Merge branch 'master' into doc-union

1136 files changed, 52211 insertions, 51976 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a8bd016cb..1dfb5763e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -19,6 +19,7 @@ jobs:
         uses: actions/checkout@master
 
       - name: Checkout syms
+        if: ${{ github.event_name == 'push' }}
         uses: actions/checkout@master
         with:
           path: symbols
@@ -52,7 +53,7 @@ jobs:
         run: make -j${nproc} all
 
       - name: Webhook
-        if: ${{ github.event_name == 'push' }}
+        if: ${{ github.event_name == 'push' && github.repository_owner == 'pret' }}
         env:
           CALCROM_DISCORD_WEBHOOK_USERNAME: OK
           CALCROM_DISCORD_WEBHOOK_AVATAR_URL: https://i.imgur.com/38BQHdd.png
@@ -63,6 +64,7 @@ jobs:
         if: ${{ github.event_name == 'push' }}
         run: |
           cp -v *.sym symbols/
+          echo "SYMBOLS_COMMIT_MSG=$( git log --format=%s ${GITHUB_SHA} )" >> $GITHUB_ENV
 
       - name: Update symfiles
         if: ${{ github.event_name == 'push' }}
@@ -71,4 +73,4 @@ jobs:
           branch: symbols
           cwd: "./symbols"
           add: "*.sym"
-          message: ${{ github.event.pull_request.title }}
+          message: ${{ env.SYMBOLS_COMMIT_MSG }}
diff --git a/asm/macros/battle_frontier/apprentice.inc b/asm/macros/battle_frontier/apprentice.inc
index 5d9ab8e3b..83871880b 100644
--- a/asm/macros/battle_frontier/apprentice.inc
+++ b/asm/macros/battle_frontier/apprentice.inc
@@ -53,7 +53,7 @@
 	special CallApprenticeFunction
 	.endm
 
-	@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason 
+	@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason
 	.macro apprentice_shouldcheckgone
 	setvar VAR_0x8004, APPRENTICE_FUNC_CHECK_GONE
 	special CallApprenticeFunction
@@ -109,7 +109,7 @@
 	special CallApprenticeFunction
 	.endm
 
-	@ Set which mon the Apprentice should lead with 
+	@ Set which mon the Apprentice should lead with
 	.macro apprentice_setleadmon  monId:req
 	copyvar VAR_0x8005, \monId
 	setvar VAR_0x8004, APPRENTICE_FUNC_SET_LEAD_MON
@@ -141,7 +141,7 @@
 	special CallApprenticeFunction
 	.endm
 
-	@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason 
+	@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason
 	.macro apprentice_shouldleave
 	setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE
 	special CallApprenticeFunction
diff --git a/asm/macros/battle_frontier/battle_factory.inc b/asm/macros/battle_frontier/battle_factory.inc
index 684eeb98d..2d49d4466 100644
--- a/asm/macros/battle_frontier/battle_factory.inc
+++ b/asm/macros/battle_frontier/battle_factory.inc
@@ -88,7 +88,7 @@
 	.endm
 
 	@ Return the FACTORY_STYLE_* dependent on what types of moves the opponents team has, or FACTORY_NUM_STYLES if multiple styles tie for the same amount of moves
-	.macro factory_getopponentstyle 
+	.macro factory_getopponentstyle
 	setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GET_OPPONENT_STYLE
 	special CallBattleFactoryFunction
 	.endm
diff --git a/asm/macros/battle_frontier/battle_palace.inc b/asm/macros/battle_frontier/battle_palace.inc
index f326c1154..37c80467a 100644
--- a/asm/macros/battle_frontier/battle_palace.inc
+++ b/asm/macros/battle_frontier/battle_palace.inc
@@ -31,7 +31,7 @@
 	special CallBattlePalaceFunction
 	.endm
 
-	@ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory 
+	@ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory
 	.macro palace_getopponentintro
 	setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO
 	special CallBattlePalaceFunction
diff --git a/asm/macros/battle_frontier/battle_pyramid.inc b/asm/macros/battle_frontier/battle_pyramid.inc
index f8141e2dd..bb5069f18 100644
--- a/asm/macros/battle_frontier/battle_pyramid.inc
+++ b/asm/macros/battle_frontier/battle_pyramid.inc
@@ -1,7 +1,7 @@
 	@ Initialize the Battle Pyramid challenge
 	.macro pyramid_init
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT
-	special CallBattlePyramidFunction 
+	special CallBattlePyramidFunction
 	.endm
 
 	@ Get the value of some PYRAMID_DATA_*. See GetBattlePyramidData for the data types that can be retrieved
@@ -59,7 +59,7 @@
 	@ Set the facility trainers to gBattleFrontierTrainers
 	.macro pyramid_settrainers
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_TRAINERS
-	special CallBattlePyramidFunction 
+	special CallBattlePyramidFunction
 	.endm
 
 	@ Show the post-battle hint text
@@ -68,11 +68,11 @@
 	special CallBattlePyramidFunction
 	.endm
 
-	@ VAR_RESULT is 1 if player is on a Pyramid floor, 2 if on the Pyramid peak, 0 otherwise 
+	@ VAR_RESULT is 1 if player is on a Pyramid floor, 2 if on the Pyramid peak, 0 otherwise
 	.macro pyramid_inchallenge
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
 	special CallBattlePyramidFunction
-	.endm   
+	.endm
 
 	@ Update the light around the player. 2 different modes, for setting or incrementing light. See PYRAMID_LIGHT_*
 	.macro pyramid_updatelight radius:req, mode:req, sound=0xFFFF
@@ -83,7 +83,7 @@
 	setvar VAR_0x8007, \sound
 	.endif
 	special CallBattlePyramidFunction
-	.endm  
+	.endm
 
 	@ Reset the held items to what they were at the start of the challenge
 	.macro pyramid_clearhelditems
@@ -100,5 +100,5 @@
 	@ Reset sketched moves and update the party order in the saveblock
 	.macro pyramid_resetparty
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
-	special CallBattlePyramidFunction 
+	special CallBattlePyramidFunction
 	.endm
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index 0f51061e8..c5bede3f5 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -1275,8 +1275,8 @@
 	various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP
 	.endm
 	
-	.macro various7 battler:req
-	various \battler, 7
+	.macro resetplayerfainted
+	various BS_ATTACKER, VARIOUS_RESET_PLAYER_FAINTED
 	.endm
 	
 	.macro palaceflavortext battler:req
@@ -1303,12 +1303,12 @@
 	various \battler, VARIOUS_EMIT_YESNOBOX
 	.endm
 	
-	.macro various14 battler:req
-	various \battler, 14
+	.macro arenadrawreftextbox
+	various BS_ATTACKER, VARIOUS_DRAW_ARENA_REF_TEXT_BOX
 	.endm
 	
-	.macro various15 battler:req
-	various \battler, 15
+	.macro arenaerasereftextbox
+	various BS_ATTACKER, VARIOUS_ERASE_ARENA_REF_TEXT_BOX
 	.endm
 	
 	.macro arenajudgmentstring id:req
@@ -1340,11 +1340,11 @@
 	.endm
 	
 	.macro setalreadystatusedmoveattempt battler:req
-	various \battler, 23
+	various \battler, VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT
 	.endm
 	
-	.macro various24 battler:req
-	various \battler, 24
+	.macro palacetryescapestatus battler:req
+	various \battler, VARIOUS_PALACE_TRY_ESCAPE_STATUS
 	.endm
 	
 	.macro setoutcomeonteleport battler:req
diff --git a/asm/macros/battle_tent.inc b/asm/macros/battle_tent.inc
index 663d1d344..142457ed9 100644
--- a/asm/macros/battle_tent.inc
+++ b/asm/macros/battle_tent.inc
@@ -26,7 +26,7 @@
 	special CallVerdanturfTentFunction
 	.endm
 
-	@ Buffers the opponents intro speech to STR_VAR_4. Despite being a Verdanturf Tent function, it serves the same purpose for all 3 tents. 
+	@ Buffers the opponents intro speech to STR_VAR_4. Despite being a Verdanturf Tent function, it serves the same purpose for all 3 tents.
 	.macro battletent_getopponentintro
 	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GET_OPPONENT_INTRO
 	special CallVerdanturfTentFunction
@@ -36,7 +36,7 @@
 	.macro verdanturftent_save challengeStatus:req
 	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_SAVE
 	setvar VAR_0x8005, \challengeStatus
-	special CallVerdanturfTentFunction  
+	special CallVerdanturfTentFunction
 	.endm
 
 	@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
@@ -49,7 +49,7 @@
 	.macro verdanturftent_giveprize
 	setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GIVE_PRIZE
 	special CallVerdanturfTentFunction
-	.endm  
+	.endm
 
 
 @ Fallarbor Tent
@@ -79,7 +79,7 @@
 	setvar VAR_0x8004, FALLARBOR_TENT_FUNC_SAVE
 	setvar VAR_0x8005, \challengeStatus
 	special CallFallarborTentFunction
-	.endm   
+	.endm
 
 	@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
 	.macro fallarbortent_setrandomprize
@@ -97,7 +97,7 @@
 	.macro fallarbortent_getopponentname
 	setvar VAR_0x8004, FALLARBOR_TENT_FUNC_GET_OPPONENT_NAME
 	special CallFallarborTentFunction
-	.endm 
+	.endm
 
 
 @ Slateport Tent
@@ -127,15 +127,15 @@
 	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SAVE
 	setvar VAR_0x8005, \challengeStatus
 	special CallSlateportTentFunction
-	.endm   
+	.endm
 
-	@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item 
+	@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
 	.macro slateporttent_setrandomprize
 	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SET_RANDOM_PRIZE
 	special CallSlateportTentFunction
 	.endm
 
-	@ Give the current prize item. FALSE if no room for prize 
+	@ Give the current prize item. FALSE if no room for prize
 	.macro slateporttent_giveprize
 	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GIVE_PRIZE
 	special CallSlateportTentFunction
@@ -157,7 +157,7 @@
 	.macro slateporttent_generateopponentmons
 	setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GENERATE_OPPONENT_MONS
 	special CallSlateportTentFunction
-	.endm 
+	.endm
 
 	@ Slateport Tent's version of factory_generaterentalmons
 	.macro slateporttent_generaterentalmons
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 73aef33b5..480684ef6 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -274,8 +274,8 @@
 	.2byte \functionId
 	.endm
 
-	@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific 
-	@ commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock 
+	@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific
+	@ commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock
 	@ state, the script will remain blocked indefinitely (essentially a hang).
 	.macro waitstate
 	.byte 0x27
@@ -317,7 +317,7 @@
 	.byte 0x2d
 	.endm
 
-	@ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG, 
+	@ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG,
 	@ this command sets those variables to zero.
 	.macro gettime
 	.byte 0x2e
@@ -382,7 +382,7 @@
 	.byte \speed
 	.endm
 
-	@ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF, 
+	@ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF,
 	@ then the player will instead be sent to (X, Y) on the map.
 	.macro warp map:req, warp:req, X:req, Y:req
 	.byte 0x39
@@ -434,7 +434,7 @@
 	.2byte \Y
 	.endm
 
-	@ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to. 
+	@ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to.
 	@ Useful when a map has warps that need to go to script-controlled locations (i.e. elevators).
 	.macro setdynamicwarp map:req, warp:req, X:req, Y:req
 	.byte 0x3f
@@ -474,7 +474,7 @@
 	.byte 0x43
 	.endm
 
-	@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and 
+	@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and
 	@ VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE.
 	.macro additem index:req, quantity=1
 	.byte 0x44
@@ -489,7 +489,7 @@
 	.2byte \quantity
 	.endm
 
-	@ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets VAR_RESULT to 
+	@ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets VAR_RESULT to
 	@ TRUE if there is room, or FALSE is there is no room.
 	.macro checkitemspace index:req, quantity:req
 	.byte 0x46
@@ -505,7 +505,7 @@
 	.2byte \quantity
 	.endm
 
-	@ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT. 
+	@ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT.
 	@ This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE).
 	.macro checkitemtype index:req
 	.byte 0x48
@@ -544,7 +544,7 @@
 	.2byte \decoration
 	.endm
 
-	@ Checks if the player has enough space in their PC to hold decoration. Sets VAR_RESULT to TRUE if there is room, or 
+	@ Checks if the player has enough space in their PC to hold decoration. Sets VAR_RESULT to TRUE if there is room, or
 	@ FALSE is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
 	.macro checkdecorspace decoration:req
 	.byte 0x4e
@@ -567,9 +567,9 @@
 		.endif
 	.endm
 
-	@ Blocks script execution until the movements being applied to the specified (index) Object finish. 
-	@ If the specified Object is 0x0000, then the command will block script execution until all Objects 
-	@ affected by applymovement finish their movements. If the specified Object is not currently being 
+	@ Blocks script execution until the movements being applied to the specified (index) Object finish.
+	@ If the specified Object is 0x0000, then the command will block script execution until all Objects
+	@ affected by applymovement finish their movements. If the specified Object is not currently being
 	@ manipulated with applymovement, then this command does nothing.
 	@ If no map is specified, then the current map is used.
 	.macro waitmovement index:req, map
@@ -583,8 +583,8 @@
 		.endif
 	.endm
 
-	@ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map, 
-	@ by setting its visibility flag if it has a valid one. If the Object does not have a valid 
+	@ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map,
+	@ by setting its visibility flag if it has a valid one. If the Object does not have a valid
 	@ visibility flag, this command does nothing.
 	@ If no map is specified, then the current map is used.
 	.macro removeobject index:req, map
@@ -598,7 +598,7 @@
 		.endif
 	.endm
 
-	@ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one. 
+	@ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one.
 	@ If the Object does not have a valid visibility flag, this command does nothing.
 	@ If no map is specified, then the current map is used.
 	.macro addobject index:req, map
@@ -740,7 +740,7 @@
 	.endm
 
 
-	@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this 
+	@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this
 	@ command behind-the-scenes), and blocks script execution until the battle finishes.
 	.macro trainerbattlebegin
 	.byte 0x5d
@@ -781,7 +781,7 @@
 	.2byte \y
 	.endm
 
-	@ Copies a live object event's xy position to its template, so that if the sprite goes off screen, 
+	@ Copies a live object event's xy position to its template, so that if the sprite goes off screen,
 	@ it'll still be there when it comes back on screen.
 	.macro copyobjectxytoperm index:req
 	.byte 0x64
@@ -794,14 +794,14 @@
 	.byte \byte
 	.endm
 
-	@ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the 
+	@ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the
 	@ box and its text have been fully drawn.
 	.macro waitmessage
 	.byte 0x66
 	.endm
 
-	@ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at 
-	@ that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as 
+	@ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at
+	@ that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as
 	@ a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.)
 	.macro message text:req
 	.byte 0x67
@@ -846,7 +846,7 @@
 	.byte \y
 	.endm
 
-	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. 
+	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
 	@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId.
 	@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
 	.macro multichoice x:req, y:req, multichoiceId:req, ignoreBPress:req
@@ -859,7 +859,7 @@
 
 	@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
 	@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId.
-	@ The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. 
+	@ The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00.
 	@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
 	.macro multichoicedefault x:req, y:req, multichoiceId:req, default:req, ignoreBPress:req
 	.byte 0x70
@@ -925,8 +925,8 @@
 	.byte \winnerId
 	.endm
 
-	@ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille 
-	@ characters and needs to provide six extra starting characters that are skipped (in RS, these characters determined the 
+	@ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille
+	@ characters and needs to provide six extra starting characters that are skipped (in RS, these characters determined the
 	@ box's size and position, but in Emerald these are calculated automatically).
 	.macro braillemessage text:req
 	.byte 0x78
@@ -996,7 +996,7 @@
 	.2byte \slot
 	.endm
 
-	@ Writes the name of the item at index item to the specified buffer. If the specified index is larger than 
+	@ Writes the name of the item at index item to the specified buffer. If the specified index is larger than
 	@ the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
 	.macro bufferitemname out:req, item:req
 	.byte 0x80
@@ -1112,7 +1112,7 @@
 	.byte \check
 	.endm
 
-	@ If check is 0x00, this command will check if the player has money >= value; VAR_RESULT is set to TRUE if the player 
+	@ If check is 0x00, this command will check if the player has money >= value; VAR_RESULT is set to TRUE if the player
 	@ has enough money, or FALSE if they do not.
 	.macro checkmoney value:req, check:req
 	.byte 0x92
@@ -1446,7 +1446,7 @@
 	.2byte \box
 	.endm
 
-	@ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, 
+	@ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text,
 	@ 0xFF resets the color to the default for the current OW's gender, and all other values produce black text.
 	@ Used only in FireRed/LeafGreen, does nothing in Emerald.
 	.macro textcolor color:req
@@ -1454,7 +1454,7 @@
 	.byte \color
 	.endm
 
-	@ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom 
+	@ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom
 	@ of the screen when the Main Menu is opened.
 	@ Used only in FireRed/LeafGreen, does nothing in Emerald.
 	.macro loadhelp pointer:req
@@ -1643,7 +1643,7 @@
 
 	.macro goto_if_lt dest:req @ LESS THAN
 	goto_if 0, \dest
-	.endm	
+	.endm
 
 	.macro goto_if_eq dest:req @ EQUAL
 	goto_if 1, \dest
@@ -1677,7 +1677,7 @@
 
 	.macro call_if_lt dest:req @ LESS THAN
 	call_if 0, \dest
-	.endm	
+	.endm
 
 	.macro call_if_eq dest:req @ EQUAL
 	call_if 1, \dest
diff --git a/common_syms/bg.txt b/common_syms/bg.txt
index 2495d1646..0a3c3aecc 100644
--- a/common_syms/bg.txt
+++ b/common_syms/bg.txt
@@ -1 +1 @@
-gUnneededFireRedVariable
+gWindowTileAutoAllocEnabled
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s
index 4867f4261..0d4c85771 100644
--- a/data/battle_ai_scripts.s
+++ b/data/battle_ai_scripts.s
@@ -12,7 +12,7 @@
 	.section script_data, "aw", %progbits
 
 	.align 2
-gBattleAI_ScriptsTable:: @ 82DBEF8
+gBattleAI_ScriptsTable::
 	.4byte AI_CheckBadMove          @ AI_SCRIPT_CHECK_BAD_MOVE
 	.4byte AI_TryToFaint            @ AI_SCRIPT_TRY_TO_FAINT
 	.4byte AI_CheckViability        @ AI_SCRIPT_CHECK_VIABILITY
@@ -52,7 +52,7 @@ AI_CheckBadMove:
 	if_move MOVE_HORN_DRILL, AI_CBM_CheckIfNegatesType
 	get_how_powerful_move_is
 	if_equal MOVE_POWER_OTHER, AI_CheckBadMove_CheckSoundproof
-AI_CBM_CheckIfNegatesType: @ 82DBF92
+AI_CBM_CheckIfNegatesType:
 	if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
 	get_ability AI_TARGET
 	if_equal ABILITY_VOLT_ABSORB, CheckIfVoltAbsorbCancelsElectric
@@ -62,32 +62,32 @@ AI_CBM_CheckIfNegatesType: @ 82DBF92
 	if_equal ABILITY_LEVITATE, CheckIfLevitateCancelsGroundMove
 	goto AI_CheckBadMove_CheckSoundproof_
 
-CheckIfVoltAbsorbCancelsElectric: @ 82DBFBD
+CheckIfVoltAbsorbCancelsElectric:
 	get_curr_move_type
 	if_equal_ TYPE_ELECTRIC, Score_Minus12
 	goto AI_CheckBadMove_CheckSoundproof_
 
-CheckIfWaterAbsorbCancelsWater: @ 82DBFCA
+CheckIfWaterAbsorbCancelsWater:
 	get_curr_move_type
 	if_equal_ TYPE_WATER, Score_Minus12
 	goto AI_CheckBadMove_CheckSoundproof_
 
-CheckIfFlashFireCancelsFire: @ 82DBFD7
+CheckIfFlashFireCancelsFire:
 	get_curr_move_type
 	if_equal_ TYPE_FIRE, Score_Minus12
 	goto AI_CheckBadMove_CheckSoundproof_
 
-CheckIfWonderGuardCancelsMove: @ 82DBFE4
+CheckIfWonderGuardCancelsMove:
 	if_type_effectiveness AI_EFFECTIVENESS_x2, AI_CheckBadMove_CheckSoundproof_
 	goto Score_Minus10
 
-CheckIfLevitateCancelsGroundMove: @ 82DBFEF
+CheckIfLevitateCancelsGroundMove:
 	get_curr_move_type
 	if_equal_ TYPE_GROUND, Score_Minus10
-AI_CheckBadMove_CheckSoundproof_: @ 82DBFF7
+AI_CheckBadMove_CheckSoundproof_:
 	get_how_powerful_move_is
 	if_equal MOVE_POWER_OTHER, AI_CheckBadMove_CheckSoundproof  @ Pointless check
-AI_CheckBadMove_CheckSoundproof: @ 82DBFFE
+AI_CheckBadMove_CheckSoundproof:
 	get_ability AI_TARGET
 	if_not_equal ABILITY_SOUNDPROOF, AI_CheckBadMove_CheckEffect
 	if_move MOVE_GROWL, Score_Minus10
@@ -99,7 +99,7 @@ AI_CheckBadMove_CheckSoundproof: @ 82DBFFE
 	if_move MOVE_UPROAR, Score_Minus10
 	if_move MOVE_METAL_SOUND, Score_Minus10
 	if_move MOVE_GRASS_WHISTLE, Score_Minus10
-AI_CheckBadMove_CheckEffect: @ 82DC045
+AI_CheckBadMove_CheckEffect:
 	if_effect EFFECT_SLEEP, AI_CBM_Sleep
 	if_effect EFFECT_EXPLOSION, AI_CBM_Explosion
 	if_effect EFFECT_DREAM_EATER, AI_CBM_DreamEater
@@ -211,7 +211,7 @@ AI_CheckBadMove_CheckEffect: @ 82DC045
 	if_effect EFFECT_DRAGON_DANCE, AI_CBM_DragonDance
 	end
 
-AI_CBM_Sleep: @ 82DC2D4
+AI_CBM_Sleep:
 	get_ability AI_TARGET
 	if_equal ABILITY_INSOMNIA, Score_Minus10
 	if_equal ABILITY_VITAL_SPIRIT, Score_Minus10
@@ -219,7 +219,7 @@ AI_CBM_Sleep: @ 82DC2D4
 	if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
 	end
 
-AI_CBM_Explosion: @ 82DC2F7
+AI_CBM_Explosion:
 	if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
 	get_ability AI_TARGET
 	if_equal ABILITY_DAMP, Score_Minus10
@@ -229,87 +229,87 @@ AI_CBM_Explosion: @ 82DC2F7
 	if_not_equal 0, Score_Minus10
 	goto Score_Minus1
 
-AI_CBM_Explosion_End: @ 82DC31A
+AI_CBM_Explosion_End:
 	end
 
-AI_CBM_Nightmare: @ 82DC31B
+AI_CBM_Nightmare:
 	if_status2 AI_TARGET, STATUS2_NIGHTMARE, Score_Minus10
 	if_not_status AI_TARGET, STATUS1_SLEEP, Score_Minus8
 	end
 
-AI_CBM_DreamEater: @ 82DC330
+AI_CBM_DreamEater:
 	if_not_status AI_TARGET, STATUS1_SLEEP, Score_Minus8
 	if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
 	end
 
-AI_CBM_BellyDrum: @ 82DC341
+AI_CBM_BellyDrum:
 	if_hp_less_than AI_USER, 51, Score_Minus10
-AI_CBM_AttackUp: @ 82DC348
+AI_CBM_AttackUp:
 	if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
 	end
 
-AI_CBM_DefenseUp: @ 82DC351
+AI_CBM_DefenseUp:
 	if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus10
 	end
 
-AI_CBM_SpeedUp: @ 82DC35A
+AI_CBM_SpeedUp:
 	if_stat_level_equal AI_USER, STAT_SPEED, MAX_STAT_STAGE, Score_Minus10
 	end
 
-AI_CBM_SpAtkUp: @ 82DC363
+AI_CBM_SpAtkUp:
 	if_stat_level_equal AI_USER, STAT_SPATK, MAX_STAT_STAGE, Score_Minus10
 	end
 
-AI_CBM_SpDefUp: @ 82DC36C
+AI_CBM_SpDefUp:
 	if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus10
 	end
 
-AI_CBM_AccUp: @ 82DC375
+AI_CBM_AccUp:
 	if_stat_level_equal AI_USER, STAT_ACC, MAX_STAT_STAGE, Score_Minus10
 	end
 
-AI_CBM_EvasionUp: @ 82DC37E
+AI_CBM_EvasionUp:
 	if_stat_level_equal AI_USER, STAT_EVASION, MAX_STAT_STAGE, Score_Minus10
 	end
 
-AI_CBM_AttackDown: @ 82DC387
+AI_CBM_AttackDown:
 	if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10
 	get_ability AI_TARGET
 	if_equal ABILITY_HYPER_CUTTER, Score_Minus10
 	goto CheckIfAbilityBlocksStatChange
 
-AI_CBM_DefenseDown: @ 82DC39C
+AI_CBM_DefenseDown:
 	if_stat_level_equal AI_TARGET, STAT_DEF, MIN_STAT_STAGE, Score_Minus10
 	goto CheckIfAbilityBlocksStatChange
 
-AI_CBM_SpeedDown: @ 82DC3A9
+AI_CBM_SpeedDown:
 	if_stat_level_equal AI_TARGET, STAT_SPEED, MIN_STAT_STAGE, Score_Minus10
 	if_ability AI_TARGET, ABILITY_SPEED_BOOST, Score_Minus10
 	goto CheckIfAbilityBlocksStatChange
 
-AI_CBM_SpAtkDown: @ 82DC3BF
+AI_CBM_SpAtkDown:
 	if_stat_level_equal AI_TARGET, STAT_SPATK, MIN_STAT_STAGE, Score_Minus10
 	goto CheckIfAbilityBlocksStatChange
 
-AI_CBM_SpDefDown: @ 82DC3CC
+AI_CBM_SpDefDown:
 	if_stat_level_equal AI_TARGET, STAT_SPDEF, MIN_STAT_STAGE, Score_Minus10
 	goto CheckIfAbilityBlocksStatChange
 
-AI_CBM_AccDown: @ 82DC3D9
+AI_CBM_AccDown:
 	if_stat_level_equal AI_TARGET, STAT_ACC, MIN_STAT_STAGE, Score_Minus10
 	get_ability AI_TARGET
 	if_equal ABILITY_KEEN_EYE, Score_Minus10
 	goto CheckIfAbilityBlocksStatChange
 
-AI_CBM_EvasionDown: @ 82DC3EE
+AI_CBM_EvasionDown:
 	if_stat_level_equal AI_TARGET, STAT_EVASION, MIN_STAT_STAGE, Score_Minus10
-CheckIfAbilityBlocksStatChange: @ 82DC3F6
+CheckIfAbilityBlocksStatChange:
 	get_ability AI_TARGET
 	if_equal ABILITY_CLEAR_BODY, Score_Minus10
 	if_equal ABILITY_WHITE_SMOKE, Score_Minus10
 	end
 
-AI_CBM_Haze: @ 82DC405
+AI_CBM_Haze:
 	if_stat_level_less_than AI_USER, STAT_ATK, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
 	if_stat_level_less_than AI_USER, STAT_DEF, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
 	if_stat_level_less_than AI_USER, STAT_SPEED, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
@@ -326,17 +326,17 @@ AI_CBM_Haze: @ 82DC405
 	if_stat_level_more_than AI_TARGET, STAT_EVASION, DEFAULT_STAT_STAGE, AI_CBM_Haze_End
 	goto Score_Minus10
 
-AI_CBM_Haze_End: @ 82DC47A
+AI_CBM_Haze_End:
 	end
 
-AI_CBM_Roar: @ 82DC47B
+AI_CBM_Roar:
 	count_usable_party_mons AI_TARGET
 	if_equal 0, Score_Minus10
 	get_ability AI_TARGET
 	if_equal ABILITY_SUCTION_CUPS, Score_Minus10
 	end
 
-AI_CBM_Toxic: @ 82DC48C
+AI_CBM_Toxic:
 	get_target_type1
 	if_equal TYPE_STEEL, Score_Minus10
 	if_equal TYPE_POISON, Score_Minus10
@@ -349,50 +349,50 @@ AI_CBM_Toxic: @ 82DC48C
 	if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
 	end
 
-AI_CBM_LightScreen: @ 82DC4C5
+AI_CBM_LightScreen:
 	if_side_affecting AI_USER, SIDE_STATUS_LIGHTSCREEN, Score_Minus8
 	end
 
-AI_CBM_OneHitKO: @ 82DC4D0
+AI_CBM_OneHitKO:
 	if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
 	get_ability AI_TARGET
 	if_equal ABILITY_STURDY, Score_Minus10
 	if_level_cond 1, Score_Minus10
 	end
 
-AI_CBM_Magnitude: @ 82DC4E5
+AI_CBM_Magnitude:
 	get_ability AI_TARGET
 	if_equal ABILITY_LEVITATE, Score_Minus10
-AI_CBM_HighRiskForDamage: @ 82DC4ED
+AI_CBM_HighRiskForDamage:
 	if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
 	get_ability AI_TARGET
 	if_not_equal ABILITY_WONDER_GUARD, AI_CBM_HighRiskForDamage_End
 	if_type_effectiveness AI_EFFECTIVENESS_x2, AI_CBM_HighRiskForDamage_End
 	goto Score_Minus10
 
-AI_CBM_HighRiskForDamage_End: @ 82DC506
+AI_CBM_HighRiskForDamage_End:
 	end
 
-AI_CBM_Mist: @ 82DC507
+AI_CBM_Mist:
 	if_side_affecting AI_USER, SIDE_STATUS_MIST, Score_Minus8
 	end
 
-AI_CBM_FocusEnergy: @ 82DC512
+AI_CBM_FocusEnergy:
 	if_status2 AI_USER, STATUS2_FOCUS_ENERGY, Score_Minus10
 	end
 
-AI_CBM_Confuse: @ 82DC51D
+AI_CBM_Confuse:
 	if_status2 AI_TARGET, STATUS2_CONFUSION, Score_Minus5
 	get_ability AI_TARGET
 	if_equal ABILITY_OWN_TEMPO, Score_Minus10
 	if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
 	end
 
-AI_CBM_Reflect: @ 82DC53A
+AI_CBM_Reflect:
 	if_side_affecting AI_USER, SIDE_STATUS_REFLECT, Score_Minus8
 	end
 
-AI_CBM_Paralyze: @ 82DC545
+AI_CBM_Paralyze:
 	if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
 	get_ability AI_TARGET
 	if_equal ABILITY_LIMBER, Score_Minus10
@@ -400,12 +400,12 @@ AI_CBM_Paralyze: @ 82DC545
 	if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
 	end
 
-AI_CBM_Substitute: @ 82DC568
+AI_CBM_Substitute:
 	if_status2 AI_USER, STATUS2_SUBSTITUTE, Score_Minus8
 	if_hp_less_than AI_USER, 26, Score_Minus10
 	end
 
-AI_CBM_LeechSeed: @ 82DC57A
+AI_CBM_LeechSeed:
 	if_status3 AI_TARGET, STATUS3_LEECHSEED, Score_Minus10
 	get_target_type1
 	if_equal TYPE_GRASS, Score_Minus10
@@ -413,45 +413,45 @@ AI_CBM_LeechSeed: @ 82DC57A
 	if_equal TYPE_GRASS, Score_Minus10
 	end
 
-AI_CBM_Disable: @ 82DC595
+AI_CBM_Disable:
 	if_any_move_disabled AI_TARGET, Score_Minus8
 	end
 
-AI_CBM_Encore: @ 82DC59D
+AI_CBM_Encore:
 	if_any_move_encored AI_TARGET, Score_Minus8
 	end
 
-AI_CBM_DamageDuringSleep: @ 82DC5A5
+AI_CBM_DamageDuringSleep:
 	if_not_status AI_USER, STATUS1_SLEEP, Score_Minus8
 	end
 
-AI_CBM_CantEscape: @ 82DC5B0
+AI_CBM_CantEscape:
 	if_status2 AI_TARGET, STATUS2_ESCAPE_PREVENTION, Score_Minus10
 	end
 
-AI_CBM_Curse: @ 82DC5BB
+AI_CBM_Curse:
 	if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
 	if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus8
 	end
 
-AI_CBM_Spikes: @ 82DC5CC
+AI_CBM_Spikes:
 	if_side_affecting AI_TARGET, SIDE_STATUS_SPIKES, Score_Minus10
 	end
 
-AI_CBM_Foresight: @ 82DC5D7
+AI_CBM_Foresight:
 	if_status2 AI_TARGET, STATUS2_FORESIGHT, Score_Minus10
 	end
 
-AI_CBM_PerishSong: @ 82DC5E2
+AI_CBM_PerishSong:
 	if_status3 AI_TARGET, STATUS3_PERISH_SONG, Score_Minus10
 	end
 
-AI_CBM_Sandstorm: @ 82DC5ED
+AI_CBM_Sandstorm:
 	get_weather
 	if_equal AI_WEATHER_SANDSTORM, Score_Minus8
 	end
 
-AI_CBM_Attract: @ 82DC5F5
+AI_CBM_Attract:
 	if_status2 AI_TARGET, STATUS2_INFATUATION, Score_Minus10
 	get_ability AI_TARGET
 	if_equal ABILITY_OBLIVIOUS, Score_Minus10
@@ -460,73 +460,73 @@ AI_CBM_Attract: @ 82DC5F5
 	if_equal MON_FEMALE, AI_CBM_Attract_CheckIfTargetIsMale
 	goto Score_Minus10
 
-AI_CBM_Attract_CheckIfTargetIsFemale: @ 82DC61A
+AI_CBM_Attract_CheckIfTargetIsFemale:
 	get_gender AI_TARGET
 	if_equal MON_FEMALE, AI_CBM_Attract_End
 	goto Score_Minus10
 
-AI_CBM_Attract_CheckIfTargetIsMale: @ 82DC627
+AI_CBM_Attract_CheckIfTargetIsMale:
 	get_gender AI_TARGET
 	if_equal MON_MALE, AI_CBM_Attract_End
 	goto Score_Minus10
 
-AI_CBM_Attract_End: @ 82DC634
+AI_CBM_Attract_End:
 	end
 
-AI_CBM_Safeguard: @ 82DC635
+AI_CBM_Safeguard:
 	if_side_affecting AI_USER, SIDE_STATUS_SAFEGUARD, Score_Minus8
 	end
 
-AI_CBM_Memento: @ 82DC640
+AI_CBM_Memento:
 	if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10
 	if_stat_level_equal AI_TARGET, STAT_SPATK, MIN_STAT_STAGE, Score_Minus8
-AI_CBM_BatonPass: @ 82DC650
+AI_CBM_BatonPass:
 	count_usable_party_mons AI_USER
 	if_equal 0, Score_Minus10
 	end
 
-AI_CBM_RainDance: @ 82DC659
+AI_CBM_RainDance:
 	get_weather
 	if_equal AI_WEATHER_RAIN, Score_Minus8
 	end
 
-AI_CBM_SunnyDay: @ 82DC661
+AI_CBM_SunnyDay:
 	get_weather
 	if_equal AI_WEATHER_SUN, Score_Minus8
 	end
 
-AI_CBM_FutureSight: @ 82DC669
+AI_CBM_FutureSight:
 	if_side_affecting AI_TARGET, SIDE_STATUS_FUTUREATTACK, Score_Minus12
 	if_side_affecting AI_USER, SIDE_STATUS_FUTUREATTACK, Score_Minus12
 	score +5
 	end
 
-AI_CBM_FakeOut: @ 82DC680
+AI_CBM_FakeOut:
 	is_first_turn_for AI_USER
 	if_equal FALSE, Score_Minus10
 	end
 
-AI_CBM_Stockpile: @ 82DC689
+AI_CBM_Stockpile:
 	get_stockpile_count AI_USER
 	if_equal 3, Score_Minus10
 	end
 
-AI_CBM_SpitUpAndSwallow: @ 82DC692
+AI_CBM_SpitUpAndSwallow:
 	if_type_effectiveness AI_EFFECTIVENESS_x0, Score_Minus10
 	get_stockpile_count AI_USER
 	if_equal 0, Score_Minus10
 	end
 
-AI_CBM_Hail: @ 82DC6A1
+AI_CBM_Hail:
 	get_weather
 	if_equal AI_WEATHER_HAIL, Score_Minus8
 	end
 
-AI_CBM_Torment: @ 82DC6A9
+AI_CBM_Torment:
 	if_status2 AI_TARGET, STATUS2_TORMENT, Score_Minus10
 	end
 
-AI_CBM_WillOWisp: @ 82DC6B4
+AI_CBM_WillOWisp:
 	get_ability AI_TARGET
 	if_equal ABILITY_WATER_VEIL, Score_Minus10
 	if_status AI_TARGET, STATUS1_ANY, Score_Minus10
@@ -536,61 +536,61 @@ AI_CBM_WillOWisp: @ 82DC6B4
 	if_side_affecting AI_TARGET, SIDE_STATUS_SAFEGUARD, Score_Minus10
 	end
 
-AI_CBM_HelpingHand: @ 82DC6E3
+AI_CBM_HelpingHand:
 	if_not_double_battle Score_Minus10
 	end
 
-AI_CBM_TrickAndKnockOff: @ 82DC6EB
+AI_CBM_TrickAndKnockOff:
 	get_ability AI_TARGET
 	if_equal ABILITY_STICKY_HOLD, Score_Minus10
 	end
 
-AI_CBM_Ingrain: @ 82DC6F4
+AI_CBM_Ingrain:
 	if_status3 AI_USER, STATUS3_ROOTED, Score_Minus10
 	end
 
-AI_CBM_Recycle: @ 82DC6FF
+AI_CBM_Recycle:
 	get_used_held_item AI_USER
 	if_equal ITEM_NONE, Score_Minus10
 	end
 
-AI_CBM_Imprison: @ 82DC708
+AI_CBM_Imprison:
 	if_status3 AI_USER, STATUS3_IMPRISONED_OTHERS, Score_Minus10
 	end
 
-AI_CBM_Refresh: @ 82DC713
+AI_CBM_Refresh:
 	if_not_status AI_USER, STATUS1_POISON | STATUS1_BURN | STATUS1_PARALYSIS | STATUS1_TOXIC_POISON, Score_Minus10
 	end
 
-AI_CBM_MudSport: @ 82DC71E
+AI_CBM_MudSport:
 	if_status3 AI_USER, STATUS3_MUDSPORT, Score_Minus10
 	end
 
-AI_CBM_Tickle: @ 82DC729
+AI_CBM_Tickle:
 	if_stat_level_equal AI_TARGET, STAT_ATK, MIN_STAT_STAGE, Score_Minus10
 	if_stat_level_equal AI_TARGET, STAT_DEF, MIN_STAT_STAGE, Score_Minus8
 	end
 
-AI_CBM_CosmicPower: @ 82DC73A
+AI_CBM_CosmicPower:
 	if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus10
 	if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus8
 	end
 
-AI_CBM_BulkUp: @ 82DC74B
+AI_CBM_BulkUp:
 	if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
 	if_stat_level_equal AI_USER, STAT_DEF, MAX_STAT_STAGE, Score_Minus8
 	end
 
-AI_CBM_WaterSport: @ 82DC75C
+AI_CBM_WaterSport:
 	if_status3 AI_USER, STATUS3_WATERSPORT, Score_Minus10
 	end
 
-AI_CBM_CalmMind: @ 82DC767
+AI_CBM_CalmMind:
 	if_stat_level_equal AI_USER, STAT_SPATK, MAX_STAT_STAGE, Score_Minus10
 	if_stat_level_equal AI_USER, STAT_SPDEF, MAX_STAT_STAGE, Score_Minus8
 	end
 
-AI_CBM_DragonDance: @ 82DC778
+AI_CBM_DragonDance:
 	if_stat_level_equal AI_USER, STAT_ATK, MAX_STAT_STAGE, Score_Minus10
 	if_stat_level_equal AI_USER, STAT_SPEED, MAX_STAT_STAGE, Score_Minus8
 	end
@@ -773,67 +773,67 @@ AI_CheckViability:
 	if_effect EFFECT_DRAGON_DANCE, AI_CV_DragonDance
 	end
 
-AI_CV_Sleep: @ 82DCA92
+AI_CV_Sleep:
 	if_has_move_with_effect AI_TARGET, EFFECT_DREAM_EATER, AI_CV_SleepEncourageSlpDamage
 	if_has_move_with_effect AI_TARGET, EFFECT_NIGHTMARE, AI_CV_SleepEncourageSlpDamage
 	goto AI_CV_Sleep_End
 
-AI_CV_SleepEncourageSlpDamage: @ 82DCAA5
+AI_CV_SleepEncourageSlpDamage:
 	if_random_less_than 128, AI_CV_Sleep_End
 	score +1
-AI_CV_Sleep_End: @ 82DCAAD
+AI_CV_Sleep_End:
 	end
 
-AI_CV_Absorb: @ 82DCAAE
+AI_CV_Absorb:
 	if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_AbsorbEncourageMaybe
 	if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_AbsorbEncourageMaybe
 	goto AI_CV_Absorb_End
 
-AI_CV_AbsorbEncourageMaybe: @ 82DCABF
+AI_CV_AbsorbEncourageMaybe:
 	if_random_less_than 50, AI_CV_Absorb_End
 	score -3
-AI_CV_Absorb_End: @ 82DCAC7
+AI_CV_Absorb_End:
 	end
 
-AI_CV_SelfKO: @ 82DCAC8
+AI_CV_SelfKO:
 	if_stat_level_less_than AI_TARGET, STAT_EVASION, 7, AI_CV_SelfKO_Encourage1
 	score -1
 	if_stat_level_less_than AI_TARGET, STAT_EVASION, 10, AI_CV_SelfKO_Encourage1
 	if_random_less_than 128, AI_CV_SelfKO_Encourage1
 	score -1
-AI_CV_SelfKO_Encourage1: @ 82DCAE2
+AI_CV_SelfKO_Encourage1:
 	if_hp_less_than AI_USER, 80, AI_CV_SelfKO_Encourage2
 	if_target_faster AI_CV_SelfKO_Encourage2
 	if_random_less_than 50, AI_CV_SelfKO_End
 	goto Score_Minus3
 
-AI_CV_SelfKO_Encourage2: @ 82DCAFA
+AI_CV_SelfKO_Encourage2:
 	if_hp_more_than AI_USER, 50, AI_CV_SelfKO_Encourage4
 	if_random_less_than 128, AI_CV_SelfKO_Encourage3
 	score +1
-AI_CV_SelfKO_Encourage3: @ 82DCB09
+AI_CV_SelfKO_Encourage3:
 	if_hp_more_than AI_USER, 30, AI_CV_SelfKO_End
 	if_random_less_than 50, AI_CV_SelfKO_End
 	score +1
 	goto AI_CV_SelfKO_End
 
-AI_CV_SelfKO_Encourage4: @ 82DCB1D
+AI_CV_SelfKO_Encourage4:
 	if_random_less_than 50, AI_CV_SelfKO_End
 	score -1
-AI_CV_SelfKO_End: @ 82DCB25
+AI_CV_SelfKO_End:
 	end
 
-AI_CV_DreamEater: @ 82DCB26
+AI_CV_DreamEater:
 	if_type_effectiveness AI_EFFECTIVENESS_x0_25, AI_CV_DreamEater_ScoreDown1
 	if_type_effectiveness AI_EFFECTIVENESS_x0_5, AI_CV_DreamEater_ScoreDown1
 	goto AI_CV_DreamEater_End
 
-AI_CV_DreamEater_ScoreDown1: @ 82DCB37
+AI_CV_DreamEater_ScoreDown1:
 	score -1
-AI_CV_DreamEater_End: @ 82DCB39
+AI_CV_DreamEater_End:
 	end
 
-AI_CV_MirrorMove: @ 82DCB3A
+AI_CV_MirrorMove:
 	if_target_faster AI_CV_MirrorMove2
 	get_last_used_bank_move AI_TARGET
 	if_not_in_hwords AI_CV_MirrorMove_EncouragedMovesToMirror, AI_CV_MirrorMove2
@@ -841,15 +841,15 @@ AI_CV_MirrorMove: @ 82DCB3A
 	score +2
 	goto AI_CV_MirrorMove_End
 
-AI_CV_MirrorMove2: @ 82DCB58
+AI_CV_MirrorMove2:
 	get_last_used_bank_move AI_TARGET
 	if_in_hwords AI_CV_MirrorMove_EncouragedMovesToMirror, AI_CV_MirrorMove_End
 	if_random_less_than 80, AI_CV_MirrorMove_End
 	score -1
-AI_CV_MirrorMove_End: @ 82DCB6B
+AI_CV_MirrorMove_End:
 	end
 
-AI_CV_MirrorMove_EncouragedMovesToMirror: @ 82DCB6C
+AI_CV_MirrorMove_EncouragedMovesToMirror:
     .2byte MOVE_SLEEP_POWDER
     .2byte MOVE_LOVELY_KISS
     .2byte MOVE_SPORE
@@ -891,39 +891,39 @@ AI_CV_MirrorMove_EncouragedMovesToMirror: @ 82DCB6C
     .2byte MOVE_SKILL_SWAP
     .2byte -1
 
-AI_CV_AttackUp: @ 82DCBBC
+AI_CV_AttackUp:
 	if_stat_level_less_than AI_USER, STAT_ATK, 9, AI_CV_AttackUp2
 	if_random_less_than 100, AI_CV_AttackUp3
 	score -1
 	goto AI_CV_AttackUp3
 
-AI_CV_AttackUp2: @ 82DCBD1
+AI_CV_AttackUp2:
 	if_hp_not_equal AI_USER, 100, AI_CV_AttackUp3
 	if_random_less_than 128, AI_CV_AttackUp3
 	score +2
-AI_CV_AttackUp3: @ 82DCBE0
+AI_CV_AttackUp3:
 	if_hp_more_than AI_USER, 70, AI_CV_AttackUp_End
 	if_hp_less_than AI_USER, 40, AI_CV_AttackUp_ScoreDown2
 	if_random_less_than 40, AI_CV_AttackUp_End
-AI_CV_AttackUp_ScoreDown2: @ 82DCBF4
+AI_CV_AttackUp_ScoreDown2:
 	score -2
-AI_CV_AttackUp_End: @ 82DCBF6
+AI_CV_AttackUp_End:
 	end
 
-AI_CV_DefenseUp: @ 82DCBF7
+AI_CV_DefenseUp:
 	if_stat_level_less_than AI_USER, STAT_DEF, 9, AI_CV_DefenseUp2
 	if_random_less_than 100, AI_CV_DefenseUp3
 	score -1
 	goto AI_CV_DefenseUp3
 
-AI_CV_DefenseUp2: @ 82DCC0C
+AI_CV_DefenseUp2:
 	if_hp_not_equal AI_USER, 100, AI_CV_DefenseUp3
 	if_random_less_than 128, AI_CV_DefenseUp3
 	score +2
-AI_CV_DefenseUp3: @ 82DCC1B
+AI_CV_DefenseUp3:
 	if_hp_less_than AI_USER, 70, AI_CV_DefenseUp4
 	if_random_less_than 200, AI_CV_DefenseUp_End
-AI_CV_DefenseUp4: @ 82DCC28
+AI_CV_DefenseUp4:
 	if_hp_less_than AI_USER, 40, AI_CV_DefenseUp_ScoreDown2
 	get_last_used_bank_move AI_TARGET
 	get_move_power_from_result
@@ -932,14 +932,14 @@ AI_CV_DefenseUp4: @ 82DCC28
 	get_move_type_from_result
 	if_not_in_bytes AI_CV_DefenseUp_PhysicalTypes, AI_CV_DefenseUp_ScoreDown2
 	if_random_less_than 60, AI_CV_DefenseUp_End
-AI_CV_DefenseUp5: @ 82DCC4A
+AI_CV_DefenseUp5:
 	if_random_less_than 60, AI_CV_DefenseUp_End
-AI_CV_DefenseUp_ScoreDown2: @ 82DCC50
+AI_CV_DefenseUp_ScoreDown2:
 	score -2
-AI_CV_DefenseUp_End: @ 82DCC52
+AI_CV_DefenseUp_End:
 	end
 
-AI_CV_DefenseUp_PhysicalTypes: @ 82DCC53
+AI_CV_DefenseUp_PhysicalTypes:
     .byte TYPE_NORMAL
     .byte TYPE_FIGHTING
     .byte TYPE_POISON
@@ -951,50 +951,50 @@ AI_CV_DefenseUp_PhysicalTypes: @ 82DCC53
     .byte TYPE_STEEL
     .byte -1
 
-AI_CV_SpeedUp: @ 82DCC5D
+AI_CV_SpeedUp:
 	if_target_faster AI_CV_SpeedUp2
 	score -3
 	goto AI_CV_SpeedUp_End
 
-AI_CV_SpeedUp2: @ 82DCC6A
+AI_CV_SpeedUp2:
 	if_random_less_than 70, AI_CV_SpeedUp_End
 	score +3
-AI_CV_SpeedUp_End: @ 82DCC72
+AI_CV_SpeedUp_End:
 	end
 
-AI_CV_SpAtkUp: @ 82DCC73
+AI_CV_SpAtkUp:
 	if_stat_level_less_than AI_USER, STAT_SPATK, 9, AI_CV_SpAtkUp2
 	if_random_less_than 100, AI_CV_SpAtkUp3
 	score -1
 	goto AI_CV_SpAtkUp3
 
-AI_CV_SpAtkUp2: @ 82DCC88
+AI_CV_SpAtkUp2:
 	if_hp_not_equal AI_USER, 100, AI_CV_SpAtkUp3
 	if_random_less_than 128, AI_CV_SpAtkUp3
 	score +2
-AI_CV_SpAtkUp3: @ 82DCC97
+AI_CV_SpAtkUp3:
 	if_hp_more_than AI_USER, 70, AI_CV_SpAtkUp_End
 	if_hp_less_than AI_USER, 40, AI_CV_SpAtkUp_ScoreDown2
 	if_random_less_than 70, AI_CV_SpAtkUp_End
-AI_CV_SpAtkUp_ScoreDown2: @ 82DCCAB
+AI_CV_SpAtkUp_ScoreDown2:
 	score -2
-AI_CV_SpAtkUp_End: @ 82DCCAD
+AI_CV_SpAtkUp_End:
 	end
 
-AI_CV_SpDefUp: @ 82DCCAE
+AI_CV_SpDefUp:
 	if_stat_level_less_than AI_USER, STAT_SPDEF, 9, AI_CV_SpDefUp2
 	if_random_less_than 100, AI_CV_SpDefUp3
 	score -1
 	goto AI_CV_SpDefUp3
 
-AI_CV_SpDefUp2: @ 82DCCC3
+AI_CV_SpDefUp2:
 	if_hp_not_equal AI_USER, 100, AI_CV_SpDefUp3
 	if_random_less_than 128, AI_CV_SpDefUp3
 	score +2
-AI_CV_SpDefUp3: @ 82DCCD2
+AI_CV_SpDefUp3:
 	if_hp_less_than AI_USER, 70, AI_CV_SpDefUp4
 	if_random_less_than 200, AI_CV_SpDefUp_End
-AI_CV_SpDefUp4: @ 82DCCDF
+AI_CV_SpDefUp4:
 	if_hp_less_than AI_USER, 40, AI_CV_SpDefUp_ScoreDown2
 	get_last_used_bank_move AI_TARGET
 	get_move_power_from_result
@@ -1003,14 +1003,14 @@ AI_CV_SpDefUp4: @ 82DCCDF
 	get_move_type_from_result
 	if_in_bytes AI_CV_SpDefUp_PhysicalTypes, AI_CV_SpDefUp_ScoreDown2
 	if_random_less_than 60, AI_CV_SpDefUp_End
-AI_CV_SpDefUp5: @ 82DCD01
+AI_CV_SpDefUp5:
 	if_random_less_than 60, AI_CV_SpDefUp_End
-AI_CV_SpDefUp_ScoreDown2: @ 82DCD07
+AI_CV_SpDefUp_ScoreDown2:
 	score -2
-AI_CV_SpDefUp_End: @ 82DCD09
+AI_CV_SpDefUp_End:
 	end
 
-AI_CV_SpDefUp_PhysicalTypes: @ 82DCD0A
+AI_CV_SpDefUp_PhysicalTypes:
     .byte TYPE_NORMAL
     .byte TYPE_FIGHTING
     .byte TYPE_POISON
@@ -1085,26 +1085,26 @@ AI_CV_AlwaysHit2:
 AI_CV_AlwaysHit_End:
 	end
 
-AI_CV_AttackDown: @ 82DCDF8
+AI_CV_AttackDown:
 	if_stat_level_equal AI_TARGET, STAT_ATK, DEFAULT_STAT_STAGE, AI_CV_AttackDown3
 	score -1
 	if_hp_more_than AI_USER, 90, AI_CV_AttackDown2
 	score -1
-AI_CV_AttackDown2: @ 82DCE0B
+AI_CV_AttackDown2:
 	if_stat_level_more_than AI_TARGET, STAT_ATK, 3, AI_CV_AttackDown3
 	if_random_less_than 50, AI_CV_AttackDown3
 	score -2
-AI_CV_AttackDown3: @ 82DCE1B
+AI_CV_AttackDown3:
 	if_hp_more_than AI_TARGET, 70, AI_CV_AttackDown4
 	score -2
-AI_CV_AttackDown4: @ 82DCE24
+AI_CV_AttackDown4:
 	get_target_type1
 	if_in_bytes AI_CV_AttackDown_UnknownTypeList, AI_CV_AttackDown_End
 	get_target_type2
 	if_in_bytes AI_CV_AttackDown_UnknownTypeList, AI_CV_AttackDown_End
 	if_random_less_than 50, AI_CV_AttackDown_End
 	score -2
-AI_CV_AttackDown_End: @ 82DCE42
+AI_CV_AttackDown_End:
 	end
 
 AI_CV_AttackDown_UnknownTypeList:
@@ -1128,21 +1128,21 @@ AI_CV_DefenseDown3:
 AI_CV_DefenseDown_End:
 	end
 
-AI_CV_SpeedDownFromChance: @ 82DCE6B
+AI_CV_SpeedDownFromChance:
 	if_move MOVE_ICY_WIND, AI_CV_SpeedDown
 	if_move MOVE_ROCK_TOMB, AI_CV_SpeedDown
 	if_move MOVE_MUD_SHOT, AI_CV_SpeedDown
 	end
 
-AI_CV_SpeedDown: @ 82DCE81
+AI_CV_SpeedDown:
 	if_target_faster AI_CV_SpeedDown2
 	score -3
 	goto AI_CV_SpeedDown_End
 
-AI_CV_SpeedDown2: @ 82DCE8E
+AI_CV_SpeedDown2:
 	if_random_less_than 70, AI_CV_SpeedDown_End
 	score +2
-AI_CV_SpeedDown_End: @ 82DCE96
+AI_CV_SpeedDown_End:
 	end
 
 AI_CV_SpAtkDown:
@@ -1164,10 +1164,10 @@ AI_CV_SpAtkDown4:
 	if_in_bytes AI_CV_SpAtkDown_SpecialTypeList, AI_CV_SpAtkDown_End
 	if_random_less_than 50, AI_CV_SpAtkDown_End
 	score -2
-AI_CV_SpAtkDown_End: @ 82DCEE1
+AI_CV_SpAtkDown_End:
 	end
 
-AI_CV_SpAtkDown_SpecialTypeList: @ 82DCEE2
+AI_CV_SpAtkDown_SpecialTypeList:
     .byte TYPE_FIRE
     .byte TYPE_WATER
     .byte TYPE_GRASS
@@ -1178,19 +1178,19 @@ AI_CV_SpAtkDown_SpecialTypeList: @ 82DCEE2
     .byte TYPE_DARK
     .byte -1
 
-AI_CV_SpDefDown: @ 82DCEEB
+AI_CV_SpDefDown:
 	if_hp_less_than AI_USER, 70, AI_CV_SpDefDown2
 	if_stat_level_more_than AI_TARGET, STAT_SPDEF, 3, AI_CV_SpDefDown3
-AI_CV_SpDefDown2: @ 82DCEFA
+AI_CV_SpDefDown2:
 	if_random_less_than 50, AI_CV_SpDefDown3
 	score -2
-AI_CV_SpDefDown3: @ 82DCF02
+AI_CV_SpDefDown3:
 	if_hp_more_than AI_TARGET, 70, AI_CV_SpDefDown_End
 	score -2
-AI_CV_SpDefDown_End: @ 82DCF0B
+AI_CV_SpDefDown_End:
 	end
 
-AI_CV_AccuracyDown: @ 82DCF0C
+AI_CV_AccuracyDown:
 	if_hp_less_than AI_USER, 70, AI_CV_AccuracyDown2
 	if_hp_more_than AI_TARGET, 70, AI_CV_AccuracyDown3
 AI_CV_AccuracyDown2:
@@ -2949,7 +2949,7 @@ AI_HPAware_TargetTryToDiscourage:
 AI_HPAware_End:
 	end
 
-AI_HPAware_DiscouragedEffectsWhenHighHP: @ 82DE21F
+AI_HPAware_DiscouragedEffectsWhenHighHP:
     .byte EFFECT_EXPLOSION
     .byte EFFECT_RESTORE_HP
     .byte EFFECT_REST
@@ -2965,7 +2965,7 @@ AI_HPAware_DiscouragedEffectsWhenHighHP: @ 82DE21F
     .byte EFFECT_OVERHEAT
     .byte -1
 
-AI_HPAware_DiscouragedEffectsWhenMediumHP: @ 82DE22D
+AI_HPAware_DiscouragedEffectsWhenMediumHP:
     .byte EFFECT_EXPLOSION
     .byte EFFECT_ATTACK_UP
     .byte EFFECT_DEFENSE_UP
@@ -3010,7 +3010,7 @@ AI_HPAware_DiscouragedEffectsWhenMediumHP: @ 82DE22D
     .byte EFFECT_DRAGON_DANCE
     .byte -1
 
-AI_HPAware_DiscouragedEffectsWhenLowHP: @ 82DE258
+AI_HPAware_DiscouragedEffectsWhenLowHP:
     .byte EFFECT_ATTACK_UP
     .byte EFFECT_DEFENSE_UP
     .byte EFFECT_SPEED_UP
@@ -3060,10 +3060,10 @@ AI_HPAware_DiscouragedEffectsWhenLowHP: @ 82DE258
     .byte EFFECT_DRAGON_DANCE
     .byte -1
 
-AI_HPAware_DiscouragedEffectsWhenTargetHighHP: @ 82DE288
+AI_HPAware_DiscouragedEffectsWhenTargetHighHP:
     .byte -1
 
-AI_HPAware_DiscouragedEffectsWhenTargetMediumHP: @ 82DE289
+AI_HPAware_DiscouragedEffectsWhenTargetMediumHP:
     .byte EFFECT_ATTACK_UP
     .byte EFFECT_DEFENSE_UP
     .byte EFFECT_SPEED_UP
@@ -3105,7 +3105,7 @@ AI_HPAware_DiscouragedEffectsWhenTargetMediumHP: @ 82DE289
     .byte EFFECT_DRAGON_DANCE
     .byte -1
 
-AI_HPAware_DiscouragedEffectsWhenTargetLowHP: @ 82DE2B1
+AI_HPAware_DiscouragedEffectsWhenTargetLowHP:
     .byte EFFECT_SLEEP
     .byte EFFECT_EXPLOSION
     .byte EFFECT_ATTACK_UP
@@ -3178,7 +3178,7 @@ AI_TrySunnyDayStart:
 	is_first_turn_for AI_USER
 	if_equal FALSE, AI_TrySunnyDayStart_End
 	score +5
-AI_TrySunnyDayStart_End: @ 82DE308
+AI_TrySunnyDayStart_End:
 	end
 
 AI_Roaming:
@@ -3190,10 +3190,10 @@ AI_Roaming:
 	if_equal ABILITY_LEVITATE, AI_Roaming_Flee
 	get_ability AI_TARGET
 	if_equal ABILITY_ARENA_TRAP, AI_Roaming_End
-AI_Roaming_Flee: @ 82DE335
+AI_Roaming_Flee:
 	flee
 
-AI_Roaming_End: @ 82DE336
+AI_Roaming_End:
 	end
 
 AI_Safari:
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index e7aad6a93..83b1f3cea 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -3514,7 +3514,7 @@ Move_MEMENTO:
 	delay 48
 	playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER
 	waitforvisualfinish
-	createvisualtask sub_8114470, 2
+	createvisualtask AnimTask_MementoHandleBg, 2
 	delay 12
 	setalpha 0, 16
 	delay 1
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 1577765cd..951558234 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -16,7 +16,7 @@
 	.section script_data, "aw", %progbits
 	
 .align 2
-gBattleScriptsForMoveEffects:: @ 82D86A8
+gBattleScriptsForMoveEffects::
 	.4byte BattleScript_EffectHit                    @ EFFECT_HIT
 	.4byte BattleScript_EffectSleep                  @ EFFECT_SLEEP
 	.4byte BattleScript_EffectPoisonHit              @ EFFECT_POISON_HIT
@@ -1901,7 +1901,7 @@ BattleScript_EffectStomp::
 BattleScript_EffectSolarbeam::
 	jumpifabilitypresent ABILITY_CLOUD_NINE, BattleScript_SolarbeamDecideTurn
 	jumpifabilitypresent ABILITY_AIR_LOCK, BattleScript_SolarbeamDecideTurn
-	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT, BattleScript_SolarbeamOnFirstTurn
+	jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN, BattleScript_SolarbeamOnFirstTurn
 BattleScript_SolarbeamDecideTurn::
 	jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
 	jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
@@ -2828,7 +2828,7 @@ BattleScript_HandleFaintedMon::
 	atk24 BattleScript_HandleFaintedMonMultiple
 	jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd
 	jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonTryChooseAnother
-	jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonTryChooseAnother
+	jumpifword CMP_NO_COMMON_BITS, gHitMarker, HITMARKER_PLAYER_FAINTED, BattleScript_FaintedMonTryChooseAnother
 	printstring STRINGID_USENEXTPKMN
 	setbyte gBattleCommunication, 0
 	yesnobox
@@ -2843,7 +2843,7 @@ BattleScript_FaintedMonTryChooseAnother::
 	jumpifbattletype BATTLE_TYPE_RECORDED_LINK, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
-	jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
+	jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_PLAYER_FAINTED, BattleScript_FaintedMonChooseAnother
 	jumpifbyte CMP_EQUAL, sBATTLE_STYLE, OPTIONS_BATTLE_STYLE_SET, BattleScript_FaintedMonChooseAnother
 	jumpifcantswitch BS_PLAYER1, BattleScript_FaintedMonChooseAnother
 	printstring STRINGID_ENEMYABOUTTOSWITCHPKMN
@@ -2881,7 +2881,7 @@ BattleScript_FaintedMonChooseAnother::
 	hidepartystatussummary BS_FAINTED
 	switchinanim BS_FAINTED, FALSE
 	waitstate
-	various7 BS_ATTACKER
+	resetplayerfainted
 	switchineffects BS_FAINTED
 	jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonEnd
 	cancelallactions
@@ -3200,7 +3200,7 @@ BattleScript_DamagingWeatherLoop::
 	jumpifword CMP_EQUAL, gBattleMoveDamage, 0, BattleScript_DamagingWeatherLoopIncrement
 	printfromtable gSandStormHailDmgStringIds
 	waitmessage B_WAIT_TIME_LONG
-	orword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
+	orword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE
 	effectivenesssound
 	hitanimation BS_ATTACKER
 	healthbarupdate BS_ATTACKER
@@ -3212,7 +3212,7 @@ BattleScript_DamagingWeatherLoopIncrement::
 	addbyte gBattleCommunication, 1
 	jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_DamagingWeatherLoop
 BattleScript_DamagingWeatherContinuesEnd::
-	bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
+	bicword gHitMarker, HITMARKER_SKIP_DMG_TRACK | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_GRUDGE
 	end2
 
 BattleScript_SandStormHailEnds::
@@ -3256,7 +3256,7 @@ BattleScript_SafeguardEnds::
 
 BattleScript_LeechSeedTurnDrain::
 	playanimation BS_ATTACKER, B_ANIM_LEECH_SEED_DRAIN, sB_ANIM_ARG1
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
 	copyword gBattleMoveDamage, gHpDealt
@@ -3267,7 +3267,7 @@ BattleScript_LeechSeedTurnDrain::
 BattleScript_LeechSeedTurnPrintLiquidOoze::
 	setbyte cMULTISTRING_CHOOSER, B_MSG_LEECH_SEED_OOZE
 BattleScript_LeechSeedTurnPrintAndUpdateHp::
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_TARGET
 	datahpupdate BS_TARGET
 	printfromtable gLeechSeedStringIds
@@ -3371,14 +3371,14 @@ BattleScript_EncoredNoMore::
 BattleScript_DestinyBondTakesLife::
 	printstring STRINGID_PKMNTOOKFOE
 	waitmessage B_WAIT_TIME_LONG
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
 	tryfaintmon BS_ATTACKER, FALSE, NULL
 	return
 
 BattleScript_SpikesOnAttacker::
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
 	call BattleScript_PrintHurtBySpikes
@@ -3393,7 +3393,7 @@ BattleScript_SpikesOnAttackerFainted::
 	goto BattleScript_HandleFaintedMon
 
 BattleScript_SpikesOnTarget::
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_TARGET
 	datahpupdate BS_TARGET
 	call BattleScript_PrintHurtBySpikes
@@ -3408,7 +3408,7 @@ BattleScript_SpikesOnTargetFainted::
 	goto BattleScript_HandleFaintedMon
 
 BattleScript_SpikesOnFaintedBattler::
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_FAINTED
 	datahpupdate BS_FAINTED
 	call BattleScript_PrintHurtBySpikes
@@ -3430,7 +3430,7 @@ BattleScript_PrintHurtBySpikes::
 BattleScript_PerishSongTakesLife::
 	printstring STRINGID_PKMNPERISHCOUNTFELL
 	waitmessage B_WAIT_TIME_LONG
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
 	tryfaintmon BS_ATTACKER, FALSE, NULL
@@ -3662,7 +3662,7 @@ BattleScript_MagicCoatBounce::
 	pause B_WAIT_TIME_SHORT
 	printstring STRINGID_PKMNMOVEBOUNCED
 	waitmessage B_WAIT_TIME_LONG
-	orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
+	orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_ALLOW_NO_PP
 	setmagiccoattarget BS_ATTACKER
 	return
 
@@ -3673,7 +3673,7 @@ BattleScript_SnatchedMove::
 	playanimation BS_TARGET, B_ANIM_SNATCH_MOVE, NULL
 	printstring STRINGID_PKMNSNATCHEDMOVE
 	waitmessage B_WAIT_TIME_LONG
-	orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_x800000
+	orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_ALLOW_NO_PP
 	swapattackerwithtarget
 	return
 
@@ -3713,7 +3713,7 @@ BattleScript_MoveUsedIsAsleep::
 	goto BattleScript_MoveEnd
 
 BattleScript_MoveUsedWokeUp::
-	bicword gHitMarker, HITMARKER_x10
+	bicword gHitMarker, HITMARKER_WAKE_UP_CLEAR
 	printfromtable gWokeUpStringIds
 	waitmessage B_WAIT_TIME_LONG
 	updatestatusicon BS_ATTACKER
@@ -3731,7 +3731,7 @@ BattleScript_PoisonTurnDmg::
 BattleScript_DoStatusTurnDmg::
 	statusanimation BS_ATTACKER
 BattleScript_DoTurnDmg::
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
 	tryfaintmon BS_ATTACKER, FALSE, NULL
@@ -3798,7 +3798,7 @@ BattleScript_DoSelfConfusionDmg::
 	effectivenesssound
 	hitanimation BS_ATTACKER
 	waitstate
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
 	resultmessage
@@ -3931,7 +3931,7 @@ BattleScript_MoveEffectRecoil::
 	jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil
 	jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_RecoilEnd
 BattleScript_DoRecoil::
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
 	printstring STRINGID_PKMNHITWITHRECOIL
@@ -4174,7 +4174,7 @@ BattleScript_ColorChangeActivates::
 	return
 
 BattleScript_RoughSkinActivates::
-	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000
+	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
 	printstring STRINGID_PKMNHURTSWITH
@@ -4222,9 +4222,10 @@ BattleScript_IgnoresAndUsesRandomMove::
 	jumptocalledmove FALSE
 
 BattleScript_MoveUsedLoafingAround::
+	@ Skip ahead if not the Battle Palace message
 	jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_INCAPABLE_OF_POWER, BattleScript_MoveUsedLoafingAroundMsg
 	setbyte gBattleCommunication, 0
-	various24 BS_ATTACKER
+	palacetryescapestatus BS_ATTACKER
 	setbyte cMULTISTRING_CHOOSER, B_MSG_INCAPABLE_OF_POWER
 BattleScript_MoveUsedLoafingAroundMsg::
 	printfromtable gInobedientStringIds
@@ -4442,22 +4443,22 @@ BattleScript_ArenaTurnBeginning::
 	playse SE_ARENA_TIMEUP1
 	pause 8
 	playse SE_ARENA_TIMEUP1
-	various14 BS_ATTACKER
+	arenadrawreftextbox
 	arenajudgmentstring B_MSG_REF_COMMENCE_BATTLE
 	arenawaitmessage B_MSG_REF_COMMENCE_BATTLE
 	pause B_WAIT_TIME_LONG
-	various15 BS_ATTACKER
+	arenaerasereftextbox
 	volumeup
 	end2
 
 @ Unused
 BattleScript_ArenaNothingDecided::
 	playse SE_DING_DONG
-	various14 BS_ATTACKER
+	arenadrawreftextbox
 	arenajudgmentstring B_MSG_REF_NOTHING_IS_DECIDED
 	arenawaitmessage B_MSG_REF_NOTHING_IS_DECIDED
 	pause B_WAIT_TIME_LONG
-	various15 BS_ATTACKER
+	arenaerasereftextbox
 	end2
 
 BattleScript_ArenaDoJudgment::
@@ -4470,7 +4471,7 @@ BattleScript_ArenaDoJudgment::
 	pause 8
 	playse SE_ARENA_TIMEUP1
 	pause B_WAIT_TIME_LONG
-	various14 BS_ATTACKER
+	arenadrawreftextbox
 	arenajudgmentstring B_MSG_REF_THATS_IT
 	arenawaitmessage B_MSG_REF_THATS_IT
 	pause B_WAIT_TIME_LONG
@@ -4492,7 +4493,7 @@ BattleScript_ArenaDoJudgment::
 	arenajudgmentstring B_MSG_REF_PLAYER_WON
 	arenawaitmessage B_MSG_REF_PLAYER_WON
 	arenajudgmentwindow
-	various15 BS_ATTACKER
+	arenaerasereftextbox
 	printstring STRINGID_DEFEATEDOPPONENTBYREFEREE
 	waitmessage B_WAIT_TIME_LONG
 	playfaintcry BS_OPPONENT1
@@ -4506,7 +4507,7 @@ BattleScript_ArenaJudgmentPlayerLoses:
 	arenajudgmentstring B_MSG_REF_OPPONENT_WON
 	arenawaitmessage B_MSG_REF_OPPONENT_WON
 	arenajudgmentwindow
-	various15 BS_ATTACKER
+	arenaerasereftextbox
 	printstring STRINGID_LOSTTOOPPONENTBYREFEREE
 	waitmessage B_WAIT_TIME_LONG
 	playfaintcry BS_PLAYER1
@@ -4520,7 +4521,7 @@ BattleScript_ArenaJudgmentDraw:
 	arenajudgmentstring B_MSG_REF_DRAW
 	arenawaitmessage B_MSG_REF_DRAW
 	arenajudgmentwindow
-	various15 BS_ATTACKER
+	arenaerasereftextbox
 	printstring STRINGID_TIEDOPPONENTBYREFEREE
 	waitmessage B_WAIT_TIME_LONG
 	playfaintcry BS_PLAYER1
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
index 996048dd3..b7f0f693f 100644
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -12,7 +12,7 @@
 	.section script_data, "aw", %progbits
 
 	.align 2
-gBattlescriptsForBallThrow:: @ 82DBD08
+gBattlescriptsForBallThrow::
 	.4byte BattleScript_BallThrow        @ ITEM_NONE
 	.4byte BattleScript_BallThrow        @ ITEM_MASTER_BALL
 	.4byte BattleScript_BallThrow        @ ITEM_ULTRA_BALL
@@ -28,7 +28,7 @@ gBattlescriptsForBallThrow:: @ 82DBD08
 	.4byte BattleScript_BallThrow        @ ITEM_PREMIER_BALL
 
 	.align 2
-gBattlescriptsForUsingItem:: @ 82DBD3C
+gBattlescriptsForUsingItem::
 	.4byte BattleScript_PlayerUsesItem
 	.4byte BattleScript_OpponentUsesHealItem        @ AI_ITEM_FULL_RESTORE
 	.4byte BattleScript_OpponentUsesHealItem        @ AI_ITEM_HEAL_HP
@@ -37,11 +37,11 @@ gBattlescriptsForUsingItem:: @ 82DBD3C
 	.4byte BattleScript_OpponentUsesGuardSpec       @ AI_ITEM_GUARD_SPEC
 
 	.align 2
-gBattlescriptsForRunningByItem:: @ 82DBD54
+gBattlescriptsForRunningByItem::
 	.4byte BattleScript_RunByUsingItem
 
 	.align 2
-gBattlescriptsForSafariActions:: @ 82DBD58
+gBattlescriptsForSafariActions::
 	.4byte BattleScript_ActionWatchesCarefully
 	.4byte BattleScript_ActionGetNear
 	.4byte BattleScript_ActionThrowPokeblock
diff --git a/data/contest_ai_scripts.s b/data/contest_ai_scripts.s
index e47ccb4c8..ef4feb25f 100644
--- a/data/contest_ai_scripts.s
+++ b/data/contest_ai_scripts.s
@@ -13,7 +13,7 @@
 	enum MON_4
 
 	.align 2
-gContestAI_ScriptsTable:: @ 82DE350
+gContestAI_ScriptsTable::
 	.4byte AI_CheckBadMove      @ CONTEST_AI_CHECK_BAD_MOVE
 	.4byte AI_CheckCombo        @ CONTEST_AI_CHECK_COMBO
 	.4byte AI_CheckBoring       @ CONTEST_AI_CHECK_BORING
@@ -48,7 +48,7 @@ gContestAI_ScriptsTable:: @ 82DE350
 	.4byte AI_Nothing           @ CONTEST_AI_DUMMY_25
 
 
-@ Unused. Encourages improving condition on the 1st appeal, or startling mons if the users turn is later 
+@ Unused. Encourages improving condition on the 1st appeal, or startling mons if the users turn is later
 AI_CheckTiming:
 	if_appeal_num_not_eq 0, AI_CheckTiming_SkipCondition
 	if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, AI_CheckTiming_SkipCondition
@@ -388,7 +388,7 @@ AI_CGM_AppealAsGoodAsPrevOnes_Last:
 	score +20
 	end
 
-@ Encourages move more for each opponent who will have a turn before the user 
+@ Encourages move more for each opponent who will have a turn before the user
 AI_CGM_AppealAsGoodAsPrevOne:
 	if_user_order_eq MON_1, AI_CGM_AppealAsGoodAsPrevOne_1stUp
 	if_user_order_eq MON_2, AI_CGM_AppealAsGoodAsPrevOne_2ndUp
@@ -456,7 +456,7 @@ AI_CGM_BetterWhenAudienceExcited_Not1stUp:
 	score +10
 	end
 
-@ Encourage move more for each condition star the prev mons have 
+@ Encourage move more for each condition star the prev mons have
 AI_CGM_WorsenConditionOfPrevMons:
 	if_user_order_eq MON_1, AI_CGM_End
 	goto AI_CGM_WorsenConditionOfPrevMons_CheckMon1
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 432f1294d..852fa36d8 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -61,7 +61,7 @@
 @ 81DB67C
 	.include "data/script_cmd_table.inc"
 
-gSpecialVars:: @ 81DBA0C
+gSpecialVars::
 	.4byte gSpecialVar_0x8000
 	.4byte gSpecialVar_0x8001
 	.4byte gSpecialVar_0x8002
@@ -87,7 +87,7 @@ gSpecialVars:: @ 81DBA0C
 
 	.include "data/specials.inc"
 
-gStdScripts:: @ 81DC2A0
+gStdScripts::
 	.4byte Std_ObtainItem              @ STD_OBTAIN_ITEM
 	.4byte Std_FindItem                @ STD_FIND_ITEM
 	.4byte Std_MsgboxNPC               @ MSGBOX_NPC
@@ -99,7 +99,7 @@ gStdScripts:: @ 81DC2A0
 	.4byte Std_RegisteredInMatchCall   @ STD_REGISTER_MATCH_CALL
 	.4byte Std_MsgboxGetPoints         @ MSGBOX_GETPOINTS
 	.4byte Std_10
-gStdScripts_End:: @ 81DC2CC
+gStdScripts_End::
 
 	.include "data/maps/PetalburgCity/scripts.inc"
 	.include "data/maps/SlateportCity/scripts.inc"
@@ -576,12 +576,12 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/scripts/new_game.inc"
 	.include "data/scripts/hall_of_fame.inc"
 
-EventScript_WhiteOut:: @ 8271857
+EventScript_WhiteOut::
 	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
 	goto EventScript_ResetMrBriney
 	end
 
-EventScript_ResetMrBriney:: @ 8271862
+EventScript_ResetMrBriney::
 	compare VAR_BRINEY_LOCATION, 1
 	goto_if_eq EventScript_MoveMrBrineyToHouse
 	compare VAR_BRINEY_LOCATION, 2
@@ -590,7 +590,7 @@ EventScript_ResetMrBriney:: @ 8271862
 	goto_if_eq EventScript_MoveMrBrineyToRoute109
 	end
 
-EventScript_MoveMrBrineyToHouse:: @ 8271884
+EventScript_MoveMrBrineyToHouse::
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
@@ -600,7 +600,7 @@ EventScript_MoveMrBrineyToHouse:: @ 8271884
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	end
 
-EventScript_MoveMrBrineyToDewford:: @ 827189A
+EventScript_MoveMrBrineyToDewford::
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
@@ -611,7 +611,7 @@ EventScript_MoveMrBrineyToDewford:: @ 827189A
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	end
 
-EventScript_MoveMrBrineyToRoute109:: @ 82718B3
+EventScript_MoveMrBrineyToRoute109::
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
@@ -622,7 +622,7 @@ EventScript_MoveMrBrineyToRoute109:: @ 82718B3
 	clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	end
 
-EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC
+EverGrandeCity_HallOfFame_EventScript_ResetEliteFour::
 	clearflag FLAG_DEFEATED_ELITE_4_SIDNEY
 	clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	clearflag FLAG_DEFEATED_ELITE_4_GLACIA
@@ -630,7 +630,7 @@ EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC
 	setvar VAR_ELITE_4_STATE, 0
 	return
 
-Common_EventScript_UpdateBrineyLocation:: @ 82718DE
+Common_EventScript_UpdateBrineyLocation::
 	goto_if_unset FLAG_RECEIVED_POKENAV, Common_EventScript_NopReturn
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn
 	goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, EventScript_SetBrineyLocation_House
@@ -638,15 +638,15 @@ Common_EventScript_UpdateBrineyLocation:: @ 82718DE
 	goto_if_unset FLAG_HIDE_ROUTE_109_MR_BRINEY, EventScript_SetBrineyLocation_Route109
 	return
 
-EventScript_SetBrineyLocation_House:: @ 827190C
+EventScript_SetBrineyLocation_House::
 	setvar VAR_BRINEY_LOCATION, 1
 	return
 
-EventScript_SetBrineyLocation_Dewford:: @ 8271912
+EventScript_SetBrineyLocation_Dewford::
 	setvar VAR_BRINEY_LOCATION, 2
 	return
 
-EventScript_SetBrineyLocation_Route109:: @ 8271918
+EventScript_SetBrineyLocation_Route109::
 	setvar VAR_BRINEY_LOCATION, 3
 	return
 
@@ -656,32 +656,32 @@ EventScript_SetBrineyLocation_Route109:: @ 8271918
 	.include "data/scripts/pc.inc"
 
 @ scripts/notices.inc? signs.inc? See comment about text/notices.inc
-Common_EventScript_ShowPokemartSign:: @ 8271E6A
+Common_EventScript_ShowPokemartSign::
 	msgbox gText_PokemartSign, MSGBOX_SIGN
 	end
 
-Common_EventScript_ShowPokemonCenterSign:: @ 8271E73
+Common_EventScript_ShowPokemonCenterSign::
 	msgbox gText_PokemonCenterSign, MSGBOX_SIGN
 	end
 
-Common_ShowEasyChatScreen:: @ 8271E7C
+Common_ShowEasyChatScreen::
 	fadescreen FADE_TO_BLACK
 	special ShowEasyChatScreen
 	fadescreen FADE_FROM_BLACK
 	return
 
-Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84
+Common_EventScript_ReadyPetalburgGymForBattle::
 	clearflag FLAG_HIDE_PETALBURG_GYM_GREETER
 	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return
 
-Common_EventScript_BufferTrendyPhrase:: @ 8271E8B
+Common_EventScript_BufferTrendyPhrase::
 	dotimebasedevents
 	setvar VAR_0x8004, 0
 	special BufferTrendyPhraseString
 	return
 
-EventScript_BackupMrBrineyLocation:: @ 8271E95
+EventScript_BackupMrBrineyLocation::
 	copyvar VAR_0x8008, VAR_BRINEY_LOCATION
 	setvar VAR_BRINEY_LOCATION, 0
 	return
@@ -690,34 +690,34 @@ EventScript_BackupMrBrineyLocation:: @ 8271E95
 	.include "data/scripts/rival_graphics.inc"
 	.include "data/scripts/set_gym_trainers.inc"
 
-Common_EventScript_ShowBagIsFull:: @ 8272054
+Common_EventScript_ShowBagIsFull::
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	release
 	end
 
-Common_EventScript_BagIsFull:: @ 827205E
+Common_EventScript_BagIsFull::
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	return
 
-Common_EventScript_ShowNoRoomForDecor:: @ 8272067
+Common_EventScript_ShowNoRoomForDecor::
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	release
 	end
 
-Common_EventScript_NoRoomForDecor:: @ 8272071
+Common_EventScript_NoRoomForDecor::
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	return
 
-Common_EventScript_SetAbnormalWeather:: @ 827207A
+Common_EventScript_SetAbnormalWeather::
 	setweather WEATHER_ABNORMAL
 	return
 
-Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
+Common_EventScript_PlayGymBadgeFanfare::
 	playfanfare MUS_OBTAIN_BADGE
 	waitfanfare
 	return
 
-Common_EventScript_OutOfCenterPartyHeal:: @ 8272083
+Common_EventScript_OutOfCenterPartyHeal::
 	fadescreen FADE_TO_BLACK
 	playfanfare MUS_HEAL
 	waitfanfare
@@ -725,7 +725,7 @@ Common_EventScript_OutOfCenterPartyHeal:: @ 8272083
 	fadescreen FADE_FROM_BLACK
 	return
 
-EventScript_RegionMap:: @ 827208F
+EventScript_RegionMap::
 	lockall
 	msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT
 	fadescreen FADE_TO_BLACK
@@ -734,12 +734,12 @@ EventScript_RegionMap:: @ 827208F
 	releaseall
 	end
 
-Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0
+Common_EventScript_PlayBrineysBoatMusic::
 	setflag FLAG_DONT_TRANSITION_MUSIC
 	playbgm MUS_SAILING, FALSE
 	return
 
-Common_EventScript_StopBrineysBoatMusic:: @ 82720A8
+Common_EventScript_StopBrineysBoatMusic::
 	clearflag FLAG_DONT_TRANSITION_MUSIC
 	fadedefaultbgm
 	return
@@ -747,13 +747,13 @@ Common_EventScript_StopBrineysBoatMusic:: @ 82720A8
 	.include "data/scripts/prof_birch.inc"
 
 @ Below could be split as ferry.inc aside from the Rusturf tunnel script
-Common_EventScript_FerryDepart:: @ 82721E2
+Common_EventScript_FerryDepart::
 	delay 60
 	applymovement VAR_0x8004, Movement_FerryDepart
 	waitmovement 0
 	return
 
-Movement_FerryDepart: @ 82721F0
+Movement_FerryDepart:
 	walk_slow_right
 	walk_slow_right
 	walk_slow_right
@@ -763,7 +763,7 @@ Movement_FerryDepart: @ 82721F0
 	walk_right
 	step_end
 
-EventScript_HideMrBriney:: @ 82721F8
+EventScript_HideMrBriney::
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
@@ -775,7 +775,7 @@ EventScript_HideMrBriney:: @ 82721F8
 	setvar VAR_BRINEY_LOCATION, 0
 	return
 
-RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216
+RusturfTunnel_EventScript_SetRusturfTunnelOpen::
 	removeobject LOCALID_WANDAS_BF
 	removeobject LOCALID_WANDA
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND
@@ -784,7 +784,7 @@ RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216
 	setflag FLAG_RUSTURF_TUNNEL_OPENED
 	return
 
-EventScript_UnusedBoardFerry:: @ 827222B
+EventScript_UnusedBoardFerry::
 	delay 30
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
@@ -795,11 +795,11 @@ EventScript_UnusedBoardFerry:: @ 827222B
 	delay 30
 	return
 
-Movement_UnusedBoardFerry: @ 827224E
+Movement_UnusedBoardFerry:
 	walk_up
 	step_end
 
-Common_EventScript_FerryDepartIsland:: @ 8272250
+Common_EventScript_FerryDepartIsland::
 	compare VAR_FACING, DIR_SOUTH
 	call_if_eq Ferry_EventScript_DepartIslandSouth
 	compare VAR_FACING, DIR_WEST
@@ -812,13 +812,13 @@ Common_EventScript_FerryDepartIsland:: @ 8272250
 	.include "data/scripts/cave_of_origin.inc"
 	.include "data/scripts/kecleon.inc"
 
-Common_EventScript_NameReceivedPartyMon:: @ 82723DD
+Common_EventScript_NameReceivedPartyMon::
 	fadescreen FADE_TO_BLACK
 	special ChangePokemonNickname
 	waitstate
 	return
 
-Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4
+Common_EventScript_PlayerHandedOverTheItem::
 	bufferitemname 0, VAR_0x8004
 	playfanfare MUS_OBTAIN_TMHM
 	message gText_PlayerHandedOverTheItem
@@ -837,32 +837,32 @@ Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4
 	.include "data/text/obtain_item.inc"
 
 @ The below and surf.inc could be split into some text/notices.inc
-gText_PokemartSign:: @ 8272B6A
+gText_PokemartSign::
 	.string "“Selected items for your convenience!”\n"
 	.string "POKéMON MART$"
 
-gText_PokemonCenterSign:: @ 8272B9E
+gText_PokemonCenterSign::
 	.string "“Rejuvenate your tired partners!”\n"
 	.string "POKéMON CENTER$"
 
-gText_MomOrDadMightLikeThisProgram:: @ 8272BCF
+gText_MomOrDadMightLikeThisProgram::
 	.string "{STR_VAR_1} might like this program.\n"
 	.string "… … … … … … … … … … … … … … … …\p"
 	.string "Better get going!$"
 
-gText_WhichFloorWouldYouLike:: @ 8272C1D
+gText_WhichFloorWouldYouLike::
 	.string "Welcome to LILYCOVE DEPARTMENT STORE.\p"
 	.string "Which floor would you like?$"
 
-gText_SandstormIsVicious:: @ 8272C5F
+gText_SandstormIsVicious::
 	.string "The sandstorm is vicious.\n"
 	.string "It's impossible to keep going.$"
 
-gText_SelectWithoutRegisteredItem:: @ 8272C98
+gText_SelectWithoutRegisteredItem::
 	.string "An item in the BAG can be\n"
 	.string "registered to SELECT for easy use.$"
 
-gText_PokemonTrainerSchoolEmail:: @ 8272CD5
+gText_PokemonTrainerSchoolEmail::
 	.string "There's an e-mail from POKéMON TRAINER\n"
 	.string "SCHOOL.\p"
 	.string "… … … … … …\p"
@@ -871,25 +871,25 @@ gText_PokemonTrainerSchoolEmail:: @ 8272CD5
 	.string "move sets chosen for POKéMON.\p"
 	.string "… … … … … …$"
 
-gText_PlayerHouseBootPC:: @ 8272D87
+gText_PlayerHouseBootPC::
 	.string "{PLAYER} booted up the PC.$"
 
-gText_PokeblockLinkCanceled:: @ 8272D9C
+gText_PokeblockLinkCanceled::
 	.string "The link was canceled.$"
 
-gText_UnusedNicknameReceivedPokemon:: @ 8272DB3
+gText_UnusedNicknameReceivedPokemon::
 	.string "Want to give a nickname to\n"
 	.string "the {STR_VAR_2} you received?$"
 
-gText_PlayerWhitedOut:: @ 8272DE3
+gText_PlayerWhitedOut::
 	.string "{PLAYER} is out of usable\n"
 	.string "POKéMON!\p{PLAYER} whited out!$"
 
-gText_RegisteredTrainerinPokeNav:: @ 8272E0F
+gText_RegisteredTrainerinPokeNav::
 	.string "Registered {STR_VAR_1} {STR_VAR_2}\n"
 	.string "in the POKéNAV.$"
 
-gText_ComeBackWithSecretPower:: @ 8272E30
+gText_ComeBackWithSecretPower::
 	.string "Do you know the TM SECRET POWER?\p"
 	.string "Our group, we love the TM SECRET\n"
 	.string "POWER.\p"
@@ -898,7 +898,7 @@ gText_ComeBackWithSecretPower:: @ 8272E30
 	.string "We'll accept you as a member and sell\n"
 	.string "you good stuff in secrecy.$"
 
-gText_PokerusExplanation:: @ 8272F07
+gText_PokerusExplanation::
 	.string "Your POKéMON may be infected with\n"
 	.string "POKéRUS.\p"
 	.string "Little is known about the POKéRUS\n"
@@ -909,94 +909,94 @@ gText_PokerusExplanation:: @ 8272F07
 
 	.include "data/text/surf.inc"
 
-gText_DoorOpenedFarAway:: @ 827301B
+gText_DoorOpenedFarAway::
 	.string "It sounded as if a door opened\n"
 	.string "somewhere far away.$"
 
-gText_BigHoleInTheWall:: @ 827304E
+gText_BigHoleInTheWall::
 	.string "There is a big hole in the wall.$"
 
-gText_SorryWirelessClubAdjustments:: @ 827306F
+gText_SorryWirelessClubAdjustments::
 	.string "I'm terribly sorry.\n"
 	.string "The POKéMON WIRELESS CLUB is\l"
 	.string "undergoing adjustments now.$"
 
-gText_UndergoingAdjustments:: @ 82730BC
+gText_UndergoingAdjustments::
 	.string "It appears to be undergoing\n"
 	.string "adjustments…$"
 
 @ Unused
-gText_SorryTradeCenterInspections:: @ 82730E5
+gText_SorryTradeCenterInspections::
 	.string "I'm terribly sorry. The TRADE CENTER\n"
 	.string "is undergoing inspections.$"
 
 @ Unused
-gText_SorryRecordCornerPreparation:: @ 8273125
+gText_SorryRecordCornerPreparation::
 	.string "I'm terribly sorry. The RECORD CORNER\n"
 	.string "is under preparation.$"
 
-gText_PlayerHandedOverTheItem:: @ 8273161
+gText_PlayerHandedOverTheItem::
 	.string "{PLAYER} handed over the\n"
 	.string "{STR_VAR_1}.$"
 
-gText_ThankYouForAccessingMysteryGift:: @ 8273178
+gText_ThankYouForAccessingMysteryGift::
 	.string "Thank you for accessing the\n"
 	.string "MYSTERY GIFT System.$"
 
-gText_PlayerFoundOneTMHM:: @ 82731A9
+gText_PlayerFoundOneTMHM::
 	.string "{PLAYER} found one {STR_VAR_1}\n"
 	.string "{STR_VAR_2}!$"
 
-gText_Sudowoodo_Attacked:: @ 82731BD
+gText_Sudowoodo_Attacked::
 	.string "The weird tree doesn't like the\n"
 	.string "WAILMER PAIL!\p"
 	.string "The weird tree attacked!$"
 
-gText_LegendaryFlewAway:: @ 8273204
+gText_LegendaryFlewAway::
 	.string "The {STR_VAR_1} flew away!$"
 
 	.include "data/text/pc_transfer.inc"
 	.include "data/text/mevent.inc"
 	.include "data/text/abnormal_weather.inc"
 
-EventScript_SelectWithoutRegisteredItem:: @ 82736B3
+EventScript_SelectWithoutRegisteredItem::
 	msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN
 	end
 
 	.include "data/scripts/field_poison.inc"
 
-Common_EventScript_NopReturn:: @ 827374E
+Common_EventScript_NopReturn::
 	return
 
 @ Unused
-EventScript_CableClub_SetVarResult1:: @ 827374F
+EventScript_CableClub_SetVarResult1::
 	setvar VAR_RESULT, 1
 	return
 
-EventScript_CableClub_SetVarResult0:: @ 8273755
+EventScript_CableClub_SetVarResult0::
 	setvar VAR_RESULT, 0
 	return
 
-Common_EventScript_UnionRoomAttendant:: @ 827375B
+Common_EventScript_UnionRoomAttendant::
 	call CableClub_EventScript_UnionRoomAttendant
 	end
 
-Common_EventScript_WirelessClubAttendant:: @ 8273761
+Common_EventScript_WirelessClubAttendant::
 	call CableClub_EventScript_WirelessClubAttendant
 	end
 
-Common_EventScript_DirectCornerAttendant:: @ 8273767
+Common_EventScript_DirectCornerAttendant::
 	call CableClub_EventScript_DirectCornerAttendant
 	end
 
-Common_EventScript_RemoveStaticPokemon:: @ 827376D
+Common_EventScript_RemoveStaticPokemon::
 	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject VAR_LAST_TALKED
 	fadescreenswapbuffers FADE_FROM_BLACK
 	release
 	end
 
-Common_EventScript_LegendaryFlewAway:: @ 8273776
+Common_EventScript_LegendaryFlewAway::
 	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject VAR_LAST_TALKED
 	fadescreenswapbuffers FADE_FROM_BLACK
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index c57f19a04..1c97da8fe 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -4,7 +4,7 @@
 	.section script_data, "aw", %progbits
 
 	.align 2
-gFieldEffectScriptPointers:: @ 82DB9D4
+gFieldEffectScriptPointers::
 	.4byte gFieldEffectScript_ExclamationMarkIcon1      @ FLDEFF_EXCLAMATION_MARK_ICON
 	.4byte gFieldEffectScript_UseCutOnTallGrass         @ FLDEFF_USE_CUT_ON_GRASS
 	.4byte gFieldEffectScript_UseCutOnTree              @ FLDEFF_USE_CUT_ON_TREE
@@ -73,273 +73,273 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_DestroyDeoxysRock         @ FLDEFF_DESTROY_DEOXYS_ROCK
 	.4byte gFieldEffectScript_MoveDeoxysRock            @ FLDEFF_MOVE_DEOXYS_ROCK
 
-gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
+gFieldEffectScript_ExclamationMarkIcon1::
 	field_eff_callnative FldEff_ExclamationMarkIcon
 	field_eff_end
 
-gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6
+gFieldEffectScript_UseCutOnTallGrass::
 	field_eff_callnative FldEff_UseCutOnGrass
 	field_eff_end
 
-gFieldEffectScript_UseCutOnTree:: @ 82DBAEC
+gFieldEffectScript_UseCutOnTree::
 	field_eff_callnative FldEff_UseCutOnTree
 	field_eff_end
 
-gFieldEffectScript_Shadow:: @ 82DBAF2
+gFieldEffectScript_Shadow::
 	field_eff_callnative FldEff_Shadow
 	field_eff_end
 
-gFieldEffectScript_TallGrass:: @ 82DBAF8
+gFieldEffectScript_TallGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_TallGrass
 	field_eff_end
 
-gFieldEffectScript_Ripple:: @ 82DBB02
+gFieldEffectScript_Ripple::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ripple
 	field_eff_end
 
-gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
+gFieldEffectScript_FieldMoveShowMon::
 	field_eff_callnative FldEff_FieldMoveShowMon
 	field_eff_end
 
-gFieldEffectScript_Ash:: @ 82DBB12
+gFieldEffectScript_Ash::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ash
 	field_eff_end
 
-gFieldEffectScript_SurfBlob:: @ 82DBB1C
+gFieldEffectScript_SurfBlob::
 	field_eff_callnative FldEff_SurfBlob
 	field_eff_end
 
-gFieldEffectScript_UseSurf:: @ 82DBB22
+gFieldEffectScript_UseSurf::
 	field_eff_callnative FldEff_UseSurf
 	field_eff_end
 
-gFieldEffectScript_GroundImpactDust:: @ 82DBB28
+gFieldEffectScript_GroundImpactDust::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Dust
 	field_eff_end
 
-gFieldEffectScript_UseSecretPowerCave:: @ 82DBB32
+gFieldEffectScript_UseSecretPowerCave::
 	field_eff_callnative FldEff_UseSecretPowerCave
 	field_eff_end
 
-gFieldEffectScript_JumpTallGrass:: @ 82DBB38
+gFieldEffectScript_JumpTallGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpTallGrass
 	field_eff_end
 
-gFieldEffectScript_SandFootprints:: @ 82DBB42
+gFieldEffectScript_SandFootprints::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints
 	field_eff_end
 
-gFieldEffectScript_JumpBigSplash:: @ 82DBB4C
+gFieldEffectScript_JumpBigSplash::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash
 	field_eff_end
 
-gFieldEffectScript_Splash:: @ 82DBB56
+gFieldEffectScript_Splash::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Splash
 	field_eff_end
 
-gFieldEffectScript_JumpSmallSplash:: @ 82DBB60
+gFieldEffectScript_JumpSmallSplash::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpSmallSplash
 	field_eff_end
 
-gFieldEffectScript_LongGrass:: @ 82DBB6A
+gFieldEffectScript_LongGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_LongGrass
 	field_eff_end
 
-gFieldEffectScript_JumpLongGrass:: @ 82DBB74
+gFieldEffectScript_JumpLongGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass
 	field_eff_end
 
-gFieldEffectScript_UnusedGrass:: @ 82DBB7E
+gFieldEffectScript_UnusedGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass
 	field_eff_end
 
-gFieldEffectScript_UnusedGrass2:: @ 82DBB88
+gFieldEffectScript_UnusedGrass2::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass2
 	field_eff_end
 
-gFieldEffectScript_UnusedSand:: @ 82DBB92
+gFieldEffectScript_UnusedSand::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_UnusedSand
 	field_eff_end
 
-gFieldEffectScript_WaterSurfacing:: @ 82DBB9C
+gFieldEffectScript_WaterSurfacing::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_WaterSurfacing
 	field_eff_end
 
-gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6
+gFieldEffectScript_BerryTreeGrowthSparkle::
 	field_eff_callnative FldEff_BerryTreeGrowthSparkle
 	field_eff_end
 
-gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC
+gFieldEffectScript_DeepSandFootprints::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_DeepSandFootprints
 	field_eff_end
 
-gFieldEffectScript_PokeCenterHeal:: @ 82DBBB6
+gFieldEffectScript_PokeCenterHeal::
 	field_eff_loadfadedpal gSpritePalette_PokeballGlow
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal
 	field_eff_end
 
-gFieldEffectScript_UseSecretPowerTree:: @ 82DBBC5
+gFieldEffectScript_UseSecretPowerTree::
 	field_eff_callnative FldEff_UseSecretPowerTree
 	field_eff_end
 
-gFieldEffectScript_UseSecretPowerShrub:: @ 82DBBCB
+gFieldEffectScript_UseSecretPowerShrub::
 	field_eff_callnative FldEff_UseSecretPowerShrub
 	field_eff_end
 
-gFieldEffectScript_TreeDisguise:: @ 82DBBD1
+gFieldEffectScript_TreeDisguise::
 	field_eff_callnative ShowTreeDisguiseFieldEffect
 	field_eff_end
 
-gFieldEffectScript_MountainDisguise:: @ 82DBBD7
+gFieldEffectScript_MountainDisguise::
 	field_eff_callnative ShowMountainDisguiseFieldEffect
 	field_eff_end
 
-gFieldEffectScript_NPCUseFly:: @ 82DBBDD
+gFieldEffectScript_NPCUseFly::
 	field_eff_callnative FldEff_NPCFlyOut
 	field_eff_end
 
-gFieldEffectScript_UseFly:: @ 82DBBE3
+gFieldEffectScript_UseFly::
 	field_eff_callnative FldEff_UseFly
 	field_eff_end
 
-gFieldEffectScript_FlyIn:: @ 82DBBE9
+gFieldEffectScript_FlyIn::
 	field_eff_callnative FldEff_FlyIn
 	field_eff_end
 
-gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
+gFieldEffectScript_QuestionMarkIcon::
 	field_eff_callnative FldEff_QuestionMarkIcon
 	field_eff_end
 
-gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
+gFieldEffectScript_FeetInFlowingWater::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_FeetInFlowingWater
 	field_eff_end
 
-gFieldEffectScript_BikeTireTracks:: @ 82DBBFF
+gFieldEffectScript_BikeTireTracks::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks
 	field_eff_end
 
-gFieldEffectScript_SandDisguisePlaceholder:: @ 82DBC09
+gFieldEffectScript_SandDisguisePlaceholder::
 	field_eff_callnative ShowSandDisguiseFieldEffect
 	field_eff_end
 
-gFieldEffectScript_UseRockSmash:: @ 82DBC0F
+gFieldEffectScript_UseRockSmash::
 	field_eff_callnative FldEff_UseRockSmash
 	field_eff_end
 
-gFieldEffectScript_UseStrength:: @ 82DBC15
+gFieldEffectScript_UseStrength::
 	field_eff_callnative FldEff_UseStrength
 	field_eff_end
 
-gFieldEffectScript_UseDig:: @ 82DBC1B
+gFieldEffectScript_UseDig::
 	field_eff_callnative FldEff_UseDig
 	field_eff_end
 
-gFieldEffectScript_SandPile:: @ 82DBC21
+gFieldEffectScript_SandPile::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandPile
 	field_eff_end
 
-gFieldEffectScript_ShortGrass:: @ 82DBC2B
+gFieldEffectScript_ShortGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShortGrass
 	field_eff_end
 
-gFieldEffectScript_HotSpringsWater:: @ 82DBC35
+gFieldEffectScript_HotSpringsWater::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_HotSpringsWater
 	field_eff_end
 
-gFieldEffectScript_UseWaterfall:: @ 82DBC3F
+gFieldEffectScript_UseWaterfall::
 	field_eff_callnative FldEff_UseWaterfall
 	field_eff_end
 
-gFieldEffectScript_UseDive:: @ 82DBC45
+gFieldEffectScript_UseDive::
 	field_eff_callnative FldEff_UseDive
 	field_eff_end
 
-gFieldEffectScript_Pokeball:: @ 82DBC4B
+gFieldEffectScript_Pokeball::
 	field_eff_loadpal gSpritePalette_Pokeball
 	field_eff_callnative FldEff_Pokeball
 	field_eff_end
 
-gFieldEffectScript_HeartIcon:: @ 82DBC56
+gFieldEffectScript_HeartIcon::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_HeartIcon
 	field_eff_end
 
-gFieldEffectScript_Nop47:: @ 82DBC60
+gFieldEffectScript_Nop47::
 	field_eff_callnative FldEff_Nop47
 	field_eff_end
 
-gFieldEffectScript_Nop48:: @ 82DBC66
+gFieldEffectScript_Nop48::
 	field_eff_callnative FldEff_Nop48
 	field_eff_end
 
-gFieldEffectScript_AshPuff:: @ 82DBC6C
+gFieldEffectScript_AshPuff::
 	field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshPuff
 	field_eff_end
 
-gFieldEffectScript_AshLaunch:: @ 82DBC76
+gFieldEffectScript_AshLaunch::
 	field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshLaunch
 	field_eff_end
 
-gFieldEffectScript_SweetScent:: @ 82DBC80
+gFieldEffectScript_SweetScent::
 	field_eff_callnative FldEff_SweetScent
 	field_eff_end
 
-gFieldEffectScript_SandPillar:: @ 82DBC86
+gFieldEffectScript_SandPillar::
 	field_eff_loadfadedpal_callnative gSpritePalette_SandPillar, FldEff_SandPillar
 	field_eff_end
 
-gFieldEffectScript_Bubbles:: @ 82DBC90
+gFieldEffectScript_Bubbles::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Bubbles
 	field_eff_end
 
-gFieldEffectScript_Sparkle:: @ 82DBC9A
+gFieldEffectScript_Sparkle::
 	field_eff_loadfadedpal_callnative gSpritePalette_SmallSparkle, FldEff_Sparkle
 	field_eff_end
 
-gFieldEffectScript_ShowSecretPowerCave:: @ 82DBCA4
+gFieldEffectScript_ShowSecretPowerCave::
 	field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Cave, FldEff_SecretPowerCave
 	field_eff_end
 
-gFieldEffectScript_ShowSecretPowerTree:: @ 82DBCAE
+gFieldEffectScript_ShowSecretPowerTree::
 	field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerTree
 	field_eff_end
 
-gFieldEffectScript_ShowSecretPowerShrub:: @ 82DBCB8
+gFieldEffectScript_ShowSecretPowerShrub::
 	field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerShrub
 	field_eff_end
 
-gFieldEffectScript_ShowCutGrass:: @ 82DBCC2
+gFieldEffectScript_ShowCutGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_CutGrass, FldEff_CutGrass
 	field_eff_end
 
-gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
+gFieldEffectScript_FieldMoveShowMonInit::
 	field_eff_callnative FldEff_FieldMoveShowMonInit
 	field_eff_end
 
-gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2
+gFieldEffectScript_UsePuzzleEffect::
 	field_eff_callnative FldEff_UsePuzzleEffect
 	field_eff_end
 
-gFieldEffectScript_SecretBaseBootPC:: @ 82DBCD8
+gFieldEffectScript_SecretBaseBootPC::
 	field_eff_callnative FldEff_SecretBasePCTurnOn
 	field_eff_end
 
-gFieldEffectScript_HallOfFameRecord:: @ 82DBCDE
+gFieldEffectScript_HallOfFameRecord::
 	field_eff_loadfadedpal gSpritePalette_PokeballGlow
 	field_eff_loadfadedpal_callnative gSpritePalette_HofMonitor, FldEff_HallOfFameRecord
 	field_eff_end
 
-gFieldEffectScript_UseTeleport:: @ 82DBCED
+gFieldEffectScript_UseTeleport::
 	field_eff_callnative FldEff_UseTeleport
 	field_eff_end
 
-gFieldEffectScript_RayquazaSpotlight:: @ 82DBCF3
+gFieldEffectScript_RayquazaSpotlight::
 	field_eff_callnative FldEff_RayquazaSpotlight
 	field_eff_end
 
-gFieldEffectScript_DestroyDeoxysRock:: @ 82DBCF9
+gFieldEffectScript_DestroyDeoxysRock::
 	field_eff_callnative FldEff_DestroyDeoxysRock
 	field_eff_end
 
-gFieldEffectScript_MoveDeoxysRock:: @ 82DBCFF
+gFieldEffectScript_MoveDeoxysRock::
 	field_eff_callnative FldEff_MoveDeoxysRock
 	field_eff_end
diff --git a/data/fonts.s b/data/fonts.s
index facc882ac..928372481 100644
--- a/data/fonts.s
+++ b/data/fonts.s
@@ -4,73 +4,73 @@
 	.section .rodata
 
 	.align 2
-gFont8LatinGlyphs:: @ 862BAE4
+gFont8LatinGlyphs::
 	.incbin "graphics/fonts/font8.latfont"
 
 	.align 2
-gFont8LatinGlyphWidths:: @ 8633AE4
+gFont8LatinGlyphWidths::
 	.include "graphics/fonts/font8_latin_widths.inc"
 
 	.align 2
-gFont0LatinGlyphs:: @ 8633CE4
+gFont0LatinGlyphs::
 	.incbin "graphics/fonts/font0.latfont"
 
 	.align 2
-gFont0LatinGlyphWidths:: @ 863BCE4
+gFont0LatinGlyphWidths::
 	.include "graphics/fonts/font0_latin_widths.inc"
 
 	.align 2
-gFont7LatinGlyphs:: @ 863BEE4
+gFont7LatinGlyphs::
 	.incbin "graphics/fonts/font7.latfont"
 
 	.align 2
-gFont7LatinGlyphWidths:: @ 8643EE4
+gFont7LatinGlyphWidths::
 	.include "graphics/fonts/font7_latin_widths.inc"
 
 	.align 2
-gFont2LatinGlyphs:: @ 86440E4
+gFont2LatinGlyphs::
 	.incbin "graphics/fonts/font2.latfont"
 
 	.align 2
-gFont2LatinGlyphWidths:: @ 864C0E4
+gFont2LatinGlyphWidths::
 	.include "graphics/fonts/font2_latin_widths.inc"
 
 	.align 2
-gFont1LatinGlyphs:: @ 864C2E4
+gFont1LatinGlyphs::
 	.incbin "graphics/fonts/font1.latfont"
 
 	.align 2
-gFont1LatinGlyphWidths:: @ 86542E4
+gFont1LatinGlyphWidths::
 	.include "graphics/fonts/font1_latin_widths.inc"
 
 	.align 2
-gFont0JapaneseGlyphs:: @ 86544E4
+gFont0JapaneseGlyphs::
 	.incbin "graphics/fonts/font0.hwjpnfont"
 
 	.align 2
-gFont1JapaneseGlyphs:: @ 86584E4
+gFont1JapaneseGlyphs::
 	.incbin "graphics/fonts/font1.hwjpnfont"
 
 	.align 2
-gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs:: @ 865C4E4
+gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs::
 	.incbin "graphics/fonts/unused_frlg_male.fwjpnfont"
 
 	.align 2
-gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths:: @ 86644E4
+gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths::
 	.include "graphics/fonts/unused_japanese_frlg_male_font_widths.inc"
 
 	.align 2
-gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs:: @ 86646E4
+gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs::
 	.incbin "graphics/fonts/unused_frlg_female.fwjpnfont"
 
 	.align 2
-gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: @ 866C6E4
+gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths::
 	.include "graphics/fonts/unused_japanese_frlg_female_font_widths.inc"
 
 	.align 2
-gFont2JapaneseGlyphs:: @ 866C8E4
+gFont2JapaneseGlyphs::
 	.incbin "graphics/fonts/font2.fwjpnfont"
 
 	.align 2
-gFont2JapaneseGlyphWidths:: @ 86748E4
+gFont2JapaneseGlyphWidths::
 	.include "graphics/fonts/font2_japanese_widths.inc"
diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
index 139701edb..99dfa7bd8 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
@@ -1,7 +1,7 @@
-AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1
+AbandonedShip_CaptainsOffice_MapScripts::
 	.byte 0
 
-AbandonedShip_CaptainsOffice_EventScript_CaptSternAide:: @ 82387E2
+AbandonedShip_CaptainsOffice_EventScript_CaptSternAide::
 	lock
 	faceplayer
 	goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
@@ -13,30 +13,30 @@ AbandonedShip_CaptainsOffice_EventScript_CaptSternAide:: @ 82387E2
 	release
 	end
 
-AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner:: @ 8238810
+AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner::
 	msgbox AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner, MSGBOX_DEFAULT
 	release
 	end
 
-AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus:: @ 823881A
+AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus::
 	msgbox AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus, MSGBOX_DEFAULT
 	release
 	end
 
-AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner: @ 8238824
+AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner:
 	.string "I'm investigating this ship on behalf\n"
 	.string "of CAPT. STERN.\p"
 	.string "He also asked me to find a SCANNER,\n"
 	.string "but I haven't had any success…$"
 
-AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner: @ 823889D
+AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner:
 	.string "Oh! That's a SCANNER!\p"
 	.string "Listen, can I get you to deliver that\n"
 	.string "to CAPT. STERN?\p"
 	.string "I want to investigate this ship a\n"
 	.string "little more.$"
 
-AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus: @ 8238918
+AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus:
 	.string "This ship is called S.S. CACTUS.\n"
 	.string "It seems to be from an earlier era.$"
 
diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
index a954ee119..2c850d1fd 100644
--- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
@@ -1,26 +1,26 @@
-AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4
+AbandonedShip_Corridors_1F_MapScripts::
 	.byte 0
 
-AbandonedShip_Corridors_1F_EventScript_Youngster:: @ 82379A5
+AbandonedShip_Corridors_1F_EventScript_Youngster::
 	msgbox AbandonedShip_Corridors_1F_Text_IsntItFunHere, MSGBOX_NPC
 	end
 
-AbandonedShip_Corridors_1F_EventScript_Charlie:: @ 82379AE
+AbandonedShip_Corridors_1F_EventScript_Charlie::
 	trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_CharlieIntro, AbandonedShip_Corridors_1F_Text_CharlieDefeat
 	msgbox AbandonedShip_Corridors_1F_Text_CharliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Corridors_1F_Text_CharlieIntro: @ 82379C5
+AbandonedShip_Corridors_1F_Text_CharlieIntro:
 	.string "What's so funny about having my inner\n"
 	.string "tube aboard the ship?$"
 
-AbandonedShip_Corridors_1F_Text_CharlieDefeat: @ 8237A01
+AbandonedShip_Corridors_1F_Text_CharlieDefeat:
 	.string "Whoa, you overwhelmed me!$"
 
-AbandonedShip_Corridors_1F_Text_CharliePostBattle: @ 8237A1B
+AbandonedShip_Corridors_1F_Text_CharliePostBattle:
 	.string "It's not easy throwing POKé BALLS\n"
 	.string "while hanging on to an inner tube!$"
 
-AbandonedShip_Corridors_1F_Text_IsntItFunHere: @ 8237A60
+AbandonedShip_Corridors_1F_Text_IsntItFunHere:
 	.string "Isn't it fun here?\n"
 	.string "I get excited just being here!$"
diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
index 94ed2ef7e..dd70c9dd3 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
@@ -1,30 +1,30 @@
-AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84
+AbandonedShip_Corridors_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_OnLoad
 	.byte 0
 
-AbandonedShip_Corridors_B1F_OnResume: @ 8237D8F
+AbandonedShip_Corridors_B1F_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
 	end
 
-AbandonedShip_Corridors_B1F_OnLoad: @ 8237D98
+AbandonedShip_Corridors_B1F_OnLoad:
 	call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom
 	call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom:: @ 8237DAB
+AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom::
 	setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
 	return
 
-AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom:: @ 8237DB5
+AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom::
 	setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
 	return
 
-AbandonedShip_Corridors_B1F_EventScript_TuberM:: @ 8237DBF
+AbandonedShip_Corridors_B1F_EventScript_TuberM::
 	msgbox AbandonedShip_Corridors_B1F_Text_YayItsAShip, MSGBOX_NPC
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: @ 8237DC8
+AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor::
 	lockall
 	goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked
 	checkitem ITEM_STORAGE_KEY, 1
@@ -39,49 +39,49 @@ AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: @ 8237DC8
 	releaseall
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked:: @ 8237DFF
+AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked::
 	msgbox AbandonedShip_Corridors_B1F_Text_DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked:: @ 8237E09
+AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked::
 	msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_Duncan:: @ 8237E13
+AbandonedShip_Corridors_B1F_EventScript_Duncan::
 	trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_DuncanIntro, AbandonedShip_Corridors_B1F_Text_DuncanDefeat
 	msgbox AbandonedShip_Corridors_B1F_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Corridors_B1F_Text_DuncanIntro: @ 8237E2A
+AbandonedShip_Corridors_B1F_Text_DuncanIntro:
 	.string "When we go out to sea, we SAILORS\n"
 	.string "always bring our POKéMON.\l"
 	.string "How about a quick battle?$"
 
-AbandonedShip_Corridors_B1F_Text_DuncanDefeat: @ 8237E80
+AbandonedShip_Corridors_B1F_Text_DuncanDefeat:
 	.string "Whoops, I'm sunk!$"
 
-AbandonedShip_Corridors_B1F_Text_DuncanPostBattle: @ 8237E92
+AbandonedShip_Corridors_B1F_Text_DuncanPostBattle:
 	.string "The ship's bottom has sunk into the\n"
 	.string "depths.\p"
 	.string "If a POKéMON knew how to go underwater,\n"
 	.string "we might make some progress…$"
 
-AbandonedShip_Corridors_B1F_Text_YayItsAShip: @ 8237F03
+AbandonedShip_Corridors_B1F_Text_YayItsAShip:
 	.string "Yay!\n"
 	.string "It's a ship!$"
 
-AbandonedShip_Corridors_B1F_Text_DoorIsLocked: @ 8237F15
+AbandonedShip_Corridors_B1F_Text_DoorIsLocked:
 	.string "The door is locked.\p"
 	.string "“STORAGE” is painted on the door.$"
 
-AbandonedShip_Corridors_B1F_Text_InsertedStorageKey: @ 8237F4B
+AbandonedShip_Corridors_B1F_Text_InsertedStorageKey:
 	.string "{PLAYER} inserted and turned the\n"
 	.string "STORAGE KEY.\p"
 	.string "The inserted KEY stuck fast,\n"
 	.string "but the door opened.$"
 
-AbandonedShip_Text_TheDoorIsOpen: @ 8237FA5
+AbandonedShip_Text_TheDoorIsOpen:
 	.string "The door is open.$"
 
diff --git a/data/maps/AbandonedShip_Deck/scripts.inc b/data/maps/AbandonedShip_Deck/scripts.inc
index b0ecc2a4d..6e1e75063 100644
--- a/data/maps/AbandonedShip_Deck/scripts.inc
+++ b/data/maps/AbandonedShip_Deck/scripts.inc
@@ -1,8 +1,8 @@
-AbandonedShip_Deck_MapScripts:: @ 823799A
+AbandonedShip_Deck_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_OnTransition
 	.byte 0
 
-AbandonedShip_Deck_OnTransition: @ 82379A0
+AbandonedShip_Deck_OnTransition:
 	setflag FLAG_LANDMARK_ABANDONED_SHIP
 	end
 
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
index 612d46a9a..4ec63a7e1 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
@@ -1,13 +1,13 @@
-AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C
+AbandonedShip_HiddenFloorCorridors_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_OnLoad
 	.byte 0
 
-AbandonedShip_HiddenFloorCorridors_OnResume: @ 8238977
+AbandonedShip_HiddenFloorCorridors_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
 	end
 
-AbandonedShip_HiddenFloorCorridors_OnLoad: @ 8238980
+AbandonedShip_HiddenFloorCorridors_OnLoad:
 	call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1
 	call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2
 	call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4
@@ -18,39 +18,39 @@ AbandonedShip_HiddenFloorCorridors_OnLoad: @ 8238980
 	call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1:: @ 82389C9
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1::
 	setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2:: @ 82389D3
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2::
 	setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4:: @ 82389DD
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4::
 	setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6:: @ 82389E7
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6::
 	setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1:: @ 82389F1
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1::
 	setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2:: @ 82389FB
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2::
 	setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4:: @ 8238A05
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4::
 	setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Locked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6:: @ 8238A0F
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6::
 	setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Locked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19
+AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door::
 	lockall
 	goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_1_KEY, 1
@@ -65,7 +65,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50
+AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door::
 	lockall
 	goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_2_KEY, 1
@@ -80,7 +80,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87
+AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door::
 	lockall
 	goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_4_KEY, 1
@@ -95,7 +95,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE
+AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door::
 	lockall
 	goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_6_KEY, 1
@@ -110,48 +110,48 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked:: @ 8238AF5
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked::
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked:: @ 8238AFF
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked::
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked:: @ 8238B09
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked::
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked:: @ 8238B13
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked::
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen:: @ 8238B1D
+AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen::
 	msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked: @ 8238B27
+AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked:
 	.string "The door is locked.\p"
 	.string "“RM. 1” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked: @ 8238B5B
+AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked:
 	.string "The door is locked.\p"
 	.string "“RM. 2” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked: @ 8238B8F
+AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked:
 	.string "The door is locked.\p"
 	.string "“RM. 4” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked: @ 8238BC3
+AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked:
 	.string "The door is locked.\p"
 	.string "“RM. 6” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_InsertedKey: @ 8238BF7
+AbandonedShip_HiddenFloorCorridors_Text_InsertedKey:
 	.string "{PLAYER} inserted and turned the\n"
 	.string "KEY.\p"
 	.string "The inserted KEY stuck fast,\n"
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
index 53a7ee2ed..cdeb225de 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
@@ -1,8 +1,8 @@
-AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49
+AbandonedShip_HiddenFloorRooms_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_OnFrame
 	.byte 0
 
-AbandonedShip_HiddenFloorRooms_OnFrame: @ 8238C4F
+AbandonedShip_HiddenFloorRooms_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle
 	.2byte 0
 
@@ -13,7 +13,7 @@ AbandonedShip_HiddenFloorRooms_OnFrame: @ 8238C4F
 @ Upper row,  left column   (Rm 4)
 @ Upper row,  middle column (Rm 5)
 @ Upper row,  right column  (Rm 6)
-AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle:: @ 8238C59
+AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle::
 	setvar VAR_TEMP_1, 1
 	getplayerxy VAR_TEMP_2, VAR_TEMP_3
 	setvar VAR_TEMP_4, 1
@@ -32,19 +32,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle:: @ 8238C59
 	case 6, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn:: @ 8238CD1
+AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn::
 	addvar VAR_TEMP_4, 1
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn:: @ 8238CD7
+AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn::
 	addvar VAR_TEMP_4, 2
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 8238CDD
+AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow::
 	addvar VAR_TEMP_4, 3
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1::
 	delay 20
 	dofieldeffectsparkle 10, 10, 0
 	specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
@@ -54,10 +54,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2:: @ 8238D0C
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2::
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: @ 8238D0D
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3::
 	specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
 	compare VAR_RESULT, TRUE
 	goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle
@@ -68,10 +68,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: @ 8238D0D
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 8238D32
+AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle::
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4::
 	delay 20
 	dofieldeffectsparkle 8, 5, 0
 	dofieldeffectsparkle 11, 3, 0
@@ -82,7 +82,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5::
 	delay 20
 	dofieldeffectsparkle 16, 3, 0
 	dofieldeffectsparkle 25, 2, 0
@@ -94,32 +94,32 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 8238DB2
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6::
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 8238DB3
+AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle::
 	dofieldeffectsparkle 42, 10, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 8238DC3
+AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle::
 	dofieldeffectsparkle 20, 5, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 8238DD3
+AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle::
 	dofieldeffectsparkle 1, 12, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 8238DE3
+AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle::
 	dofieldeffectsparkle 1, 2, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 8238DF3
+AbandonedShip_HiddenFloorRooms_EventScript_Trash::
 	lockall
 	msgbox AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash: @ 8238DFE
+AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash:
 	.string "It's bright and shiny!\n"
 	.string "But it's just trash…$"
 
diff --git a/data/maps/AbandonedShip_Room_B1F/scripts.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc
index 5dd7a2bad..a5489e810 100644
--- a/data/maps/AbandonedShip_Room_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Room_B1F/scripts.inc
@@ -1,3 +1,3 @@
-AbandonedShip_Room_B1F_MapScripts:: @ 82380A5
+AbandonedShip_Room_B1F_MapScripts::
 	.byte 0
 
diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
index a09242fc9..e02d109b7 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
@@ -1,7 +1,7 @@
-AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6
+AbandonedShip_Rooms2_1F_MapScripts::
 	.byte 0
 
-AbandonedShip_Rooms2_1F_EventScript_Dan:: @ 82380A7
+AbandonedShip_Rooms2_1F_EventScript_Dan::
 	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanIntro, AbandonedShip_Rooms2_1F_Text_DanDefeat, AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterDan
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -10,18 +10,18 @@ AbandonedShip_Rooms2_1F_EventScript_Dan:: @ 82380A7
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_RegisterDan:: @ 82380D7
+AbandonedShip_Rooms2_1F_EventScript_RegisterDan::
 	msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT  @ Kira speaks for both when registering KiraAndDan
 	register_matchcall TRAINER_KIRA_AND_DAN_1
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_DanRematch:: @ 82380F0
+AbandonedShip_Rooms2_1F_EventScript_DanRematch::
 	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanRematchIntro, AbandonedShip_Rooms2_1F_Text_DanRematchDefeat, AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons
 	msgbox AbandonedShip_Rooms2_1F_Text_DanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_Kira:: @ 823810B
+AbandonedShip_Rooms2_1F_EventScript_Kira::
 	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraIntro, AbandonedShip_Rooms2_1F_Text_KiraDefeat, AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterKira
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -30,122 +30,122 @@ AbandonedShip_Rooms2_1F_EventScript_Kira:: @ 823810B
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_RegisterKira:: @ 823813B
+AbandonedShip_Rooms2_1F_EventScript_RegisterKira::
 	msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KIRA_AND_DAN_1
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_KiraRematch:: @ 8238154
+AbandonedShip_Rooms2_1F_EventScript_KiraRematch::
 	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraRematchIntro, AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat, AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons
 	msgbox AbandonedShip_Rooms2_1F_Text_KiraPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_Jani:: @ 823816F
+AbandonedShip_Rooms2_1F_EventScript_Jani::
 	trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_JaniIntro, AbandonedShip_Rooms2_1F_Text_JaniDefeat
 	msgbox AbandonedShip_Rooms2_1F_Text_JaniPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_Garrison:: @ 8238186
+AbandonedShip_Rooms2_1F_EventScript_Garrison::
 	trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_GarrisonIntro, AbandonedShip_Rooms2_1F_Text_GarrisonDefeat
 	msgbox AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_Text_DanIntro: @ 823819D
+AbandonedShip_Rooms2_1F_Text_DanIntro:
 	.string "DAN: While searching for treasures,\n"
 	.string "we discovered a TRAINER!$"
 
-AbandonedShip_Rooms2_1F_Text_DanDefeat: @ 82381DA
+AbandonedShip_Rooms2_1F_Text_DanDefeat:
 	.string "DAN: We couldn't win even though\n"
 	.string "we worked together…$"
 
-AbandonedShip_Rooms2_1F_Text_DanPostBattle: @ 823820F
+AbandonedShip_Rooms2_1F_Text_DanPostBattle:
 	.string "DAN: We can't find any treasures…\n"
 	.string "I wonder if someone got them already?$"
 
-AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons: @ 8238257
+AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons:
 	.string "DAN: You don't even have two POKéMON.\n"
 	.string "You can't expect to beat us like that.$"
 
-AbandonedShip_Rooms2_1F_Text_KiraIntro: @ 82382A4
+AbandonedShip_Rooms2_1F_Text_KiraIntro:
 	.string "KIRA: Oh?\n"
 	.string "We were searching for treasures.\l"
 	.string "But we discovered a TRAINER instead!$"
 
-AbandonedShip_Rooms2_1F_Text_KiraDefeat: @ 82382F4
+AbandonedShip_Rooms2_1F_Text_KiraDefeat:
 	.string "KIRA: Ooh, so strong!$"
 
-AbandonedShip_Rooms2_1F_Text_KiraPostBattle: @ 823830A
+AbandonedShip_Rooms2_1F_Text_KiraPostBattle:
 	.string "KIRA: Where could the treasures be?\p"
 	.string "I've already decided what I'm buying\n"
 	.string "when we find the treasures!$"
 
-AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons: @ 823836F
+AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons:
 	.string "KIRA: Oh, you don't have two POKéMON?\n"
 	.string "We'll have to battle some other time!$"
 
-AbandonedShip_Rooms2_1F_Text_KiraRegister: @ 82383BB
+AbandonedShip_Rooms2_1F_Text_KiraRegister:
 	.string "KIRA: Oh, you make me so angry!\n"
 	.string "I'm going to register you for that!$"
 
-AbandonedShip_Rooms2_1F_Text_DanRematchIntro: @ 82383FF
+AbandonedShip_Rooms2_1F_Text_DanRematchIntro:
 	.string "DAN: We've been searching for\n"
 	.string "treasures all this time.\p"
 	.string "Our POKéMON have grown stronger, too.\n"
 	.string "Let us show you, okay?$"
 
-AbandonedShip_Rooms2_1F_Text_DanRematchDefeat: @ 8238473
+AbandonedShip_Rooms2_1F_Text_DanRematchDefeat:
 	.string "DAN: You're strong, as usual!$"
 
-AbandonedShip_Rooms2_1F_Text_DanPostRematch: @ 8238491
+AbandonedShip_Rooms2_1F_Text_DanPostRematch:
 	.string "DAN: We can't find any treasures,\n"
 	.string "we lose at POKéMON…\p"
 	.string "I want to go home… But if I say that,\n"
 	.string "she gets all angry with me…$"
 
-AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons: @ 8238509
+AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons:
 	.string "DAN: You don't even have two POKéMON.\n"
 	.string "You can't expect to beat us like that.$"
 
-AbandonedShip_Rooms2_1F_Text_KiraRematchIntro: @ 8238556
+AbandonedShip_Rooms2_1F_Text_KiraRematchIntro:
 	.string "KIRA: Oh? We meet again!\p"
 	.string "Just like us, you still haven't given up\n"
 	.string "searching for treasures, have you?\p"
 	.string "Want to make it so the loser has\n"
 	.string "to give up searching?$"
 
-AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat: @ 82385F2
+AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat:
 	.string "KIRA: Oh, we lost again…$"
 
-AbandonedShip_Rooms2_1F_Text_KiraPostRematch: @ 823860B
+AbandonedShip_Rooms2_1F_Text_KiraPostRematch:
 	.string "KIRA: We're not leaving until we raise\n"
 	.string "our POKéMON some more and we find\l"
 	.string "the treasures here!$"
 
-AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons: @ 8238668
+AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons:
 	.string "KIRA: Oh, you don't have two POKéMON?\n"
 	.string "We'll have to battle some other time!$"
 
-AbandonedShip_Rooms2_1F_Text_JaniIntro: @ 82386B4
+AbandonedShip_Rooms2_1F_Text_JaniIntro:
 	.string "I'm not good at swimming,\n"
 	.string "but I am good at battles!$"
 
-AbandonedShip_Rooms2_1F_Text_JaniDefeat: @ 82386E8
+AbandonedShip_Rooms2_1F_Text_JaniDefeat:
 	.string "Oops.\n"
 	.string "That didn't go very well.$"
 
-AbandonedShip_Rooms2_1F_Text_JaniPostBattle: @ 8238708
+AbandonedShip_Rooms2_1F_Text_JaniPostBattle:
 	.string "Walking around barefoot in this ship\n"
 	.string "is kind of gross.$"
 
-AbandonedShip_Rooms2_1F_Text_GarrisonIntro: @ 823873F
+AbandonedShip_Rooms2_1F_Text_GarrisonIntro:
 	.string "Strength and compassion…\n"
 	.string "Those are a TRAINER's treasures!$"
 
-AbandonedShip_Rooms2_1F_Text_GarrisonDefeat: @ 8238779
+AbandonedShip_Rooms2_1F_Text_GarrisonDefeat:
 	.string "Ah, there is something about you\n"
 	.string "that sparkles.$"
 
-AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle: @ 82387A9
+AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle:
 	.string "In a cabin somewhere on board,\n"
 	.string "I saw something sparkle.$"
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
index 5c2418696..156a67e5d 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
@@ -1,11 +1,11 @@
-AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024
+AbandonedShip_Rooms2_B1F_MapScripts::
 	.byte 0
 
-AbandonedShip_Rooms2_B1F_EventScript_Camper:: @ 8238025
+AbandonedShip_Rooms2_B1F_EventScript_Camper::
 	msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC
 	end
 
-AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring: @ 823802E
+AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring:
 	.string "This is a perfect place to go exploring!\n"
 	.string "It's exciting here!\p"
 	.string "I bet there're amazing treasures on\n"
diff --git a/data/maps/AbandonedShip_Rooms_1F/scripts.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
index cabbb45ea..41b4eb3b6 100644
--- a/data/maps/AbandonedShip_Rooms_1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
@@ -1,16 +1,16 @@
-AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92
+AbandonedShip_Rooms_1F_MapScripts::
 	.byte 0
 
-AbandonedShip_Rooms_1F_EventScript_Gentleman:: @ 8237A93
+AbandonedShip_Rooms_1F_EventScript_Gentleman::
 	msgbox AbandonedShip_Rooms_1F_Text_TakingALookAround, MSGBOX_NPC
 	end
 
-AbandonedShip_Rooms_1F_EventScript_Demetrius:: @ 8237A9C
+AbandonedShip_Rooms_1F_EventScript_Demetrius::
 	trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_DemetriusIntro, AbandonedShip_Rooms_1F_Text_DemetriusDefeat
 	msgbox AbandonedShip_Rooms_1F_Text_DemetriusPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms_1F_EventScript_Thalia:: @ 8237AB3
+AbandonedShip_Rooms_1F_EventScript_Thalia::
 	trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaIntro, AbandonedShip_Rooms_1F_Text_ThaliaDefeat, AbandonedShip_Rooms_1F_EventScript_RegisterThalia
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -19,7 +19,7 @@ AbandonedShip_Rooms_1F_EventScript_Thalia:: @ 8237AB3
 	release
 	end
 
-AbandonedShip_Rooms_1F_EventScript_RegisterThalia:: @ 8237ADF
+AbandonedShip_Rooms_1F_EventScript_RegisterThalia::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox AbandonedShip_Rooms_1F_Text_ThaliaRegister, MSGBOX_DEFAULT
@@ -27,52 +27,52 @@ AbandonedShip_Rooms_1F_EventScript_RegisterThalia:: @ 8237ADF
 	release
 	end
 
-AbandonedShip_Rooms_1F_EventScript_ThaliaRematch:: @ 8237AFE
+AbandonedShip_Rooms_1F_EventScript_ThaliaRematch::
 	trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro, AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat
 	msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms_1F_Text_TakingALookAround: @ 8237B15
+AbandonedShip_Rooms_1F_Text_TakingALookAround:
 	.string "Ships of this sort are rare, so I'm\n"
 	.string "taking a look around.\p"
 	.string "Hmhm…\n"
 	.string "There appear to be other cabins…$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaIntro: @ 8237B76
+AbandonedShip_Rooms_1F_Text_ThaliaIntro:
 	.string "What on earth would compel you to\n"
 	.string "come here? You must be curious!$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaDefeat: @ 8237BB8
+AbandonedShip_Rooms_1F_Text_ThaliaDefeat:
 	.string "Not just curious, but also strong…$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaPostBattle: @ 8237BDB
+AbandonedShip_Rooms_1F_Text_ThaliaPostBattle:
 	.string "The man next door…\p"
 	.string "He says he's just sightseeing,\n"
 	.string "but I don't know about that.$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaRegister: @ 8237C2A
+AbandonedShip_Rooms_1F_Text_ThaliaRegister:
 	.string "You're such a tough TRAINER!\n"
 	.string "Let me register you as a memento!$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro: @ 8237C69
+AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro:
 	.string "What on earth would compel you to\n"
 	.string "come back? You must really be curious!$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat: @ 8237CB2
+AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat:
 	.string "Aren't you too strong?$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaPostRematch: @ 8237CC9
+AbandonedShip_Rooms_1F_Text_ThaliaPostRematch:
 	.string "I'm sure that man's up to something!\n"
 	.string "He just acts so suspiciously!$"
 
-AbandonedShip_Rooms_1F_Text_DemetriusIntro: @ 8237D0C
+AbandonedShip_Rooms_1F_Text_DemetriusIntro:
 	.string "Waaah!\n"
 	.string "I've been found! …Huh?$"
 
-AbandonedShip_Rooms_1F_Text_DemetriusDefeat: @ 8237D2A
+AbandonedShip_Rooms_1F_Text_DemetriusDefeat:
 	.string "Oh, you're not my mom.$"
 
-AbandonedShip_Rooms_1F_Text_DemetriusPostBattle: @ 8237D41
+AbandonedShip_Rooms_1F_Text_DemetriusPostBattle:
 	.string "I'm in trouble with my mom, so I ran.\n"
 	.string "Keep it a secret where I am!$"
 
diff --git a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
index 80208b051..a716972ff 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
@@ -1,16 +1,16 @@
-AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7
+AbandonedShip_Rooms_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_OnResume
 	.byte 0
 
-AbandonedShip_Rooms_B1F_OnResume: @ 8237FBD
+AbandonedShip_Rooms_B1F_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4
 	end
 
-AbandonedShip_Rooms_B1F_EventScript_FatMan:: @ 8237FC6
+AbandonedShip_Rooms_B1F_EventScript_FatMan::
 	msgbox AbandonedShip_Rooms_B1F_Text_GettingQueasy, MSGBOX_NPC
 	end
 
-AbandonedShip_Rooms_B1F_Text_GettingQueasy: @ 8237FCF
+AbandonedShip_Rooms_B1F_Text_GettingQueasy:
 	.string "Urrrrppp…\p"
 	.string "I'm getting queasy just being aboard\n"
 	.string "this ship…\p"
diff --git a/data/maps/AbandonedShip_Underwater1/scripts.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc
index 9e10c19f5..9b3528b77 100644
--- a/data/maps/AbandonedShip_Underwater1/scripts.inc
+++ b/data/maps/AbandonedShip_Underwater1/scripts.inc
@@ -1,8 +1,8 @@
-AbandonedShip_Underwater1_MapScripts:: @ 8238096
+AbandonedShip_Underwater1_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_OnResume
 	.byte 0
 
-AbandonedShip_Underwater1_OnResume: @ 823809C
+AbandonedShip_Underwater1_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10
 	end
 
diff --git a/data/maps/AbandonedShip_Underwater2/scripts.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc
index 40e6c1e5e..bb139bd51 100644
--- a/data/maps/AbandonedShip_Underwater2/scripts.inc
+++ b/data/maps/AbandonedShip_Underwater2/scripts.inc
@@ -1,8 +1,8 @@
-AbandonedShip_Underwater2_MapScripts:: @ 823895D
+AbandonedShip_Underwater2_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_OnResume
 	.byte 0
 
-AbandonedShip_Underwater2_OnResume: @ 8238963
+AbandonedShip_Underwater2_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7
 	end
 
diff --git a/data/maps/AlteringCave/scripts.inc b/data/maps/AlteringCave/scripts.inc
index 601f49217..91bc5ec33 100644
--- a/data/maps/AlteringCave/scripts.inc
+++ b/data/maps/AlteringCave/scripts.inc
@@ -1,8 +1,8 @@
-AlteringCave_MapScripts:: @ 823B177
+AlteringCave_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_OnTransition
 	.byte 0
 
-AlteringCave_OnTransition: @ 823B17D
+AlteringCave_OnTransition:
 	setflag FLAG_LANDMARK_ALTERING_CAVE
 	end
 
diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc
index 95dd85d28..40d9f0dff 100644
--- a/data/maps/AncientTomb/scripts.inc
+++ b/data/maps/AncientTomb/scripts.inc
@@ -1,34 +1,34 @@
-AncientTomb_MapScripts:: @ 8238FB3
+AncientTomb_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AncientTomb_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, AncientTomb_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition
 	.byte 0
 
-AncientTomb_OnResume: @ 8238FC3
+AncientTomb_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_TryRemoveRegisteel
 	end
 
-AncientTomb_EventScript_TryRemoveRegisteel:: @ 8238FCD
+AncientTomb_EventScript_TryRemoveRegisteel::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-AncientTomb_OnTransition: @ 8238FE1
+AncientTomb_OnTransition:
 	setflag FLAG_LANDMARK_ANCIENT_TOMB
 	call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_ShowRegisteel
 	end
 
-AncientTomb_EventScript_ShowRegisteel:: @ 8238FEE
+AncientTomb_EventScript_ShowRegisteel::
 	clearflag FLAG_HIDE_REGISTEEL
 	return
 
-AncientTomb_OnLoad: @ 8238FF2
+AncientTomb_OnLoad:
 	call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_HideRegiEntrance
 	end
 
-AncientTomb_EventScript_HideRegiEntrance:: @ 8238FFC
+AncientTomb_EventScript_HideRegiEntrance::
 	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
@@ -37,7 +37,7 @@ AncientTomb_EventScript_HideRegiEntrance:: @ 8238FFC
 	setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
-AncientTomb_EventScript_CaveEntranceMiddle:: @ 8239033
+AncientTomb_EventScript_CaveEntranceMiddle::
 	lockall
 	goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_BigHoleInWall
 	braillemessage AncientTomb_Braille_ShineInTheMiddle
@@ -46,12 +46,12 @@ AncientTomb_EventScript_CaveEntranceMiddle:: @ 8239033
 	releaseall
 	end
 
-AncientTomb_EventScript_BigHoleInWall:: @ 8239046
+AncientTomb_EventScript_BigHoleInWall::
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AncientTomb_EventScript_CaveEntranceSide:: @ 8239050
+AncientTomb_EventScript_CaveEntranceSide::
 	lockall
 	braillemessage AncientTomb_Braille_ShineInTheMiddle
 	waitbuttonpress
@@ -59,7 +59,7 @@ AncientTomb_EventScript_CaveEntranceSide:: @ 8239050
 	releaseall
 	end
 
-AncientTomb_EventScript_Registeel:: @ 823905A
+AncientTomb_EventScript_Registeel::
 	lock
 	faceplayer
 	waitse
@@ -82,12 +82,12 @@ AncientTomb_EventScript_Registeel:: @ 823905A
 	release
 	end
 
-AncientTomb_EventScript_DefeatedRegisteel:: @ 82390A1
+AncientTomb_EventScript_DefeatedRegisteel::
 	setflag FLAG_DEFEATED_REGISTEEL
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-AncientTomb_EventScript_RanFromRegisteel:: @ 82390AA
+AncientTomb_EventScript_RanFromRegisteel::
 	setvar VAR_0x8004, SPECIES_REGISTEEL
 	goto Common_EventScript_LegendaryFlewAway
 	end
diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc
index b246862a7..4a99f250c 100644
--- a/data/maps/AquaHideout_1F/scripts.inc
+++ b/data/maps/AquaHideout_1F/scripts.inc
@@ -1,8 +1,8 @@
-AquaHideout_1F_MapScripts:: @ 8233493
+AquaHideout_1F_MapScripts::
 	.byte 0
 
 @ The below two entrance guards give hints about what to do to progress the story
-AquaHideout_1F_EventScript_HideoutEntranceGrunt1:: @ 8233494
+AquaHideout_1F_EventScript_HideoutEntranceGrunt1::
 	lock
 	faceplayer
 	goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_SlateportHint1
@@ -11,17 +11,17 @@ AquaHideout_1F_EventScript_HideoutEntranceGrunt1:: @ 8233494
 	release
 	end
 
-AquaHideout_1F_EventScript_MagmaHideoutHint1:: @ 82334B2
+AquaHideout_1F_EventScript_MagmaHideoutHint1::
 	msgbox AquaHideout_1F_Text_WhereMightMagmaHideoutBe, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_SlateportHint1:: @ 82334BC
+AquaHideout_1F_EventScript_SlateportHint1::
 	msgbox AquaHideout_1F_Text_BossWentToJackASubmarine, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_HideoutEntranceGrunt2:: @ 82334C6
+AquaHideout_1F_EventScript_HideoutEntranceGrunt2::
 	lock
 	faceplayer
 	goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_SlateportHint2
@@ -30,27 +30,27 @@ AquaHideout_1F_EventScript_HideoutEntranceGrunt2:: @ 82334C6
 	release
 	end
 
-AquaHideout_1F_EventScript_MagmaHideoutHint2:: @ 82334E4
+AquaHideout_1F_EventScript_MagmaHideoutHint2::
 	msgbox AquaHideout_1F_Text_TeamMagmaAtMtChimney, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_SlateportHint2:: @ 82334EE
+AquaHideout_1F_EventScript_SlateportHint2::
 	msgbox AquaHideout_1F_Text_BossIsInSlateportCity, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_Grunt1:: @ 82334F8
+AquaHideout_1F_EventScript_Grunt1::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_1, AquaHideout_1F_Text_Grunt1Intro, AquaHideout_1F_Text_Grunt1Defeat, AquaHideout_1F_EventScript_Grunt1Defeated
 	msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_1F_EventScript_Grunt1Defeated:: @ 8233513
+AquaHideout_1F_EventScript_Grunt1Defeated::
 	msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_Text_OurBossIsSnatchingSomething: @ 823351D
+AquaHideout_1F_Text_OurBossIsSnatchingSomething:
 	.string "What? What? What do you want with \n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here! He's gone off to\n"
@@ -60,7 +60,7 @@ AquaHideout_1F_Text_OurBossIsSnatchingSomething: @ 823351D
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_WhereMightMagmaHideoutBe: @ 82335E3
+AquaHideout_1F_Text_WhereMightMagmaHideoutBe:
 	.string "What? What?\n"
 	.string "Are you a TEAM MAGMA grunt?\p"
 	.string "I hear that TEAM MAGMA is trying to\n"
@@ -68,7 +68,7 @@ AquaHideout_1F_Text_WhereMightMagmaHideoutBe: @ 82335E3
 	.string "HIDEOUT.\p"
 	.string "But where might their HIDEOUT be?$"
 
-AquaHideout_1F_Text_BossWentToJackASubmarine: @ 823367D
+AquaHideout_1F_Text_BossWentToJackASubmarine:
 	.string "What? What? What do you want with \n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here!\n"
@@ -78,7 +78,7 @@ AquaHideout_1F_Text_BossWentToJackASubmarine: @ 823367D
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_BossIsOnRoute122: @ 8233739
+AquaHideout_1F_Text_BossIsOnRoute122:
 	.string "What? What? What do you want with \n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here! He's on his way to\n"
@@ -88,14 +88,14 @@ AquaHideout_1F_Text_BossIsOnRoute122: @ 8233739
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_TeamMagmaAtMtChimney: @ 82337FA
+AquaHideout_1F_Text_TeamMagmaAtMtChimney:
 	.string "What? What?\n"
 	.string "Are you a TEAM MAGMA grunt?\p"
 	.string "I hear that TEAM MAGMA is after\n"
 	.string "an awesome POKéMON at MT. CHIMNEY.\p"
 	.string "But what is that POKéMON like?$"
 
-AquaHideout_1F_Text_BossIsInSlateportCity: @ 8233884
+AquaHideout_1F_Text_BossIsInSlateportCity:
 	.string "What? What? What do you want with\n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here!\n"
@@ -105,15 +105,15 @@ AquaHideout_1F_Text_BossIsInSlateportCity: @ 8233884
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_Grunt1Intro: @ 823393D
+AquaHideout_1F_Text_Grunt1Intro:
 	.string "Ayiyiyi!\n"
 	.string "Suspicious character spotted!$"
 
-AquaHideout_1F_Text_Grunt1Defeat: @ 8233964
+AquaHideout_1F_Text_Grunt1Defeat:
 	.string "Grrrrr…\n"
 	.string "I lost it!$"
 
-AquaHideout_1F_Text_Grunt1PostBattle: @ 8233977
+AquaHideout_1F_Text_Grunt1PostBattle:
 	.string "I took the loss for the TEAM,\n"
 	.string "but I did my job…$"
 
diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc
index 17e803814..4a4a95cc4 100644
--- a/data/maps/AquaHideout_B1F/scripts.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
@@ -1,33 +1,33 @@
-AquaHideout_B1F_MapScripts:: @ 82339A7
+AquaHideout_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition
 	.byte 0
 
-AquaHideout_B1F_OnResume: @ 82339B2
+AquaHideout_B1F_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_TryRemoveElectrode
 	end
 
-AquaHideout_B1F_EventScript_TryRemoveElectrode:: @ 82339BC
+AquaHideout_B1F_EventScript_TryRemoveElectrode::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-AquaHideout_B1F_OnTransition: @ 82339D0
+AquaHideout_B1F_OnTransition:
 	call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode1
 	call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode2
 	end
 
-AquaHideout_B1F_EventScript_ShowElectrode1:: @ 82339E3
+AquaHideout_B1F_EventScript_ShowElectrode1::
 	clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
 	return
 
-AquaHideout_B1F_EventScript_ShowElectrode2:: @ 82339E7
+AquaHideout_B1F_EventScript_ShowElectrode2::
 	clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
 	return
 
-AquaHideout_B1F_EventScript_Electrode1:: @ 82339EB
+AquaHideout_B1F_EventScript_Electrode1::
 	lock
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
@@ -49,12 +49,12 @@ AquaHideout_B1F_EventScript_Electrode1:: @ 82339EB
 	release
 	end
 
-AquaHideout_B1F_EventScript_DefeatedElectrode1:: @ 8233A2F
+AquaHideout_B1F_EventScript_DefeatedElectrode1::
 	setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-AquaHideout_B1F_EventScript_Electrode2:: @ 8233A38
+AquaHideout_B1F_EventScript_Electrode2::
 	lock
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
@@ -76,92 +76,92 @@ AquaHideout_B1F_EventScript_Electrode2:: @ 8233A38
 	release
 	end
 
-AquaHideout_B1F_EventScript_DefeatedElectrode2:: @ 8233A7C
+AquaHideout_B1F_EventScript_DefeatedElectrode2::
 	setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-AquaHideout_B1F_EventScript_Grunt2:: @ 8233A85
+AquaHideout_B1F_EventScript_Grunt2::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_2, AquaHideout_B1F_Text_Grunt2Intro, AquaHideout_B1F_Text_Grunt2Defeat, AquaHideout_B1F_EventScript_Grunt2Defeated
 	msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_EventScript_Grunt2Defeated:: @ 8233AA0
+AquaHideout_B1F_EventScript_Grunt2Defeated::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B1F_EventScript_Grunt3:: @ 8233AB0
+AquaHideout_B1F_EventScript_Grunt3::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_3, AquaHideout_B1F_Text_Grunt3Intro, AquaHideout_B1F_Text_Grunt3Defeat, AquaHideout_B1F_EventScript_Grunt3Defeated
 	msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_EventScript_Grunt3Defeated:: @ 8233ACB
+AquaHideout_B1F_EventScript_Grunt3Defeated::
 	msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B1F_EventScript_Grunt5:: @ 8233AD5
+AquaHideout_B1F_EventScript_Grunt5::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_5, AquaHideout_B1F_Text_Grunt5Intro, AquaHideout_B1F_Text_Grunt5Defeat
 	msgbox AquaHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_EventScript_Grunt7:: @ 8233AEC
+AquaHideout_B1F_EventScript_Grunt7::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_7, AquaHideout_B1F_Text_Grunt7Intro, AquaHideout_B1F_Text_Grunt7Defeat
 	msgbox AquaHideout_B1F_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_Text_Grunt2Intro: @ 8233B03
+AquaHideout_B1F_Text_Grunt2Intro:
 	.string "If you want to know the secret about\n"
 	.string "our HIDEOUT, you have me to beat!$"
 
-AquaHideout_B1F_Text_Grunt2Defeat: @ 8233B4A
+AquaHideout_B1F_Text_Grunt2Defeat:
 	.string "I can't win at all…$"
 
-AquaHideout_B1F_Text_Grunt2PostBattle: @ 8233B5E
+AquaHideout_B1F_Text_Grunt2PostBattle:
 	.string "Our HIDEOUT's secret?\p"
 	.string "Well, let's just say…\n"
 	.string "There's a submarine at the far end!\p"
 	.string "But, by now…\n"
 	.string "Kekekeke…$"
 
-AquaHideout_B1F_Text_Grunt3Intro: @ 8233BC5
+AquaHideout_B1F_Text_Grunt3Intro:
 	.string "Fuel supply loaded A-OK!\n"
 	.string "In-cruise snacks loaded A-OK!\p"
 	.string "Nothing left to do but KO a pesky\n"
 	.string "meddler!$"
 
-AquaHideout_B1F_Text_Grunt3Defeat: @ 8233C27
+AquaHideout_B1F_Text_Grunt3Defeat:
 	.string "I took a serious licking!$"
 
-AquaHideout_B1F_Text_Grunt3PostBattle: @ 8233C41
+AquaHideout_B1F_Text_Grunt3PostBattle:
 	.string "Humph!\n"
 	.string "This was supposed to happen!\p"
 	.string "My mission was to just hold you up!$"
 
-AquaHideout_B1F_Text_Grunt5Intro: @ 8233C89
+AquaHideout_B1F_Text_Grunt5Intro:
 	.string "Yawn… Keeping watch over the\n"
 	.string "HIDEOUT bores me. I'll take you on.$"
 
-AquaHideout_B1F_Text_Grunt5Defeat: @ 8233CCA
+AquaHideout_B1F_Text_Grunt5Defeat:
 	.string "Yawn…\n"
 	.string "Oh, I lost…$"
 
-AquaHideout_B1F_Text_Grunt5PostBattle: @ 8233CDC
+AquaHideout_B1F_Text_Grunt5PostBattle:
 	.string "If you scurry too much, other TEAM\n"
 	.string "AQUA members might get you.$"
 
-AquaHideout_B1F_Text_Grunt7Intro: @ 8233D1B
+AquaHideout_B1F_Text_Grunt7Intro:
 	.string "Hey!\n"
 	.string "You there!\p"
 	.string "Which do you think is cooler?\n"
 	.string "TEAM AQUA's uniform or TEAM MAGMA's?$"
 
-AquaHideout_B1F_Text_Grunt7Defeat: @ 8233D6E
+AquaHideout_B1F_Text_Grunt7Defeat:
 	.string "I lost in a cool way…$"
 
-AquaHideout_B1F_Text_Grunt7PostBattle: @ 8233D84
+AquaHideout_B1F_Text_Grunt7PostBattle:
 	.string "If you have a cool uniform, you look\n"
 	.string "good even in a loss, don't you think?$"
diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc
index 25fc1820f..95059fb6d 100644
--- a/data/maps/AquaHideout_B2F/scripts.inc
+++ b/data/maps/AquaHideout_B2F/scripts.inc
@@ -1,19 +1,19 @@
 .set LOCALID_MATT, 1
 .set LOCALID_SUBMARINE, 4
 
-AquaHideout_B2F_MapScripts:: @ 8233DCF
+AquaHideout_B2F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_OnTransition
 	.byte 0
 
-AquaHideout_B2F_OnTransition: @ 8233DD5
+AquaHideout_B2F_OnTransition:
 	call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_PreventMattNoticing
 	end
 
-AquaHideout_B2F_EventScript_PreventMattNoticing:: @ 8233DDF
+AquaHideout_B2F_EventScript_PreventMattNoticing::
 	setvar VAR_TEMP_1, 1
 	return
 
-AquaHideout_B2F_EventScript_MattNoticePlayer:: @ 8233DE5
+AquaHideout_B2F_EventScript_MattNoticePlayer::
 	lockall
 	setvar VAR_0x8008, LOCALID_MATT
 	playse SE_PIN
@@ -25,13 +25,13 @@ AquaHideout_B2F_EventScript_MattNoticePlayer:: @ 8233DE5
 	releaseall
 	end
 
-AquaHideout_B2F_EventScript_Matt:: @ 8233E09
+AquaHideout_B2F_EventScript_Matt::
 	trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_MattIntro, AquaHideout_B2F_Text_MattDefeat, AquaHideout_B2F_EventScript_SubmarineEscape
 	msgbox AquaHideout_B2F_Text_MattPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B2F_EventScript_SubmarineEscape:: @ 8233E25
+AquaHideout_B2F_EventScript_SubmarineEscape::
 	setvar VAR_0x8008, LOCALID_MATT
 	setvar VAR_0x8009, LOCALID_SUBMARINE
 	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft
@@ -54,7 +54,7 @@ AquaHideout_B2F_EventScript_SubmarineEscape:: @ 8233E25
 	release
 	end
 
-AquaHideout_B2F_Movement_SumbarineDepartLeft: @ 8233E80
+AquaHideout_B2F_Movement_SumbarineDepartLeft:
 	walk_left
 	walk_left
 	walk_left
@@ -62,34 +62,34 @@ AquaHideout_B2F_Movement_SumbarineDepartLeft: @ 8233E80
 	step_end
 
 @ Unused
-AquaHideout_B2F_Movement_SumbarineDepartRight: @ 8233E85
+AquaHideout_B2F_Movement_SumbarineDepartRight:
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-AquaHideout_B2F_EventScript_Grunt4:: @ 8233E8A
+AquaHideout_B2F_EventScript_Grunt4::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_4, AquaHideout_B2F_Text_Grunt4Intro, AquaHideout_B2F_Text_Grunt4Defeat, AquaHideout_B2F_EventScript_Grunt4Defeated
 	msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B2F_EventScript_Grunt4Defeated:: @ 8233EA5
+AquaHideout_B2F_EventScript_Grunt4Defeated::
 	msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B2F_EventScript_Grunt6:: @ 8233EAF
+AquaHideout_B2F_EventScript_Grunt6::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_6, AquaHideout_B2F_Text_Grunt6Intro, AquaHideout_B2F_Text_Grunt6Defeat
 	msgbox AquaHideout_B2F_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B2F_EventScript_Grunt8:: @ 8233EC6
+AquaHideout_B2F_EventScript_Grunt8::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_8, AquaHideout_B2F_Text_Grunt8Intro, AquaHideout_B2F_Text_Grunt8Defeat
 	msgbox AquaHideout_B2F_Text_Grunt8PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B2F_Text_MattIntro: @ 8233EDD
+AquaHideout_B2F_Text_MattIntro:
 	.string "Hehehe…\p"
 	.string "Got here already, did you?\n"
 	.string "We underestimated you!\p"
@@ -99,16 +99,16 @@ AquaHideout_B2F_Text_MattIntro: @ 8233EDD
 	.string "I'm not stalling for time.\n"
 	.string "I'm going to pulverize you!$"
 
-AquaHideout_B2F_Text_MattDefeat: @ 8233F8D
+AquaHideout_B2F_Text_MattDefeat:
 	.string "Hehehe…\n"
 	.string "So, I lost, too…$"
 
-AquaHideout_B2F_Text_OurBossGotThroughHisPreparations: @ 8233FA6
+AquaHideout_B2F_Text_OurBossGotThroughHisPreparations:
 	.string "Hehehe!\p"
 	.string "While I was toying with you, our BOSS\n"
 	.string "got through his preparations!$"
 
-AquaHideout_B2F_Text_MattPostBattle: @ 8233FF2
+AquaHideout_B2F_Text_MattPostBattle:
 	.string "Hehehe!\p"
 	.string "Our BOSS has already gone on his way to\n"
 	.string "some cave under the sea!\p"
@@ -118,19 +118,19 @@ AquaHideout_B2F_Text_MattPostBattle: @ 8233FF2
 	.string "But will you find it then?\n"
 	.string "Hehehe!$"
 
-AquaHideout_B2F_Text_Grunt4Intro: @ 82340B4
+AquaHideout_B2F_Text_Grunt4Intro:
 	.string "Wahahah, I grew weary of waiting!\n"
 	.string "You owe me a battle, too!$"
 
-AquaHideout_B2F_Text_Grunt4Defeat: @ 82340F0
+AquaHideout_B2F_Text_Grunt4Defeat:
 	.string "Tired of waiting…\n"
 	.string "Lost and dazed…$"
 
-AquaHideout_B2F_Text_Grunt4PostBattle: @ 8234112
+AquaHideout_B2F_Text_Grunt4PostBattle:
 	.string "BOSS…\n"
 	.string "Is this good enough?$"
 
-AquaHideout_B2F_Text_Grunt6Intro: @ 823412D
+AquaHideout_B2F_Text_Grunt6Intro:
 	.string "Warp panels, the HIDEOUT's pride\n"
 	.string "and joy!\p"
 	.string "You're clueless about where you are,\n"
@@ -138,25 +138,25 @@ AquaHideout_B2F_Text_Grunt6Intro: @ 823412D
 	.string "Fluster and tire out the enemy, then\n"
 	.string "lower the boom! That's our plan!$"
 
-AquaHideout_B2F_Text_Grunt6Defeat: @ 82341CE
+AquaHideout_B2F_Text_Grunt6Defeat:
 	.string "What's wrong with you?\n"
 	.string "You're not tired at all!$"
 
-AquaHideout_B2F_Text_Grunt6PostBattle: @ 82341FE
+AquaHideout_B2F_Text_Grunt6PostBattle:
 	.string "That reminds me… I can't remember\n"
 	.string "where I put the MASTER BALL.\p"
 	.string "If I fail to guard it, our BOSS will\n"
 	.string "chew me out…$"
 
-AquaHideout_B2F_Text_Grunt8Intro: @ 823426F
+AquaHideout_B2F_Text_Grunt8Intro:
 	.string "When I joined TEAM AQUA, the first\n"
 	.string "thing I had to learn was how these\l"
 	.string "warp panels connected.$"
 
-AquaHideout_B2F_Text_Grunt8Defeat: @ 82342CC
+AquaHideout_B2F_Text_Grunt8Defeat:
 	.string "I was too occupied thinking about\n"
 	.string "the warp panels…$"
 
-AquaHideout_B2F_Text_Grunt8PostBattle: @ 82342FF
+AquaHideout_B2F_Text_Grunt8PostBattle:
 	.string "I'll have to learn about how I can\n"
 	.string "battle more effectively…$"
diff --git a/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc
index 73cde82a9..ed01251e6 100644
--- a/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap1/scripts.inc
@@ -1,3 +1,3 @@
-AquaHideout_UnusedRubyMap1_MapScripts:: @ 823929B
+AquaHideout_UnusedRubyMap1_MapScripts::
 	.byte 0
 
diff --git a/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc
index 28901497a..adf4c5b8c 100644
--- a/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap2/scripts.inc
@@ -1,3 +1,3 @@
-AquaHideout_UnusedRubyMap2_MapScripts:: @ 823929C
+AquaHideout_UnusedRubyMap2_MapScripts::
 	.byte 0
 
diff --git a/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc
index de0e6d7dd..518a6c019 100644
--- a/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc
+++ b/data/maps/AquaHideout_UnusedRubyMap3/scripts.inc
@@ -1,3 +1,3 @@
-AquaHideout_UnusedRubyMap3_MapScripts:: @ 823929D
+AquaHideout_UnusedRubyMap3_MapScripts::
 	.byte 0
 
diff --git a/data/maps/ArtisanCave_1F/scripts.inc b/data/maps/ArtisanCave_1F/scripts.inc
index 18090ff68..66e478ade 100644
--- a/data/maps/ArtisanCave_1F/scripts.inc
+++ b/data/maps/ArtisanCave_1F/scripts.inc
@@ -1,3 +1,3 @@
-ArtisanCave_1F_MapScripts:: @ 823AFB7
+ArtisanCave_1F_MapScripts::
 	.byte 0
 
diff --git a/data/maps/ArtisanCave_B1F/scripts.inc b/data/maps/ArtisanCave_B1F/scripts.inc
index 4dd850e88..a7afb0776 100644
--- a/data/maps/ArtisanCave_B1F/scripts.inc
+++ b/data/maps/ArtisanCave_B1F/scripts.inc
@@ -1,8 +1,8 @@
-ArtisanCave_B1F_MapScripts:: @ 823AFAD
+ArtisanCave_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_OnTransition
 	.byte 0
 
-ArtisanCave_B1F_OnTransition: @ 823AFB3
+ArtisanCave_B1F_OnTransition:
 	setflag FLAG_LANDMARK_ARTISAN_CAVE
 	end
 
diff --git a/data/maps/BattleColosseum_2P/scripts.inc b/data/maps/BattleColosseum_2P/scripts.inc
index 97c6a5d0b..460943a87 100644
--- a/data/maps/BattleColosseum_2P/scripts.inc
+++ b/data/maps/BattleColosseum_2P/scripts.inc
@@ -1,3 +1,3 @@
-BattleColosseum_2P_MapScripts:: @ 823B77D
+BattleColosseum_2P_MapScripts::
 	.byte 0
 
diff --git a/data/maps/BattleColosseum_4P/scripts.inc b/data/maps/BattleColosseum_4P/scripts.inc
index 70dca8e27..f18dd7abd 100644
--- a/data/maps/BattleColosseum_4P/scripts.inc
+++ b/data/maps/BattleColosseum_4P/scripts.inc
@@ -1,3 +1,3 @@
-BattleColosseum_4P_MapScripts:: @ 823B780
+BattleColosseum_4P_MapScripts::
 	.byte 0
 
diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
index ac48a45bf..4f7d3bd87 100644
--- a/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
@@ -7,7 +7,7 @@
 .set LOCALID_PLAYER, 8
 .set LOCALID_ANNOUNCER, 9
 
-BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487
+BattleFrontier_BattleArenaBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_OnWarp
@@ -17,16 +17,16 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487
 	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
 	@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_1
 
-BattleFrontier_BattleArenaBattleRoom_OnResume: @ 825749C
+BattleFrontier_BattleArenaBattleRoom_OnResume:
 	special OffsetCameraForBattle
 	end
 
-BattleFrontier_BattleArenaBattleRoom_OnTransition: @ 82574A0
+BattleFrontier_BattleArenaBattleRoom_OnTransition:
 	frontier_settrainers
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx
 	end
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx:: @ 82574AE
+BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale
@@ -34,19 +34,19 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx:: @ 82574AE
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale:: @ 82574C6
+BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale:: @ 82574CC
+BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattleArenaBattleRoom_OnFrame: @ 82574D2
+BattleFrontier_BattleArenaBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC
+BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom::
 	lockall
 	showobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter
@@ -60,7 +60,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
+BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers::
 	tower_setopponent
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter
@@ -97,7 +97,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner:: @ 82575DB
+BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner::
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
 	applymovement LOCALID_BLACK_BELT_1, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
 	applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
@@ -108,12 +108,12 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner:: @ 82575
 	waitmovement 0
 	arena_gettrainername
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost:: @ 8257615
+BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
 	waitstate
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent:: @ 8257630
+BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent::
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
@@ -134,7 +134,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent:: @ 8257630
 	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent::
 	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
@@ -163,7 +163,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
 	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8257768
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge
@@ -171,7 +171,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @
 	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle:: @ 825779E
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattleArenaBattleRoom_Text_RecordLastBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -180,18 +180,18 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle:: @ 825779E
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_RecordBattle:: @ 82577D0
+BattleFrontier_BattleArenaBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge:: @ 82577DA
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 	case YES, BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge:: @ 8257808
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -200,50 +200,50 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge:: @ 8257808
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge:: @ 825783A
+BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge::
 	closemessage
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight
 	waitmovement 0
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers
 	waitstate
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon:: @ 8257852
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon::
 	delay 60
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
 	waitstate
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8257870
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8257877
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor4thOpponent:: @ 825787E
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor4thOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8257885
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor5thOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent:: @ 825788C
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8257893
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor7thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge:: @ 825789A
+BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait
 	waitmessage
 	arena_save CHALLENGE_STATUS_PAUSED
@@ -253,12 +253,12 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge:: @ 825789A
 	frontier_reset
 	end
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext:: @ 82578BC
+BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext::
 	compare VAR_TEMP_2, 1
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_NowFaceTycoon, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon::
 	message BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon
 	waitmessage
 	call BattleFrontier_EventScript_GetCantRecordBattle
@@ -272,7 +272,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4
 	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord:: @ 825792B
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta
@@ -280,7 +280,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord:: @ 8
 	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961
+BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta::
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight
@@ -321,14 +321,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver:: @ 8257A3F
+BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver::
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle, MSGBOX_DEFAULT
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: @ 8257A5C
+BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver::
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner
 	frontier_getsymbols
 	compare VAR_RESULT, 0
@@ -344,7 +344,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: @ 8257A5C
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_GoingToBeFunNextTime, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold:: @ 8257AA5
+BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold
@@ -358,14 +358,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold:: @ 8257AA5
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WontAllowHalfheartedEffort, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold:: @ 8257AF8
+BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold::
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted, MSGBOX_DEFAULT
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: @ 8257B15
+BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold::
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner
 	frontier_getsymbols
 	compare VAR_RESULT, 2
@@ -381,12 +381,12 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: @ 8257B15
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_IfWeBattleAgainWontLose, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle:: @ 8257B5E
+BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle::
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle:: @ 8257B6C
+BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle::
 	closemessage
 	setvar VAR_TEMP_2, 0
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
@@ -400,7 +400,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle:: @ 8257B6C
 	frontier_resetsketch
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner:: @ 8257BA9
+BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner::
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
 	applymovement LOCALID_BLACK_BELT_1, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
 	applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
@@ -414,39 +414,39 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner:: @ 8257BA9
 	call BattleFrontier_EventScript_IncrementWinStreak
 	return
 
-BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter: @ 8257BE2
+BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter:
 	walk_right
 	walk_right
-BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong: @ 8257BE4
+BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong:
 	walk_right
-BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward: @ 8257BE5
+BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward:
 	walk_right
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_PlayerWalkBackToLine: @ 8257BE7
+BattleFrontier_BattleArenaBattleRoom_Movement_PlayerWalkBackToLine:
 	walk_left
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft: @ 8257BEB
+BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft:
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight: @ 8257BED
+BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight:
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter: @ 8257BEF
+BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter:
 	walk_left
 	walk_left
-BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong: @ 8257BF1
+BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong:
 	walk_left
-BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward: @ 8257BF2
+BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward:
 	walk_left
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_GretaEnter: @ 8257BF4
+BattleFrontier_BattleArenaBattleRoom_Movement_GretaEnter:
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -454,7 +454,7 @@ BattleFrontier_BattleArenaBattleRoom_Movement_GretaEnter: @ 8257BF4
 	walk_fast_left
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_OpponentExit: @ 8257BFA
+BattleFrontier_BattleArenaBattleRoom_Movement_OpponentExit:
 	walk_right
 	walk_right
 	walk_right
@@ -464,30 +464,30 @@ BattleFrontier_BattleArenaBattleRoom_Movement_OpponentExit: @ 8257BFA
 	walk_right
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown: @ 8257C02
+BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown:
 	disable_jump_landing_ground_effect
 	jump_in_place_down
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp: @ 8257C05
+BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp:
 	disable_jump_landing_ground_effect
 	jump_in_place_up
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown: @ 8257C08
+BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown:
 	walk_in_place_fastest_down
 	step_end
 
 @ Unused, redundant
-BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight2: @ 8257C0A
+BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight2:
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_OnWarp: @ 8257C0C
+BattleFrontier_BattleArenaBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects
 	.2byte 0
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects:: @ 8257C16
+BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects::
 	hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
 	removeobject LOCALID_OPPONENT
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
@@ -495,7 +495,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects:: @ 8257C16
 	setvar VAR_TEMP_1, 1
 	end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer: @ 8257C30
+BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer:
 	walk_down
 	walk_in_place_fastest_left
 	delay_16
@@ -507,97 +507,97 @@ BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer: @ 8257C30
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter: @ 8257C3A
+BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter:
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward: @ 8257C3D
+BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward:
 	.string "REFEREE: TRAINER {PLAYER}!\n"
 	.string "Step forward, please!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_OpponentStepForward: @ 8257C68
+BattleFrontier_BattleArenaBattleRoom_Text_OpponentStepForward:
 	.string "REFEREE: TRAINER {STR_VAR_1}!\n"
 	.string "Step forward, please!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin: @ 8257C93
+BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin:
 	.string "REFEREE: Set KO Tourney!\n"
 	.string "Begin!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer: @ 8257CB3
+BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer:
 	.string "REFEREE: The winner is {PLAYER}!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent: @ 8257CCE
+BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent:
 	.string "REFEREE: The winner is {STR_VAR_1}!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored: @ 8257CE9
+BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored:
 	.string "Your POKéMON will be restored to\n"
 	.string "full health.$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent: @ 8257D17
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent:
 	.string "Next up, your second opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent: @ 8257D50
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent:
 	.string "Next up, your third opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor4thOpponent: @ 8257D88
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor4thOpponent:
 	.string "Next up, your fourth opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor5thOpponent: @ 8257DC1
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor5thOpponent:
 	.string "Next up, your fifth opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor6thOpponent: @ 8257DF9
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor6thOpponent:
 	.string "Next up, your sixth opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor7thOpponent: @ 8257E31
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor7thOpponent:
 	.string "Next up, your seventh opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown: @ 8257E6B
+BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown:
 	.string "Would you like to save the game and\n"
 	.string "shut down now?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge: @ 8257E9E
+BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge:
 	.string "Would you like to retire from your\n"
 	.string "Set KO Tourney challenge?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait: @ 8257EDB
+BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait:
 	.string "I am saving your game data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_RecordLastBattle: @ 8257F04
+BattleFrontier_BattleArenaBattleRoom_Text_RecordLastBattle:
 	.string "Would you like to record your last\n"
 	.string "battle on your FRONTIER PASS?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_NowFaceTycoon: @ 8257F45
+BattleFrontier_BattleArenaBattleRoom_Text_NowFaceTycoon:
 	.string "My dear challenger!\p"
 	.string "Your skill level is truly astounding!\p"
 	.string "We now would like you to face our\n"
 	.string "leader, the ARENA TYCOON!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon: @ 8257FBB
+BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon:
 	.string "A battle with the ARENA TYCOON!\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta: @ 8257FED
+BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta:
 	.string "REFEREE: The ARENA TYCOON!\n"
 	.string "Make way for GRETA!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureChallenger: @ 825801C
+BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureChallenger:
 	.string "GRETA: Hey!\n"
 	.string "Howdy!\p"
 	.string "…Wait, are you the challenger?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_IsThatRight: @ 825804E
+BattleFrontier_BattleArenaBattleRoom_Text_IsThatRight:
 	.string "Is that right? Hmm…\n"
 	.string "Hmhm…$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy: @ 8258068
+BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy:
 	.string "I don't know how to say it, but…\n"
 	.string "To put it bluntly, you look pretty weak.\l"
 	.string "Are you sure you're up for me?\p"
@@ -605,53 +605,53 @@ BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy: @ 8258068
 	.string "Well, all right!\n"
 	.string "We'll take things easy to start with!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle: @ 825810D
+BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle:
 	.string "Okay! Let's see you ignite my passion\n"
 	.string "for battle!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll: @ 825813F
+BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll:
 	.string "GRETA: Ow, wait a second!\n"
 	.string "You are tough after all!\p"
 	.string "I like you!\n"
 	.string "Let's see your FRONTIER PASS.$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol: @ 825819C
+BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol:
 	.string "The Guts Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GoingToBeFunNextTime: @ 82581CF
+BattleFrontier_BattleArenaBattleRoom_Text_GoingToBeFunNextTime:
 	.string "Hmm…\p"
 	.string "It's going to be fun the next time!\n"
 	.string "I'm looking forward to it!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GretaLookingForwardToSeeingAgain: @ 8258213
+BattleFrontier_BattleArenaBattleRoom_Text_GretaLookingForwardToSeeingAgain:
 	.string "GRETA: Hey! Howdy!\n"
 	.string "You finally won your way up to me!\p"
 	.string "I was getting worried waiting for you!\n"
 	.string "I was really looking forward to seeing\l"
 	.string "you again!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_SoAreYouReady: @ 82582A2
+BattleFrontier_BattleArenaBattleRoom_Text_SoAreYouReady:
 	.string "… … …\n"
 	.string "So, are you ready?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_WontAllowHalfheartedEffort: @ 82582BB
+BattleFrontier_BattleArenaBattleRoom_Text_WontAllowHalfheartedEffort:
 	.string "I won't allow a halfhearted effort!\n"
 	.string "Be ready for a thrashing!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted: @ 82582F9
+BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted:
 	.string "Come on, REFEREE!\n"
 	.string "Let's get this started!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway: @ 8258323
+BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway:
 	.string "GRETA: Gaaah! Blown away!\n"
 	.string "Let's see your FRONTIER PASS!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine: @ 825835B
+BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine:
 	.string "The Guts Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_IfWeBattleAgainWontLose: @ 8258383
+BattleFrontier_BattleArenaBattleRoom_Text_IfWeBattleAgainWontLose:
 	.string "Arrrgh!\n"
 	.string "This is so infuriating!\p"
 	.string "If we ever battle again, I won't lose!\n"
diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
index 7044caa39..fe808159e 100644
--- a/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
@@ -1,14 +1,14 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9
+BattleFrontier_BattleArenaCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattleArenaCorridor_OnFrame: @ 82573BF
+BattleFrontier_BattleArenaCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom
 	.2byte 0
 
-BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom:: @ 82573C9
+BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom::
 	delay 16
 	setvar VAR_TEMP_0, 1
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor
@@ -26,7 +26,7 @@ BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom:: @ 82573C9
 	waitstate
 	end
 
-BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor: @ 8257417
+BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor:
 	walk_up
 	walk_left
 	walk_left
@@ -49,12 +49,12 @@ BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor: @ 8257417
 	walk_right
 	step_end
 
-BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor: @ 825742C
+BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor:
 	walk_right
 	set_invisible
 	step_end
 
-BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor: @ 825742F
+BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor:
 	walk_left
 	walk_left
 	walk_left
@@ -77,16 +77,16 @@ BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor: @ 825742F
 	walk_right
 	step_end
 
-BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer: @ 8257444
+BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer:
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay: @ 8257446
+BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay:
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn: @ 8257449
+BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn:
 	.string "Your battles shall be waged in\n"
 	.string "the next room. Please step in!$"
 
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
index 2c8253456..287fd4639 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
@@ -1,20 +1,20 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36
+BattleFrontier_BattleArenaLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleArenaLobby_OnWarp: @ 8255C41
+BattleFrontier_BattleArenaLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth:: @ 8255C4B
+BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleArenaLobby_OnFrame: @ 8255C55
+BattleFrontier_BattleArenaLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge
@@ -22,11 +22,11 @@ BattleFrontier_BattleArenaLobby_OnFrame: @ 8255C55
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleArenaLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattleArenaLobby_EventScript_GetChallengeStatus:: @ 8255C7F
+BattleFrontier_BattleArenaLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving:: @ 8255C88
+BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox BattleFrontier_BattleArenaLobby_Text_DidntSaveBeforeShuttingDown, MSGBOX_DEFAULT
 	closemessage
@@ -37,7 +37,7 @@ BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving:: @ 8255C88
 	releaseall
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_WonChallenge:: @ 8255CCF
+BattleFrontier_BattleArenaLobby_EventScript_WonChallenge::
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
@@ -45,9 +45,9 @@ BattleFrontier_BattleArenaLobby_EventScript_WonChallenge:: @ 8255CCF
 	msgbox BattleFrontier_BattleArenaLobby_Text_CongratsOnSevenWins, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattleArenaLobby_EventScript_DefeatedTycoon:: @ 8255CF0
+BattleFrontier_BattleArenaLobby_EventScript_DefeatedTycoon::
 	msgbox BattleFrontier_BattleArenaLobby_Text_CongratsOnDefeatingTycoon, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints:: @ 8255CF8
+BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattleArenaLobby_Text_PleaseAcceptBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -60,7 +60,7 @@ BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints:: @ 8255CF8
 	releaseall
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_LostChallenge:: @ 8255D2B
+BattleFrontier_BattleArenaLobby_EventScript_LostChallenge::
 	lockall
 	message BattleFrontier_BattleArenaLobby_Text_ThankYouWaitWhileSave
 	waitmessage
@@ -72,7 +72,7 @@ BattleFrontier_BattleArenaLobby_EventScript_LostChallenge:: @ 8255D2B
 	releaseall
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge:: @ 8255D59
+BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge::
 	frontier_checkairshow
 	special LoadPlayerParty
 	special HealPlayerParty
@@ -90,12 +90,12 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge:: @ 8255D59
 	case 0, BattleFrontier_BattleArenaLobby_EventScript_RecordMatch
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_RecordMatch:: @ 8255DBA
+BattleFrontier_BattleArenaLobby_EventScript_RecordMatch::
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge:: @ 8255DBF
+BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge::
 	return
 
-BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge:: @ 8255DC0
+BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge::
 	lockall
 	message BattleFrontier_BattleArenaLobby_Text_LookingForwardToArrivalSaveGame
 	waitmessage
@@ -106,14 +106,14 @@ BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge:: @ 8255DC0
 	setvar VAR_TEMP_0, 255
 	goto BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_Attendant:: @ 8255DF4
+BattleFrontier_BattleArenaLobby_EventScript_Attendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_ARENA
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleArenaLobby_Text_WelcomeToBattleArena, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge:: @ 8255E0B
+BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge::
 	message BattleFrontier_BattleArenaLobby_Text_WishToTakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -123,7 +123,7 @@ BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge:: @ 8255E0B
 	case 2, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge:: @ 8255E47
+BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattleArenaLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -149,7 +149,7 @@ BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge:: @ 8255E47
 	case YES, BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge:: @ 8255EE8
+BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	arena_init
@@ -163,7 +163,7 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge:: @ 8255EE8
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed
-BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge:: @ 8255F54
+BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox BattleFrontier_BattleArenaLobby_Text_GuideYouToArena, MSGBOX_DEFAULT
@@ -178,36 +178,36 @@ BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge:: @ 8255F54
 	waitstate
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_ExplainChallenge:: @ 8255F9F
+BattleFrontier_BattleArenaLobby_EventScript_ExplainChallenge::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainChallenge, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons:: @ 8255FAC
+BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLv50:: @ 8255FC7
+BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8255FD4
+BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed:: @ 8255FE1
+BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge:: @ 8255FF8
+BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge:: @ 8255FFB
+BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge:: @ 8256003
+BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50:: @ 8256005
+BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor
 	waitmovement 0
@@ -220,7 +220,7 @@ BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50:: @ 8256005
 	waitdooranim
 	return
 
-BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor: @ 8256034
+BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor:
 	walk_up
 	walk_up
 	walk_up
@@ -232,12 +232,12 @@ BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor: @ 8256034
 	walk_up
 	step_end
 
-BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor: @ 825603E
+BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor: @ 8256041
+BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor:
 	walk_up
 	walk_up
 	walk_up
@@ -250,13 +250,13 @@ BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor: @ 8256041
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor: @ 825604C
+BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen:: @ 8256050
+BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor
 	waitmovement 0
@@ -269,7 +269,7 @@ BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen:: @ 8256050
 	waitdooranim
 	return
 
-BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor: @ 825607F
+BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor:
 	walk_up
 	walk_up
 	walk_up
@@ -280,7 +280,7 @@ BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor: @ 825607F
 	walk_up
 	step_end
 
-BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor: @ 8256088
+BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor:
 	walk_up
 	walk_up
 	walk_up
@@ -292,7 +292,7 @@ BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor: @ 8256088
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleArenaLobby_EventScript_ShowResults:: @ 8256092
+BattleFrontier_BattleArenaLobby_EventScript_ShowResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_ARENA
 	waitbuttonpress
@@ -300,29 +300,29 @@ BattleFrontier_BattleArenaLobby_EventScript_ShowResults:: @ 8256092
 	releaseall
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_Youngster:: @ 82560A6
+BattleFrontier_BattleArenaLobby_EventScript_Youngster::
 	msgbox BattleFrontier_BattleArenaLobby_Text_BadIdeaToNotAttack, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_Man:: @ 82560AF
+BattleFrontier_BattleArenaLobby_EventScript_Man::
 	msgbox BattleFrontier_BattleArenaLobby_Text_LandingHitsWorked, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_Camper:: @ 82560B8
+BattleFrontier_BattleArenaLobby_EventScript_Camper::
 	msgbox BattleFrontier_BattleArenaLobby_Text_MatchWasDeclaredDraw, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_Woman:: @ 82560C1
+BattleFrontier_BattleArenaLobby_EventScript_Woman::
 	msgbox BattleFrontier_BattleArenaLobby_Text_OrderOfMonsImportant, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_RulesBoard:: @ 82560CA
+BattleFrontier_BattleArenaLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattleArenaLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard:: @ 82560D9
+BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 2, MULTI_BATTLE_ARENA_RULES, FALSE
@@ -335,45 +335,45 @@ BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard:: @ 82560D9
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_BattleRules:: @ 825612C
+BattleFrontier_BattleArenaLobby_EventScript_BattleRules::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_MindRules:: @ 825613A
+BattleFrontier_BattleArenaLobby_EventScript_MindRules::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainMindRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_SkillRules:: @ 8256148
+BattleFrontier_BattleArenaLobby_EventScript_SkillRules::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_BodyRules:: @ 8256156
+BattleFrontier_BattleArenaLobby_EventScript_BodyRules::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_ExitRules:: @ 8256164
+BattleFrontier_BattleArenaLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattleArenaLobby_Text_WelcomeToBattleArena: @ 8256166
+BattleFrontier_BattleArenaLobby_Text_WelcomeToBattleArena:
 	.string "Where the battling spirit of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "I welcome you to the BATTLE ARENA!\p"
 	.string "I am your guide to the Set KO Tourney!$"
 
-BattleFrontier_BattleArenaLobby_Text_WishToTakeChallenge: @ 82561EA
+BattleFrontier_BattleArenaLobby_Text_WishToTakeChallenge:
 	.string "Now, do you wish to take\n"
 	.string "the BATTLE ARENA challenge?$"
 
-BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge: @ 825621F
+BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge:
 	.string "We await your challenge on\n"
 	.string "another occasion!$"
 
-BattleFrontier_BattleArenaLobby_Text_ExplainChallenge: @ 825624C
+BattleFrontier_BattleArenaLobby_Text_ExplainChallenge:
 	.string "In the BATTLE ARENA, we undertake\n"
 	.string "the Set KO Tourney.\p"
 	.string "All participants enter with a team of\n"
@@ -394,20 +394,20 @@ BattleFrontier_BattleArenaLobby_Text_ExplainChallenge: @ 825624C
 	.string "seven TRAINERS in succession,\l"
 	.string "we will present you with Battle Points.$"
 
-BattleFrontier_BattleArenaLobby_Text_OkayToSave: @ 82564CE
+BattleFrontier_BattleArenaLobby_Text_OkayToSave:
 	.string "Before showing you to the BATTLE\n"
 	.string "ARENA, you must save. Is that okay?$"
 
-BattleFrontier_BattleArenaLobby_Text_WhichLevelMode: @ 8256513
+BattleFrontier_BattleArenaLobby_Text_WhichLevelMode:
 	.string "The BATTLE ARENA offers two levels\n"
 	.string "of challenge, Level 50 and Open Level.\l"
 	.string "Which is your choice?$"
 
-BattleFrontier_BattleArenaLobby_Text_SelectThreeMons: @ 8256573
+BattleFrontier_BattleArenaLobby_Text_SelectThreeMons:
 	.string "Very well, now select your\n"
 	.string "three POKéMON, please.$"
 
-BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen: @ 82565A5
+BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "My dear challenger!\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for entry.\p"
@@ -419,7 +419,7 @@ BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen: @ 82565A5
 	.string "When you have made your preparations,\n"
 	.string "please do return.$"
 
-BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50: @ 82566A8
+BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50:
 	.string "My dear challenger!\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for entry.\p"
@@ -433,11 +433,11 @@ BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50: @ 82566A8
 	.string "When you have made your preparations,\n"
 	.string "please do return.$"
 
-BattleFrontier_BattleArenaLobby_Text_GuideYouToArena: @ 82567E6
+BattleFrontier_BattleArenaLobby_Text_GuideYouToArena:
 	.string "I shall now guide you to\n"
 	.string "the BATTLE ARENA.$"
 
-BattleFrontier_BattleArenaLobby_Text_DidntSaveBeforeShuttingDown: @ 8256811
+BattleFrontier_BattleArenaLobby_Text_DidntSaveBeforeShuttingDown:
 	.string "My dear challenger!\p"
 	.string "You did not save the game before\n"
 	.string "shutting down, did you?\p"
@@ -447,67 +447,67 @@ BattleFrontier_BattleArenaLobby_Text_DidntSaveBeforeShuttingDown: @ 8256811
 	.string "You may, of course, start with a fresh\n"
 	.string "challenge.$"
 
-BattleFrontier_BattleArenaLobby_Text_CongratsOnSevenWins: @ 82568E7
+BattleFrontier_BattleArenaLobby_Text_CongratsOnSevenWins:
 	.string "We congratulate you for your splendid\n"
 	.string "string of wins over seven TRAINERS!$"
 
-BattleFrontier_BattleArenaLobby_Text_RecordAchievement: @ 8256931
+BattleFrontier_BattleArenaLobby_Text_RecordAchievement:
 	.string "Your achievement will be recorded.\n"
 	.string "Please wait while I save the game.$"
 
 @ Unused
-BattleFrontier_BattleArenaLobby_Text_PresentYouWithPrize: @ 8256977
+BattleFrontier_BattleArenaLobby_Text_PresentYouWithPrize:
 	.string "In commemoration of your 7-win streak,\n"
 	.string "we present you with this prize.$"
 
 @ Unused
-BattleFrontier_BattleArenaLobby_Text_ReceivedPrize: @ 82569BE
+BattleFrontier_BattleArenaLobby_Text_ReceivedPrize:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
 @ Unused
-BattleFrontier_BattleArenaLobby_Text_BagFullReturnForPrize: @ 82569D8
+BattleFrontier_BattleArenaLobby_Text_BagFullReturnForPrize:
 	.string "Oh?\n"
 	.string "Your BAG seems to be full.\p"
 	.string "I urge you to clear space and\n"
 	.string "return for your prize.$"
 
-BattleFrontier_BattleArenaLobby_Text_ThankYouWaitWhileSave: @ 8256A2C
+BattleFrontier_BattleArenaLobby_Text_ThankYouWaitWhileSave:
 	.string "Thank you so much for participating!\p"
 	.string "Please wait while I save the game.$"
 
-BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge2: @ 8256A74
+BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge2:
 	.string "We await your challenge on\n"
 	.string "another occasion!$"
 
-BattleFrontier_BattleArenaLobby_Text_LookingForwardToArrivalSaveGame: @ 8256AA1
+BattleFrontier_BattleArenaLobby_Text_LookingForwardToArrivalSaveGame:
 	.string "We have been looking forward to\n"
 	.string "your arrival.\p"
 	.string "Before I show you to the BATTLE\n"
 	.string "ARENA, I must save the game.\l"
 	.string "Please wait.$"
 
-BattleFrontier_BattleArenaLobby_Text_RecordLastMatch: @ 8256B19
+BattleFrontier_BattleArenaLobby_Text_RecordLastMatch:
 	.string "Shall I record your last BATTLE ARENA\n"
 	.string "match on your FRONTIER PASS?$"
 
-BattleFrontier_BattleArenaLobby_Text_BadIdeaToNotAttack: @ 8256B5C
+BattleFrontier_BattleArenaLobby_Text_BadIdeaToNotAttack:
 	.string "I lost on the REFEREE's decision…\p"
 	.string "I don't think it was a good idea to only\n"
 	.string "use defensive moves and not attack…$"
 
-BattleFrontier_BattleArenaLobby_Text_LandingHitsWorked: @ 8256BCB
+BattleFrontier_BattleArenaLobby_Text_LandingHitsWorked:
 	.string "I won in judging!\p"
 	.string "Landing hits consistently on\n"
 	.string "the opponent's POKéMON worked!$"
 
-BattleFrontier_BattleArenaLobby_Text_MatchWasDeclaredDraw: @ 8256C19
+BattleFrontier_BattleArenaLobby_Text_MatchWasDeclaredDraw:
 	.string "Our match was declared a draw.\p"
 	.string "When we ran out of time, both my\n"
 	.string "POKéMON and the opponent's had about\l"
 	.string "the same amount of HP left.$"
 
-BattleFrontier_BattleArenaLobby_Text_OrderOfMonsImportant: @ 8256C9A
+BattleFrontier_BattleArenaLobby_Text_OrderOfMonsImportant:
 	.string "In the BATTLE ARENA, the order of\n"
 	.string "POKéMON is totally important.\p"
 	.string "For example, if your first POKéMON\n"
@@ -518,13 +518,13 @@ BattleFrontier_BattleArenaLobby_Text_OrderOfMonsImportant: @ 8256C9A
 	.string "I think that will be a good way of\n"
 	.string "making an effective team.$"
 
-BattleFrontier_BattleArenaLobby_Text_RulesAreListed: @ 8256DB8
+BattleFrontier_BattleArenaLobby_Text_RulesAreListed:
 	.string "The Set KO Tourney's rules are listed.$"
 
-BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading: @ 8256DDF
+BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules: @ 8256E02
+BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules:
 	.string "The Set KO Tourney has special rules,\n"
 	.string "unlike standard battles.\p"
 	.string "First, one battle lasts only\n"
@@ -536,7 +536,7 @@ BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules: @ 8256E02
 	.string "Also, a POKéMON cannot be switched out\n"
 	.string "until its battle's outcome is decided.$"
 
-BattleFrontier_BattleArenaLobby_Text_ExplainMindRules: @ 8256F43
+BattleFrontier_BattleArenaLobby_Text_ExplainMindRules:
 	.string "The first judging factor is “Mind.”\n"
 	.string "This factor evaluates how aggressive\l"
 	.string "the battlers were.\p"
@@ -544,7 +544,7 @@ BattleFrontier_BattleArenaLobby_Text_ExplainMindRules: @ 8256F43
 	.string "the TRAINERS ordered the use of\l"
 	.string "offensive moves.$"
 
-BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules: @ 8256FF2
+BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules:
 	.string "The second judging factor is “Skill.”\n"
 	.string "This factor evaluates how effectively\l"
 	.string "POKéMON moves were used.\p"
@@ -563,7 +563,7 @@ BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules: @ 8256FF2
 	.string "hit with a move, its Skill rating will not\l"
 	.string "go down.$"
 
-BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules: @ 8257202
+BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules:
 	.string "The third judging factor is “Body.”\n"
 	.string "This factor is based on how much HP\l"
 	.string "remained at the end of a battle.\p"
@@ -571,13 +571,13 @@ BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules: @ 8257202
 	.string "HP a POKéMON had at the start of\l"
 	.string "battle, and what remained at the end.$"
 
-BattleFrontier_BattleArenaLobby_Text_CongratsOnDefeatingTycoon: @ 82572D9
+BattleFrontier_BattleArenaLobby_Text_CongratsOnDefeatingTycoon:
 	.string "A victory snatched from the ARENA\n"
 	.string "TYCOON, and a seven-TRAINER sweep!\p"
 	.string "We congratulate you on your most\n"
 	.string "splendid challenge!$"
 
-BattleFrontier_BattleArenaLobby_Text_PleaseAcceptBattlePoints: @ 8257353
+BattleFrontier_BattleArenaLobby_Text_PleaseAcceptBattlePoints:
 	.string "My dear challenger, in recognition of\n"
 	.string "your indefatigable spirit, please\l"
 	.string "accept these Battle Point(s).$"
diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
index f9cc466a2..b092d5603 100644
--- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
@@ -5,7 +5,7 @@
 .set LOCALID_PLAYER, 13
 .set LOCALID_OPPONENT, 15
 
-BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
+BattleFrontier_BattleDomeBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_OnWarp
@@ -16,7 +16,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
 	.set DRAW_TRAINER,  1
 	.set DRAW_TUCKER,   2
 
-BattleFrontier_BattleDomeBattleRoom_OnTransition: @ 824BCB1
+BattleFrontier_BattleDomeBattleRoom_OnTransition:
 	dome_setopponentgfx
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	copyvar VAR_TEMP_F, VAR_RESULT
@@ -25,7 +25,7 @@ BattleFrontier_BattleDomeBattleRoom_OnTransition: @ 824BCB1
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
 	end
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx:: @ 824BCDC
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale
@@ -33,19 +33,19 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx:: @ 824BCDC
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale:: @ 824BCF4
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824BCFA
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattleDomeBattleRoom_OnFrame: @ 824BD00
+BattleFrontier_BattleDomeBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom:: @ 824BD0A
+BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom::
 	lockall
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	compare VAR_RESULT, DOME_ROUND1
@@ -60,13 +60,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom:: @ 824BD0A
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter
 	compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker
-BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter:: @ 824BD4E
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter::
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnter
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker:: @ 824BD5A
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker::
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker
-BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer:: @ 824BD61
+BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer::
 	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitmovement 0
@@ -74,7 +74,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer:: @ 824BD6
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent
 	compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTucker
-BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: @ 824BD82
+BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent::
 	dome_getopponentname
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTrainer, MSGBOX_DEFAULT
 	closemessage
@@ -92,7 +92,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: @ 824BD82
 	case B_OUTCOME_LOST, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent
 	case B_OUTCOME_FORFEITED, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent
 	setvar VAR_TEMP_2, DRAW_TRAINER
-BattleFrontier_BattleDomeBattleRoom_EventScript_Draw:: @ 824BDF7
+BattleFrontier_BattleDomeBattleRoom_EventScript_Draw::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait, MSGBOX_DEFAULT
 	closemessage
 	playse SE_M_ENCORE2
@@ -110,7 +110,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_Draw:: @ 824BDF7
 	dome_compareseeds
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent:: @ 824BE4F
+BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent::
 	applymovement LOCALID_ANNOUNCER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	dome_getopponentname
@@ -123,30 +123,30 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent:: @ 824BE4F
 	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	delay 60
-BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney:: @ 824BE8D
+BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney::
 	dome_resolvewinners DOME_PLAYER_LOST_MATCH
-BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobbyLost:: @ 824BE9A
+BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon:: @ 824BEB1
+BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon::
 	frontier_gettrainername 1
 	message BattleFrontier_BattleDomeBattleRoom_Text_TrainerIsWinner
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw:: @ 824BEC5
+BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw::
 	frontier_gettrainername 0
 	message BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw:: @ 824BED9
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw::
 	message BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTucker
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: @ 824BEE0
+BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent::
 	applymovement LOCALID_ANNOUNCER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	compare VAR_TEMP_2, NO_DRAW
@@ -167,7 +167,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: @ 824BEE0
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3
 	waitstate
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney:: @ 824BF62
+BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney::
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerApproachAudience
 	waitmovement 0
 	frontier_get FRONTIER_DATA_LVL_MODE
@@ -176,9 +176,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney:: @ 824BF62
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney:: @ 824BF96
+BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp, MSGBOX_DEFAULT
-BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin:: @ 824BF9E
+BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin::
 	special DoDomeConfetti
 	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
@@ -186,15 +186,15 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin:: @ 824BF9E
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon:: @ 824BFC3
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsWinner, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw:: @ 824BFCC
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerPlayer, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer:: @ 824BFD5
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer::
 	dome_get DOME_DATA_ATTEMPTED_CHALLENGE
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt
@@ -207,7 +207,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer:: @ 824BFD5
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt:: @ 824C023
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt::
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound1
@@ -216,27 +216,27 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt:: @ 8
 	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound1:: @ 824C05A
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound1::
 	message BattleFrontier_BattleDomeBattleRoom_Text_BrightNewHope
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound2:: @ 824C061
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound2::
 	message BattleFrontier_BattleDomeBattleRoom_Text_RisingStar
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptSemifinal:: @ 824C068
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptSemifinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_WillTheyRaceToChampionship
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptFinal:: @ 824C06F
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptFinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_CanAchieveChampionFirstTry
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWon:: @ 824C076
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWon::
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound1
@@ -245,27 +245,27 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWon:: @ 824C0
 	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound1:: @ 824C0AD
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound1::
 	message BattleFrontier_BattleDomeBattleRoom_Text_CanLossBeAvenged
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound2:: @ 824C0B4
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound2::
 	message BattleFrontier_BattleDomeBattleRoom_Text_OnFireForChampionship
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonSemifinal:: @ 824C0BB
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonSemifinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_WinHereAdvancesToFinal
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonFinal:: @ 824C0C2
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonFinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_WillLongHeldDreamComeTrue
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion:: @ 824C0C9
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion::
 	compare VAR_TEMP_F, DOME_FINAL
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker
 	switch VAR_TEMP_E
@@ -273,7 +273,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion:: @ 824C0
 	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold
 	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver
 	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker:: @ 824C105
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker::
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound1
@@ -282,35 +282,35 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker::
 	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound1:: @ 824C13C
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound1::
 	message BattleFrontier_BattleDomeBattleRoom_Text_TheInvincibleChampion
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound2:: @ 824C143
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound2::
 	message BattleFrontier_BattleDomeBattleRoom_Text_CanAnyoneHopeToBeatTrainer
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionSemifinal:: @ 824C14A
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionSemifinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_DoBattlesExistSolelyForTrainer
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionFinal:: @ 824C151
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionFinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_CurrentChampAimingToRetainTitle
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver:: @ 824C158
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_FeelGlowOfTrueMaster, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold:: @ 824C161
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_CanWinStreakBeStretched, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreak:: @ 824C16A
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreak::
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound1
@@ -319,44 +319,44 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreak:: @ 8
 	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound1:: @ 824C1A1
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound1::
 	message BattleFrontier_BattleDomeBattleRoom_Text_FormerChampHasReturned
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound2:: @ 824C1A8
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound2::
 	message BattleFrontier_BattleDomeBattleRoom_Text_FormerToughnessReturned
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakSemifinal:: @ 824C1AF
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakSemifinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_WillDoExpectedAdvanceToFinals
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakFinal:: @ 824C1B6
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakFinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_WillFormerChampRegainGlory
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum:: @ 824C1BD
+BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTucker:: @ 824C1CB
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTucker::
 	switch VAR_TEMP_E
 	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver
 	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold
 	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver
 	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver:: @ 824C1FC
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_MakeWayForDomeAceTucker, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold:: @ 824C209
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_LegendHasReturnedDomeAceTucker, MSGBOX_DEFAULT
-BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter:: @ 824C211
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter::
 	closemessage
 	applymovement LOCALID_AUDIENCE_TWIN, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance
@@ -391,7 +391,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter:: @ 824C211
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: @ 824C2B9
+BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_LetsSeeYourStrategy, MSGBOX_DEFAULT
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle
 	switch VAR_RESULT
@@ -415,13 +415,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: @ 824C2B9
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_WontUnderestimateYouNextTime, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerGoldIntro:: @ 824C346
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerGoldIntro::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: @ 824C373
+BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_UnleashAllPowerIPossess, MSGBOX_DEFAULT
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle
 	switch VAR_RESULT
@@ -445,7 +445,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: @ 824C373
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_LookForwardToNextEncounter, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle:: @ 824C400
+BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTucker, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward2
@@ -454,18 +454,18 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle:: @ 824C400
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker:: @ 824C420
+BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker, MSGBOX_DEFAULT
 	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerDraw:: @ 824C436
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerDraw::
 	setvar VAR_TEMP_2, DRAW_TUCKER
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_Draw
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle:: @ 824C440
+BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle::
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_DOME
@@ -479,11 +479,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle:: @ 824C440
 	dome_resetsketch
 	return
 
-BattleFrontier_BattleDomeBattleRoom_OnWarp: @ 824C481
+BattleFrontier_BattleDomeBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects:: @ 824C48B
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects::
 	hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
@@ -501,20 +501,20 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects:: @ 824C48B
 	removeobject LOCALID_OPPONENT
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisibleFacingUp
-BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects:: @ 824C4EF
+BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects::
 	end
 
-BattleFrontier_BattleDomeBattleRoom_OnResume: @ 824C4F0
+BattleFrontier_BattleDomeBattleRoom_OnResume:
 	compare VAR_TEMP_9, 1
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience
 	end
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience:: @ 824C4FC
+BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience::
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience
 	return
 
 @ Add audience members to supplement the permanent object event audience
-BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience:: @ 824C502
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience::
 	compare VAR_TEMP_F, DOME_ROUND1
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience
 	compare VAR_TEMP_F, DOME_ROUND2
@@ -525,10 +525,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience:: @ 824C502
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience:: @ 824C52F
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience::
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience:: @ 824C530
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience::
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
@@ -542,7 +542,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience:: @ 824C530
 	createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience:: @ 824C594
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience::
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
@@ -566,7 +566,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience:: @ 824C594
 	createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience:: @ 824C652
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience::
 	createvobject OBJ_EVENT_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH
@@ -601,27 +601,27 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience:: @ 824C652
 	createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH
 	return
 
-BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible: @ 824C773
+BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible:
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnter: @ 824C775
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnter:
 	set_visible
 	delay_16
 	walk_up
 	walk_up
 	walk_up
 	walk_right
-BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward: @ 824C77B
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward:
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_PlayerApproachAudience: @ 824C77D
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerApproachAudience:
 	walk_up
 	step_end
 
 @ Identical to Movement_PlayerEnter
-BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker: @ 824C77F
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker:
 	set_visible
 	delay_16
 	walk_up
@@ -631,20 +631,20 @@ BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker: @ 824C77F
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward2: @ 824C787
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward2:
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_OpponentStepForward: @ 824C789
+BattleFrontier_BattleDomeBattleRoom_Movement_OpponentStepForward:
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisibleFacingUp: @ 824C78B
+BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisibleFacingUp:
 	face_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance: @ 824C78E
+BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance:
 	set_visible
 	walk_up
 	walk_up
@@ -753,7 +753,7 @@ BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance: @ 824C78E
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance: @ 824C7F9
+BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance:
 	delay_16
 	delay_16
 	walk_left
@@ -803,16 +803,16 @@ BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance: @ 8
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_TuckerStepForward: @ 824C829
+BattleFrontier_BattleDomeBattleRoom_Movement_TuckerStepForward:
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer: @ 824C82B
+BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer:
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround:: @ 824C82E
+BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround::
 	turnvobject 0, DIR_EAST
 	turnvobject 2, DIR_EAST
 	turnvobject 4, DIR_EAST
@@ -881,7 +881,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround:: @ 824C82E
 	delay 20
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby:: @ 824C8F5
+BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles
@@ -889,13 +889,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby:: @ 824C8F5
 	waitstate
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles:: @ 824C90F
+BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles::
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11
 	waitstate
 	end
 
 @ On round 1 there's a 50% chance that a specific audience member will walk to his seat
-BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos:: @ 824C919
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos::
 	random 2
 	copyvar VAR_TEMP_D, VAR_RESULT
 	compare VAR_TEMP_D, 0
@@ -904,13 +904,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos:: @
 	setobjectmovementtype LOCALID_AUDIENCE_WALKING, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat:: @ 824C938
+BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat::
 	compare VAR_TEMP_D, 0
 	goto_if_eq Common_EventScript_NopReturn
 	applymovement LOCALID_AUDIENCE_WALKING, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat
 	return
 
-BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump: @ 824C94B
+BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump:
 	delay_16
 	delay_16
 	delay_16
@@ -931,7 +931,7 @@ BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump: @ 824C94B
 	enable_jump_landing_ground_effect
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat: @ 824C95E
+BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat:
 	walk_down
 	walk_down
 	walk_right
@@ -939,52 +939,52 @@ BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat: @ 824C95E
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter: @ 824C964
+BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter:
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerFaceLeft: @ 824C969
+BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerFaceLeft:
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit: @ 824C96B
+BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit:
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerHasEnteredDome: @ 824C970
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerHasEnteredDome:
 	.string "{PLAYER} has entered the BATTLE DOME!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTrainer: @ 824C990
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTrainer:
 	.string "{STR_VAR_1}\n"
 	.string "match!\p"
 	.string "{PLAYER} versus {STR_VAR_2}!\p"
 	.string "Let the battle begin!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsWinner: @ 824C9BE
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsWinner:
 	.string "{PLAYER} is the winner!\n"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_TrainerIsWinner: @ 824C9E1
+BattleFrontier_BattleDomeBattleRoom_Text_TrainerIsWinner:
 	.string "{STR_VAR_2} is the winner!\n"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ: @ 824CA04
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ:
 	.string "{PLAYER} is the Level 50\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp: @ 824CA44
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp:
 	.string "{PLAYER} is the Open Level\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait: @ 824CA86
+BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait:
 	.string "What an unbelievable finish!\n"
 	.string "We have a double knockout!\p"
 	.string "In this event, the Battle Tournament\n"
@@ -992,7 +992,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait: @ 824CA86
 	.string "Please wait while the judging\n"
 	.string "is under way.$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer: @ 824CB34
+BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer:
 	.string "The REFEREES have reached\n"
 	.string "a decision!\p"
 	.string "The winner is…\n"
@@ -1000,7 +1000,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer: @ 824CB34
 	.string "The winner is {STR_VAR_1}!\l"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerPlayer: @ 824CB9D
+BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerPlayer:
 	.string "The REFEREES have reached\n"
 	.string "a decision!\p"
 	.string "The winner is…\n"
@@ -1008,85 +1008,85 @@ BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerPlayer: @ 824CB9D
 	.string "The winner is {PLAYER}!\l"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_BrightNewHope: @ 824CC06
+BattleFrontier_BattleDomeBattleRoom_Text_BrightNewHope:
 	.string "The bright new hope!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_RisingStar: @ 824CC1C
+BattleFrontier_BattleDomeBattleRoom_Text_RisingStar:
 	.string "The rising star!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WillTheyRaceToChampionship: @ 824CC2E
+BattleFrontier_BattleDomeBattleRoom_Text_WillTheyRaceToChampionship:
 	.string "Will this TRAINER race to\n"
 	.string "the championship?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_CanAchieveChampionFirstTry: @ 824CC5B
+BattleFrontier_BattleDomeBattleRoom_Text_CanAchieveChampionFirstTry:
 	.string "Can the feat of a championship\n"
 	.string "on the first try be achieved?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_CanLossBeAvenged: @ 824CC99
+BattleFrontier_BattleDomeBattleRoom_Text_CanLossBeAvenged:
 	.string "Can the loss of the last match\n"
 	.string "be avenged?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_OnFireForChampionship: @ 824CCC5
+BattleFrontier_BattleDomeBattleRoom_Text_OnFireForChampionship:
 	.string "The TRAINER is on fire for\n"
 	.string "the first championship try!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WinHereAdvancesToFinal: @ 824CCFD
+BattleFrontier_BattleDomeBattleRoom_Text_WinHereAdvancesToFinal:
 	.string "A win here means this TRAINER\n"
 	.string "advances to the final!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WillLongHeldDreamComeTrue: @ 824CD33
+BattleFrontier_BattleDomeBattleRoom_Text_WillLongHeldDreamComeTrue:
 	.string "Will the long-held dream of\n"
 	.string "a championship finally come true?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_TheInvincibleChampion: @ 824CD72
+BattleFrontier_BattleDomeBattleRoom_Text_TheInvincibleChampion:
 	.string "The invincible champion!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_CanAnyoneHopeToBeatTrainer: @ 824CD8C
+BattleFrontier_BattleDomeBattleRoom_Text_CanAnyoneHopeToBeatTrainer:
 	.string "Can anyone hope to beat this\n"
 	.string "TRAINER?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_DoBattlesExistSolelyForTrainer: @ 824CDB3
+BattleFrontier_BattleDomeBattleRoom_Text_DoBattlesExistSolelyForTrainer:
 	.string "Do battles exist solely for\n"
 	.string "this TRAINER?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_CurrentChampAimingToRetainTitle: @ 824CDDE
+BattleFrontier_BattleDomeBattleRoom_Text_CurrentChampAimingToRetainTitle:
 	.string "The current champion aiming to\n"
 	.string "retain the title!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_FormerChampHasReturned: @ 824CE10
+BattleFrontier_BattleDomeBattleRoom_Text_FormerChampHasReturned:
 	.string "The former champion has returned!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_FormerToughnessReturned: @ 824CE33
+BattleFrontier_BattleDomeBattleRoom_Text_FormerToughnessReturned:
 	.string "The former toughness has returned!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WillDoExpectedAdvanceToFinals: @ 824CE57
+BattleFrontier_BattleDomeBattleRoom_Text_WillDoExpectedAdvanceToFinals:
 	.string "Will this TRAINER do as expected\n"
 	.string "and advance to the finals?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WillFormerChampRegainGlory: @ 824CE94
+BattleFrontier_BattleDomeBattleRoom_Text_WillFormerChampRegainGlory:
 	.string "Will the former champ regain\n"
 	.string "lost glory?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_FeelGlowOfTrueMaster: @ 824CEBE
+BattleFrontier_BattleDomeBattleRoom_Text_FeelGlowOfTrueMaster:
 	.string "Feel the glow of a true master!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_MakeWayForDomeAceTucker: @ 824CEDE
+BattleFrontier_BattleDomeBattleRoom_Text_MakeWayForDomeAceTucker:
 	.string "And now… The TRAINER standing in\n"
 	.string "{PLAYER}'s record-setting path…\p"
 	.string "Yes! The one and only!\n"
@@ -1094,11 +1094,11 @@ BattleFrontier_BattleDomeBattleRoom_Text_MakeWayForDomeAceTucker: @ 824CEDE
 	.string "Our very own DOME ACE!\l"
 	.string "Make way for TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_SpectatorTuckerChant: @ 824CF7A
+BattleFrontier_BattleDomeBattleRoom_Text_SpectatorTuckerChant:
 	.string "Spectators: TUCKER! TUCKER!\n"
 	.string "TUCKER! TUCKER! TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro: @ 824CFAE
+BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro:
 	.string "TUCKER: Ahahah!\p"
 	.string "Do you hear it? This crowd!\n"
 	.string "They're all itching to see our match!\p"
@@ -1110,37 +1110,37 @@ BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro: @ 824CFAE
 	.string "I, TUCKER the DOME ACE, will bathe you\l"
 	.string "in my brilliant glow!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_LetsSeeYourStrategy: @ 824D0D9
+BattleFrontier_BattleDomeBattleRoom_Text_LetsSeeYourStrategy:
 	.string "Your strategy!\n"
 	.string "Let's see it!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer: @ 824D0F6
+BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer:
 	.string "Unbelievable! It's incredible!\n"
 	.string "The victor is {PLAYER}!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker: @ 824D127
+BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker:
 	.string "The winner is TUCKER!\n"
 	.string "The DOME ACE has prevailed!\p"
 	.string "Congratulations, TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass: @ 824D172
+BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass:
 	.string "TUCKER: Rules are rules!\n"
 	.string "Let me see your FRONTIER PASS.$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol: @ 824D1AA
+BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol:
 	.string "The Tactics Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WontUnderestimateYouNextTime: @ 824D1E0
+BattleFrontier_BattleDomeBattleRoom_Text_WontUnderestimateYouNextTime:
 	.string "… … … … … …\p"
 	.string "I sorely underestimated you. I won't\n"
 	.string "make the same mistake next time…$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_CanWinStreakBeStretched: @ 824D232
+BattleFrontier_BattleDomeBattleRoom_Text_CanWinStreakBeStretched:
 	.string "Can the win streak be stretched?\n"
 	.string "The confidence is there!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_LegendHasReturnedDomeAceTucker: @ 824D26C
+BattleFrontier_BattleDomeBattleRoom_Text_LegendHasReturnedDomeAceTucker:
 	.string "Ladies and gentlemen!\n"
 	.string "Boys, girls, and POKéMON!\p"
 	.string "Finally!\n"
@@ -1149,7 +1149,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_LegendHasReturnedDomeAceTucker: @ 824D2
 	.string "Our very own DOME ACE!\l"
 	.string "It's none other than TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro: @ 824D319
+BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro:
 	.string "TUCKER: Ah…\n"
 	.string "The pummeling roar of the crowd…\l"
 	.string "Their furnace-like heat of excitement…\l"
@@ -1161,22 +1161,22 @@ BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro: @ 824D319
 	.string "Brighter and more brilliant!\l"
 	.string "I must light all that gather here!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_UnleashAllPowerIPossess: @ 824D43E
+BattleFrontier_BattleDomeBattleRoom_Text_UnleashAllPowerIPossess:
 	.string "I will unleash all the power that\n"
 	.string "I possess! Right here and now!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed: @ 824D47F
+BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed:
 	.string "TUCKER: You're genuinely fantastic!\p"
 	.string "Never before! I haven't ever lost in the\n"
 	.string "times I've had to unleash my power.\p"
 	.string "Yes, quite fantastic!\n"
 	.string "Your FRONTIER PASS, please?$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine: @ 824D522
+BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine:
 	.string "The Tactics Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_LookForwardToNextEncounter: @ 824D54D
+BattleFrontier_BattleDomeBattleRoom_Text_LookForwardToNextEncounter:
 	.string "You're strong, but above all,\n"
 	.string "you have a unique charm!\p"
 	.string "In you, I see a definite potential for\n"
@@ -1185,23 +1185,23 @@ BattleFrontier_BattleDomeBattleRoom_Text_LookForwardToNextEncounter: @ 824D54D
 	.string "our next encounter!$"
 
 @ Unused
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ2: @ 824D5F5
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ2:
 	.string "{PLAYER} is the Level 50\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
 @ Unused
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp2: @ 824D635
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp2:
 	.string "{PLAYER} is the Open Level\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTucker: @ 824D677
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTucker:
 	.string "The final match!\p"
 	.string "{PLAYER} versus the DOME ACE, TUCKER!\p"
 	.string "Let the battle begin!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTucker: @ 824D6BE
+BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTucker:
 	.string "The REFEREES have reached\n"
 	.string "a decision!\p"
 	.string "The winner is…\n"
diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
index 44db802e8..2c35779c7 100644
--- a/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
@@ -1,14 +1,14 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE
+BattleFrontier_BattleDomeCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattleDomeCorridor_OnFrame: @ 824B104
+BattleFrontier_BattleDomeCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
+BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor::
 	delay 16
 	setvar VAR_TEMP_0, 1
 	frontier_get FRONTIER_DATA_LVL_MODE
@@ -26,7 +26,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
 	waitdooranim
 	goto BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom
 
-BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen:: @ 824B161
+BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen
 	waitmovement 0
@@ -37,14 +37,14 @@ BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen:: @ 824B161
 	waitmovement 0
 	closedoor 37, 3
 	waitdooranim
-BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom:: @ 824B18F
+BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom::
 	waitmovement 0
 	setvar VAR_0x8006, 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7
 	waitstate
 	end
 
-BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50: @ 824B1A1
+BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50:
 	walk_up
 	walk_left
 	walk_left
@@ -59,13 +59,13 @@ BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50: @ 824B1A1
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50: @ 824B1AE
+BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50: @ 824B1B2
+BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50:
 	walk_left
 	walk_left
 	walk_left
@@ -79,12 +79,12 @@ BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50: @ 824B1B2
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50: @ 824B1BE
+BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen: @ 824B1C1
+BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen:
 	walk_up
 	walk_right
 	walk_right
@@ -103,13 +103,13 @@ BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen: @ 824B1C1
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen: @ 824B1D2
+BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen: @ 824B1D6
+BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen:
 	walk_right
 	walk_right
 	walk_right
@@ -127,13 +127,13 @@ BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen: @ 824B1D6
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen: @ 824B1E6
+BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen:
 	walk_up
 	set_invisible
 	step_end
 
 @ Unused
-BattleFrontier_BattleDomeCorridor_Movement_WalkToBattleRoomMidRight: @ 824B1E9
+BattleFrontier_BattleDomeCorridor_Movement_WalkToBattleRoomMidRight:
 	walk_up
 	walk_right
 	walk_right
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
index 39bca5a3d..04df6f38c 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -1,26 +1,26 @@
 .set LOCALID_ATTENDANT_SINGLES, 1
 .set LOCALID_ATTENDANT_DOUBLES, 6
 
-BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
+BattleFrontier_BattleDomeLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleDomeLobby_OnResume: @ 82497F2
+BattleFrontier_BattleDomeLobby_OnResume:
 	dome_initresultstree
 	end
 
-BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB
+BattleFrontier_BattleDomeLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth:: @ 8249805
+BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleDomeLobby_OnFrame: @ 824980F
+BattleFrontier_BattleDomeLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge
@@ -28,11 +28,11 @@ BattleFrontier_BattleDomeLobby_OnFrame: @ 824980F
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleDomeLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus:: @ 8249839
+BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving:: @ 8249842
+BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
@@ -44,7 +44,7 @@ BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving:: @ 8249842
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_WonChallenge:: @ 824989B
+BattleFrontier_BattleDomeLobby_EventScript_WonChallenge::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	lockall
 	frontier_isbrain
@@ -53,9 +53,9 @@ BattleFrontier_BattleDomeLobby_EventScript_WonChallenge:: @ 824989B
 	msgbox BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattleDomeLobby_EventScript_DefeatedAce:: @ 82498C1
+BattleFrontier_BattleDomeLobby_EventScript_DefeatedAce::
 	msgbox BattleFrontier_BattleDomeLobby_Text_CongratsDefeatedTucker, MSGBOX_DEFAULT
-BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints:: @ 82498C9
+BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattleDomeLobby_Text_AwardTheseBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -71,7 +71,7 @@ BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints:: @ 82498C9
 	special HealPlayerParty
 	goto BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle
 
-BattleFrontier_BattleDomeLobby_EventScript_LostChallenge:: @ 8249940
+BattleFrontier_BattleDomeLobby_EventScript_LostChallenge::
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_ThankYouForPlaying, MSGBOX_DEFAULT
 	message BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved
@@ -83,7 +83,7 @@ BattleFrontier_BattleDomeLobby_EventScript_LostChallenge:: @ 8249940
 	dome_set DOME_DATA_ATTEMPTED_CHALLENGE, TRUE
 	special LoadPlayerParty
 	special HealPlayerParty
-BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle:: @ 8249991
+BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle::
 	dome_save 0
 	playse SE_SAVE
 	waitse
@@ -98,16 +98,16 @@ BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle:: @ 8249991
 	case 0, BattleFrontier_BattleDomeLobby_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_RecordBattle:: @ 82499E4
+BattleFrontier_BattleDomeLobby_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattleDomeLobby_EventScript_EndChallenge:: @ 82499E9
+BattleFrontier_BattleDomeLobby_EventScript_EndChallenge::
 	msgbox BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge:: @ 82499F9
+BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge::
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_WeveBeenWaitingForYou, MSGBOX_DEFAULT
 	message BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge2
@@ -119,7 +119,7 @@ BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge:: @ 82499F9
 	setvar VAR_TEMP_0, 255
 	goto BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendant:: @ 8249A35
+BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME
@@ -127,7 +127,7 @@ BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendant:: @ 8249A35
 	goto BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant:: @ 8249A47
+BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME
@@ -135,13 +135,13 @@ BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant:: @ 8249A47
 	goto BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome:: @ 8249A59
+BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome::
 	special SavePlayerParty
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles
-BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge:: @ 8249A72
+BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -154,7 +154,7 @@ BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge:: @ 8249A72
 	case 2, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge:: @ 8249ABF
+BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattleDomeLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -180,7 +180,7 @@ BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge:: @ 8249ABF
 	case YES, BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge:: @ 8249B60
+BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	dome_init
@@ -194,7 +194,7 @@ BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge:: @ 8249B60
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed
 	dome_inittrainers
-BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge:: @ 8249BC2
+BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	dome_settrainers
@@ -207,39 +207,39 @@ BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge:: @ 8249BC2
 	waitstate
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge:: @ 8249BFA
+BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge
 	goto BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons:: @ 8249C15
+BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50:: @ 8249C30
+BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8249C3D
+BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed:: @ 8249C4A
+BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge:: @ 8249C61
+BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge:: @ 8249C64
+BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain, MSGBOX_DEFAULT
-BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge:: @ 8249C6C
+BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: @ 8249C6E
+BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -264,63 +264,63 @@ BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: @ 8249C6E
 	waitdooranim
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor:: @ 8249CDD
+BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor::
 	applymovement LOCALID_ATTENDANT_SINGLES, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor:: @ 8249CE5
+BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor::
 	applymovement LOCALID_ATTENDANT_DOUBLES, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor:: @ 8249CED
+BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor::
 	applymovement LOCALID_ATTENDANT_SINGLES, BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor:: @ 8249CF5
+BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor::
 	applymovement LOCALID_ATTENDANT_DOUBLES, BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles:: @ 8249CFD
+BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles::
 	msgbox BattleFrontier_BattleDomeLobby_Text_WelcomeSingleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles:: @ 8249D06
+BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles::
 	msgbox BattleFrontier_BattleDomeLobby_Text_WelcomeDoubleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge:: @ 8249D0F
+BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge::
 	message BattleFrontier_BattleDomeLobby_Text_TakeSinglesChallenge
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge:: @ 8249D15
+BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge::
 	message BattleFrontier_BattleDomeLobby_Text_TakeDoublesChallenge
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge:: @ 8249D1B
+BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge::
 	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge:: @ 8249D24
+BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge::
 	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor:: @ 8249D2D
+BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor::
 	opendoor 5, 4
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor:: @ 8249D33
+BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor::
 	opendoor 17, 4
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor:: @ 8249D39
+BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor::
 	closedoor 5, 4
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor:: @ 8249D3F
+BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor::
 	closedoor 17, 4
 	return
 
-BattleFrontier_BattleDomeLobby_Movement_WalkToDoor: @ 8249D45
+BattleFrontier_BattleDomeLobby_Movement_WalkToDoor:
 	walk_up
 	walk_up
 	walk_up
@@ -328,18 +328,18 @@ BattleFrontier_BattleDomeLobby_Movement_WalkToDoor: @ 8249D45
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor: @ 8249D4B
+BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor: @ 8249D4E
+BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeLobby_EventScript_ShowSinglesResults:: @ 8249D52
+BattleFrontier_BattleDomeLobby_EventScript_ShowSinglesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_SINGLES
 	waitbuttonpress
@@ -347,7 +347,7 @@ BattleFrontier_BattleDomeLobby_EventScript_ShowSinglesResults:: @ 8249D52
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults:: @ 8249D6B
+BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
@@ -355,7 +355,7 @@ BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults:: @ 8249D6B
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree:: @ 8249D84
+BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree::
 	dome_get DOME_DATA_PREV_TOURNEY_TYPE
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50
@@ -370,61 +370,61 @@ BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree:: @ 8249D84
 	waitstate
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50:: @ 8249DC9
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50::
 	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLv50, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLv50:: @ 8249DD2
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLv50::
 	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLv50, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLvOpen:: @ 8249DDB
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLvOpen::
 	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLvOpen, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLvOpen:: @ 8249DE4
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLvOpen::
 	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLvOpen, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_Maniac:: @ 8249DED
+BattleFrontier_BattleDomeLobby_EventScript_Maniac::
 	dome_getwinnersname
 	msgbox BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_Lass:: @ 8249DFE
+BattleFrontier_BattleDomeLobby_EventScript_Lass::
 	msgbox BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_FatMan:: @ 8249E07
+BattleFrontier_BattleDomeLobby_EventScript_FatMan::
 	msgbox BattleFrontier_BattleDomeLobby_Text_TrashedInFirstRound, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_Man:: @ 8249E10
+BattleFrontier_BattleDomeLobby_EventScript_Man::
 	msgbox BattleFrontier_BattleDomeLobby_Text_NeedToCheckOpponentCarefully, MSGBOX_NPC
 	end
 
 @ A few OutsideWest event scripts are inserted here instead, two of which are unused
-BattleFrontier_OutsideWest_EventScript_Man3:: @ 8249E19
+BattleFrontier_OutsideWest_EventScript_Man3::
 	msgbox BattleFrontier_OutsideWest_Text_LongDreamedAboutBattleFrontier, MSGBOX_NPC
 	end
 
 @ Unused
-BattleFrontier_OutsideWest_EventScript_BattleDomeSign2:: @ 8249E22
+BattleFrontier_OutsideWest_EventScript_BattleDomeSign2::
 	msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign2, MSGBOX_NPC
 	end
 
 @ Unused
-BattleFrontier_OutsideWest_EventScript_UnderConstructionSign:: @ 8249E2B
+BattleFrontier_OutsideWest_EventScript_UnderConstructionSign::
 	msgbox BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_RulesBoard:: @ 8249E34
+BattleFrontier_BattleDomeLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard:: @ 8249E43
+BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 4, MULTI_BATTLE_DOME_RULES, FALSE
@@ -436,40 +436,40 @@ BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard:: @ 8249E43
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_RulesMatchup:: @ 8249E8B
+BattleFrontier_BattleDomeLobby_EventScript_RulesMatchup::
 	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainMatchupRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_RulesTourneyTree:: @ 8249E99
+BattleFrontier_BattleDomeLobby_EventScript_RulesTourneyTree::
 	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_RulesDoubleKO:: @ 8249EA7
+BattleFrontier_BattleDomeLobby_EventScript_RulesDoubleKO::
 	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainDoubleKORules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ExitRules:: @ 8249EB5
+BattleFrontier_BattleDomeLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_Text_WelcomeSingleBattle: @ 8249EB7
+BattleFrontier_BattleDomeLobby_Text_WelcomeSingleBattle:
 	.string "Where the strategies of TRAINERS\n"
 	.string "are put to the test!\p"
 	.string "Welcome to the BATTLE DOME!\p"
 	.string "I am your guide to the SINGLE BATTLE\n"
 	.string "Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_TakeSinglesChallenge: @ 8249F3A
+BattleFrontier_BattleDomeLobby_Text_TakeSinglesChallenge:
 	.string "Would you like to challenge\n"
 	.string "the SINGLE BATTLE Tournament?$"
 
-BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain: @ 8249F74
+BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain:
 	.string "We hope to see you again.$"
 
-BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge: @ 8249F8E
+BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge:
 	.string "The SINGLE BATTLE Tournament\n"
 	.string "is exactly as the name suggests--\l"
 	.string "a tournament of SINGLE BATTLES.\p"
@@ -490,20 +490,20 @@ BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge: @ 8249F8E
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge: @ 824A1C6
+BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge:
 	.string "Before I show you to the BATTLE DOME,\n"
 	.string "I must save the data. Is that okay?$"
 
-BattleFrontier_BattleDomeLobby_Text_WhichLevelMode: @ 824A210
+BattleFrontier_BattleDomeLobby_Text_WhichLevelMode:
 	.string "The tournament offers two levels\n"
 	.string "of challenge, Level 50 and Open Level.\l"
 	.string "Which is your choice?$"
 
-BattleFrontier_BattleDomeLobby_Text_SelectThreeMons: @ 824A26E
+BattleFrontier_BattleDomeLobby_Text_SelectThreeMons:
 	.string "Now select the three POKéMON that\n"
 	.string "you wish to enter, please.$"
 
-BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen: @ 824A2AB
+BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "Excuse me!\p"
 	.string "You don't have three eligible POKéMON.\p"
 	.string "Also, the POKéMON must be holding\n"
@@ -511,7 +511,7 @@ BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen: @ 824A2AB
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50: @ 824A353
+BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50:
 	.string "Excuse me!\p"
 	.string "You don't have three eligible POKéMON.\p"
 	.string "You must have three different POKéMON\n"
@@ -521,63 +521,63 @@ BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50: @ 824A353
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleDomeLobby_Text_ShowYouToBattleDome: @ 824A437
+BattleFrontier_BattleDomeLobby_Text_ShowYouToBattleDome:
 	.string "I will now show you to\n"
 	.string "the BATTLE DOME.$"
 
-BattleFrontier_BattleDomeLobby_Text_DidntSaveBeforeQuitting: @ 824A45F
+BattleFrontier_BattleDomeLobby_Text_DidntSaveBeforeQuitting:
 	.string "Excuse me!\p"
 	.string "You didn't save before you quit your\n"
 	.string "challenge last time.\p"
 	.string "Because of that, your challenge so far\n"
 	.string "has been disqualified. Sorry!$"
 
-BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney: @ 824A4E9
+BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney:
 	.string "Congratulations for winning\n"
 	.string "your Battle Tournament!$"
 
 @ Unused
-BattleFrontier_BattleDomeLobby_Text_HereIsYourPrize: @ 824A51D
+BattleFrontier_BattleDomeLobby_Text_HereIsYourPrize:
 	.string "Here is your prize for your Battle\n"
 	.string "Tournament victory.$"
 
 @ Used by Verdanturf Tent
-BattleFrontier_BattleDomeLobby_Text_ReceivedPrize: @ 824A554
+BattleFrontier_BattleDomeLobby_Text_ReceivedPrize:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
 @ Unused
-BattleFrontier_BattleDomeLobby_Text_BagFullMakeRoom: @ 824A56E
+BattleFrontier_BattleDomeLobby_Text_BagFullMakeRoom:
 	.string "Oh, your BAG appears to be full.\p"
 	.string "Please make room in your BAG, then come\n"
 	.string "see me.$"
 
-BattleFrontier_BattleDomeLobby_Text_ThankYouForPlaying: @ 824A5BF
+BattleFrontier_BattleDomeLobby_Text_ThankYouForPlaying:
 	.string "Thank you for playing!$"
 
-BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved: @ 824A5D6
+BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved:
 	.string "Your record will be saved.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleDomeLobby_Text_WeveBeenWaitingForYou: @ 824A5FE
+BattleFrontier_BattleDomeLobby_Text_WeveBeenWaitingForYou:
 	.string "We've been waiting for you!$"
 
-BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge2: @ 824A61A
+BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge2:
 	.string "Before I show you to the BATTLE DOME,\n"
 	.string "I must save the data. Is that okay?$"
 
-BattleFrontier_BattleDomeLobby_Text_WelcomeDoubleBattle: @ 824A664
+BattleFrontier_BattleDomeLobby_Text_WelcomeDoubleBattle:
 	.string "Where the strategies of TRAINERS\n"
 	.string "are put to the test!\p"
 	.string "Welcome to the BATTLE DOME!\p"
 	.string "I am your guide to the DOUBLE BATTLE\n"
 	.string "Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_TakeDoublesChallenge: @ 824A6E7
+BattleFrontier_BattleDomeLobby_Text_TakeDoublesChallenge:
 	.string "Would you like to challenge\n"
 	.string "the DOUBLE BATTLE Tournament?$"
 
-BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge: @ 824A721
+BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge:
 	.string "The DOUBLE BATTLE Tournament\n"
 	.string "is exactly as the name suggests--\l"
 	.string "a tournament of DOUBLE BATTLES.\p"
@@ -598,23 +598,23 @@ BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge: @ 824A721
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLv50: @ 824A966
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLv50:
 	.string "They're the results of the last\n"
 	.string "Level 50 SINGLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLv50: @ 824A9A9
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLv50:
 	.string "They're the results of the last\n"
 	.string "Level 50 DOUBLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLvOpen: @ 824A9EC
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLvOpen:
 	.string "They're the results of the last\n"
 	.string "Open Level SINGLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLvOpen: @ 824AA31
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLvOpen:
 	.string "They're the results of the last\n"
 	.string "Open Level DOUBLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough: @ 824AA76
+BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough:
 	.string "Did you see it?\n"
 	.string "The last Battle Tournament?\p"
 	.string "The winner, {STR_VAR_1}, was seriously\n"
@@ -622,21 +622,21 @@ BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough: @ 824AA76
 	.string "You should check out the results\n"
 	.string "on the monitor beside the PC.$"
 
-BattleFrontier_OutsideWest_Text_LongDreamedAboutBattleFrontier: @ 824AB06
+BattleFrontier_OutsideWest_Text_LongDreamedAboutBattleFrontier:
 	.string "The BATTLE FRONTIER…\n"
 	.string "I've long dreamed about a place like it.$"
 
 @ Functionally unused
-BattleFrontier_OutsideWest_Text_BattleDomeSign2: @ 824AB44
+BattleFrontier_OutsideWest_Text_BattleDomeSign2:
 	.string "The BATTLE DOME\n"
 	.string "Become the Unbeatable Superstar!$"
 
 @ Functionally unused
-BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction: @ 824AB75
+BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction:
 	.string "The ??????\n"
 	.string "Under Construction!$"
 
-BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation: @ 824AB94
+BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation:
 	.string "When a TRAINER chains tournament\n"
 	.string "wins at the BATTLE DOME, he or she\l"
 	.string "gains a reputation as a star.\p"
@@ -645,48 +645,48 @@ BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation: @ 824AB94
 	.string "A true superstar is a TRAINER who\n"
 	.string "can keep winning tournaments.$"
 
-BattleFrontier_BattleDomeLobby_Text_TrashedInFirstRound: @ 824AC76
+BattleFrontier_BattleDomeLobby_Text_TrashedInFirstRound:
 	.string "I ran into one of the tournament\n"
 	.string "favorites in the very first round.\p"
 	.string "Of course I got trashed…$"
 
-BattleFrontier_BattleDomeLobby_Text_NeedToCheckOpponentCarefully: @ 824ACD3
+BattleFrontier_BattleDomeLobby_Text_NeedToCheckOpponentCarefully:
 	.string "I would've won if I'd kept this POKéMON\n"
 	.string "held in reserve.\p"
 	.string "You need to check your opponent's\n"
 	.string "POKéMON carefully before choosing\l"
 	.string "your battling POKéMON.$"
 
-BattleFrontier_BattleDomeLobby_Text_CongratsDefeatedTucker: @ 824AD67
+BattleFrontier_BattleDomeLobby_Text_CongratsDefeatedTucker:
 	.string "Congratulations!\p"
 	.string "You defeated the DOME ACE and won\n"
 	.string "the Battle Tournament!$"
 
-BattleFrontier_BattleDomeLobby_Text_AwardTheseBattlePoints: @ 824ADB1
+BattleFrontier_BattleDomeLobby_Text_AwardTheseBattlePoints:
 	.string "In recognition of your strategy--\n"
 	.string "a thing of beauty it was, too--\l"
 	.string "we award you these Battle Point(s)!$"
 
-BattleFrontier_BattleDomeLobby_Text_RecordLastMatch: @ 824AE17
+BattleFrontier_BattleDomeLobby_Text_RecordLastMatch:
 	.string "Would you like to record your\n"
 	.string "last BATTLE DOME match on your\l"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattleDomeLobby_Text_RulesAreListed: @ 824AE63
+BattleFrontier_BattleDomeLobby_Text_RulesAreListed:
 	.string "The Battle Tournament rules\n"
 	.string "are listed.$"
 
-BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading: @ 824AE8B
+BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattleDomeLobby_Text_ExplainMatchupRules: @ 824AEAE
+BattleFrontier_BattleDomeLobby_Text_ExplainMatchupRules:
 	.string "The tournament matchups are drawn up\n"
 	.string "based on the toughness of POKéMON\l"
 	.string "held by TRAINERS.\p"
 	.string "The matchups avoid having tough\n"
 	.string "TRAINERS face each other right away.$"
 
-BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree: @ 824AF4C
+BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree:
 	.string "The tournament chart, or as we call it,\n"
 	.string "the “Tree,” is available for viewing\l"
 	.string "in the Waiting Room from any guide.\p"
@@ -697,7 +697,7 @@ BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree: @ 824AF4C
 	.string "by TRAINERS, and the battle styles of\l"
 	.string "TRAINERS.$"
 
-BattleFrontier_BattleDomeLobby_Text_ExplainDoubleKORules: @ 824B073
+BattleFrontier_BattleDomeLobby_Text_ExplainDoubleKORules:
 	.string "If battling POKéMON faint at the same\n"
 	.string "time--a double KO--in a tournament\l"
 	.string "match, the REFEREES will review\l"
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
index 4499bda92..ca441cf1f 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -1,24 +1,24 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9
+BattleFrontier_BattleDomePreBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattleDomePreBattleRoom_OnWarp: @ 824B204
+BattleFrontier_BattleDomePreBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth:: @ 824B20E
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_OnFrame: @ 824B218
+BattleFrontier_BattleDomePreBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: @ 824B222
+BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom::
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
@@ -26,7 +26,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: @ 824B222
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter
 	waitmovement 0
 	lockall
-BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B24F
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound::
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage
 	waitmessage
 	switch VAR_RESULT  @ No case?
@@ -43,7 +43,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B
 	case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord:: @ 824B2C1
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord::
 	multichoice 16, 2, MULTI_TOURNEY_NO_RECORD, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo
@@ -53,7 +53,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord:
 	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle:: @ 824B30D
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -62,18 +62,18 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle:: @ 824B30D
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle:: @ 824B33F
+BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge:: @ 824B349
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 	case YES, BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge:: @ 824B377
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -82,11 +82,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge:: @ 824B37
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge:: @ 824B3A9
+BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge::
 	dome_resolvewinners DOME_PLAYER_RETIRED
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge:: @ 824B3BB
+BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_SavingDataPleaseWait
 	waitmessage
 	dome_save CHALLENGE_STATUS_PAUSED
@@ -96,21 +96,21 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge:: @ 824B3BB
 	frontier_reset
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo:: @ 824B3DD
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_PlayersNextOpponentIsTrainer, MSGBOX_DEFAULT
 	fadescreen FADE_TO_BLACK
 	dome_showopponentinfo
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree:: @ 824B3F5
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree::
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage
 	fadescreen FADE_TO_BLACK
 	dome_showtourneytree
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage:: @ 824B40A
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound1
@@ -119,23 +119,23 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage:: @ 824B40A
 	case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInFinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound1:: @ 824B449
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound1::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound1, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound2:: @ 824B452
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound2::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound2, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInSemifinals:: @ 824B45B
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInSemifinals::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInSemifinals, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInFinals:: @ 824B464
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInFinals::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInFinals, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge:: @ 824B46D
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons
 	waitmessage
 	waitbuttonpress
@@ -168,7 +168,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge:: @ 824B46D
 	waitstate
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage:: @ 824B4FB
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound1
@@ -177,19 +177,19 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage:: @
 	case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound1:: @ 824B53A
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound1::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound1
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound2:: @ 824B540
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound2::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound2
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForSemifinals:: @ 824B546
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForSemifinals::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForSemifinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals:: @ 824B54C
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals::
 	frontier_getbrainstatus
 	switch VAR_RESULT
 	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver
@@ -199,27 +199,27 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals:: @ 824B54C
 	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver:: @ 824B58B
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver::
 	goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilverShort
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGold:: @ 824B5A0
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGold::
 	goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGoldShort
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGold, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilverShort:: @ 824B5B5
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilverShort::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilverShort, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGoldShort:: @ 824B5BE
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGoldShort::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGoldShort, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle:: @ 824B5C7
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle::
 	setvar VAR_TEMP_0, 1
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
 	special LoadPlayerParty
@@ -233,7 +233,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle:: @ 824B5C7
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage:: @ 824B600
+BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
 	case DOME_ROUND2, BattleFrontier_BattleDomePreBattleRoom_EventScript_Round1Complete
@@ -241,136 +241,136 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage:: @ 824B
 	case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_SemifinalsComplete
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_Round1Complete:: @ 824B634
+BattleFrontier_BattleDomePreBattleRoom_EventScript_Round1Complete::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_Round2Complete:: @ 824B63D
+BattleFrontier_BattleDomePreBattleRoom_EventScript_Round2Complete::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_Round2Complete, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_SemifinalsComplete:: @ 824B646
+BattleFrontier_BattleDomePreBattleRoom_EventScript_SemifinalsComplete::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_SemifinalsComplete, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside: @ 824B64F
+BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside:
 	walk_right
 	face_left
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter: @ 824B652
+BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor: @ 824B657
+BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor:
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor: @ 824B659
+BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound1: @ 824B65C
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound1:
 	.string "Your 1st-round match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound2: @ 824B689
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound2:
 	.string "Your 2nd-round match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForSemifinals: @ 824B6B6
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForSemifinals:
 	.string "Your semifinal match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals: @ 824B6E3
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals:
 	.string "Your final match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons: @ 824B70C
+BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons:
 	.string "Please choose the two POKéMON\n"
 	.string "that are to appear in battle.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay: @ 824B748
+BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay:
 	.string "Right this way, please.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth: @ 824B760
+BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth:
 	.string "Thank you for competing!\p"
 	.string "I'll restore your POKéMON to\n"
 	.string "full health.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete: @ 824B7A3
+BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete:
 	.string "All 1st-round matches have been\n"
 	.string "completed.\p"
 	.string "These are the teams that advanced!$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_Round2Complete: @ 824B7F1
+BattleFrontier_BattleDomePreBattleRoom_Text_Round2Complete:
 	.string "All 2nd-round matches have been\n"
 	.string "completed.\p"
 	.string "These are the teams that advanced!$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_SemifinalsComplete: @ 824B83F
+BattleFrontier_BattleDomePreBattleRoom_Text_SemifinalsComplete:
 	.string "All semifinal matches have been\n"
 	.string "completed.\p"
 	.string "These are the teams that advanced!$"
 
 @ Unused
-BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForRound2: @ 824B88D
+BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForRound2:
 	.string "Congratulations for getting through\n"
 	.string "the 1st round.\p"
 	.string "The 2nd round is next.\n"
 	.string "Are you ready?$"
 
 @ Unused
-BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForSemifinals: @ 824B8E6
+BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForSemifinals:
 	.string "Congratulations for advancing\n"
 	.string "to the semifinals.\p"
 	.string "The best four teams meet in this round.\n"
 	.string "Are you ready?$"
 
 @ Unused
-BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForFinals: @ 824B94E
+BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForFinals:
 	.string "Congratulations for advancing\n"
 	.string "to the final match.\p"
 	.string "You're one win from the championship.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_PlayersNextOpponentIsTrainer: @ 824B9B5
+BattleFrontier_BattleDomePreBattleRoom_Text_PlayersNextOpponentIsTrainer:
 	.string "{PLAYER}'s next opponent\n"
 	.string "is this TRAINER.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound1: @ 824B9D9
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound1:
 	.string "The tournament is in the 1st round.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound2: @ 824B9FD
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound2:
 	.string "The tournament is in the 2nd round.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInSemifinals: @ 824BA21
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInSemifinals:
 	.string "The tournament is in the semifinals.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInFinals: @ 824BA46
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInFinals:
 	.string "The tournament is up to the final.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_SaveAndQuitGame: @ 824BA69
+BattleFrontier_BattleDomePreBattleRoom_Text_SaveAndQuitGame:
 	.string "Would you like to save and\n"
 	.string "quit the game?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge: @ 824BA93
+BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge:
 	.string "Would you like to retire from your\n"
 	.string "Battle Tournament challenge?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_SavingDataPleaseWait: @ 824BAD3
+BattleFrontier_BattleDomePreBattleRoom_Text_SavingDataPleaseWait:
 	.string "I am saving your data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch: @ 824BAF7
+BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch:
 	.string "Should I record your last match\n"
 	.string "on your FRONTIER PASS?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver: @ 824BB2E
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver:
 	.string "Congratulations for advancing\n"
 	.string "to the final match.\p"
 	.string "For the final match, you will challenge\n"
@@ -378,19 +378,19 @@ BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver: @ 824BB2E
 	.string "Are you ready?$"
 
 @ Identical to ReadyForTuckerSilver
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGold: @ 824BBAC
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGold:
 	.string "Congratulations for advancing\n"
 	.string "to the final match.\p"
 	.string "For the final match, you will challenge\n"
 	.string "the DOME ACE TUCKER.\p"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilverShort: @ 824BC2A
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilverShort:
 	.string "Your final battle against TUCKER is\n"
 	.string "next. Are you ready?$"
 
 @ Identical again
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGoldShort: @ 824BC63
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGoldShort:
 	.string "Your final battle against TUCKER is\n"
 	.string "next. Are you ready?$"
 
diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
index f15f6542e..367756054 100644
--- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
@@ -7,7 +7,7 @@
 .set LOCALID_SCIENTIST_6, 7
 .set LOCALID_PLAYER, 8
 
-BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
+BattleFrontier_BattleFactoryBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_OnFrame
@@ -16,7 +16,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
 	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
 	@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_F
 
-BattleFrontier_BattleFactoryBattleRoom_OnTransition: @ 825ADBB
+BattleFrontier_BattleFactoryBattleRoom_OnTransition:
 	frontier_settrainers
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -29,37 +29,37 @@ BattleFrontier_BattleFactoryBattleRoom_OnTransition: @ 825ADBB
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj:: @ 825ADF3
+BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj::
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	setobjectxyperm LOCALID_OPPONENT, 7, 9
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_OnWarp: @ 825AE00
+BattleFrontier_BattleFactoryBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects
 	.2byte 0
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects:: @ 825AE0A
+BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects::
 	setvar VAR_TEMP_1, 1
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
 	compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects
 	hideobjectat LOCALID_OPPONENT, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
-BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects:: @ 825AE24
+BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects::
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale:: @ 825AE25
+BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale:: @ 825AE2B
+BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_OnFrame: @ 825AE31
+BattleFrontier_BattleFactoryBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle:: @ 825AE3B
+BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle::
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_GetAMoveOn, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle
@@ -70,7 +70,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle::
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom:: @ 825AE67
+BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom::
 	compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
@@ -83,7 +83,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom:: @ 825AE67
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter
 	waitmovement 0
-BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: @ 825AEA7
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent::
 	compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland
 	palace_getopponentintro
@@ -99,20 +99,20 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: @ 825AEA7
 	waitstate
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost:: @ 825AEF8
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedOpponent:: @ 825AF0F
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedOpponent::
 	factory_get FACTORY_DATA_WIN_STREAK_SWAPS
 	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak
 	addvar VAR_RESULT, 1
 	setorcopyvar VAR_0x8006, VAR_RESULT
 	factory_set FACTORY_DATA_WIN_STREAK_SWAPS  @ uses VAR_0x8006 above
-BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak:: @ 825AF3E
+BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak::
 	call BattleFrontier_EventScript_IncrementWinStreak
-BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum:: @ 825AF43
+BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
@@ -121,11 +121,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum:: @ 825AF4
 	setvar VAR_0x8006, 1
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8
 	waitstate
-BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon:: @ 825AF85
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland:: @ 825AF9C
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland::
 	switch VAR_TEMP_F
 	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleFactoryBattleRoom_EventScript_IntroNolandGold
 	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver
@@ -135,14 +135,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland:: @ 825AF9C
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver:: @ 825AFEF
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver::
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_ShakeOutKnowledgeBringItOn, MSGBOX_DEFAULT
 	call BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: @ 825B00C
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver::
 	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
@@ -158,20 +158,20 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: @ 825B
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NextTimeNoHoldsBarred, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_IntroNolandGold:: @ 825B051
+BattleFrontier_BattleFactoryBattleRoom_EventScript_IntroNolandGold::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold:: @ 825B07E
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold::
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_AllRightBringItOn, MSGBOX_DEFAULT
 	call BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09B
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold::
 	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
@@ -187,7 +187,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_LastTimeILoseToYou, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle:: @ 825B0E0
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle::
 	closemessage
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
@@ -197,7 +197,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle:: @ 825B0E0
 	waitstate
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland:: @ 825B105
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland::
 	factory_get FACTORY_DATA_WIN_STREAK_SWAPS
 	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak
@@ -214,7 +214,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland:: @ 825B105
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom: @ 825B17B
+BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom:
 	walk_up
 	walk_up
 	walk_up
@@ -223,11 +223,11 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom: @ 825B17B
 	face_right
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland: @ 825B182
+BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland:
 	walk_right
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter: @ 825B184
+BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -236,14 +236,14 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter: @ 825B184
 	face_left
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle: @ 825B18B
+BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle:
 	walk_up
 	walk_up
 	walk_up
 	face_left
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby:: @ 825B190
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles
@@ -251,12 +251,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby:: @ 825B190
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles:: @ 825B1AA
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles::
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle:: @ 825B1B4
+BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle::
 	applymovement LOCALID_SCIENTIST_1, Common_Movement_WalkInPlaceFastestRight
 	applymovement LOCALID_SCIENTIST_2, Common_Movement_WalkInPlaceFastestRight
 	applymovement LOCALID_SCIENTIST_3, Common_Movement_WalkInPlaceFastestRight
@@ -266,11 +266,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle:: @ 825B
 	waitmovement 0
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_Text_GetAMoveOn: @ 825B1E2
+BattleFrontier_BattleFactoryBattleRoom_Text_GetAMoveOn:
 	.string "Hey, hey!\n"
 	.string "Get a move on!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead: @ 825B1FB
+BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead:
 	.string "Hey, my name's NOLAND!\n"
 	.string "I'm basically in charge of this place,\l"
 	.string "which is why I'm the FACTORY HEAD!\p"
@@ -287,26 +287,26 @@ BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead: @ 825B1FB
 	.string "conditions as you.\p"
 	.string "I'll be using rental POKéMON, too!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_ShakeOutKnowledgeBringItOn: @ 825B3F1
+BattleFrontier_BattleFactoryBattleRoom_Text_ShakeOutKnowledgeBringItOn:
 	.string "Shake out every last bit of your\n"
 	.string "knowledge and bring it on!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_NolandLetsSeeFrontierPass: @ 825B42D
+BattleFrontier_BattleFactoryBattleRoom_Text_NolandLetsSeeFrontierPass:
 	.string "NOLAND: Smart going!\n"
 	.string "Let's see your FRONTIER PASS.$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol: @ 825B460
+BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol:
 	.string "The Knowledge Symbol was embossed\n"
 	.string "on the FRONTIER PASS!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_NextTimeNoHoldsBarred: @ 825B498
+BattleFrontier_BattleFactoryBattleRoom_Text_NextTimeNoHoldsBarred:
 	.string "Heh…\n"
 	.string "You're a pretty bright spark…\p"
 	.string "Next time, I'll come after you hard.\n"
 	.string "No holds barred, understand?\p"
 	.string "You keep up your studies!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime: @ 825B517
+BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime:
 	.string "NOLAND: Hey, hey! How's it going?\n"
 	.string "You keeping up with your studies?\p"
 	.string "…Oh?\p"
@@ -315,21 +315,21 @@ BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime: @ 825B517
 	.string "Now, this should be fun!\n"
 	.string "I'm getting excited, hey!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_AllRightBringItOn: @ 825B5CF
+BattleFrontier_BattleFactoryBattleRoom_Text_AllRightBringItOn:
 	.string "All right!\n"
 	.string "Bring it on!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_OutOfMyLeagueLetsSeePass: @ 825B5E7
+BattleFrontier_BattleFactoryBattleRoom_Text_OutOfMyLeagueLetsSeePass:
 	.string "NOLAND: What the…\n"
 	.string "You're getting out of my league!\p"
 	.string "Sheesh!\n"
 	.string "Let's see that FRONTIER PASS!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine: @ 825B640
+BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine:
 	.string "The Knowledge Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_LastTimeILoseToYou: @ 825B66D
+BattleFrontier_BattleFactoryBattleRoom_Text_LastTimeILoseToYou:
 	.string "Pfft, man!\p"
 	.string "That's absolutely the last time\n"
 	.string "I lose to you!\p"
diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
index dfdb7c944..3b1139294 100644
--- a/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
@@ -1,21 +1,21 @@
 .set LOCALID_ATTENDANT_SINGLES, 1
 .set LOCALID_ATTENDANT_DOUBLES, 6
 
-BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8
+BattleFrontier_BattleFactoryLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleFactoryLobby_OnWarp: @ 82583F3
+BattleFrontier_BattleFactoryLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth:: @ 82583FD
+BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleFactoryLobby_OnFrame: @ 8258407
+BattleFrontier_BattleFactoryLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge
@@ -23,11 +23,11 @@ BattleFrontier_BattleFactoryLobby_OnFrame: @ 8258407
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattleFactoryLobby_EventScript_GetChallengeStatus:: @ 8258431
+BattleFrontier_BattleFactoryLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving:: @ 825843A
+BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox BattleFrontier_BattleFactoryLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
@@ -40,7 +40,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving:: @ 825843A
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge:: @ 825849B
+BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge::
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
@@ -49,10 +49,10 @@ BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge:: @ 825849B
 	waitmessage
 	goto BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattleFactoryLobby_EventScript_DefeatedFactoryHead:: @ 82584BD
+BattleFrontier_BattleFactoryLobby_EventScript_DefeatedFactoryHead::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_CongratsForDefeatingHead, MSGBOX_DEFAULT
 	waitmessage
-BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints:: @ 82584C6
+BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_AwardBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -66,7 +66,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints:: @ 82584C6
 	goto BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge:: @ 8258506
+BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge::
 	lockall
 	message BattleFrontier_BattleFactoryLobby_Text_ReturnMonsSaveResults
 	waitmessage
@@ -77,7 +77,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge:: @ 8258506
 	playse SE_SAVE
 	waitse
 
-BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B
+BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle::
 	call BattleFrontier_EventScript_GetCantRecordBattle
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
@@ -89,16 +89,16 @@ BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B
 	case 0, BattleFrontier_BattleFactoryLobby_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
 
-BattleFrontier_BattleFactoryLobby_EventScript_RecordBattle:: @ 825857D
+BattleFrontier_BattleFactoryLobby_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle:: @ 8258582
+BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge:: @ 8258592
+BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge::
 	lockall
 	message BattleFrontier_BattleFactoryLobby_Text_WaitingForYouToResume
 	waitmessage
@@ -110,7 +110,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge:: @ 8258592
 	setvar VAR_0x8006, 2
 	goto BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_SinglesAttendant:: @ 82585CB
+BattleFrontier_BattleFactoryLobby_EventScript_SinglesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
@@ -118,19 +118,19 @@ BattleFrontier_BattleFactoryLobby_EventScript_SinglesAttendant:: @ 82585CB
 	goto BattleFrontier_BattleFactoryLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_DoublesAttendant:: @ 82585DD
+BattleFrontier_BattleFactoryLobby_EventScript_DoublesAttendant::
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	goto BattleFrontier_BattleFactoryLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_Attendant:: @ 82585ED
+BattleFrontier_BattleFactoryLobby_EventScript_Attendant::
 	special SavePlayerParty
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForSingleBattle
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForDoubleBattle
-BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge:: @ 8258606
+BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TakeSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -143,7 +143,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge:: @ 8258606
 	case 2, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_TryEnterChallenge:: @ 8258653
+BattleFrontier_BattleFactoryLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattleFactoryLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -157,7 +157,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_TryEnterChallenge:: @ 8258653
 	case YES, BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge:: @ 82586B9
+BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	factory_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
@@ -170,7 +170,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge:: @ 82586B9
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed
 	setvar VAR_0x8006, 0
-BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge:: @ 825871A
+BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleFactoryLobby_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
@@ -186,71 +186,71 @@ BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge:: @ 825871A
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_TalkedToSinglesAttendant:: @ 825875C
+BattleFrontier_BattleFactoryLobby_EventScript_TalkedToSinglesAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_SINGLES
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant:: @ 8258762
+BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_DOUBLES
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_ExplainChallenge:: @ 8258768
+BattleFrontier_BattleFactoryLobby_EventScript_ExplainChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_ExplainSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_ExplainDoublesChallenge
 	goto BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed:: @ 8258783
+BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_LoadPartyAndCancelChallenge:: @ 825879A
+BattleFrontier_BattleFactoryLobby_EventScript_LoadPartyAndCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge:: @ 825879D
+BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor: @ 82587A7
+BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor:
 	walk_up
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor: @ 82587AC
+BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForSingleBattle:: @ 82587B1
+BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForSingleBattle::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_WelcomeForSingleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForDoubleBattle:: @ 82587BA
+BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForDoubleBattle::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_WelcomeForDoubleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_TakeSinglesChallenge:: @ 82587C3
+BattleFrontier_BattleFactoryLobby_EventScript_TakeSinglesChallenge::
 	message BattleFrontier_BattleFactoryLobby_Text_TakeSinglesChallenge
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_TakeDoublesChallenge:: @ 82587C9
+BattleFrontier_BattleFactoryLobby_EventScript_TakeDoublesChallenge::
 	message BattleFrontier_BattleFactoryLobby_Text_TakeDoublesChallenge
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_ExplainSinglesChallenge:: @ 82587CF
+BattleFrontier_BattleFactoryLobby_EventScript_ExplainSinglesChallenge::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSinglesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_ExplainDoublesChallenge:: @ 82587D8
+BattleFrontier_BattleFactoryLobby_EventScript_ExplainDoublesChallenge::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainDoublesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_ShowSinglesResults:: @ 82587E1
+BattleFrontier_BattleFactoryLobby_EventScript_ShowSinglesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_SINGLES
 	waitbuttonpress
@@ -258,7 +258,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_ShowSinglesResults:: @ 82587E1
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_ShowDoublesResults:: @ 82587FA
+BattleFrontier_BattleFactoryLobby_EventScript_ShowDoublesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
@@ -266,31 +266,31 @@ BattleFrontier_BattleFactoryLobby_EventScript_ShowDoublesResults:: @ 82587FA
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_Woman:: @ 8258813
+BattleFrontier_BattleFactoryLobby_EventScript_Woman::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_NeedKnowledgeOfMonsMoves, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_Camper:: @ 825881C
+BattleFrontier_BattleFactoryLobby_EventScript_Camper::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_SwappedForWeakMon, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_Picnicker:: @ 8258825
+BattleFrontier_BattleFactoryLobby_EventScript_Picnicker::
 	lock
 	msgbox BattleFrontier_BattleFactoryLobby_Text_NeedToCheckOpponentsMons, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_FatMan:: @ 8258830
+BattleFrontier_BattleFactoryLobby_EventScript_FatMan::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_CantFigureOutStaffHints, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesBoard:: @ 8258839
+BattleFrontier_BattleFactoryLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattleFactoryLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard:: @ 8258848
+BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 0, MULTI_BATTLE_FACTORY_RULES, FALSE
@@ -304,47 +304,47 @@ BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard:: @ 8258848
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesBasics:: @ 82588A6
+BattleFrontier_BattleFactoryLobby_EventScript_RulesBasics::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainBasicRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapPartner:: @ 82588B4
+BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapPartner::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSwapPartnerRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNumber:: @ 82588C2
+BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNumber::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNumberRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNotes:: @ 82588D0
+BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNotes::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNotesRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesOpenLv:: @ 82588DE
+BattleFrontier_BattleFactoryLobby_EventScript_RulesOpenLv::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainOpenLvRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_ExitRules:: @ 82588EC
+BattleFrontier_BattleFactoryLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_Text_WelcomeForSingleBattle: @ 82588EE
+BattleFrontier_BattleFactoryLobby_Text_WelcomeForSingleBattle:
 	.string "Where the intelligence of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "Welcome to the BATTLE FACTORY!\p"
 	.string "I am your guide to the Battle Swap\n"
 	.string "Single Tournament.$"
 
-BattleFrontier_BattleFactoryLobby_Text_TakeSinglesChallenge: @ 825897A
+BattleFrontier_BattleFactoryLobby_Text_TakeSinglesChallenge:
 	.string "Would you like to take the Battle\n"
 	.string "Swap Single challenge?$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainSinglesChallenge: @ 82589B3
+BattleFrontier_BattleFactoryLobby_Text_ExplainSinglesChallenge:
 	.string "The Battle Swap Single Tournament\n"
 	.string "is a SINGLE BATTLE competition using\l"
 	.string "only rental POKéMON.\p"
@@ -362,26 +362,26 @@ BattleFrontier_BattleFactoryLobby_Text_ExplainSinglesChallenge: @ 82589B3
 	.string "If you don't save, you will be\n"
 	.string "disqualified from your challenge.$"
 
-BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit: @ 8258BC5
+BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit:
 	.string "We look forward to your next visit.$"
 
-BattleFrontier_BattleFactoryLobby_Text_WhichLevelMode: @ 8258BE9
+BattleFrontier_BattleFactoryLobby_Text_WhichLevelMode:
 	.string "Which level do you wish to challenge?\n"
 	.string "Level 50 or Open Level?$"
 
-BattleFrontier_BattleFactoryLobby_Text_OkayToSaveBeforeChallenge: @ 8258C27
+BattleFrontier_BattleFactoryLobby_Text_OkayToSaveBeforeChallenge:
 	.string "Before you begin your challenge,\n"
 	.string "I need to save the game. Is that okay?$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_WillHoldMonsForSafekeeping: @ 8258C6F
+BattleFrontier_BattleFactoryLobby_Text_WillHoldMonsForSafekeeping:
 	.string "Okay, I will hold your POKéMON for\n"
 	.string "safekeeping while you compete.$"
 
-BattleFrontier_BattleFactoryLobby_Text_StepThisWay: @ 8258CB1
+BattleFrontier_BattleFactoryLobby_Text_StepThisWay:
 	.string "Please step this way.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ReturnMonsSaveResults: @ 8258CC7
+BattleFrontier_BattleFactoryLobby_Text_ReturnMonsSaveResults:
 	.string "Thank you for participating!\p"
 	.string "I will return your POKéMON in exchange\n"
 	.string "for our rental POKéMON.\p"
@@ -389,58 +389,58 @@ BattleFrontier_BattleFactoryLobby_Text_ReturnMonsSaveResults: @ 8258CC7
 	.string "Please wait.$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_ReturnMons: @ 8258D54
+BattleFrontier_BattleFactoryLobby_Text_ReturnMons:
 	.string "I will return your POKéMON in exchange\n"
 	.string "for our rental POKéMON.$"
 
-BattleFrontier_BattleFactoryLobby_Text_CongratsSevenWins: @ 8258D93
+BattleFrontier_BattleFactoryLobby_Text_CongratsSevenWins:
 	.string "Congratulations! You've won seven\n"
 	.string "straight Battle Swap matches!$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_AwardBattlePointsForStreak: @ 8258DD3
+BattleFrontier_BattleFactoryLobby_Text_AwardBattlePointsForStreak:
 	.string "In recognition of your 7-win streak,\n"
 	.string "we award you these Battle Point(s).$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_MaxBattlePoints: @ 8258E1C
+BattleFrontier_BattleFactoryLobby_Text_MaxBattlePoints:
 	.string "Oh, oh, oh!\p"
 	.string "Your Battle Points are maxed.\p"
 	.string "Please come back after using\n"
 	.string "some Battle Points.$"
 
-BattleFrontier_BattleFactoryLobby_Text_WaitingForYouToResume: @ 8258E77
+BattleFrontier_BattleFactoryLobby_Text_WaitingForYouToResume:
 	.string "We've been waiting for you!\p"
 	.string "Before we resume your challenge,\n"
 	.string "I must save the game.$"
 
-BattleFrontier_BattleFactoryLobby_Text_DidntSaveBeforeQuitting: @ 8258ECA
+BattleFrontier_BattleFactoryLobby_Text_DidntSaveBeforeQuitting:
 	.string "I'm sorry to say this, but you didn't\n"
 	.string "save before you quit playing last time.\p"
 	.string "As a result, you have been disqualified\n"
 	.string "from your challenge.$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_WellReturnMons: @ 8258F55
+BattleFrontier_BattleFactoryLobby_Text_WellReturnMons:
 	.string "We'll return your personal POKéMON.$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_ReceivedPrizeItem: @ 8258F79
+BattleFrontier_BattleFactoryLobby_Text_ReceivedPrizeItem:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-BattleFrontier_BattleFactoryLobby_Text_WelcomeForDoubleBattle: @ 8258F93
+BattleFrontier_BattleFactoryLobby_Text_WelcomeForDoubleBattle:
 	.string "Where the intelligence of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "Welcome to the BATTLE FACTORY!\p"
 	.string "I am your guide to the Battle Swap\n"
 	.string "Double Tournament.$"
 
-BattleFrontier_BattleFactoryLobby_Text_TakeDoublesChallenge: @ 825901F
+BattleFrontier_BattleFactoryLobby_Text_TakeDoublesChallenge:
 	.string "Would you like to take the Battle\n"
 	.string "Swap Double challenge?$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainDoublesChallenge: @ 8259058
+BattleFrontier_BattleFactoryLobby_Text_ExplainDoublesChallenge:
 	.string "The Battle Swap Double Tournament\n"
 	.string "is a DOUBLE BATTLE competition using\l"
 	.string "only rental POKéMON.\p"
@@ -458,28 +458,28 @@ BattleFrontier_BattleFactoryLobby_Text_ExplainDoublesChallenge: @ 8259058
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleFactoryLobby_Text_CongratsForDefeatingHead: @ 825926A
+BattleFrontier_BattleFactoryLobby_Text_CongratsForDefeatingHead:
 	.string "Congratulations for defeating\n"
 	.string "the FACTORY HEAD and winning\l"
 	.string "seven matches in a row!$"
 
-BattleFrontier_BattleFactoryLobby_Text_AwardBattlePoints: @ 82592BD
+BattleFrontier_BattleFactoryLobby_Text_AwardBattlePoints:
 	.string "In recognition of your wealth of\n"
 	.string "knowledge and keen intelligence,\l"
 	.string "we award you these Battle Point(s).$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExchangeMonsAndSave: @ 8259323
+BattleFrontier_BattleFactoryLobby_Text_ExchangeMonsAndSave:
 	.string "Let me exchange your POKéMON\n"
 	.string "for our rental POKéMON.\p"
 	.string "I need to save the battle data,\n"
 	.string "so please wait.$"
 
-BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch: @ 8259388
+BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch:
 	.string "Would you like to record your last\n"
 	.string "BATTLE FACTORY match on your\l"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattleFactoryLobby_Text_NeedKnowledgeOfMonsMoves: @ 82593D7
+BattleFrontier_BattleFactoryLobby_Text_NeedKnowledgeOfMonsMoves:
 	.string "Hi!\n"
 	.string "You, there!\p"
 	.string "Are you thinking that the events here\n"
@@ -491,26 +491,26 @@ BattleFrontier_BattleFactoryLobby_Text_NeedKnowledgeOfMonsMoves: @ 82593D7
 	.string "about POKéMON and their moves,\l"
 	.string "it will be tough to keep winning.$"
 
-BattleFrontier_BattleFactoryLobby_Text_SwappedForWeakMon: @ 82594E5
+BattleFrontier_BattleFactoryLobby_Text_SwappedForWeakMon:
 	.string "I swapped for a weak POKéMON…\n"
 	.string "I thought it was a good kind to have…\p"
 	.string "They wiped the floor with us…$"
 
-BattleFrontier_BattleFactoryLobby_Text_NeedToCheckOpponentsMons: @ 8259547
+BattleFrontier_BattleFactoryLobby_Text_NeedToCheckOpponentsMons:
 	.string "Things haven't been going my way\n"
 	.string "at all.\p"
 	.string "You need to check your opponent's\n"
 	.string "POKéMON during battle to see if\l"
 	.string "they're any good.$"
 
-BattleFrontier_BattleFactoryLobby_Text_CantFigureOutStaffHints: @ 82595C4
+BattleFrontier_BattleFactoryLobby_Text_CantFigureOutStaffHints:
 	.string "You know how the staff here give you\n"
 	.string "a few hints about your next opponent?\p"
 	.string "Well, I'm a full-grown man, but I have\n"
 	.string "trouble figuring out their hints.$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_RentalMonsAreVaried: @ 8259658
+BattleFrontier_BattleFactoryLobby_Text_RentalMonsAreVaried:
 	.string "Like, I'm really tough, but I get bored\n"
 	.string "really easily, so I just kept swapping\l"
 	.string "and battling over and over.\p"
@@ -518,33 +518,33 @@ BattleFrontier_BattleFactoryLobby_Text_RentalMonsAreVaried: @ 8259658
 	.string "Battle Swap events, I noticed they\l"
 	.string "varied the rental POKéMON.$"
 
-BattleFrontier_BattleFactoryLobby_Text_RulesAreListed: @ 8259721
+BattleFrontier_BattleFactoryLobby_Text_RulesAreListed:
 	.string "The Battle Swap rules are listed.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading: @ 8259743
+BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainBasicRules: @ 8259766
+BattleFrontier_BattleFactoryLobby_Text_ExplainBasicRules:
 	.string "In a Battle Swap event, you may use\n"
 	.string "only three POKéMON.\p"
 	.string "Whether you are renting or swapping,\n"
 	.string "your team may not have two or more\l"
 	.string "of the same POKéMON.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainSwapPartnerRules: @ 82597FB
+BattleFrontier_BattleFactoryLobby_Text_ExplainSwapPartnerRules:
 	.string "You may swap POKéMON only with\n"
 	.string "the TRAINER you have just defeated.\p"
 	.string "You may swap for only those POKéMON\n"
 	.string "used by the beaten TRAINER.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNumberRules: @ 825987E
+BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNumberRules:
 	.string "After every battle you win, you may\n"
 	.string "swap for one of your defeated\l"
 	.string "opponent's POKéMON.\p"
 	.string "You will not be able to swap POKéMON\n"
 	.string "with the seventh TRAINER in the event.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNotesRules: @ 8259920
+BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNotesRules:
 	.string "There are two key points to be aware\n"
 	.string "of when swapping POKéMON.\p"
 	.string "First, when swapping, you can't check\n"
@@ -556,7 +556,7 @@ BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNotesRules: @ 8259920
 	.string "This sequence remains unchanged\n"
 	.string "even when swaps are made.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainOpenLvRules: @ 8259A5E
+BattleFrontier_BattleFactoryLobby_Text_ExplainOpenLvRules:
 	.string "In the Open Level, the rental POKéMON\n"
 	.string "and the opposing TRAINERS' POKéMON\l"
 	.string "are all Level 100.$"
diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
index 3d3f2faee..ce3cb357c 100644
--- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
@@ -1,29 +1,29 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA
+BattleFrontier_BattleFactoryPreBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattleFactoryPreBattleRoom_OnWarp: @ 8259AC5
+BattleFrontier_BattleFactoryPreBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects:: @ 8259ACF
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
 	compare VAR_0x8006, 1
 	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth
 	setobjectxy LOCALID_ATTENDANT, 8, 7
 	turnobject LOCALID_ATTENDANT, DIR_SOUTH
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth:: @ 8259AEA
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_OnFrame: @ 8259AEF
+BattleFrontier_BattleFactoryPreBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: @ 8259AF9
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom::
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle
 	setvar VAR_TEMP_0, 1
@@ -45,7 +45,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: @ 8259AF9
 	factory_setswapped
 	factory_rentmons
 	waitstate
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom:: @ 8259B74
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_EventScript_GetLvlMode
@@ -58,7 +58,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom:: @ 8259B7
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle:: @ 8259BA5
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle::
 	factory_setopponentmons
 	factory_resethelditems
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT
@@ -84,11 +84,11 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle:: @
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent:: @ 8259C13
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent::
 	frontier_getbrainstatus
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent:: @ 8259C26
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor2ndOpponent
@@ -113,7 +113,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
 	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8259CC6
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon
@@ -121,7 +121,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecor
 	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle:: @ 8259CFC
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_RecordLatestBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -130,18 +130,18 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle:: @ 8259CF
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_RecordBattle:: @ 8259D2E
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge:: @ 8259D38
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge:: @ 8259D66
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -150,7 +150,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge:: @ 825
 	case 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon:: @ 8259D98
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon::
 	factory_generateopponentmons
 	factory_getopponentmontype
 	setorcopyvar VAR_0x8005, VAR_RESULT
@@ -164,7 +164,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon:: @ 8259D98
 	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons::
 	fadescreen FADE_TO_BLACK
 	factory_swapmons
 	waitstate
@@ -174,37 +174,37 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8259E1D
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8259E24
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor4thOpponent:: @ 8259E2B
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor4thOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8259E32
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor5thOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent:: @ 8259E39
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8259E40
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor7thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait
 	waitmessage
 	factory_save CHALLENGE_STATUS_PAUSED
@@ -214,14 +214,14 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47
 	frontier_reset
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge:: @ 8259E69
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge::
 	special SavePlayerParty
 	factory_setparties 0
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	special CalculatePlayerPartyCount
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType:: @ 8259E93
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_InvestigatedUpcomingOpponent, MSGBOX_DEFAULT
 	compare VAR_0x8005, TYPE_NORMAL
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal
@@ -261,79 +261,79 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType:: @
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonType
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal:: @ 8259F62
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInNormalType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFighting:: @ 8259F6B
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFighting::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFightingType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFlying:: @ 8259F74
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFlying::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFlyingType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPoison:: @ 8259F7D
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPoison::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPoisonType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGround:: @ 8259F86
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGround::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGroundType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesRock:: @ 8259F8F
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesRock::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInRockType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesBug:: @ 8259F98
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesBug::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInBugType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGhost:: @ 8259FA1
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGhost::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGhostType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesSteel:: @ 8259FAA
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesSteel::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInSteelType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFire:: @ 8259FB3
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFire::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFireType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesWater:: @ 8259FBC
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesWater::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInWaterType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGrass:: @ 8259FC5
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGrass::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGrassType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesElectric:: @ 8259FCE
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesElectric::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInElectricType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPsychic:: @ 8259FD7
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPsychic::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPsychicType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesIce:: @ 8259FE0
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesIce::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInIceType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDragon:: @ 8259FE9
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDragon::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDragonType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDark:: @ 8259FF2
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDark::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDarkType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonType:: @ 8259FFB
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonType::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerHasNoClearFavorite, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle:: @ 825A004
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle::
 	compare VAR_0x8006, FACTORY_STYLE_NONE
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained
 	compare VAR_0x8006, FACTORY_STYLE_PREPARATION
@@ -354,43 +354,43 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle:: @
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained:: @ 825A068
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleUnrestrained, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleTotalPreparation:: @ 825A071
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleTotalPreparation::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleTotalPreparation, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleSlowAndSteady:: @ 825A07A
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleSlowAndSteady::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleSlowAndSteady, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleEndurance:: @ 825A083
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleEndurance::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleEndurance, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleHighRisk:: @ 825A08C
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleHighRisk::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleHighRisk, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleWeakenFoe:: @ 825A095
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleWeakenFoe::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleWeakenFoe, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleImpossibleToPredict:: @ 825A09E
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleImpossibleToPredict::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleImpossibleToPredict, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleDependsOnFlow:: @ 825A0A7
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleDependsOnFlow::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleDependsOnFlow, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible:: @ 825A0B0
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleFlexible, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B9
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead
 	waitmessage
 	call BattleFrontier_EventScript_GetCantRecordBattle
@@ -404,7 +404,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B
 	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord:: @ 825A110
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead
@@ -412,7 +412,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord::
 	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead:: @ 825A146
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_CantTellAnythingAboutHead, MSGBOX_DEFAULT
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon, MSGBOX_YESNO
 	switch VAR_RESULT
@@ -420,17 +420,17 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead:: @ 825A
 	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50:: @ 825A17C
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen:: @ 825A18B
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom: @ 825A19A
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom:
 	walk_up
 	walk_up
 	walk_up
@@ -438,7 +438,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom: @ 825A19A
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50: @ 825A1A0
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50:
 	walk_up
 	walk_left
 	walk_left
@@ -446,7 +446,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50: @
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen: @ 825A1A6
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen:
 	walk_up
 	walk_right
 	walk_right
@@ -454,7 +454,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen:
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom: @ 825A1AC
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom:
 	walk_up
 	walk_up
 	walk_up
@@ -463,7 +463,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom: @ 825A1AC
 	face_down
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50: @ 825A1B3
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50:
 	walk_left
 	walk_left
 	walk_up
@@ -471,7 +471,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50: @
 	set_invisible
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen: @ 825A1B9
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen:
 	walk_right
 	walk_right
 	walk_up
@@ -479,201 +479,201 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen:
 	set_invisible
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantMoveToReceiveCall: @ 825A1BF
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantMoveToReceiveCall:
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantReturnToPlayer: @ 825A1C3
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantReturnToPlayer:
 	walk_right
 	walk_right
 	walk_right
 	face_down
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection: @ 825A1C8
+BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection:
 	.string "First, we will hold your POKéMON for\n"
 	.string "safekeeping.\p"
 	.string "You may then choose from our\n"
 	.string "selection of POKéMON.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons: @ 825A22D
+BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons:
 	.string "Thank you for competing!\n"
 	.string "Let us restore your POKéMON!$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent: @ 825A263
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent:
 	.string "The 2nd match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent: @ 825A289
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent:
 	.string "The 3rd match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor4thOpponent: @ 825A2AF
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor4thOpponent:
 	.string "The 4th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor5thOpponent: @ 825A2D5
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor5thOpponent:
 	.string "The 5th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor6thOpponent: @ 825A2FB
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor6thOpponent:
 	.string "The 6th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor7thOpponent: @ 825A321
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor7thOpponent:
 	.string "Finally, the 7th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame: @ 825A350
+BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame:
 	.string "Would you like to save and quit\n"
 	.string "the game?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge: @ 825A37A
+BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge:
 	.string "Would you like to retire from your\n"
 	.string "Battle Swap challenge?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_InvestigatedUpcomingOpponent: @ 825A3B4
+BattleFrontier_BattleFactoryPreBattleRoom_Text_InvestigatedUpcomingOpponent:
 	.string "I've conducted a little investigation\n"
 	.string "about your upcoming opponent.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInNormalType: @ 825A3F8
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInNormalType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the NORMAL type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFireType: @ 825A43E
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFireType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the FIRE type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInWaterType: @ 825A482
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInWaterType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the WATER type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInElectricType: @ 825A4C7
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInElectricType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the ELECTRIC type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGrassType: @ 825A50F
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGrassType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the GRASS type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInIceType: @ 825A554
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInIceType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the ICE type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFightingType: @ 825A597
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFightingType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the FIGHTING type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPoisonType: @ 825A5DF
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPoisonType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the POISON type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGroundType: @ 825A625
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGroundType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the GROUND type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFlyingType: @ 825A66B
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFlyingType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the FLYING type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPsychicType: @ 825A6B1
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPsychicType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the PSYCHIC type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInBugType: @ 825A6F8
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInBugType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the BUG type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInRockType: @ 825A73B
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInRockType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the ROCK type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGhostType: @ 825A77F
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGhostType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the GHOST type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDragonType: @ 825A7C4
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDragonType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the DRAGON type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDarkType: @ 825A80A
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDarkType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the DARK type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInSteelType: @ 825A84E
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInSteelType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the STEEL type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerHasNoClearFavorite: @ 825A893
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerHasNoClearFavorite:
 	.string "The TRAINER appears to have no clear\n"
 	.string "favorites when it comes to type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleSlowAndSteady: @ 825A8D9
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleSlowAndSteady:
 	.string "The favorite battle style appears to\n"
 	.string "be slow and steady.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleEndurance: @ 825A912
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleEndurance:
 	.string "The favorite battle style appears to\n"
 	.string "be one of endurance.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleHighRisk: @ 825A94C
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleHighRisk:
 	.string "The favorite battle style appears to\n"
 	.string "be high risk, high return.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleDependsOnFlow: @ 825A98C
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleDependsOnFlow:
 	.string "The favorite battle style appears to\n"
 	.string "depend on the battle's flow.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleTotalPreparation: @ 825A9CE
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleTotalPreparation:
 	.string "The favorite battle style appears to\n"
 	.string "be one based on total preparation.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleWeakenFoe: @ 825AA16
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleWeakenFoe:
 	.string "The favorite battle style appears\n"
 	.string "to be weakening the foe to start.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleFlexible: @ 825AA5A
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleFlexible:
 	.string "The favorite battle style appears to\n"
 	.string "be flexibly adaptable to the situation.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleImpossibleToPredict: @ 825AAA7
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleImpossibleToPredict:
 	.string "The favorite battle style appears to\n"
 	.string "be impossible to predict.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleUnrestrained: @ 825AAE6
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleUnrestrained:
 	.string "The favorite battle style appears to\n"
 	.string "be free-spirited and unrestrained.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon: @ 825AB2E
+BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon:
 	.string "Before starting the battle, would you\n"
 	.string "like to swap a POKéMON?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete: @ 825AB6C
+BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete:
 	.string "Thank you!\n"
 	.string "Your POKéMON swap is complete.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay: @ 825AB96
+BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay:
 	.string "Right this way, please!$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait: @ 825ABAE
+BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait:
 	.string "I am saving your data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_RecordLatestBattle: @ 825ABD2
+BattleFrontier_BattleFactoryPreBattleRoom_Text_RecordLatestBattle:
 	.string "Would you like to record your latest\n"
 	.string "battle on your FRONTIER PASS?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments: @ 825AC15
+BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments:
 	.string "Excuse me! Excuse me, please!\n"
 	.string "May I get you to wait a few moments?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_UnderstoodSirWillDo: @ 825AC58
+BattleFrontier_BattleFactoryPreBattleRoom_Text_UnderstoodSirWillDo:
 	.string "…Uh-huh? What?! …Whoa!\n"
 	.string "Understood, sir! Will do!$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_MessageFromHeadComeRightNow: @ 825AC89
+BattleFrontier_BattleFactoryPreBattleRoom_Text_MessageFromHeadComeRightNow:
 	.string "Oh, my…\n"
 	.string "Sorry to keep you waiting!\p"
 	.string "I have a message from this facility's\n"
@@ -681,10 +681,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_Text_MessageFromHeadComeRightNow: @ 82
 	.string "He says, “We're going to do it!\n"
 	.string "Come here right now!”$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead: @ 825AD20
+BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead:
 	.string "The FACTORY HEAD is demanding you.\n"
 	.string "Are you prepared to face him?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_CantTellAnythingAboutHead: @ 825AD61
+BattleFrontier_BattleFactoryPreBattleRoom_Text_CantTellAnythingAboutHead:
 	.string "I'm terribly sorry, but I can't tell you\n"
 	.string "anything about the FACTORY HEAD.$"
diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
index 0ad0a9377..a838c7ead 100644
--- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
@@ -4,7 +4,7 @@
 .set LOCALID_DUSCLOPS, 4
 .set LOCALID_AZURILL, 5
 
-BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
+BattleFrontier_BattlePalaceBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_OnWarp
@@ -14,12 +14,12 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
 	@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_0
 	@ The opponent is represented by LOCALID_OPPONENT, which has the gfx id VAR_OBJ_GFX_ID_1
 
-BattleFrontier_BattlePalaceBattleRoom_OnTransition: @ 824F825
+BattleFrontier_BattlePalaceBattleRoom_OnTransition:
 	frontier_settrainers
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx:: @ 824F833
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale
@@ -28,21 +28,21 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx:: @ 824F833
 	return
 
 @ The opponent's gfx are set to the players by default
-BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale:: @ 824F84B
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824F856
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_OnFrame: @ 824F861
+BattleFrontier_BattlePalaceBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom:: @ 824F86B
+BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom::
 	showobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
@@ -54,10 +54,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom:: @ 824F86B
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge:: @ 824F8B5
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge::
 	applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerEnterRoom
 	waitmovement 0
-BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter:: @ 824F8BF
+BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter::
 	tower_setopponent
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter
@@ -68,11 +68,11 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter:: @ 824F8BF
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost:: @ 824F8FA
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent:: @ 824F911
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
@@ -92,7 +92,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent:: @ 824F911
 	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98A
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent::
 	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
@@ -121,7 +121,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98
 	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 824FA42
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge
@@ -129,7 +129,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord::
 	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle:: @ 824FA78
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_RecordLastMatch
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -138,18 +138,18 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle:: @ 824FA78
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_RecordBattle:: @ 824FAAA
+BattleFrontier_BattlePalaceBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge:: @ 824FAB4
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 	case YES, BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge:: @ 824FAE2
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -158,17 +158,17 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge:: @ 824FAE2
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge:: @ 824FB14
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge::
 	applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight
 	closemessage
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon:: @ 824FB28
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge:: @ 824FB3F
+BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_SavingData
 	waitmessage
 	palace_save CHALLENGE_STATUS_PAUSED
@@ -178,12 +178,12 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge:: @ 824FB3F
 	frontier_reset
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext:: @ 824FB61
+BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext::
 	compare VAR_TEMP_2, 1
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_ChallengingPalaceMaven, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven
 	waitmessage
 	call BattleFrontier_EventScript_GetCantRecordBattle
@@ -197,7 +197,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79
 	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord:: @ 824FBD0
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser
@@ -205,7 +205,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord:: @ 8
 	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser:: @ 824FC06
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser::
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_AnnounceArrivalOfSpenser, MSGBOX_DEFAULT
 	closemessage
@@ -229,14 +229,14 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser:: @ 824FC06
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver:: @ 824FCAA
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver::
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_ProveYourBondWithMons, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver:: @ 824FCC7
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver::
 	palace_incrementstreak
 	frontier_getsymbols
 	compare VAR_RESULT, 0
@@ -258,20 +258,20 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver:: @ 824F
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserAwaitNextTime, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_IntroSpenserGold:: @ 824FD3A
+BattleFrontier_BattlePalaceBattleRoom_EventScript_IntroSpenserGold::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold:: @ 824FD67
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold::
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_Kaaah, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD84
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold::
 	palace_incrementstreak
 	frontier_getsymbols
 	compare VAR_RESULT, 2
@@ -293,7 +293,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD8
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserComeSeeMeAgain, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle:: @ 824FDF7
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle::
 	closemessage
 	setvar VAR_TEMP_2, 0
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
@@ -307,11 +307,11 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle:: @ 824FDF7
 	frontier_resetsketch
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_OnWarp: @ 824FE34
+BattleFrontier_BattlePalaceBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects
 	.2byte 0
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects:: @ 824FE3E
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects::
 	hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx
 	setvar VAR_TEMP_1, 1
@@ -321,55 +321,55 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects:: @ 824FE3E
 	applymovement LOCALID_AZURILL, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 824FE66
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 824FE6D
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor4thOpponent:: @ 824FE74
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor4thOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor5thOpponent:: @ 824FE7B
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor5thOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent:: @ 824FE82
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent:: @ 824FE89
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor7thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible: @ 824FE90
+BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible:
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerEnterRoom: @ 824FE92
+BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerEnterRoom:
 	set_visible
 	walk_up
 	walk_up
 	walk_up
 	walk_up
-BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight: @ 824FE97
+BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight:
 	face_right
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp: @ 824FE99
+BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp:
 	face_up
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge: @ 824FE9B
+BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge:
 	set_visible
 	walk_up
 	walk_up
@@ -377,7 +377,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge: @ 824FE9
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter: @ 824FEA1
+BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -385,37 +385,37 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter: @ 824FEA1
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentExit: @ 824FEA7
+BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentExit:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown: @ 824FEAC
+BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown:
 	face_down
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter1: @ 824FEAE
+BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter1:
 	set_visible
 	walk_slow_down
 	walk_slow_down
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter2: @ 824FEB3
+BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter2:
 	set_visible
 	walk_slow_down
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter3: @ 824FEB6
+BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter3:
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby:: @ 824FEBB
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles
@@ -423,12 +423,12 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby:: @ 824FEBB
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles:: @ 824FED5
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles::
 	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_DusclopsEnter: @ 824FEDF
+BattleFrontier_BattlePalaceBattleRoom_Movement_DusclopsEnter:
 	delay_16
 	delay_16
 	set_visible
@@ -438,7 +438,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_DusclopsEnter: @ 824FEDF
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter: @ 824FEE7
+BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter:
 	set_visible
 	walk_fast_down
 	walk_fast_right
@@ -451,7 +451,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter: @ 824FEE7
 	delay_16
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_SpenserEnter: @ 824FEF2
+BattleFrontier_BattlePalaceBattleRoom_Movement_SpenserEnter:
 	delay_16
 	delay_16
 	delay_16
@@ -467,64 +467,64 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_SpenserEnter: @ 824FEF2
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Text_LetMeRestoreYourMons: @ 824FF00
+BattleFrontier_BattlePalaceBattleRoom_Text_LetMeRestoreYourMons:
 	.string "Excellent…\n"
 	.string "Let me restore your POKéMON.$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent: @ 824FF28
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent:
 	.string "The 2nd opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent: @ 824FF54
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent:
 	.string "The 3rd opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor4thOpponent: @ 824FF80
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor4thOpponent:
 	.string "The 4th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor5thOpponent: @ 824FFAC
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor5thOpponent:
 	.string "The 5th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor6thOpponent: @ 824FFD8
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor6thOpponent:
 	.string "The 6th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor7thOpponent: @ 8250004
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor7thOpponent:
 	.string "The 7th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame: @ 8250030
+BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame:
 	.string "Would you like to save and quit\n"
 	.string "the game?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge: @ 825005A
+BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge:
 	.string "Do you wish to quit your challenge?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SavingData: @ 825007E
+BattleFrontier_BattlePalaceBattleRoom_Text_SavingData:
 	.string "Saving the data.\n"
 	.string "Have patience…$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_RecordLastMatch: @ 825009E
+BattleFrontier_BattlePalaceBattleRoom_Text_RecordLastMatch:
 	.string "Do you wish to record your latest\n"
 	.string "match on your FRONTIER PASS?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_ChallengingPalaceMaven: @ 82500DD
+BattleFrontier_BattlePalaceBattleRoom_Text_ChallengingPalaceMaven:
 	.string "And now…\p"
 	.string "By winning consistently, you have\n"
 	.string "earned the privilege of challenging\l"
 	.string "our master, the PALACE MAVEN…$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven: @ 825014A
+BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven:
 	.string "I shall send for the PALACE MAVEN.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_AnnounceArrivalOfSpenser: @ 825017C
+BattleFrontier_BattlePalaceBattleRoom_Text_AnnounceArrivalOfSpenser:
 	.string "Let great fanfare announce the arrival\n"
 	.string "of the PALACE MAVEN, SPENSER!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro: @ 82501C1
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro:
 	.string "SPENSER: My physical being is with\n"
 	.string "POKéMON always!\p"
 	.string "My heart beats as one with\n"
@@ -536,34 +536,34 @@ BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro: @ 82501C1
 	.string "If your bonds of trust are frail,\n"
 	.string "you will never beat my brethren!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_ProveYourBondWithMons: @ 82502C4
+BattleFrontier_BattlePalaceBattleRoom_Text_ProveYourBondWithMons:
 	.string "The bond you share with your POKéMON!\n"
 	.string "Prove it to me here!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserPostSilverBattle: @ 82502FF
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserPostSilverBattle:
 	.string "SPENSER: Gwahahah!\p"
 	.string "Hah, you never fell for my bluster!\n"
 	.string "Sorry for trying that stunt!\p"
 	.string "Here!\n"
 	.string "Bring me the thing!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_LetsSeeFrontierPass: @ 825036D
+BattleFrontier_BattlePalaceBattleRoom_Text_LetsSeeFrontierPass:
 	.string "My, my, if only you could maintain that\n"
 	.string "facade of distinguished authority…\p"
 	.string "Here!\n"
 	.string "Let's see your FRONTIER PASS!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_ReceivedSpiritsSymbol: @ 82503DC
+BattleFrontier_BattlePalaceBattleRoom_Text_ReceivedSpiritsSymbol:
 	.string "The Spirits Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserAwaitNextTime: @ 8250412
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserAwaitNextTime:
 	.string "SPENSER: Your POKéMON's eyes are \n"
 	.string "truly clear and unclouded.\p"
 	.string "I will eagerly await the next\n"
 	.string "opportunity to see you.$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack: @ 8250485
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack:
 	.string "SPENSER: Gwahahah!\n"
 	.string "You've battled your way up again?\p"
 	.string "You must have developed a truly\n"
@@ -574,10 +574,10 @@ BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack: @ 825048
 	.string "Ready now?\n"
 	.string "Prepare to lose!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_Kaaah: @ 8250572
+BattleFrontier_BattlePalaceBattleRoom_Text_Kaaah:
 	.string "… … …Kaaah!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserYourTeamIsAdmirable: @ 825057E
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserYourTeamIsAdmirable:
 	.string "SPENSER: Well, that was some display!\n"
 	.string "Even fully unleashed, my brethren\l"
 	.string "could not overpower you.\p"
@@ -585,17 +585,17 @@ BattleFrontier_BattlePalaceBattleRoom_Text_SpenserYourTeamIsAdmirable: @ 825057E
 	.string "Here!\n"
 	.string "Bring me that thing, will you?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_HurryWithFrontierPass: @ 8250629
+BattleFrontier_BattlePalaceBattleRoom_Text_HurryWithFrontierPass:
 	.string "My, my, if only you could maintain\n"
 	.string "a certain level of decorum…\p"
 	.string "Gaaah, here!\n"
 	.string "Hurry with that FRONTIER PASS, you!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpiritsSymbolTookGoldenShine: @ 8250699
+BattleFrontier_BattlePalaceBattleRoom_Text_SpiritsSymbolTookGoldenShine:
 	.string "The Spirits Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserComeSeeMeAgain: @ 82506C4
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserComeSeeMeAgain:
 	.string "SPENSER: Gwahahah!\p"
 	.string "Come see me time and again!\n"
 	.string "My brethren and I will be waiting!$"
diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
index 2b3b8aab3..011170bae 100644
--- a/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
@@ -1,14 +1,14 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3
+BattleFrontier_BattlePalaceCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattlePalaceCorridor_OnFrame: @ 824F4A9
+BattleFrontier_BattlePalaceCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor
 	.2byte 0
 
-BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
+BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor::
 	delay 16
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
@@ -41,7 +41,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
 	waitdooranim
 	goto BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom
 
-BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom:: @ 824F553
+BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom
 	waitmovement 0
@@ -52,39 +52,39 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom:: @ 824F553
 	waitmovement 0
 	closedoor 10, 3
 	waitdooranim
-BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom:: @ 824F581
+BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom::
 	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment1:: @ 824F58B
+BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment1::
 	msgbox BattleFrontier_BattlePalaceCorridor_Text_PeopleAndMonAreSame, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment2:: @ 824F594
+BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment2::
 	msgbox BattleFrontier_BattlePalaceCorridor_Text_LetMonDoWhatItLikes, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment3:: @ 824F59D
+BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment3::
 	msgbox BattleFrontier_BattlePalaceCorridor_Text_MonDifferentWhenCornered, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_StreakComment:: @ 824F5A6
+BattleFrontier_BattlePalaceCorridor_EventScript_StreakComment::
 	msgbox BattleFrontier_BattlePalaceCorridor_Text_BeginningToUnderstandNature, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_LongStreakComment:: @ 824F5AF
+BattleFrontier_BattlePalaceCorridor_EventScript_LongStreakComment::
 	msgbox BattleFrontier_BattlePalaceCorridor_Text_HeartfeltBondBetweenYouAndMons, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor: @ 824F5B8
+BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom: @ 824F5BD
+BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom:
 	walk_up
 	walk_up
 	walk_left
@@ -93,7 +93,7 @@ BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom: @ 824F
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom: @ 824F5C4
+BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom:
 	walk_up
 	walk_up
 	walk_up
@@ -102,7 +102,7 @@ BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom: @ 824F5C4
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom: @ 824F5CB
+BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom:
 	walk_up
 	walk_right
 	walk_right
@@ -111,7 +111,7 @@ BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom: @ 82
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom: @ 824F5D2
+BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom:
 	walk_up
 	walk_up
 	walk_right
@@ -120,38 +120,38 @@ BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom: @ 824F5
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom: @ 824F5D9
+BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom:
 	walk_up
-BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom: @ 824F5DA
+BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Text_PeopleAndMonAreSame: @ 824F5DD
+BattleFrontier_BattlePalaceCorridor_Text_PeopleAndMonAreSame:
 	.string "People and POKéMON, they are but\n"
 	.string "the same…\p"
 	.string "Their individual nature makes them\n"
 	.string "good at certain things, and not good\l"
 	.string "at others.$"
 
-BattleFrontier_BattlePalaceCorridor_Text_LetMonDoWhatItLikes: @ 824F65B
+BattleFrontier_BattlePalaceCorridor_Text_LetMonDoWhatItLikes:
 	.string "Rather than trying to make a POKéMON\n"
 	.string "do what it dislikes, try to let it do\l"
 	.string "what it likes and is good at doing.\p"
 	.string "Put yourself in the POKéMON's position\n"
 	.string "and consider what moves it would like.$"
 
-BattleFrontier_BattlePalaceCorridor_Text_MonDifferentWhenCornered: @ 824F718
+BattleFrontier_BattlePalaceCorridor_Text_MonDifferentWhenCornered:
 	.string "A POKéMON's nature is a remarkable\n"
 	.string "thing…\p"
 	.string "Some POKéMON behave in a completely\n"
 	.string "different way when they are cornered.$"
 
-BattleFrontier_BattlePalaceCorridor_Text_BeginningToUnderstandNature: @ 824F78C
+BattleFrontier_BattlePalaceCorridor_Text_BeginningToUnderstandNature:
 	.string "Are you beginning to understand how\n"
 	.string "a POKéMON's nature makes it behave?$"
 
-BattleFrontier_BattlePalaceCorridor_Text_HeartfeltBondBetweenYouAndMons: @ 824F7D4
+BattleFrontier_BattlePalaceCorridor_Text_HeartfeltBondBetweenYouAndMons:
 	.string "Ah… I see a strong, heartfelt bond\n"
 	.string "between you and your POKéMON…$"
 
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
index 4c2a4841e..a51fa48fd 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -1,21 +1,21 @@
 .set LOCALID_ATTENDANT_SINGLES, 1
 .set LOCALID_ATTENDANT_DOUBLES, 6
 
-BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E
+BattleFrontier_BattlePalaceLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePalaceLobby_OnWarp: @ 824D789
+BattleFrontier_BattlePalaceLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth:: @ 824D793
+BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePalaceLobby_OnFrame: @ 824D79D
+BattleFrontier_BattlePalaceLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge
@@ -23,11 +23,11 @@ BattleFrontier_BattlePalaceLobby_OnFrame: @ 824D79D
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattlePalaceLobby_EventScript_GetChallengeStatus:: @ 824D7C7
+BattleFrontier_BattlePalaceLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving:: @ 824D7D0
+BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge, MSGBOX_DEFAULT
 	closemessage
@@ -38,7 +38,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving:: @ 824D7D0
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge:: @ 824D817
+BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge::
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
@@ -46,9 +46,9 @@ BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge:: @ 824D817
 	msgbox BattleFrontier_BattlePalaceLobby_Text_FirmTrueBondsFor7WinStreak, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattlePalaceLobby_EventScript_DefeatedMaven:: @ 824D838
+BattleFrontier_BattlePalaceLobby_EventScript_DefeatedMaven::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ToDefeatMavenAnd7Trainers, MSGBOX_DEFAULT
-BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints:: @ 824D840
+BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_PresentYouWithBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -61,7 +61,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints:: @ 824D840
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge:: @ 824D873
+BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge::
 	lockall
 	message BattleFrontier_BattlePalaceLobby_Text_ResultsWillBeRecorded
 	waitmessage
@@ -73,7 +73,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge:: @ 824D873
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge:: @ 824D8A1
+BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge::
 	frontier_checkairshow
 	special LoadPlayerParty
 	special HealPlayerParty
@@ -91,12 +91,12 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge:: @ 824D8A1
 	case 0, BattleFrontier_BattlePalaceLobby_EventScript_RecordMatch
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_RecordMatch:: @ 824D902
+BattleFrontier_BattlePalaceLobby_EventScript_RecordMatch::
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge:: @ 824D907
+BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge::
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge:: @ 824D908
+BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge::
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting, MSGBOX_DEFAULT
 	message BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge
@@ -108,7 +108,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge:: @ 824D908
 	setvar VAR_TEMP_0, 255
 	goto BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_SinglesAttendant:: @ 824D944
+BattleFrontier_BattlePalaceLobby_EventScript_SinglesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
@@ -116,7 +116,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_SinglesAttendant:: @ 824D944
 	goto BattleFrontier_BattlePalaceLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_DoublesAttendant:: @ 824D956
+BattleFrontier_BattlePalaceLobby_EventScript_DoublesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
@@ -124,7 +124,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_DoublesAttendant:: @ 824D956
 	goto BattleFrontier_BattlePalaceLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_Attendant:: @ 824D968
+BattleFrontier_BattlePalaceLobby_EventScript_Attendant::
 	palace_get PALACE_DATA_PRIZE
 	compare VAR_RESULT, ITEM_NONE
 	goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge
@@ -133,7 +133,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_Attendant:: @ 824D968
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForSingleBattle
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForDoubleBattle
-BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge:: @ 824D999
+BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_AskTakeSingleBattleChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -146,7 +146,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge:: @ 824D999
 	case 2, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge:: @ 824D9E6
+BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattlePalaceLobby_Text_WhichChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -172,7 +172,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge:: @ 824D9E6
 	case YES, BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge:: @ 824DA87
+BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	palace_init
@@ -186,7 +186,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge:: @ 824DA87
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed
-BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge:: @ 824DAF3
+BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox BattleFrontier_BattlePalaceLobby_Text_FollowMe, MSGBOX_DEFAULT
@@ -197,58 +197,58 @@ BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge:: @ 824DAF3
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_ExplainChallenge:: @ 824DB20
+BattleFrontier_BattlePalaceLobby_EventScript_ExplainChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_ExplainDoublesChallenge
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_ExplainDoublesChallenge:: @ 824DB38
+BattleFrontier_BattlePalaceLobby_EventScript_ExplainDoublesChallenge::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainDoubleBattleChallenge, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons:: @ 824DB45
+BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLv50:: @ 824DB60
+BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 824DB6D
+BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed:: @ 824DB7A
+BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge:: @ 824DB91
+BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge:: @ 824DB94
+BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified, MSGBOX_DEFAULT
-BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge:: @ 824DB9C
+BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForSingleBattle:: @ 824DB9E
+BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForSingleBattle::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_WelcomeForSingleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForDoubleBattle:: @ 824DBA7
+BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForDoubleBattle::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_WelcomeForDoubleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_AskTakeSingleBattleChallenge:: @ 824DBB0
+BattleFrontier_BattlePalaceLobby_EventScript_AskTakeSingleBattleChallenge::
 	message BattleFrontier_BattlePalaceLobby_Text_TakeSingleBattleChallenge
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_AskTakeDoubleBattleChallenge:: @ 824DBB6
+BattleFrontier_BattlePalaceLobby_EventScript_AskTakeDoubleBattleChallenge::
 	message BattleFrontier_BattlePalaceLobby_Text_TakeDoubleBattleChallenge
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor:: @ 824DBBC
+BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_TalkedToSinglesAttendant
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -271,46 +271,46 @@ BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor:: @ 824DBBC
 	waitdooranim
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_TalkedToSinglesAttendant:: @ 824DC23
+BattleFrontier_BattlePalaceLobby_EventScript_TalkedToSinglesAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_SINGLES
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant:: @ 824DC29
+BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_DOUBLES
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor:: @ 824DC2F
+BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor::
 	opendoor 5, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor:: @ 824DC35
+BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor::
 	opendoor 19, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor:: @ 824DC3B
+BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor::
 	closedoor 5, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_CloseDoublesHallDoor:: @ 824DC41
+BattleFrontier_BattlePalaceLobby_EventScript_CloseDoublesHallDoor::
 	closedoor 19, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor: @ 824DC47
+BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor:
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor: @ 824DC49
+BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor: @ 824DC4C
+BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceLobby_EventScript_ShowSinglesResults:: @ 824DC50
+BattleFrontier_BattlePalaceLobby_EventScript_ShowSinglesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_PALACE, FRONTIER_MODE_SINGLES
 	waitbuttonpress
@@ -318,7 +318,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_ShowSinglesResults:: @ 824DC50
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_ShowDoublesResults:: @ 824DC69
+BattleFrontier_BattlePalaceLobby_EventScript_ShowDoublesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_PALACE, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
@@ -326,29 +326,29 @@ BattleFrontier_BattlePalaceLobby_EventScript_ShowDoublesResults:: @ 824DC69
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_BlackBelt:: @ 824DC82
+BattleFrontier_BattlePalaceLobby_EventScript_BlackBelt::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_LadyCanTellWhatMonsThink, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_Man:: @ 824DC8B
+BattleFrontier_BattlePalaceLobby_EventScript_Man::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_NatureAndMovesKeyHere, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_Beauty:: @ 824DC94
+BattleFrontier_BattlePalaceLobby_EventScript_Beauty::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_MonDocileButTransforms, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_Maniac:: @ 824DC9D
+BattleFrontier_BattlePalaceLobby_EventScript_Maniac::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_WhatNatureFavorsChippingAway, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesBoard:: @ 824DCA6
+BattleFrontier_BattlePalaceLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard:: @ 824DCB5
+BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 16, 0, MULTI_BATTLE_PALACE_RULES, FALSE
@@ -362,47 +362,47 @@ BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard:: @ 824DCB5
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesBasics:: @ 824DD13
+BattleFrontier_BattlePalaceLobby_EventScript_RulesBasics::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesNature:: @ 824DD21
+BattleFrontier_BattlePalaceLobby_EventScript_RulesNature::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesMoves:: @ 824DD2F
+BattleFrontier_BattlePalaceLobby_EventScript_RulesMoves::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesUnderpowered:: @ 824DD3D
+BattleFrontier_BattlePalaceLobby_EventScript_RulesUnderpowered::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesWhenInDanger:: @ 824DD4B
+BattleFrontier_BattlePalaceLobby_EventScript_RulesWhenInDanger::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_ExitRules:: @ 824DD59
+BattleFrontier_BattlePalaceLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_Text_WelcomeForSingleBattle: @ 824DD5B
+BattleFrontier_BattlePalaceLobby_Text_WelcomeForSingleBattle:
 	.string "Where the hearts of TRAINERS\n"
 	.string "are put to the test.\p"
 	.string "I welcome you to the BATTLE PALACE.\p"
 	.string "I accept challenges to the SINGLE\n"
 	.string "BATTLE HALLS.$"
 
-BattleFrontier_BattlePalaceLobby_Text_TakeSingleBattleChallenge: @ 824DDE1
+BattleFrontier_BattlePalaceLobby_Text_TakeSingleBattleChallenge:
 	.string "Do you wish to take\n"
 	.string "the SINGLE BATTLE HALL challenge?$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge: @ 824DE17
+BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge:
 	.string "In the BATTLE PALACE, there are\n"
 	.string "several auditoriums for SINGLE BATTLES\l"
 	.string "that are named SINGLE BATTLE HALLS.\p"
@@ -425,16 +425,16 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge: @ 824DE17
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified: @ 824E0D8
+BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified:
 	.string "When you have fortified your heart\n"
 	.string "and POKéMON, you must return.$"
 
-BattleFrontier_BattlePalaceLobby_Text_WhichChallenge: @ 824E119
+BattleFrontier_BattlePalaceLobby_Text_WhichChallenge:
 	.string "There are two BATTLE HALLS,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which is your choice of a challenge?$"
 
-BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50: @ 824E173
+BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50:
 	.string "Sigh…\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for the challenge.\p"
@@ -448,7 +448,7 @@ BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50: @ 824E173
 	.string "Come back when you have made\n"
 	.string "your preparations.$"
 
-BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen: @ 824E29E
+BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "Sigh…\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for the challenge.\p"
@@ -460,52 +460,52 @@ BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen: @ 824E29E
 	.string "Come back when you have made\n"
 	.string "your preparations.$"
 
-BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons: @ 824E399
+BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons:
 	.string "Good. Now, you must select your\n"
 	.string "three POKéMON.$"
 
-BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge2: @ 824E3C8
+BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge2:
 	.string "I must save before I show you to\n"
 	.string "the BATTLE HALL. Is that okay?$"
 
-BattleFrontier_BattlePalaceLobby_Text_FollowMe: @ 824E408
+BattleFrontier_BattlePalaceLobby_Text_FollowMe:
 	.string "Good.\n"
 	.string "Now, follow me.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ResultsWillBeRecorded: @ 824E41E
+BattleFrontier_BattlePalaceLobby_Text_ResultsWillBeRecorded:
 	.string "I feel privileged for having seen\n"
 	.string "your POKéMON's exploits.\p"
 	.string "The results will be recorded.\n"
 	.string "I must ask you to briefly wait.$"
 
-BattleFrontier_BattlePalaceLobby_Text_FirmTrueBondsFor7WinStreak: @ 824E497
+BattleFrontier_BattlePalaceLobby_Text_FirmTrueBondsFor7WinStreak:
 	.string "To achieve a 7-win streak…\p"
 	.string "The bonds that bind your heart with\n"
 	.string "your POKéMON seem firm and true.$"
 
-BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded: @ 824E4F7
+BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded:
 	.string "Your feat will be recorded.\n"
 	.string "I must ask you to briefly wait.$"
 
 @ Unused
-BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak: @ 824E5333
+BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak:
     .string "For the feat of your 7-win streak,\n"
     .string "we present you with Battle Point(s).$"
 
-BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize: @ 824E57B
+BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize:
 	.string "You seem to have no space for\n"
 	.string "our prize.\p"
 	.string "You should return when you have\n"
 	.string "organized your BAG.$"
 
-BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting: @ 824E5D8
+BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting:
 	.string "We have been waiting for you…$"
 
-BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge: @ 824E5F6
+BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge:
 	.string "I must save before I show you to\n"
 	.string "the BATTLE HALL. Is that okay?$"
 
-BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge: @ 824E636
+BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge:
 	.string "Sigh…\p"
 	.string "You failed to save before you ended\n"
 	.string "your challenge the last time.\p"
@@ -513,11 +513,11 @@ BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge: @ 824E6
 	.string "disqualified. It is most unfortunate.$"
 
 @ Unused
-BattleFrontier_BattlePalaceLobby_Text_ReceivedPrize: @ 824E6C9
+BattleFrontier_BattlePalaceLobby_Text_ReceivedPrize:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-BattleFrontier_BattlePalaceLobby_Text_LadyCanTellWhatMonsThink: @ 824E6E3
+BattleFrontier_BattlePalaceLobby_Text_LadyCanTellWhatMonsThink:
 	.string "For a hardy fellow like me,\n"
 	.string "hardy POKéMON are the best.\p"
 	.string "Offense is the best defense!\n"
@@ -533,7 +533,7 @@ BattleFrontier_BattlePalaceLobby_Text_LadyCanTellWhatMonsThink: @ 824E6E3
 	.string "Huh?\n"
 	.string "Why are you looking at me like that?$"
 
-BattleFrontier_BattlePalaceLobby_Text_NatureAndMovesKeyHere: @ 824E851
+BattleFrontier_BattlePalaceLobby_Text_NatureAndMovesKeyHere:
 	.string "Hmm…\p"
 	.string "It appears that the nature of POKéMON\n"
 	.string "and the moves that they have been\l"
@@ -546,7 +546,7 @@ BattleFrontier_BattlePalaceLobby_Text_NatureAndMovesKeyHere: @ 824E851
 	.string "you may need to examine how well\l"
 	.string "its moves match its nature.$"
 
-BattleFrontier_BattlePalaceLobby_Text_MonDocileButTransforms: @ 824E992
+BattleFrontier_BattlePalaceLobby_Text_MonDocileButTransforms:
 	.string "My POKéMON is usually very docile.\p"
 	.string "But when it's in a BATTLE HALL,\n"
 	.string "it sometimes seems to become\l"
@@ -554,25 +554,25 @@ BattleFrontier_BattlePalaceLobby_Text_MonDocileButTransforms: @ 824E992
 	.string "It becomes totally intimidating.\n"
 	.string "It's shocking, even.$"
 
-BattleFrontier_BattlePalaceLobby_Text_WhatNatureFavorsChippingAway: @ 824EA4B
+BattleFrontier_BattlePalaceLobby_Text_WhatNatureFavorsChippingAway:
 	.string "I wonder what sort of nature a POKéMON\n"
 	.string "would have if it favored enfeebling its\l"
 	.string "opponents and chipping away slowly.\p"
 	.string "I'd be surprised if it was a LAX nature.\p"
 	.string "But, nah, that can't be right.$"
 
-BattleFrontier_BattlePalaceLobby_Text_WelcomeForDoubleBattle: @ 824EB06
+BattleFrontier_BattlePalaceLobby_Text_WelcomeForDoubleBattle:
 	.string "Where the hearts of TRAINERS\n"
 	.string "are put to the test.\p"
 	.string "I welcome you to the BATTLE PALACE.\p"
 	.string "I accept challenges to the DOUBLE\n"
 	.string "BATTLE HALLS.$"
 
-BattleFrontier_BattlePalaceLobby_Text_TakeDoubleBattleChallenge: @ 824EB8C
+BattleFrontier_BattlePalaceLobby_Text_TakeDoubleBattleChallenge:
 	.string "Do you wish to take\n"
 	.string "the DOUBLE BATTLE HALL challenge?$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainDoubleBattleChallenge: @ 824EBC2
+BattleFrontier_BattlePalaceLobby_Text_ExplainDoubleBattleChallenge:
 	.string "In the BATTLE PALACE, there are\n"
 	.string "several auditoriums for DOUBLE BATTLES\l"
 	.string "that are named DOUBLE BATTLE HALLS.\p"
@@ -595,34 +595,34 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainDoubleBattleChallenge: @ 824EBC2
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ToDefeatMavenAnd7Trainers: @ 824EE81
+BattleFrontier_BattlePalaceLobby_Text_ToDefeatMavenAnd7Trainers:
 	.string "To defeat the PALACE MAVEN\n"
 	.string "and seven TRAINERS in a row…$"
 
-BattleFrontier_BattlePalaceLobby_Text_PresentYouWithBattlePoints: @ 824EEB9
+BattleFrontier_BattlePalaceLobby_Text_PresentYouWithBattlePoints:
 	.string "In honor of the bond you share with\n"
 	.string "your POKéMON, we present you with\l"
 	.string "these Battle Point(s).$"
 
-BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch: @ 824EF16
+BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch:
 	.string "Would you like to record your latest\n"
 	.string "BATTLE PALACE match on your\l"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattlePalaceLobby_Text_RulesAreListed: @ 824EF66
+BattleFrontier_BattlePalaceLobby_Text_RulesAreListed:
 	.string "The BATTLE HALL rules are listed.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading: @ 824EF88
+BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics: @ 824EFAB
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics:
 	.string "Here, POKéMON are required to think\n"
 	.string "and battle by themselves.\p"
 	.string "Unlike in the wild, POKéMON that live\n"
 	.string "with people behave differently\l"
 	.string "depending on their nature.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature: @ 824F049
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature:
 	.string "Depending on its nature, a POKéMON\n"
 	.string "may prefer to attack no matter what.\p"
 	.string "Another POKéMON may prefer to protect\n"
@@ -635,7 +635,7 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature: @ 824F049
 	.string "It may also dislike certain moves that\n"
 	.string "it has trouble using.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves: @ 824F190
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves:
 	.string "There are offensive moves that inflict\n"
 	.string "direct damage on the foe.\p"
 	.string "There are defensive moves that are\n"
@@ -648,7 +648,7 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves: @ 824F190
 	.string "POKéMON will consider using moves in\n"
 	.string "these three categories.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered: @ 824F2E8
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered:
 	.string "When not under command by its TRAINER,\n"
 	.string "a POKéMON may be unable to effectively\l"
 	.string "use certain moves.\p"
@@ -658,7 +658,7 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered: @ 824F2E8
 	.string "do not match its nature, it will often\l"
 	.string "be unable to live up to its potential.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger: @ 824F3F4
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger:
 	.string "Depending on its nature, a POKéMON may\n"
 	.string "start using moves that don't match its\l"
 	.string "nature when it is in trouble.\p"
diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
index 1c55d7bf5..44539747b 100644
--- a/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771
+BattleFrontier_BattlePikeCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeCorridor_OnFrame: @ 825C77C
+BattleFrontier_BattlePikeCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor:: @ 825C786
+BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor::
 	delay 16
 	frontier_set FRONTIER_DATA_BATTLE_NUM, 1
 	pike_cleartrainerids
@@ -29,34 +29,34 @@ BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor:: @ 825C786
 	waitstate
 	end
 
-BattleFrontier_BattlePikeCorridor_OnWarp: @ 825C7F7
+BattleFrontier_BattlePikeCorridor_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth:: @ 825C801
+BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor: @ 825C80B
+BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor:
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor: @ 825C80E
+BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor: @ 825C812
+BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor:
 	walk_up
 	walk_up
 	walk_left
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun: @ 825C817
+BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun:
 	.string "Your Battle Choice challenge\n"
 	.string "has now begun…$"
 
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index 1bc66bbfa..ecbbafef2 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -1,31 +1,31 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6
+BattleFrontier_BattlePikeLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeLobby_OnFrame: @ 825B6D1
+BattleFrontier_BattlePikeLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePikeLobby_EventScript_WonChallenge
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePikeLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattlePikeLobby_OnWarp: @ 825B6F3
+BattleFrontier_BattlePikeLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth:: @ 825B6FD
+BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus:: @ 825B707
+BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving:: @ 825B710
+BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving::
 	special HealPlayerParty
 	pike_resethelditems
 	lockall
@@ -38,7 +38,7 @@ BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving:: @ 825B710
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_WonChallenge:: @ 825B762
+BattleFrontier_BattlePikeLobby_EventScript_WonChallenge::
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
@@ -47,10 +47,10 @@ BattleFrontier_BattlePikeLobby_EventScript_WonChallenge:: @ 825B762
 	waitmessage
 	goto BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattlePikeLobby_EventScript_DefeatedQueen:: @ 825B784
+BattleFrontier_BattlePikeLobby_EventScript_DefeatedQueen::
 	msgbox BattleFrontier_BattlePikeLobby_Text_SnatchedVictoryFromQueen, MSGBOX_DEFAULT
 	waitmessage
-BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints:: @ 825B78D
+BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -72,7 +72,7 @@ BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints:: @ 825B78D
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_LostChallenge:: @ 825B806
+BattleFrontier_BattlePikeLobby_EventScript_LostChallenge::
 	lockall
 	message BattleFrontier_BattlePikeLobby_Text_ChallengeEndedRecordResults
 	waitmessage
@@ -91,14 +91,14 @@ BattleFrontier_BattlePikeLobby_EventScript_LostChallenge:: @ 825B806
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_Attendant:: @ 825B868
+BattleFrontier_BattlePikeLobby_EventScript_Attendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PIKE
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
 	msgbox BattleFrontier_BattlePikeLobby_Text_WelcomeToBattlePike, MSGBOX_DEFAULT
-BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge:: @ 825B87F
+BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge::
 	message BattleFrontier_BattlePikeLobby_Text_TakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -108,7 +108,7 @@ BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge:: @ 825B87F
 	case 2, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge:: @ 825B8BB
+BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -134,7 +134,7 @@ BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge:: @ 825B8BB
 	case YES, BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge:: @ 825B95C
+BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	setvar VAR_TEMP_1, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
@@ -164,36 +164,36 @@ BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge:: @ 825B95C
 	waitstate
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_ExplainChallenge:: @ 825BA1A
+BattleFrontier_BattlePikeLobby_EventScript_ExplainChallenge::
 	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons:: @ 825BA27
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50:: @ 825BA42
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 825BA4F
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed:: @ 825BA5C
+BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge:: @ 825BA73
+BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge:: @ 825BA76
+BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou, MSGBOX_DEFAULT
-BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge:: @ 825BA7E
+BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_ShowResults:: @ 825BA80
+BattleFrontier_BattlePikeLobby_EventScript_ShowResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_PIKE
 	waitbuttonpress
@@ -201,39 +201,39 @@ BattleFrontier_BattlePikeLobby_EventScript_ShowResults:: @ 825BA80
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor:: @ 825BA94
+BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor
 	waitmovement 0
 	return
 
-BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor: @ 825BAA6
+BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor:
 	walk_up
-BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor: @ 825BAA7
+BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeLobby_EventScript_Hiker:: @ 825BAAB
+BattleFrontier_BattlePikeLobby_EventScript_Hiker::
 	msgbox BattleFrontier_BattlePikeLobby_Text_OneRoomAwayFromGoal, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_Twin:: @ 825BAB4
+BattleFrontier_BattlePikeLobby_EventScript_Twin::
 	msgbox BattleFrontier_BattlePikeLobby_Text_NeverHadToBattleTrainer, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_Beauty:: @ 825BABD
+BattleFrontier_BattlePikeLobby_EventScript_Beauty::
 	msgbox BattleFrontier_BattlePikeLobby_Text_ThinkAbilitiesUsefulHere, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_RulesBoard:: @ 825BAC6
+BattleFrontier_BattlePikeLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattlePikeLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard:: @ 825BAD5
+BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 16, 4, MULTI_BATTLE_PIKE_RULES, FALSE
@@ -245,43 +245,43 @@ BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard:: @ 825BAD5
 	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_RulesPokenavBag:: @ 825BB1D
+BattleFrontier_BattlePikeLobby_EventScript_RulesPokenavBag::
 	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainPokenavBagRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_RulesHeldItems:: @ 825BB2B
+BattleFrontier_BattlePikeLobby_EventScript_RulesHeldItems::
 	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainHeldItemRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_RulesMonOrder:: @ 825BB39
+BattleFrontier_BattlePikeLobby_EventScript_RulesMonOrder::
 	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_ExitRules:: @ 825BB47
+BattleFrontier_BattlePikeLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49
+BattleFrontier_BattlePike_EventScript_CloseCurtain::
 	playse SE_PIKE_CURTAIN_CLOSE
 	special CloseBattlePikeCurtain
 	waitstate
 	waitse
 	return
 
-BattleFrontier_BattlePikeLobby_Text_WelcomeToBattlePike: @ 825BB52
+BattleFrontier_BattlePikeLobby_Text_WelcomeToBattlePike:
 	.string "Where the luck of TRAINERS\n"
 	.string "is put to the test…\p"
 	.string "Welcome to the BATTLE PIKE…\p"
 	.string "I am your guide to the BATTLE PIKE…$"
 
-BattleFrontier_BattlePikeLobby_Text_TakeChallenge: @ 825BBC1
+BattleFrontier_BattlePikeLobby_Text_TakeChallenge:
 	.string "Would you like to take the Battle\n"
 	.string "Choice challenge?$"
 
-BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike: @ 825BBF5
+BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike:
 	.string "Here we conduct an event we call\n"
 	.string "the Battle Choice.\p"
 	.string "The Battle Choice rules are very\n"
@@ -300,16 +300,16 @@ BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike: @ 825BBF5
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou: @ 825BE02
+BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou:
 	.string "We look forward to seeing you\n"
 	.string "on another occasion…$"
 
-BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode: @ 825BE35
+BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode:
 	.string "You have the choice of two courses,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which will you challenge?$"
 
-BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50: @ 825BE8C
+BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50:
 	.string "I beg your pardon, but…\p"
 	.string "You do not have three eligible\n"
 	.string "POKéMON for the Battle Choice event.\p"
@@ -321,7 +321,7 @@ BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50: @ 825BE8C
 	.string "Please come see me when\n"
 	.string "you are ready…$"
 
-BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen: @ 825BF9A
+BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "I beg your pardon, but…\p"
 	.string "You do not have three eligible\n"
 	.string "POKéMON for the Battle Choice event.\p"
@@ -333,101 +333,101 @@ BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen: @ 825BF9A
 	.string "Please come see me when\n"
 	.string "you are ready…$"
 
-BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons: @ 825C094
+BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons:
 	.string "Please choose the three POKéMON\n"
 	.string "you wish to enter in the challenge…$"
 
-BattleFrontier_BattlePikeLobby_Text_SaveBeforeChallenge: @ 825C0D8
+BattleFrontier_BattlePikeLobby_Text_SaveBeforeChallenge:
 	.string "Before starting your Battle Choice\n"
 	.string "challenge, I must save the game.\l"
 	.string "Is that acceptable?$"
 
-BattleFrontier_BattlePikeLobby_Text_StepThisWay: @ 825C130
+BattleFrontier_BattlePikeLobby_Text_StepThisWay:
 	.string "Please step this way…$"
 
-BattleFrontier_BattlePikeLobby_Text_ChallengeEndedRecordResults: @ 825C146
+BattleFrontier_BattlePikeLobby_Text_ChallengeEndedRecordResults:
 	.string "Your challenge has ended…\p"
 	.string "I shall record your results.\n"
 	.string "Please wait…$"
 
-BattleFrontier_BattlePikeLobby_Text_PossessLuckInAbundance: @ 825C18A
+BattleFrontier_BattlePikeLobby_Text_PossessLuckInAbundance:
 	.string "You have completed the challenge…\p"
 	.string "I must say… You seem to possess luck\n"
 	.string "in abundance…$"
 
-BattleFrontier_BattlePikeLobby_Text_ShallRecordResults: @ 825C1DF
+BattleFrontier_BattlePikeLobby_Text_ShallRecordResults:
 	.string "I shall record your results.\n"
 	.string "Please wait…$"
 
 @ Unused
-BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints2: @ 825C209
+BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints2:
 	.string "To commemorate your completion of\n"
 	.string "the Battle Choice challenge, we award\l"
 	.string "you these Battle Point(s)…$"
 
 @ Unused
-BattleFrontier_BattlePikeLobby_Text_ReachedBattlePointLimit: @ 825C26C
+BattleFrontier_BattlePikeLobby_Text_ReachedBattlePointLimit:
 	.string "You appear to have reached the limit\n"
 	.string "for Battle Points…\pPlease exchange some Battle Points\n"
 	.string "for prizes, then return…$"
 
-BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting: @ 825C2E0
+BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting:
 	.string "I beg your pardon, but…\p"
 	.string "You failed to save before you quit\n"
 	.string "your challenge the last time.\p"
 	.string "Because of that, your challenge so far\n"
 	.string "has been disqualified. I am sorry…$"
 
-BattleFrontier_BattlePikeLobby_Text_SnatchedVictoryFromQueen: @ 825C383
+BattleFrontier_BattlePikeLobby_Text_SnatchedVictoryFromQueen:
 	.string "Congratulations…\p"
 	.string "You have snatched victory from the\n"
 	.string "PIKE QUEEN and cleared the event…$"
 
-BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints: @ 825C3D9
+BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints:
 	.string "In recognition of your amazing luck,\n"
 	.string "we award you these Battle Point(s)…$"
 
-BattleFrontier_BattlePikeLobby_Text_OneRoomAwayFromGoal: @ 825C422
+BattleFrontier_BattlePikeLobby_Text_OneRoomAwayFromGoal:
 	.string "Arrgh! I blew my chance!\n"
 	.string "I was one room away from the goal!\p"
 	.string "In this place, you'd better watch out\n"
 	.string "for poison, freezing, and so on.$"
 
-BattleFrontier_BattlePikeLobby_Text_NeverHadToBattleTrainer: @ 825C4A5
+BattleFrontier_BattlePikeLobby_Text_NeverHadToBattleTrainer:
 	.string "I've completed the challenge 10 times\n"
 	.string "now, but I've never had to battle\l"
 	.string "a TRAINER once.$"
 
-BattleFrontier_BattlePikeLobby_Text_ThinkAbilitiesUsefulHere: @ 825C4FD
+BattleFrontier_BattlePikeLobby_Text_ThinkAbilitiesUsefulHere:
 	.string "Listen! Listen!\p"
 	.string "Don't you think that the special\n"
 	.string "abilities of POKéMON will be useful\l"
 	.string "here?$"
 
 @ Unused
-BattleFrontier_BattlePikeLobby_Text_TrainersWhicheverPathIChoose: @ 825C558
+BattleFrontier_BattlePikeLobby_Text_TrainersWhicheverPathIChoose:
 	.string "What is this weird place?\n"
 	.string "I can't figure it out at all!\p"
 	.string "I've taken the challenge a bunch\n"
 	.string "of times, but all I ever do is run into\l"
 	.string "TRAINERS whichever path I choose.$"
 
-BattleFrontier_BattlePikeLobby_Text_RulesAreListed: @ 825C5FB
+BattleFrontier_BattlePikeLobby_Text_RulesAreListed:
 	.string "The Battle Choice's rules are listed.$"
 
-BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading: @ 825C621
+BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattlePikeLobby_Text_ExplainPokenavBagRules: @ 825C644
+BattleFrontier_BattlePikeLobby_Text_ExplainPokenavBagRules:
 	.string "The BAG and POKéNAV may not be used\n"
 	.string "during a Battle Choice challenge.$"
 
-BattleFrontier_BattlePikeLobby_Text_ExplainHeldItemRules: @ 825C68A
+BattleFrontier_BattlePikeLobby_Text_ExplainHeldItemRules:
 	.string "During a Battle Choice challenge,\n"
 	.string "any BERRY or HERB held by POKéMON\l"
 	.string "will be effective only once.$"
 
-BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules: @ 825C6EB
+BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules:
 	.string "During a Battle Choice challenge,\n"
 	.string "the sequence of POKéMON cannot be\l"
 	.string "changed.\p"
diff --git a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
index 51c7d5610..15ebbeb3f 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattlePikeRoomFinal_MapScripts:: @ 825E392
+BattleFrontier_BattlePikeRoomFinal_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomFinal_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomFinal_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeRoomFinal_OnFrame: @ 825E39D
+BattleFrontier_BattlePikeRoomFinal_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom:: @ 825E3A7
+BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom::
 	delay 16
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer
 	waitmovement 0
@@ -22,21 +22,21 @@ BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom:: @ 825E3A7
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer: @ 825E3DB
+BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomFinal_OnWarp: @ 825E3DE
+BattleFrontier_BattlePikeRoomFinal_OnWarp:
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth:: @ 825E3E8
+BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_4, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease: @ 825E3F2
+BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease:
 	.string "Congratulations…\n"
 	.string "Now, this way, please…$"
 
diff --git a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
index 4238dd3f3..6ab862287 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
@@ -3,18 +3,18 @@
 .equ LOCALID_OBJ_0, 1
 .equ LOCALID_OBJ_1, 2
 
-BattleFrontier_BattlePikeRoomNormal_MapScripts:: @ 825D152
+BattleFrontier_BattlePikeRoomNormal_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoom_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomNormal_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeRoomNormal_OnFrame: @ 825D167
+BattleFrontier_BattlePikeRoomNormal_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 825D171
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom::
 	setvar VAR_TEMP_0, 1
 	pike_getroomtype
 	switch VAR_RESULT
@@ -26,7 +26,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 825D171
 	case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom:: @ 825D1C6
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom::
 	lockall
 	delay 16
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer
@@ -42,18 +42,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom:: @ 825D1C
 	waitstate
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle
-BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost:: @ 825D20A
+BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle:: @ 825D226
+BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle::
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom:: @ 825D231
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom::
 	lockall
 	delay 16
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_BattleSomewhatToughTrainer, MSGBOX_DEFAULT
@@ -75,7 +75,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom:: @ 825D231
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: @ 825D285
+BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle::
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit
 	waitmovement 0
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCApproachPlayer
@@ -93,7 +93,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: @ 825D285
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom:: @ 825D2BF
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom::
 	delay 22
 	lockall
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_PreQueenHealNPCApproachPlayer
@@ -104,7 +104,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom:: @ 825D2BF
 	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon
 	case 2, BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
+BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster, MSGBOX_DEFAULT
 	closemessage
 	special SpawnCameraObject
@@ -141,14 +141,14 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
 	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver:: @ 825D3BD
+BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver:: @ 825D3DA
+BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver::
 	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
@@ -163,20 +163,20 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver:: @ 825D3DA
 	closemessage
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_IntroLucyGold:: @ 825D416
+BattleFrontier_BattlePikeRoomNormal_EventScript_IntroLucyGold::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold:: @ 825D443
+BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460
+BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold::
 	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
@@ -192,7 +192,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy:: @ 825D49D
+BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy::
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
@@ -204,26 +204,26 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy:: @ 825D49D
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal:: @ 825D4DC
+BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomNoHeal, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon:: @ 825D4EA
+BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne, MSGBOX_DEFAULT
 	playfanfare MUS_HEAL
 	waitfanfare
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons:: @ 825D4FC
+BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo, MSGBOX_DEFAULT
 	playfanfare MUS_HEAL
 	waitfanfare
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: @ 825D50E
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom::
 	lockall
 	delay 16
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer
@@ -240,7 +240,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: @ 825D50E
 	releaseall
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: @ 825D53E
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom::
 	lockall
 	delay 16
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1WalkRight
@@ -272,7 +272,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: @ 825D53
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle:: @ 825D5DC
+BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2
 	waitmovement 0
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit
@@ -283,7 +283,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle:: @ 825D5DC
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom:: @ 825D605
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom::
 	lockall
 	message BattleFrontier_BattlePikeRoomNormal_Text_WatchOut
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer
@@ -299,7 +299,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom:: @ 825D605
 	releaseall
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack:: @ 825D643
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop, MSGBOX_DEFAULT
 	closemessage
 	waitse
@@ -334,7 +334,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack:: @ 825D643
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForKirlia, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack:: @ 825D6D5
+BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop, MSGBOX_DEFAULT
 	closemessage
 	waitse
@@ -365,37 +365,37 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack:: @ 825D6D5
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForDusclops, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedToxic:: @ 825D751
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedToxic::
 	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedToxic
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedWillOWisp:: @ 825D758
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedWillOWisp::
 	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedWillOWisp
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedThunderWave:: @ 825D75F
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedThunderWave::
 	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedThunderWave
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis:: @ 825D766
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis::
 	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedHypnosis
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedIceBeam:: @ 825D76D
+BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedIceBeam::
 	message BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedIceBeam
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp:: @ 825D774
+BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp::
 	message BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedWillOWisp
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle:: @ 825D77B
+BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle::
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
 	waitmovement 0
@@ -405,12 +405,12 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle:: @ 825D77B
 	waitstate
 	return
 
-BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer: @ 825D795
+BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit: @ 825D798
+BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit:
 	walk_up
 	walk_up
 	walk_up
@@ -418,17 +418,17 @@ BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit: @ 825D798
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExit: @ 825D79E
+BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExit:
 	walk_up
 	set_invisible
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon: @ 825D7A2
+BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon:
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_StatusNPCApproachPlayer: @ 825D7A4
+BattleFrontier_BattlePikeRoomNormal_Movement_StatusNPCApproachPlayer:
 	walk_down
 	face_left
 	delay_16
@@ -436,7 +436,7 @@ BattleFrontier_BattlePikeRoomNormal_Movement_StatusNPCApproachPlayer: @ 825D7A4
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer: @ 825D7AA
+BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer:
 	walk_fast_down
 	walk_fast_right
 	walk_fast_right
@@ -445,57 +445,57 @@ BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer: @ 825D7AA
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC: @ 825D7B1
+BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC:
 	face_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside: @ 825D7B3
+BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside:
 	walk_left
-BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceRight: @ 825D7B4
+BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceRight:
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCApproachPlayer: @ 825D7B6
+BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCApproachPlayer:
 	walk_down
 	walk_down
 	walk_right
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1: @ 825D7BB
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1:
 	face_left
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2: @ 825D7BD
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2:
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp: @ 825D7BF
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp:
 	face_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1WalkRight: @ 825D7C1
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1WalkRight:
 	walk_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2WalkLeft: @ 825D7C3
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2WalkLeft:
 	walk_left
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_DoubleTrainersWalkDown: @ 825D7C5
+BattleFrontier_BattlePikeRoomNormal_Movement_DoubleTrainersWalkDown:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1FacePlayer: @ 825D7C8
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1FacePlayer:
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2FacePlayer: @ 825D7CA
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2FacePlayer:
 	face_left
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit: @ 825D7CC
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit:
 	walk_up
 	walk_up
 	walk_up
@@ -505,7 +505,7 @@ BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit: @ 825D7CC
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit: @ 825D7D4
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit:
 	walk_up
 	walk_up
 	walk_up
@@ -516,40 +516,40 @@ BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit: @ 825D7D4
 	step_end
 
 @ For approaching Lucy and exiting room after defeating Lucy
-BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2: @ 825D7DC
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2:
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_PreQueenHealNPCApproachPlayer: @ 825D7DF
+BattleFrontier_BattlePikeRoomNormal_Movement_PreQueenHealNPCApproachPlayer:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy: @ 825D7E2
+BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy:
 	walk_up
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_LucyEnter: @ 825D7E7
+BattleFrontier_BattlePikeRoomNormal_Movement_LucyEnter:
 	set_visible
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside: @ 825D7EA
+BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside:
 	walk_left
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_NPC:: @ 825D7ED
+BattleFrontier_BattlePikeRoomNormal_EventScript_NPC::
 	pike_getroomtype
 	switch VAR_RESULT
 	case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC
 	case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC
 	case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC
-BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC:: @ 825D81B
+BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC::
 	lock
 	faceplayer
 	pike_getnpcmsg
@@ -559,7 +559,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC:: @ 825D81B
 	release
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC:: @ 825D831
+BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ApologizeHopeMonsAreFine, MSGBOX_DEFAULT
@@ -567,7 +567,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC:: @ 825D831
 	release
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: @ 825D83E
+BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC::
 	pike_healonetwomons
 	compare VAR_RESULT, 2
 	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons
@@ -582,14 +582,14 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: @ 825D83E
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon:: @ 825D875
+BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreOneMon, MSGBOX_DEFAULT
 	closemessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons:: @ 825D881
+BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreTwoMons, MSGBOX_DEFAULT
@@ -597,7 +597,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons:: @ 825D881
 	return
 
 @ Dusclops or Kirlia
-BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon:: @ 825D88D
+BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_Silence, MSGBOX_DEFAULT
@@ -607,7 +607,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon:: @ 825D88D
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed:: @ 825D8A4
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed::
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1
@@ -618,7 +618,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed:: @
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed:: @ 825D8E7
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed::
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1
@@ -629,7 +629,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed:: @
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen:: @ 825D92A
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen::
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1
@@ -640,7 +640,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen:: @ 825D92A
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed:: @ 825D96D
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed::
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1
@@ -651,136 +651,136 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed:: @ 825D96
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp: @ 825D9B0
+BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp:
 	walk_up
 	walk_up
 	step_end
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanDown: @ 825D9B3
+BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanDown:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth: @ 825D9B6
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth:
 	.string "Welcome…\n"
 	.string "You must be commended for your luck…\p"
 	.string "Your POKéMON shall be restored\n"
 	.string "to full health…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge: @ 825DA13
+BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge:
 	.string "I urge you to enjoy the rest of your\n"
 	.string "Battle Choice challenge…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreOneMon: @ 825DA51
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreOneMon:
 	.string "Ah, you're a lucky one.\n"
 	.string "I'm in somewhat-good spirits now.\p"
 	.string "I will restore one of your POKéMON\n"
 	.string "to full health.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell: @ 825DABE
+BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell:
 	.string "The best of luck to you.\n"
 	.string "Farewell.$"
 
 @ Seems there was a planned room type where the player could choose to battle and would be healed if they won
 @ Possibly replaced/superseded by the hard battle room, which is the same but the battle isnt optional
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_CareForBattleWillRestoreMons: @ 825DAE1
+BattleFrontier_BattlePikeRoomNormal_Text_CareForBattleWillRestoreMons:
 	.string "Excuse me…\p"
 	.string "Would you care for a battle?\n"
 	.string "I'll restore your POKéMON if you win.$"
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_NowShallWe: @ 825DB2F
+BattleFrontier_BattlePikeRoomNormal_Text_NowShallWe:
 	.string "Very well…\n"
 	.string "Now, shall we?$"
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_HowUnsportingOfYou: @ 825DB49
+BattleFrontier_BattlePikeRoomNormal_Text_HowUnsportingOfYou:
 	.string "I see…\n"
 	.string "How unsporting of you…$"
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreMonsAsPromised: @ 825DB67
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreMonsAsPromised:
 	.string "Magnificent…\p"
 	.string "As promised, I shall restore your\n"
 	.string "POKéMON to full health.$"
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell2: @ 825DBAE
+BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell2:
 	.string "The best of luck to you.\n"
 	.string "Farewell.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_WatchOut: @ 825DBD1
+BattleFrontier_BattlePikeRoomNormal_Text_WatchOut:
 	.string "Oh, my!\p"
 	.string "Watch out!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop: @ 825DBE4
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop:
 	.string "Now, now!\n"
 	.string "KIRLIA, stop that!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop: @ 825DC01
+BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop:
 	.string "Now, now!\n"
 	.string "DUSCLOPS, stop that!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedToxic: @ 825DC20
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedToxic:
 	.string "KIRLIA used TOXIC!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedHypnosis: @ 825DC33
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedHypnosis:
 	.string "KIRLIA used HYPNOSIS!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedThunderWave: @ 825DC49
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedThunderWave:
 	.string "KIRLIA used THUNDER WAVE!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedWillOWisp: @ 825DC63
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedWillOWisp:
 	.string "KIRLIA used WILL-O-WISP!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedWillOWisp: @ 825DC7C
+BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedWillOWisp:
 	.string "DUSCLOPS used WILL-O-WISP!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedIceBeam: @ 825DC97
+BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedIceBeam:
 	.string "DUSCLOPS used ICE BEAM!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough: @ 825DCAF
+BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough:
 	.string "Look here!\n"
 	.string "That's quite enough!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForKirlia: @ 825DCCF
+BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForKirlia:
 	.string "I must apologize to you…\p"
 	.string "My KIRLIA has a TIMID nature…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForDusclops: @ 825DD06
+BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForDusclops:
 	.string "I must apologize to you…\p"
 	.string "My DUSCLOPS has a TIMID nature…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_AttacksWhenStartled: @ 825DD3F
+BattleFrontier_BattlePikeRoomNormal_Text_AttacksWhenStartled:
 	.string "It attacks without warning if it is\n"
 	.string "startled by another person…\p"
 	.string "Are you and your POKéMON all right?$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ApologizeHopeMonsAreFine: @ 825DDA3
+BattleFrontier_BattlePikeRoomNormal_Text_ApologizeHopeMonsAreFine:
 	.string "I do apologize for what happened…\n"
 	.string "I do hope your POKéMON are fine.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_Silence: @ 825DDE6
+BattleFrontier_BattlePikeRoomNormal_Text_Silence:
 	.string "… … … … … …\n"
 	.string "… … … … … …$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_BattleSomewhatToughTrainer: @ 825DDFE
+BattleFrontier_BattlePikeRoomNormal_Text_BattleSomewhatToughTrainer:
 	.string "Welcome…\p"
 	.string "Here, we will have you battle\n"
 	.string "a somewhat-tough TRAINER…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth: @ 825DE3F
+BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth:
 	.string "How wonderful…\p"
 	.string "To honor your victory, your POKéMON\n"
 	.string "shall be restored to full health…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2: @ 825DE94
+BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2:
 	.string "I urge you to enjoy the rest of your\n"
 	.string "Battle Choice challenge…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen: @ 825DED2
+BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen:
 	.string "I am LUCY…\n"
 	.string "I am the law here…\l"
 	.string "For I am the PIKE QUEEN…\p"
@@ -789,23 +789,23 @@ BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen: @ 825DED2
 	.string "…I'm not one for idle chatter.\n"
 	.string "Hurry. Come on…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck: @ 825DF71
+BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck:
 	.string "Your luck…\n"
 	.string "I hope you didn't use it all up here…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass: @ 825DFA2
+BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass:
 	.string "LUCY: … … … … … …\n"
 	.string "Show me your FRONTIER PASS…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ReceivedLuckSymbol: @ 825DFD0
+BattleFrontier_BattlePikeRoomNormal_Text_ReceivedLuckSymbol:
 	.string "The Luck Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_AllThereIsDisappear: @ 825E003
+BattleFrontier_BattlePikeRoomNormal_Text_AllThereIsDisappear:
 	.string "…That's all there is…\n"
 	.string "Disappear already…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain: @ 825E02C
+BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain:
 	.string "LUCY: …You again…\p"
 	.string "… … … … … …\p"
 	.string "…I've trampled flowers and braved\n"
@@ -815,51 +815,51 @@ BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain: @ 825E02C
 	.string "… … … … … …\n"
 	.string "Fine… I'll do it…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn: @ 825E0E8
+BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn:
 	.string "Now!\n"
 	.string "Come on!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass: @ 825E0F6
+BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass:
 	.string "LUCY: … … … … … …\p"
 	.string "…FRONTIER PASS…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_LuckSymbolTookGoldenShine: @ 825E118
+BattleFrontier_BattlePikeRoomNormal_Text_LuckSymbolTookGoldenShine:
 	.string "The Luck Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_IWontForget: @ 825E140
+BattleFrontier_BattlePikeRoomNormal_Text_IWontForget:
 	.string "…You, I won't forget…\n"
 	.string "…Ever…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomNoHeal: @ 825E15D
+BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomNoHeal:
 	.string "I welcome you…\p"
 	.string "Giggle…\n"
 	.string "You seem to be bereft of luck…\p"
 	.string "If only you hadn't chosen this room,\n"
 	.string "your POKéMON could have been healed…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne: @ 825E1DD
+BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne:
 	.string "I welcome you…\p"
 	.string "Since you have chosen this room, I will\n"
 	.string "restore one POKéMON to full health…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo: @ 825E238
+BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo:
 	.string "I welcome you…\p"
 	.string "Since you have chosen this room, I will\n"
 	.string "restore two POKéMON to full health…$"
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreAllMons: @ 825E293
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreAllMons:
 	.string "I welcome you…\p"
 	.string "Giggle…\n"
 	.string "You should thank your lucky stars…\p"
 	.string "Since you have chosen this room,\n"
 	.string "all your POKéMON will be restored…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster: @ 825E311
+BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster:
 	.string "I shall go fetch our master…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreTwoMons: @ 825E32E
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreTwoMons:
 	.string "Ah, you're a lucky one!\n"
 	.string "I'm in good spirits now.\p"
 	.string "I will restore two of your POKéMON\n"
diff --git a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
index b035d25d3..ee9e548f6 100644
--- a/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
@@ -1,35 +1,35 @@
-BattleFrontier_BattlePikeRoomWildMons_MapScripts:: @ 825E41A
+BattleFrontier_BattlePikeRoomWildMons_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoomWildMons_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomWildMons_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomWildMons_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_OnFrame: @ 825E42A
+BattleFrontier_BattlePikeRoomWildMons_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom
 	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom:: @ 825E43C
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom::
 	setvar VAR_TEMP_0, 1
 	pike_inwildmonroom
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost:: @ 825E44A
+BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_OnWarp: @ 825E466
+BattleFrontier_BattlePikeRoomWildMons_OnWarp:
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth:: @ 825E470
+BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_4, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_OnResume: @ 825E47A
+BattleFrontier_BattlePikeRoomWildMons_OnResume:
 	call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	compare VAR_RESULT, B_OUTCOME_LOST
@@ -38,7 +38,7 @@ BattleFrontier_BattlePikeRoomWildMons_OnResume: @ 825E47A
 	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost:: @ 825E4A3
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost::
 	setvar VAR_TEMP_1, 1
 	end
 
diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
index acdd49020..37737554f 100644
--- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
@@ -1,12 +1,12 @@
 .set LOCALID_HINT_GIVER, 2
 
-BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843
+BattleFrontier_BattlePikeThreePathRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoom_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeThreePathRoom_OnFrame: @ 825C853
+BattleFrontier_BattlePikeThreePathRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge
@@ -14,25 +14,25 @@ BattleFrontier_BattlePikeThreePathRoom_OnFrame: @ 825C853
 	map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint
 	.2byte 0
 
-BattleFrontier_BattlePikeThreePathRoom_OnWarp: @ 825C87D
+BattleFrontier_BattlePikeThreePathRoom_OnWarp:
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth:: @ 825C887
+BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_4, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus:: @ 825C891
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby:: @ 825C89A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby::
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge:: @ 825C8A4
+BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge::
 	lockall
 	message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume
 	waitmessage
@@ -50,7 +50,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge:: @ 825C8A4
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant:: @ 825C908
+BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant::
 	frontier_get FRONTIER_DATA_BATTLE_NUM  @ Room number
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom1
@@ -62,56 +62,56 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant:: @ 825C908
 	case 13, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom13
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom1:: @ 825C968
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom1::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom3:: @ 825C978
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom3::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom5:: @ 825C988
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom5::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom7:: @ 825C998
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom7::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom9:: @ 825C9A8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom9::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom11:: @ 825C9B8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom11::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom13:: @ 825C9C8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom13::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge:: @ 825C9D8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge
@@ -119,7 +119,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge:: @ 825C
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge:: @ 825C9FD
+BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge::
 	frontier_saveparty
 	message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData
 	waitmessage
@@ -131,7 +131,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge:: @ 825C9FD
 	frontier_reset
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge:: @ 825CA2A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit, MSGBOX_YESNO
 	switch VAR_RESULT
 	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge
@@ -140,7 +140,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge:: @ 825CA2A
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge:: @ 825CA5A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -149,18 +149,18 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge:: @ 825CA5
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom:: @ 825CA78
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom::
 	pike_sethintroom
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint
 	setvar VAR_TEMP_5, 255
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint:: @ 825CA91
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint::
 	setvar VAR_TEMP_5, 1
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint:: @ 825CA97
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint::
 	applymovement LOCALID_HINT_GIVER, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer
 	waitmovement 0
 	lockall
@@ -171,7 +171,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint:: @ 825CA97
 	setvar VAR_TEMP_5, 255
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: @ 825CABB
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver::
 	pike_gethint
 	compare VAR_RESULT, PIKE_HINT_BRAIN
 	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint
@@ -185,12 +185,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: @ 825CABB
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint:: @ 825CB00
+BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_ApologizeForImpertinence, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint:: @ 825CB0A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint::
 	pike_gethintroomid
 	switch VAR_RESULT
 	case PIKE_ROOM_LEFT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint
@@ -198,19 +198,19 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint:: @ 825CB0A
 	case PIKE_ROOM_RIGHT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint:: @ 825CB39
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutLeftPath, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint:: @ 825CB46
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutCenterPath, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint:: @ 825CB53
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutRightPath, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint:: @ 825CB60
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint::
 	pike_gethint
 	switch VAR_RESULT
 	case PIKE_HINT_NOSTALGIA, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia
@@ -219,34 +219,34 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint:: @ 825CB60
 	case PIKE_HINT_PEOPLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPeople
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia:: @ 825CB9A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_WaveOfNostaliga, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering:: @ 825CBA4
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_HeardWhispering, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPokemon:: @ 825CBAE
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPokemon::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_AromaOfPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPeople:: @ 825CBB8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPeople::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_PresenceOfPeople, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint:: @ 825CBC2
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_DreadfulPresence, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer: @ 825CBCE
+BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer:
 	walk_left
 	walk_left
 	walk_down
@@ -255,7 +255,7 @@ BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer: @ 825CB
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos: @ 825CBD5
+BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos:
 	walk_up
 	walk_up
 	walk_up
@@ -265,107 +265,107 @@ BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos: @ 825CBD5
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1: @ 825CBDD
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1:
 	.string "You are currently in\n"
 	.string "the 1st room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3: @ 825CC00
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3:
 	.string "You are currently in\n"
 	.string "the 3rd room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5: @ 825CC23
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5:
 	.string "You are currently in\n"
 	.string "the 5th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7: @ 825CC46
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7:
 	.string "You are currently in\n"
 	.string "the 7th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9: @ 825CC69
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9:
 	.string "You are currently in\n"
 	.string "the 9th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11: @ 825CC8C
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11:
 	.string "You are currently in\n"
 	.string "the 11th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13: @ 825CCB0
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13:
 	.string "You are currently in\n"
 	.string "the 13th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge: @ 825CCD4
+BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge:
 	.string "Will you continue with\n"
 	.string "your challenge?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit: @ 825CCFB
+BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit:
 	.string "Would you like to save your challenge\n"
 	.string "and quit the game for now?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge: @ 825CD3C
+BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge:
 	.string "Do you wish to retire from your\n"
 	.string "Battle Choice challenge?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume: @ 825CD75
+BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume:
 	.string "We've been awaiting your return…\p"
 	.string "Before resuming your Battle Choice\n"
 	.string "challenge, let me save the game…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_PleaseEnjoyChallenge: @ 825CDDA
+BattleFrontier_BattlePikeThreePathRoom_Text_PleaseEnjoyChallenge:
 	.string "Please do enjoy your Battle Choice\n"
 	.string "challenge…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData: @ 825CE08
+BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData:
 	.string "I am saving your data…\n"
 	.string "A little time, please…$"
 
-BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack: @ 825CE36
+BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack:
 	.string "The path is blocked!\n"
 	.string "And there is no turning back…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose: @ 825CE69
+BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose:
 	.string "I beg your pardon, but…\p"
 	.string "Are you perhaps finding it difficult\n"
 	.string "to choose your path?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_ApologizeForImpertinence: @ 825CEBB
+BattleFrontier_BattlePikeThreePathRoom_Text_ApologizeForImpertinence:
 	.string "I see…\n"
 	.string "I apologize for my impertinence…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutRightPath: @ 825CEE3
+BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutRightPath:
 	.string "Ah, let me see… There is something\n"
 	.string "about the path on the right…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutCenterPath: @ 825CF23
+BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutCenterPath:
 	.string "Ah, let me see… There is something\n"
 	.string "about the path in the center…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutLeftPath: @ 825CF64
+BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutLeftPath:
 	.string "Ah, let me see… There is something\n"
 	.string "about the path on the left…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_AromaOfPokemon: @ 825CFA3
+BattleFrontier_BattlePikeThreePathRoom_Text_AromaOfPokemon:
 	.string "It seems to have the distinct aroma\n"
 	.string "of POKéMON wafting around it…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_PresenceOfPeople: @ 825CFE5
+BattleFrontier_BattlePikeThreePathRoom_Text_PresenceOfPeople:
 	.string "Is it… A TRAINER?\n"
 	.string "I sense the presence of people…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_HeardWhispering: @ 825D017
+BattleFrontier_BattlePikeThreePathRoom_Text_HeardWhispering:
 	.string "I seem to have heard something…\n"
 	.string "It may have been whispering…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_WaveOfNostaliga: @ 825D054
+BattleFrontier_BattlePikeThreePathRoom_Text_WaveOfNostaliga:
 	.string "For some odd reason, I felt a wave\n"
 	.string "of nostalgia coming from it…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent: @ 825D094
+BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent:
 	.string "I am sorry to say…\p"
 	.string "A terrifying event, yes, a horrible one,\n"
 	.string "is about to befall you…\p"
 	.string "I urge you to pay the utmost care\n"
 	.string "and prepare for the worst…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_DreadfulPresence: @ 825D125
+BattleFrontier_BattlePikeThreePathRoom_Text_DreadfulPresence:
 	.string "From every path I sense a dreadful\n"
 	.string "presence…$"
diff --git a/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
index e63e27e4e..8993418ee 100644
--- a/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
@@ -1,16 +1,16 @@
-BattleFrontier_BattlePyramidFloor_MapScripts:: @ 8252A33
+BattleFrontier_BattlePyramidFloor_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidFloor_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidFloor_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidFloor_OnTransition
 	.byte 0
 
-BattleFrontier_BattlePyramidFloor_OnFrame: @ 8252A43
+BattleFrontier_BattlePyramidFloor_OnFrame:
 	map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight
 	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic
 	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName
 	.2byte 0
 
-BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight:: @ 8252A5D
+BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight::
 	lockall
 	@ pyramid_updatelight, cant use macro because it straddles the loop
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
@@ -18,7 +18,7 @@ BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight:: @ 8252A5D
 	setvar VAR_0x8006, PYRAMID_LIGHT_INCR_RADIUS
 	setvar VAR_0x8007, SE_SAVE
 	setvar VAR_RESULT, 0
-BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop:: @ 8252A77
+BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop::
 	special CallBattlePyramidFunction
 	delay 2
 	compare VAR_RESULT, 2
@@ -27,17 +27,17 @@ BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop:: @ 8252A77
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName:: @ 8252A8F
+BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName::
 	special ShowMapNamePopup
 	setvar VAR_TEMP_F, 0
 	end
 
-BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic:: @ 8252A98
+BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic::
 	playbgm MUS_B_PYRAMID, FALSE
 	setvar VAR_TEMP_E, 1
 	end
 
-BattleFrontier_BattlePyramidFloor_OnResume: @ 8252AA2
+BattleFrontier_BattlePyramidFloor_OnResume:
 	pyramid_setfloorpal
 	frontier_getstatus
 	switch VAR_TEMP_0
@@ -59,14 +59,14 @@ BattleFrontier_BattlePyramidFloor_OnResume: @ 8252AA2
 	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	frontier_isbattletype BATTLE_TYPE_TRAINER  @ VAR_RESULT seems to be ignored here
 	setvar VAR_TEMP_D, 1
-BattleFrontier_BattlePyramidFloor_EventScript_ResetParty:: @ 8252B39
+BattleFrontier_BattlePyramidFloor_EventScript_ResetParty::
 	pyramid_resetparty
 	end
 
-BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost:: @ 8252B42
+BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	pyramid_set PYRAMID_DATA_TRAINER_FLAGS, 255
-BattleFrontier_BattlePyramid_EventScript_WarpToLobby:: @ 8252B66
+BattleFrontier_BattlePyramid_EventScript_WarpToLobby::
 	pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS
 	pyramid_clearhelditems
 	special HealPlayerParty
@@ -74,7 +74,7 @@ BattleFrontier_BattlePyramid_EventScript_WarpToLobby:: @ 8252B66
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge:: @ 8252B8D
+BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge::
 	pyramid_save CHALLENGE_STATUS_SAVING
 	special SavePlayerParty
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -83,16 +83,16 @@ BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge:: @ 8252B8D
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidFloor_OnTransition: @ 8252BCA
+BattleFrontier_BattlePyramidFloor_OnTransition:
 	call BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius:: @ 8252BD5
+BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius::
 	pyramid_updatelight 32, PYRAMID_LIGHT_SET_RADIUS
 	return
 
-BattlePyramid_WarpToNextFloor:: @ 8252BE8
+BattlePyramid_WarpToNextFloor::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_get FRONTIER_DATA_BATTLE_NUM  @ Floor number
 	addvar VAR_RESULT, 1
@@ -106,13 +106,13 @@ BattlePyramid_WarpToNextFloor:: @ 8252BE8
 	waitstate
 	end
 
-BattlePyramid_WarpToTop:: @ 8252C45
+BattlePyramid_WarpToTop::
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17
 	waitstate
 	end
 
 @ TRAINER_PHILLIP is used as a placeholder
-BattlePyramid_TrainerBattle:: @ 8252C4F
+BattlePyramid_TrainerBattle::
 	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
 	pyramid_showhint
 	waitmessage
@@ -121,620 +121,620 @@ BattlePyramid_TrainerBattle:: @ 8252C4F
 	releaseall
 	end
 
-BattlePyramid_FindItemBall:: @ 8252C6A
+BattlePyramid_FindItemBall::
 	pyramid_setitem
 	callstd STD_FIND_ITEM
 	compare VAR_0x8007, 0
 	goto_if_eq BattlePyramid_FindItemBallEnd
 	pyramid_hideitem
-BattlePyramid_FindItemBallEnd:: @ 8252C87
+BattlePyramid_FindItemBallEnd::
 	end
 
-BattlePyramid_Retire:: @ 8252C88
+BattlePyramid_Retire::
 	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 
 @ Also used by Trainer Hill
-BattleFacility_TrainerBattle_PlaceholderText: @ 8252C8D
+BattleFacility_TrainerBattle_PlaceholderText:
 	.string "This is a sample message.$"
 
-gText_BattlePyramidConfirmRest:: @ 8252CA7
+gText_BattlePyramidConfirmRest::
 	.string "Your BATTLE PYRAMID quest will be\n"
 	.string "saved so that you may quit for now.\l"
 	.string "Is that okay?$"
 
-gText_BattlePyramidConfirmRetire:: @ 8252CFB
+gText_BattlePyramidConfirmRetire::
 	.string "Are you sure you want to quit your\n"
 	.string "PYRAMID quest?$"
 
-BattlePyramid_Text_ExitHintUp1:: @ 8252D2D
+BattlePyramid_Text_ExitHintUp1::
 	.string "This floor's exit is in\n"
 	.string "that direction: {UP_ARROW}$"
 
-BattlePyramid_Text_ExitHintLeft1:: @ 8252D57
+BattlePyramid_Text_ExitHintLeft1::
 	.string "This floor's exit is in\n"
 	.string "that direction: {LEFT_ARROW}$"
 
-BattlePyramid_Text_ExitHintRight1:: @ 8252D81
+BattlePyramid_Text_ExitHintRight1::
 	.string "This floor's exit is in\n"
 	.string "that direction: {RIGHT_ARROW}$"
 
-BattlePyramid_Text_ExitHintDown1:: @ 8252DAB
+BattlePyramid_Text_ExitHintDown1::
 	.string "This floor's exit is in\n"
 	.string "that direction: {DOWN_ARROW}$"
 
-BattlePyramid_Text_ExitHintUp2:: @ 8252DD5
+BattlePyramid_Text_ExitHintUp2::
 	.string "The exit on this floor is in\n"
 	.string "the {UP_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintLeft2:: @ 8252E03
+BattlePyramid_Text_ExitHintLeft2::
 	.string "The exit on this floor is in\n"
 	.string "the {LEFT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintRight2:: @ 8252E31
+BattlePyramid_Text_ExitHintRight2::
 	.string "The exit on this floor is in\n"
 	.string "the {RIGHT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintDown2:: @ 8252E5F
+BattlePyramid_Text_ExitHintDown2::
 	.string "The exit on this floor is in\n"
 	.string "the {DOWN_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintUp3:: @ 8252E8D
+BattlePyramid_Text_ExitHintUp3::
 	.string "The exit is over\n"
 	.string "that {UP_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintLeft3:: @ 8252EAA
+BattlePyramid_Text_ExitHintLeft3::
 	.string "The exit is over\n"
 	.string "that {LEFT_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintRight3:: @ 8252EC7
+BattlePyramid_Text_ExitHintRight3::
 	.string "The exit is over\n"
 	.string "that {RIGHT_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintDown3:: @ 8252EE4
+BattlePyramid_Text_ExitHintDown3::
 	.string "The exit is over\n"
 	.string "that {DOWN_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintUp4:: @ 8252F01
+BattlePyramid_Text_ExitHintUp4::
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {UP_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintLeft4:: @ 8252F3A
+BattlePyramid_Text_ExitHintLeft4::
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {LEFT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintRight4:: @ 8252F73
+BattlePyramid_Text_ExitHintRight4::
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {RIGHT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintDown4:: @ 8252FAC
+BattlePyramid_Text_ExitHintDown4::
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {DOWN_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintUp5:: @ 8252FE5
+BattlePyramid_Text_ExitHintUp5::
 	.string "The exit?\n"
 	.string "It's that {UP_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintLeft5:: @ 8253000
+BattlePyramid_Text_ExitHintLeft5::
 	.string "The exit?\n"
 	.string "It's that {LEFT_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintRight5:: @ 825301B
+BattlePyramid_Text_ExitHintRight5::
 	.string "The exit?\n"
 	.string "It's that {RIGHT_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintDown5:: @ 8253036
+BattlePyramid_Text_ExitHintDown5::
 	.string "The exit?\n"
 	.string "It's that {DOWN_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintUp6:: @ 8253051
+BattlePyramid_Text_ExitHintUp6::
 	.string "The exit happens to be in\n"
 	.string "the {UP_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintLeft6:: @ 825307C
+BattlePyramid_Text_ExitHintLeft6::
 	.string "The exit happens to be in\n"
 	.string "the {LEFT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintRight6:: @ 82530A7
+BattlePyramid_Text_ExitHintRight6::
 	.string "The exit happens to be in\n"
 	.string "the {RIGHT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintDown6:: @ 82530D2
+BattlePyramid_Text_ExitHintDown6::
 	.string "The exit happens to be in\n"
 	.string "the {DOWN_ARROW} direction.$"
 
-BattlePyramid_Text_EightItemsRemaining1:: @ 82530FD
+BattlePyramid_Text_EightItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are eight items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_SevenItemsRemaining1:: @ 8253140
+BattlePyramid_Text_SevenItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are seven items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_SixItemsRemaining1:: @ 8253183
+BattlePyramid_Text_SixItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are six items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_FiveItemsRemaining1:: @ 82531C4
+BattlePyramid_Text_FiveItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are five items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_FourItemsRemaining1:: @ 8253206
+BattlePyramid_Text_FourItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are four items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_ThreeItemsRemaining1:: @ 8253248
+BattlePyramid_Text_ThreeItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are three items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_TwoItemsRemaining1:: @ 825328B
+BattlePyramid_Text_TwoItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are two items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_OneItemRemaining1:: @ 82532CC
+BattlePyramid_Text_OneItemRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There is one item left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_ZeroItemsRemaining1:: @ 825330B
+BattlePyramid_Text_ZeroItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There isn't anything left to\n"
 	.string "be found!$"
 
-BattlePyramid_Text_EightItemsRemaining2:: @ 825334D
+BattlePyramid_Text_EightItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are eight items\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_SevenItemsRemaining2:: @ 82533A6
+BattlePyramid_Text_SevenItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are seven items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_SixItemsRemaining2:: @ 8253404
+BattlePyramid_Text_SixItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are six items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_FiveItemsRemaining2:: @ 8253460
+BattlePyramid_Text_FiveItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are five items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_FourItemsRemaining2:: @ 82534BD
+BattlePyramid_Text_FourItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are four items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_ThreeItemsRemaining2:: @ 825351A
+BattlePyramid_Text_ThreeItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are three items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_TwoItemsRemaining2:: @ 8253578
+BattlePyramid_Text_TwoItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are two items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_OneItemRemaining2:: @ 82535D4
+BattlePyramid_Text_OneItemRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There is just one item\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_ZeroItemsRemaining2:: @ 825362E
+BattlePyramid_Text_ZeroItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There isn't anything left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_EightItemsRemaining3:: @ 825368B
+BattlePyramid_Text_EightItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are eight items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_SevenItemsRemaining3:: @ 82536F8
+BattlePyramid_Text_SevenItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are seven items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_SixItemsRemaining3:: @ 8253765
+BattlePyramid_Text_SixItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are six items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_FiveItemsRemaining3:: @ 82537D0
+BattlePyramid_Text_FiveItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are five items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_FourItemsRemaining3:: @ 825383C
+BattlePyramid_Text_FourItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are four items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_ThreeItemsRemaining3:: @ 82538A8
+BattlePyramid_Text_ThreeItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are three items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_TwoItemsRemaining3:: @ 8253915
+BattlePyramid_Text_TwoItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are two items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_OneItemRemaining3:: @ 8253980
+BattlePyramid_Text_OneItemRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there's but one item left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_ZeroItemsRemaining3:: @ 82539EC
+BattlePyramid_Text_ZeroItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are no more items\n"
 	.string "waiting to be found on this floor.\l"
 	.string "You take care now!$"
 
-BattlePyramid_Text_EightItemsRemaining4:: @ 8253A69
+BattlePyramid_Text_EightItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be eight more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_SevenItemsRemaining4:: @ 8253AC4
+BattlePyramid_Text_SevenItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be seven more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_SixItemsRemaining4:: @ 8253B1F
+BattlePyramid_Text_SixItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be six more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_FiveItemsRemaining4:: @ 8253B78
+BattlePyramid_Text_FiveItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be five more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_FourItemsRemaining4:: @ 8253BD2
+BattlePyramid_Text_FourItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be four more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_ThreeItemsRemaining4:: @ 8253C2C
+BattlePyramid_Text_ThreeItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be three more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_TwoItemsRemaining4:: @ 8253C87
+BattlePyramid_Text_TwoItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be two more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_OneItemRemaining4:: @ 8253CE0
+BattlePyramid_Text_OneItemRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appears to be only one more\n"
 	.string "item on the ground.$"
 
-BattlePyramid_Text_ZeroItemsRemaining4:: @ 8253D3E
+BattlePyramid_Text_ZeroItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be no more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_EightItemsRemaining5:: @ 8253D96
+BattlePyramid_Text_EightItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are eight items…$"
 
-BattlePyramid_Text_SevenItemsRemaining5:: @ 8253DD2
+BattlePyramid_Text_SevenItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are seven items…$"
 
-BattlePyramid_Text_SixItemsRemaining5:: @ 8253E0E
+BattlePyramid_Text_SixItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are six items…$"
 
-BattlePyramid_Text_FiveItemsRemaining5:: @ 8253E48
+BattlePyramid_Text_FiveItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are five items…$"
 
-BattlePyramid_Text_FourItemsRemaining5:: @ 8253E83
+BattlePyramid_Text_FourItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are four items…$"
 
-BattlePyramid_Text_ThreeItemsRemaining5:: @ 8253EBE
+BattlePyramid_Text_ThreeItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are three items…$"
 
-BattlePyramid_Text_TwoItemsRemaining5:: @ 8253EFA
+BattlePyramid_Text_TwoItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are two items…$"
 
-BattlePyramid_Text_OneItemRemaining5:: @ 8253F34
+BattlePyramid_Text_OneItemRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there is one item…$"
 
-BattlePyramid_Text_ZeroItemsRemaining5:: @ 8253F6C
+BattlePyramid_Text_ZeroItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are no items…$"
 
-BattlePyramid_Text_EightItemsRemaining6:: @ 8253FA5
+BattlePyramid_Text_EightItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are eight more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_SevenItemsRemaining6:: @ 8253FF7
+BattlePyramid_Text_SevenItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are seven more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_SixItemsRemaining6:: @ 8254049
+BattlePyramid_Text_SixItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are six more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_FiveItemsRemaining6:: @ 8254099
+BattlePyramid_Text_FiveItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are five more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_FourItemsRemaining6:: @ 82540EA
+BattlePyramid_Text_FourItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are four more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_ThreeItemsRemaining6:: @ 825413B
+BattlePyramid_Text_ThreeItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are three more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_TwoItemsRemaining6:: @ 825418D
+BattlePyramid_Text_TwoItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are two more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_OneItemRemaining6:: @ 82541DD
+BattlePyramid_Text_OneItemRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there is one more\n"
 	.string "item on this floor.$"
 
-BattlePyramid_Text_ZeroItemsRemaining6:: @ 825422B
+BattlePyramid_Text_ZeroItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are no more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_SevenTrainersRemaining1:: @ 825427A
+BattlePyramid_Text_SevenTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still seven tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_SixTrainersRemaining1:: @ 82542CB
+BattlePyramid_Text_SixTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still six tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_FiveTrainersRemaining1:: @ 825431A
+BattlePyramid_Text_FiveTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still five tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_FourTrainersRemaining1:: @ 825436A
+BattlePyramid_Text_FourTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still four tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_ThreeTrainersRemaining1:: @ 82543BA
+BattlePyramid_Text_ThreeTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still three tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_TwoTrainersRemaining1:: @ 825440B
+BattlePyramid_Text_TwoTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still two tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_OneTrainersRemaining1:: @ 825445A
+BattlePyramid_Text_OneTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there's still one tough\n"
 	.string "TRAINER other than me!$"
 
-BattlePyramid_Text_ZeroTrainersRemaining1:: @ 82544A6
+BattlePyramid_Text_ZeroTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "There's no one left that\n"
 	.string "can beat you!$"
 
-BattlePyramid_Text_SevenTrainersRemaining2:: @ 82544E6
+BattlePyramid_Text_SevenTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are seven TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_SixTrainersRemaining2:: @ 8254538
+BattlePyramid_Text_SixTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are six TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_FiveTrainersRemaining2:: @ 8254588
+BattlePyramid_Text_FiveTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are five TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_FourTrainersRemaining2:: @ 82545D9
+BattlePyramid_Text_FourTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are four TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_ThreeTrainersRemaining2:: @ 825462A
+BattlePyramid_Text_ThreeTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are three TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_TwoTrainersRemaining2:: @ 825467C
+BattlePyramid_Text_TwoTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are two TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_OneTrainersRemaining2:: @ 82546CC
+BattlePyramid_Text_OneTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there's one TRAINER left!\n"
 	.string "I'm sure you will be humbled!$"
 
-BattlePyramid_Text_ZeroTrainersRemaining2:: @ 825471E
+BattlePyramid_Text_ZeroTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are no more TRAINERS\n"
 	.string "who can engage you!$"
 
-BattlePyramid_Text_SevenTrainersRemaining3:: @ 8254767
+BattlePyramid_Text_SevenTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are seven more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_Text_SixTrainersRemaining3:: @ 82547C9
+BattlePyramid_Text_SixTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are six more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_Text_FiveTrainersRemaining3:: @ 8254829
+BattlePyramid_Text_FiveTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are five more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_Text_FourTrainersRemaining3:: @ 825488A
+BattlePyramid_Text_FourTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are four more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_Text_ThreeTrainersRemaining3:: @ 82548EB
+BattlePyramid_Text_ThreeTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are three more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_Text_TwoTrainersRemaining3:: @ 825494D
+BattlePyramid_Text_TwoTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are two more TRAINERS\n"
 	.string "on this floor. Can you beat them both?$"
 
-BattlePyramid_Text_OneTrainersRemaining3:: @ 82549AE
+BattlePyramid_Text_OneTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there's still one more TRAINER\n"
 	.string "on this floor. Can you prevail?$"
 
-BattlePyramid_Text_ZeroTrainersRemaining3:: @ 8254A0B
+BattlePyramid_Text_ZeroTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "You've gone through all the TRAINERS\n"
 	.string "on this floor.$"
 
-BattlePyramid_Text_SevenTrainersRemaining4:: @ 8254A59
+BattlePyramid_Text_SevenTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the seven TRAINERS left on this floor.$"
 
-BattlePyramid_Text_SixTrainersRemaining4:: @ 8254A9E
+BattlePyramid_Text_SixTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the six TRAINERS left on this floor.$"
 
-BattlePyramid_Text_FiveTrainersRemaining4:: @ 8254AE1
+BattlePyramid_Text_FiveTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the five TRAINERS left on this floor.$"
 
-BattlePyramid_Text_FourTrainersRemaining4:: @ 8254B25
+BattlePyramid_Text_FourTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the four TRAINERS left on this floor.$"
 
-BattlePyramid_Text_ThreeTrainersRemaining4:: @ 8254B69
+BattlePyramid_Text_ThreeTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the three TRAINERS left on this floor.$"
 
-BattlePyramid_Text_TwoTrainersRemaining4:: @ 8254BAE
+BattlePyramid_Text_TwoTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the two TRAINERS left on this floor.$"
 
-BattlePyramid_Text_OneTrainersRemaining4:: @ 8254BF1
+BattlePyramid_Text_OneTrainersRemaining4::
 	.string "Maybe you could complete your sweep\n"
 	.string "with the one TRAINER left on this floor.$"
 
-BattlePyramid_Text_ZeroTrainersRemaining4:: @ 8254C3E
+BattlePyramid_Text_ZeroTrainersRemaining4::
 	.string "There isn't a single person left who\n"
 	.string "can defeat you now…$"
 
-BattlePyramid_Text_SevenTrainersRemaining5:: @ 8254C77
+BattlePyramid_Text_SevenTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the seven expert TRAINERS who remain.$"
 
-BattlePyramid_Text_SixTrainersRemaining5:: @ 8254CC0
+BattlePyramid_Text_SixTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the six expert TRAINERS who remain.$"
 
-BattlePyramid_Text_FiveTrainersRemaining5:: @ 8254D07
+BattlePyramid_Text_FiveTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the five expert TRAINERS who remain.$"
 
-BattlePyramid_Text_FourTrainersRemaining5:: @ 8254D4F
+BattlePyramid_Text_FourTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the four expert TRAINERS who remain.$"
 
-BattlePyramid_Text_ThreeTrainersRemaining5:: @ 8254D97
+BattlePyramid_Text_ThreeTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the three expert TRAINERS who remain.$"
 
-BattlePyramid_Text_TwoTrainersRemaining5:: @ 8254DE0
+BattlePyramid_Text_TwoTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the two expert TRAINERS who remain.$"
 
-BattlePyramid_Text_OneTrainersRemaining5:: @ 8254E27
+BattlePyramid_Text_OneTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the one expert TRAINER who remains.$"
 
-BattlePyramid_Text_ZeroTrainersRemaining5:: @ 8254E6E
+BattlePyramid_Text_ZeroTrainersRemaining5::
 	.string "Your skills are beyond reproach.\p"
 	.string "There are no more TRAINERS here\n"
 	.string "who have any chance of beating you.$"
 
-BattlePyramid_Text_SevenTrainersRemaining6:: @ 8254ED3
+BattlePyramid_Text_SevenTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the seven remaining TRAINERS?$"
 
-BattlePyramid_Text_SixTrainersRemaining6:: @ 8254F0E
+BattlePyramid_Text_SixTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the six remaining TRAINERS?$"
 
-BattlePyramid_Text_FiveTrainersRemaining6:: @ 8254F47
+BattlePyramid_Text_FiveTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the five remaining TRAINERS?$"
 
-BattlePyramid_Text_FourTrainersRemaining6:: @ 8254F81
+BattlePyramid_Text_FourTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the four remaining TRAINERS?$"
 
-BattlePyramid_Text_ThreeTrainersRemaining6:: @ 8254FBB
+BattlePyramid_Text_ThreeTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the three remaining TRAINERS?$"
 
-BattlePyramid_Text_TwoTrainersRemaining6:: @ 8254FF6
+BattlePyramid_Text_TwoTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the two remaining TRAINERS?$"
 
-BattlePyramid_Text_OneTrainersRemaining6:: @ 825502F
+BattlePyramid_Text_OneTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the last remaining TRAINER?$"
 
-BattlePyramid_Text_ZeroTrainersRemaining6:: @ 8255068
+BattlePyramid_Text_ZeroTrainersRemaining6::
 	.string "There aren't any TRAINERS left that\n"
 	.string "can take you on now…$"
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index 175d2c56b..c93deee3e 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -1,22 +1,22 @@
 .set LOCALID_ATTENDANT, 1
 .set LOCALID_HINT_GIVER, 2
 
-BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716
+BattleFrontier_BattlePyramidLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
 	.byte 0
 
 @ Unused. Pyramid uses Dome's OnWarp (presumably by mistake). Their effects are identical
-BattleFrontier_BattlePyramidLobby_OnWarp: @ 8250721
+BattleFrontier_BattlePyramidLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth: @ 825072B
+BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth:
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePyramidLobby_OnFrame: @ 8250735
+BattleFrontier_BattlePyramidLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge
@@ -24,11 +24,11 @@ BattleFrontier_BattlePyramidLobby_OnFrame: @ 8250735
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus:: @ 825075F
+BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768
+BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving::
 	lockall
 	message BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag
 	waitmessage
@@ -42,7 +42,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge:: @ 82507B1
+BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge::
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
@@ -50,9 +50,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge:: @ 82507B1
 	msgbox BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing:: @ 82507D2
+BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA
+BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints::
 	special DoBattlePyramidMonsHaveHeldItem
 	compare VAR_RESULT, TRUE
 	call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag
@@ -80,7 +80,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852
+BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge::
 	frontier_checkairshow
 	special LoadPlayerParty
 	pyramid_clearhelditems
@@ -102,17 +102,17 @@ BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge:: @ 82508AC
+BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge::
 	goto BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_Attendant:: @ 82508B1
+BattleFrontier_BattlePyramidLobby_EventScript_Attendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PYRAMID
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
 	msgbox BattleFrontier_BattlePyramidLobby_Text_WelcomeToBattlePyramid, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge:: @ 82508C8
+BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge::
 	message BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -122,7 +122,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge:: @ 82508C8
 	case 2, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge:: @ 8250904
+BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -148,7 +148,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge:: @ 8250904
 	case YES, BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge:: @ 82509A5
+BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	pyramid_init
@@ -164,7 +164,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge:: @ 82509A5
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed
-BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge:: @ 8250A21
+BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ShowYouIntoPyramid, MSGBOX_DEFAULT
@@ -178,36 +178,36 @@ BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge:: @ 8250A21
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_ExplainChallenge:: @ 8250A68
+BattleFrontier_BattlePyramidLobby_EventScript_ExplainChallenge::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons:: @ 8250A75
+BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50:: @ 8250A90
+BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8250A9D
+BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed:: @ 8250AAA
+BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge:: @ 8250AC1
+BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge:: @ 8250AC4
+BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge:: @ 8250ACC
+BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintGiver:: @ 8250ACE
+BattleFrontier_BattlePyramidLobby_EventScript_HintGiver::
 	lockall
 	applymovement LOCALID_HINT_GIVER, Common_Movement_FacePlayer
 	waitmovement 0
@@ -217,7 +217,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_HintGiver:: @ 8250ACE
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_GiveHint:: @ 8250AF0
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHint::
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50
@@ -227,10 +227,10 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveHint:: @ 8250AF0
 	return
 
 @ Shouldnt occur
-BattleFrontier_BattlePyramidLobby_EventScript_NoHint:: @ 8250B27
+BattleFrontier_BattlePyramidLobby_EventScript_NoHint::
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50:: @ 8250B28
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT
 	pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_50
 	compare VAR_RESULT, FALSE
@@ -239,12 +239,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50:: @ 8250B28
 	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak:: @ 8250B53
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak::
 	pyramid_get PYRAMID_DATA_WIN_STREAK_50
 	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen:: @ 8250B66
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT
 	pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_OPEN
 	compare VAR_RESULT, FALSE
@@ -253,12 +253,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen:: @ 8250B66
 	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLvOpenStreak:: @ 8250B91
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLvOpenStreak::
 	pyramid_get PYRAMID_DATA_WIN_STREAK_OPEN
 	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment:: @ 8250BA4
+BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment::
 	copyvar VAR_0x8004, VAR_RESULT
 	special GetBattlePyramidHint
 	switch VAR_RESULT
@@ -284,87 +284,87 @@ BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment:: @ 8250BA4
 	case 19, BattleFrontier_BattlePyramidLobby_EventScript_HintNormal
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintParalysis:: @ 8250C8E
+BattleFrontier_BattlePyramidLobby_EventScript_HintParalysis::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintParalysis, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintPoison:: @ 8250C97
+BattleFrontier_BattlePyramidLobby_EventScript_HintPoison::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintPoison, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintBurn:: @ 8250CA0
+BattleFrontier_BattlePyramidLobby_EventScript_HintBurn::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintBurn, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintPPWaste:: @ 8250CA9
+BattleFrontier_BattlePyramidLobby_EventScript_HintPPWaste::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintPPWaste, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintLevitate:: @ 8250CB2
+BattleFrontier_BattlePyramidLobby_EventScript_HintLevitate::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintLevitate, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintTrapAbility:: @ 8250CBB
+BattleFrontier_BattlePyramidLobby_EventScript_HintTrapAbility::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintTrapAbility, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintIce:: @ 8250CC4
+BattleFrontier_BattlePyramidLobby_EventScript_HintIce::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintIce, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintExplosion:: @ 8250CCD
+BattleFrontier_BattlePyramidLobby_EventScript_HintExplosion::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintExplosion, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintPsychic:: @ 8250CD6
+BattleFrontier_BattlePyramidLobby_EventScript_HintPsychic::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintPsychic, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintRock:: @ 8250CDF
+BattleFrontier_BattlePyramidLobby_EventScript_HintRock::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintRock, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintFighting:: @ 8250CE8
+BattleFrontier_BattlePyramidLobby_EventScript_HintFighting::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintFighting, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintWeather:: @ 8250CF1
+BattleFrontier_BattlePyramidLobby_EventScript_HintWeather::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintWeather, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintBug:: @ 8250CFA
+BattleFrontier_BattlePyramidLobby_EventScript_HintBug::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintBug, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintDark:: @ 8250D03
+BattleFrontier_BattlePyramidLobby_EventScript_HintDark::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintDark, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintWater:: @ 8250D0C
+BattleFrontier_BattlePyramidLobby_EventScript_HintWater::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintWater, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintGhost:: @ 8250D15
+BattleFrontier_BattlePyramidLobby_EventScript_HintGhost::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintGhost, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintSteel:: @ 8250D1E
+BattleFrontier_BattlePyramidLobby_EventScript_HintSteel::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintSteel, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintFlyingDragon:: @ 8250D27
+BattleFrontier_BattlePyramidLobby_EventScript_HintFlyingDragon::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintFlyingDragon, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintStoneEvolve:: @ 8250D30
+BattleFrontier_BattlePyramidLobby_EventScript_HintStoneEvolve::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintNormal:: @ 8250D39
+BattleFrontier_BattlePyramidLobby_EventScript_HintNormal::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintNormal, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_ShowResults:: @ 8250D42
+BattleFrontier_BattlePyramidLobby_EventScript_ShowResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_PYRAMID
 	waitbuttonpress
@@ -372,7 +372,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ShowResults:: @ 8250D42
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag:: @ 8250D56
+BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel
 	waitmovement 0
@@ -383,9 +383,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag:: @ 8250D
 	msgbox BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag
 
-BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag:: @ 8250D94
+BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_PleaseTakeThisBattleBag, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C
+BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag::
 	message BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag
 	waitmessage
 	playse SE_EXP_MAX
@@ -398,7 +398,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C
 	waitmovement 0
 	return
 
-BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel: @ 8250DC4
+BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel:
 	walk_up
 	walk_up
 	walk_up
@@ -409,7 +409,7 @@ BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel: @ 8250DC4
 	face_down
 	step_end
 
-BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel: @ 8250DCD
+BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel:
 	walk_up
 	walk_up
 	walk_up
@@ -419,17 +419,17 @@ BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel: @ 8250DCD
 	walk_up
 	step_end
 
-BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside: @ 8250DD5
+BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside:
 	walk_right
 	face_left
 	step_end
 
-BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel: @ 8250DD8
+BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel:
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag:: @ 8250DDB
+BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake, MSGBOX_DEFAULT
 	setflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
 	special TryStoreHeldItemsInPyramidBag
@@ -440,12 +440,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag:: @ 825
 	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag:: @ 8250E00
+BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HeldItemsMovedToBag, MSGBOX_DEFAULT
 	return
 
 @ When exiting Battle Pyramid with a full pyramid bag and held items the player must select to keep/toss party held items and make room for any kept items by tossing from the pyramid bag
-BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep:: @ 8250E09
+BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep::
 	multichoice 17, 6, MULTI_FRONTIER_ITEM_CHOOSE, FALSE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag
@@ -454,7 +454,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep:: @ 8250E09
 	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag:: @ 8250E40
+BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag::
 	special ChooseItemsToTossFromPyramidBag
 	waitstate
 	message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep
@@ -462,7 +462,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag:: @ 8250E40
 	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty:: @ 8250E50
+BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty::
 	special BattlePyramidChooseMonHeldItems
 	waitstate
 	message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep
@@ -470,34 +470,34 @@ BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty:: @ 8250E50
 	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems:: @ 8250E60
+BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems::
 	special DoBattlePyramidMonsHaveHeldItem
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems:: @ 8250E6F
+BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_LeastOneMonHoldingItem, MSGBOX_DEFAULT
 	message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep
 	waitmessage
 	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_Woman:: @ 8250E83
+BattleFrontier_BattlePyramidLobby_EventScript_Woman::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_FatMan:: @ 8250E8C
+BattleFrontier_BattlePyramidLobby_EventScript_FatMan::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_LostLotOfItems, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard:: @ 8250E95
+BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattlePyramidLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard:: @ 8250EA4
+BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 15, 2, MULTI_BATTLE_PYRAMID_RULES, FALSE
@@ -510,45 +510,45 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard:: @ 8250EA4
 	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_RulesPokemon:: @ 8250EF7
+BattleFrontier_BattlePyramidLobby_EventScript_RulesPokemon::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainMonRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_RulesTrainers:: @ 8250F05
+BattleFrontier_BattlePyramidLobby_EventScript_RulesTrainers::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_RulesMaze:: @ 8250F13
+BattleFrontier_BattlePyramidLobby_EventScript_RulesMaze::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_RulesBag:: @ 8250F21
+BattleFrontier_BattlePyramidLobby_EventScript_RulesBag::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_ExitRules:: @ 8250F2F
+BattleFrontier_BattlePyramidLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_Text_WelcomeToBattlePyramid: @ 8250F31
+BattleFrontier_BattlePyramidLobby_Text_WelcomeToBattlePyramid:
 	.string "Where the courage of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "Welcome to the BATTLE PYRAMID!\p"
 	.string "I am your guide to\n"
 	.string "the Battle Quest.$"
 
-BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge: @ 8250FA7
+BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge:
 	.string "Have you the courage to embark on\n"
 	.string "the Battle Quest challenge?$"
 
-BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge: @ 8250FE5
+BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge:
 	.string "We await your challenge in the future!$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid: @ 825100C
+BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid:
 	.string "The Battle Quest is a battling\n"
 	.string "event in which you must explore\l"
 	.string "the PYRAMID and try to reach the top.\p"
@@ -567,16 +567,16 @@ BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid: @ 825100C
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode: @ 8251248
+BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode:
 	.string "The PYRAMID offers two courses,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which will you enter?$"
 
-BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons: @ 8251297
+BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons:
 	.string "Very good. Now, please select the three\n"
 	.string "POKéMON you wish to accompany you.$"
 
-BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen: @ 82512E2
+BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "A slight problem, adventurer!\p"
 	.string "You seem to not have the three\n"
 	.string "POKéMON qualified for the challenge.\p"
@@ -586,7 +586,7 @@ BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen: @ 82512E2
 	.string "When you are ready, please have\n"
 	.string "a word with me.$"
 
-BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50: @ 82513C1
+BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50:
 	.string "A slight problem, adventurer!\p"
 	.string "You seem to not have the three\n"
 	.string "POKéMON qualified for the challenge.\p"
@@ -598,38 +598,38 @@ BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50: @ 82513C1
 	.string "When you are ready, please have\n"
 	.string "a word with me.$"
 
-BattleFrontier_BattlePyramidLobby_Text_OkayToSaveBeforeChallenge: @ 82514E6
+BattleFrontier_BattlePyramidLobby_Text_OkayToSaveBeforeChallenge:
 	.string "Before you enter the BATTLE PYRAMID,\n"
 	.string "the game must be saved. Is that okay?$"
 
-BattleFrontier_BattlePyramidLobby_Text_ShowYouIntoPyramid: @ 8251531
+BattleFrontier_BattlePyramidLobby_Text_ShowYouIntoPyramid:
 	.string "Very good. I will now show you into\n"
 	.string "the BATTLE PYRAMID.$"
 
-BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping: @ 8251569
+BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping:
 	.string "We will hold your BAG for safekeeping,\n"
 	.string "{PLAYER}, while you are exploring.$"
 
-BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag: @ 82515AD
+BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag:
 	.string "In exchange, please take this BATTLE\n"
 	.string "BAG, the one you used previously.$"
 
-BattleFrontier_BattlePyramidLobby_Text_PleaseTakeThisBattleBag: @ 82515F4
+BattleFrontier_BattlePyramidLobby_Text_PleaseTakeThisBattleBag:
 	.string "In exchange, please take this\n"
 	.string "BATTLE BAG.$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag: @ 825161E
+BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag:
 	.string "{PLAYER} exchanged the BAG for\n"
 	.string "the BATTLE BAG.$"
 
-BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel: @ 8251647
+BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel:
 	.string "When you step on this floor panel,\n"
 	.string "you will be transported to a higher\l"
 	.string "floor in the PYRAMID.\p"
 	.string "I hope for your sake that your\n"
 	.string "quest goes safely!$"
 
-BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag: @ 82516D6
+BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag:
 	.string "A major problem, explorer!\p"
 	.string "You did not save before ending\n"
 	.string "your challenge the last time.\p"
@@ -639,112 +639,112 @@ BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag: @ 82516D6
 	.string "for you.\p"
 	.string "{PLAYER} got the BAG back.$"
 
-BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid: @ 82517B5
+BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid:
 	.string "Excellent to see you back!\p"
 	.string "You've conquered the PYRAMID!\n"
 	.string "How splendid!$"
 
-BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake: @ 82517FC
+BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake:
 	.string "Ah, a slight problem.\p"
 	.string "At least one POKéMON is holding\n"
 	.string "an item.\p"
 	.string "I'm sorry to say, items obtained in\n"
 	.string "the PYRAMID cannot be taken away.$"
 
-BattleFrontier_BattlePyramidLobby_Text_HeldItemsMovedToBag: @ 8251881
+BattleFrontier_BattlePyramidLobby_Text_HeldItemsMovedToBag:
 	.string "All items held by your POKéMON will be\n"
 	.string "moved to your BATTLE BAG, {PLAYER}.$"
 
-BattleFrontier_BattlePyramidLobby_Text_BagCannotHoldPickItemsToKeep: @ 82518C6
+BattleFrontier_BattlePyramidLobby_Text_BagCannotHoldPickItemsToKeep:
 	.string "The BATTLE BAG cannot hold all your\n"
 	.string "items, I'm sorry to say.\p"
 	.string "Please pick the items you'll keep in the\n"
 	.string "BATTLE BAG, and with your POKéMON.$"
 
-BattleFrontier_BattlePyramidLobby_Text_LeastOneMonHoldingItem: @ 825194F
+BattleFrontier_BattlePyramidLobby_Text_LeastOneMonHoldingItem:
 	.string "At least one POKéMON is still\n"
 	.string "holding an item.$"
 
-BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep: @ 825197E
+BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep:
 	.string "Please pick the items you'll keep in the\n"
 	.string "BATTLE BAG, and with your POKéMON.$"
 
 @ Unused
-BattleFrontier_BattlePyramidLobby_Text_ReturnedEverythingMonsHeld: @ 82519CA
+BattleFrontier_BattlePyramidLobby_Text_ReturnedEverythingMonsHeld:
 	.string "{PLAYER} returned everything that\n"
 	.string "the POKéMON held.$"
 
-BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept: @ 82519F8
+BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept:
 	.string "The BATTLE BAG you used will be kept\n"
 	.string "in readiness for your next challenge.\p"
 	.string "{PLAYER} turned the BATTLE BAG over\n"
 	.string "for the BAG's return.$"
 
-BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait: @ 8251A77
+BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait:
 	.string "I must record your results.\n"
 	.string "Please wait.$"
 
 @ Unused
-BattleFrontier_BattlePyramidLobby_Text_ForConqueringPyramidTakeThis: @ 8251AA0
+BattleFrontier_BattlePyramidLobby_Text_ForConqueringPyramidTakeThis:
 	.string "As a memento for conquering\n"
 	.string "the BATTLE PYRAMID, please take this.$"
 
 @ Unused
-BattleFrontier_BattlePyramidLobby_Text_ReceivedPrizeItem: @ 8251AE2
+BattleFrontier_BattlePyramidLobby_Text_ReceivedPrizeItem:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
 @ Unused
-BattleFrontier_BattlePyramidLobby_Text_BagIsFull: @ 8251AFC
+BattleFrontier_BattlePyramidLobby_Text_BagIsFull:
 	.string "…Ah…\n"
 	.string "Your BAG appears to be filled.\p"
 	.string "Please return after you've organized\n"
 	.string "your BAG's contents.$"
 
-BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag: @ 8251B5A
+BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag:
 	.string "How disappointing for you…\p"
 	.string "Here is the BAG we've been holding\n"
 	.string "for you.\p"
 	.string "{PLAYER} got the BAG back.$"
 
-BattleFrontier_BattlePyramidLobby_Text_LookForwardToNextChallenge: @ 8251BB6
+BattleFrontier_BattlePyramidLobby_Text_LookForwardToNextChallenge:
 	.string "We look forward to your\n"
 	.string "next challenge!$"
 
 @ Unused
-BattleFrontier_BattlePyramidLobby_Text_HereIsPrize: @ 8251BDE
+BattleFrontier_BattlePyramidLobby_Text_HereIsPrize:
 	.string "We have been looking forward to\n"
 	.string "your arrival!\p"
 	.string "Here is your prize for conquering\n"
 	.string "the PYRAMID.$"
 
-BattleFrontier_BattlePyramidLobby_Text_TellYouWhatMisfortunesAwait: @ 8251C3B
+BattleFrontier_BattlePyramidLobby_Text_TellYouWhatMisfortunesAwait:
 	.string "Welcome…\p"
 	.string "I shall be pleased to tell you what\n"
 	.string "misfortunes await in the PYRAMID…$"
 
-BattleFrontier_BattlePyramidLobby_Text_Aah: @ 8251C8A
+BattleFrontier_BattlePyramidLobby_Text_Aah:
 	.string "… … … … … …\n"
 	.string "… … … … … …\p"
 	.string "… … … … … …\n"
 	.string "Aah!$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintParalysis: @ 8251CB3
+BattleFrontier_BattlePyramidLobby_Text_HintParalysis:
 	.string "I see a shower of sparks…\p"
 	.string "…And in it, I see your POKéMON\n"
 	.string "struggling with paralysis…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintPoison: @ 8251D07
+BattleFrontier_BattlePyramidLobby_Text_HintPoison:
 	.string "I see poison…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from the effects of poison…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintBurn: @ 8251D54
+BattleFrontier_BattlePyramidLobby_Text_HintBurn:
 	.string "I see bright red flames…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from burns…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintPPWaste: @ 8251D9C
+BattleFrontier_BattlePyramidLobby_Text_HintPPWaste:
 	.string "I sense the tremendous pressure of\n"
 	.string "unrequited anger…\p"
 	.string "It is a curse…\p"
@@ -752,44 +752,44 @@ BattleFrontier_BattlePyramidLobby_Text_HintPPWaste: @ 8251D9C
 	.string "Power Points and having no recourse\l"
 	.string "but to use STRUGGLE…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintLevitate: @ 8251E3D
+BattleFrontier_BattlePyramidLobby_Text_HintLevitate:
 	.string "I see POKéMON loftily airborne…\p"
 	.string "…And, I see your POKéMON frustrated\n"
 	.string "by powerless GROUND-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintTrapAbility: @ 8251EA1
+BattleFrontier_BattlePyramidLobby_Text_HintTrapAbility:
 	.string "I sense terrific energy rising from\n"
 	.string "the ground below…\p"
 	.string "…And, I see your POKéMON unable to\n"
 	.string "escape the power's clutches…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintIce: @ 8251F17
+BattleFrontier_BattlePyramidLobby_Text_HintIce:
 	.string "I see ICE-type POKéMON…\p"
 	.string "…And, I see your POKéMON fighting\n"
 	.string "the freezing effects of ice…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintExplosion: @ 8251F6E
+BattleFrontier_BattlePyramidLobby_Text_HintExplosion:
 	.string "I see a flurry of moves that imperil\n"
 	.string "the user…\p"
 	.string "…And, I see your POKéMON falling\n"
 	.string "to them…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintPsychic: @ 8251FC7
+BattleFrontier_BattlePyramidLobby_Text_HintPsychic:
 	.string "I see PSYCHIC-type POKéMON…\p"
 	.string "…And, I see your POKéMON in torment\n"
 	.string "from PSYCHIC moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintRock: @ 825201B
+BattleFrontier_BattlePyramidLobby_Text_HintRock:
 	.string "I see ROCK-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from ROCK moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintFighting: @ 8252068
+BattleFrontier_BattlePyramidLobby_Text_HintFighting:
 	.string "I see FIGHTING-type POKéMON…\p"
 	.string "…And, I see your POKéMON pummeled\n"
 	.string "by FIGHTING moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintWeather: @ 82520BA
+BattleFrontier_BattlePyramidLobby_Text_HintWeather:
 	.string "RAIN DANCE… SUNNY DAY…\n"
 	.string "SANDSTORM… HAIL…\p"
 	.string "I see POKéMON that become stronger\n"
@@ -797,37 +797,37 @@ BattleFrontier_BattlePyramidLobby_Text_HintWeather: @ 82520BA
 	.string "…And, I see your POKéMON confounded\n"
 	.string "by different types of moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintBug: @ 8252158
+BattleFrontier_BattlePyramidLobby_Text_HintBug:
 	.string "I see BUG-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from different kinds of attacks…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintDark: @ 82521B4
+BattleFrontier_BattlePyramidLobby_Text_HintDark:
 	.string "I see DARK-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from DARK-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintWater: @ 8252206
+BattleFrontier_BattlePyramidLobby_Text_HintWater:
 	.string "I see WATER-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from WATER-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintGhost: @ 825225A
+BattleFrontier_BattlePyramidLobby_Text_HintGhost:
 	.string "I see GHOST-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from GHOST-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintSteel: @ 82522AE
+BattleFrontier_BattlePyramidLobby_Text_HintSteel:
 	.string "I see STEEL-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from enormously powerful moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintFlyingDragon: @ 825230B
+BattleFrontier_BattlePyramidLobby_Text_HintFlyingDragon:
 	.string "I see flying POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from enormously powerful moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve: @ 8252364
+BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve:
 	.string "I see those that have evolved from\n"
 	.string "the power of stones…\p"
 	.string "I also sense fire, water,\n"
@@ -835,18 +835,18 @@ BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve: @ 8252364
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from those three powers…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintNormal: @ 8252403
+BattleFrontier_BattlePyramidLobby_Text_HintNormal:
 	.string "I see NORMAL-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from enormously powerful moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_BelieveMyFortunesOrNot: @ 8252461
+BattleFrontier_BattlePyramidLobby_Text_BelieveMyFortunesOrNot:
 	.string "Whether you believe my fortunes\n"
 	.string "or not, the choice is yours…\p"
 	.string "The future can be changed anytime…\n"
 	.string "I wish you safe passage…$"
 
-BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning: @ 82524DA
+BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning:
 	.string "Did you know?\p"
 	.string "If you run fast, TRAINERS may notice\n"
 	.string "and come after you for a battle.\p"
@@ -854,37 +854,37 @@ BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning: @ 82524DA
 	.string "don't catch their eyes, but sneak\l"
 	.string "cautiously and quietly past them.$"
 
-BattleFrontier_BattlePyramidLobby_Text_LostLotOfItems: @ 8252595
+BattleFrontier_BattlePyramidLobby_Text_LostLotOfItems:
 	.string "Awaaaaaaarrrrgh!\p"
 	.string "I had a whole lot of items, but I lost\n"
 	.string "them all when I lost!\p"
 	.string "Awaaaaaaarrrrgh!$"
 
-BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing: @ 82525F4
+BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing:
 	.string "Welcome back!\n"
 	.string "You've done the unthinkable!\p"
 	.string "You've defeated the PYRAMID KING\n"
 	.string "and conquered the BATTLE PYRAMID!$"
 
-BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints: @ 8252662
+BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints:
 	.string "Young explorer!\n"
 	.string "In commendation of your courage,\l"
 	.string "we give you these Battle Point(s)!$"
 
-BattleFrontier_BattlePyramidLobby_Text_RulesAreListed: @ 82526B6
+BattleFrontier_BattlePyramidLobby_Text_RulesAreListed:
 	.string "The Battle Quest rules are listed.$"
 
-BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading: @ 82526D9
+BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExplainMonRules: @ 82526FC
+BattleFrontier_BattlePyramidLobby_Text_ExplainMonRules:
 	.string "When the PYRAMID is conquered,\n"
 	.string "the wild POKéMON that appear in it\l"
 	.string "are replaced by different kinds.\p"
 	.string "Explore, observe, and learn what kinds\n"
 	.string "of wild POKéMON you may encounter.$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules: @ 82527A9
+BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules:
 	.string "TRAINERS are lying in wait for you\n"
 	.string "inside the PYRAMID.\p"
 	.string "On each floor, there are up to\n"
@@ -892,7 +892,7 @@ BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules: @ 82527A9
 	.string "When you defeat a TRAINER, you will\n"
 	.string "get a helpful hint for your adventure.$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules: @ 825285A
+BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules:
 	.string "The mazes in the PYRAMID rearrange\n"
 	.string "themselves every time you enter it.\p"
 	.string "The mazes are poorly lit.\n"
@@ -900,7 +900,7 @@ BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules: @ 825285A
 	.string "The light grows brighter whenever you\n"
 	.string "defeat a wild POKéMON or a TRAINER.$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules: @ 8252924
+BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules:
 	.string "The BATTLE BAG serves as your BAG\n"
 	.string "while in the PYRAMID.\p"
 	.string "There are two separate BATTLE BAGS--\n"
diff --git a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
index 568424083..1f031ea40 100644
--- a/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
@@ -1,37 +1,37 @@
 .set LOCALID_ATTENDANT, 1
 .set LOCALID_BRANDON, 2
 
-BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
+BattleFrontier_BattlePyramidTop_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePyramidTop_OnTransition: @ 82550B6
+BattleFrontier_BattlePyramidTop_OnTransition:
 	pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidTop_OnWarp: @ 82550CE
+BattleFrontier_BattlePyramidTop_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects:: @ 82550D8
+BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	compare VAR_TEMP_C, 0
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects
 	setobjectxyperm LOCALID_BRANDON, 0, 0
-BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects:: @ 82550F3
+BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects::
 	end
 
-BattleFrontier_BattlePyramidTop_OnResume: @ 82550F4
+BattleFrontier_BattlePyramidTop_OnResume:
 	frontier_getbrainstatus
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus
 	call BattleFrontier_EventScript_SetBrainObjectGfx
-BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus:: @ 825510C
+BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus::
 	copyvar VAR_TEMP_C, VAR_RESULT
 	frontier_getstatus
 	switch VAR_TEMP_0
@@ -47,22 +47,22 @@ BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus:: @ 825510C
 	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattlePyramidTop_OnFrame: @ 825516E
+BattleFrontier_BattlePyramidTop_OnFrame:
 	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic
 	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_ShowMapName
 	.2byte 0
 
-BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic:: @ 8255180
+BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic::
 	playbgm MUS_B_PYRAMID_TOP, FALSE
 	setvar VAR_TEMP_E, 1
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_ShowMapName:: @ 825518A
+BattleFrontier_BattlePyramidTop_EventScript_ShowMapName::
 	special ShowMapNamePopup
 	setvar VAR_TEMP_F, 0
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge:: @ 8255193
+BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge::
 	pyramid_save CHALLENGE_STATUS_SAVING
 	special SavePlayerParty
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -71,7 +71,7 @@ BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge:: @ 8255193
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0
+BattleFrontier_BattlePyramidTop_EventScript_Attendant::
 	lock
 	faceplayer
 	compare VAR_TEMP_D, 0
@@ -91,25 +91,25 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0
 	playfanfare MUS_OBTAIN_B_POINTS
 	waitfanfare
 	closemessage
-BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon:: @ 825521A
+BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady:: @ 8255236
+BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady::
 	msgbox BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady, MSGBOX_DEFAULT
 	closemessage
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside:: @ 8255240
+BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside::
 	msgbox BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere, MSGBOX_DEFAULT
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside
 	setvar VAR_TEMP_D, 1
 	closemessage
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon:: @ 8255256
+BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon::
 	lockall
 	switch VAR_TEMP_C
 	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold
@@ -130,10 +130,10 @@ BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon:: @ 8255256
 	goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech:: @ 82552D0
+BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech::
 	applymovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
 	waitmovement 0
-BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: @ 82552DA
+BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver::
 	msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
 	playbgm MUS_B_PYRAMID_TOP, FALSE
@@ -141,7 +141,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: @ 82552DA
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver
 	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB
+BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver::
 	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
@@ -154,7 +154,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB
 	msgbox BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: @ 8255335
+BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
@@ -170,10 +170,10 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: @ 8255335
 	goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech:: @ 8255388
+BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech::
 	applymovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
 	waitmovement 0
-BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: @ 8255392
+BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold::
 	msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
 	playbgm MUS_B_PYRAMID_TOP, FALSE
@@ -181,7 +181,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: @ 8255392
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold
 	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3
+BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold::
 	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
@@ -194,7 +194,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3
 	msgbox BattleFrontier_BattlePyramidTop_Text_FarewellForNow, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle:: @ 82553ED
+BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle::
 	closemessage
 	setvar VAR_0x8004, SPECIAL_BATTLE_PYRAMID
 	setvar VAR_0x8005, 0
@@ -202,17 +202,17 @@ BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle:: @ 82553ED
 	waitstate
 	return
 
-BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside: @ 82553FD
+BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside:
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath: @ 8255400
+BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath:
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop: @ 8255403
+BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop:
 	walk_up
 	walk_up
 	walk_up
@@ -221,17 +221,17 @@ BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop: @ 8255403
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer: @ 825540A
+BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer:
 	walk_fast_down
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_CameraPanUp: @ 825540C
+BattleFrontier_BattlePyramidTop_Movement_CameraPanUp:
 	walk_slow_up
 	walk_slow_up
 	delay_16
 	step_end
 
-BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo: @ 8255410
+BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo:
 	.string "It is a delight to see you here!\n"
 	.string "You have reached the summit of\l"
 	.string "the BATTLE PYRAMID!\p"
@@ -242,11 +242,11 @@ BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo: @ 8255410
 	.string "Now, please!\n"
 	.string "Up you go!$"
 
-BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid: @ 82554E8
+BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid:
 	.string "The PYRAMID's new conqueror!\n"
 	.string "Let the name {PLAYER} be known!$"
 
-BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere: @ 825551F
+BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere:
 	.string "It is a delight to see you here!\p"
 	.string "Unfortunately, you were second by\n"
 	.string "a mere fraction of time!\p"
@@ -259,7 +259,7 @@ BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere: @ 825551F
 	.string "Now, please! When you are ready,\n"
 	.string "take one more step of courage!$"
 
-BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure: @ 8255669
+BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure:
 	.string "Young adventurer…\p"
 	.string "Wouldn't you agree that explorations\n"
 	.string "are the grandest of adventures?\p"
@@ -269,7 +269,7 @@ BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure: @ 8255669
 	.string "And, above all, only your own courage\n"
 	.string "to lead you through unknown worlds…$"
 
-BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon: @ 825573E
+BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon:
 	.string "Aah, yes, indeed this life is grand!\n"
 	.string "Grand, it is! Eh?\p"
 	.string "I'm BRANDON!\p"
@@ -282,25 +282,25 @@ BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon: @ 825573E
 	.string "Hahahah!\n"
 	.string "This should be exciting!$"
 
-BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle: @ 8255846
+BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle:
 	.string "Now, then!\n"
 	.string "Bring your courage to our battle!$"
 
-BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease: @ 8255873
+BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease:
 	.string "BRANDON: Hahahah! Grand it was!\n"
 	.string "Grand, yes, indeed!\p"
 	.string "Well done! You've earned recognition!\n"
 	.string "Your FRONTIER PASS, please!$"
 
-BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol: @ 82558E9
+BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol:
 	.string "The Brave Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting: @ 825591D
+BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting:
 	.string "Young explorer!\n"
 	.string "I look forward to our next meeting!$"
 
-BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned: @ 8255951
+BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned:
 	.string "BRANDON: …You've finally returned,\n"
 	.string "young explorer…\p"
 	.string "Your love of adventure seems to come\n"
@@ -314,16 +314,16 @@ BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned: @ 8255951
 	.string "Those days of death-defying,\n"
 	.string "life-affirming adventures are back…$"
 
-BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter: @ 8255A6D
+BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter:
 	.string "Now, then!\p"
 	.string "I sense my own courage is off\n"
 	.string "the meter!$"
 
-BattleFrontier_BattlePyramidTop_Text_EverythingYouHave: @ 8255AA1
+BattleFrontier_BattlePyramidTop_Text_EverythingYouHave:
 	.string "Everything you have!\n"
 	.string "I'm braced for it all!$"
 
-BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis: @ 8255ACD
+BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis:
 	.string "BRANDON: Hahahah!\n"
 	.string "Remarkable!\l"
 	.string "Yes, it's grand, indeed!\p"
@@ -331,17 +331,17 @@ BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis: @ 8255ACD
 	.string "You've bested me through and through!\n"
 	.string "Here! I want you to have this!$"
 
-BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine: @ 8255B59
+BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine:
 	.string "The Brave Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattlePyramidTop_Text_FarewellForNow: @ 8255B82
+BattleFrontier_BattlePyramidTop_Text_FarewellForNow:
 	.string "Ah, yes! It just goes to show that\n"
 	.string "I have much to learn still!\p"
 	.string "May our paths cross again!\n"
 	.string "Farewell for now, young explorer!$"
 
-BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady: @ 8255BFE
+BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady:
 	.string "Now, when you are ready, take courage\n"
 	.string "and step forward.$"
 
diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
index bfe26edb5..c909239be 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -2,25 +2,25 @@
 .set LOCALID_ATTENDANT_1, 2
 .set LOCALID_ATTENDANT_2, 3
 
-BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40
+BattleFrontier_BattleTowerBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattleTowerBattleRoom_OnWarp: @ 8241B4B
+BattleFrontier_BattleTowerBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects:: @ 8241B55
+BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
 	applymovement LOCALID_ATTENDANT_2, BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible
 	end
 
-BattleFrontier_BattleTowerBattleRoom_OnFrame: @ 8241B62
+BattleFrontier_BattleTowerBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: @ 8241B6C
+BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom::
 	setvar VAR_TEMP_0, 1
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter
 	waitmovement 0
@@ -35,7 +35,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: @ 8241B6C
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter:: @ 8241BC3
+BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter::
 	tower_setopponent
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter
@@ -46,14 +46,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter:: @ 8241BC3
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
 	switch VAR_RESULT
 	case B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattleTower_EventScript_WarpToLobbyLost:: @ 8241C03
+BattleFrontier_BattleTower_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, FANCOUNTER_USED_BATTLE_TOWER
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F
+BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	tower_setbattlewon
 	switch VAR_RESULT
@@ -72,7 +72,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F
 	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent::
 	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
@@ -90,7 +90,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F
 	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8241D0A
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge
@@ -98,7 +98,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @
 	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle:: @ 8241D40
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -107,18 +107,18 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle:: @ 8241D40
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle:: @ 8241D72
+BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge:: @ 8241D7C
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 	case YES, BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: @ 8241DAA
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -127,7 +127,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: @ 8241DAA
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: @ 8241DDC
+BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge::
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
 	waitmovement 0
@@ -135,14 +135,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: @ 8241DDC
 	waitmovement 0
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon:: @ 8241DF6
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, FANCOUNTER_USED_BATTLE_TOWER
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge:: @ 8241E22
+BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait
 	waitmessage
 	tower_save CHALLENGE_STATUS_PAUSED
@@ -152,7 +152,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge:: @ 8241E22
 	frontier_reset
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent:: @ 8241E44
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent::
 	copyvar VAR_TEMP_F, VAR_RESULT
 	switch VAR_TEMP_F
 	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent
@@ -162,41 +162,41 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent:: @ 8241E44
 	case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent
 	case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8241E90
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8241E97
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor4thOpponent:: @ 8241E9E
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor4thOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8241EA5
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor5thOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent:: @ 8241EAC
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8241EB3
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent
 	waitmessage
 	return
 
-BattleFrontier_EventScript_IncrementWinStreak:: @ 8241EBA
+BattleFrontier_EventScript_IncrementWinStreak::
 	frontier_incrementstreak
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter:: @ 8241EC3
+BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter::
 	applymovement LOCALID_ATTENDANT_2, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter
 	waitmovement 0
 	applymovement LOCALID_ATTENDANT_2, Common_Movement_WalkInPlaceLeft
@@ -213,12 +213,12 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter:: @ 8241EC
 	waitmovement 0
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext:: @ 8241F0A
+BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext::
 	compare VAR_TEMP_2, 1
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden:: @ 8241F22
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden
 	waitmessage
 	call BattleFrontier_EventScript_GetCantRecordBattle
@@ -232,7 +232,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden:: @ 8241F22
 	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: @ 8241F79
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel
@@ -240,7 +240,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: @ 8
 	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: @ 8241FAF
+BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel::
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
@@ -259,14 +259,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: @ 8241FAF
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver:: @ 8242029
+BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver::
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent, MSGBOX_DEFAULT
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver
 	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 8242046
+BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_getsymbols
 	compare VAR_RESULT, 0
@@ -280,20 +280,20 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 824204
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro:: @ 8242085
+BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold:: @ 82420B2
+BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold::
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe, MSGBOX_DEFAULT
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold
 	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF
+BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_getsymbols
 	compare VAR_RESULT, 2
@@ -307,7 +307,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle:: @ 824210E
+BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle::
 	closemessage
 	setvar VAR_TEMP_2, 0
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
@@ -322,31 +322,31 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle:: @ 824210E
 	frontier_restorehelditems
 	special HealPlayerParty
 	frontier_resetsketch
-BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle:: @ 824215A
+BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle::
 	tower_setinterviewdata
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	return
 
-BattleFrontier_EventScript_SetBrainObjectGfx:: @ 8242170
+BattleFrontier_EventScript_SetBrainObjectGfx::
 	frontier_setbrainobj
 	return
 
-BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter: @ 8242179
+BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter:
 	walk_up
 	walk_up
 	walk_up
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant: @ 824217E
+BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant:
 	face_down
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle: @ 8242180
+BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle:
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter: @ 8242182
+BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -354,21 +354,21 @@ BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter: @ 8242182
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit: @ 8242188
+BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer: @ 824218D
+BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer:
 	walk_right
 	walk_right
 	walk_right
 	walk_up
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos: @ 8242192
+BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos:
 	walk_down
 	walk_left
 	walk_left
@@ -376,11 +376,11 @@ BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos: @ 8242192
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible: @ 8242198
+BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible:
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter: @ 824219A
+BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter:
 	set_visible
 	delay_16
 	walk_up
@@ -389,21 +389,21 @@ BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter: @ 824219A
 	delay_8
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit: @ 82421A1
+BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit:
 	walk_right
 	walk_right
 	walk_down
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay: @ 82421A6
+BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay:
 	delay_16
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant: @ 82421AB
+BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant:
 	face_right
 	delay_16
 	delay_16
@@ -412,7 +412,7 @@ BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant: @ 82
 	walk_in_place_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter: @ 82421B2
+BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter:
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down
@@ -420,7 +420,7 @@ BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter: @ 82421B2
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby:: @ 82421B8
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles
@@ -432,95 +432,95 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby:: @ 82421B8
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles:: @ 82421E8
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis:: @ 82421F2
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis:: @ 82421FC
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis::
 	tower_closelink
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge:: @ 824220E
+BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge::
 	setflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE
 	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth: @ 8242217
+BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth:
 	.string "We will restore your POKéMON to\n"
 	.string "full health.$"
 
 @ Unused
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyForOpponent: @ 8242244
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyForOpponent:
 	.string "You will be facing opponent no. {STR_VAR_1}.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent: @ 8242277
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent:
 	.string "You will be facing opponent no. 2.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent: @ 82422A9
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent:
 	.string "You will be facing opponent no. 3.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent: @ 82422DB
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent:
 	.string "You will be facing opponent no. 4.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent: @ 824230D
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent:
 	.string "You will be facing opponent no. 5.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent: @ 824233F
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent:
 	.string "You will be facing opponent no. 6.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent: @ 8242371
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent:
 	.string "You will be facing opponent no. 7.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle: @ 82423A3
+BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle:
 	.string "Record your battle on your\n"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass: @ 82423CD
+BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass:
 	.string "{PLAYER}'s battle was recorded\n"
 	.string "on the FRONTIER PASS.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame: @ 82423FC
+BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame:
 	.string "Would you like to save and\n"
 	.string "quit the game?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait: @ 8242426
+BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait:
 	.string "Saving your battle data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge: @ 824244C
+BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge:
 	.string "Would you like to cancel your BATTLE\n"
 	.string "ROOM challenge?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved:: @ 8242481
+BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved::
 	.string "There was an error of some sort.\n"
 	.string "Your record could not be saved.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay: @ 82424C2
+BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay:
 	.string "Excuse me, but…\p"
 	.string "Our leader, the SALON MAIDEN, is on\n"
 	.string "her way here in hopes of battling you.\p"
 	.string "She should be arriving very shortly.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden: @ 8242542
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden:
 	.string "You will be facing the SALON MAIDEN.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel: @ 8242579
+BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel:
 	.string "Greetings…\n"
 	.string "My name is ANABEL.\p"
 	.string "I am the SALON MAIDEN, and I am in\n"
@@ -532,20 +532,20 @@ BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel: @ 8242579
 	.string "The reason I've come to see you…\n"
 	.string "Well, there is but one reason…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent: @ 824268C
+BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent:
 	.string "Let me see your talent in\n"
 	.string "its entirety…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized: @ 82426B4
+BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized:
 	.string "ANABEL: Fufufu, nicely done…\p"
 	.string "Your FRONTIER PASS, please…\n"
 	.string "Your talent shall be recognized.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol: @ 824270E
+BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol:
 	.string "The Ability Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime: @ 8242744
+BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime:
 	.string "… … … … … …\p"
 	.string "You have confidence in your POKéMON\n"
 	.string "battling talent, don't you?\p"
@@ -554,7 +554,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime: @ 8242744
 	.string "I will be waiting for you.\n"
 	.string "Until the next time we meet…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack: @ 82427F9
+BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack:
 	.string "ANABEL: You really did come back to\n"
 	.string "see me…\p"
 	.string "… … … … … …\p"
@@ -564,18 +564,18 @@ BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack: @ 82427F9
 	.string "Too long since I've been able to battle\n"
 	.string "without thinking about anything…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe: @ 82428E0
+BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe:
 	.string "Let's begin, shall we?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease: @ 82428F7
+BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease:
 	.string "ANABEL: Fufu, congratulations…\n"
 	.string "Your FRONTIER PASS, please…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine: @ 8242932
+BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine:
 	.string "The Ability Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain: @ 824295D
+BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain:
 	.string "That was fun…\p"
 	.string "I have never had a POKéMON battle\n"
 	.string "so enjoyable before…\p"
diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
index 0237e525c..c09c897e9 100644
--- a/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
@@ -1,27 +1,27 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
+BattleFrontier_BattleTowerCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattleTowerCorridor_OnLoad: @ 8241AB5
+BattleFrontier_BattleTowerCorridor_OnLoad:
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor
 	setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
 	setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
 	end
 
-BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor:: @ 8241AD3
+BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor::
 	setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
 	setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
 	end
 
-BattleFrontier_BattleTowerCorridor_OnFrame: @ 8241AE6
+BattleFrontier_BattleTowerCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: @ 8241AF0
+BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor::
 	setvar VAR_TEMP_0, 1
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor
@@ -30,25 +30,25 @@ BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: @ 8241AF0
 	waitmovement 0
 	goto BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom
 
-BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor:: @ 8241B16
+BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor
 	waitmovement 0
 
-BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom:: @ 8241B27
+BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom::
 	setvar VAR_TEMP_0, 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
 	waitstate
 	end
 
-BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor: @ 8241B36
+BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor:
 	walk_right
-BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor: @ 8241B37
+BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor:
 	walk_right
 	walk_right
-BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor: @ 8241B39
+BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor:
 	walk_right
-BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor: @ 8241B3A
+BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor:
 	walk_right
 	walk_right
 	walk_right
diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
index 8e66465b7..0021b9e84 100644
--- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB
+BattleFrontier_BattleTowerElevator_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_OnWarp
 	.byte 0
 
-BattleFrontier_BattleTowerElevator_OnFrame: @ 82419E6
+BattleFrontier_BattleTowerElevator_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_EnterElevator
 	.2byte 0
 
-BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
+BattleFrontier_BattleTowerElevator_EventScript_EnterElevator::
 	setvar VAR_TEMP_0, 1
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter
@@ -25,7 +25,7 @@ BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
 	call BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom
 	end
 
-BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom:: @ 8241A28
+BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -36,56 +36,56 @@ BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom:: @ 8241A28
 	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor:: @ 8241A55
+BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti:: @ 8241A5F
+BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti::
 	goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti:: @ 8241A72
+BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom:: @ 8241A7C
+BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 1
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_Movement_AttendantEnter: @ 8241A86
+BattleFrontier_BattleTowerElevator_Movement_AttendantEnter:
 	walk_up
 	walk_right
 	face_down
 	step_end
 
-BattleFrontier_BattleTowerElevator_Movement_PlayerEnter: @ 8241A8A
+BattleFrontier_BattleTowerElevator_Movement_PlayerEnter:
 	walk_up
 	walk_up
 	face_down
 	step_end
 
-BattleFrontier_BattleTowerElevator_Movement_AttendantExit: @ 8241A8E
+BattleFrontier_BattleTowerElevator_Movement_AttendantExit:
 	walk_down
 	walk_down
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerElevator_Movement_PlayerExit: @ 8241A92
+BattleFrontier_BattleTowerElevator_Movement_PlayerExit:
 	walk_right
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattleTowerElevator_OnWarp: @ 8241A96
+BattleFrontier_BattleTowerElevator_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth:: @ 8241AA0
+BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 5bc18e000..ab2a62043 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -5,43 +5,43 @@
 
 @ Note: LOCALID_BATTLE_TOWER_LOBBY_REPORTER is a local id for this map used elsewhere. It's defined in event_objects.h
 
-BattleFrontier_BattleTowerLobby_MapScripts:: @ 823E67B
+BattleFrontier_BattleTowerLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerLobby_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerLobby_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleTowerLobby_OnResume: @ 823E690
+BattleFrontier_BattleTowerLobby_OnResume:
 	special TryHideBattleTowerReporter
 	end
 
-BattleFrontier_BattleTowerLobby_OnTransition: @ 823E694
+BattleFrontier_BattleTowerLobby_OnTransition:
 	call BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter
 	apprentice_shouldcheckgone
 	compare VAR_0x8004, FALSE  @ Always TRUE here
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice
 	goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_HideApprentice
-BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice:: @ 823E6B5
+BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice::
 	clearflag FLAG_HIDE_APPRENTICE
 	apprentice_setgfx
-BattleFrontier_BattleTowerLobby_EventScript_EndShowOrHideApprentice:: @ 823E6C0
+BattleFrontier_BattleTowerLobby_EventScript_EndShowOrHideApprentice::
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_HideApprentice:: @ 823E6C1
+BattleFrontier_BattleTowerLobby_EventScript_HideApprentice::
 	setflag FLAG_HIDE_APPRENTICE
 	goto BattleFrontier_BattleTowerLobby_EventScript_EndShowOrHideApprentice
 
-BattleFrontier_BattleTowerLobby_OnWarp: @ 823E6C9
+BattleFrontier_BattleTowerLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth
 	.2byte 0
 
-BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth:: @ 823E6D3
+BattleFrontier_BattleTowerLobby_EventScript_PlayerFaceNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD
+BattleFrontier_BattleTowerLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleTowerLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleTowerLobby_EventScript_ResumeChallenge
@@ -49,11 +49,11 @@ BattleFrontier_BattleTowerLobby_OnFrame: @ 823E6DD
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleTowerLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattleTowerLobby_EventScript_GetChallengeStatus:: @ 823E707
+BattleFrontier_BattleTowerLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_QuitWithoutSaving:: @ 823E710
+BattleFrontier_BattleTowerLobby_EventScript_QuitWithoutSaving::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattleTowerLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
@@ -65,7 +65,7 @@ BattleFrontier_BattleTowerLobby_EventScript_QuitWithoutSaving:: @ 823E710
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_WonChallenge:: @ 823E758
+BattleFrontier_BattleTowerLobby_EventScript_WonChallenge::
 	lock
 	faceplayer
 	frontier_isbrain
@@ -75,9 +75,9 @@ BattleFrontier_BattleTowerLobby_EventScript_WonChallenge:: @ 823E758
 	waitmessage
 	goto BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons
 
-BattleFrontier_BattleTowerLobby_EventScript_DefeatedMaiden:: @ 823E778
+BattleFrontier_BattleTowerLobby_EventScript_DefeatedMaiden::
 	msgbox BattleFrontier_BattleTowerLobby_Text_CongratsDefeatedMaiden, MSGBOX_DEFAULT
-BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons:: @ 823E780
+BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons::
 	tower_giveribbons
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints
@@ -86,7 +86,7 @@ BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons:: @ 823E780
 	playfanfare MUS_OBTAIN_ITEM
 	waitfanfare
 	msgbox BattleFrontier_BattleTowerLobby_Text_PutRibbonOnMons, MSGBOX_DEFAULT
-BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints:: @ 823E7A5
+BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattleTowerLobby_Text_AwardYouTheseBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -95,23 +95,23 @@ BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints:: @ 823E7A5
 	compare VAR_RESULT, 49
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge
 	msgbox BattleFrontier_BattleTowerLobby_Text_AboutToFace50thTrainer, MSGBOX_DEFAULT
-BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge:: @ 823E7E2
+BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge::
 	msgbox BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_LostChallenge:: @ 823E7F2
+BattleFrontier_BattleTowerLobby_EventScript_LostChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak
 	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak
 	tower_get TOWER_DATA_WIN_STREAK
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying
-BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak:: @ 823E81E
+BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak::
 	tower_set TOWER_DATA_WIN_STREAK_ACTIVE, FALSE
-BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying:: @ 823E830
+BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying::
 	lock
 	faceplayer
 	message BattleFrontier_BattleTowerLobby_Text_ThankYouForPlaying
@@ -123,7 +123,7 @@ BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying:: @ 823E830
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle:: @ 823E84D
+BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle::
 	message BattleFrontier_BattleTowerLobby_Text_RecordWillBeSaved
 	waitmessage
 	frontier_checkairshow
@@ -143,7 +143,7 @@ BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle:: @ 823E84D
 	case 0, BattleFrontier_EventScript_SaveBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle
 
-BattleFrontier_EventScript_SaveBattle:: @ 823E8B4
+BattleFrontier_EventScript_SaveBattle::
 	frontier_savebattle
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_EventScript_BattleSaveFailed
@@ -151,16 +151,16 @@ BattleFrontier_EventScript_SaveBattle:: @ 823E8B4
 	msgbox BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle
 
-BattleFrontier_EventScript_BattleSaveFailed:: @ 823E8D7
+BattleFrontier_EventScript_BattleSaveFailed::
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved, MSGBOX_DEFAULT
-BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle:: @ 823E8DF
+BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle::
 	return
 
-BattleFrontier_EventScript_GetCantRecordBattle:: @ 823E8E0
+BattleFrontier_EventScript_GetCantRecordBattle::
 	frontier_get FRONTIER_DATA_RECORD_DISABLED
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_ResumeChallenge:: @ 823E8EE
+BattleFrontier_BattleTowerLobby_EventScript_ResumeChallenge::
 	lock
 	faceplayer
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
@@ -176,17 +176,17 @@ BattleFrontier_BattleTowerLobby_EventScript_ResumeChallenge:: @ 823E8EE
 	goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_SetBravoTrainerOn:: @ 823E930
+BattleFrontier_BattleTowerLobby_EventScript_SetBravoTrainerOn::
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, TRUE
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_SinglesAttendant:: @ 823E936
+BattleFrontier_BattleTowerLobby_EventScript_SinglesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_WelcomSingleBattle, MSGBOX_DEFAULT
-BattleFrontier_BattleTowerLobby_EventScript_AskEnterSinglesChallenge:: @ 823E948
+BattleFrontier_BattleTowerLobby_EventScript_AskEnterSinglesChallenge::
 	message BattleFrontier_BattleTowerLobby_Text_TakeSinglesChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -196,7 +196,7 @@ BattleFrontier_BattleTowerLobby_EventScript_AskEnterSinglesChallenge:: @ 823E948
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge:: @ 823E984
+BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge::
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode
 	waitmessage
@@ -223,7 +223,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge:: @ 823E984
 	case YES, BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeSinglesChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
 
-BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeSinglesChallenge:: @ 823EA2A
+BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeSinglesChallenge::
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
 	tower_init
@@ -241,18 +241,18 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeSinglesChallenge:: @ 823EA
 	goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ExplainSinglesChallenge:: @ 823EA91
+BattleFrontier_BattleTowerLobby_EventScript_ExplainSinglesChallenge::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ExplainSinglesChallenge, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_AskEnterSinglesChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_DoublesAttendant:: @ 823EA9F
+BattleFrontier_BattleTowerLobby_EventScript_DoublesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_WelcomeDoubleBattle, MSGBOX_DEFAULT
-BattleFrontier_BattleTowerLobby_EventScript_AskEnterDoublesChallenge:: @ 823EAB1
+BattleFrontier_BattleTowerLobby_EventScript_AskEnterDoublesChallenge::
 	message BattleFrontier_BattleTowerLobby_Text_TakeDoublesChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -262,7 +262,7 @@ BattleFrontier_BattleTowerLobby_EventScript_AskEnterDoublesChallenge:: @ 823EAB1
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge:: @ 823EAED
+BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge::
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode
 	waitmessage
@@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge:: @ 823EAED
 	case YES, BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeDoublesChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
 
-BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeDoublesChallenge:: @ 823EB93
+BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeDoublesChallenge::
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
 	tower_init
@@ -307,19 +307,19 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeDoublesChallenge:: @ 823EB
 	goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ExplainDoublesChallenge:: @ 823EBFA
+BattleFrontier_BattleTowerLobby_EventScript_ExplainDoublesChallenge::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ExplainDoublesChallenge, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_AskEnterDoublesChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_MultisAttendant:: @ 823EC08
+BattleFrontier_BattleTowerLobby_EventScript_MultisAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER
 	clearflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_WelcomeMultiBattle, MSGBOX_DEFAULT
-BattleFrontier_BattleTowerLobby_EventScript_AskEnterMultisChallenge:: @ 823EC1D
+BattleFrontier_BattleTowerLobby_EventScript_AskEnterMultisChallenge::
 	message BattleFrontier_BattleTowerLobby_Text_TakeMultisChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -329,7 +329,7 @@ BattleFrontier_BattleTowerLobby_EventScript_AskEnterMultisChallenge:: @ 823EC1D
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge:: @ 823EC59
+BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge::
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode
 	waitmessage
@@ -356,7 +356,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge:: @ 823EC59
 	case YES, BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeMultisChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
 
-BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeMultisChallenge:: @ 823ECFF
+BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeMultisChallenge::
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
 	tower_init
@@ -374,18 +374,18 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeMultisChallenge:: @ 823ECF
 	goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ExplainMultisChallenge:: @ 823ED66
+BattleFrontier_BattleTowerLobby_EventScript_ExplainMultisChallenge::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ExplainMultisChallenge, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_AskEnterMultisChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_LinkMultisAttendant:: @ 823ED74
+BattleFrontier_BattleTowerLobby_EventScript_LinkMultisAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_TOWER
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_WelcomeLinkMultiBattle, MSGBOX_DEFAULT
-BattleFrontier_BattleTowerLobby_EventScript_AskEnterLinkMultisChallenge:: @ 823ED86
+BattleFrontier_BattleTowerLobby_EventScript_AskEnterLinkMultisChallenge::
 	message BattleFrontier_BattleTowerLobby_Text_TakeLinkMultisChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -395,7 +395,7 @@ BattleFrontier_BattleTowerLobby_EventScript_AskEnterLinkMultisChallenge:: @ 823E
 	case 2, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge:: @ 823EDC2
+BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge::
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	message BattleFrontier_BattleTowerLobby_Text_WhichLevelMode
 	waitmessage
@@ -422,7 +422,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge:: @ 823E
 	case YES, BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
 
-BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge:: @ 823EE68
+BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge::
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_TEMP_0, 0
 	tower_init
@@ -443,7 +443,7 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge:: @ 82
 	goto BattleFrontier_BattleTowerLobby_EventScript_TryCableLink
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_FeelingsMan:: @ 823EEE7
+BattleFrontier_BattleTowerLobby_EventScript_FeelingsMan::
 	lock
 	faceplayer
 	message BattleFrontier_BattleTowerLobby_Text_DescribeFeelingsAboutBattleTower
@@ -458,7 +458,7 @@ BattleFrontier_BattleTowerLobby_EventScript_FeelingsMan:: @ 823EEE7
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_FeelingsBattleNow:: @ 823EF32
+BattleFrontier_BattleTowerLobby_EventScript_FeelingsBattleNow::
 	msgbox BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouBegin, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_START
 	call Common_ShowEasyChatScreen
@@ -467,7 +467,7 @@ BattleFrontier_BattleTowerLobby_EventScript_FeelingsBattleNow:: @ 823EF32
 	goto BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_FeelingsIWon:: @ 823EF4C
+BattleFrontier_BattleTowerLobby_EventScript_FeelingsIWon::
 	msgbox BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouveWon, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_WON
 	call Common_ShowEasyChatScreen
@@ -476,7 +476,7 @@ BattleFrontier_BattleTowerLobby_EventScript_FeelingsIWon:: @ 823EF4C
 	goto BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_FeelingsILost:: @ 823EF66
+BattleFrontier_BattleTowerLobby_EventScript_FeelingsILost::
 	msgbox BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouveLost, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_BATTLE_LOST
 	call Common_ShowEasyChatScreen
@@ -485,37 +485,37 @@ BattleFrontier_BattleTowerLobby_EventScript_FeelingsILost:: @ 823EF66
 	goto BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_FeelingsWontTell:: @ 823EF80
+BattleFrontier_BattleTowerLobby_EventScript_FeelingsWontTell::
 	msgbox BattleFrontier_BattleTowerLobby_Text_DontThinkMuchAboutIt, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings:: @ 823EF8A
+BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings::
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CanceledEasyChat
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_SubmittedFeelings
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_CanceledEasyChat:: @ 823EFA1
+BattleFrontier_BattleTowerLobby_EventScript_CanceledEasyChat::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ChangedYourMind, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_SubmittedFeelings:: @ 823EFAB
+BattleFrontier_BattleTowerLobby_EventScript_SubmittedFeelings::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ThatsHowYouFeel, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_Woman:: @ 823EFB5
+BattleFrontier_BattleTowerLobby_EventScript_Woman::
 	msgbox BattleFrontier_BattleTowerLobby_Text_WinsInRowRecorded, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_Boy:: @ 823EFBE
+BattleFrontier_BattleTowerLobby_EventScript_Boy::
 	msgbox BattleFrontier_BattleTowerLobby_Text_CanLeaveUntilLossOrSevenWins, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ShowSinglesResults:: @ 823EFC7
+BattleFrontier_BattleTowerLobby_EventScript_ShowSinglesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_SINGLES
 	waitbuttonpress
@@ -523,7 +523,7 @@ BattleFrontier_BattleTowerLobby_EventScript_ShowSinglesResults:: @ 823EFC7
 	releaseall
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ShowDoublesResults:: @ 823EFE0
+BattleFrontier_BattleTowerLobby_EventScript_ShowDoublesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
@@ -531,7 +531,7 @@ BattleFrontier_BattleTowerLobby_EventScript_ShowDoublesResults:: @ 823EFE0
 	releaseall
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ShowMultisResults:: @ 823EFF9
+BattleFrontier_BattleTowerLobby_EventScript_ShowMultisResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_MULTIS
 	waitbuttonpress
@@ -539,7 +539,7 @@ BattleFrontier_BattleTowerLobby_EventScript_ShowMultisResults:: @ 823EFF9
 	releaseall
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ShowLinkMultisResults:: @ 823F012
+BattleFrontier_BattleTowerLobby_EventScript_ShowLinkMultisResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_TOWER, FRONTIER_MODE_LINK_MULTIS
 	waitbuttonpress
@@ -547,12 +547,12 @@ BattleFrontier_BattleTowerLobby_EventScript_ShowLinkMultisResults:: @ 823F012
 	releaseall
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons:: @ 823F02B
+BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50:: @ 823F046
+BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50::
 	switch VAR_FRONTIER_BATTLE_MODE
 	case FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Singles
 	case FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Doubles
@@ -560,17 +560,17 @@ BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50:: @ 823F046
 	goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Singles:: @ 823F06F
+BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Singles::
 	msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Singles, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Doubles:: @ 823F07D
+BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Doubles::
 	msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Doubles, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 823F08B
+BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpen::
 	switch VAR_FRONTIER_BATTLE_MODE
 	case FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenSingles
 	case FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenDoubles
@@ -578,37 +578,37 @@ BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 823F08B
 	goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenSingles:: @ 823F0B4
+BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenSingles::
 	msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenSingles, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenDoubles:: @ 823F0C2
+BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenDoubles::
 	msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenDoubles, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed:: @ 823F0D0
+BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS  @ No status provided, so it relies on VAR_0x8006 being 0 already
 	goto BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge:: @ 823F0E3
+BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge:: @ 823F0E6
+BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge::
 	special CloseLink
 	msgbox BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge, MSGBOX_DEFAULT
-BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge:: @ 823F0F1
+BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_EnterElevator:: @ 823F0F3
+BattleFrontier_BattleTowerLobby_EventScript_EnterElevator::
 	special SavePlayerParty
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_PARTY_ORDER
 	call BattleFrontier_BattleTowerLobby_EventScript_GetPartySize
 	special CallFrontierUtilFunc
 	setvar VAR_RESULT, 0
-BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad:: @ 823F108
+BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad::
 	tower_loadlinkopponents
 	delay 1
 	compare VAR_RESULT, 6
@@ -620,18 +620,18 @@ BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad:: @ 823F108
 	waitstate
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ShowYouToBattleRoom:: @ 823F135
+BattleFrontier_BattleTowerLobby_EventScript_ShowYouToBattleRoom::
 	call BattleFrontier_BattleTowerLobby_EventScript_BufferModeText
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ShowYouToLinkMultiBattleRoom
 	msgbox BattleFrontier_BattleTowerLobby_Text_ShowYouToBattleRoom, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_WalkToElevator
 
-BattleFrontier_BattleTowerLobby_EventScript_ShowYouToLinkMultiBattleRoom:: @ 823F152
+BattleFrontier_BattleTowerLobby_EventScript_ShowYouToLinkMultiBattleRoom::
 	messageautoscroll BattleFrontier_BattleTowerLobby_Text_ShowYouToBattleRoom
 	waitmessage
 	delay 48
-BattleFrontier_BattleTowerLobby_EventScript_WalkToElevator:: @ 823F15B
+BattleFrontier_BattleTowerLobby_EventScript_WalkToElevator::
 	closemessage
 	call BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo
 	call BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord
@@ -647,25 +647,25 @@ BattleFrontier_BattleTowerLobby_EventScript_WalkToElevator:: @ 823F15B
 	waitdooranim
 	return
 
-BattleFrontier_BattleTowerLobby_Movement_WalkToElevator: @ 823F195
+BattleFrontier_BattleTowerLobby_Movement_WalkToElevator:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleTowerLobby_Movement_AttendantEnterElevator: @ 823F199
+BattleFrontier_BattleTowerLobby_Movement_AttendantEnterElevator:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerLobby_Movement_PlayerEnterElevator: @ 823F19C
+BattleFrontier_BattleTowerLobby_Movement_PlayerEnterElevator:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Movement_UnusedEnterElevator: @ 823F1A0
+BattleFrontier_BattleTowerLobby_Movement_UnusedEnterElevator:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -674,7 +674,7 @@ BattleFrontier_BattleTowerLobby_Movement_UnusedEnterElevator: @ 823F1A0
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerLobby_EventScript_BufferModeText:: @ 823F1A7
+BattleFrontier_BattleTowerLobby_EventScript_BufferModeText::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_BufferTextSingle
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -685,23 +685,23 @@ BattleFrontier_BattleTowerLobby_EventScript_BufferModeText:: @ 823F1A7
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_BufferTextLinkMulti
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_BufferTextSingle:: @ 823F1D4
+BattleFrontier_BattleTowerLobby_EventScript_BufferTextSingle::
 	bufferstdstring 0, STDSTRING_SINGLE
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_BufferTextDouble:: @ 823F1D9
+BattleFrontier_BattleTowerLobby_EventScript_BufferTextDouble::
 	bufferstdstring 0, STDSTRING_DOUBLE
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_BufferTextMulti:: @ 823F1DE
+BattleFrontier_BattleTowerLobby_EventScript_BufferTextMulti::
 	bufferstdstring 0, STDSTRING_MULTI
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_BufferTextLinkMulti:: @ 823F1E3
+BattleFrontier_BattleTowerLobby_EventScript_BufferTextLinkMulti::
 	bufferstdstring 0, STDSTRING_MULTI_LINK
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo:: @ 823F1E8
+BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_TalkedToSinglesAttendant
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -712,23 +712,23 @@ BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo:: @ 823F1E8
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_TalkedToLinkMultisAttendant
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_TalkedToSinglesAttendant:: @ 823F215
+BattleFrontier_BattleTowerLobby_EventScript_TalkedToSinglesAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_SINGLES
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_TalkedToDoublesAttendant:: @ 823F21B
+BattleFrontier_BattleTowerLobby_EventScript_TalkedToDoublesAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_DOUBLES
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_TalkedToMultisAttendant:: @ 823F221
+BattleFrontier_BattleTowerLobby_EventScript_TalkedToMultisAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_MULTIS
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_TalkedToLinkMultisAttendant:: @ 823F227
+BattleFrontier_BattleTowerLobby_EventScript_TalkedToLinkMultisAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_LINK_MULTIS
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord:: @ 823F22D
+BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordSingles
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -739,23 +739,23 @@ BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord:: @ 823F22D
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordLinkMultis
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordSingles:: @ 823F25A
+BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordSingles::
 	setvar VAR_0x8004, 6
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordDoubles:: @ 823F260
+BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordDoubles::
 	setvar VAR_0x8004, 10
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordMultis:: @ 823F266
+BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordMultis::
 	setvar VAR_0x8004, 14
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordLinkMultis:: @ 823F26C
+BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordLinkMultis::
 	setvar VAR_0x8004, 18
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_GetPartySize:: @ 823F272
+BattleFrontier_BattleTowerLobby_EventScript_GetPartySize::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetSinglesPartySize
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -766,27 +766,27 @@ BattleFrontier_BattleTowerLobby_EventScript_GetPartySize:: @ 823F272
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetLinkMultisPartySize
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_GetSinglesPartySize:: @ 823F29F
+BattleFrontier_BattleTowerLobby_EventScript_GetSinglesPartySize::
 	setvar VAR_0x8005, FRONTIER_PARTY_SIZE
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_GetDoublesPartySize:: @ 823F2A5
+BattleFrontier_BattleTowerLobby_EventScript_GetDoublesPartySize::
 	setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_GetMultisPartySize:: @ 823F2AB
+BattleFrontier_BattleTowerLobby_EventScript_GetMultisPartySize::
 	setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_GetLinkMultisPartySize:: @ 823F2B1
+BattleFrontier_BattleTowerLobby_EventScript_GetLinkMultisPartySize::
 	setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
 	return
 
-BattleFrontier_EventScript_GetLvlMode:: @ 823F2B7
+BattleFrontier_EventScript_GetLvlMode::
 	frontier_get FRONTIER_DATA_LVL_MODE
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_TryCableLink:: @ 823F2C5
+BattleFrontier_BattleTowerLobby_EventScript_TryCableLink::
 	setvar VAR_0x8004, USING_BATTLE_TOWER
 	message gText_PleaseWaitForLink
 	waitmessage
@@ -809,7 +809,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryCableLink:: @ 823F2C5
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLink
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections:: @ 823F327
+BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections::
 	special CloseLink
 	compare VAR_0x8005, 3
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_FriendDifferentSelection
@@ -817,20 +817,20 @@ BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections:: @ 823
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_FriendDifferentSelection:: @ 823F33F
+BattleFrontier_BattleTowerLobby_EventScript_FriendDifferentSelection::
 	msgbox BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlMode, MSGBOX_DEFAULT
 	msgbox BattleFrontier_BattleTowerLobby_Text_ChooseDifferentMonsMatchLvlMode, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_AbortLinkIncorrectNumberOfPlayers:: @ 823F351
+BattleFrontier_BattleTowerLobby_EventScript_AbortLinkIncorrectNumberOfPlayers::
 	msgbox BattleFrontier_BattleTowerLobby_Text_LinkMultiOnlyForTwoPlayers, MSGBOX_DEFAULT
 	special CloseLink
 	msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_AbortLink:: @ 823F366
+BattleFrontier_BattleTowerLobby_EventScript_AbortLink::
 	special CloseLink
 	compare VAR_0x8005, 0
 	call_if_eq BattleFrontier_BattleTowerLobby_EventScript_FriendChoseDifferentLvlMode
@@ -842,19 +842,19 @@ BattleFrontier_BattleTowerLobby_EventScript_AbortLink:: @ 823F366
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_FriendChoseDifferentLvlMode:: @ 823F394
+BattleFrontier_BattleTowerLobby_EventScript_FriendChoseDifferentLvlMode::
 	msgbox BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlMode, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMon:: @ 823F39D
+BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMon::
 	msgbox BattleFrontier_BattleTowerLobby_Text_FriendAlsoSelectedMon, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMons:: @ 823F3A6
+BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMons::
 	msgbox BattleFrontier_BattleTowerLobby_Text_FriendAlsoSelectedMons, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful:: @ 823F3AF
+BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful::
 	incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, FALSE
 	message BattleFrontier_BattleTowerLobby_Text_SaveGameBeforeShowingIn
@@ -868,17 +868,17 @@ BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful:: @ 823F3AF
 	goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ExplainLinkMultisChallenge:: @ 823F3DA
+BattleFrontier_BattleTowerLobby_EventScript_ExplainLinkMultisChallenge::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ExplainLinkMultisChallenge, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_AskEnterLinkMultisChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink:: @ 823F3E8
+BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink::
 	setvar VAR_0x8004, LINK_GROUP_BATTLE_TOWER
 	goto BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader:: @ 823F3F3
+BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader::
 	message CableClub_Text_ChooseGroupLeaderOfTwo
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, FALSE
@@ -889,7 +889,7 @@ BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader:: @ 823F3F3
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader:: @ 823F430
+BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader::
 	call CableClub_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful
@@ -902,7 +902,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader:: @ 823F430
 	release
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup:: @ 823F463
+BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup::
 	call CableClub_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful
@@ -915,7 +915,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup:: @ 823F463
 	release
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful:: @ 823F496
+BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful::
 	incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, FALSE
 	message BattleFrontier_BattleTowerLobby_Text_SaveGameBeforeShowingIn
@@ -928,13 +928,13 @@ BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful:: @ 823F496
 	goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_RulesBoard:: @ 823F4BE
+BattleFrontier_BattleTowerLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattleTowerLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard:: @ 823F4CD
+BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattleTowerLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 2, MULTI_BATTLE_TOWER_RULES, FALSE
@@ -947,79 +947,79 @@ BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard:: @ 823F4CD
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_RulesTower:: @ 823F520
+BattleFrontier_BattleTowerLobby_EventScript_RulesTower::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ExplainTowerRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_RulesMons:: @ 823F52E
+BattleFrontier_BattleTowerLobby_EventScript_RulesMons::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ExplainMonRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_RulesSalon:: @ 823F53C
+BattleFrontier_BattleTowerLobby_EventScript_RulesSalon::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ExplainSalonRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_RulesMultiLink:: @ 823F54A
+BattleFrontier_BattleTowerLobby_EventScript_RulesMultiLink::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ExplainMultiLinkRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ExitRules:: @ 823F558
+BattleFrontier_BattleTowerLobby_EventScript_ExitRules::
 	releaseall
 	end
 
 @ Unused
-BattleFrontier_BattleTowerLobby_EventScript_DirectYouToBattleRoom: @ 823F55A
+BattleFrontier_BattleTowerLobby_EventScript_DirectYouToBattleRoom:
 	.string "I'll direct you to your BATTLE ROOM now.$"
 
-BattleFrontier_BattleTowerLobby_Text_DidntSaveBeforeQuitting: @ 823F583
+BattleFrontier_BattleTowerLobby_Text_DidntSaveBeforeQuitting:
 	.string "Excuse me!\p"
 	.string "You didn't save before you quit your\n"
 	.string "challenge last time.\p"
 	.string "Because of that, your challenge so far\n"
 	.string "has been disqualified. Sorry!$"
 
-BattleFrontier_BattleTowerLobby_Text_CongratsBeatenSeven: @ 823F60D
+BattleFrontier_BattleTowerLobby_Text_CongratsBeatenSeven:
 	.string "Congratulations!\n"
 	.string "You've beaten all seven TRAINERS!\p"
 	.string "$"
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Text_EarnedFabulousPrize: @ 823F641
+BattleFrontier_BattleTowerLobby_Text_EarnedFabulousPrize:
 	.string "For beating seven TRAINERS in a row,\n"
 	.string "you have earned this fabulous prize!\p"
 	.string "$"
 
-BattleFrontier_BattleTowerLobby_Text_ReceivedPrize: @ 823F68C
+BattleFrontier_BattleTowerLobby_Text_ReceivedPrize:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Text_BagFullMakeRoom: @ 823F6A6
+BattleFrontier_BattleTowerLobby_Text_BagFullMakeRoom:
 	.string "Oh, your BAG appears to be full.\p"
 	.string "Please make room in your BAG, then come\n"
 	.string "see me.$"
 
-BattleFrontier_BattleTowerLobby_Text_ThankYouForPlaying: @ 823F6F7
+BattleFrontier_BattleTowerLobby_Text_ThankYouForPlaying:
 	.string "Thank you for playing!\p"
 	.string "$"
 
-BattleFrontier_BattleTowerLobby_Text_RecordWillBeSaved: @ 823F70F
+BattleFrontier_BattleTowerLobby_Text_RecordWillBeSaved:
 	.string "Your record will be saved.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleTowerLobby_Text_WeveBeenWaitingForYou: @ 823F737
+BattleFrontier_BattleTowerLobby_Text_WeveBeenWaitingForYou:
 	.string "We've been waiting for you!\p"
 	.string "$"
 
-BattleFrontier_BattleTowerLobby_Text_ProgressWillBeSaved: @ 823F754
+BattleFrontier_BattleTowerLobby_Text_ProgressWillBeSaved:
 	.string "Before entering a BATTLE ROOM, your\n"
 	.string "progress will be saved. Please wait.$"
 
-BattleFrontier_BattleTowerLobby_Text_AboutToFace50thTrainer: @ 823F79D
+BattleFrontier_BattleTowerLobby_Text_AboutToFace50thTrainer:
 	.string "You're finally about to face the\n"
 	.string "50th TRAINER.\p"
 	.string "From here on, every time you beat seven\n"
@@ -1027,54 +1027,54 @@ BattleFrontier_BattleTowerLobby_Text_AboutToFace50thTrainer: @ 823F79D
 	.string "receive a commemorative RIBBON.\p"
 	.string "Good luck!$"
 
-BattleFrontier_BattleTowerLobby_Text_HereAreSomeRibbons: @ 823F844
+BattleFrontier_BattleTowerLobby_Text_HereAreSomeRibbons:
 	.string "Here are some RIBBONS for beating\n"
 	.string "seven tough TRAINERS in a row.\p"
 	.string "{PLAYER} received some RIBBONS!$"
 
-BattleFrontier_BattleTowerLobby_Text_PutRibbonOnMons: @ 823F89F
+BattleFrontier_BattleTowerLobby_Text_PutRibbonOnMons:
 	.string "{PLAYER} put the RIBBONS on\n"
 	.string "the challenger POKéMON.$"
 
-BattleFrontier_BattleTowerLobby_Text_DescribeFeelingsAboutBattleTower: @ 823F8CD
+BattleFrontier_BattleTowerLobby_Text_DescribeFeelingsAboutBattleTower:
 	.string "Excuse me, do you have a moment?\p"
 	.string "Can you describe your feelings when\n"
 	.string "you're about to begin a BATTLE TOWER\l"
 	.string "match, or when you've either won or\l"
 	.string "lost a match?$"
 
-BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouBegin: @ 823F969
+BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouBegin:
 	.string "Okay, what are your feelings when\n"
 	.string "you're about to begin a match?$"
 
-BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouveWon: @ 823F9AA
+BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouveWon:
 	.string "What do you feel when you've won\n"
 	.string "a match?$"
 
-BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouveLost: @ 823F9D4
+BattleFrontier_BattleTowerLobby_Text_FeelWhatWhenYouveLost:
 	.string "Can I hear about your feelings when\n"
 	.string "you have lost a match?$"
 
-BattleFrontier_BattleTowerLobby_Text_DontThinkMuchAboutIt: @ 823FA0F
+BattleFrontier_BattleTowerLobby_Text_DontThinkMuchAboutIt:
 	.string "Oh, so you don't think much about it?\n"
 	.string "You're one cool customer.$"
 
-BattleFrontier_BattleTowerLobby_Text_ChangedYourMind: @ 823FA4F
+BattleFrontier_BattleTowerLobby_Text_ChangedYourMind:
 	.string "Hunh? You changed your mind?\n"
 	.string "I guess you're fickle.$"
 
-BattleFrontier_BattleTowerLobby_Text_ThatsHowYouFeel: @ 823FA83
+BattleFrontier_BattleTowerLobby_Text_ThatsHowYouFeel:
 	.string "Okay, so that's how you feel?\n"
 	.string "That's quite original.\p"
 	.string "Thanks!$"
 
-BattleFrontier_BattleTowerLobby_Text_WinsInRowRecorded: @ 823FAC0
+BattleFrontier_BattleTowerLobby_Text_WinsInRowRecorded:
 	.string "The number of matches you win in a row\n"
 	.string "is recorded.\p"
 	.string "I'd better not get beaten in\n"
 	.string "an embarrassing way!$"
 
-BattleFrontier_BattleTowerLobby_Text_CanLeaveUntilLossOrSevenWins: @ 823FB26
+BattleFrontier_BattleTowerLobby_Text_CanLeaveUntilLossOrSevenWins:
 	.string "Once you've entered the BATTLE TOWER,\n"
 	.string "you can't leave until you either lose\l"
 	.string "or you beat seven TRAINERS in a row.\p"
@@ -1082,7 +1082,7 @@ BattleFrontier_BattleTowerLobby_Text_CanLeaveUntilLossOrSevenWins: @ 823FB26
 	.string "to the challenge.$"
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Text_DoubleBattleRoomConstruction: @ 823FBCE
+BattleFrontier_BattleTowerLobby_Text_DoubleBattleRoomConstruction:
 	.string "Welcome to the BATTLE TOWER\n"
 	.string "DOUBLE BATTLE CORNER!\p"
 	.string "Unfortunately, the BATTLE ROOMS\n"
@@ -1091,7 +1091,7 @@ BattleFrontier_BattleTowerLobby_Text_DoubleBattleRoomConstruction: @ 823FBCE
 	.string "is completed.$"
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Text_MultiBattleRoomConstruction: @ 823FC6B
+BattleFrontier_BattleTowerLobby_Text_MultiBattleRoomConstruction:
 	.string "Welcome to the BATTLE TOWER\n"
 	.string "MULTI BATTLE CORNER!\p"
 	.string "Unfortunately, the BATTLE ROOMS\n"
@@ -1099,34 +1099,34 @@ BattleFrontier_BattleTowerLobby_Text_MultiBattleRoomConstruction: @ 823FC6B
 	.string "Please come back when the work\n"
 	.string "is completed.$"
 
-BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge: @ 823FD07
+BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge:
 	.string "We look forward to seeing you on\n"
 	.string "another challenge!$"
 
-BattleFrontier_BattleTowerLobby_Text_WhichLevelMode: @ 823FD3B
+BattleFrontier_BattleTowerLobby_Text_WhichLevelMode:
 	.string "The BATTLE ROOM offers two levels\n"
 	.string "of challenge, Level 50 and Open Level.\l"
 	.string "Which is your choice?$"
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Text_PleaseSelectMons: @ 823FD9A
+BattleFrontier_BattleTowerLobby_Text_PleaseSelectMons:
 	.string "Please select the POKéMON you wish\n"
 	.string "to enter.$"
 
-BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering: @ 823FDC7
+BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering:
 	.string "Before entering a BATTLE ROOM, your\n"
 	.string "progress must be saved. Is that okay?$"
 
-BattleFrontier_BattleTowerLobby_Text_ShowYouToBattleRoom: @ 823FE11
+BattleFrontier_BattleTowerLobby_Text_ShowYouToBattleRoom:
 	.string "I will now show you to the\n"
 	.string "{STR_VAR_1} BATTLE ROOM.$"
 
-BattleFrontier_BattleTowerLobby_Text_RecordLastMatch: @ 823FE3C
+BattleFrontier_BattleTowerLobby_Text_RecordLastMatch:
 	.string "Shall I record your last BATTLE TOWER\n"
 	.string "match on your FRONTIER PASS?$"
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50: @ 823FE7F
+BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50:
 	.string "Excuse me!\p"
 	.string "You don't have {STR_VAR_2} eligible POKéMON.\p"
 	.string "You must have {STR_VAR_2} different POKéMON\n"
@@ -1137,7 +1137,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50: @ 823FE7F
 	.string "Please come see me when you are ready.$"
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpen: @ 823FF5D
+BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "Excuse me!\p"
 	.string "You don't have {STR_VAR_2} eligible POKéMON.\p"
 	.string "You must have {STR_VAR_2} different POKéMON\n"
@@ -1147,7 +1147,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpen: @ 823FF5D
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Singles: @ 8240027
+BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Singles:
 	.string "Excuse me!\p"
 	.string "You don't have three eligible POKéMON.\p"
 	.string "You must have three different POKéMON\n"
@@ -1157,7 +1157,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Singles: @ 8240027
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenSingles: @ 824010B
+BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenSingles:
 	.string "Excuse me!\p"
 	.string "You don't have three eligible POKéMON.\p"
 	.string "You must have three different POKéMON\n"
@@ -1167,7 +1167,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenSingles: @ 824010B
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Doubles: @ 82401DB
+BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Doubles:
 	.string "Excuse me!\p"
 	.string "You don't have four eligible POKéMON.\p"
 	.string "You must have four different POKéMON\n"
@@ -1177,7 +1177,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Doubles: @ 82401DB
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenDoubles: @ 82402BD
+BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenDoubles:
 	.string "Excuse me!\p"
 	.string "You don't have four eligible POKéMON.\p"
 	.string "You must have four different POKéMON\n"
@@ -1187,7 +1187,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenDoubles: @ 82402BD
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Multis: @ 824038B
+BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Multis:
 	.string "Excuse me!\p"
 	.string "You don't have two eligible POKéMON.\p"
 	.string "You must have two different POKéMON\n"
@@ -1197,7 +1197,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Multis: @ 824038B
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenMultis: @ 824046B
+BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenMultis:
 	.string "Excuse me!\p"
 	.string "You don't have two eligible POKéMON.\p"
 	.string "You must have two different POKéMON\n"
@@ -1207,18 +1207,18 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenMultis: @ 824046B
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleTowerLobby_Text_WelcomSingleBattle: @ 8240537
+BattleFrontier_BattleTowerLobby_Text_WelcomSingleBattle:
 	.string "Where the talents of TRAINERS\n"
 	.string "are put to the test!\p"
 	.string "Welcome to the BATTLE TOWER!\p"
 	.string "I am your guide to the SINGLE\n"
 	.string "BATTLE ROOMS.$"
 
-BattleFrontier_BattleTowerLobby_Text_TakeSinglesChallenge: @ 82405B3
+BattleFrontier_BattleTowerLobby_Text_TakeSinglesChallenge:
 	.string "Would you like to take the SINGLE\n"
 	.string "BATTLE ROOM challenge?$"
 
-BattleFrontier_BattleTowerLobby_Text_ExplainSinglesChallenge: @ 82405EC
+BattleFrontier_BattleTowerLobby_Text_ExplainSinglesChallenge:
 	.string "The BATTLE TOWER's SINGLE BATTLE\n"
 	.string "ROOMS are facilities for conducting\l"
 	.string "SINGLE BATTLES with three POKéMON.\p"
@@ -1233,22 +1233,22 @@ BattleFrontier_BattleTowerLobby_Text_ExplainSinglesChallenge: @ 82405EC
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleTowerLobby_Text_SelectThreeMons: @ 82407A6
+BattleFrontier_BattleTowerLobby_Text_SelectThreeMons:
 	.string "Now please select the three POKéMON\n"
 	.string "that are to be entered.$"
 
-BattleFrontier_BattleTowerLobby_Text_WelcomeDoubleBattle: @ 82407E2
+BattleFrontier_BattleTowerLobby_Text_WelcomeDoubleBattle:
 	.string "Where the talents of TRAINERS\n"
 	.string "are put to the test!\p"
 	.string "Welcome to the BATTLE TOWER!\p"
 	.string "I am your guide to the DOUBLE\n"
 	.string "BATTLE ROOMS.$"
 
-BattleFrontier_BattleTowerLobby_Text_TakeDoublesChallenge: @ 824085E
+BattleFrontier_BattleTowerLobby_Text_TakeDoublesChallenge:
 	.string "Would you like to take the DOUBLE\n"
 	.string "BATTLE ROOM challenge?$"
 
-BattleFrontier_BattleTowerLobby_Text_ExplainDoublesChallenge: @ 8240897
+BattleFrontier_BattleTowerLobby_Text_ExplainDoublesChallenge:
 	.string "The BATTLE TOWER's DOUBLE BATTLE\n"
 	.string "ROOMS are facilities for conducting\l"
 	.string "DOUBLE BATTLES with four POKéMON.\p"
@@ -1263,22 +1263,22 @@ BattleFrontier_BattleTowerLobby_Text_ExplainDoublesChallenge: @ 8240897
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleTowerLobby_Text_PleaseSelectFourMons: @ 8240A50
+BattleFrontier_BattleTowerLobby_Text_PleaseSelectFourMons:
 	.string "Now please select the four POKéMON\n"
 	.string "that are to be entered.$"
 
-BattleFrontier_BattleTowerLobby_Text_WelcomeMultiBattle: @ 8240A8B
+BattleFrontier_BattleTowerLobby_Text_WelcomeMultiBattle:
 	.string "Where the talents of TRAINERS\n"
 	.string "are put to the test!\p"
 	.string "Welcome to the BATTLE TOWER!\p"
 	.string "I am your guide to the MULTI\n"
 	.string "BATTLE ROOMS.$"
 
-BattleFrontier_BattleTowerLobby_Text_TakeMultisChallenge: @ 8240B06
+BattleFrontier_BattleTowerLobby_Text_TakeMultisChallenge:
 	.string "Would you like to take the MULTI\n"
 	.string "BATTLE ROOM challenge?$"
 
-BattleFrontier_BattleTowerLobby_Text_ExplainMultisChallenge: @ 8240B3E
+BattleFrontier_BattleTowerLobby_Text_ExplainMultisChallenge:
 	.string "The BATTLE TOWER's MULTI BATTLE\n"
 	.string "ROOMS are facilities for conducting\l"
 	.string "MULTI BATTLES.\p"
@@ -1301,22 +1301,22 @@ BattleFrontier_BattleTowerLobby_Text_ExplainMultisChallenge: @ 8240B3E
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons: @ 8240DDB
+BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons:
 	.string "Now please select the two POKéMON\n"
 	.string "that are to be entered.$"
 
-BattleFrontier_BattleTowerLobby_Text_WelcomeLinkMultiBattle: @ 8240E15
+BattleFrontier_BattleTowerLobby_Text_WelcomeLinkMultiBattle:
 	.string "Where the talents of TRAINERS\n"
 	.string "are put to the test!\p"
 	.string "Welcome to the BATTLE TOWER!\p"
 	.string "I am your guide to the LINK MULTI\n"
 	.string "BATTLE ROOMS.$"
 
-BattleFrontier_BattleTowerLobby_Text_TakeLinkMultisChallenge: @ 8240E95
+BattleFrontier_BattleTowerLobby_Text_TakeLinkMultisChallenge:
 	.string "Would you like to take the LINK MULTI\n"
 	.string "BATTLE ROOM challenge?$"
 
-BattleFrontier_BattleTowerLobby_Text_ExplainLinkMultisChallenge: @ 8240ED2
+BattleFrontier_BattleTowerLobby_Text_ExplainLinkMultisChallenge:
 	.string "The BATTLE TOWER's MULTI BATTLE\n"
 	.string "ROOMS are facilities for conducting\l"
 	.string "MULTI BATTLES with a friend.\p"
@@ -1337,76 +1337,76 @@ BattleFrontier_BattleTowerLobby_Text_ExplainLinkMultisChallenge: @ 8240ED2
 	.string "Once you start, you must battle seven\n"
 	.string "MULTI BATTLES in a row nonstop.$"
 
-BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons2: @ 824115E
+BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons2:
 	.string "Now please select the two POKéMON\n"
 	.string "that are to be entered.$"
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Text_ChoseSameMonAsFriend: @ 8241198
+BattleFrontier_BattleTowerLobby_Text_ChoseSameMonAsFriend:
 	.string "You have chosen the same kind of\n"
 	.string "POKéMON as your friend.\p"
 	.string "Please choose two POKéMON different\n"
 	.string "from your friend's, match the level\l"
 	.string "you wish to enter, and register again.$"
 
-BattleFrontier_BattleTowerLobby_Text_LinkMultiOnlyForTwoPlayers: @ 8241240
+BattleFrontier_BattleTowerLobby_Text_LinkMultiOnlyForTwoPlayers:
 	.string "The LINK MULTI BATTLE ROOM challenge\n"
 	.string "is only for two linked players.$"
 
-BattleFrontier_BattleTowerLobby_Text_FriendAlsoSelectedMon: @ 8241285
+BattleFrontier_BattleTowerLobby_Text_FriendAlsoSelectedMon:
 	.string "Your friend has also selected\n"
 	.string "the POKéMON {STR_VAR_1}.$"
 
-BattleFrontier_BattleTowerLobby_Text_FriendAlsoSelectedMons: @ 82412B3
+BattleFrontier_BattleTowerLobby_Text_FriendAlsoSelectedMons:
 	.string "Your friend has also selected the\n"
 	.string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$"
 
-BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlMode: @ 82412E8
+BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlMode:
 	.string "Your friend has chosen a different\n"
 	.string "battle level.$"
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlModeSameMon: @ 8241319
+BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlModeSameMon:
 	.string "Your friend has chosen a different\n"
 	.string "battle level.\p"
 	.string "Your friend has also selected\n"
 	.string "the POKéMON {STR_VAR_1}.$"
 
 @ Unused
-BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlModeSameMons: @ 8241378
+BattleFrontier_BattleTowerLobby_Text_FriendChoseDifferentLvlModeSameMons:
 	.string "Your friend has chosen a different\n"
 	.string "battle level.\p"
 	.string "Your friend has also selected the\n"
 	.string "POKéMON {STR_VAR_1} and {STR_VAR_2}.$"
 
-BattleFrontier_BattleTowerLobby_Text_ChooseDifferentMonsMatchLvlMode: @ 82413DE
+BattleFrontier_BattleTowerLobby_Text_ChooseDifferentMonsMatchLvlMode:
 	.string "Please choose two POKéMON different\n"
 	.string "from your friend's, match the level\l"
 	.string "you wish to enter, and register again.$"
 
-BattleFrontier_BattleTowerLobby_Text_SaveGameBeforeShowingIn: @ 824144D
+BattleFrontier_BattleTowerLobby_Text_SaveGameBeforeShowingIn:
 	.string "I will save the game before\n"
 	.string "showing you in. Please wait.$"
 
-BattleFrontier_BattleTowerLobby_Text_CongratsDefeatedMaiden: @ 8241486
+BattleFrontier_BattleTowerLobby_Text_CongratsDefeatedMaiden:
 	.string "Congratulations!\n"
 	.string "You have defeated the SALON MAIDEN\l"
 	.string "and swept seven TRAINERS!$"
 
-BattleFrontier_BattleTowerLobby_Text_AwardYouTheseBattlePoints: @ 82414D4
+BattleFrontier_BattleTowerLobby_Text_AwardYouTheseBattlePoints:
 	.string "In recognition of your infinite talent,\n"
 	.string "we award you these Battle Point(s).$"
 
-BattleFrontier_Text_ObtainedXBattlePoints: @ 8241520
+BattleFrontier_Text_ObtainedXBattlePoints:
 	.string "{PLAYER} obtained {STR_VAR_1} Battle Point(s).$"
 
-BattleFrontier_BattleTowerLobby_Text_RulesAreListed: @ 8241540
+BattleFrontier_BattleTowerLobby_Text_RulesAreListed:
 	.string "The BATTLE TOWER rules are listed.$"
 
-BattleFrontier_BattleTowerLobby_Text_ReadWhichHeading: @ 8241563
+BattleFrontier_BattleTowerLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattleTowerLobby_Text_ExplainTowerRules: @ 8241586
+BattleFrontier_BattleTowerLobby_Text_ExplainTowerRules:
 	.string "The BATTLE TOWER is a facility where\n"
 	.string "four types of battles are waged--\l"
 	.string "SINGLE BATTLE, DOUBLE BATTLE, MULTI\l"
@@ -1416,7 +1416,7 @@ BattleFrontier_BattleTowerLobby_Text_ExplainTowerRules: @ 8241586
 	.string "Please speak with a guide offering\n"
 	.string "the type of battle you wish to enter.$"
 
-BattleFrontier_BattleTowerLobby_Text_ExplainMonRules: @ 8241693
+BattleFrontier_BattleTowerLobby_Text_ExplainMonRules:
 	.string "Depending on the BATTLE ROOM you are\n"
 	.string "entering, you will be required to take\l"
 	.string "a certain number of POKéMON.\p"
@@ -1425,7 +1425,7 @@ BattleFrontier_BattleTowerLobby_Text_ExplainMonRules: @ 8241693
 	.string "The DOUBLE BATTLE mode requires four,\n"
 	.string "and the MULTI modes both require two.$"
 
-BattleFrontier_BattleTowerLobby_Text_ExplainSalonRules: @ 8241777
+BattleFrontier_BattleTowerLobby_Text_ExplainSalonRules:
 	.string "The BATTLE SALON is where you must\n"
 	.string "find a partner to form a tag team for\l"
 	.string "the MULTI BATTLE ROOM challenge.\p"
@@ -1435,7 +1435,7 @@ BattleFrontier_BattleTowerLobby_Text_ExplainSalonRules: @ 8241777
 	.string "You may choose a new tag partner\n"
 	.string "after winning seven straight matches.$"
 
-BattleFrontier_BattleTowerLobby_Text_ExplainMultiLinkRules: @ 824187E
+BattleFrontier_BattleTowerLobby_Text_ExplainMultiLinkRules:
 	.string "The LINK MULTI BATTLE Mode is for two\n"
 	.string "friends to mount a challenge together.\p"
 	.string "You and your friend must be linked with\n"
diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
index 0e8f5e8cd..b7354d9a2 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
@@ -5,7 +5,7 @@
 .set LOCALID_PLAYER, 5
 .set LOCALID_PARTNER, 6
 
-BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8248EE8
+BattleFrontier_BattleTowerMultiBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_OnFrame
@@ -15,14 +15,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8248EE8
 	@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_F
 	@ The multi partner is represented by LOCALID_PARTNER, which has the gfx id VAR_OBJ_GFX_ID_E
 
-BattleFrontier_BattleTowerMultiBattleRoom_OnTransition: @ 8248EF8
+BattleFrontier_BattleTowerMultiBattleRoom_OnTransition:
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx:: @ 8248F0F
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx::
 	tower_setpartnergfx
 	checkplayergender
 	compare VAR_RESULT, FEMALE
@@ -30,27 +30,27 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx:: @ 8248F0F
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8248F29
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx:: @ 8248F2F
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx::
 	special SetBattleTowerLinkPlayerGfx
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_OnWarp: @ 8248F33
+BattleFrontier_BattleTowerMultiBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj
 	.2byte 0
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj:: @ 8248F3D
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj::
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_OnFrame: @ 8248F43
+BattleFrontier_BattleTowerMultiBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom:: @ 8248F4D
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom::
 	setvar VAR_TEMP_0, 1
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom
 	applymovement LOCALID_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom
@@ -67,7 +67,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom:: @ 8248F4D
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter:: @ 8248FB4
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter::
 	tower_setopponent
 	addobject LOCALID_OPPONENT_1
 	addobject LOCALID_OPPONENT_2
@@ -89,7 +89,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter:: @ 8248FB4
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink:: @ 8249026
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink::
 	tower_getopponentintro 0
 	delay 15
 	applymovement LOCALID_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft
@@ -103,18 +103,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink:: @ 8
 	messageautoscroll gStringVar4
 	waitmessage
 	delay 48
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle:: @ 8249069
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle::
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
 	switch VAR_RESULT
 	case B_OUTCOME_WON, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost:: @ 824907E
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, FANCOUNTER_USED_BATTLE_TOWER
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents:: @ 82490AA
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	tower_setbattlewon
 	switch VAR_RESULT
@@ -135,11 +135,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents:: @ 8249
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetorePartyMsgLink:: @ 8249118
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetorePartyMsgLink::
 	messageautoscroll BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth
 	waitmessage
 	delay 48
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: @ 8249121
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty::
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
@@ -147,7 +147,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: @ 8249121
 	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8249143
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
@@ -163,7 +163,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8
 	case 3, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoRecord:: @ 82491B1
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge
@@ -171,7 +171,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoReco
 	case 2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattle:: @ 82491E7
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -180,18 +180,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattle:: @ 82491E
 	case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RecordBattle:: @ 8249219
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskPauseChallenge:: @ 8249223
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 	case YES, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge:: @ 8249251
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -200,7 +200,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge:: @ 824
 	case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge:: @ 8249283
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge::
 	closemessage
 	clearflag FLAG_TEMP_2
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle
@@ -212,14 +212,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge:: @ 8249
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyWon:: @ 82492AF
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, FANCOUNTER_USED_BATTLE_TOWER
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge:: @ 82492DB
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait
 	waitmessage
 	tower_save CHALLENGE_STATUS_PAUSED
@@ -229,7 +229,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge:: @ 82492DB
 	frontier_reset
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet:: @ 82492FD
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLink
 	copyvar VAR_TEMP_F, VAR_RESULT
@@ -241,37 +241,37 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet::
 	case 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSet
 	case 6, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSet
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSet:: @ 8249354
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSet:: @ 824935B
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSet:: @ 8249362
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSet:: @ 8249369
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSet:: @ 8249370
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSet:: @ 8249377
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLink:: @ 824937E
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLink::
 	copyvar VAR_TEMP_F, VAR_RESULT
 	switch VAR_TEMP_F
 	case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSetLink
@@ -281,48 +281,48 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLin
 	case 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSetLink
 	case 6, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSetLink
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSetLink:: @ 82493CA
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSetLink:: @ 82493D6
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSetLink:: @ 82493E2
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSetLink:: @ 82493EE
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSetLink:: @ 82493FA
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSetLink:: @ 8249406
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg:: @ 8249412
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg::
 	waitmessage
 	delay 48
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink:: @ 8249417
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink::
 	goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNoRecord
 	multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, TRUE
 	switch VAR_RESULT
@@ -332,7 +332,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink::
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNoRecord:: @ 8249457
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNoRecord::
 	multichoice 20, 8, MULTI_GO_ON_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink
@@ -340,7 +340,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNo
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink:: @ 8249483
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink::
 	setvar VAR_0x8004, BATTLE_TOWER_LINK_CONTINUE
 	setvar VAR_0x8005, 0
 	message gText_LinkStandby3
@@ -352,7 +352,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink:: @
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink:: @ 82494A8
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink::
 	message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -364,7 +364,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink:: @ 82
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink:: @ 82494DD
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink::
 	message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -373,7 +373,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink:: @
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink:: @ 82494FA
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink::
 	setvar VAR_0x8004, BATTLE_TOWER_LINK_RETIRE
 	setvar VAR_0x8005, 0
 	message gText_LinkStandby3
@@ -383,11 +383,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink:: @ 82
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReconnectLink:: @ 8249514
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReconnectLink::
 	special BattleTowerReconnectLink
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom: @ 8249518
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom:
 	walk_up
 	walk_up
 	walk_up
@@ -395,7 +395,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom: @ 8249518
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom: @ 824951E
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom:
 	walk_left
 	walk_up
 	walk_up
@@ -403,15 +403,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom: @ 824951E
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant: @ 8249524
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant:
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle: @ 8249526
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle:
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter: @ 8249528
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter:
 	walk_down
 	walk_down
 	walk_down
@@ -419,7 +419,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter: @ 8249528
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Enter: @ 824952E
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Enter:
 	walk_right
 	walk_down
 	walk_down
@@ -427,93 +427,93 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Enter: @ 824952E
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Exit: @ 8249534
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Exit:
 	walk_up
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Exit: @ 8249539
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Exit:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer: @ 824953E
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer:
 	walk_right
 	walk_right
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantReturnToPos: @ 8249541
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantReturnToPos:
 	walk_left
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft: @ 8249545
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft:
 	walk_in_place_left
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet: @ 8249547
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet:
 	.string "The 2nd set of opponents is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet: @ 8249578
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet:
 	.string "The 3rd set of opponents is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet: @ 82495A9
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet:
 	.string "The 4th set of opponents is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet: @ 82495DA
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet:
 	.string "The 5th set of opponents is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet: @ 824960B
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet:
 	.string "The 6th set of opponents is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet: @ 824963C
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet:
 	.string "The 7th set of opponents is next.\n"
 	.string "Are you ready?$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2ndOpponentSetNext: @ 824966D
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2ndOpponentSetNext:
 	.string "The 2nd set of opponents is next.\n"
 	.string "Do your best!$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_3rdOpponentSetNext: @ 824969D
+BattleFrontier_BattleTowerMultiBattleRoom_Text_3rdOpponentSetNext:
 	.string "The 3rd set of opponents is next.\n"
 	.string "Do your best!$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_4thOpponentSetNext: @ 82496CD
+BattleFrontier_BattleTowerMultiBattleRoom_Text_4thOpponentSetNext:
 	.string "The 4th set of opponents is next.\n"
 	.string "Do your best!$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_5thOpponentSetNext: @ 82496FD
+BattleFrontier_BattleTowerMultiBattleRoom_Text_5thOpponentSetNext:
 	.string "The 5th set of opponents is next.\n"
 	.string "Do your best!$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_6thOpponentSetNext: @ 824972D
+BattleFrontier_BattleTowerMultiBattleRoom_Text_6thOpponentSetNext:
 	.string "The 6th set of opponents is next.\n"
 	.string "Do your best!$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_7thOpponentSetNext: @ 824975D
+BattleFrontier_BattleTowerMultiBattleRoom_Text_7thOpponentSetNext:
 	.string "The 7th set of opponents is next.\n"
 	.string "Do your best!$"
 
-gText_LinkStandby3:: @ 824978D
+gText_LinkStandby3::
 	.string "Link standby…$"
 
-gText_YourPartnerHasRetired:: @ 824979B
+gText_YourPartnerHasRetired::
 	.string "Your partner has retired.\p"
 	.string "Your BATTLE ROOM challenge\n"
 	.string "will be canceled.$"
diff --git a/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc
index 5e496527e..9c6a8bb2b 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc
@@ -3,7 +3,7 @@
 .set LOCALID_ATTENDANT_2, 3
 .set LOCALID_PARTNER, 4
 
-BattleFrontier_BattleTowerMultiCorridor_MapScripts:: @ 8248D4A
+BattleFrontier_BattleTowerMultiCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiCorridor_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnFrame
@@ -13,14 +13,14 @@ BattleFrontier_BattleTowerMultiCorridor_MapScripts:: @ 8248D4A
 	@ The player is represented instead by LOCALID_PLAYER, and has the gfx id VAR_OBJ_GFX_ID_F
 	@ The multi partner is represented by LOCALID_PARTNER, and has the gfx id VAR_OBJ_GFX_ID_E
 
-BattleFrontier_BattleTowerMultiCorridor_OnTransition: @ 8248D5A
+BattleFrontier_BattleTowerMultiCorridor_OnTransition:
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx
 	end
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx:: @ 8248D71
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx::
 	tower_setpartnergfx
 	checkplayergender
 	compare VAR_RESULT, FEMALE
@@ -28,30 +28,30 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx:: @ 8248D71
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale:: @ 8248D8B
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx:: @ 8248D91
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx::
 	special SetBattleTowerLinkPlayerGfx
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_OnWarp: @ 8248D95
+BattleFrontier_BattleTowerMultiCorridor_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects:: @ 8248D9F
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects::
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
 	hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
 	hideobjectat LOCALID_PARTNER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
 	special OffsetCameraForBattle
 	end
 
-BattleFrontier_BattleTowerMultiCorridor_OnFrame: @ 8248DB2
+BattleFrontier_BattleTowerMultiCorridor_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor:: @ 8248DBC
+BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor::
 	lockall
 	setflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR
 	setvar VAR_0x8004, 14  @ x coord of far door, used by DrawDoor
@@ -94,7 +94,7 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor:: @ 8248DBC
 	releaseall
 	end
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom:: @ 8248E71
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -105,23 +105,23 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom:: @ 8248E71
 	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom:: @ 8248E9E
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
 	waitstate
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom:: @ 8248EA8
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5
 	waitstate
 	return
 
 @ Unnecessary duplicate of the above
-BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom:: @ 8248EB2
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5
 	waitstate
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor: @ 8248EBC
+BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor:
 	walk_down
 	walk_right
 	walk_right
@@ -131,7 +131,7 @@ BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor: @ 8248EBC
 	walk_right
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor: @ 8248EC4
+BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor:
 	walk_down
 	walk_left
 	walk_left
@@ -141,7 +141,7 @@ BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor: @ 8248EC4
 	walk_left
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor: @ 8248ECC
+BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor:
 	walk_right
 	walk_right
 	walk_right
@@ -152,7 +152,7 @@ BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor: @ 82
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor: @ 8248ED5
+BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor:
 	walk_left
 	walk_left
 	walk_left
@@ -163,19 +163,19 @@ BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor: @ 8
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor: @ 8248EDE
+BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor:
 	delay_16
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor: @ 8248EE3
+BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator: @ 8248EE6
+BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator:
 	walk_down
 	step_end
 
diff --git a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
index 297514524..4a6d29446 100644
--- a/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
@@ -1,17 +1,17 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleTowerMultiPartnerRoom_MapScripts:: @ 8243D92
+BattleFrontier_BattleTowerMultiPartnerRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleTowerMultiPartnerRoom_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiPartnerRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame
 	.byte 0
 
-BattleFrontier_BattleTowerMultiPartnerRoom_OnResume: @ 8243DA7
+BattleFrontier_BattleTowerMultiPartnerRoom_OnResume:
 	pyramid_resetparty
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition: @ 8243DB0
+BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition:
 	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner
 	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1
 	clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2
@@ -24,7 +24,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_OnTransition: @ 8243DB0
 	tower_loadpartners
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner:: @ 8243DDA
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner::
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_BOY_1
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_BOY_1
 	setvar VAR_OBJ_GFX_ID_2, OBJ_EVENT_GFX_BOY_1
@@ -38,26 +38,26 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ChosePartner:: @ 8243DDA
 	setobjectxyperm LOCALID_ATTENDANT, 10, 2
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_OnWarp: @ 8243E14
+BattleFrontier_BattleTowerMultiPartnerRoom_OnWarp:
 	map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth:: @ 8243E1E
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame: @ 8243E23
+BattleFrontier_BattleTowerMultiPartnerRoom_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom
 	map_script_2 VAR_TEMP_3, 1, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom
 	.2byte 0
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom:: @ 8243E35
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_ExitRoom::
 	lockall
 	setvar VAR_TEMP_3, 0
 	goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom:: @ 8243E41
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom
 	waitmovement 0
@@ -72,16 +72,16 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom:: @ 8243E41
 	releaseall
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom: @ 8243E75
+BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom:
 	walk_down
 	step_end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit: @ 8243E77
+BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit:
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant:: @ 8243E7A
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant::
 	lock
 	faceplayer
 	message BattleFrontier_BattleTowerMultiPartnerRoom_Text_QuitLookingForPartner
@@ -93,12 +93,12 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant:: @ 8243E7A
 	release
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge:: @ 8243E9D
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge::
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator:: @ 8243EB5
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator::
 	msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_ThankYouForChoosingPartner, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFastestUp
@@ -113,59 +113,59 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator:: @ 8243EB5
 	releaseall
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator:: @ 8243EE4
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator
 	waitmovement 0
 	return
 
 @ Unused
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorEast: @ 8243EF6
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorEast:
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast
 	waitmovement 0
 	return
 
 @ Unused
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorWest: @ 8243F08
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevatorWest:
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest
 	waitmovement 0
 	return
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator: @ 8243F1A
+BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevator:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
 @ Functionally unused
-BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast: @ 8243F1E
+BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterElevatorEast:
 	walk_right
 	walk_up
 	set_invisible
 	step_end
 
 @ Functionally unused
-BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest: @ 8243F22
+BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEneterElevatorWest:
 	walk_left
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator: @ 8243F26
+BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantEnterElevator:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner1:: @ 8243F29
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner1::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, 0
 	goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner:: @ 8243F36
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner::
 	goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_RejectPartner
 	tower_dopartnermsg PARTNER_MSGID_INTRO
 	waitmessage
@@ -194,24 +194,24 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner::
 	release
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_RejectPartner:: @ 8243FC3
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_RejectPartner::
 	tower_dopartnermsg PARTNER_MSGID_REJECT
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit:: @ 8243FD4
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit::
 	applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExit
 	waitmovement 0
 	return
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth:: @ 8243FDF
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth::
 	applymovement VAR_LAST_TALKED, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExitSouth
 	waitmovement 0
 	return
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExit: @ 8243FEA
+BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExit:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -221,7 +221,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExit: @ 8243FEA
 	walk_fast_up
 	step_end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExitSouth: @ 8243FF2
+BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExitSouth:
 	walk_fast_left
 	walk_fast_up
 	walk_fast_up
@@ -232,131 +232,131 @@ BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PartnerExitSouth: @ 8243FF2
 	walk_fast_up
 	step_end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner2:: @ 8243FFB
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner2::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, 1
 	goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner3:: @ 8244008
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner3::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, 2
 	goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner4:: @ 8244015
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner4::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, 3
 	goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner5:: @ 8244022
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner5::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, 4
 	goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner6:: @ 824402F
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner6::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, 5
 	goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner7:: @ 824403C
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner7::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, 6
 	goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner8:: @ 8244049
+BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Partner8::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, 7
 	goto BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner
 	end
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner: @ 8244056
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner:
 	.string "Please find a partner from out of\n"
 	.string "the TRAINERS gathered here.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_QuitLookingForPartner: @ 8244094
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_QuitLookingForPartner:
 	.string "{PLAYER}, you have not found a partner\n"
 	.string "for your tag team.\p"
 	.string "Would you like to quit looking and\n"
 	.string "return to the reception counter?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner2: @ 824410C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner2:
 	.string "Then, please find a partner from\n"
 	.string "the TRAINERS gathered here.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ThankYouForChoosingPartner:: @ 8244149
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ThankYouForChoosingPartner::
 	.string "Thank you for choosing a partner.\p"
 	.string "I will now show you to your\n"
 	.string "MULTI BATTLE ROOM.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Intro:: @ 824419A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Intro::
 	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
 	.string "You can call me {STR_VAR_3}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Mon1:: @ 82441CA
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Mon1::
 	.string "On {STR_VAR_1}'s advice, I brought\n"
 	.string "one {STR_VAR_3} with {STR_VAR_2} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Mon2Ask:: @ 82441F7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Mon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "Please, let me join you as a tag team.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Accept:: @ 824422E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Accept::
 	.string "Thank you!\n"
 	.string "I'll go register right now.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Reject:: @ 8244255
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice1Reject::
 	.string "I really wanted to form a tag team\n"
 	.string "with you, {PLAYER}…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Intro:: @ 8244286
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Intro::
 	.string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
 	.string "My name is {STR_VAR_3}.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Mon1:: @ 82442B2
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Mon1::
 	.string "I got advice from {STR_VAR_1} and chose\n"
 	.string "one {STR_VAR_3} with {STR_VAR_2} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Mon2Ask:: @ 82442E4
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Mon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "Please, let's form a tag team!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Accept:: @ 8244313
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Accept::
 	.string "Thank you very much!\n"
 	.string "I'll be done with registration quickly!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Reject:: @ 8244350
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_UnusedApprentice2Reject::
 	.string "{PLAYER}, I was hoping that I could\n"
 	.string "partner up with you…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Intro:: @ 8244383
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Intro::
 	.string "Um, my name's {STR_VAR_3}, and I'm\n"
 	.string "{STR_VAR_1}'s no. {STR_VAR_2} apprentice.\p"
 	.string "Snivel…\p"
 	.string "I'm sorry!\n"
 	.string "This tension is making me cry…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon1:: @ 82443E7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon1::
 	.string "{STR_VAR_3} advised me, so I have\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon2Ask:: @ 8244413
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Mon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "Snivel…\n"
 	.string "Please, please team up with me!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Accept:: @ 824444B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Accept::
 	.string "Oh, really? You will?\n"
 	.string "Awesome! Wicked! Awoooh!\p"
 	.string "Oh… I'm sorry…\n"
@@ -364,119 +364,119 @@ BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Accept:: @ 824444B
 	.string "I'll go register right away.\n"
 	.string "Please don't go away!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Reject:: @ 82444D6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice1Reject::
 	.string "Oh, b-but…\n"
 	.string "Sob… Waaaaah!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Intro:: @ 82444EF
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Intro::
 	.string "Hi, there! I'm {STR_VAR_3}!\n"
 	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon1:: @ 824451E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon1::
 	.string "{STR_VAR_3} recommended my crew.\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon2Ask:: @ 8244549
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Mon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1},\n"
 	.string "that's what I have! Cool, huh?\p"
 	.string "So come on!\n"
 	.string "Let's form a tag team!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Accept:: @ 824459B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Accept::
 	.string "Yay! Great!\n"
 	.string "Okay, I'll go register, okay?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Reject:: @ 82445C5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice2Reject::
 	.string "Aww, why?\n"
 	.string "I wanted to team up, {PLAYER}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Intro:: @ 82445E8
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Intro::
 	.string "I'm {STR_VAR_3}, the no. {STR_VAR_2} apprentice\n"
 	.string "of the famous {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon1:: @ 8244618
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon1::
 	.string "I looked to {STR_VAR_3} for advice.\n"
 	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon2Ask:: @ 8244643
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Mon2Ask::
 	.string "and one {STR_VAR_2} with {STR_VAR_1},\n"
 	.string "that's my pair.\p"
 	.string "Please, will you join me in\n"
 	.string "a tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Accept:: @ 824468F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Accept::
 	.string "Thank you!\n"
 	.string "I'll register right away!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Reject:: @ 82446B4
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice3Reject::
 	.string "{PLAYER}, I had been hoping to join\n"
 	.string "you in a tag team…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Intro:: @ 82446E5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Intro::
 	.string "Um… I'm sincerely happy that you\n"
 	.string "would take the time to talk to me.\p"
 	.string "I'm {STR_VAR_3}.\n"
 	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon1:: @ 824474D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon1::
 	.string "{STR_VAR_3} gave me advice.\n"
 	.string "I'm very grateful for it.\p"
 	.string "I have a team of one {STR_VAR_2}\n"
 	.string "with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon2Ask:: @ 824479E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Mon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\n"
 	.string "I know I'm asking a lot…\p"
 	.string "I don't think you'll be willing to,\n"
 	.string "but may I join you as a partner?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Accept:: @ 824480C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Accept::
 	.string "Really? I can't believe it!\n"
 	.string "I can't believe you'll let me join you!\l"
 	.string "I… I won't let you down!\p"
 	.string "Um… If it's really okay, I'll go register\n"
 	.string "right this instant!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Reject:: @ 82448A7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice4Reject::
 	.string "Oh…\n"
 	.string "I didn't think I was good enough…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Intro:: @ 82448CD
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Intro::
 	.string "Hi, I'm {STR_VAR_3}.\n"
 	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon1:: @ 82448F5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon1::
 	.string "{STR_VAR_3} told me that it would be\n"
 	.string "good to make this team:\l"
 	.string "one {STR_VAR_1}-using {STR_VAR_2}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon2Ask:: @ 8244939
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Mon2Ask::
 	.string "and one {STR_VAR_2} that knows how\n"
 	.string "to use {STR_VAR_1}.\p"
 	.string "Not bad, huh?\n"
 	.string "Want me to team up with you?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Accept:: @ 8244989
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Accept::
 	.string "Okay, glad to join you!\n"
 	.string "I hope you won't mess things up for me!\l"
 	.string "I'll do my registration now.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Reject:: @ 82449E6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice5Reject::
 	.string "Huh? Why did you turn me down?\n"
 	.string "You're no judge of character!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Intro:: @ 8244A23
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Intro::
 	.string "I'm {STR_VAR_3} and I'm a TRIATHLETE.\n"
 	.string "I'm busy every day what with jogging,\l"
 	.string "training, and rapping.\p"
 	.string "I also happen to be {STR_VAR_1}'s\n"
 	.string "no. {STR_VAR_2} apprentice.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon1:: @ 8244AA9
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon1::
 	.string "This is what {STR_VAR_3} recommended.\n"
 	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon2Ask:: @ 8244AD6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon2Ask::
 	.string "and one {STR_VAR_1}-using\n"
 	.string "{STR_VAR_2}.\p"
 	.string "I put a lot of effort into raising\n"
@@ -484,113 +484,113 @@ BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Mon2Ask:: @ 8244AD6
 	.string "Let's form a tag team\n"
 	.string "and give it a go!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Accept:: @ 8244B52
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Accept::
 	.string "Thanks, that's the spirit!\n"
 	.string "Hang tight while I go register, okay?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Reject:: @ 8244B93
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice6Reject::
 	.string "I took time from my busy schedule\n"
 	.string "to be here! Give me a break!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Intro:: @ 8244BD2
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Intro::
 	.string "Hi!\n"
 	.string "How's it going?\p"
 	.string "I'm {STR_VAR_3}, {STR_VAR_1}'s\n"
 	.string "no. {STR_VAR_2} apprentice. Glad to meet you!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon1:: @ 8244C18
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon1::
 	.string "Listen, listen! You have to hear about\n"
 	.string "the POKéMON {STR_VAR_3} recommended.\l"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon2Ask:: @ 8244C6E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Mon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\n"
 	.string "Of course I raised them superbly!\p"
 	.string "So, want to team up?\n"
 	.string "I'm sure it'll be a great combo!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Accept:: @ 8244CD6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Accept::
 	.string "Yay, I think this will be fun!\n"
 	.string "I'll go register!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Reject:: @ 8244D07
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice7Reject::
 	.string "Oh, you're mean!\n"
 	.string "I come recommended, you know.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Intro:: @ 8244D36
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Intro::
 	.string "Please let me introduce myself.\n"
 	.string "I am {STR_VAR_3}.\p"
 	.string "I serve as {STR_VAR_1}'s\n"
 	.string "no. {STR_VAR_2} apprentice.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon1:: @ 8244D82
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon1::
 	.string "I sought the sage advice of\n"
 	.string "{STR_VAR_3} and raised my team\l"
 	.string "of one {STR_VAR_2} with {STR_VAR_1}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon2Ask:: @ 8244DC6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Mon2Ask::
 	.string "and one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "Please agree to a tag team with me!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Accept:: @ 8244DFE
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Accept::
 	.string "Oh… I'm delighted!\n"
 	.string "I promise to give you my best!\p"
 	.string "Of course I will register us!\n"
 	.string "Please wait!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Reject:: @ 8244E5B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice8Reject::
 	.string "I had been hoping to join you,\n"
 	.string "{PLAYER}…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Intro:: @ 8244E7E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Intro::
 	.string "Eek! You spoke to me!\n"
 	.string "I… I'm overjoyed!\p"
 	.string "I'm {STR_VAR_3}! I'm {STR_VAR_1}'s\n"
 	.string "no. {STR_VAR_2} apprentice!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon1:: @ 8244ECA
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon1::
 	.string "On {STR_VAR_3}'s advice, I trained\n"
 	.string "one {STR_VAR_1}-using {STR_VAR_2}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon2Ask:: @ 8244EF4
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Mon2Ask::
 	.string "and one {STR_VAR_1}-using\n"
 	.string "{STR_VAR_2}.\p"
 	.string "Please, can you grant me my wish?\n"
 	.string "I want to be your tag-team partner!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Accept:: @ 8244F4F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Accept::
 	.string "Eek! I… I feel giddy!\n"
 	.string "Thank you so much!\l"
 	.string "I'll go register us right away!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Reject:: @ 8244F98
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice9Reject::
 	.string "Waaah! Don't you feel any pity?\n"
 	.string "But that makes you cooler…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Intro:: @ 8244FD3
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Intro::
 	.string "Yeehaw! I'm {STR_VAR_1}'s\n"
 	.string "no. {STR_VAR_2} apprentice!\p"
 	.string "{STR_VAR_3}'s my name, hello, hello!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon1:: @ 8245013
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon1::
 	.string "My mentor {STR_VAR_3} recommended\n"
 	.string "one {STR_VAR_1}-master {STR_VAR_2}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon2Ask:: @ 824503D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Mon2Ask::
 	.string "and one {STR_VAR_1}-master\n"
 	.string "{STR_VAR_2}.\p"
 	.string "Good stuff, huh?\n"
 	.string "You'll partner with me, won't you?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Accept:: @ 8245087
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Accept::
 	.string "Okay, excellent!\n"
 	.string "I'll get the registration done quickly!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Reject:: @ 82450C0
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice10Reject::
 	.string "Gwaaah!\n"
 	.string "You're a calculating one, {PLAYER}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Intro:: @ 82450E6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Intro::
 	.string "Hey! There's big trouble! This is\n"
 	.string "the BATTLE TOWER's last day!\p"
 	.string "… … … … … …\n"
@@ -599,29 +599,29 @@ BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Intro:: @ 82450E6
 	.string "I'm {STR_VAR_1}'s 1,000th apprentice!\l"
 	.string "Actually, I'm no. {STR_VAR_2}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon1:: @ 8245196
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon1::
 	.string "{STR_VAR_3} gave me some advice.\n"
 	.string "{STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon2Ask:: @ 82451BD
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Mon2Ask::
 	.string "{STR_VAR_2} with {STR_VAR_1}.\n"
 	.string "I've got ten of each kind!\l"
 	.string "Actually, just one of each!\p"
 	.string "How about it?\n"
 	.string "Want to try tag battles with me?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Accept:: @ 824522F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Accept::
 	.string "Yippee!\n"
 	.string "I'll give you a POKéMON as my thanks!\p"
 	.string "Just joking! But I will really go do\n"
 	.string "the registration, okay?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Reject:: @ 824529A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice11Reject::
 	.string "Oh, that's so cold! I'll have to wreck\n"
 	.string "the BATTLE TOWER for that!\p"
 	.string "Of course I won't!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Intro:: @ 82452EF
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Intro::
 	.string "Hey, there, I'm rockin' and a-rollin'!\n"
 	.string "POKéMON, I be controllin'!\p"
 	.string "I'm {STR_VAR_3} the rappin' SAILOR.\n"
@@ -629,36 +629,36 @@ BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Intro:: @ 82452EF
 	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
 	.string "Me, you shouldn't be quick to dismiss!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon1:: @ 82453B4
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon1::
 	.string "With the advice of {STR_VAR_3} I did\n"
 	.string "abide, put together my team of pride!\l"
 	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon2Ask:: @ 8245406
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Mon2Ask::
 	.string "and one {STR_VAR_1}-using\n"
 	.string "{STR_VAR_2}!\p"
 	.string "Our meeting we should commemorate,\n"
 	.string "with a tag-team victory to celebrate!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Accept:: @ 8245464
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Accept::
 	.string "Hey, hey, I like your style!\n"
 	.string "Our registration, I will go file!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Reject:: @ 82454A3
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice12Reject::
 	.string "Oh, hey, {PLAYER}, now that's cold!\n"
 	.string "If I may be so bold!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Intro:: @ 82454D6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Intro::
 	.string "Yippee-yahoo!\n"
 	.string "Oh, don't run! I was just having fun!\p"
 	.string "Howdy! I'm {STR_VAR_3}!\n"
 	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon1:: @ 8245535
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon1::
 	.string "{STR_VAR_3} told me what to do.\n"
 	.string "So one {STR_VAR_1}-using {STR_VAR_2}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon2Ask:: @ 824555F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon2Ask::
 	.string "and one {STR_VAR_1}-using\n"
 	.string "{STR_VAR_2}, I did choose.\p"
 	.string "So, what do you say?\n"
@@ -666,29 +666,29 @@ BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Mon2Ask:: @ 824555F
 	.string "Please, I'm begging you!\n"
 	.string "Let me join you, don't leave me blue!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Accept:: @ 82455EC
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Accept::
 	.string "Yeahah! Luck is with me!\n"
 	.string "It sure makes me happy!\p"
 	.string "Before we go join the fray,\n"
 	.string "I'll go register right away!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Reject:: @ 8245656
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice13Reject::
 	.string "You're turning me down?\n"
 	.string "{PLAYER}, you're making me frown!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Intro:: @ 824568A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Intro::
 	.string "Cough!\p"
 	.string "Oh, sorry, I have a cold.\n"
 	.string "My POKéMON are fine, though.\p"
 	.string "My name's {STR_VAR_3}, {STR_VAR_1}'s\n"
 	.string "no. {STR_VAR_2} apprentice. Cough!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon1:: @ 82456F5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon1::
 	.string "I took {STR_VAR_3}'s advice to heart\n"
 	.string "and put together my team of\l"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon2Ask:: @ 8245740
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "I trained them every day,\n"
 	.string "even in wind and rain.\p"
@@ -697,1115 +697,1115 @@ BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Mon2Ask:: @ 8245740
 	.string "That's what I'm about.\n"
 	.string "Want to be my tag partner?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Accept:: @ 82457D9
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Accept::
 	.string "Thanks, I appreciate this!\n"
 	.string "Cough, cough!\l"
 	.string "Hang on while I go register.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Reject:: @ 824581F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice14Reject::
 	.string "Oh, you won't?\n"
 	.string "{PLAYER}, I think we'd make a good pair.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Intro:: @ 8245851
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Intro::
 	.string "Oh, hello!\n"
 	.string "This is nerve-racking.\p"
 	.string "I'm {STR_VAR_3}.\n"
 	.string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon1:: @ 824589C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon1::
 	.string "{STR_VAR_3} said this team'll be good--\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon2Ask:: @ 82458CE
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Mon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "I'm feeling self-conscious about this,\n"
 	.string "but will you let me join you?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Accept:: @ 8245923
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Accept::
 	.string "Oh, gee, thank you!\n"
 	.string "I feel bashful, but I'll do my best!\p"
 	.string "I'll go get the registration done.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Reject:: @ 824597F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice15Reject::
 	.string "Oh, please don't say no!\n"
 	.string "I feel self-conscious enough already…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Intro:: @ 82459BE
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Intro::
 	.string "I am {STR_VAR_3}, and that's no lie.\n"
 	.string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon1:: @ 82459F7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon1::
 	.string "{STR_VAR_3} recommended my team.\p"
 	.string "Since the advice sounded sincere,\n"
 	.string "I decided to bring with me\l"
 	.string "my {STR_VAR_1}-using {STR_VAR_2} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon2Ask:: @ 8245A5F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Mon2Ask::
 	.string "my {STR_VAR_1}-using {STR_VAR_2}.\p"
 	.string "If possible, I would like you to accept\n"
 	.string "me as your tag-team partner.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Accept:: @ 8245AB4
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Accept::
 	.string "You really will accept me?\n"
 	.string "It would be too terrible otherwise.\p"
 	.string "But since you've agreed, this is fine.\n"
 	.string "I shall go register the both of us.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Reject:: @ 8245B3E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_Apprentice16Reject::
 	.string "Hm? Now why would you refuse?\n"
 	.string "Is this your idea of a joke?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassIntro:: @ 8245B79
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassIntro::
 	.string "I'm {STR_VAR_1}, and I'm a LASS!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon1:: @ 8245B91
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon1::
 	.string "What I have are one {STR_VAR_2}\n"
 	.string "that uses {STR_VAR_1} and one$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon2Ask:: @ 8245BBD
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassMon2Ask::
 	.string "{STR_VAR_2} that uses {STR_VAR_1}.\n"
 	.string "Those are what I have with me.\p"
 	.string "Will you be my partner?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassAccept:: @ 8245C05
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassAccept::
 	.string "Thank you!\n"
 	.string "I'll go do the registration!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassReject:: @ 8245C2D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_LassReject::
 	.string "You don't want to be my partner?\n"
 	.string "You'll regret it later!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterIntro:: @ 8245C66
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterIntro::
 	.string "Hello!\p"
 	.string "I'm YOUNGSTER {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon1:: @ 8245C7F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon1::
 	.string "Want to know what I have?\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon2Ask:: @ 8245CAC
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "You'll be my tag-team partner,\n"
 	.string "won't you?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterAccept:: @ 8245CE6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterAccept::
 	.string "Yay!\n"
 	.string "I'll go and register, okay?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterReject:: @ 8245D07
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_YoungsterReject::
 	.string "Aww! If you'd form a tag team with\n"
 	.string "my POKéMON, we'd be unstoppable!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerIntro:: @ 8245D4B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerIntro::
 	.string "Yahoo!\n"
 	.string "I'm HIKER {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon1:: @ 8245D60
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon1::
 	.string "Know what I have with me?\n"
 	.string "My {STR_VAR_1}-using {STR_VAR_2} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon2Ask:: @ 8245D8D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerMon2Ask::
 	.string "my {STR_VAR_1}-using {STR_VAR_2}!\p"
 	.string "Sounds good, eh?\n"
 	.string "Want to form a tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerAccept:: @ 8245DC7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerAccept::
 	.string "Yahoo!\n"
 	.string "I'll go do the registering, then.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerReject:: @ 8245DF0
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_HikerReject::
 	.string "I would've liked to battle with you\n"
 	.string "at my side.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyIntro:: @ 8245E20
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyIntro::
 	.string "Hello!\n"
 	.string "I'm {STR_VAR_1}, and I'm a BEAUTY!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon1:: @ 8245E41
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon1::
 	.string "Do you know what I've been raising?\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon2Ask:: @ 8245E78
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "What do you think?\n"
 	.string "Want to make a tag team together?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyAccept:: @ 8245EBD
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyAccept::
 	.string "Wonderful!\n"
 	.string "I'll get the registration done now!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyReject:: @ 8245EEC
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BeautyReject::
 	.string "How disappointing!\p"
 	.string "We two together--we would've been\n"
 	.string "the best!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanIntro:: @ 8245F2B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanIntro::
 	.string "Yo!\p"
 	.string "You know who I am?\n"
 	.string "I'm {STR_VAR_1} the FISHERMAN!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon1:: @ 8245F58
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon1::
 	.string "I've got with me a team of one\n"
 	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon2Ask:: @ 8245F87
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanMon2Ask::
 	.string "one {STR_VAR_1}-using {STR_VAR_2}.\p"
 	.string "So, how about it?\n"
 	.string "Will you battle at my side?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanAccept:: @ 8245FC6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanAccept::
 	.string "Good, good!\n"
 	.string "Leave it up to me!\p"
 	.string "I'll go and register us now.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanReject:: @ 8246002
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_FishermanReject::
 	.string "We matched up perfectly, too…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyIntro:: @ 8246020
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyIntro::
 	.string "Glad to make your acquaintance.\n"
 	.string "I am {STR_VAR_1}, a LADY.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon1:: @ 8246051
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon1::
 	.string "I am accompanied by a team of\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon2Ask:: @ 8246082
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "I hope I meet your approval.\n"
 	.string "For I wish to have you as my partner.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyAccept:: @ 82460D5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyAccept::
 	.string "I thank you sincerely.\n"
 	.string "I shall handle the registration.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyReject:: @ 824610D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_LadyReject::
 	.string "I'm sure that you will regret not\n"
 	.string "having me as your partner.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFIntro:: @ 824614A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFIntro::
 	.string "I'm TRIATHLETE {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon1:: @ 824615D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon1::
 	.string "What I have…\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon2Ask:: @ 824617D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\n"
 	.string "That's my pair!\p"
 	.string "Please?\n"
 	.string "Will you form a tag team with me?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFAccept:: @ 82461C7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFAccept::
 	.string "Gee, thanks!\n"
 	.string "I'll go register at the counter.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFReject:: @ 82461F5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteFReject::
 	.string "We two together, we would've been\n"
 	.string "tough for certain!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherIntro:: @ 824622A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherIntro::
 	.string "Hiya!\n"
 	.string "I'm BUG CATCHER {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon1:: @ 8246244
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon1::
 	.string "Check out what I have!\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon2Ask:: @ 824626E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "So, listen!\n"
 	.string "Do you want to form a tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherAccept:: @ 82462AA
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherAccept::
 	.string "Gotcha!\p"
 	.string "I'll go do the registration stuff\n"
 	.string "at the counter.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherReject:: @ 82462E4
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugCatcherReject::
 	.string "Aww, my POKéMON are awesome.\n"
 	.string "I hope you won't regret this!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMIntro:: @ 824631F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMIntro::
 	.string "Good day!\n"
 	.string "I'm SCHOOL KID {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon1:: @ 824633C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon1::
 	.string "What I've been raising are one\n"
 	.string "{STR_VAR_2} that uses {STR_VAR_1}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon2Ask:: @ 824636B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMMon2Ask::
 	.string "and one {STR_VAR_2} that uses\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Not too bad, don't you think?\n"
 	.string "Would you care to form a tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMAccept:: @ 82463C5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMAccept::
 	.string "Thank you very much!\n"
 	.string "I'll get done with the registration.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMReject:: @ 82463FF
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidMReject::
 	.string "That's too bad…\p"
 	.string "I was hoping that I could learn\n"
 	.string "from you as your partner…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyIntro:: @ 8246449
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyIntro::
 	.string "Yo! Let me tell you who I am!\n"
 	.string "I'm RICH BOY {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon1:: @ 8246478
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon1::
 	.string "Guess what I got!\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon2Ask:: @ 824649D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "I'm willing to offer you the chance\n"
 	.string "to be in a tag team with me.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyAccept:: @ 82464EE
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyAccept::
 	.string "Smart move!\p"
 	.string "I'll finish up the registration\n"
 	.string "process quick!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyReject:: @ 8246529
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RichBoyReject::
 	.string "You'd turn me of all people down?\n"
 	.string "You'll regret that decision for sure!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltIntro:: @ 8246571
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltIntro::
 	.string "Hiyah!\n"
 	.string "I am BLACK BELT {STR_VAR_1}.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon1:: @ 824658C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon1::
 	.string "As my companions, I have\n"
 	.string "one {STR_VAR_2} using {STR_VAR_1}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon2Ask:: @ 82465B5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltMon2Ask::
 	.string "and one {STR_VAR_2} using\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Please, grant me my wish!\n"
 	.string "Allow me to be your tag partner!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltAccept:: @ 8246605
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltAccept::
 	.string "Hiyah!\n"
 	.string "I will go register forthwith!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltReject:: @ 824662A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BlackBeltReject::
 	.string "I see… I hope for an opportunity\n"
 	.string "the next time we meet…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFIntro:: @ 8246662
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFIntro::
 	.string "Hi, there!\n"
 	.string "I'm {STR_VAR_1}, and I'm a TUBER!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon1:: @ 8246686
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon1::
 	.string "I'll tell you what I have.\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon2Ask:: @ 82466B4
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\n"
 	.string "May I please be on your tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFAccept:: @ 82466E6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFAccept::
 	.string "Thank you!\n"
 	.string "I'll go register us now!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFReject:: @ 824670A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberFReject::
 	.string "If we'd become partners, we could\n"
 	.string "have been so strong!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacIntro:: @ 8246741
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacIntro::
 	.string "Greetings…\n"
 	.string "I am HEX MANIAC {STR_VAR_1}…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon1:: @ 8246760
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon1::
 	.string "I bear with me one {STR_VAR_1}-using\n"
 	.string "{STR_VAR_2} together with one$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon2Ask:: @ 8246791
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacMon2Ask::
 	.string "{STR_VAR_1}-using {STR_VAR_2}…\p"
 	.string "I beseech you…\n"
 	.string "Join me in a tag team…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacAccept:: @ 82467C4
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacAccept::
 	.string "I thank you…\n"
 	.string "I shall register us…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacReject:: @ 82467E6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_HexManiacReject::
 	.string "I so longed to join you…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMIntro:: @ 82467FF
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMIntro::
 	.string "How do you do? I'm {STR_VAR_1},\n"
 	.string "and I'm a POKéMON BREEDER!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon1:: @ 8246831
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon1::
 	.string "I'm raising a couple good ones!\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon2Ask:: @ 8246864
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "How about it?\n"
 	.string "Feel like making a tag team with me?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMAccept:: @ 82468A7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMAccept::
 	.string "Thank you kindly!\p"
 	.string "I'll go take care of the registration\n"
 	.string "stuff, so you wait right here!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMReject:: @ 82468FE
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederMReject::
 	.string "I was looking forward to being\n"
 	.string "your partner…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFIntro:: @ 824692B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFIntro::
 	.string "Well, hello!\n"
 	.string "I'm TRIATHLETE {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon1:: @ 824694B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon1::
 	.string "Want to know what I run with?\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon2Ask:: @ 824697C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Well?\n"
 	.string "Want to be in a tag team with me?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFAccept:: @ 82469B4
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFAccept::
 	.string "Good going!\p"
 	.string "I'll be quick and get the registration\n"
 	.string "all done!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFReject:: @ 82469F1
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteFReject::
 	.string "You and me, we would've been tops.\n"
 	.string "It's too bad…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMIntro:: @ 8246A22
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMIntro::
 	.string "Hey, there! My name's {STR_VAR_1}!\n"
 	.string "I'm a TRIATHLETE!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon1:: @ 8246A4E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon1::
 	.string "I go on runs with my durable team--\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon2Ask:: @ 8246A85
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Not too shabby, huh?\n"
 	.string "We should be in a tag team together!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMAccept:: @ 8246ACF
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMAccept::
 	.string "All right!\n"
 	.string "I'll go register in a flash!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMReject:: @ 8246AF7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RunningTriathleteMReject::
 	.string "I really wanted to battle as your\n"
 	.string "tag-team partner…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlIntro:: @ 8246B2B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlIntro::
 	.string "I'm BATTLE GIRL {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon1:: @ 8246B3F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon1::
 	.string "I've been toughening up one\n"
 	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon2Ask:: @ 8246B6B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlMon2Ask::
 	.string "one {STR_VAR_1}-using {STR_VAR_2}!\p"
 	.string "Do you like that combo?\n"
 	.string "How about you and me join up?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlAccept:: @ 8246BB2
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlAccept::
 	.string "Why, thanks!\p"
 	.string "I'll get the registration done\n"
 	.string "right now!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlReject:: @ 8246BE9
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BattleGirlReject::
 	.string "With you, I thought we could form\n"
 	.string "the ultimate tag team…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMIntro:: @ 8246C22
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMIntro::
 	.string "I'm TRIATHLETE {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon1:: @ 8246C35
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon1::
 	.string "I've been running with one {STR_VAR_2}\n"
 	.string "that knows how to use {STR_VAR_1}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon2Ask:: @ 8246C6C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMMon2Ask::
 	.string "and one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "We could be in a tag team.\n"
 	.string "Wouldn't that be great?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMAccept:: @ 8246CB3
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMAccept::
 	.string "Thank you!\p"
 	.string "I'll go register us, and that's\n"
 	.string "right now!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMReject:: @ 8246CE9
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CyclingTriathleteMReject::
 	.string "Aww, that's too bad. We would've been\n"
 	.string "the toughest tag team around!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMIntro:: @ 8246D2D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMIntro::
 	.string "Me?\n"
 	.string "I'm TUBER {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon1:: @ 8246D3F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon1::
 	.string "What do I have with me?\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon2Ask:: @ 8246D6A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Hey?\n"
 	.string "You'll team up with me, right?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMAccept:: @ 8246D9E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMAccept::
 	.string "Okay!\p"
 	.string "I'll go register!\n"
 	.string "Let's be excellent together!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMReject:: @ 8246DD3
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_TuberMReject::
 	.string "My POKéMON are tough for sure…\n"
 	.string "It's too bad you don't want to team up.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristIntro:: @ 8246E1A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristIntro::
 	.string "Yay-hey!\n"
 	.string "Call me GUITARIST {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon1:: @ 8246E39
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon1::
 	.string "Check out my entourage!\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon2Ask:: @ 8246E64
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Yay-hey! Pretty wild, huh?\n"
 	.string "We'll have to do a duet in a tag team!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristAccept:: @ 8246EB6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristAccept::
 	.string "Yay-hey! Right on!\n"
 	.string "I'll do that registration stuff now!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristReject:: @ 8246EEE
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_GuitaristReject::
 	.string "My POKéMON rock hard!\n"
 	.string "You'll be sorry, I tell you!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanIntro:: @ 8246F21
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanIntro::
 	.string "Pleased to meet you.\n"
 	.string "I am {STR_VAR_1}, a GENTLEMAN.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon1:: @ 8246F4C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon1::
 	.string "I am accompanied by my trusted\n"
 	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon2Ask:: @ 8246F7B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanMon2Ask::
 	.string "one {STR_VAR_1}-using {STR_VAR_2}.\p"
 	.string "May I ask you to join me in a tag-team\n"
 	.string "partnership arrangement?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanAccept:: @ 8246FCC
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanAccept::
 	.string "Ah, I thank you for your trust.\n"
 	.string "I shall be done with the registration.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanReject:: @ 8247013
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_GentlemanReject::
 	.string "That is most unfortunate…\p"
 	.string "I shall look forward to the next\n"
 	.string "opportunity…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMIntro:: @ 824705B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMIntro::
 	.string "Hello, I'm {STR_VAR_1},\n"
 	.string "and I'm a POKéFAN.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon1:: @ 824707D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon1::
 	.string "I have with me now one {STR_VAR_2}\n"
 	.string "that knows the move {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon2Ask:: @ 82470B2
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "Do you like what you see?\n"
 	.string "Why don't you be my tag partner?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMAccept:: @ 82470FD
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMAccept::
 	.string "Thank you!\n"
 	.string "I'll look after the registration!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMReject:: @ 824712A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanMReject::
 	.string "My POKéMON are top grade…\n"
 	.string "It's too bad you can't appreciate that.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMIntro:: @ 824716C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMIntro::
 	.string "Hm!\n"
 	.string "I am {STR_VAR_1}, and an EXPERT am I!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon1:: @ 824718D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon1::
 	.string "The POKéMON that I've toughened up are\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon2Ask:: @ 82471C7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "What say you to a tag team with me?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMAccept:: @ 82471FB
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMAccept::
 	.string "Hm!\n"
 	.string "I shall register us right away!\l"
 	.string "Let us both do our best!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMReject:: @ 8247238
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertMReject::
 	.string "I will hope that your choice is\n"
 	.string "indeed correct…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFIntro:: @ 8247268
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFIntro::
 	.string "Hello, hello.\n"
 	.string "I'm {STR_VAR_1}, and I'm an EXPERT.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon1:: @ 8247291
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon1::
 	.string "I've raised my POKéMON thoroughly.\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon2Ask:: @ 82472C7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}--\n"
 	.string "they're what I have.\p"
 	.string "Wouldn't you like to team up with me?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFAccept:: @ 8247313
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFAccept::
 	.string "Good, good.\n"
 	.string "I'll see to the registration right away.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFReject:: @ 8247348
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ExpertFReject::
 	.string "Perhaps we can form a team the next\n"
 	.string "time we meet.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerIntro:: @ 824737A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerIntro::
 	.string "I'm DRAGON TAMER {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon1:: @ 824738F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon1::
 	.string "The team I've been toughening up is\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon2Ask:: @ 82473C6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "How about it?\n"
 	.string "Want to be my partner?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerAccept:: @ 82473FB
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerAccept::
 	.string "Okay, I'll give it my best!\n"
 	.string "I'll go register now, all right?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerReject:: @ 8247438
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_DragonTamerReject::
 	.string "You're not going to find many tougher\n"
 	.string "partners than me!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperIntro:: @ 8247470
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperIntro::
 	.string "I'm BIRD KEEPER {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon1:: @ 8247484
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon1::
 	.string "What POKéMON do I have?\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon2Ask:: @ 82474AF
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "Don't you think we'd make a decent\n"
 	.string "tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperAccept:: @ 82474EC
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperAccept::
 	.string "Great, thanks!\n"
 	.string "I'll look after the registration!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperReject:: @ 824751D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperReject::
 	.string "My POKéMON and I are strong.\n"
 	.string "What a letdown.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro:: @ 824754A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro::
 	.string "I'm NINJA BOY {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon1:: @ 824755C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon1::
 	.string "My POKéMON team consists of one\n"
 	.string "{STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon2Ask:: @ 824758B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Let's be in a tag team together!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept:: @ 82475BC
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept::
 	.string "Yay!\n"
 	.string "Let me go register!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyReject:: @ 82475D5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyReject::
 	.string "You'll regret not having my tough\n"
 	.string "POKéMON on your side!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyIntro:: @ 824760D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyIntro::
 	.string "Hello!\n"
 	.string "I'm PARASOL LADY {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon1:: @ 8247629
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon1::
 	.string "Escorting me now are my {STR_VAR_2}\n"
 	.string "that uses {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon2Ask:: @ 8247655
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon2Ask::
 	.string "one {STR_VAR_2} that uses\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Aren't they nice?\n"
 	.string "Care to join us in a tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyAccept:: @ 824769B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyAccept::
 	.string "Thanks a bunch!\p"
 	.string "I'll go register at the counter.\n"
 	.string "Let's not disappoint each other!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyReject:: @ 82476ED
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyReject::
 	.string "My POKéMON are tremendously strong.\n"
 	.string "How disappointing…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacIntro:: @ 8247724
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacIntro::
 	.string "Hello.\n"
 	.string "I'm {STR_VAR_1}, and I'm a BUG MANIAC!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon1:: @ 8247749
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon1::
 	.string "I have found my POKéMON, yes.\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon2Ask:: @ 824777A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}--\n"
 	.string "they are what I found.\p"
 	.string "Could I interest you in forming\n"
 	.string "a tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept:: @ 82477CE
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept::
 	.string "Okay!\n"
 	.string "Understood!\p"
 	.string "I won't be long with the registration!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject:: @ 8247807
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject::
 	.string "With the POKéMON I found, we wouldn't\n"
 	.string "have lost…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorIntro:: @ 8247838
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorIntro::
 	.string "Ahoy, there!\n"
 	.string "I'm SAILOR {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon1:: @ 8247854
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon1::
 	.string "Let me show you my pride and joy!\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon2Ask:: @ 8247889
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Of course you're not going to turn\n"
 	.string "me down. We will team up, right?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorAccept:: @ 82478DD
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorAccept::
 	.string "I didn't expect any less!\n"
 	.string "I'll go register now.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorReject:: @ 824790D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorReject::
 	.string "We would've stormed through\n"
 	.string "the opposition! Too bad!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorIntro:: @ 8247942
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorIntro::
 	.string "Hi, I'm {STR_VAR_1}.\n"
 	.string "I'm a COLLECTOR.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon1:: @ 824795F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon1::
 	.string "The jewels in my collection are\n"
 	.string "my {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon2Ask:: @ 8247991
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Swell, huh?\n"
 	.string "We should be in a team together.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorAccept:: @ 82479CE
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorAccept::
 	.string "Oh, yeah!\p"
 	.string "Well, let's not waste any time.\n"
 	.string "I'll go register the two of us.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorReject:: @ 8247A18
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorReject::
 	.string "Well, that's upsetting.\n"
 	.string "You don't appreciate my POKéMON.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMIntro:: @ 8247A51
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMIntro::
 	.string "Howdy, I'm {STR_VAR_1}.\n"
 	.string "I'm a POKéMON RANGER.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon1:: @ 8247A76
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon1::
 	.string "Keeping me company are one\n"
 	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask:: @ 8247AA1
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Don't you think we'd make an impressive\n"
 	.string "tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMAccept:: @ 8247AE3
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMAccept::
 	.string "That's super!\n"
 	.string "I'll deal with the registration now.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMReject:: @ 8247B16
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMReject::
 	.string "Next time, choose my POKéMON,\n"
 	.string "will you?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFIntro:: @ 8247B3E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFIntro::
 	.string "My name's {STR_VAR_1}.\n"
 	.string "I'm a POKéMON RANGER!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon1:: @ 8247B62
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon1::
 	.string "Let me tell you about my team. I have\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon2Ask:: @ 8247B9B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "How would you like to form a tag team\n"
 	.string "with my little posse?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept:: @ 8247BE7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept::
 	.string "We'll be at our best!\n"
 	.string "I'll get the registration done quick!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFReject:: @ 8247C23
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFReject::
 	.string "I hope you'll choose my POKéMON\n"
 	.string "next time.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyIntro:: @ 8247C4E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyIntro::
 	.string "Pleased to meet you. I'm {STR_VAR_1}.\n"
 	.string "I consider myself an AROMA LADY.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon1:: @ 8247C8C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon1::
 	.string "I travel with one {STR_VAR_2}\n"
 	.string "that uses {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon2Ask:: @ 8247CB2
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon2Ask::
 	.string "one {STR_VAR_2} that uses\n"
 	.string "{STR_VAR_1}.\p"
 	.string "I hope they strike your fancy.\n"
 	.string "Would you care to be my partner?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyAccept:: @ 8247D07
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyAccept::
 	.string "I'm honored by your acceptance.\n"
 	.string "I will go register right this instant.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyReject:: @ 8247D4E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyReject::
 	.string "It would be wonderful if we could form\n"
 	.string "a tag team the next time we meet.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro:: @ 8247D97
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro::
 	.string "Want to know who I am?\n"
 	.string "I'm {STR_VAR_1}, the RUIN MANIAC!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1:: @ 8247DC7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1::
 	.string "The POKéMON that I have with me are\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask:: @ 8247DFE
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Intriguing, eh?\n"
 	.string "How about you and I partner up?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept:: @ 8247E3E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept::
 	.string "That's a sound decision!\n"
 	.string "I'll go do the registration paperwork.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacReject:: @ 8247E7E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacReject::
 	.string "Hmm…\n"
 	.string "I think my POKéMON are tough…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro:: @ 8247EA1
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro::
 	.string "I'm COOLTRAINER {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon1:: @ 8247EB5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon1::
 	.string "The POKéMON I have right now are one\n"
 	.string "{STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon2Ask:: @ 8247EE9
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\n"
 	.string "Cool, huh?\p"
 	.string "Don't you think it'd be pretty cool\n"
 	.string "if we made a tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMAccept:: @ 8247F3F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMAccept::
 	.string "Cool!\n"
 	.string "I'll go do the registration in a flash!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject:: @ 8247F6D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject::
 	.string "I thought that we'd make just\n"
 	.string "the greatest team ever.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro:: @ 8247FA3
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro::
 	.string "I'm COOLTRAINER {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1:: @ 8247FB7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1::
 	.string "The team I've been raising has one\n"
 	.string "{STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon2Ask:: @ 8247FE9
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "Does that sound okay?\n"
 	.string "How about we become tag partners?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFAccept:: @ 8248031
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFAccept::
 	.string "Sounds A-OK!\n"
 	.string "I'd better do the registration.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFReject:: @ 824805E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFReject::
 	.string "I was thinking how we would be\n"
 	.string "one tough team…$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro:: @ 824808D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro::
 	.string "Heyo!\n"
 	.string "I'm {STR_VAR_1}, the POKéMANIAC!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon1:: @ 82480AB
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon1::
 	.string "What does a guy like me have?\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon2Ask:: @ 82480DC
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1},\n"
 	.string "that's what!\p"
 	.string "Let's do it!\n"
 	.string "We'll stomp around as a tag team!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacAccept:: @ 8248128
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacAccept::
 	.string "Good call!\n"
 	.string "I'll register the both of us!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacReject:: @ 8248151
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacReject::
 	.string "My POKéMON are brutal!\n"
 	.string "It's not my fault if you regret this!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerIntro:: @ 824818E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerIntro::
 	.string "Yo, there!\n"
 	.string "I'm KINDLER {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon1:: @ 82481A9
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon1::
 	.string "You know what my training cooked up?\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon2Ask:: @ 82481E1
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Well, what do you say?\n"
 	.string "Want to form a tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerAccept:: @ 8248221
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerAccept::
 	.string "All right!\n"
 	.string "I'll get on with the registration.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerReject:: @ 824824F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerReject::
 	.string "Promise you'll partner up with me\n"
 	.string "the next time we run into each other.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperIntro:: @ 8248297
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperIntro::
 	.string "I'm {STR_VAR_1}, and I'm a CAMPER!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1:: @ 82482B1
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1::
 	.string "I've been raising one {STR_VAR_1}-\n"
 	.string "using {STR_VAR_2} and one$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask:: @ 82482DC
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask::
 	.string "{STR_VAR_1}-using {STR_VAR_2}.\p"
 	.string "Do you think it'd be fun to team up?\n"
 	.string "I bet it would be!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept:: @ 8248321
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept::
 	.string "Yeah!\n"
 	.string "Off I go to register!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject:: @ 824833D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject::
 	.string "Next time, okay?\n"
 	.string "I want to be on your team.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro:: @ 8248369
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro::
 	.string "Hello!\n"
 	.string "I'm {STR_VAR_1}, and I'm a PICNICKER!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1:: @ 824838D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1::
 	.string "The POKéMON I've been taking are\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon2Ask:: @ 82483C1
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "Are you interested in joining me\n"
 	.string "on a tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept:: @ 8248401
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept::
 	.string "Why, thank you!\n"
 	.string "I will do the registration now.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerReject:: @ 8248431
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerReject::
 	.string "It would be nice if I could join you\n"
 	.string "some other time.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro:: @ 8248467
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro::
 	.string "I'm PSYCHIC {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon1:: @ 8248477
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon1::
 	.string "The twosome I've been raising are\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask:: @ 82484AC
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "Would you like to form a tag team\n"
 	.string "with me?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMAccept:: @ 82484E7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMAccept::
 	.string "Sure thing!\n"
 	.string "I'll take care of the registration!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject:: @ 8248517
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject::
 	.string "If we meet again, that's when I'd like\n"
 	.string "to team up with you.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro:: @ 8248553
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro::
 	.string "I'm {STR_VAR_1}.\n"
 	.string "I'm a PSYCHIC.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1:: @ 824856A
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1::
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon2Ask:: @ 824857D
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}--\n"
 	.string "they're my disciples.\p"
 	.string "Doesn't the idea of forming a tag-team\n"
 	.string "partnership intrigue you?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept:: @ 82485E5
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept::
 	.string "Thank you.\n"
 	.string "I'll go deal with the registration.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFReject:: @ 8248614
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFReject::
 	.string "I hope there will be another chance\n"
 	.string "to forge an alliance.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFIntro:: @ 824864E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFIntro::
 	.string "I'm SCHOOL KID {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1:: @ 8248661
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1::
 	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask:: @ 8248671
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask::
 	.string "and one {STR_VAR_1}-using\n"
 	.string "{STR_VAR_2} are my POKéMON pair.\p"
 	.string "May I please be your partner on\n"
 	.string "a tag team?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFAccept:: @ 82486C6
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFAccept::
 	.string "Ooh, thank you!\n"
 	.string "I'll register at the counter right away!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFReject:: @ 82486FF
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFReject::
 	.string "Please?\n"
 	.string "May I join you the next time?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFIntro:: @ 8248725
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFIntro::
 	.string "Hiya! The name's {STR_VAR_1}!\n"
 	.string "I'm a POKéMON BREEDER!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon1:: @ 8248751
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon1::
 	.string "The POKéMON I've raised are one\n"
 	.string "{STR_VAR_1}-using {STR_VAR_2} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon2Ask:: @ 8248781
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFMon2Ask::
 	.string "one {STR_VAR_1}-using {STR_VAR_2}.\p"
 	.string "Sound interesting?\n"
 	.string "How about we form a tag team, then?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFAccept:: @ 82487C9
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFAccept::
 	.string "All righty!\n"
 	.string "You leave the registration to me!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFReject:: @ 82487F7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFReject::
 	.string "You have to team up with me next time,\n"
 	.string "all right?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFIntro:: @ 8248829
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFIntro::
 	.string "I'm {STR_VAR_1}, and I'm proud to say\n"
 	.string "that I am a POKéFAN.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon1:: @ 824885B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon1::
 	.string "The darling POKéMON I've raised are\n"
 	.string "one {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon2Ask:: @ 8248892
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}.\p"
 	.string "Aren't they just the cutest?\n"
 	.string "We ought to make a team!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFAccept:: @ 82488D8
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFAccept::
 	.string "Thank you, dear!\n"
 	.string "I'll be on my way to register!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject:: @ 8248908
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject::
 	.string "My darling POKéMON are the best,\n"
 	.string "I'll have you know. How annoying!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFIntro:: @ 824894B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFIntro::
 	.string "Hi, I'm SWIMMER {STR_VAR_1}.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1:: @ 824895F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1::
 	.string "One {STR_VAR_1}-using {STR_VAR_2}$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon2Ask:: @ 824896F
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon2Ask::
 	.string "and one {STR_VAR_1}-using\n"
 	.string "{STR_VAR_2} are what I've trained.\p"
 	.string "You and me, let's make a tag team.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFAccept:: @ 82489BD
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFAccept::
 	.string "That's cool!\n"
 	.string "I'll register the two of us.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject:: @ 82489E7
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject::
 	.string "If we meet again, you owe me\n"
 	.string "a tag team!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro:: @ 8248A10
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro::
 	.string "What's happening?\n"
 	.string "I'm {STR_VAR_1}, and I'm a TRIATHLETE.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon1:: @ 8248A40
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon1::
 	.string "I got a couple decent POKéMON.\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon2Ask:: @ 8248A72
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "It'd be neat if we made a tag team\n"
 	.string "together, so how about it?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept:: @ 8248AC0
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept::
 	.string "Right on!\n"
 	.string "You wait while I register, okay?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMReject:: @ 8248AEB
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMReject::
 	.string "I expect you'll let me join you\n"
 	.string "next time, how's that?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro:: @ 8248B22
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro::
 	.string "I'm the TRIATHLETE {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1:: @ 8248B39
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1::
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon2Ask:: @ 8248B4C
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon2Ask::
 	.string "another {STR_VAR_2} that knows how\n"
 	.string "to use {STR_VAR_1}. That's my pair.\p"
 	.string "What do you think?\n"
 	.string "We'd make a good team, I'd say.$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFAccept:: @ 8248BB4
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFAccept::
 	.string "I like that answer!\n"
 	.string "I'll get done with registration fast!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFReject:: @ 8248BEE
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFReject::
 	.string "You'll give me another chance to form\n"
 	.string "a partnership, won't you?$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMIntro:: @ 8248C2E
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMIntro::
 	.string "Hi, there! Hello!\n"
 	.string "I'm {STR_VAR_1}, and I'm a SWIMMER!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon1:: @ 8248C5B
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon1::
 	.string "Check out what I've been raising!\n"
 	.string "One {STR_VAR_2} with {STR_VAR_1} and$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask:: @ 8248C90
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask::
 	.string "one {STR_VAR_2} with {STR_VAR_1}!\p"
 	.string "Sweet, huh?\n"
 	.string "It'd be sweet to form a team, too!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMAccept:: @ 8248CCF
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMAccept::
 	.string "Much obliged!\n"
 	.string "I'll get this registration thing done!$"
 
-BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject:: @ 8248D04
+BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject::
 	.string "If we meet again, you have to team up\n"
 	.string "with me. You'll do that, right?$"
 
diff --git a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
index b7dfe19fa..360b8162c 100644
--- a/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
+++ b/data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
@@ -1,18 +1,18 @@
-BattleFrontier_ExchangeServiceCorner_MapScripts:: @ 825F070
+BattleFrontier_ExchangeServiceCorner_MapScripts::
 	.byte 0
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome:: @ 825F071
+BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize, MSGBOX_DEFAULT
 	special ShowBattlePointsWindow
 	return
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye:: @ 825F07D
+BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints, MSGBOX_DEFAULT
 	special CloseBattlePointsWindow
 	release
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize:: @ 825F08A
+BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize::
 	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
 	goto_if_ge BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize
@@ -26,7 +26,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize:: @ 825F08A
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize:: @ 825F0C9
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize::
 	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor
 	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
@@ -34,7 +34,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize:: @ 825F0C9
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor::
 	checkdecorspace VAR_0x8009
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor
@@ -49,13 +49,13 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor:: @ 825F11D
+BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_PCIsFull, MSGBOX_DEFAULT
 	special CloseBattlePointsWindow
 	release
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem::
 	checkitemspace VAR_0x8009, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_BagFull
@@ -70,13 +70,13 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_BagFull:: @ 825F166
+BattleFrontier_ExchangeServiceCorner_EventScript_BagFull::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_DontHaveSpaceToHoldIt, MSGBOX_DEFAULT
 	special CloseBattlePointsWindow
 	release
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk1:: @ 825F173
+BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk1::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
@@ -84,7 +84,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk1:: @ 825F173
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1:: @ 825F185
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1::
 	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1
 	special ShowFrontierExchangeCornerItemIconWindow
 	special ShowScrollableMultichoice
@@ -105,7 +105,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1:: @ 825F185
 	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster:: @ 825F21E
+BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -114,7 +114,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster:: @ 825F21E
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion:: @ 825F241
+BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -123,7 +123,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion:: @ 825F241
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll:: @ 825F264
+BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -132,7 +132,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll:: @ 825F264
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll:: @ 825F287
+BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -141,7 +141,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll:: @ 825F287
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll:: @ 825F2AA
+BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -150,7 +150,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll:: @ 825F2AA
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll:: @ 825F2CD
+BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -159,7 +159,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll:: @ 825F2CD
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll:: @ 825F2F0
+BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -168,7 +168,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll:: @ 825F2F0
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll:: @ 825F313
+BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -177,7 +177,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll:: @ 825F313
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll:: @ 825F336
+BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -186,7 +186,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll:: @ 825F336
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll:: @ 825F359
+BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -195,7 +195,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll:: @ 825F359
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk2:: @ 825F37C
+BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk2::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
@@ -203,7 +203,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk2:: @ 825F37C
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2:: @ 825F38E
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2::
 	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2
 	special ShowFrontierExchangeCornerItemIconWindow
 	special ShowScrollableMultichoice
@@ -219,7 +219,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2:: @ 825F38E
 	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll:: @ 825F3F0
+BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
@@ -228,7 +228,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll:: @ 825F3F0
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll:: @ 825F413
+BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
@@ -237,7 +237,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll:: @ 825F413
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll:: @ 825F436
+BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
@@ -246,7 +246,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll:: @ 825F436
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll:: @ 825F459
+BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
@@ -255,7 +255,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll:: @ 825F459
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll:: @ 825F47C
+BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
@@ -264,7 +264,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll:: @ 825F47C
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_VitaminClerk:: @ 825F49F
+BattleFrontier_ExchangeServiceCorner_EventScript_VitaminClerk::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
@@ -272,7 +272,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_VitaminClerk:: @ 825F49F
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin:: @ 825F4B1
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin::
 	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR
 	special ShowFrontierExchangeCornerItemIconWindow
 	special ShowScrollableMultichoice
@@ -289,7 +289,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin:: @ 825F4B1
 	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Protein:: @ 825F51E
+BattleFrontier_ExchangeServiceCorner_EventScript_Protein::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -298,7 +298,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Protein:: @ 825F51E
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Calcium:: @ 825F541
+BattleFrontier_ExchangeServiceCorner_EventScript_Calcium::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -307,7 +307,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Calcium:: @ 825F541
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Iron:: @ 825F564
+BattleFrontier_ExchangeServiceCorner_EventScript_Iron::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -316,7 +316,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Iron:: @ 825F564
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Zinc:: @ 825F587
+BattleFrontier_ExchangeServiceCorner_EventScript_Zinc::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -325,7 +325,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Zinc:: @ 825F587
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Carbos:: @ 825F5AA
+BattleFrontier_ExchangeServiceCorner_EventScript_Carbos::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -334,7 +334,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Carbos:: @ 825F5AA
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_HPUp:: @ 825F5CD
+BattleFrontier_ExchangeServiceCorner_EventScript_HPUp::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -343,7 +343,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_HPUp:: @ 825F5CD
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_HoldItemClerk:: @ 825F5F0
+BattleFrontier_ExchangeServiceCorner_EventScript_HoldItemClerk::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, EXCHANGE_CORNER_HOLD_ITEM_CLERK
@@ -351,7 +351,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_HoldItemClerk:: @ 825F5F0
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem:: @ 825F602
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem::
 	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR
 	special ShowFrontierExchangeCornerItemIconWindow
 	special ShowScrollableMultichoice
@@ -371,7 +371,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem:: @ 825F602
 	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers:: @ 825F690
+BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -380,7 +380,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers:: @ 825F690
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb:: @ 825F6B3
+BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -389,7 +389,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb:: @ 825F6B3
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw:: @ 825F6D6
+BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -398,7 +398,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw:: @ 825F6D6
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb:: @ 825F6F9
+BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -407,7 +407,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb:: @ 825F6F9
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder:: @ 825F71C
+BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -416,7 +416,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder:: @ 825F71C
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand:: @ 825F73F
+BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -425,7 +425,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand:: @ 825F73F
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock:: @ 825F762
+BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -434,7 +434,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock:: @ 825F762
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand:: @ 825F785
+BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -443,7 +443,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand:: @ 825F785
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens:: @ 825F7A8
+BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -452,29 +452,29 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens:: @ 825F7A8
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Man:: @ 825F7CB
+BattleFrontier_ExchangeServiceCorner_EventScript_Man::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll, MSGBOX_NPC
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Sailor:: @ 825F7D4
+BattleFrontier_ExchangeServiceCorner_EventScript_Sailor::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher, MSGBOX_NPC
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF:: @ 825F7DD
+BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF::
 	lock
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy:: @ 825F7E8
+BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls, MSGBOX_NPC
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Girl:: @ 825F7F1
+BattleFrontier_ExchangeServiceCorner_EventScript_Girl::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord, MSGBOX_NPC
 	end
 
-BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize: @ 825F7FA
+BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize:
 	.string "Hello, this is the EXCHANGE SERVICE\n"
 	.string "CORNER.\p"
 	.string "We exchange the Battle Points you\n"
@@ -482,154 +482,154 @@ BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize: @ 825F7FA
 	.string "Please choose a prize from this list.$"
 
 @ Unused
-BattleFrontier_ExchangeServiceCorner_Text_PleaseChoosePrize: @ 825F890
+BattleFrontier_ExchangeServiceCorner_Text_PleaseChoosePrize:
 	.string "Please choose a prize from this list.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster: @ 825F8B6
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster:
 	.string "You've chosen the KISS POSTER.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion: @ 825F8E6
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion:
 	.string "You've chosen the KISS CUSHION.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll: @ 825F917
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll:
 	.string "You've chosen the SMOOCHUM DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll: @ 825F949
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll:
 	.string "You've chosen the TOGEPI DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll: @ 825F979
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll:
 	.string "You've chosen the MEOWTH DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll: @ 825F9A9
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll:
 	.string "You've chosen the CLEFAIRY DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll: @ 825F9DB
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll:
 	.string "You've chosen the DITTO DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll: @ 825FA0A
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll:
 	.string "You've chosen the CYNDAQUIL DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll: @ 825FA3D
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll:
 	.string "You've chosen the CHIKORITA DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll: @ 825FA70
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll:
 	.string "You've chosen the TOTODILE DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll: @ 825FAA2
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll:
 	.string "You've chosen the LAPRAS DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll: @ 825FAD2
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll:
 	.string "You've chosen the SNORLAX DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll: @ 825FB03
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll:
 	.string "You've chosen the VENUSAUR DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll: @ 825FB35
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll:
 	.string "You've chosen the CHARIZARD DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll: @ 825FB68
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll:
 	.string "You've chosen the BLASTOISE DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein: @ 825FB9B
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein:
 	.string "You've chosen the PROTEIN.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium: @ 825FBC7
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium:
 	.string "You've chosen the CALCIUM.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron: @ 825FBF3
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron:
 	.string "You've chosen the IRON.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc: @ 825FC1C
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc:
 	.string "You've chosen the ZINC.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos: @ 825FC45
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos:
 	.string "You've chosen the CARBOS.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp: @ 825FC70
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp:
 	.string "You've chosen the HP UP.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder: @ 825FC9A
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder:
 	.string "You've chosen the BRIGHTPOWDER.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb: @ 825FCCB
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb:
 	.string "You've chosen the WHITE HERB.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw: @ 825FCFA
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw:
 	.string "You've chosen the QUICK CLAW.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb: @ 825FD29
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb:
 	.string "You've chosen the MENTAL HERB.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand: @ 825FD59
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand:
 	.string "You've chosen the CHOICE BAND.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock: @ 825FD89
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock:
 	.string "You've chosen the KING'S ROCK.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand: @ 825FDB9
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand:
 	.string "You've chosen the FOCUS BAND.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens: @ 825FDE8
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens:
 	.string "You've chosen the SCOPE LENS.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers: @ 825FE17
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers:
 	.string "You've chosen the LEFTOVERS.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC: @ 825FE45
+BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC:
 	.string "Thank you!\n"
 	.string "We'll send it to your PC at home.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize: @ 825FE72
+BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize:
 	.string "Here is your prize!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_DontHaveEnoughPoints: @ 825FE86
+BattleFrontier_ExchangeServiceCorner_Text_DontHaveEnoughPoints:
 	.string "I'm so sorry…\n"
 	.string "You don't have enough Battle Points…$"
 
-BattleFrontier_ExchangeServiceCorner_Text_PCIsFull: @ 825FEB9
+BattleFrontier_ExchangeServiceCorner_Text_PCIsFull:
 	.string "I'm so sorry…\n"
 	.string "Your PC appears to be full…$"
 
-BattleFrontier_ExchangeServiceCorner_Text_DontHaveSpaceToHoldIt: @ 825FEE3
+BattleFrontier_ExchangeServiceCorner_Text_DontHaveSpaceToHoldIt:
 	.string "I'm so sorry…\n"
 	.string "You don't have space to hold it…$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints: @ 825FF12
+BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints:
 	.string "Thank you very much.\p"
 	.string "Please visit us when you have\n"
 	.string "saved up Battle Points.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls: @ 825FF5D
+BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls:
 	.string "Oh, they're so nice!\n"
 	.string "I wish I had them!\l"
 	.string "Cute cushions!\l"
@@ -637,18 +637,18 @@ BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls: @ 825FF5D
 	.string "Little plush DOLLS!\l"
 	.string "I wish I had them all!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant: @ 825FFD0
+BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant:
 	.string "Leave it to your mommy!\p"
 	.string "If it's anything you want, I'll go\n"
 	.string "through anything to get it, honey!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher: @ 826002E
+BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher:
 	.string "If I can get hold of the items here,\n"
 	.string "my POKéMON will get tougher.\p"
 	.string "You bet they will!\n"
 	.string "No question about it!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll: @ 8260099
+BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll:
 	.string "Hah?\n"
 	.string "What are you gawking at?\p"
 	.string "I don't like you staring at my plush\n"
@@ -656,110 +656,110 @@ BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll: @ 8260099
 	.string "If you want it, go get one yourself!\n"
 	.string "Isn't that right, SMOOCHUM?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord: @ 826012D
+BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord:
 	.string "Did you know?\p"
 	.string "If you stretch your record at any of\n"
 	.string "the BATTLE facilities, they start\l"
 	.string "giving you more and more Battle Points.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_KissPosterDesc:: @ 82601AA
+BattleFrontier_ExchangeServiceCorner_Text_KissPosterDesc::
 	.string "A large poster with a SMOOCHUM print.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_KissCushionDesc:: @ 82601D0
+BattleFrontier_ExchangeServiceCorner_Text_KissCushionDesc::
 	.string "A SMOOCHUM cushion.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_SmoochumDollDesc:: @ 8260201
+BattleFrontier_ExchangeServiceCorner_Text_SmoochumDollDesc::
 	.string "A SMOOCHUM DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_TogepiDollDesc:: @ 826022F
+BattleFrontier_ExchangeServiceCorner_Text_TogepiDollDesc::
 	.string "A TOGEPI DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_MeowthDollDesc:: @ 826025B
+BattleFrontier_ExchangeServiceCorner_Text_MeowthDollDesc::
 	.string "A MEOWTH DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ClefairyDollDesc:: @ 8260287
+BattleFrontier_ExchangeServiceCorner_Text_ClefairyDollDesc::
 	.string "A CLEFAIRY DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_DittoDollDesc:: @ 82602B5
+BattleFrontier_ExchangeServiceCorner_Text_DittoDollDesc::
 	.string "A DITTO DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_CyndaquilDollDesc:: @ 82602E0
+BattleFrontier_ExchangeServiceCorner_Text_CyndaquilDollDesc::
 	.string "A CYNDAQUIL DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ChikoritaDollDesc:: @ 826030F
+BattleFrontier_ExchangeServiceCorner_Text_ChikoritaDollDesc::
 	.string "A CHIKORITA DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_TotodileDollDesc:: @ 826033E
+BattleFrontier_ExchangeServiceCorner_Text_TotodileDollDesc::
 	.string "A TOTODILE DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc:: @ 826036C
+BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc::
 	.string "A large DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc:: @ 8260397
+BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc::
 	.string "Raises the stat ATTACK of one\n"
 	.string "POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc:: @ 82603BE
+BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc::
 	.string "Raises the stat SP. ATK of one\n"
 	.string "POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_IronDesc:: @ 82603E6
+BattleFrontier_ExchangeServiceCorner_Text_IronDesc::
 	.string "Raises the stat DEFENSE of one\n"
 	.string "POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ZincDesc:: @ 826040E
+BattleFrontier_ExchangeServiceCorner_Text_ZincDesc::
 	.string "Raises the stat SP. DEF of one\n"
 	.string "POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_CarbosDesc:: @ 8260436
+BattleFrontier_ExchangeServiceCorner_Text_CarbosDesc::
 	.string "Raises the stat SPEED of one\n"
 	.string "POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_HPUpDesc:: @ 826045C
+BattleFrontier_ExchangeServiceCorner_Text_HPUpDesc::
 	.string "Raises the HP of one POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc:: @ 826047A
+BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc::
 	.string "A hold item that gradually restores\n"
 	.string "HP in battle.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc:: @ 82604AC
+BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc::
 	.string "A hold item that restores any\n"
 	.string "lowered stat.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_QuickClawDesc:: @ 82604D8
+BattleFrontier_ExchangeServiceCorner_Text_QuickClawDesc::
 	.string "A hold item that occasionally allows\n"
 	.string "the first strike.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_MentalHerbDesc:: @ 826050F
+BattleFrontier_ExchangeServiceCorner_Text_MentalHerbDesc::
 	.string "A hold item that snaps POKéMON out\n"
 	.string "of infatuation.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_BrightpowderDesc:: @ 8260542
+BattleFrontier_ExchangeServiceCorner_Text_BrightpowderDesc::
 	.string "A hold item that casts a glare to\n"
 	.string "reduce accuracy.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ChoiceBandDesc:: @ 8260575
+BattleFrontier_ExchangeServiceCorner_Text_ChoiceBandDesc::
 	.string "Raises a move's power, but permits\n"
 	.string "only that move.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_KingsRockDesc:: @ 82605A8
+BattleFrontier_ExchangeServiceCorner_Text_KingsRockDesc::
 	.string "A hold item that may cause flinching\n"
 	.string "when the foe is hit.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_FocusBandDesc:: @ 82605E2
+BattleFrontier_ExchangeServiceCorner_Text_FocusBandDesc::
 	.string "A hold item that occasionally\n"
 	.string "prevents fainting.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ScopeLensDesc:: @ 8260613
+BattleFrontier_ExchangeServiceCorner_Text_ScopeLensDesc::
 	.string "A hold item that raises the\n"
 	.string "critical-hit rate.$"
diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc
index 0ded021b6..0455d577c 100644
--- a/data/maps/BattleFrontier_Lounge1/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge1/scripts.inc
@@ -1,8 +1,8 @@
-BattleFrontier_Lounge1_MapScripts:: @ 825E774
+BattleFrontier_Lounge1_MapScripts::
 	.byte 0
 
 @ NPC that rates pokemon based on their IVs
-BattleFrontier_Lounge1_EventScript_Breeder:: @ 825E775
+BattleFrontier_Lounge1_EventScript_Breeder::
 	lock
 	faceplayer
 	call_if_unset FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_BreederIntro
@@ -11,7 +11,7 @@ BattleFrontier_Lounge1_EventScript_Breeder:: @ 825E775
 	goto BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder
 	end
 
-BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder:: @ 825E792
+BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder::
 	special ChoosePartyMon
 	waitstate
 	compare VAR_0x8004, 255
@@ -20,11 +20,11 @@ BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder:: @ 825E792
 	goto_if_eq BattleFrontier_Lounge1_EventScript_CancelMonSelect
 	end
 
-BattleFrontier_Lounge1_EventScript_BreederIntro:: @ 825E7AD
+BattleFrontier_Lounge1_EventScript_BreederIntro::
 	msgbox BattleFrontier_Lounge1_Text_PokemonBreederIntro, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder:: @ 825E7B6
+BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder::
 	msgbox BattleFrontier_Lounge1_Text_LetsLookAtYourPokemon, MSGBOX_DEFAULT
 	return
 
@@ -32,7 +32,7 @@ BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder:: @ 825E7B6
 @ VAR_0x8005: Sum of the mons IVs
 @ VAR_0x8006: Stat id of highest IV stat
 @ VAR_0x8007: IV of the highest IV stat
-BattleFrontier_Lounge1_EventScript_ShowMonToBreeder:: @ 825E7BF
+BattleFrontier_Lounge1_EventScript_ShowMonToBreeder::
 	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
 	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq BattleFrontier_Lounge1_EventScript_ShowEggToBreeder
@@ -47,13 +47,13 @@ BattleFrontier_Lounge1_EventScript_ShowMonToBreeder:: @ 825E7BF
 	goto_if_ge BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs
 	end
 
-BattleFrontier_Lounge1_EventScript_ShowEggToBreeder:: @ 825E7FF
+BattleFrontier_Lounge1_EventScript_ShowEggToBreeder::
 	msgbox BattleFrontier_Lounge1_Text_EvenICantTell, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder
 	end
 
 @ Comment on the highest IV stat
-BattleFrontier_Lounge1_EventScript_HighestIVStat:: @ 825E80D
+BattleFrontier_Lounge1_EventScript_HighestIVStat::
 	compare VAR_0x8006, STAT_HP
 	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVHP
 	compare VAR_0x8006, STAT_ATK
@@ -69,7 +69,7 @@ BattleFrontier_Lounge1_EventScript_HighestIVStat:: @ 825E80D
 	end
 
 @ Comment on the highest IV value
-BattleFrontier_Lounge1_EventScript_HighestIVValue:: @ 825E850
+BattleFrontier_Lounge1_EventScript_HighestIVValue::
 	compare VAR_0x8007, 15
 	goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVLow
 	compare VAR_0x8007, 25
@@ -80,94 +80,94 @@ BattleFrontier_Lounge1_EventScript_HighestIVValue:: @ 825E850
 	goto_if_ge BattleFrontier_Lounge1_EventScript_HighestIVMax
 	end
 
-BattleFrontier_Lounge1_EventScript_EndBreederComments:: @ 825E87D
+BattleFrontier_Lounge1_EventScript_EndBreederComments::
 	release
 	end
 
-BattleFrontier_Lounge1_EventScript_AverageTotalIVs:: @ 825E87F
+BattleFrontier_Lounge1_EventScript_AverageTotalIVs::
 	msgbox BattleFrontier_Lounge1_Text_AverageAbility, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_AboveAverageTotalIVs:: @ 825E88D
+BattleFrontier_Lounge1_EventScript_AboveAverageTotalIVs::
 	msgbox BattleFrontier_Lounge1_Text_BetterThanAverageAbility, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_HighTotalIVs:: @ 825E89B
+BattleFrontier_Lounge1_EventScript_HighTotalIVs::
 	msgbox BattleFrontier_Lounge1_Text_ImpressiveAbility, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs:: @ 825E8A9
+BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs::
 	msgbox BattleFrontier_Lounge1_Text_OutstandingAbility, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVHP:: @ 825E8B7
+BattleFrontier_Lounge1_EventScript_HighestIVHP::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectHP, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVAtk:: @ 825E8C5
+BattleFrontier_Lounge1_EventScript_HighestIVAtk::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectAtk, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVDef:: @ 825E8D3
+BattleFrontier_Lounge1_EventScript_HighestIVDef::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectDef, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVSpeed:: @ 825E8E1
+BattleFrontier_Lounge1_EventScript_HighestIVSpeed::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectSpeed, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVSpAtk:: @ 825E8EF
+BattleFrontier_Lounge1_EventScript_HighestIVSpAtk::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectSpAtk, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVSpDef:: @ 825E8FD
+BattleFrontier_Lounge1_EventScript_HighestIVSpDef::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectSpDef, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVLow:: @ 825E90B
+BattleFrontier_Lounge1_EventScript_HighestIVLow::
 	msgbox BattleFrontier_Lounge1_Text_StatRelativelyGood, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVMid:: @ 825E919
+BattleFrontier_Lounge1_EventScript_HighestIVMid::
 	msgbox BattleFrontier_Lounge1_Text_StatImpressive, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVHigh:: @ 825E927
+BattleFrontier_Lounge1_EventScript_HighestIVHigh::
 	msgbox BattleFrontier_Lounge1_Text_StatOutstanding, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVMax:: @ 825E935
+BattleFrontier_Lounge1_EventScript_HighestIVMax::
 	msgbox BattleFrontier_Lounge1_Text_StatFlawless, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_CancelMonSelect:: @ 825E943
+BattleFrontier_Lounge1_EventScript_CancelMonSelect::
 	msgbox BattleFrontier_Lounge1_Text_NoTimeForMyAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge1_EventScript_Boy1:: @ 825E94D
+BattleFrontier_Lounge1_EventScript_Boy1::
 	msgbox BattleFrontier_Lounge1_Text_SaidMyMonIsOutstanding, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge1_EventScript_Boy2:: @ 825E956
+BattleFrontier_Lounge1_EventScript_Boy2::
 	msgbox BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge1_Text_PokemonBreederIntro: @ 825E95F
+BattleFrontier_Lounge1_Text_PokemonBreederIntro:
 	.string "For 70 years I have raised POKéMON!\n"
 	.string "I am the man they revere as\l"
 	.string "the legendary top POKéMON BREEDER!\p"
@@ -180,95 +180,95 @@ BattleFrontier_Lounge1_Text_PokemonBreederIntro: @ 825E95F
 	.string "Here!\n"
 	.string "Let's have a look at your POKéMON!$"
 
-BattleFrontier_Lounge1_Text_AverageAbility: @ 825EA92
+BattleFrontier_Lounge1_Text_AverageAbility:
 	.string "…Hmm…\p"
 	.string "This one, overall, I would describe\n"
 	.string "as being of average ability.$"
 
-BattleFrontier_Lounge1_Text_BetterThanAverageAbility: @ 825EAD9
+BattleFrontier_Lounge1_Text_BetterThanAverageAbility:
 	.string "…Hmm…\p"
 	.string "This one, overall, I would describe as\n"
 	.string "having better-than-average ability.$"
 
-BattleFrontier_Lounge1_Text_ImpressiveAbility: @ 825EB2A
+BattleFrontier_Lounge1_Text_ImpressiveAbility:
 	.string "…Hmm…\p"
 	.string "This one, overall, I would say is\n"
 	.string "quite impressive in ability!$"
 
-BattleFrontier_Lounge1_Text_OutstandingAbility: @ 825EB6F
+BattleFrontier_Lounge1_Text_OutstandingAbility:
 	.string "…Hmm…\p"
 	.string "This one, overall, I would say is\n"
 	.string "wonderfully outstanding in ability!$"
 
-BattleFrontier_Lounge1_Text_BestAspectHP: @ 825EBBB
+BattleFrontier_Lounge1_Text_BestAspectHP:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its HP…$"
 
-BattleFrontier_Lounge1_Text_BestAspectAtk: @ 825EBF8
+BattleFrontier_Lounge1_Text_BestAspectAtk:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its ATTACK…$"
 
-BattleFrontier_Lounge1_Text_BestAspectDef: @ 825EC39
+BattleFrontier_Lounge1_Text_BestAspectDef:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its DEFENSE…$"
 
-BattleFrontier_Lounge1_Text_BestAspectSpAtk: @ 825EC7B
+BattleFrontier_Lounge1_Text_BestAspectSpAtk:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPECIAL ATTACK…$"
 
-BattleFrontier_Lounge1_Text_BestAspectSpDef: @ 825ECC4
+BattleFrontier_Lounge1_Text_BestAspectSpDef:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPECIAL DEFENSE…$"
 
-BattleFrontier_Lounge1_Text_BestAspectSpeed: @ 825ED0E
+BattleFrontier_Lounge1_Text_BestAspectSpeed:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPEED…$"
 
-BattleFrontier_Lounge1_Text_StatRelativelyGood: @ 825ED4E
+BattleFrontier_Lounge1_Text_StatRelativelyGood:
 	.string "That stat is relatively good.\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_StatImpressive: @ 825ED87
+BattleFrontier_Lounge1_Text_StatImpressive:
 	.string "That stat is quite impressive.\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_StatOutstanding: @ 825EDC1
+BattleFrontier_Lounge1_Text_StatOutstanding:
 	.string "That stat is outstanding!\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_StatFlawless: @ 825EDF6
+BattleFrontier_Lounge1_Text_StatFlawless:
 	.string "It's flawless! A thing of perfection!\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_NoTimeForMyAdvice: @ 825EE37
+BattleFrontier_Lounge1_Text_NoTimeForMyAdvice:
 	.string "What?\n"
 	.string "You have no time for my advice?\p"
 	.string "You should always be eager to learn\n"
 	.string "from the experiences of your elders!$"
 
 @ Unused
-BattleFrontier_Lounge1_Text_HaveBusinessNeedsTending: @ 825EEA6
+BattleFrontier_Lounge1_Text_HaveBusinessNeedsTending:
 	.string "Yes, what is it now?\p"
 	.string "I have business that needs tending!\n"
 	.string "Save it for next time!$"
 
-BattleFrontier_Lounge1_Text_LetsLookAtYourPokemon: @ 825EEF6
+BattleFrontier_Lounge1_Text_LetsLookAtYourPokemon:
 	.string "Ah, youngster! Do your POKéMON's\n"
 	.string "abilities intrigue you?\p"
 	.string "Here, here!\n"
 	.string "Let's have a look at your POKéMON!$"
 
-BattleFrontier_Lounge1_Text_EvenICantTell: @ 825EF5E
+BattleFrontier_Lounge1_Text_EvenICantTell:
 	.string "An expert I am, but even I can't tell\n"
 	.string "anything about an unhatched POKéMON!\p"
 	.string "Show me a POKéMON!\n"
 	.string "A POKéMON is what I need to see!$"
 
-BattleFrontier_Lounge1_Text_SaidMyMonIsOutstanding: @ 825EFDD
+BattleFrontier_Lounge1_Text_SaidMyMonIsOutstanding:
 	.string "He said my POKéMON is outstanding!\n"
 	.string "I'm glad I raised it carefully!$"
 
-BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt: @ 825F020
+BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt:
 	.string "He said my POKéMON is outstanding!\n"
 	.string "But I didn't do anything special\l"
 	.string "raising it…$"
diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc
index 610a744b4..d98a9f64e 100644
--- a/data/maps/BattleFrontier_Lounge2/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge2/scripts.inc
@@ -1,13 +1,13 @@
-BattleFrontier_Lounge2_MapScripts:: @ 8260642
+BattleFrontier_Lounge2_MapScripts::
 	.byte 0
 
 @ This NPC gives hints about a random facility or battle mode.
-@ For battle modes he gives generic advice 
+@ For battle modes he gives generic advice
 @ For facilities, depending on how far the player has progressed he will say either
 @    The name of the Frontier Brain there
 @    The type and description of the 3 pokemon they use in their silver battle
 @    The type and description of the 3 pokemon they use in their gold battle
-BattleFrontier_Lounge2_EventScript_FrontierManiac:: @ 8260643
+BattleFrontier_Lounge2_EventScript_FrontierManiac::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_BATTLE_FRONTIER_MANIAC, BattleFrontier_Lounge2_EventScript_AlreadyMetManiac
@@ -16,12 +16,12 @@ BattleFrontier_Lounge2_EventScript_FrontierManiac:: @ 8260643
 	goto BattleFrontier_Lounge2_EventScript_GiveAdvice
 	end
 
-BattleFrontier_Lounge2_EventScript_AlreadyMetManiac:: @ 826065F
+BattleFrontier_Lounge2_EventScript_AlreadyMetManiac::
 	msgbox BattleFrontier_Lounge2_Text_SwingByForTheLatestWord, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge2_EventScript_GiveAdvice
 	end
 
-BattleFrontier_Lounge2_EventScript_GiveAdvice:: @ 826066D
+BattleFrontier_Lounge2_EventScript_GiveAdvice::
 	compare VAR_FRONTIER_MANIAC_FACILITY, 0
 	call_if_eq BattleFrontier_Lounge2_EventScript_BufferSingle
 	compare VAR_FRONTIER_MANIAC_FACILITY, 1
@@ -52,77 +52,77 @@ BattleFrontier_Lounge2_EventScript_GiveAdvice:: @ 826066D
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_BattleTowerNews:: @ 82606F8
+BattleFrontier_Lounge2_EventScript_BattleTowerNews::
 	msgbox BattleFrontier_Lounge2_Text_BattleTowerIsHottest, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge2_EventScript_FacilityNews:: @ 8260701
+BattleFrontier_Lounge2_EventScript_FacilityNews::
 	msgbox BattleFrontier_Lounge2_Text_FacilityIsHottest, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferSingle:: @ 826070A
+BattleFrontier_Lounge2_EventScript_BufferSingle::
 	bufferstdstring 0, STDSTRING_SINGLE
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferDouble:: @ 826070F
+BattleFrontier_Lounge2_EventScript_BufferDouble::
 	bufferstdstring 0, STDSTRING_DOUBLE
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferMulti:: @ 8260714
+BattleFrontier_Lounge2_EventScript_BufferMulti::
 	bufferstdstring 0, STDSTRING_MULTI
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferMultiLink:: @ 8260719
+BattleFrontier_Lounge2_EventScript_BufferMultiLink::
 	bufferstdstring 0, STDSTRING_MULTI_LINK
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattleDome:: @ 826071E
+BattleFrontier_Lounge2_EventScript_BufferBattleDome::
 	bufferstdstring 0, STDSTRING_BATTLE_DOME
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattleFactory:: @ 8260723
+BattleFrontier_Lounge2_EventScript_BufferBattleFactory::
 	bufferstdstring 0, STDSTRING_BATTLE_FACTORY
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattlePalace:: @ 8260728
+BattleFrontier_Lounge2_EventScript_BufferBattlePalace::
 	bufferstdstring 0, STDSTRING_BATTLE_PALACE
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattleArena:: @ 826072D
+BattleFrontier_Lounge2_EventScript_BufferBattleArena::
 	bufferstdstring 0, STDSTRING_BATTLE_ARENA
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattlePike:: @ 8260732
+BattleFrontier_Lounge2_EventScript_BufferBattlePike::
 	bufferstdstring 0, STDSTRING_BATTLE_PIKE
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattlePyramid:: @ 8260737
+BattleFrontier_Lounge2_EventScript_BufferBattlePyramid::
 	bufferstdstring 0, STDSTRING_BATTLE_PYRAMID
 	return
 
-BattleFrontier_Lounge2_EventScript_Maniac1:: @ 826073C
+BattleFrontier_Lounge2_EventScript_Maniac1::
 	lock
 	msgbox BattleFrontier_Lounge2_Text_NewsGatheringPower, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_Maniac2:: @ 8260747
+BattleFrontier_Lounge2_EventScript_Maniac2::
 	lock
 	msgbox BattleFrontier_Lounge2_Text_AmazingPowersOfObservation, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_Maniac3:: @ 8260752
+BattleFrontier_Lounge2_EventScript_Maniac3::
 	lock
 	msgbox BattleFrontier_Lounge2_Text_AmazingPowerOfPersuasion, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_TriathleteF:: @ 826075D
+BattleFrontier_Lounge2_EventScript_TriathleteF::
 	msgbox BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge2_Text_FrontierManiacIntro:: @ 8260766
+BattleFrontier_Lounge2_Text_FrontierManiacIntro::
 	.string "Howdy! When it comes to news about\n"
 	.string "the BATTLE FRONTIER, I'm no. 1.\p"
 	.string "You can think of me as\n"
@@ -132,34 +132,34 @@ BattleFrontier_Lounge2_Text_FrontierManiacIntro:: @ 8260766
 	.string "I'll happily share the hottest news\n"
 	.string "I gathered about the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge2_Text_SwingByForTheLatestWord:: @ 8260857
+BattleFrontier_Lounge2_Text_SwingByForTheLatestWord::
 	.string "Howdy! Did you swing by to grill me\n"
 	.string "about the latest word? Oh, all right!$"
 
 @ Unused
-BattleFrontier_Lounge2_Text_MyInformationsBeenUsefulRight:: @ 82608A1
+BattleFrontier_Lounge2_Text_MyInformationsBeenUsefulRight::
 	.string "Well? Well? Well?\p"
 	.string "I'm sure my information's been\n"
 	.string "seriously useful to you, right?$"
 
-BattleFrontier_Lounge2_Text_FacilityIsHottest:: @ 82608F2
+BattleFrontier_Lounge2_Text_FacilityIsHottest::
 	.string "Let's see now…\p"
 	.string "It sounds like the {STR_VAR_1}\n"
 	.string "is the hottest place going.$"
 
-BattleFrontier_Lounge2_Text_BattleTowerIsHottest:: @ 8260933
+BattleFrontier_Lounge2_Text_BattleTowerIsHottest::
 	.string "Let's see now…\p"
 	.string "It sounds like BATTLE TOWER\n"
 	.string "{STR_VAR_1} is the hottest.$"
 
-BattleFrontier_Lounge2_Text_SalonMaidenIsThere:: @ 8260971
+BattleFrontier_Lounge2_Text_SalonMaidenIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this mysterious TRAINER called\n"
 	.string "the SALON MAIDEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_SalonMaidenSilverMons:: @ 8260A1E
+BattleFrontier_Lounge2_Text_SalonMaidenSilverMons::
 	.string "Have you battled the SALON MAIDEN?\p"
 	.string "When she's measuring up her opponent,\n"
 	.string "she apparently uses these POKéMON:\p"
@@ -167,7 +167,7 @@ BattleFrontier_Lounge2_Text_SalonMaidenSilverMons:: @ 8260A1E
 	.string "a FIRE-type VOLCANO POKéMON,\l"
 	.string "and a NORMAL-type SLEEPING POKéMON.$"
 
-BattleFrontier_Lounge2_Text_SalonMaidenGoldMons:: @ 8260AE7
+BattleFrontier_Lounge2_Text_SalonMaidenGoldMons::
 	.string "Have you battled the SALON MAIDEN\n"
 	.string "when she's serious?\p"
 	.string "When she's battling flat out,\n"
@@ -176,14 +176,14 @@ BattleFrontier_Lounge2_Text_SalonMaidenGoldMons:: @ 8260AE7
 	.string "an ELECTRIC-type THUNDER POKéMON,\l"
 	.string "and a NORMAL-type SLEEPING POKéMON.$"
 
-BattleFrontier_Lounge2_Text_DomeAceIsThere:: @ 8260BC4
+BattleFrontier_Lounge2_Text_DomeAceIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this flamboyant TRAINER called\n"
 	.string "the DOME ACE that runs the place.$"
 
-BattleFrontier_Lounge2_Text_DomeAceSilverMons:: @ 8260C6D
+BattleFrontier_Lounge2_Text_DomeAceSilverMons::
 	.string "Have you battled the DOME ACE?\p"
 	.string "When he's treating the opponent\n"
 	.string "lightly, he uses these three POKéMON:\p"
@@ -191,7 +191,7 @@ BattleFrontier_Lounge2_Text_DomeAceSilverMons:: @ 8260C6D
 	.string "a WATER & GROUND MUD FISH POKéMON,\l"
 	.string "and a FIRE & FLYING FLAME POKéMON.$"
 
-BattleFrontier_Lounge2_Text_DomeAceGoldMons:: @ 8260D3A
+BattleFrontier_Lounge2_Text_DomeAceGoldMons::
 	.string "Have you battled the DOME ACE\n"
 	.string "when he's serious?\p"
 	.string "When he's demonstrating his strategy,\n"
@@ -201,14 +201,14 @@ BattleFrontier_Lounge2_Text_DomeAceGoldMons:: @ 8260D3A
 	.string "and a STEEL- & PSYCHIC-type IRON LEG\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_FactoryHeadIsThere:: @ 8260E1E
+BattleFrontier_Lounge2_Text_FactoryHeadIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this freaky TRAINER called\n"
 	.string "the FACTORY HEAD that runs the place.$"
 
-BattleFrontier_Lounge2_Text_FactoryHeadSilverMons:: @ 8260EC7
+BattleFrontier_Lounge2_Text_FactoryHeadSilverMons::
 	.string "Have you battled the FACTORY HEAD\n"
 	.string "already?\p"
 	.string "Let me think… When he goes to battle,\n"
@@ -216,7 +216,7 @@ BattleFrontier_Lounge2_Text_FactoryHeadSilverMons:: @ 8260EC7
 	.string "He battles under pretty much the same\n"
 	.string "conditions as you.$"
 
-BattleFrontier_Lounge2_Text_FactoryHeadGoldMons:: @ 8260F74
+BattleFrontier_Lounge2_Text_FactoryHeadGoldMons::
 	.string "Have you battled the FACTORY HEAD\n"
 	.string "when he's serious?\p"
 	.string "When he goes seriously to battle,\n"
@@ -224,14 +224,14 @@ BattleFrontier_Lounge2_Text_FactoryHeadGoldMons:: @ 8260F74
 	.string "He battles under virtually the same\n"
 	.string "conditions as you.$"
 
-BattleFrontier_Lounge2_Text_PikeQueenIsThere:: @ 8261026
+BattleFrontier_Lounge2_Text_PikeQueenIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this scary TRAINER called\n"
 	.string "the PIKE QUEEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_PikeQueenSilverMons:: @ 82610CC
+BattleFrontier_Lounge2_Text_PikeQueenSilverMons::
 	.string "Have you battled the PIKE QUEEN\n"
 	.string "before?\p"
 	.string "When she's in a good mood, they say\n"
@@ -240,7 +240,7 @@ BattleFrontier_Lounge2_Text_PikeQueenSilverMons:: @ 82610CC
 	.string "a BUG & ROCK MOLD POKéMON,\l"
 	.string "and a WATER-type TENDER POKéMON.$"
 
-BattleFrontier_Lounge2_Text_PikeQueenGoldMons:: @ 8261194
+BattleFrontier_Lounge2_Text_PikeQueenGoldMons::
 	.string "Have you battled the PIKE QUEEN\n"
 	.string "when she's serious?\p"
 	.string "When she's seriously annoyed, they say\n"
@@ -250,14 +250,14 @@ BattleFrontier_Lounge2_Text_PikeQueenGoldMons:: @ 8261194
 	.string "and a WATER- & FLYING-type ATROCIOUS\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_ArenaTycoonIsThere:: @ 8261282
+BattleFrontier_Lounge2_Text_ArenaTycoonIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this cute TRAINER called\n"
 	.string "the ARENA TYCOON that runs the place.$"
 
-BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons:: @ 8261329
+BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons::
 	.string "Have you battled the ARENA TYCOON\n"
 	.string "before?\p"
 	.string "When she's assessing the foe's ability,\n"
@@ -266,7 +266,7 @@ BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons:: @ 8261329
 	.string "a DARK-type MOONLIGHT POKéMON,\l"
 	.string "and a BUG & GHOST SHED POKéMON.$"
 
-BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons:: @ 8261403
+BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons::
 	.string "Have you battled the ARENA TYCOON\n"
 	.string "when she's serious?\p"
 	.string "When she battles for keeps,\n"
@@ -276,14 +276,14 @@ BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons:: @ 8261403
 	.string "and a GRASS- & FIGHTING-type\l"
 	.string "MUSHROOM POKéMON.$"
 
-BattleFrontier_Lounge2_Text_PalaceMavenIsThere:: @ 82614E6
+BattleFrontier_Lounge2_Text_PalaceMavenIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this sinister TRAINER called\n"
 	.string "the PALACE MAVEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_PalaceMavenSilverMons:: @ 8261591
+BattleFrontier_Lounge2_Text_PalaceMavenSilverMons::
 	.string "Have you battled the PALACE MAVEN\n"
 	.string "before?\p"
 	.string "When he's testing the opponent's\n"
@@ -292,7 +292,7 @@ BattleFrontier_Lounge2_Text_PalaceMavenSilverMons:: @ 8261591
 	.string "a NORMAL-type LAZY POKéMON, and a\l"
 	.string "WATER- & ICE-type TRANSPORT POKéMON.$"
 
-BattleFrontier_Lounge2_Text_PalaceMavenGoldMons:: @ 826166F
+BattleFrontier_Lounge2_Text_PalaceMavenGoldMons::
 	.string "Have you battled the PALACE MAVEN\n"
 	.string "when he's serious?\p"
 	.string "When he throws his entire might into\n"
@@ -301,14 +301,14 @@ BattleFrontier_Lounge2_Text_PalaceMavenGoldMons:: @ 826166F
 	.string "a NORMAL-type LAZY POKéMON,\l"
 	.string "and a WATER-type AURORA POKéMON.$"
 
-BattleFrontier_Lounge2_Text_PyramidKingIsThere:: @ 826174D
+BattleFrontier_Lounge2_Text_PyramidKingIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this fiery-hot TRAINER called\n"
 	.string "the PYRAMID KING that runs the place.$"
 
-BattleFrontier_Lounge2_Text_PyramidKingSilverMons:: @ 82617F9
+BattleFrontier_Lounge2_Text_PyramidKingSilverMons::
 	.string "Have you battled the PYRAMID KING\n"
 	.string "before?\p"
 	.string "When he's checking the foe's power,\n"
@@ -317,7 +317,7 @@ BattleFrontier_Lounge2_Text_PyramidKingSilverMons:: @ 82617F9
 	.string "an ICE-type ICEBERG POKéMON,\l"
 	.string "and a STEEL-type IRON POKéMON.$"
 
-BattleFrontier_Lounge2_Text_PyramidKingGoldMons:: @ 82618C4
+BattleFrontier_Lounge2_Text_PyramidKingGoldMons::
 	.string "Have you battled the PYRAMID KING\n"
 	.string "when he's serious?\p"
 	.string "When he's pumped with hot power,\n"
@@ -327,7 +327,7 @@ BattleFrontier_Lounge2_Text_PyramidKingGoldMons:: @ 82618C4
 	.string "and a FIRE- & FLYING-type FLAME\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_DoubleBattleAdvice1:: @ 82619AC
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice1::
 	.string "Sure, there are several places where\n"
 	.string "you can enter DOUBLE BATTLES.\p"
 	.string "But the DOUBLE BATTLE ROOMS of\n"
@@ -336,44 +336,44 @@ BattleFrontier_Lounge2_Text_DoubleBattleAdvice1:: @ 82619AC
 	.string "how DOUBLE BATTLES are played here\l"
 	.string "in the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge2_Text_DoubleBattleAdvice2:: @ 8261A91
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice2::
 	.string "Watch yourself in the battles here.\p"
 	.string "I hear there are TRAINERS that have\n"
 	.string "strategies they developed just for\l"
 	.string "DOUBLE BATTLES.$"
 
-BattleFrontier_Lounge2_Text_DoubleBattleAdvice3:: @ 8261B0C
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice3::
 	.string "Once you're confident and comfortable\n"
 	.string "with DOUBLE BATTLES here, you should\l"
 	.string "think about challenging other places\l"
 	.string "offering DOUBLE BATTLES.$"
 
-BattleFrontier_Lounge2_Text_MultiBattleAdvice:: @ 8261B95
+BattleFrontier_Lounge2_Text_MultiBattleAdvice::
 	.string "All sorts of TRAINERS gather in\n"
 	.string "the BATTLE SALON.\p"
 	.string "Just think--you may run into your\n"
 	.string "friends or followers!\l"
 	.string "You should look carefully!$"
 
-BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice:: @ 8261C1A
+BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice::
 	.string "If you're with a friend, head for the\n"
 	.string "LINK MULTI BATTLE ROOM.\p"
 	.string "If you play with a strong friend,\n"
 	.string "you can expect to see tough foes!$"
 
-BattleFrontier_Lounge2_Text_NewsGatheringPower:: @ 8261C9C
+BattleFrontier_Lounge2_Text_NewsGatheringPower::
 	.string "What amazing news-gathering power!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_AmazingPowersOfObservation:: @ 8261CDC
+BattleFrontier_Lounge2_Text_AmazingPowersOfObservation::
 	.string "What amazing powers of observation!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_AmazingPowerOfPersuasion:: @ 8261D1D
+BattleFrontier_Lounge2_Text_AmazingPowerOfPersuasion::
 	.string "What amazing power of persuasion!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe:: @ 8261D5C
+BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe::
 	.string "…What is this place?\n"
 	.string "It's scaring me…$"
 
diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc
index d1b8d2024..c0a941738 100644
--- a/data/maps/BattleFrontier_Lounge3/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge3/scripts.inc
@@ -1,11 +1,11 @@
-BattleFrontier_Lounge3_MapScripts:: @ 8261D82
+BattleFrontier_Lounge3_MapScripts::
 	.byte 0
 
 	.set BET_AMOUNT_5,  5
 	.set BET_AMOUNT_10, 10
 	.set BET_AMOUNT_15, 15
 
-BattleFrontier_Lounge3_EventScript_Gambler:: @ 8261D83
+BattleFrontier_Lounge3_EventScript_Gambler::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_BATTLE_FRONTIER_GAMBLER, BattleFrontier_Lounge3_EventScript_AlreadyMetGambler
@@ -17,7 +17,7 @@ BattleFrontier_Lounge3_EventScript_Gambler:: @ 8261D83
 	goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_AskToEnterChallenge:: @ 8261DAF
+BattleFrontier_Lounge3_EventScript_AskToEnterChallenge::
 	special ShowFrontierGamblerLookingMessage
 	waitmessage
 	waitbuttonpress
@@ -33,7 +33,7 @@ BattleFrontier_Lounge3_EventScript_AskToEnterChallenge:: @ 8261DAF
 	goto BattleFrontier_Lounge3_EventScript_ChooseBetAmount
 	end
 
-BattleFrontier_Lounge3_EventScript_ChooseBetAmount:: @ 8261DE9
+BattleFrontier_Lounge3_EventScript_ChooseBetAmount::
 	multichoice 20, 4, MULTI_FRONTIER_GAMBLER_BET, FALSE
 	copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT
 	switch VAR_RESULT
@@ -44,22 +44,22 @@ BattleFrontier_Lounge3_EventScript_ChooseBetAmount:: @ 8261DE9
 	case MULTI_B_PRESSED, BattleFrontier_Lounge3_EventScript_CancelBet
 	end
 
-BattleFrontier_Lounge3_EventScript_Bet5:: @ 8261E30
+BattleFrontier_Lounge3_EventScript_Bet5::
 	setvar VAR_0x8008, BET_AMOUNT_5
 	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_Bet10:: @ 8261E3B
+BattleFrontier_Lounge3_EventScript_Bet10::
 	setvar VAR_0x8008, BET_AMOUNT_10
 	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_Bet15:: @ 8261E46
+BattleFrontier_Lounge3_EventScript_Bet15::
 	setvar VAR_0x8008, BET_AMOUNT_15
 	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_TryPlaceBet:: @ 8261E51
+BattleFrontier_Lounge3_EventScript_TryPlaceBet::
 	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
 	goto_if_ge BattleFrontier_Lounge3_EventScript_PlaceBet
@@ -69,7 +69,7 @@ BattleFrontier_Lounge3_EventScript_TryPlaceBet:: @ 8261E51
 	goto BattleFrontier_Lounge3_EventScript_ChooseBetAmount
 	end
 
-BattleFrontier_Lounge3_EventScript_PlaceBet:: @ 8261E75
+BattleFrontier_Lounge3_EventScript_PlaceBet::
 	copyvar VAR_0x8004, VAR_0x8008
 	special TakeFrontierBattlePoints
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
@@ -79,7 +79,7 @@ BattleFrontier_Lounge3_EventScript_PlaceBet:: @ 8261E75
 	goto BattleFrontier_Lounge3_EventScript_FinishBet
 	end
 
-BattleFrontier_Lounge3_EventScript_FinishBet:: @ 8261E96
+BattleFrontier_Lounge3_EventScript_FinishBet::
 	special ShowFrontierGamblerGoMessage
 	waitmessage
 	waitbuttonpress
@@ -87,7 +87,7 @@ BattleFrontier_Lounge3_EventScript_FinishBet:: @ 8261E96
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_CountSilverSymbols:: @ 8261EA0
+BattleFrontier_Lounge3_EventScript_CountSilverSymbols::
 	setvar VAR_0x8004, 0
 	call_if_set FLAG_SYS_TOWER_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
 	call_if_set FLAG_SYS_DOME_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
@@ -98,23 +98,23 @@ BattleFrontier_Lounge3_EventScript_CountSilverSymbols:: @ 8261EA0
 	call_if_set FLAG_SYS_PYRAMID_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
 	return
 
-BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount:: @ 8261EE5
+BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount::
 	addvar VAR_0x8004, 1
 	return
 
-BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols:: @ 8261EEB
+BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols::
 	msgbox BattleFrontier_Lounge3_Text_CantYouSeeWereBusyHere, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_AlreadyMetGambler:: @ 8261EF9
+BattleFrontier_Lounge3_EventScript_AlreadyMetGambler::
 	msgbox BattleFrontier_Lounge3_Text_Oh, MSGBOX_DEFAULT
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
 	goto_if_ge BattleFrontier_Lounge3_EventScript_CheckBetResults
 	goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_CheckBetResults:: @ 8261F12
+BattleFrontier_Lounge3_EventScript_CheckBetResults::
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
 	goto_if_eq BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON
@@ -122,7 +122,7 @@ BattleFrontier_Lounge3_EventScript_CheckBetResults:: @ 8261F12
 	goto BattleFrontier_Lounge3_EventScript_LostChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_WonChallenge:: @ 8261F2E
+BattleFrontier_Lounge3_EventScript_WonChallenge::
 	msgbox BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints, MSGBOX_DEFAULT
 	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_5
 	call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet5
@@ -137,82 +137,82 @@ BattleFrontier_Lounge3_EventScript_WonChallenge:: @ 8261F2E
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_LostChallenge:: @ 8261F71
+BattleFrontier_Lounge3_EventScript_LostChallenge::
 	msgbox BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints, MSGBOX_DEFAULT
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WAITING
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_RewardBet5:: @ 8261F80
+BattleFrontier_Lounge3_EventScript_RewardBet5::
 	buffernumberstring 0, (BET_AMOUNT_5 * 2)
 	setvar VAR_0x8004, (BET_AMOUNT_5 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_RewardBet10:: @ 8261F8A
+BattleFrontier_Lounge3_EventScript_RewardBet10::
 	buffernumberstring 0, (BET_AMOUNT_10 * 2)
 	setvar VAR_0x8004, (BET_AMOUNT_10 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_RewardBet15:: @ 8261F94
+BattleFrontier_Lounge3_EventScript_RewardBet15::
 	buffernumberstring 0, (BET_AMOUNT_15 * 2)
 	setvar VAR_0x8004, (BET_AMOUNT_15 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted:: @ 8261F9E
+BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted::
 	special ShowFrontierGamblerGoMessage
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_DeclineChallenge:: @ 8261FA5
+BattleFrontier_Lounge3_EventScript_DeclineChallenge::
 	msgbox BattleFrontier_Lounge3_Text_NotInterested, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_CancelBet:: @ 8261FAF
+BattleFrontier_Lounge3_EventScript_CancelBet::
 	special CloseBattlePointsWindow
 	goto BattleFrontier_Lounge3_EventScript_DeclineChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_Man:: @ 8261FB8
+BattleFrontier_Lounge3_EventScript_Man::
 	msgbox BattleFrontier_Lounge3_Text_ShouldBeTakingChallenges, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge3_EventScript_Woman:: @ 8261FC1
+BattleFrontier_Lounge3_EventScript_Woman::
 	lock
 	faceplayer
 	msgbox BattleFrontier_Lounge3_Text_BackedWrongTrainer, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_PokefanF:: @ 8261FD1
+BattleFrontier_Lounge3_EventScript_PokefanF::
 	lock
 	faceplayer
 	msgbox BattleFrontier_Lounge3_Text_KnowWinnerWhenISeeOne, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_FatMan:: @ 8261FE1
+BattleFrontier_Lounge3_EventScript_FatMan::
 	lock
 	faceplayer
 	msgbox BattleFrontier_Lounge3_Text_TrainerGoodButRattled, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_FaceOriginalDirection:: @ 8261FF1
+BattleFrontier_Lounge3_EventScript_FaceOriginalDirection::
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-BattleFrontier_Lounge3_Text_CantYouSeeWereBusyHere:: @ 8261FFE
+BattleFrontier_Lounge3_Text_CantYouSeeWereBusyHere::
 	.string "…What's that you want?\p"
 	.string "Can't you see we're kind of busy here?\n"
 	.string "Can't your business wait till later?$"
 
-BattleFrontier_Lounge3_Text_YouLookToughExplainGambling:: @ 8262061
+BattleFrontier_Lounge3_Text_YouLookToughExplainGambling::
 	.string "…Huh?\n"
 	.string "You look to me like a tough TRAINER.\p"
 	.string "Heheh…\n"
@@ -232,201 +232,201 @@ BattleFrontier_Lounge3_Text_YouLookToughExplainGambling:: @ 8262061
 	.string "Sounds simple, huh?\n"
 	.string "So, anyway…$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle:: @ 8262261
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's SINGLE BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble:: @ 826230D
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's DOUBLE BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleTowerMulti:: @ 82623B9
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerMulti::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's MULTI BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleDomeSingle:: @ 8262464
+BattleFrontier_Lounge3_Text_ChallengeBattleDomeSingle::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "DOME's SINGLE BATTLE Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleDomeDouble:: @ 826250E
+BattleFrontier_Lounge3_Text_ChallengeBattleDomeDouble::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "DOME's DOUBLE BATTLE Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleFactorySingle:: @ 82625B8
+BattleFrontier_Lounge3_Text_ChallengeBattleFactorySingle::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "FACTORY's Battle Swap Single Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleFactoryDouble:: @ 826266A
+BattleFrontier_Lounge3_Text_ChallengeBattleFactoryDouble::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "FACTORY's Battle Swap Double Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattlePalaceSingle:: @ 826271C
+BattleFrontier_Lounge3_Text_ChallengeBattlePalaceSingle::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "PALACE's SINGLE BATTLE HALLS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattlePalaceDouble:: @ 82627C9
+BattleFrontier_Lounge3_Text_ChallengeBattlePalaceDouble::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "PALACE's DOUBLE BATTLE HALLS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleArena:: @ 8262876
+BattleFrontier_Lounge3_Text_ChallengeBattleArena::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "ARENA's Set KO Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattlePike:: @ 826291A
+BattleFrontier_Lounge3_Text_ChallengeBattlePike::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE PIKE's\l"
 	.string "Battle Choice.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattlePyramid:: @ 82629BC
+BattleFrontier_Lounge3_Text_ChallengeBattlePyramid::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "PYRAMID's Battle Quest.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_HowAboutEnteringEventForMe:: @ 8262A60
+BattleFrontier_Lounge3_Text_HowAboutEnteringEventForMe::
 	.string "I'll see to it that you benefit, too.\n"
 	.string "So how about it?\l"
 	.string "How about entering that event for me?$"
 
-BattleFrontier_Lounge3_Text_SpotMeSomeBattlePoints:: @ 8262ABD
+BattleFrontier_Lounge3_Text_SpotMeSomeBattlePoints::
 	.string "All right, that's perfect.\n"
 	.string "So, uh… How about spotting me some\l"
 	.string "of your Battle Points?\p"
 	.string "Trust me, I'll show you my gratitude\n"
 	.string "afterward.$"
 
-BattleFrontier_Lounge3_Text_HowMuchCanYouSpot:: @ 8262B42
+BattleFrontier_Lounge3_Text_HowMuchCanYouSpot::
 	.string "Great, great!\n"
 	.string "So, how much can you spot me?$"
 
-BattleFrontier_Lounge3_Text_YouDontHaveEnoughPoints:: @ 8262B6E
+BattleFrontier_Lounge3_Text_YouDontHaveEnoughPoints::
 	.string "Oh, no, no, no!\n"
 	.string "You don't have enough Battle Points!\p"
 	.string "I wish you wouldn't monkey around and\n"
 	.string "waste everyone's time!$"
 
-BattleFrontier_Lounge3_Text_ThanksOffYouGo:: @ 8262BE0
+BattleFrontier_Lounge3_Text_ThanksOffYouGo::
 	.string "Heheh! Thanks much!\n"
 	.string "So, off you go!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleTowerSingle:: @ 8262C04
+BattleFrontier_Lounge3_Text_GetToBattleTowerSingle::
 	.string "Get to the BATTLE TOWER's\n"
 	.string "SINGLE BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleTowerDouble:: @ 8262C90
+BattleFrontier_Lounge3_Text_GetToBattleTowerDouble::
 	.string "Get to the BATTLE TOWER's\n"
 	.string "DOUBLE BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleTowerMulti:: @ 8262D1C
+BattleFrontier_Lounge3_Text_GetToBattleTowerMulti::
 	.string "Get to the BATTLE TOWER's\n"
 	.string "MULTI BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleDomeSingle:: @ 8262DA7
+BattleFrontier_Lounge3_Text_GetToBattleDomeSingle::
 	.string "Get to the BATTLE DOME's\n"
 	.string "SINGLE BATTLE Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleDomeDouble:: @ 8262E34
+BattleFrontier_Lounge3_Text_GetToBattleDomeDouble::
 	.string "Get to the BATTLE DOME's\n"
 	.string "DOUBLE BATTLE Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleFactorySingle:: @ 8262EC1
+BattleFrontier_Lounge3_Text_GetToBattleFactorySingle::
 	.string "Get to the BATTLE FACTORY's\n"
 	.string "Battle Swap Single Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleFactoryDouble:: @ 8262F56
+BattleFrontier_Lounge3_Text_GetToBattleFactoryDouble::
 	.string "Get to the BATTLE FACTORY's\n"
 	.string "Battle Swap Double Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattlePalaceSingle:: @ 8262FEB
+BattleFrontier_Lounge3_Text_GetToBattlePalaceSingle::
 	.string "Get to the BATTLE PALACE's\n"
 	.string "SINGLE BATTLE HALLS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattlePalaceDouble:: @ 8263078
+BattleFrontier_Lounge3_Text_GetToBattlePalaceDouble::
 	.string "Get to the BATTLE PALACE's\n"
 	.string "DOUBLE BATTLE HALLS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleArena:: @ 8263105
+BattleFrontier_Lounge3_Text_GetToBattleArena::
 	.string "Get to the BATTLE ARENA's\n"
 	.string "Set KO Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattlePike:: @ 826318C
+BattleFrontier_Lounge3_Text_GetToBattlePike::
 	.string "Get to the BATTLE PIKE's\n"
 	.string "Battle Choice pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattlePyramid:: @ 8263211
+BattleFrontier_Lounge3_Text_GetToBattlePyramid::
 	.string "Get to the BATTLE PYRAMID's\n"
 	.string "Battle Quest pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints:: @ 8263298
+BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints::
 	.string "Oh, it's you…\n"
 	.string "Nice try…\p"
 	.string "I hate to break it to you, but I can't\n"
@@ -434,7 +434,7 @@ BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints:: @ 8263298
 	.string "I guess we'll have to let it motivate\n"
 	.string "us to try harder next time!$"
 
-BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints:: @ 8263334
+BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints::
 	.string "Oh, yes!\n"
 	.string "Hello there, champ!\p"
 	.string "I knew you could!\n"
@@ -443,36 +443,36 @@ BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints:: @ 8263334
 	.string "I'll return your Battle Points and,\n"
 	.string "of course, a little extra from me!$"
 
-BattleFrontier_Lounge3_Text_ObtainedBattlePoints:: @ 82633D4
+BattleFrontier_Lounge3_Text_ObtainedBattlePoints::
 	.string "{PLAYER} obtained\n"
 	.string "{STR_VAR_1} Battle Points.$"
 
-BattleFrontier_Lounge3_Text_ThinkOfMeForAnotherChallenge:: @ 82633F2
+BattleFrontier_Lounge3_Text_ThinkOfMeForAnotherChallenge::
 	.string "If you're up for another challenge,\n"
 	.string "please do think of me!$"
 
-BattleFrontier_Lounge3_Text_NotInterested:: @ 826342D
+BattleFrontier_Lounge3_Text_NotInterested::
 	.string "Not interested?! You shouldn't be\n"
 	.string "so afraid to take a chance!$"
 
-BattleFrontier_Lounge3_Text_Oh:: @ 826346B
+BattleFrontier_Lounge3_Text_Oh::
 	.string "Oh…$"
 
-BattleFrontier_Lounge3_Text_BackedWrongTrainer:: @ 826346F
+BattleFrontier_Lounge3_Text_BackedWrongTrainer::
 	.string "I backed the wrong TRAINER again!\p"
 	.string "Maybe I should be battling normally\n"
 	.string "like everyone else…$"
 
-BattleFrontier_Lounge3_Text_TrainerGoodButRattled:: @ 82634C9
+BattleFrontier_Lounge3_Text_TrainerGoodButRattled::
 	.string "That TRAINER…\p"
 	.string "He's good, but he gets rattled too\n"
 	.string "easily to survive the BATTLE DOME…$"
 
-BattleFrontier_Lounge3_Text_KnowWinnerWhenISeeOne:: @ 826351D
+BattleFrontier_Lounge3_Text_KnowWinnerWhenISeeOne::
 	.string "Giggle!\n"
 	.string "I know a winner when I see one!$"
 
-BattleFrontier_Lounge3_Text_ShouldBeTakingChallenges:: @ 8263545
+BattleFrontier_Lounge3_Text_ShouldBeTakingChallenges::
 	.string "Those TRAINERS…\n"
 	.string "What are they doing?\l"
 	.string "They should be taking challenges.$"
diff --git a/data/maps/BattleFrontier_Lounge4/scripts.inc b/data/maps/BattleFrontier_Lounge4/scripts.inc
index 6da60d30f..9aa6c8204 100644
--- a/data/maps/BattleFrontier_Lounge4/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge4/scripts.inc
@@ -1,27 +1,27 @@
-BattleFrontier_Lounge4_MapScripts:: @ 826358C
+BattleFrontier_Lounge4_MapScripts::
 	.byte 0
 
-BattleFrontier_Lounge4_EventScript_Woman:: @ 826358D
+BattleFrontier_Lounge4_EventScript_Woman::
 	msgbox BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_EventScript_Cook:: @ 8263596
+BattleFrontier_Lounge4_EventScript_Cook::
 	msgbox BattleFrontier_Lounge4_Text_IfIOpenedRestaurantHere, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_EventScript_Man:: @ 826359F
+BattleFrontier_Lounge4_EventScript_Man::
 	msgbox BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring: @ 82635A8
+BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring:
 	.string "I wonder if they'll be airing interviews\n"
 	.string "with tough TRAINERS today?$"
 
-BattleFrontier_Lounge4_Text_IfIOpenedRestaurantHere: @ 82635EC
+BattleFrontier_Lounge4_Text_IfIOpenedRestaurantHere:
 	.string "If I opened a restaurant here,\n"
 	.string "it'd make money for sure.$"
 
-BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles: @ 8263625
+BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles:
 	.string "Whew…\p"
 	.string "I need to take a breather after\n"
 	.string "some intense battles…\p"
diff --git a/data/maps/BattleFrontier_Lounge5/scripts.inc b/data/maps/BattleFrontier_Lounge5/scripts.inc
index 3df294fb1..61ac0cb9e 100644
--- a/data/maps/BattleFrontier_Lounge5/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge5/scripts.inc
@@ -1,7 +1,7 @@
-BattleFrontier_Lounge5_MapScripts:: @ 82645C5
+BattleFrontier_Lounge5_MapScripts::
 	.byte 0
 
-BattleFrontier_Lounge5_EventScript_NatureGirl:: @ 82645C6
+BattleFrontier_Lounge5_EventScript_NatureGirl::
 	lock
 	faceplayer
 	msgbox BattleFrontier_Lounge5_Text_NatureGirlGreeting, MSGBOX_YESNO
@@ -22,184 +22,184 @@ BattleFrontier_Lounge5_EventScript_NatureGirl:: @ 82645C6
 	release
 	end
 
-BattleFrontier_Lounge5_EventScript_NatureGirlEgg:: @ 8264603
+BattleFrontier_Lounge5_EventScript_NatureGirlEgg::
 	msgbox BattleFrontier_Lounge5_Text_NatureGirlEgg, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown:: @ 826460D
+BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown::
 	msgbox BattleFrontier_Lounge5_Text_NatureGirlNoneShown, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge5_EventScript_Gentleman:: @ 8264617
+BattleFrontier_Lounge5_EventScript_Gentleman::
 	msgbox BattleFrontier_Lounge5_Text_LadyClaimsSheUnderstandsPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_EventScript_BlackBelt:: @ 8264620
+BattleFrontier_Lounge5_EventScript_BlackBelt::
 	msgbox BattleFrontier_Lounge5_Text_GirlSayingSomethingProfound, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_EventScript_LittleBoy:: @ 8264629
+BattleFrontier_Lounge5_EventScript_LittleBoy::
 	msgbox BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_Text_NatureGirlGreeting:: @ 8264632
+BattleFrontier_Lounge5_Text_NatureGirlGreeting::
 	.string "Ehehe!\n"
 	.string "I can tell what POKéMON are thinking!\p"
 	.string "Please!\n"
 	.string "Can I see your POKéMON?$"
 
-BattleFrontier_Lounge5_Text_NatureGirlNoneShown:: @ 826467F
+BattleFrontier_Lounge5_Text_NatureGirlNoneShown::
 	.string "Boo!\n"
 	.string "Cheapie!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlHardy:: @ 826468D
+BattleFrontier_Lounge5_Text_NatureGirlHardy::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlLonely:: @ 82646E5
+BattleFrontier_Lounge5_Text_NatureGirlLonely::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlBrave:: @ 8264741
+BattleFrontier_Lounge5_Text_NatureGirlBrave::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlAdamant:: @ 82647A4
+BattleFrontier_Lounge5_Text_NatureGirlAdamant::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlNaughty:: @ 82647FC
+BattleFrontier_Lounge5_Text_NatureGirlNaughty::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlBold:: @ 8264858
+BattleFrontier_Lounge5_Text_NatureGirlBold::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky:: @ 82648BE
+BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlRelaxed:: @ 8264916
+BattleFrontier_Lounge5_Text_NatureGirlRelaxed::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlImpish:: @ 8264972
+BattleFrontier_Lounge5_Text_NatureGirlImpish::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlLax:: @ 82649D5
+BattleFrontier_Lounge5_Text_NatureGirlLax::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "It says it likes to be sneaky even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlTimid:: @ 8264A3F
+BattleFrontier_Lounge5_Text_NatureGirlTimid::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlHasty:: @ 8264A9B
+BattleFrontier_Lounge5_Text_NatureGirlHasty::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlSerious:: @ 8264AF3
+BattleFrontier_Lounge5_Text_NatureGirlSerious::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "It says it likes to be sneaky even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlJolly:: @ 8264B5D
+BattleFrontier_Lounge5_Text_NatureGirlJolly::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlModest:: @ 8264BC3
+BattleFrontier_Lounge5_Text_NatureGirlModest::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "It says it worries about itself whether\l"
 	.string "or not it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlMild:: @ 8264C36
+BattleFrontier_Lounge5_Text_NatureGirlMild::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlBashful:: @ 8264C95
+BattleFrontier_Lounge5_Text_NatureGirlBashful::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "It says it worries about itself even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlRash:: @ 8264D01
+BattleFrontier_Lounge5_Text_NatureGirlRash::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "It says it likes to be sneaky even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlCalm:: @ 8264D6B
+BattleFrontier_Lounge5_Text_NatureGirlCalm::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "It says it worries about itself even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlGentle:: @ 8264DD7
+BattleFrontier_Lounge5_Text_NatureGirlGentle::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlSassy:: @ 8264E33
+BattleFrontier_Lounge5_Text_NatureGirlSassy::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlCareful:: @ 8264E8F
+BattleFrontier_Lounge5_Text_NatureGirlCareful::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlEgg:: @ 8264EEE
+BattleFrontier_Lounge5_Text_NatureGirlEgg::
 	.string "That's silly! An EGG is asleep!\n"
 	.string "I can't talk to it!$"
 
-BattleFrontier_Lounge5_Text_LadyClaimsSheUnderstandsPokemon:: @ 8264F22
+BattleFrontier_Lounge5_Text_LadyClaimsSheUnderstandsPokemon::
 	.string "How charming!\n"
 	.string "That little lady claims she can\l"
 	.string "understand POKéMON!$"
 
-BattleFrontier_Lounge5_Text_GirlSayingSomethingProfound:: @ 8264F64
+BattleFrontier_Lounge5_Text_GirlSayingSomethingProfound::
 	.string "I have this feeling that the little girl\n"
 	.string "is saying something profound.$"
 
-BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot:: @ 8264FAB
+BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot::
 	.string "I know something!\p"
 	.string "That little girl plays at the red house\n"
 	.string "a lot!$"
diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc
index 34ca00073..f88c69324 100644
--- a/data/maps/BattleFrontier_Lounge6/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge6/scripts.inc
@@ -1,7 +1,7 @@
-BattleFrontier_Lounge6_MapScripts:: @ 8264FEC
+BattleFrontier_Lounge6_MapScripts::
 	.byte 0
 
-BattleFrontier_Lounge6_EventScript_Trader:: @ 8264FED
+BattleFrontier_Lounge6_EventScript_Trader::
 	lock
 	faceplayer
 	goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_TradeCompleted
@@ -32,23 +32,23 @@ BattleFrontier_Lounge6_EventScript_Trader:: @ 8264FED
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_DeclineTrade:: @ 826506B
+BattleFrontier_Lounge6_EventScript_DeclineTrade::
 	msgbox BattleFrontier_Lounge6_Text_WellThatsFineToo, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_NotRequestedMon:: @ 8265075
+BattleFrontier_Lounge6_EventScript_NotRequestedMon::
 	bufferspeciesname 0, VAR_0x8009
 	msgbox BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_TradeCompleted:: @ 8265083
+BattleFrontier_Lounge6_EventScript_TradeCompleted::
 	msgbox BattleFrontier_Lounge6_Text_SkittySoMuchCuterThanImagined, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_Text_WouldYouLikeToTrade: @ 826508D
+BattleFrontier_Lounge6_Text_WouldYouLikeToTrade:
 	.string "My POKéMON is a {STR_VAR_2}.\n"
 	.string "Do you know it?\l"
 	.string "It's quite cute and rather nice.\p"
@@ -57,24 +57,24 @@ BattleFrontier_Lounge6_Text_WouldYouLikeToTrade: @ 826508D
 	.string "Would you like to trade me a {STR_VAR_1}\n"
 	.string "for my {STR_VAR_2}?$"
 
-BattleFrontier_Lounge6_Text_PromiseIllBeGoodToIt: @ 8265128
+BattleFrontier_Lounge6_Text_PromiseIllBeGoodToIt:
 	.string "Oh, it's adorable!\n"
 	.string "Thank you!\l"
 	.string "I promise I'll be good to it!\p"
 	.string "Oh! I hope you'll be good to\n"
 	.string "my {STR_VAR_2}, too!$"
 
-BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon: @ 826518D
+BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon:
 	.string "Oh, I'm sorry!\n"
 	.string "I don't intend to trade for anything\l"
 	.string "but a {STR_VAR_1}.$"
 
-BattleFrontier_Lounge6_Text_WellThatsFineToo: @ 82651CB
+BattleFrontier_Lounge6_Text_WellThatsFineToo:
 	.string "Oh, you won't?\n"
 	.string "Well, that's fine, too.\l"
 	.string "Please come visit us again.$"
 
-BattleFrontier_Lounge6_Text_SkittySoMuchCuterThanImagined: @ 826520E
+BattleFrontier_Lounge6_Text_SkittySoMuchCuterThanImagined:
 	.string "Giggle!\n"
 	.string "A SKITTY is so much cuter than I had\l"
 	.string "imagined. I'm delighted!$"
diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc
index 3dd8fc98c..287844470 100644
--- a/data/maps/BattleFrontier_Lounge7/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge7/scripts.inc
@@ -1,7 +1,7 @@
-BattleFrontier_Lounge7_MapScripts:: @ 8265254
+BattleFrontier_Lounge7_MapScripts::
 	.byte 0
 
-BattleFrontier_Lounge7_EventScript_LeftMoveTutor:: @ 8265255
+BattleFrontier_Lounge7_EventScript_LeftMoveTutor::
 	lock
 	faceplayer
 	setvar VAR_TEMP_C, SCROLL_MULTI_BF_MOVE_TUTOR_1
@@ -11,12 +11,12 @@ BattleFrontier_Lounge7_EventScript_LeftMoveTutor:: @ 8265255
 	goto BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_AlreadyMetLeftTutor:: @ 8265276
+BattleFrontier_Lounge7_EventScript_AlreadyMetLeftTutor::
 	msgbox BattleFrontier_Lounge7_Text_LeftTutorWelcomeBack, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove:: @ 8265284
+BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove::
 	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	special ShowBattlePointsWindow
@@ -41,7 +41,7 @@ BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove:: @ 8265284
 	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
 	end
 
-BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove:: @ 826532F
+BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove::
 	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	setvar VAR_TEMP_E, 0
@@ -65,57 +65,57 @@ BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove:: @ 826532F
 	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
 	end
 
-BattleFrontier_Lounge7_EventScript_Softboiled:: @ 82653D7
+BattleFrontier_Lounge7_EventScript_Softboiled::
 	setvar VAR_0x8008, 16
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_SeismicToss:: @ 82653E2
+BattleFrontier_Lounge7_EventScript_SeismicToss::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_DreamEater:: @ 82653ED
+BattleFrontier_Lounge7_EventScript_DreamEater::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_MegaPunch:: @ 82653F8
+BattleFrontier_Lounge7_EventScript_MegaPunch::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_MegaKick:: @ 8265403
+BattleFrontier_Lounge7_EventScript_MegaKick::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_BodySlam:: @ 826540E
+BattleFrontier_Lounge7_EventScript_BodySlam::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_RockSlide:: @ 8265419
+BattleFrontier_Lounge7_EventScript_RockSlide::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_Counter:: @ 8265424
+BattleFrontier_Lounge7_EventScript_Counter::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_ThunderWave:: @ 826542F
+BattleFrontier_Lounge7_EventScript_ThunderWave::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_SwordsDance:: @ 826543A
+BattleFrontier_Lounge7_EventScript_SwordsDance::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_RightMoveTutor:: @ 8265445
+BattleFrontier_Lounge7_EventScript_RightMoveTutor::
 	lock
 	faceplayer
 	setvar VAR_TEMP_C, SCROLL_MULTI_BF_MOVE_TUTOR_2
@@ -125,12 +125,12 @@ BattleFrontier_Lounge7_EventScript_RightMoveTutor:: @ 8265445
 	goto BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_AlreadyMetRightTutor:: @ 8265466
+BattleFrontier_Lounge7_EventScript_AlreadyMetRightTutor::
 	msgbox BattleFrontier_Lounge7_Text_RightTutorWelcomeBack, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove:: @ 8265474
+BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove::
 	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	special ShowBattlePointsWindow
@@ -155,7 +155,7 @@ BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove:: @ 8265474
 	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
 	end
 
-BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove:: @ 826551F
+BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove::
 	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	setvar VAR_TEMP_E, 1
@@ -179,64 +179,64 @@ BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove:: @ 826551F
 	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
 	end
 
-BattleFrontier_Lounge7_EventScript_DefenseCurl:: @ 82655C7
+BattleFrontier_Lounge7_EventScript_DefenseCurl::
 	setvar VAR_0x8008, 16
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_Snore:: @ 82655D2
+BattleFrontier_Lounge7_EventScript_Snore::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_MudSlap:: @ 82655DD
+BattleFrontier_Lounge7_EventScript_MudSlap::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_Swift:: @ 82655E8
+BattleFrontier_Lounge7_EventScript_Swift::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_IcyWind:: @ 82655F3
+BattleFrontier_Lounge7_EventScript_IcyWind::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_Endure:: @ 82655FE
+BattleFrontier_Lounge7_EventScript_Endure::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_PsychUp:: @ 8265609
+BattleFrontier_Lounge7_EventScript_PsychUp::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_IcePunch:: @ 8265614
+BattleFrontier_Lounge7_EventScript_IcePunch::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_ThunderPunch:: @ 826561F
+BattleFrontier_Lounge7_EventScript_ThunderPunch::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_FirePunch:: @ 826562A
+BattleFrontier_Lounge7_EventScript_FirePunch::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect:: @ 8265635
+BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect::
 	special CloseBattleFrontierTutorWindow
 	special CloseBattlePointsWindow
 	msgbox BattleFrontier_Lounge7_Text_YouDontWantTo, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge7_EventScript_CancelChooseMon:: @ 8265645
+BattleFrontier_Lounge7_EventScript_CancelChooseMon::
 	msgbox BattleFrontier_Lounge7_Text_YouDontWantTo, MSGBOX_DEFAULT
 	release
 	end
@@ -245,7 +245,7 @@ BattleFrontier_Lounge7_EventScript_CancelChooseMon:: @ 8265645
 @ VAR_TEMP_C is the scroll multichoice ID
 @ VAR_TEMP_D is the move selection
 @ VAR_TEMP_E is which move tutor was spoken to
-BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection:: @ 826564F
+BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection::
 	copyvar VAR_0x8004, VAR_TEMP_D
 	copyvar VAR_0x8005, VAR_TEMP_E
 	special BufferBattleFrontierTutorMoveName
@@ -261,7 +261,7 @@ BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection:: @ 826564F
 	goto BattleFrontier_Lounge7_EventScript_ChooseNewMove
 	end
 
-BattleFrontier_Lounge7_EventScript_TeachTutorMove:: @ 8265696
+BattleFrontier_Lounge7_EventScript_TeachTutorMove::
 	msgbox BattleFrontier_Lounge7_Text_TeachMoveToWhichMon, MSGBOX_DEFAULT
 	special GetBattleFrontierTutorMoveIndex
 	fadescreen FADE_TO_BLACK
@@ -277,21 +277,21 @@ BattleFrontier_Lounge7_EventScript_TeachTutorMove:: @ 8265696
 	release
 	end
 
-BattleFrontier_Lounge7_EventScript_ChooseNewMove:: @ 82656CA
+BattleFrontier_Lounge7_EventScript_ChooseNewMove::
 	compare VAR_TEMP_E, 0
 	goto_if_eq BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove
 	goto BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_Sailor:: @ 82656DB
+BattleFrontier_Lounge7_EventScript_Sailor::
 	msgbox BattleFrontier_Lounge7_Text_ThinkLadiesDontGetAlong, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge7_EventScript_Gentleman:: @ 82656E4
+BattleFrontier_Lounge7_EventScript_Gentleman::
 	msgbox BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge7_Text_LeftTutorIntro: @ 82656ED
+BattleFrontier_Lounge7_Text_LeftTutorIntro:
 	.string "Buhahaha!\p"
 	.string "You couldn't tell it from looking now,\n"
 	.string "but I used to be one tough TRAINER.\p"
@@ -309,38 +309,38 @@ BattleFrontier_Lounge7_Text_LeftTutorIntro: @ 82656ED
 	.string "How about paying for the moves I teach\l"
 	.string "with a wee bit of Battle Points?$"
 
-BattleFrontier_Lounge7_Text_LeftTutorWelcomeBack: @ 82658AB
+BattleFrontier_Lounge7_Text_LeftTutorWelcomeBack:
 	.string "Buhahaha!\p"
 	.string "Are you back to learn special and\n"
 	.string "yet cute POKéMON moves?$"
 
-BattleFrontier_Lounge7_Text_TeachWhichMove: @ 82658EF
+BattleFrontier_Lounge7_Text_TeachWhichMove:
 	.string "Fine, fine, look here!\n"
 	.string "Which move should I teach?$"
 
-BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints: @ 8265921
+BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints:
 	.string "The move {STR_VAR_1}, is it?\n"
 	.string "That will be {STR_VAR_2} Battle Points, okay?$"
 
-BattleFrontier_Lounge7_Text_TeachMoveToWhichMon: @ 826595A
+BattleFrontier_Lounge7_Text_TeachMoveToWhichMon:
 	.string "Fine, fine, now pick the POKéMON\n"
 	.string "I should teach the move to.$"
 
-BattleFrontier_Lounge7_Text_HaventGotEnoughPoints: @ 8265997
+BattleFrontier_Lounge7_Text_HaventGotEnoughPoints:
 	.string "What the…\n"
 	.string "You haven't got enough Battle Points!$"
 
-BattleFrontier_Lounge7_Text_IllTakeBattlePoints: @ 82659C7
+BattleFrontier_Lounge7_Text_IllTakeBattlePoints:
 	.string "Do you see how skilled I am now?\n"
 	.string "I'll take your Battle Points, thanks!$"
 
-BattleFrontier_Lounge7_Text_YouDontWantTo: @ 8265A0E
+BattleFrontier_Lounge7_Text_YouDontWantTo:
 	.string "What's that?\n"
 	.string "You don't want to…\p"
 	.string "If you want to see how skilled I am,\n"
 	.string "you come see me anytime!$"
 
-BattleFrontier_Lounge7_Text_RightTutorIntro: @ 8265A6C
+BattleFrontier_Lounge7_Text_RightTutorIntro:
 	.string "Ihihihi!\p"
 	.string "I know it's hard to see now, but I used\n"
 	.string "to be one fantastic TRAINER.\p"
@@ -358,19 +358,19 @@ BattleFrontier_Lounge7_Text_RightTutorIntro: @ 8265A6C
 	.string "How about paying for the moves I teach\l"
 	.string "with a wee bit of Battle Points?$"
 
-BattleFrontier_Lounge7_Text_RightTutorWelcomeBack: @ 8265C2C
+BattleFrontier_Lounge7_Text_RightTutorWelcomeBack:
 	.string "Ihihihi!\p"
 	.string "Have you come to learn hard and\n"
 	.string "yet pretty POKéMON moves?$"
 
-BattleFrontier_Lounge7_Text_ThinkLadiesDontGetAlong: @ 8265C6F
+BattleFrontier_Lounge7_Text_ThinkLadiesDontGetAlong:
 	.string "Those ladies, the way they bad-mouth\n"
 	.string "each other, you probably think that\l"
 	.string "they don't get along.\p"
 	.string "But if that were true, they wouldn't\n"
 	.string "stay out here together, would they?$"
 
-BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful: @ 8265D17
+BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful:
 	.string "When I was just a wee YOUNGSTER,\n"
 	.string "those ladies were strong and beautiful.\p"
 	.string "They were idols among us TRAINERS.\p"
@@ -382,102 +382,102 @@ BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful: @ 8265D17
 	.string "but feel this…\p"
 	.string "Time is so cruel…$"
 
-BattleFrontier_Lounge7_Text_SoftboiledDesc:: @ 8265E30
+BattleFrontier_Lounge7_Text_SoftboiledDesc::
 	.string "Recovers up to\n"
 	.string "half the user's\n"
 	.string "maximum HP.$"
 
-BattleFrontier_Lounge7_Text_SeismicTossDesc:: @ 8265E5B
+BattleFrontier_Lounge7_Text_SeismicTossDesc::
 	.string "Inflicts damage\n"
 	.string "identical to the\n"
 	.string "user's level.$"
 
-BattleFrontier_Lounge7_Text_DreamEaterDesc:: @ 8265E8A
+BattleFrontier_Lounge7_Text_DreamEaterDesc::
 	.string "Recovers half the\n"
 	.string "damage inflicted\n"
 	.string "on a sleeping foe.$"
 
-BattleFrontier_Lounge7_Text_MegaPunchDesc:: @ 8265EC0
+BattleFrontier_Lounge7_Text_MegaPunchDesc::
 	.string "A strong punch\n"
 	.string "thrown with\n"
 	.string "incredible power.$"
 
-BattleFrontier_Lounge7_Text_MegaKickDesc:: @ 8265EED
+BattleFrontier_Lounge7_Text_MegaKickDesc::
 	.string "An extremely\n"
 	.string "powerful kick with\n"
 	.string "intense force.$"
 
-BattleFrontier_Lounge7_Text_BodySlamDesc:: @ 8265F1C
+BattleFrontier_Lounge7_Text_BodySlamDesc::
 	.string "A full-body slam\n"
 	.string "that may cause\n"
 	.string "paralysis.$"
 
-BattleFrontier_Lounge7_Text_RockSlideDesc:: @ 8265F47
+BattleFrontier_Lounge7_Text_RockSlideDesc::
 	.string "Large boulders\n"
 	.string "are hurled. May\n"
 	.string "cause flinching.$"
 
-BattleFrontier_Lounge7_Text_CounterDesc:: @ 8265F77
+BattleFrontier_Lounge7_Text_CounterDesc::
 	.string "Retaliates any\n"
 	.string "physical hit with\n"
 	.string "double the power.$"
 
-BattleFrontier_Lounge7_Text_ThunderWaveDesc:: @ 8265FAA
+BattleFrontier_Lounge7_Text_ThunderWaveDesc::
 	.string "A weak jolt of\n"
 	.string "electricity that\n"
 	.string "paralyzes the foe.$"
 
-BattleFrontier_Lounge7_Text_SwordsDanceDesc:: @ 8265FDD
+BattleFrontier_Lounge7_Text_SwordsDanceDesc::
 	.string "A fighting dance\n"
 	.string "that sharply\n"
 	.string "raises ATTACK.$"
 
-BattleFrontier_Lounge7_Text_DefenseCurlDesc:: @ 826600A
+BattleFrontier_Lounge7_Text_DefenseCurlDesc::
 	.string "Curls up to con-\n"
 	.string "ceal weak spots\n"
 	.string "and raise DEFENSE.$"
 
-BattleFrontier_Lounge7_Text_SnoreDesc:: @ 826603E
+BattleFrontier_Lounge7_Text_SnoreDesc::
 	.string "A loud attack\n"
 	.string "that can be used\n"
 	.string "only while asleep.$"
 
-BattleFrontier_Lounge7_Text_MudSlapDesc:: @ 8266070
+BattleFrontier_Lounge7_Text_MudSlapDesc::
 	.string "Hurls mud in the\n"
 	.string "foe's face to re-\n"
 	.string "duce its accuracy.$"
 
-BattleFrontier_Lounge7_Text_SwiftDesc:: @ 82660A6
+BattleFrontier_Lounge7_Text_SwiftDesc::
 	.string "Sprays star-\n"
 	.string "shaped rays\n"
 	.string "that never miss.$"
 
-BattleFrontier_Lounge7_Text_IcyWindDesc:: @ 82660D0
+BattleFrontier_Lounge7_Text_IcyWindDesc::
 	.string "A chilling attack\n"
 	.string "that lowers the\n"
 	.string "foe's SPEED.$"
 
-BattleFrontier_Lounge7_Text_EndureDesc:: @ 82660FF
+BattleFrontier_Lounge7_Text_EndureDesc::
 	.string "Endures any at-\n"
 	.string "tack for 1 turn,\n"
 	.string "leaving 1HP.$"
 
-BattleFrontier_Lounge7_Text_PsychUpDesc:: @ 826612D
+BattleFrontier_Lounge7_Text_PsychUpDesc::
 	.string "Copies the foe's\n"
 	.string "effect(s) and\n"
 	.string "gives to the user.$"
 
-BattleFrontier_Lounge7_Text_IcePunchDesc:: @ 826615F
+BattleFrontier_Lounge7_Text_IcePunchDesc::
 	.string "An icy punch\n"
 	.string "that may\n"
 	.string "freeze the foe.$"
 
-BattleFrontier_Lounge7_Text_ThunderPunchDesc:: @ 8266185
+BattleFrontier_Lounge7_Text_ThunderPunchDesc::
 	.string "An electrified\n"
 	.string "punch that may\n"
 	.string "paralyze the foe.$"
 
-BattleFrontier_Lounge7_Text_FirePunchDesc:: @ 82661B5
+BattleFrontier_Lounge7_Text_FirePunchDesc::
 	.string "A fiery punch\n"
 	.string "that may burn\n"
 	.string "the foe.$"
diff --git a/data/maps/BattleFrontier_Lounge8/scripts.inc b/data/maps/BattleFrontier_Lounge8/scripts.inc
index 2615af743..8f4a443d5 100644
--- a/data/maps/BattleFrontier_Lounge8/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge8/scripts.inc
@@ -1,19 +1,19 @@
-BattleFrontier_Lounge8_MapScripts:: @ 82676C9
+BattleFrontier_Lounge8_MapScripts::
 	.byte 0
 
-BattleFrontier_Lounge8_EventScript_Man:: @ 82676CA
+BattleFrontier_Lounge8_EventScript_Man::
 	msgbox BattleFrontier_Lounge8_Text_WhatATrainerNeeds, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_EventScript_Woman:: @ 82676D3
+BattleFrontier_Lounge8_EventScript_Woman::
 	msgbox BattleFrontier_Lounge8_Text_KnowAboutFrontierBrains, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_EventScript_NinjaBoy:: @ 82676DC
+BattleFrontier_Lounge8_EventScript_NinjaBoy::
 	msgbox BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_Text_WhatATrainerNeeds: @ 82676E5
+BattleFrontier_Lounge8_Text_WhatATrainerNeeds:
 	.string "What a TRAINER needs…\p"
 	.string "Knowledge…\n"
 	.string "Strategy…\l"
@@ -27,14 +27,14 @@ BattleFrontier_Lounge8_Text_WhatATrainerNeeds: @ 82676E5
 	.string "Huh? POKéMON?\n"
 	.string "What's that?$"
 
-BattleFrontier_Lounge8_Text_KnowAboutFrontierBrains: @ 826779C
+BattleFrontier_Lounge8_Text_KnowAboutFrontierBrains:
 	.string "Do you know about the FRONTIER\n"
 	.string "BRAINS?\p"
 	.string "That's what SCOTT calls the seven\n"
 	.string "special TRAINERS that run the seven\l"
 	.string "facilities in the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling: @ 826782C
+BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling:
 	.string "At the BATTLE TOWER, an older girl\n"
 	.string "told me that I have a lot of talent\l"
 	.string "for battling!\p"
diff --git a/data/maps/BattleFrontier_Lounge9/scripts.inc b/data/maps/BattleFrontier_Lounge9/scripts.inc
index cba75ee77..b955a81e3 100644
--- a/data/maps/BattleFrontier_Lounge9/scripts.inc
+++ b/data/maps/BattleFrontier_Lounge9/scripts.inc
@@ -1,3 +1,3 @@
-BattleFrontier_Lounge9_MapScripts:: @ 82678F8
+BattleFrontier_Lounge9_MapScripts::
 	.byte 0
 
diff --git a/data/maps/BattleFrontier_Mart/scripts.inc b/data/maps/BattleFrontier_Mart/scripts.inc
index 4e60e9ce5..6afe6a018 100644
--- a/data/maps/BattleFrontier_Mart/scripts.inc
+++ b/data/maps/BattleFrontier_Mart/scripts.inc
@@ -1,9 +1,9 @@
 .set LOCALID_OLD_WOMAN, 2
 
-BattleFrontier_Mart_MapScripts:: @ 8267ACB
+BattleFrontier_Mart_MapScripts::
 	.byte 0
 
-BattleFrontier_Mart_EventScript_Clerk:: @ 8267ACC
+BattleFrontier_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -14,7 +14,7 @@ BattleFrontier_Mart_EventScript_Clerk:: @ 8267ACC
 	end
 
 	.align 2
-BattleFrontier_Mart_Pokemart: @ 8267AE4
+BattleFrontier_Mart_Pokemart:
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
@@ -32,11 +32,11 @@ BattleFrontier_Mart_Pokemart: @ 8267AE4
 	release
 	end
 
-BattleFrontier_Mart_EventScript_OldMan:: @ 8267B02
+BattleFrontier_Mart_EventScript_OldMan::
 	msgbox BattleFrontier_Mart_Text_ChaperonGrandson, MSGBOX_NPC
 	end
 
-BattleFrontier_Mart_EventScript_OldWoman:: @ 8267B0B
+BattleFrontier_Mart_EventScript_OldWoman::
 	lock
 	applymovement LOCALID_OLD_WOMAN, Common_Movement_FaceDown
 	waitmovement 0
@@ -44,23 +44,23 @@ BattleFrontier_Mart_EventScript_OldWoman:: @ 8267B0B
 	release
 	end
 
-BattleFrontier_Mart_EventScript_Boy:: @ 8267B20
+BattleFrontier_Mart_EventScript_Boy::
 	msgbox BattleFrontier_Mart_Text_FacilitiesDontAllowItems, MSGBOX_NPC
 	end
 
-BattleFrontier_Mart_Text_ChaperonGrandson: @ 8267B29
+BattleFrontier_Mart_Text_ChaperonGrandson:
 	.string "We came here to chaperon our\n"
 	.string "grandson.\p"
 	.string "But since we're here, we thought\n"
 	.string "we should get some souvenirs.$"
 
-BattleFrontier_Mart_Text_ProteinMakeNiceGift: @ 8267B8F
+BattleFrontier_Mart_Text_ProteinMakeNiceGift:
 	.string "Dear, what do you think of this?\n"
 	.string "Wouldn't this make a nice gift?\p"
 	.string "It's…PRO…TE…IN?\n"
 	.string "It sounds delicious, doesn't it?$"
 
-BattleFrontier_Mart_Text_FacilitiesDontAllowItems: @ 8267C01
+BattleFrontier_Mart_Text_FacilitiesDontAllowItems:
 	.string "A lot of the BATTLE FRONTIER's\n"
 	.string "facilities don't allow the use of items\l"
 	.string "during battles.\p"
diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc
index 8e891dd32..8166f9186 100644
--- a/data/maps/BattleFrontier_OutsideEast/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc
@@ -1,74 +1,74 @@
 .set LOCALID_SUDOWOODO, 14
 
-BattleFrontier_OutsideEast_MapScripts:: @ 8242C04
+BattleFrontier_OutsideEast_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_OnTransition
 	.byte 0
 
-BattleFrontier_OutsideEast_OnResume: @ 8242C0F
+BattleFrontier_OutsideEast_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo
 	end
 
-BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo:: @ 8242C19
+BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-BattleFrontier_OutsideEast_OnTransition: @ 8242C2D
+BattleFrontier_OutsideEast_OnTransition:
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_ShowSudowoodo
 	end
 
-BattleFrontier_OutsideEast_EventScript_ShowSudowoodo:: @ 8242C3F
+BattleFrontier_OutsideEast_EventScript_ShowSudowoodo::
 	clearflag FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO
 	return
 
-BattleFrontier_OutsideEast_EventScript_BattleTowerSign:: @ 8242C43
+BattleFrontier_OutsideEast_EventScript_BattleTowerSign::
 	msgbox BattleFrontier_OutsideEast_Text_BattleTowerSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_BattlePalaceSign:: @ 8242C4C
+BattleFrontier_OutsideEast_EventScript_BattlePalaceSign::
 	msgbox BattleFrontier_OutsideEast_Text_BattlePalaceSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_BattleArenaSign:: @ 8242C55
+BattleFrontier_OutsideEast_EventScript_BattleArenaSign::
 	msgbox BattleFrontier_OutsideEast_Text_BattleArenaSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_BattlePyramidSign:: @ 8242C5E
+BattleFrontier_OutsideEast_EventScript_BattlePyramidSign::
 	msgbox BattleFrontier_OutsideEast_Text_BattlePyramidSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_NinjaBoy:: @ 8242C67
+BattleFrontier_OutsideEast_EventScript_NinjaBoy::
 	msgbox BattleFrontier_OutsideEast_Text_BattleTowerFeelsSpecial, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Man1:: @ 8242C70
+BattleFrontier_OutsideEast_EventScript_Man1::
 	msgbox BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Hiker:: @ 8242C79
+BattleFrontier_OutsideEast_EventScript_Hiker::
 	msgbox BattleFrontier_OutsideEast_Text_PyramidTooHarsh, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_HexManiac:: @ 8242C82
+BattleFrontier_OutsideEast_EventScript_HexManiac::
 	msgbox BattleFrontier_OutsideEast_Text_ThriveInDarkness, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_BlackBelt1:: @ 8242C8B
+BattleFrontier_OutsideEast_EventScript_BlackBelt1::
 	msgbox BattleFrontier_OutsideEast_Text_PutTogetherUltimateTeam, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Cook:: @ 8242C94
+BattleFrontier_OutsideEast_EventScript_Cook::
 	lock
 	msgbox BattleFrontier_OutsideEast_Text_BelieveInYouBuddy, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_Zigzagoon:: @ 8242C9F
+BattleFrontier_OutsideEast_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
@@ -78,33 +78,33 @@ BattleFrontier_OutsideEast_EventScript_Zigzagoon:: @ 8242C9F
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_RichBoy:: @ 8242CB2
+BattleFrontier_OutsideEast_EventScript_RichBoy::
 	msgbox BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_ExpertF:: @ 8242CBB
+BattleFrontier_OutsideEast_EventScript_ExpertF::
 	msgbox BattleFrontier_OutsideEast_Text_OnceBeatGymLeader, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_TriathleteF:: @ 8242CC4
+BattleFrontier_OutsideEast_EventScript_TriathleteF::
 	msgbox BattleFrontier_OutsideEast_Text_FastOnBikeAndBattles, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Twin:: @ 8242CCD
+BattleFrontier_OutsideEast_EventScript_Twin::
 	msgbox BattleFrontier_OutsideEast_Text_BetterThanDaddyAtPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Man2:: @ 8242CD6
+BattleFrontier_OutsideEast_EventScript_Man2::
 	lock
 	msgbox BattleFrontier_OutsideEast_Text_GoRackUpSomeWinsForDaddy, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_TriathleteM:: @ 8242CE1
+BattleFrontier_OutsideEast_EventScript_TriathleteM::
 	msgbox BattleFrontier_OutsideEast_Text_DidScottBringYouHere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA
+BattleFrontier_OutsideEast_EventScript_Sudowoodo::
 	lock
 	faceplayer
 	waitse
@@ -114,7 +114,7 @@ BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC
+BattleFrontier_OutsideEast_EventScript_WaterSudowoodo::
 	lock
 	faceplayer
 	special DoWateringBerryTreeAnim
@@ -145,12 +145,12 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo:: @ 8242D60
+BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo::
 	setflag FLAG_DEFEATED_SUDOWOODO
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-BattleFrontier_OutsideEast_Movement_SudowoodoShake: @ 8242D69
+BattleFrontier_OutsideEast_Movement_SudowoodoShake:
 	face_right
 	delay_8
 	face_down
@@ -168,59 +168,59 @@ BattleFrontier_OutsideEast_Movement_SudowoodoShake: @ 8242D69
 	face_down
 	step_end
 
-BattleFrontier_OutsideEast_EventScript_Maniac1:: @ 8242D79
+BattleFrontier_OutsideEast_EventScript_Maniac1::
 	msgbox BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Girl:: @ 8242D82
+BattleFrontier_OutsideEast_EventScript_Girl::
 	msgbox BattleFrontier_OutsideEast_Text_SometimesImportantOldManInThere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_PsychicM:: @ 8242D8B
+BattleFrontier_OutsideEast_EventScript_PsychicM::
 	msgbox BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Man3:: @ 8242D94
+BattleFrontier_OutsideEast_EventScript_Man3::
 	msgbox BattleFrontier_OutsideEast_Text_GotWipedOut, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Woman1:: @ 8242D9D
+BattleFrontier_OutsideEast_EventScript_Woman1::
 	msgbox BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Woman2:: @ 8242DA6
+BattleFrontier_OutsideEast_EventScript_Woman2::
 	msgbox BattleFrontier_OutsideEast_Text_EnoughBattlePointsForDoll, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_BlackBelt2:: @ 8242DAF
+BattleFrontier_OutsideEast_EventScript_BlackBelt2::
 	msgbox BattleFrontier_OutsideEast_Text_LikeToHaveNameRecordedHere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Maniac2:: @ 8242DB8
+BattleFrontier_OutsideEast_EventScript_Maniac2::
 	lock
 	msgbox BattleFrontier_OutsideEast_Text_CanDoAnythingWithYou, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_Woman3:: @ 8242DC3
+BattleFrontier_OutsideEast_EventScript_Woman3::
 	lock
 	msgbox BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_RankingHallSign:: @ 8242DCE
+BattleFrontier_OutsideEast_EventScript_RankingHallSign::
 	msgbox BattleFrontier_OutsideEast_Text_RankingHallSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_ExchangeCornerSign:: @ 8242DD7
+BattleFrontier_OutsideEast_EventScript_ExchangeCornerSign::
 	msgbox BattleFrontier_OutsideEast_Text_ExchangeCornerSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_Gentleman:: @ 8242DE0
+BattleFrontier_OutsideEast_EventScript_Gentleman::
 	msgbox BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_OldWoman:: @ 8242DE9
+BattleFrontier_OutsideEast_EventScript_OldWoman::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_OldWomanSudowoodoGone
@@ -228,47 +228,47 @@ BattleFrontier_OutsideEast_EventScript_OldWoman:: @ 8242DE9
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_OldWomanSudowoodoGone:: @ 8242DFE
+BattleFrontier_OutsideEast_EventScript_OldWomanSudowoodoGone::
 	msgbox BattleFrontier_OutsideEast_Text_OnceAnOddTreePastHere, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_Camper:: @ 8242E08
+BattleFrontier_OutsideEast_EventScript_Camper::
 	msgbox BattleFrontier_OutsideEast_Text_StickyMonWithLongTail, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_Text_BattleTowerSign: @ 8242E11
+BattleFrontier_OutsideEast_Text_BattleTowerSign:
 	.string "This is the BATTLE TOWER!\n"
 	.string "Keep the win streak as the toughest\l"
 	.string "TRAINER!$"
 
-BattleFrontier_OutsideEast_Text_BattlePalaceSign: @ 8242E58
+BattleFrontier_OutsideEast_Text_BattlePalaceSign:
 	.string "This is the BATTLE PALACE!\n"
 	.string "Keep your eyes on POKéMON battles!$"
 
-BattleFrontier_OutsideEast_Text_BattleArenaSign: @ 8242E96
+BattleFrontier_OutsideEast_Text_BattleArenaSign:
 	.string "This is the BATTLE ARENA!\n"
 	.string "Let the toughest teams gather!$"
 
-BattleFrontier_OutsideEast_Text_BattlePyramidSign: @ 8242ECF
+BattleFrontier_OutsideEast_Text_BattlePyramidSign:
 	.string "This is the BATTLE PYRAMID!\n"
 	.string "Advance through the Battle Quest!$"
 
-BattleFrontier_OutsideEast_Text_RankingHallSign: @ 8242F0D
+BattleFrontier_OutsideEast_Text_RankingHallSign:
 	.string "BATTLE FRONTIER RANKING HALL\n"
 	.string "Set your sights on new records!$"
 
-BattleFrontier_OutsideEast_Text_ExchangeCornerSign: @ 8242F4A
+BattleFrontier_OutsideEast_Text_ExchangeCornerSign:
 	.string "BATTLE POINT EXCHANGE SERVICE CORNER\n"
 	.string "Exchange your Battle Points!$"
 
-BattleFrontier_OutsideEast_Text_BattleTowerFeelsSpecial: @ 8242F8C
+BattleFrontier_OutsideEast_Text_BattleTowerFeelsSpecial:
 	.string "Wow!\n"
 	.string "It's huge!\p"
 	.string "The BATTLE TOWER feels special.\n"
 	.string "It's different from the others.$"
 
-BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier: @ 8242FDC
+BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier:
 	.string "My grand ambition is to conquer both\n"
 	.string "the BATTLE FRONTIER and the POKéMON\l"
 	.string "LEAGUE.\p"
@@ -276,26 +276,26 @@ BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier: @ 8242FDC
 	.string "I… I'm going to ask MIMI next door\n"
 	.string "if she will be friends with me!$"
 
-BattleFrontier_OutsideEast_Text_PyramidTooHarsh: @ 824308C
+BattleFrontier_OutsideEast_Text_PyramidTooHarsh:
 	.string "The BATTLE PYRAMID's too harsh!\n"
 	.string "I just can't make it to the top!\p"
 	.string "Since I'm out of options, maybe I can\n"
 	.string "climb the outside…$"
 
-BattleFrontier_OutsideEast_Text_ThriveInDarkness: @ 8243106
+BattleFrontier_OutsideEast_Text_ThriveInDarkness:
 	.string "I thrive in darkness…\n"
 	.string "Yes… What is worthy of me?\l"
 	.string "None other than the BATTLE PYRAMID…\p"
 	.string "What say you to wandering in darkness\n"
 	.string "and in utter and total desperation?$"
 
-BattleFrontier_OutsideEast_Text_PutTogetherUltimateTeam: @ 82431A5
+BattleFrontier_OutsideEast_Text_PutTogetherUltimateTeam:
 	.string "I didn't sleep for a week, but then\n"
 	.string "I put together the ultimate team!\p"
 	.string "I can't see myself losing, no joke.\n"
 	.string "We're storming the BATTLE ARENA!$"
 
-BattleFrontier_OutsideEast_Text_DidScottBringYouHere: @ 8243230
+BattleFrontier_OutsideEast_Text_DidScottBringYouHere:
 	.string "Did SCOTT bring you here, too?\n"
 	.string "What is it with that guy?\p"
 	.string "It sounds like he really does know\n"
@@ -303,16 +303,16 @@ BattleFrontier_OutsideEast_Text_DidScottBringYouHere: @ 8243230
 	.string "I've never seen him battling in person\n"
 	.string "ever.$"
 
-BattleFrontier_OutsideEast_Text_BelieveInYouBuddy: @ 82432DD
+BattleFrontier_OutsideEast_Text_BelieveInYouBuddy:
 	.string "ZIGG!\n"
 	.string "I believe in you, little buddy!\p"
 	.string "I'll make my little ZIGG any favorite\n"
 	.string "tasty treats you like if you win!$"
 
-BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant: @ 824334B
+BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant:
 	.string "ZIGZAGOON looks vacant…$"
 
-BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody: @ 8243363
+BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody:
 	.string "People call me a busybody,\n"
 	.string "but I can't help it.\p"
 	.string "Your hat's on crooked!\n"
@@ -321,29 +321,29 @@ BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody: @ 8243363
 	.string "I don't know if I can stand to just\n"
 	.string "watch at the BATTLE PALACE…$"
 
-BattleFrontier_OutsideEast_Text_OnceBeatGymLeader: @ 8243425
+BattleFrontier_OutsideEast_Text_OnceBeatGymLeader:
 	.string "I may not look that impressive now,\n"
 	.string "but I once beat a GYM LEADER.\p"
 	.string "Who knows, maybe I should give it\n"
 	.string "another shot at glory.$"
 
-BattleFrontier_OutsideEast_Text_FastOnBikeAndBattles: @ 82434A0
+BattleFrontier_OutsideEast_Text_FastOnBikeAndBattles:
 	.string "I'm fast on my BIKE, and that goes for\n"
 	.string "the way I battle, too.\p"
 	.string "I win matches in the blink of\n"
 	.string "an eye!$"
 
-BattleFrontier_OutsideEast_Text_BetterThanDaddyAtPokemon: @ 8243504
+BattleFrontier_OutsideEast_Text_BetterThanDaddyAtPokemon:
 	.string "I'm better than my daddy\n"
 	.string "at POKéMON.$"
 
-BattleFrontier_OutsideEast_Text_GoRackUpSomeWinsForDaddy: @ 8243529
+BattleFrontier_OutsideEast_Text_GoRackUpSomeWinsForDaddy:
 	.string "Go on, my baby sweetie!\n"
 	.string "Go rack up some wins for Daddy!\p"
 	.string "You're just like your mother,\n"
 	.string "so you'll be dominating!$"
 
-BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena: @ 8243598
+BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena:
 	.string "It wasn't easy getting here,\n"
 	.string "but I'd heard about this knockout\l"
 	.string "pretty girl at the BATTLE ARENA.\p"
@@ -352,13 +352,13 @@ BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena: @ 8243598
 	.string "A whole teeming mob of sweaty,\n"
 	.string "stinky, and primitive martial artists!$"
 
-BattleFrontier_OutsideEast_Text_SometimesImportantOldManInThere: @ 8243668
+BattleFrontier_OutsideEast_Text_SometimesImportantOldManInThere:
 	.string "I sometimes see this really important-\n"
 	.string "looking old man going in there.\p"
 	.string "He has these really awesome POKéMON.\n"
 	.string "He seems really nice, though.$"
 
-BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid: @ 82436F2
+BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid:
 	.string "Do you know it?\n"
 	.string "The legend of the BATTLE PYRAMID?\p"
 	.string "When there comes a confident TRAINER\n"
@@ -370,7 +370,7 @@ BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid: @ 82436F2
 	.string "What's it supposed to mean?\n"
 	.string "That, my friend, I can't say!$"
 
-BattleFrontier_OutsideEast_Text_GotWipedOut: @ 8243809
+BattleFrontier_OutsideEast_Text_GotWipedOut:
 	.string "Man! Oh man!\n"
 	.string "I've never lost once before!\p"
 	.string "But I got wiped out with no saving\n"
@@ -378,7 +378,7 @@ BattleFrontier_OutsideEast_Text_GotWipedOut: @ 8243809
 	.string "And then I'm told I don't have any\n"
 	.string "talent?! Man!$"
 
-BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower: @ 8243895
+BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower:
 	.string "This guy ran into a horribly tough\n"
 	.string "TRAINER while he was on the BATTLE\l"
 	.string "TOWER challenge.\p"
@@ -386,23 +386,23 @@ BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower: @ 8243895
 	.string "You need to be cautious if you ever\n"
 	.string "decide to go to the BATTLE TOWER.$"
 
-BattleFrontier_OutsideEast_Text_EnoughBattlePointsForDoll: @ 8243943
+BattleFrontier_OutsideEast_Text_EnoughBattlePointsForDoll:
 	.string "Yes!\n"
 	.string "I've finally got enough Battle Points!\p"
 	.string "I guess I'll trade for another giant\n"
 	.string "plush DOLL!$"
 
-BattleFrontier_OutsideEast_Text_LikeToHaveNameRecordedHere: @ 82439A0
+BattleFrontier_OutsideEast_Text_LikeToHaveNameRecordedHere:
 	.string "Oh, yeah, okay!\n"
 	.string "So this is the RANKING HALL!\p"
 	.string "I'd like to go down in history as\n"
 	.string "a super champ and have my name\l"
 	.string "recorded here for posterity.$"
 
-BattleFrontier_OutsideEast_Text_CanDoAnythingWithYou: @ 8243A2B
+BattleFrontier_OutsideEast_Text_CanDoAnythingWithYou:
 	.string "With you by my side, I can do anything.$"
 
-BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome: @ 8243A53
+BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome:
 	.string "Ooh, darling, you are so wonderful!\p"
 	.string "Ooh, I just can't wait anymore!\p"
 	.string "Let's go to a MULTI BATTLE ROOM\n"
@@ -413,7 +413,7 @@ BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome: @ 8243A53
 	.string "Why, before us, darling, everything\n"
 	.string "will topple like dominoes!$"
 
-BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers: @ 8243B68
+BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers:
 	.string "The BATTLE FRONTIER isn't exclusively\n"
 	.string "for tough TRAINERS.\p"
 	.string "Many people with special abilities\n"
@@ -422,19 +422,19 @@ BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers: @ 8243B6
 	.string "He may have built this place to serve\n"
 	.string "a bigger objective…$"
 
-BattleFrontier_OutsideEast_Text_OddTreeHereSeemsToWiggle: @ 8243C2C
+BattleFrontier_OutsideEast_Text_OddTreeHereSeemsToWiggle:
 	.string "Excuse me, young one.\n"
 	.string "Have you good eyesight?\p"
 	.string "There is an odd tree past here, and to\n"
 	.string "my tired eyes it seems to wiggle.$"
 
-BattleFrontier_OutsideEast_Text_OnceAnOddTreePastHere: @ 8243CA3
+BattleFrontier_OutsideEast_Text_OnceAnOddTreePastHere:
 	.string "Excuse me, young one.\n"
 	.string "Have you a good memory?\p"
 	.string "I have this feeling there once was\n"
 	.string "an odd tree past here.$"
 
-BattleFrontier_OutsideEast_Text_StickyMonWithLongTail: @ 8243D0B
+BattleFrontier_OutsideEast_Text_StickyMonWithLongTail:
 	.string "I…\n"
 	.string "I saw it!\p"
 	.string "There was a sticky sort of a POKéMON\n"
diff --git a/data/maps/BattleFrontier_OutsideWest/scripts.inc b/data/maps/BattleFrontier_OutsideWest/scripts.inc
index 9a85593a1..19f056258 100644
--- a/data/maps/BattleFrontier_OutsideWest/scripts.inc
+++ b/data/maps/BattleFrontier_OutsideWest/scripts.inc
@@ -7,16 +7,16 @@
 .set LOCALID_FISHERMAN_2, 18
 .set LOCALID_MAN_4, 23
 
-BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
+BattleFrontier_OutsideWest_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_OnTransition
 	.byte 0
 
-BattleFrontier_OutsideWest_OnTransition: @ 823D3E7
+BattleFrontier_OutsideWest_OnTransition:
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	end
 
-BattleFrontier_OutsideWest_EventScript_FerryAttendant:: @ 823D3F0
+BattleFrontier_OutsideWest_EventScript_FerryAttendant::
 	lock
 	faceplayer
 	msgbox BattleFrontier_OutsideWest_Text_MayISeeYourTicket, MSGBOX_DEFAULT
@@ -28,7 +28,7 @@ BattleFrontier_OutsideWest_EventScript_FerryAttendant:: @ 823D3F0
 	goto BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination
 	end
 
-BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination:: @ 823D416
+BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination::
 	multichoicedefault 18, 6, MULTI_SSTIDAL_BATTLE_FRONTIER, 2, FALSE
 	switch VAR_RESULT
 	case 0, BattleFrontier_OutsideWest_EventScript_FerryToSlateport
@@ -37,12 +37,12 @@ BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination:: @ 823D416
 	case MULTI_B_PRESSED, BattleFrontier_OutsideWest_EventScript_CancelFerrySelect
 	end
 
-BattleFrontier_OutsideWest_EventScript_NoSSTicket:: @ 823D44E
+BattleFrontier_OutsideWest_EventScript_NoSSTicket::
 	msgbox BattleFrontier_OutsideWest_Text_MustHaveTicketToBoard, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_FerryToSlateport:: @ 823D458
+BattleFrontier_OutsideWest_EventScript_FerryToSlateport::
 	msgbox BattleFrontier_OutsideWest_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
@@ -53,7 +53,7 @@ BattleFrontier_OutsideWest_EventScript_FerryToSlateport:: @ 823D458
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_FerryToLilycove:: @ 823D483
+BattleFrontier_OutsideWest_EventScript_FerryToLilycove::
 	msgbox BattleFrontier_OutsideWest_Text_LilycoveItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
@@ -64,13 +64,13 @@ BattleFrontier_OutsideWest_EventScript_FerryToLilycove:: @ 823D483
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination:: @ 823D4AE
+BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination::
 	message BattleFrontier_OutsideWest_Text_ThenWhereWouldYouLikeToGo
 	waitmessage
 	goto BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination
 	end
 
-BattleFrontier_OutsideWest_EventScript_BoardFerry:: @ 823D4BA
+BattleFrontier_OutsideWest_EventScript_BoardFerry::
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -80,38 +80,38 @@ BattleFrontier_OutsideWest_EventScript_BoardFerry:: @ 823D4BA
 	call Common_EventScript_FerryDepartIsland
 	return
 
-BattleFrontier_OutsideWest_EventScript_CancelFerrySelect:: @ 823D4D8
+BattleFrontier_OutsideWest_EventScript_CancelFerrySelect::
 	msgbox BattleFrontier_OutsideWest_Text_SailWithUsAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_BattleDomeSign:: @ 823D4E2
+BattleFrontier_OutsideWest_EventScript_BattleDomeSign::
 	msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideWest_EventScript_BattleFactorySign:: @ 823D4EB
+BattleFrontier_OutsideWest_EventScript_BattleFactorySign::
 	msgbox BattleFrontier_OutsideWest_Text_BattleFactorySign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideWest_EventScript_BattlePikeSign:: @ 823D4F4
+BattleFrontier_OutsideWest_EventScript_BattlePikeSign::
 	msgbox BattleFrontier_OutsideWest_Text_BattlePikeSign, MSGBOX_SIGN
 	end
 
 @ Unused. Of note, Battle Tower is in the East section in the final release
-BattleFrontier_OutsideWest_EventScript_UnusedNPC1:: @ 823D4FD
+BattleFrontier_OutsideWest_EventScript_UnusedNPC1::
 	msgbox BattleFrontier_OutsideWest_Text_ThisIsBattleTower, MSGBOX_NPC
 	end
 
 @ Unused
-BattleFrontier_OutsideWest_EventScript_UnusedNPC2:: @ 823D4FD
+BattleFrontier_OutsideWest_EventScript_UnusedNPC2::
 	msgbox BattleFrontier_OutsideWest_Text_CantFindBattleTower, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Boy1:: @ 823D50F
+BattleFrontier_OutsideWest_EventScript_Boy1::
 	msgbox BattleFrontier_OutsideWest_Text_BestOutOfAllMyFriends, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Fisherman2:: @ 823D518
+BattleFrontier_OutsideWest_EventScript_Fisherman2::
 	lock
 	faceplayer
 	message BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere
@@ -122,21 +122,21 @@ BattleFrontier_OutsideWest_EventScript_Fisherman2:: @ 823D518
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_Man1:: @ 823D52D
+BattleFrontier_OutsideWest_EventScript_Man1::
 	msgbox BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Maniac1:: @ 823D536
+BattleFrontier_OutsideWest_EventScript_Maniac1::
 	lock
 	goto BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk
 	end
 
-BattleFrontier_OutsideWest_EventScript_Maniac2:: @ 823D53D
+BattleFrontier_OutsideWest_EventScript_Maniac2::
 	lock
 	goto BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk
 	end
 
-BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk:: @ 823D544
+BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk::
 	applymovement LOCALID_MANIAC_1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons, MSGBOX_DEFAULT
@@ -151,7 +151,7 @@ BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk:: @ 823D544
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_Camper:: @ 823D57F
+BattleFrontier_OutsideWest_EventScript_Camper::
 	lock
 	faceplayer
 	delay 20
@@ -167,15 +167,15 @@ BattleFrontier_OutsideWest_EventScript_Camper:: @ 823D57F
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_CamperFaceFactory:: @ 823D5BA
+BattleFrontier_OutsideWest_EventScript_CamperFaceFactory::
 	applymovement LOCALID_CAMPER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory:: @ 823D5C5
+BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory::
 	return
 
-BattleFrontier_OutsideWest_EventScript_Girl:: @ 823D5C6
+BattleFrontier_OutsideWest_EventScript_Girl::
 	lock
 	faceplayer
 	message BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper
@@ -192,47 +192,47 @@ BattleFrontier_OutsideWest_EventScript_Girl:: @ 823D5C6
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_GirlShudderNorth:: @ 823D5FD
+BattleFrontier_OutsideWest_EventScript_GirlShudderNorth::
 	applymovement LOCALID_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderNorth
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_GirlShudderSouth:: @ 823D608
+BattleFrontier_OutsideWest_EventScript_GirlShudderSouth::
 	applymovement LOCALID_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderSouth
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_GirlShudderWest:: @ 823D613
+BattleFrontier_OutsideWest_EventScript_GirlShudderWest::
 	applymovement LOCALID_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderWest
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_GirlShudderEast:: @ 823D61E
+BattleFrontier_OutsideWest_EventScript_GirlShudderEast::
 	applymovement LOCALID_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderEast
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_Movement_GirlShudderNorth: @ 823D629
+BattleFrontier_OutsideWest_Movement_GirlShudderNorth:
 	walk_in_place_fastest_down
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_OutsideWest_Movement_GirlShudderSouth: @ 823D62C
+BattleFrontier_OutsideWest_Movement_GirlShudderSouth:
 	walk_in_place_fastest_up
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_OutsideWest_Movement_GirlShudderWest: @ 823D62F
+BattleFrontier_OutsideWest_Movement_GirlShudderWest:
 	walk_in_place_fastest_right
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_OutsideWest_Movement_GirlShudderEast: @ 823D632
+BattleFrontier_OutsideWest_Movement_GirlShudderEast:
 	walk_in_place_fastest_left
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_OutsideWest_EventScript_Woman2:: @ 823D635
+BattleFrontier_OutsideWest_EventScript_Woman2::
 	lock
 	faceplayer
 	msgbox BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors, MSGBOX_DEFAULT
@@ -242,70 +242,70 @@ BattleFrontier_OutsideWest_EventScript_Woman2:: @ 823D635
 	goto BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors
 	end
 
-BattleFrontier_OutsideWest_EventScript_WomanWonRockPaperScissors:: @ 823D653
+BattleFrontier_OutsideWest_EventScript_WomanWonRockPaperScissors::
 	msgbox BattleFrontier_OutsideWest_Text_WonIllTakePikeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors:: @ 823D65D
+BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors::
 	msgbox BattleFrontier_OutsideWest_Text_LostIllPutOffPikeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_Fisherman1:: @ 823D667
+BattleFrontier_OutsideWest_EventScript_Fisherman1::
 	msgbox BattleFrontier_OutsideWest_Text_ChooseFishingOverBattling, MSGBOX_NPC
 	end
 
 @ Unused
-BattleFrontier_OutsideWest_EventScript_UnusedNPC3:: @ 823D670
+BattleFrontier_OutsideWest_EventScript_UnusedNPC3::
 	msgbox BattleFrontier_OutsideWest_Text_DomeIsHereGrandpa, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Gentleman:: @ 823D679
+BattleFrontier_OutsideWest_EventScript_Gentleman::
 	msgbox BattleFrontier_OutsideWest_Text_YoureOffToChallengeDome, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Lass:: @ 823D682
+BattleFrontier_OutsideWest_EventScript_Lass::
 	msgbox BattleFrontier_OutsideWest_Text_KeepBattlingUntilIGetSymbol, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_ExpertM:: @ 823D68B
+BattleFrontier_OutsideWest_EventScript_ExpertM::
 	msgbox BattleFrontier_OutsideWest_Text_WontLetGentlemenBeatMe, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Man2:: @ 823D694
+BattleFrontier_OutsideWest_EventScript_Man2::
 	msgbox BattleFrontier_OutsideWest_Text_NothingHereNotLongAgo, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Woman1:: @ 823D69D
+BattleFrontier_OutsideWest_EventScript_Woman1::
 	msgbox BattleFrontier_OutsideWest_Text_FinallyArrivedAtFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_FatMan1:: @ 823D6A6
+BattleFrontier_OutsideWest_EventScript_FatMan1::
 	msgbox BattleFrontier_OutsideWest_Text_SquareFilledWithToughPeople, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_FatMan2:: @ 823D6AF
+BattleFrontier_OutsideWest_EventScript_FatMan2::
 	msgbox BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Woman3:: @ 823D6B8
+BattleFrontier_OutsideWest_EventScript_Woman3::
 	lock
 	msgbox BattleFrontier_OutsideWest_Text_LastTimeOurEyesMet, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_Boy2:: @ 823D6C3
+BattleFrontier_OutsideWest_EventScript_Boy2::
 	lock
 	msgbox BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_OldMan:: @ 823D6CE
+BattleFrontier_OutsideWest_EventScript_OldMan::
 	msgbox BattleFrontier_OutsideWest_Text_DomeAceIsMine, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Man4:: @ 823D6D7
+BattleFrontier_OutsideWest_EventScript_Man4::
 	lock
 	faceplayer
 	msgbox BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers, MSGBOX_DEFAULT
@@ -315,76 +315,76 @@ BattleFrontier_OutsideWest_EventScript_Man4:: @ 823D6D7
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_PokefanF:: @ 823D6EE
+BattleFrontier_OutsideWest_EventScript_PokefanF::
 	msgbox BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_Text_BattleDomeSign: @ 823D6F7
+BattleFrontier_OutsideWest_Text_BattleDomeSign:
 	.string "This is the BATTLE DOME!\n"
 	.string "Your path to the invincible superstar!$"
 
-BattleFrontier_OutsideWest_Text_BattleFactorySign: @ 823D737
+BattleFrontier_OutsideWest_Text_BattleFactorySign:
 	.string "This is the BATTLE FACTORY!\n"
 	.string "Seek out the toughest POKéMON!$"
 
-BattleFrontier_OutsideWest_Text_BattlePikeSign: @ 823D772
+BattleFrontier_OutsideWest_Text_BattlePikeSign:
 	.string "This is the BATTLE PIKE!\n"
 	.string "Choose one of three paths!$"
 
-BattleFrontier_OutsideWest_Text_ThisIsBattleTower: @ 823D7A6
+BattleFrontier_OutsideWest_Text_ThisIsBattleTower:
 	.string "This is the BATTLE TOWER.\p"
 	.string "TRAINERS bring their best-raised\n"
 	.string "POKéMON for elimination-style matches.$"
 
-BattleFrontier_OutsideWest_Text_MayISeeYourTicket: @ 823D808
+BattleFrontier_OutsideWest_Text_MayISeeYourTicket:
 	.string "Hello, are you here for the ferry?\n"
 	.string "May I see your TICKET?$"
 
-BattleFrontier_OutsideWest_Text_MustHaveTicketToBoard: @ 823D842
+BattleFrontier_OutsideWest_Text_MustHaveTicketToBoard:
 	.string "{PLAYER} doesn't have the TICKET…\p"
 	.string "I'm terribly sorry.\p"
 	.string "You must have a TICKET to board\n"
 	.string "the ferry.$"
 
-BattleFrontier_OutsideWest_Text_WhereWouldYouLikeToGo: @ 823D89D
+BattleFrontier_OutsideWest_Text_WhereWouldYouLikeToGo:
 	.string "{PLAYER} flashed the TICKET.\p"
 	.string "Perfect! That's all you need!\p"
 	.string "And where would you like to go?$"
 
-BattleFrontier_OutsideWest_Text_SlateportItIs: @ 823D8F2
+BattleFrontier_OutsideWest_Text_SlateportItIs:
 	.string "SLATEPORT CITY it is, then!$"
 
-BattleFrontier_OutsideWest_Text_LilycoveItIs: @ 823D90E
+BattleFrontier_OutsideWest_Text_LilycoveItIs:
 	.string "LILYCOVE CITY it is, then!$"
 
-BattleFrontier_OutsideWest_Text_SailWithUsAnotherTime: @ 823D929
+BattleFrontier_OutsideWest_Text_SailWithUsAnotherTime:
 	.string "Please sail with us another time!$"
 
-BattleFrontier_OutsideWest_Text_PleaseBoardFerry: @ 823D94B
+BattleFrontier_OutsideWest_Text_PleaseBoardFerry:
 	.string "Please board the ferry and wait for\n"
 	.string "departure.$"
 
-BattleFrontier_OutsideWest_Text_ThenWhereWouldYouLikeToGo: @ 823D97A
+BattleFrontier_OutsideWest_Text_ThenWhereWouldYouLikeToGo:
 	.string "Then, where would you like to go?$"
 
-BattleFrontier_OutsideWest_Text_BestOutOfAllMyFriends: @ 823D99C
+BattleFrontier_OutsideWest_Text_BestOutOfAllMyFriends:
 	.string "I'm the best out of all my friends.\n"
 	.string "But here…\l"
 	.string "I've been useless!$"
 
-BattleFrontier_OutsideWest_Text_CantFindBattleTower: @ 823D9DD
+BattleFrontier_OutsideWest_Text_CantFindBattleTower:
 	.string "I want to go to the BATTLE TOWER,\n"
 	.string "but I can't find it even though I have\l"
 	.string "a map of the BATTLE FRONTIER.\p"
 	.string "This place is just too big!$"
 
-BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere: @ 823DA60
+BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere:
 	.string "I wanted to take a challenge as soon\n"
 	.string "as I arrived here.\p"
 	.string "But on the way, I got seasick…\n"
 	.string "Urrrrp…$"
 
-BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere: @ 823DABF
+BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere:
 	.string "It's not as if just anyone can come\n"
 	.string "here, you know?\p"
 	.string "Only those TRAINERS who've been\n"
@@ -392,94 +392,94 @@ BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere: @ 823DABF
 	.string "That's why many TRAINERS don't even\n"
 	.string "know about the BATTLE FRONTIER.$"
 
-BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons: @ 823DB7D
+BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons:
 	.string "Hey, bro…\p"
 	.string "Are you sure we can make challenges\n"
 	.string "even if we don't have any POKéMON?$"
 
-BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons: @ 823DBCE
+BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons:
 	.string "Uh…\n"
 	.string "I'm sure it'll be okay.\p"
 	.string "I think…\p"
 	.string "But remember that big scary guy?\n"
 	.string "He said, “I'll lend you POKéMON!”$"
 
-BattleFrontier_OutsideWest_Text_WhosRaisingThoseRentalMons: @ 823DC36
+BattleFrontier_OutsideWest_Text_WhosRaisingThoseRentalMons:
 	.string "That's the BATTLE FACTORY.\n"
 	.string "You can rent strong POKéMON there.\p"
 	.string "But it makes me wonder.\n"
 	.string "Who's raising those rental POKéMON?$"
 
-BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper: @ 823DCB0
+BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper:
 	.string "I'm scared of going into the BATTLE\n"
 	.string "PIKE because of SEVIPER…\p"
 	.string "B-but I came all the way here, so I will\n"
 	.string "try to conquer everything!\l"
 	.string "…Shudder…$"
 
-BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors: @ 823DD3B
+BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors:
 	.string "Let's play rock, paper, scissors!\n"
 	.string "One, two, three!\p"
 	.string "… … … … … …$"
 
-BattleFrontier_OutsideWest_Text_WonIllTakePikeChallenge: @ 823DD7A
+BattleFrontier_OutsideWest_Text_WonIllTakePikeChallenge:
 	.string "Yay! I won!\n"
 	.string "I will take the BATTLE PIKE challenge!$"
 
-BattleFrontier_OutsideWest_Text_LostIllPutOffPikeChallenge: @ 823DDAD
+BattleFrontier_OutsideWest_Text_LostIllPutOffPikeChallenge:
 	.string "Oh, no…\n"
 	.string "I lost.\p"
 	.string "I guess I'm not very lucky today.\n"
 	.string "I'll put off my BATTLE PIKE challenge\l"
 	.string "until tomorrow.$"
 
-BattleFrontier_OutsideWest_Text_ChooseFishingOverBattling: @ 823DE15
+BattleFrontier_OutsideWest_Text_ChooseFishingOverBattling:
 	.string "I believe I'm the only person here who,\n"
 	.string "for some unknown reason, would choose\l"
 	.string "fishing over battling.\p"
 	.string "Huh? You can't catch anything here?\n"
 	.string "That's disappointing…$"
 
-BattleFrontier_OutsideWest_Text_KeepBattlingUntilIGetSymbol: @ 823DEB4
+BattleFrontier_OutsideWest_Text_KeepBattlingUntilIGetSymbol:
 	.string "Today, I'm going to keep battling, no\n"
 	.string "matter what, until I get a Symbol.$"
 
-BattleFrontier_OutsideWest_Text_YoureOffToChallengeDome: @ 823DEFD
+BattleFrontier_OutsideWest_Text_YoureOffToChallengeDome:
 	.string "Oh? You're off to challenge\n"
 	.string "the BATTLE DOME?\p"
 	.string "I'll wish you the best of luck.\n"
 	.string "Let us both win our way up and meet\l"
 	.string "in challenges.$"
 
-BattleFrontier_OutsideWest_Text_DomeIsHereGrandpa: @ 823DF7D
+BattleFrontier_OutsideWest_Text_DomeIsHereGrandpa:
 	.string "Grandpa, over here!\n"
 	.string "The BATTLE DOME is here!\l"
 	.string "Go get 'em, Grandpa!$"
 
-BattleFrontier_OutsideWest_Text_WontLetGentlemenBeatMe: @ 823DFBF
+BattleFrontier_OutsideWest_Text_WontLetGentlemenBeatMe:
 	.string "Ah, so this here is the BATTLE DOME?\n"
 	.string "I won't let GENTLEMEN beat me!\p"
 	.string "But where is the entrance?$"
 
-BattleFrontier_OutsideWest_Text_NothingHereNotLongAgo: @ 823E01E
+BattleFrontier_OutsideWest_Text_NothingHereNotLongAgo:
 	.string "There used to be nothing here not all\n"
 	.string "that long ago.\p"
 	.string "But, now look at this place! Amazing!\n"
 	.string "I'll bring my mother out to see this.$"
 
-BattleFrontier_OutsideWest_Text_FinallyArrivedAtFrontier: @ 823E09F
+BattleFrontier_OutsideWest_Text_FinallyArrivedAtFrontier:
 	.string "I've finally arrived at the BATTLE\n"
 	.string "FRONTIER!\p"
 	.string "I'm sure to grab attention with\n"
 	.string "my looks and ability!$"
 
-BattleFrontier_OutsideWest_Text_SquareFilledWithToughPeople: @ 823E102
+BattleFrontier_OutsideWest_Text_SquareFilledWithToughPeople:
 	.string "Munch, munch…\p"
 	.string "It looks like this square's filled with\n"
 	.string "tough people.\p"
 	.string "Munch, munch…$"
 
-BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike: @ 823E154
+BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike:
 	.string "Crunch, munch…\p"
 	.string "A while back, I met this older girl\n"
 	.string "at the BATTLE PIKE.\p"
@@ -492,13 +492,13 @@ BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike: @ 823E154
 	.string "scary experience, sure enough.\p"
 	.string "Crunch, munch…$"
 
-BattleFrontier_OutsideWest_Text_LastTimeOurEyesMet: @ 823E273
+BattleFrontier_OutsideWest_Text_LastTimeOurEyesMet:
 	.string "Huh? Will you listen to yourself?\n"
 	.string "That's nothing!\p"
 	.string "Why, the last time I cheered for him,\n"
 	.string "our eyes met and sparks flew!$"
 
-BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering: @ 823E2E9
+BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering:
 	.string "Whaaaaaat?!\n"
 	.string "Pfft!\p"
 	.string "That only happened because\n"
@@ -506,7 +506,7 @@ BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering: @ 823E2E9
 	.string "The DOME ACE only looked our way\n"
 	.string "because my cheering was so loud!$"
 
-BattleFrontier_OutsideWest_Text_DomeAceIsMine: @ 823E37E
+BattleFrontier_OutsideWest_Text_DomeAceIsMine:
 	.string "Oh, shush!\n"
 	.string "Keep that racket down!\p"
 	.string "You fair-weather fans should stick\n"
@@ -514,7 +514,7 @@ BattleFrontier_OutsideWest_Text_DomeAceIsMine: @ 823E37E
 	.string "The DOME ACE is mine!\n"
 	.string "The only idol for me!$"
 
-BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers: @ 823E410
+BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers:
 	.string "Those people squabbling over there…\p"
 	.string "It's hard to believe, but they once\n"
 	.string "were TRAINERS, and good ones, too.\p"
@@ -528,7 +528,7 @@ BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers: @ 823E410
 	.string "They go cheer for their idol at the\l"
 	.string "BATTLE DOME every day now.$"
 
-BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier: @ 823E5A5
+BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier:
 	.string "I heard a rumor that someone saw\n"
 	.string "a POKéMON with an unusually long tail\l"
 	.string "somewhere in the BATTLE FRONTIER.\p"
diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
index 795c3fabe..647927050 100644
--- a/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_NURSE, 1
 
-BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
+BattleFrontier_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-BattleFrontier_PokemonCenter_1F_OnTransition: @ 8267904
+BattleFrontier_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: @ 8267908
+BattleFrontier_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -17,19 +17,19 @@ BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: @ 8267908
 	release
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid:: @ 8267916
+BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid::
 	msgbox BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_Man:: @ 826791F
+BattleFrontier_PokemonCenter_1F_EventScript_Man::
 	msgbox BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_Picnicker:: @ 8267928
+BattleFrontier_PokemonCenter_1F_EventScript_Picnicker::
 	msgbox BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: @ 8267931
+BattleFrontier_PokemonCenter_1F_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
@@ -39,7 +39,7 @@ BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: @ 8267931
 	release
 	end
 
-BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: @ 8267944
+BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon:
 	.string "There was someone here using a \n"
 	.string "POKéMON I've never seen before.\p"
 	.string "I never learned about it at\n"
@@ -47,15 +47,15 @@ BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: @ 8267944
 	.string "I wonder where you can catch POKéMON\n"
 	.string "like that.$"
 
-BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena: @ 82679EB
+BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena:
 	.string "Okay! Next stop, the BATTLE ARENA!\n"
 	.string "I'd better get the right POKéMON from\l"
 	.string "the PC Storage System.$"
 
-BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge: @ 8267A4B
+BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge:
 	.string "Giggle… I'm going to go through every\n"
 	.string "challenge with just this baby!$"
 
-BattleFrontier_PokemonCenter_1F_Text_Skitty: @ 8267A90
+BattleFrontier_PokemonCenter_1F_Text_Skitty:
 	.string "SKITTY: Mya myaaah!$"
 
diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
index 5a19a9d28..6dc785e75 100644
--- a/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
+++ b/data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
+BattleFrontier_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-BattleFrontier_PokemonCenter_2F_EventScript_Colosseum:: @ 8267AB9
+BattleFrontier_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-BattleFrontier_PokemonCenter_2F_EventScript_TradeCenter:: @ 8267ABF
+BattleFrontier_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-BattleFrontier_PokemonCenter_2F_EventScript_RecordCorner:: @ 8267AC5
+BattleFrontier_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/BattleFrontier_RankingHall/scripts.inc b/data/maps/BattleFrontier_RankingHall/scripts.inc
index e8415c828..20b2b21c1 100644
--- a/data/maps/BattleFrontier_RankingHall/scripts.inc
+++ b/data/maps/BattleFrontier_RankingHall/scripts.inc
@@ -1,67 +1,67 @@
-BattleFrontier_RankingHall_MapScripts:: @ 825E4A9
+BattleFrontier_RankingHall_MapScripts::
 	.byte 0
 
-BattleFrontier_RankingHall_EventScript_TowerSinglesRecords:: @ 825E4AA
+BattleFrontier_RankingHall_EventScript_TowerSinglesRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_SINGLES
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_TowerDoublesRecords:: @ 825E4B6
+BattleFrontier_RankingHall_EventScript_TowerDoublesRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_DOUBLES
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_TowerMultisRecords:: @ 825E4C2
+BattleFrontier_RankingHall_EventScript_TowerMultisRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_MULTIS
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_TowerLinkRecords:: @ 825E4CE
+BattleFrontier_RankingHall_EventScript_TowerLinkRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_LINK
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_ArenaRecords:: @ 825E4DA
+BattleFrontier_RankingHall_EventScript_ArenaRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_ARENA
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_PalaceRecords:: @ 825E4E6
+BattleFrontier_RankingHall_EventScript_PalaceRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_PALACE
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_FactoryRecords:: @ 825E4F2
+BattleFrontier_RankingHall_EventScript_FactoryRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_FACTORY
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_DomeRecords:: @ 825E4FE
+BattleFrontier_RankingHall_EventScript_DomeRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_DOME
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_PikeRecords:: @ 825E50A
+BattleFrontier_RankingHall_EventScript_PikeRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_PIKE
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_PyramidRecords:: @ 825E516
+BattleFrontier_RankingHall_EventScript_PyramidRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_PYRAMID
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_ShowRecords:: @ 825E522
+BattleFrontier_RankingHall_EventScript_ShowRecords::
 	special ShowRankingHallRecordsWindow
 	waitbuttonpress
 	special ScrollRankingHallRecordsWindow
@@ -70,19 +70,19 @@ BattleFrontier_RankingHall_EventScript_ShowRecords:: @ 825E522
 	releaseall
 	end
 
-BattleFrontier_RankingHall_EventScript_Attendant:: @ 825E52F
+BattleFrontier_RankingHall_EventScript_Attendant::
 	msgbox BattleFrontier_RankingHall_Text_ExplainRankingHall, MSGBOX_NPC
 	end
 
-BattleFrontier_RankingHall_EventScript_DomePikeFactoryRecordsSign:: @ 825E538
+BattleFrontier_RankingHall_EventScript_DomePikeFactoryRecordsSign::
 	msgbox BattleFrontier_RankingHall_Text_DomePikeFactoryRecords, MSGBOX_SIGN
 	end
 
-BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn:: @ 825E541
+BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn::
 	msgbox BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords, MSGBOX_SIGN
 	end
 
-BattleFrontier_RankingHall_EventScript_NinjaBoy:: @ 825E54A
+BattleFrontier_RankingHall_EventScript_NinjaBoy::
 	lock
 	faceplayer
 	msgbox BattleFrontier_RankingHall_Text_IsYourNameOnThisList, MSGBOX_YESNO
@@ -92,42 +92,42 @@ BattleFrontier_RankingHall_EventScript_NinjaBoy:: @ 825E54A
 	release
 	end
 
-BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList:: @ 825E569
+BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList::
 	msgbox BattleFrontier_RankingHall_Text_WowThatsSuper, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_RankingHall_EventScript_Boy:: @ 825E573
+BattleFrontier_RankingHall_EventScript_Boy::
 	msgbox BattleFrontier_RankingHall_Text_MyNamesNotUpThere, MSGBOX_NPC
 	end
 
-BattleFrontier_RankingHall_Text_ExplainRankingHall: @ 825E57C
+BattleFrontier_RankingHall_Text_ExplainRankingHall:
 	.string "This is the RANKING HALL.\p"
 	.string "This is where we recognize the immortal\n"
 	.string "TRAINERS who left great records in\l"
 	.string "BATTLE FRONTIER events.$"
 
-BattleFrontier_RankingHall_Text_DomePikeFactoryRecords: @ 825E5F9
+BattleFrontier_RankingHall_Text_DomePikeFactoryRecords:
 	.string "BATTLE DOME, BATTLE PIKE,\n"
 	.string "and BATTLE FACTORY Records$"
 
-BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords: @ 825E62E
+BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords:
 	.string "BATTLE PALACE, BATTLE ARENA,\n"
 	.string "and BATTLE PYRAMID Records$"
 
-BattleFrontier_RankingHall_Text_IsYourNameOnThisList: @ 825E666
+BattleFrontier_RankingHall_Text_IsYourNameOnThisList:
 	.string "Hi, is your name on this list?$"
 
-BattleFrontier_RankingHall_Text_WowThatsSuper: @ 825E685
+BattleFrontier_RankingHall_Text_WowThatsSuper:
 	.string "Wow, that's super!\n"
 	.string "I'll have to try harder, too!$"
 
-BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName: @ 825E6B6
+BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName:
 	.string "Oh, is that right?\p"
 	.string "If you saw your friend's name up here,\n"
 	.string "I bet it would make you work harder!$"
 
-BattleFrontier_RankingHall_Text_MyNamesNotUpThere: @ 825E715
+BattleFrontier_RankingHall_Text_MyNamesNotUpThere:
 	.string "Hmm…\n"
 	.string "My name's not up there…\p"
 	.string "Well, it's only natural since I haven't\n"
diff --git a/data/maps/BattleFrontier_ReceptionGate/scripts.inc b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
index 904bb5247..410eb747d 100644
--- a/data/maps/BattleFrontier_ReceptionGate/scripts.inc
+++ b/data/maps/BattleFrontier_ReceptionGate/scripts.inc
@@ -2,20 +2,20 @@
 .set LOCALID_GUIDE, 2
 .set LOCALID_SCOTT, 4
 
-BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
+BattleFrontier_ReceptionGate_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_OnTransition
 	.byte 0
 
-BattleFrontier_ReceptionGate_OnTransition: @ 82661E5
+BattleFrontier_ReceptionGate_OnTransition:
 	setflag FLAG_LANDMARK_BATTLE_FRONTIER
 	end
 
-BattleFrontier_ReceptionGate_OnFrame: @ 82661E9
+BattleFrontier_ReceptionGate_OnFrame:
 	map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering
 	.2byte 0
 
-BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3
+BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering::
 	lockall
 	setvar VAR_HAS_ENTERED_BATTLE_FRONTIER, 1
 	playse SE_PIN
@@ -30,7 +30,7 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3
 	goto BattleFrontier_ReceptionGate_EventScript_ScottScene
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229
+BattleFrontier_ReceptionGate_EventScript_ScottScene::
 	msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
 	msgbox BattleFrontier_ReceptionGate_Text_IssueFrontierPass, MSGBOX_DEFAULT
 	playfanfare MUS_OBTAIN_ITEM
@@ -66,14 +66,14 @@ BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229
 	releaseall
 	end
 
-BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter: @ 82662D2
+BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter:
 	walk_up
 	walk_up
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_PlayerFaceScott: @ 82662D7
+BattleFrontier_ReceptionGate_Movement_PlayerFaceScott:
 	delay_16
 	delay_16
 	delay_16
@@ -82,12 +82,12 @@ BattleFrontier_ReceptionGate_Movement_PlayerFaceScott: @ 82662D7
 	step_end
 
 @ Unused
-BattleFrontier_ReceptionGate_Movement_WalkDown: @ 82662DD
+BattleFrontier_ReceptionGate_Movement_WalkDown:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_ScottEnter: @ 82662E0
+BattleFrontier_ReceptionGate_Movement_ScottEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -97,7 +97,7 @@ BattleFrontier_ReceptionGate_Movement_ScottEnter: @ 82662E0
 	walk_left
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_ScottExit: @ 82662E8
+BattleFrontier_ReceptionGate_Movement_ScottExit:
 	walk_right
 	walk_up
 	walk_up
@@ -107,7 +107,7 @@ BattleFrontier_ReceptionGate_Movement_ScottExit: @ 82662E8
 	walk_up
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_GreeterFaceScott: @ 82662F0
+BattleFrontier_ReceptionGate_Movement_GreeterFaceScott:
 	delay_16
 	delay_16
 	delay_16
@@ -115,7 +115,7 @@ BattleFrontier_ReceptionGate_Movement_GreeterFaceScott: @ 82662F0
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott: @ 82662F6
+BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott:
 	delay_16
 	delay_16
 	delay_16
@@ -123,7 +123,7 @@ BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott: @ 82662F6
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_ReceptionGate_EventScript_Greeter:: @ 82662FC
+BattleFrontier_ReceptionGate_EventScript_Greeter::
 	lock
 	faceplayer
 	msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
@@ -131,14 +131,14 @@ BattleFrontier_ReceptionGate_EventScript_Greeter:: @ 82662FC
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_FacilityGuide:: @ 8266310
+BattleFrontier_ReceptionGate_EventScript_FacilityGuide::
 	lock
 	faceplayer
 	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToFacilities, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout:: @ 8266320
+BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout::
 	message BattleFrontier_ReceptionGate_Text_LearnAboutWhich2
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_BF_RECEPTIONIST
@@ -158,64 +158,64 @@ BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout:: @ 8266320
 	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattleTower:: @ 82663AE
+BattleFrontier_ReceptionGate_EventScript_BattleTower::
 	msgbox BattleFrontier_ReceptionGate_Text_BattleTowerInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattleDome:: @ 82663BC
+BattleFrontier_ReceptionGate_EventScript_BattleDome::
 	msgbox BattleFrontier_ReceptionGate_Text_BattleDomeInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattlePalace:: @ 82663CA
+BattleFrontier_ReceptionGate_EventScript_BattlePalace::
 	msgbox BattleFrontier_ReceptionGate_Text_BattlePalaceInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattleArena:: @ 82663D8
+BattleFrontier_ReceptionGate_EventScript_BattleArena::
 	msgbox BattleFrontier_ReceptionGate_Text_BattleArenaInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattleFactory:: @ 82663E6
+BattleFrontier_ReceptionGate_EventScript_BattleFactory::
 	msgbox BattleFrontier_ReceptionGate_Text_BattleFactoryInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattlePike:: @ 82663F4
+BattleFrontier_ReceptionGate_EventScript_BattlePike::
 	msgbox BattleFrontier_ReceptionGate_Text_BattlePikeInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattlePyramid:: @ 8266402
+BattleFrontier_ReceptionGate_EventScript_BattlePyramid::
 	msgbox BattleFrontier_ReceptionGate_Text_BattlePyramidInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_RankingHall:: @ 8266410
+BattleFrontier_ReceptionGate_EventScript_RankingHall::
 	msgbox BattleFrontier_ReceptionGate_Text_RankingHallInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ExchangeCorner:: @ 826641E
+BattleFrontier_ReceptionGate_EventScript_ExchangeCorner::
 	msgbox BattleFrontier_ReceptionGate_Text_ExchangeCornerInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide:: @ 826642C
+BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide::
 	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_RulesGuide:: @ 8266436
+BattleFrontier_ReceptionGate_EventScript_RulesGuide::
 	lock
 	faceplayer
 	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToRules, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout:: @ 8266446
+BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout::
 	message BattleFrontier_ReceptionGate_Text_LearnAboutWhat
 	waitmessage
 	multichoice 15, 0, MULTI_FRONTIER_RULES, FALSE
@@ -229,44 +229,44 @@ BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout:: @ 8266446
 	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_LevelMode:: @ 82664A4
+BattleFrontier_ReceptionGate_EventScript_LevelMode::
 	msgbox BattleFrontier_ReceptionGate_Text_LevelModeInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_Level50:: @ 82664B2
+BattleFrontier_ReceptionGate_EventScript_Level50::
 	msgbox BattleFrontier_ReceptionGate_Text_Level50Info, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_OpenLevel:: @ 82664C0
+BattleFrontier_ReceptionGate_EventScript_OpenLevel::
 	msgbox BattleFrontier_ReceptionGate_Text_OpenLevelInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_MonEntry:: @ 82664CE
+BattleFrontier_ReceptionGate_EventScript_MonEntry::
 	msgbox BattleFrontier_ReceptionGate_Text_MonEntryInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_HoldItems:: @ 82664DC
+BattleFrontier_ReceptionGate_EventScript_HoldItems::
 	msgbox BattleFrontier_ReceptionGate_Text_HoldItemsInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide:: @ 82664EA
+BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide::
 	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_FrontierPassGuide:: @ 82664F4
+BattleFrontier_ReceptionGate_EventScript_FrontierPassGuide::
 	lock
 	faceplayer
 	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToFrontierPass, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout:: @ 8266504
+BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout::
 	message BattleFrontier_ReceptionGate_Text_LearnAboutWhich1
 	waitmessage
 	multichoice 16, 4, MULTI_FRONTIER_PASS_INFO, FALSE
@@ -278,62 +278,62 @@ BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout:: @
 	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_Symbols:: @ 826654C
+BattleFrontier_ReceptionGate_EventScript_Symbols::
 	msgbox BattleFrontier_ReceptionGate_Text_SymbolsInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_RecordBattle:: @ 826655A
+BattleFrontier_ReceptionGate_EventScript_RecordBattle::
 	msgbox BattleFrontier_ReceptionGate_Text_RecordedBattleInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattlePoints:: @ 8266568
+BattleFrontier_ReceptionGate_EventScript_BattlePoints::
 	msgbox BattleFrontier_ReceptionGate_Text_BattlePointsInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide:: @ 8266576
+BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide::
 	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay: @ 8266580
+BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay:
 	.string "Is it your first time here?\n"
 	.string "Please step this way!$"
 
-BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier: @ 82665B2
+BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier:
 	.string "The front lines of POKéMON battling!\n"
 	.string "Welcome to the BATTLE FRONTIER!$"
 
-BattleFrontier_ReceptionGate_Text_IssueFrontierPass: @ 82665F7
+BattleFrontier_ReceptionGate_Text_IssueFrontierPass:
 	.string "For a first-time visitor, we issue\n"
 	.string "the FRONTIER PASS.\p"
 	.string "It's for use at all the facilities\n"
 	.string "in the BATTLE FRONTIER.\p"
 	.string "Here you are!$"
 
-BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass: @ 8266676
+BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass:
 	.string "{PLAYER} obtained\n"
 	.string "the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_PlacedTrainerCardInFrontierPass: @ 8266695
+BattleFrontier_ReceptionGate_Text_PlacedTrainerCardInFrontierPass:
 	.string "{PLAYER} placed the TRAINER CARD\n"
 	.string "in the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier: @ 82666C6
+BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier:
 	.string "We hope you enjoy all that the BATTLE\n"
 	.string "FRONTIER has to offer!$"
 
-BattleFrontier_ReceptionGate_Text_IfItIsntPlayerYouCame: @ 8266703
+BattleFrontier_ReceptionGate_Text_IfItIsntPlayerYouCame:
 	.string "???: Well, if it isn't {PLAYER}{KUN}!\n"
 	.string "You came out here!$"
 
-BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay: @ 8266733
+BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay:
 	.string "GUIDE: Oh! MR. SCOTT, sir!\n"
 	.string "Good day to you, sir!$"
 
-BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere: @ 8266764
+BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere:
 	.string "SCOTT: It's great to see you here,\n"
 	.string "it really is!\p"
 	.string "I hope you'll take your time and\n"
@@ -343,21 +343,21 @@ BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere: @ 8266764
 	.string "I also have my quarters here, so feel\n"
 	.string "free to visit if you have time.$"
 
-BattleFrontier_ReceptionGate_Text_YourGuideToFacilities: @ 8266857
+BattleFrontier_ReceptionGate_Text_YourGuideToFacilities:
 	.string "I'm your guide to the various facilities\n"
 	.string "here in the BATTLE FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_LearnAboutWhich2: @ 826689D
+BattleFrontier_ReceptionGate_Text_LearnAboutWhich2:
 	.string "Which would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_BattleTowerInfo: @ 82668C2
+BattleFrontier_ReceptionGate_Text_BattleTowerInfo:
 	.string "It is the gigantic tower considered\n"
 	.string "to be the BATTLE FRONTIER's symbol.\p"
 	.string "There are four kinds of BATTLE ROOMS\n"
 	.string "in the tower for SINGLE, DOUBLE, MULTI,\l"
 	.string "and LINK MULTI BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_BattleDomeInfo: @ 826696F
+BattleFrontier_ReceptionGate_Text_BattleDomeInfo:
 	.string "The BATTLE DOME is the large building\n"
 	.string "shaped like a huge egg.\p"
 	.string "Events named Battle Tourneys are held\n"
@@ -366,20 +366,20 @@ BattleFrontier_ReceptionGate_Text_BattleDomeInfo: @ 826696F
 	.string "two courses--for SINGLE and DOUBLE\l"
 	.string "BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_BattlePalaceInfo: @ 8266A34
+BattleFrontier_ReceptionGate_Text_BattlePalaceInfo:
 	.string "The BATTLE PALACE is the red building\n"
 	.string "on the right of the BATTLE FRONTIER.\p"
 	.string "There are two kinds of BATTLE HALLS\n"
 	.string "for SINGLE and DOUBLE BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_BattleArenaInfo: @ 8266AC2
+BattleFrontier_ReceptionGate_Text_BattleArenaInfo:
 	.string "The BATTLE ARENA is the dojo-like\n"
 	.string "building at the center-right of\l"
 	.string "the BATTLE FRONTIER.\p"
 	.string "An event called the Set KO Tourney\n"
 	.string "takes place at the BATTLE ARENA.$"
 
-BattleFrontier_ReceptionGate_Text_BattleFactoryInfo: @ 8266B5D
+BattleFrontier_ReceptionGate_Text_BattleFactoryInfo:
 	.string "The BATTLE FACTORY is the large\n"
 	.string "building that is the closest to us.\p"
 	.string "An event called the Battle Swap\n"
@@ -388,20 +388,20 @@ BattleFrontier_ReceptionGate_Text_BattleFactoryInfo: @ 8266B5D
 	.string "two courses for SINGLE and DOUBLE\l"
 	.string "BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_BattlePikeInfo: @ 8266C24
+BattleFrontier_ReceptionGate_Text_BattlePikeInfo:
 	.string "The BATTLE PIKE is the building shaped\n"
 	.string "like a POKéMON at the center-left of\l"
 	.string "the BATTLE FRONTIER.\p"
 	.string "An event called the Battle Choice\n"
 	.string "is conducted there.$"
 
-BattleFrontier_ReceptionGate_Text_BattlePyramidInfo: @ 8266CBB
+BattleFrontier_ReceptionGate_Text_BattlePyramidInfo:
 	.string "The BATTLE PYRAMID is the enormous\n"
 	.string "pyramid.\p"
 	.string "An event called the Battle Quest\n"
 	.string "is conducted there.$"
 
-BattleFrontier_ReceptionGate_Text_RankingHallInfo: @ 8266D1C
+BattleFrontier_ReceptionGate_Text_RankingHallInfo:
 	.string "The RANKING HALL is located near\n"
 	.string "the BATTLE TOWER.\p"
 	.string "There, you may see the most fantastic\n"
@@ -409,28 +409,28 @@ BattleFrontier_ReceptionGate_Text_RankingHallInfo: @ 8266D1C
 	.string "took on the many challenges of\l"
 	.string "the BATTLE FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_ExchangeCornerInfo: @ 8266DCB
+BattleFrontier_ReceptionGate_Text_ExchangeCornerInfo:
 	.string "The EXCHANGE SERVICE CORNER is near\n"
 	.string "the BATTLE TOWER.\p"
 	.string "The Battle Points you have earned in\n"
 	.string "the BATTLE FRONTIER may be exchanged\l"
 	.string "for fabulous prizes there.$"
 
-BattleFrontier_ReceptionGate_Text_YourGuideToRules: @ 8266E66
+BattleFrontier_ReceptionGate_Text_YourGuideToRules:
 	.string "I'm your guide to the basic rules that\n"
 	.string "are common to all the challenges\l"
 	.string "offered by the facilities in the BATTLE\l"
 	.string "FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_LearnAboutWhat: @ 8266EE0
+BattleFrontier_ReceptionGate_Text_LearnAboutWhat:
 	.string "What would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_LevelModeInfo: @ 8266F04
+BattleFrontier_ReceptionGate_Text_LevelModeInfo:
 	.string "All the challenges at the BATTLE\n"
 	.string "FRONTIER's facilities come in\l"
 	.string "two courses--Level 50 and Open Level.$"
 
-BattleFrontier_ReceptionGate_Text_Level50Info: @ 8266F69
+BattleFrontier_ReceptionGate_Text_Level50Info:
 	.string "The Level 50 course is open to POKéMON\n"
 	.string "up to and including Level 50.\p"
 	.string "Please keep in mind, however, that\n"
@@ -441,7 +441,7 @@ BattleFrontier_ReceptionGate_Text_Level50Info: @ 8266F69
 	.string "To begin, we hope you will challenge\n"
 	.string "this course.$"
 
-BattleFrontier_ReceptionGate_Text_OpenLevelInfo: @ 8267080
+BattleFrontier_ReceptionGate_Text_OpenLevelInfo:
 	.string "The Open Level course places no limit\n"
 	.string "on the levels of POKéMON entering\l"
 	.string "challenges.\p"
@@ -451,7 +451,7 @@ BattleFrontier_ReceptionGate_Text_OpenLevelInfo: @ 8267080
 	.string "However, no TRAINER you face will\n"
 	.string "have any POKéMON below Level 60.$"
 
-BattleFrontier_ReceptionGate_Text_MonEntryInfo: @ 826716A
+BattleFrontier_ReceptionGate_Text_MonEntryInfo:
 	.string "Virtually any kind of POKéMON may take\n"
 	.string "on the challenges at all facilities.\p"
 	.string "EGGS and certain kinds of POKéMON,\n"
@@ -462,7 +462,7 @@ BattleFrontier_ReceptionGate_Text_MonEntryInfo: @ 826716A
 	.string "of the same kind of POKéMON are not\l"
 	.string "permitted.$"
 
-BattleFrontier_ReceptionGate_Text_HoldItemsInfo: @ 8267298
+BattleFrontier_ReceptionGate_Text_HoldItemsInfo:
 	.string "When entering a challenge at a BATTLE\n"
 	.string "FRONTIER facility, POKéMON may not\l"
 	.string "be holding the same kind of item.\p"
@@ -470,13 +470,13 @@ BattleFrontier_ReceptionGate_Text_HoldItemsInfo: @ 8267298
 	.string "entering a challenge are holding\l"
 	.string "different items.$"
 
-BattleFrontier_ReceptionGate_Text_YourGuideToFrontierPass: @ 8267357
+BattleFrontier_ReceptionGate_Text_YourGuideToFrontierPass:
 	.string "I'm your guide to the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_LearnAboutWhich1: @ 826737C
+BattleFrontier_ReceptionGate_Text_LearnAboutWhich1:
 	.string "Which would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_SymbolsInfo: @ 82673A1
+BattleFrontier_ReceptionGate_Text_SymbolsInfo:
 	.string "There are seven facilities at\n"
 	.string "the BATTLE FRONTIER.\p"
 	.string "TRAINERS who gain recognition for\n"
@@ -488,7 +488,7 @@ BattleFrontier_ReceptionGate_Text_SymbolsInfo: @ 82673A1
 	.string "It's certainly not easy to win symbols.\n"
 	.string "I wish you the best of luck!$"
 
-BattleFrontier_ReceptionGate_Text_RecordedBattleInfo: @ 82674F3
+BattleFrontier_ReceptionGate_Text_RecordedBattleInfo:
 	.string "It is possible to record one battle\n"
 	.string "on your FRONTIER PASS.\p"
 	.string "You may record a battle you had with\n"
@@ -500,7 +500,7 @@ BattleFrontier_ReceptionGate_Text_RecordedBattleInfo: @ 82674F3
 	.string "You may choose to record your match\n"
 	.string "at the end of a battle.$"
 
-BattleFrontier_ReceptionGate_Text_BattlePointsInfo: @ 826761C
+BattleFrontier_ReceptionGate_Text_BattlePointsInfo:
 	.string "Battle Points are rewards given to\n"
 	.string "TRAINERS who battled outstandingly\l"
 	.string "at the BATTLE FRONTIER.\p"
diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
index ece1577b4..5c793517e 100644
--- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc
+++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc
@@ -1,9 +1,9 @@
 .set LOCALID_SCOTT, 1
 
-BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7
+BattleFrontier_ScottsHouse_MapScripts::
 	.byte 0
 
-BattleFrontier_ScottsHouse_EventScript_Scott:: @ 82636A8
+BattleFrontier_ScottsHouse_EventScript_Scott::
 	lock
 	faceplayer
 	goto_if_set FLAG_TEMP_4, BattleFrontier_ScottsHouse_EventScript_GivenBerry
@@ -12,20 +12,20 @@ BattleFrontier_ScottsHouse_EventScript_Scott:: @ 82636A8
 	goto BattleFrontier_ScottsHouse_EventScript_CheckGiveItems
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckGiveItems:: @ 82636CB
+BattleFrontier_ScottsHouse_EventScript_CheckGiveItems::
 	goto_if_unset FLAG_SCOTT_GIVES_BATTLE_POINTS, BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier
 	goto_if_unset FLAG_COLLECTED_ALL_SILVER_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols
 	goto_if_unset FLAG_COLLECTED_ALL_GOLD_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols
 	goto BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckGiveShield:: @ 82636EC
+BattleFrontier_ScottsHouse_EventScript_CheckGiveShield::
 	goto_if_unset FLAG_RECEIVED_SILVER_SHIELD, BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield
 	goto_if_unset FLAG_RECEIVED_GOLD_SHIELD, BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield
 	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols:: @ 8263704
+BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols::
 	goto_if_unset FLAG_SYS_TOWER_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	goto_if_unset FLAG_SYS_DOME_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	goto_if_unset FLAG_SYS_PALACE_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
@@ -42,7 +42,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols:: @ 8263704
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols:: @ 826376A
+BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols::
 	goto_if_unset FLAG_SYS_TOWER_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	goto_if_unset FLAG_SYS_DOME_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	goto_if_unset FLAG_SYS_PALACE_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
@@ -59,17 +59,17 @@ BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols:: @ 826376A
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_BerryPocketFull:: @ 82637D0
+BattleFrontier_ScottsHouse_EventScript_BerryPocketFull::
 	msgbox BattleFrontier_ScottsHouse_Text_BerryPocketStuffed, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GivenBerry:: @ 82637DA
+BattleFrontier_ScottsHouse_EventScript_GivenBerry::
 	msgbox BattleFrontier_ScottsHouse_Text_SoGladIBroughtYouHere, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_RandomComment:: @ 82637E4
+BattleFrontier_ScottsHouse_EventScript_RandomComment::
 	random 3
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment
@@ -79,17 +79,17 @@ BattleFrontier_ScottsHouse_EventScript_RandomComment:: @ 82637E4
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment:: @ 8263807
+BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment::
 	msgbox BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment:: @ 8263811
+BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment::
 	msgbox BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B
+BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield::
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	tower_get TOWER_DATA_WIN_STREAK
@@ -102,7 +102,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B
 	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GiveSilverShield:: @ 826387A
+BattleFrontier_ScottsHouse_EventScript_GiveSilverShield::
 	msgbox BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow, MSGBOX_DEFAULT
 	givedecoration DECOR_SILVER_SHIELD
 	compare VAR_RESULT, FALSE
@@ -112,17 +112,17 @@ BattleFrontier_ScottsHouse_EventScript_GiveSilverShield:: @ 826387A
 	goto BattleFrontier_ScottsHouse_EventScript_GivenShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_NoRoomForShield:: @ 82638A0
+BattleFrontier_ScottsHouse_EventScript_NoRoomForShield::
 	msgbox BattleFrontier_ScottsHouse_Text_ComeBackForThisLater, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GivenShield:: @ 82638AA
+BattleFrontier_ScottsHouse_EventScript_GivenShield::
 	msgbox BattleFrontier_ScottsHouse_Text_ExpectingToHearEvenGreaterThings, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4
+BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield::
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	tower_get TOWER_DATA_WIN_STREAK
@@ -135,7 +135,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4
 	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GiveGoldShield:: @ 8263913
+BattleFrontier_ScottsHouse_EventScript_GiveGoldShield::
 	msgbox BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow, MSGBOX_DEFAULT
 	givedecoration DECOR_GOLD_SHIELD
 	compare VAR_RESULT, FALSE
@@ -145,12 +145,12 @@ BattleFrontier_ScottsHouse_EventScript_GiveGoldShield:: @ 8263913
 	goto BattleFrontier_ScottsHouse_EventScript_GivenShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GivenBattlePoints:: @ 8263939
+BattleFrontier_ScottsHouse_EventScript_GivenBattlePoints::
 	msgbox BattleFrontier_ScottsHouse_Text_ExpectingGreatThings, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier:: @ 8263943
+BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier::
 	msgbox BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
 	closemessage
 	delay 30
@@ -175,31 +175,31 @@ BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier:: @ 8263943
 	goto BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint
 	end
 
-BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints:: @ 82639BC
+BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints::
 	buffernumberstring 0, 4
 	setvar VAR_0x8004, 4
 	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints:: @ 82639CB
+BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints::
 	buffernumberstring 0, 3
 	setvar VAR_0x8004, 3
 	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints:: @ 82639DA
+BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints::
 	buffernumberstring 0, 2
 	setvar VAR_0x8004, 2
 	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint:: @ 82639E9
+BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint::
 	buffernumberstring 0, 1
 	setvar VAR_0x8004, 1
 	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints:: @ 82639F8
+BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints::
 	special GiveFrontierBattlePoints
 	msgbox BattleFrontier_ScottsHouse_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	msgbox BattleFrontier_ScottsHouse_Text_ExplainBattlePoints, MSGBOX_DEFAULT
@@ -208,27 +208,27 @@ BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints:: @ 82639F8
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth:: @ 8263A13
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth::
 	applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth:: @ 8263A1E
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth::
 	applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast:: @ 8263A29
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast::
 	applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest:: @ 8263A34
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest::
 	applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier: @ 8263A3F
+BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier:
 	.string "SCOTT: Well, hello and welcome!\n"
 	.string "Heheh… Sorry about the cramped space.\p"
 	.string "Anyway, {PLAYER}{KUN}, let me formally\n"
@@ -237,7 +237,7 @@ BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier: @ 8263A3F
 	.string "It took me years and years, but I've\l"
 	.string "finally given shape to my dream.$"
 
-BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal: @ 8263B29
+BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal:
 	.string "On reflection, it was a terribly long\n"
 	.string "journey…\p"
 	.string "I left home alone on a quest to find\n"
@@ -245,7 +245,7 @@ BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal: @ 8263B29
 	.string "No one can imagine how much effort\n"
 	.string "or time it took to make this real.$"
 
-BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing: @ 8263BD4
+BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing:
 	.string "But that's all in the past.\n"
 	.string "No point dwelling on that!\p"
 	.string "All I want for you is to enjoy battling\n"
@@ -254,11 +254,11 @@ BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing: @ 8263BD4
 	.string "as a memento for all the time our\l"
 	.string "paths crossed on our journeys.$"
 
-BattleFrontier_ScottsHouse_Text_ObtainedXBattlePoints: @ 8263CB0
+BattleFrontier_ScottsHouse_Text_ObtainedXBattlePoints:
 	.string "{PLAYER} obtained\n"
 	.string "{STR_VAR_1} Battle Point(s).$"
 
-BattleFrontier_ScottsHouse_Text_ExplainBattlePoints: @ 8263CD0
+BattleFrontier_ScottsHouse_Text_ExplainBattlePoints:
 	.string "SCOTT: You can check your Battle\n"
 	.string "Points on your FRONTIER PASS.\p"
 	.string "The more success you have here at\n"
@@ -267,10 +267,10 @@ BattleFrontier_ScottsHouse_Text_ExplainBattlePoints: @ 8263CD0
 	.string "Use your Battle Points the way you\n"
 	.string "see fit, like trading them for items.$"
 
-BattleFrontier_ScottsHouse_Text_ExpectingGreatThings: @ 8263DB8
+BattleFrontier_ScottsHouse_Text_ExpectingGreatThings:
 	.string "I'm expecting great things from you!$"
 
-BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers: @ 8263DDD
+BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers:
 	.string "SCOTT: Every TRAINER is an individual.\n"
 	.string "They all lead lives of their own.\p"
 	.string "But when they're in a battle,\n"
@@ -282,7 +282,7 @@ BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers: @ 8263DDD
 	.string "TRAINERS who are serious about\l"
 	.string "battling, and invite them here.$"
 
-BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain: @ 8263F12
+BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain:
 	.string "SCOTT: Have you met any of\n"
 	.string "the FRONTIER BRAINS?\p"
 	.string "Better yet, have you obtained any\n"
@@ -292,7 +292,7 @@ BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain: @ 8263F12
 	.string "But I'm sure that seeing how tough\n"
 	.string "you are will startle even them!$"
 
-BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier: @ 8263FFE
+BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier:
 	.string "SCOTT: You don't just train for battle,\n"
 	.string "right?\p"
 	.string "I think I remember you working on\n"
@@ -302,7 +302,7 @@ BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier: @ 8263FFE
 	.string "the BATTLE FRONTIER somewhere…\l"
 	.string "Fufufu!$"
 
-BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols: @ 82640BC
+BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols:
 	.string "SCOTT: Are you enjoying things in\n"
 	.string "the BATTLE FRONTIER?\p"
 	.string "…Wait a second…\n"
@@ -317,7 +317,7 @@ BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols: @ 82640BC
 	.string "I want you to have this.\n"
 	.string "I'm sure you can put it to proper use.$"
 
-BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols: @ 8264216
+BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols:
 	.string "SCOTT: I hope you're enjoying\n"
 	.string "everything in the BATTLE FRONTIER.\p"
 	.string "…Wait a second…\n"
@@ -332,35 +332,35 @@ BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols: @ 8264216
 	.string "I think you will be able to\n"
 	.string "appreciate the value of my gift!$"
 
-BattleFrontier_ScottsHouse_Text_SoGladIBroughtYouHere: @ 8264373
+BattleFrontier_ScottsHouse_Text_SoGladIBroughtYouHere:
 	.string "I must say I have the gift of knowing\n"
 	.string "a good TRAINER when I see one.\p"
 	.string "I'm so glad I had the foresight to\n"
 	.string "bring you here!$"
 
-BattleFrontier_ScottsHouse_Text_BerryPocketStuffed: @ 82643EB
+BattleFrontier_ScottsHouse_Text_BerryPocketStuffed:
 	.string "Your BERRY POCKET seems to\n"
 	.string "be stuffed.$"
 
-BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow: @ 8264412
+BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow:
 	.string "SCOTT: Oh, I heard about you!\n"
 	.string "How you ruled the BATTLE TOWER!\l"
 	.string "You beat over 50 TRAINERS in a row?\p"
 	.string "That's fantastic!\n"
 	.string "I want you to have this!$"
 
-BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow: @ 826449F
+BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow:
 	.string "SCOTT: Oh, my! I heard about you!\n"
 	.string "How you overwhelmed the BATTLE TOWER!\l"
 	.string "You beat over 100 TRAINERS in a row?\p"
 	.string "That's ridiculously spectacular!\n"
 	.string "You've got to have this!$"
 
-BattleFrontier_ScottsHouse_Text_ExpectingToHearEvenGreaterThings: @ 8264546
+BattleFrontier_ScottsHouse_Text_ExpectingToHearEvenGreaterThings:
 	.string "I'll be expecting to hear even greater\n"
 	.string "things about you now!$"
 
-BattleFrontier_ScottsHouse_Text_ComeBackForThisLater: @ 8264583
+BattleFrontier_ScottsHouse_Text_ComeBackForThisLater:
 	.string "Oops, well, if you have too much\n"
 	.string "stuff, come back for this later.$"
 
diff --git a/data/maps/BattlePyramidSquare01/scripts.inc b/data/maps/BattlePyramidSquare01/scripts.inc
index c547b1b81..7a5db2fe2 100644
--- a/data/maps/BattlePyramidSquare01/scripts.inc
+++ b/data/maps/BattlePyramidSquare01/scripts.inc
@@ -1,2 +1,2 @@
-BattlePyramidSquare01_MapScripts:: @ 823D1A5
+BattlePyramidSquare01_MapScripts::
 	.byte 0
diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc
index 58a74f8c4..03463729c 100644
--- a/data/maps/BirthIsland_Exterior/scripts.inc
+++ b/data/maps/BirthIsland_Exterior/scripts.inc
@@ -2,17 +2,17 @@
 
 @ Note: LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK is a local id for this map used elsewhere. It's defined in event_objects.h
 
-BirthIsland_Exterior_MapScripts:: @ 8267F15
+BirthIsland_Exterior_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume
 	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_OnReturnToField
 	.byte 0
 
-BirthIsland_Exterior_OnReturnToField: @ 8267F25
+BirthIsland_Exterior_OnReturnToField:
 	special SetDeoxysRockPalette
 	end
 
-BirthIsland_Exterior_OnTransition: @ 8267F29
+BirthIsland_Exterior_OnTransition:
 	setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0
@@ -21,29 +21,29 @@ BirthIsland_Exterior_OnTransition: @ 8267F29
 	call_if_unset FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle
 	end
 
-BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle:: @ 8267F4E
+BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle::
 	setflag FLAG_HIDE_DEOXYS
 	setflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	return
 
-BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle:: @ 8267F55
+BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle::
 	goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	clearflag FLAG_DEOXYS_ROCK_COMPLETE
 	return
 
-BirthIsland_Exterior_OnResume: @ 8267F65
+BirthIsland_Exterior_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BirthIsland_Exterior_EventScript_TryRemoveDeoxys
 	end
 
-BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 8267F6F
+BirthIsland_Exterior_EventScript_TryRemoveDeoxys::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject LOCALID_DEOXYS
 	return
 
-BirthIsland_Exterior_EventScript_Triangle:: @ 8267F83
+BirthIsland_Exterior_EventScript_Triangle::
 	lock
 	faceplayer
 	special DoDeoxysRockInteraction
@@ -55,19 +55,19 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8267F83
 	case 3, BirthIsland_Exterior_EventScript_NotSolved3
 	end
 
-BirthIsland_Exterior_EventScript_NotSolved1:: @ 8267FBB
+BirthIsland_Exterior_EventScript_NotSolved1::
 	release
 	end
 
-BirthIsland_Exterior_EventScript_NotSolved2:: @ 8267FBD
+BirthIsland_Exterior_EventScript_NotSolved2::
 	release
 	end
 
-BirthIsland_Exterior_EventScript_NotSolved3:: @ 8267FBF
+BirthIsland_Exterior_EventScript_NotSolved3::
 	release
 	end
 
-BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1
+BirthIsland_Exterior_EventScript_Deoxys::
 	waitse
 	setfieldeffectargument 0, LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK
 	setfieldeffectargument 1, MAP_NUM(BIRTH_ISLAND_EXTERIOR)
@@ -102,18 +102,18 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1
 	release
 	end
 
-BirthIsland_Exterior_EventScript_DefeatedDeoxys:: @ 826803B
+BirthIsland_Exterior_EventScript_DefeatedDeoxys::
 	setflag FLAG_DEFEATED_DEOXYS
 	setvar VAR_0x8004, SPECIES_DEOXYS
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-BirthIsland_Exterior_EventScript_RanFromDeoxys:: @ 8268049
+BirthIsland_Exterior_EventScript_RanFromDeoxys::
 	setvar VAR_0x8004, SPECIES_DEOXYS
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-BirthIsland_Exterior_Movement_DeoxysApproach: @ 8268054
+BirthIsland_Exterior_Movement_DeoxysApproach:
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down
diff --git a/data/maps/BirthIsland_Harbor/scripts.inc b/data/maps/BirthIsland_Harbor/scripts.inc
index b9274ee2f..7ec88ae18 100644
--- a/data/maps/BirthIsland_Harbor/scripts.inc
+++ b/data/maps/BirthIsland_Harbor/scripts.inc
@@ -1,10 +1,10 @@
 .set LOCALID_SAILOR, 1
 .set LOCALID_SS_TIDAL, 2
 
-BirthIsland_Harbor_MapScripts:: @ 826805C
+BirthIsland_Harbor_MapScripts::
 	.byte 0
 
-BirthIsland_Harbor_EventScript_Sailor:: @ 826805D
+BirthIsland_Harbor_EventScript_Sailor::
 	lock
 	faceplayer
 	msgbox BirthIsland_Harbor_Text_SailorReturn, MSGBOX_YESNO
@@ -23,7 +23,7 @@ BirthIsland_Harbor_EventScript_Sailor:: @ 826805D
 	release
 	end
 
-BirthIsland_Harbor_EventScript_AsYouLike:: @ 82680A2
+BirthIsland_Harbor_EventScript_AsYouLike::
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc
index 943a9e9ed..fc18fa525 100644
--- a/data/maps/CaveOfOrigin_1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_1F/scripts.inc
@@ -1,7 +1,7 @@
-CaveOfOrigin_1F_MapScripts:: @ 8235768
+CaveOfOrigin_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_OnTransition
 	.byte 0
 
-CaveOfOrigin_1F_OnTransition: @ 823576E
+CaveOfOrigin_1F_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
 	end
diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index e9a146f73..511364cfa 100644
--- a/data/maps/CaveOfOrigin_B1F/scripts.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
@@ -1,9 +1,9 @@
 .set LOCALID_WALLACE, 1
 
-CaveOfOrigin_B1F_MapScripts:: @ 82357A8
+CaveOfOrigin_B1F_MapScripts::
 	.byte 0
 
-CaveOfOrigin_B1F_EventScript_Wallace:: @ 82357A9
+CaveOfOrigin_B1F_EventScript_Wallace::
 	lock
 	faceplayer
 	msgbox CaveOfOrigin_B1F_Text_WallaceStory, MSGBOX_DEFAULT
@@ -23,7 +23,7 @@ CaveOfOrigin_B1F_EventScript_Wallace:: @ 82357A9
 	waitmessage
 	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_WheresRayquaza:: @ 82357F0
+CaveOfOrigin_B1F_EventScript_WheresRayquaza::
 	multichoice 0, 0, MULTI_WHERES_RAYQUAZA, FALSE
 	switch VAR_RESULT
 	case 0, CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin
@@ -33,22 +33,22 @@ CaveOfOrigin_B1F_EventScript_WheresRayquaza:: @ 82357F0
 	goto CaveOfOrigin_B1F_EventScript_DontRemember
 	end
 
-CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin:: @ 823582C
+CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin::
 	message CaveOfOrigin_B1F_Text_ButWereInCaveOfOrigin
 	waitmessage
 	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_AtMtPyre:: @ 8235837
+CaveOfOrigin_B1F_EventScript_AtMtPyre::
 	message CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat
 	waitmessage
 	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_DontRemember:: @ 8235842
+CaveOfOrigin_B1F_EventScript_DontRemember::
 	message CaveOfOrigin_B1F_Text_CantYouRememberSomehow
 	waitmessage
 	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D
+CaveOfOrigin_B1F_EventScript_AtSkyPillar::
 	msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT
 	closemessage
 	playse SE_EXIT
@@ -61,7 +61,7 @@ CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D
 	release
 	end
 
-CaveOfOrigin_B1F_Text_WallaceStory: @ 823586E
+CaveOfOrigin_B1F_Text_WallaceStory:
 	.string "Ah, so you are {PLAYER}{KUN}?\n"
 	.string "I've heard tales of your exploits.\p"
 	.string "My name is WALLACE.\p"
@@ -85,19 +85,19 @@ CaveOfOrigin_B1F_Text_WallaceStory: @ 823586E
 	.string "But even I have no clue as to\n"
 	.string "RAYQUAZA's whereabouts…$"
 
-CaveOfOrigin_B1F_Text_WhereIsRayquaza: @ 8235ACE
+CaveOfOrigin_B1F_Text_WhereIsRayquaza:
 	.string "WALLACE: {PLAYER}{KUN}, do you perhaps\n"
 	.string "know where RAYQUAZA is now?\p"
 	.string "If you do, please tell me.$"
 
-CaveOfOrigin_B1F_Text_ButWereInCaveOfOrigin: @ 8235B23
+CaveOfOrigin_B1F_Text_ButWereInCaveOfOrigin:
 	.string "WALLACE: The CAVE OF ORIGIN?\p"
 	.string "But that's right here!\n"
 	.string "I need you to do better than that!\p"
 	.string "Please, I need you to think about\n"
 	.string "where RAYQUAZA might be right now.$"
 
-CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat: @ 8235BBF
+CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat:
 	.string "WALLACE: MT. PYRE?\p"
 	.string "But when I met the old lady there\n"
 	.string "earlier, she made no mention of it.\p"
@@ -106,12 +106,12 @@ CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat: @ 8235BBF
 	.string "{PLAYER}{KUN}, could you think about this\n"
 	.string "more carefully for me?$"
 
-CaveOfOrigin_B1F_Text_CantYouRememberSomehow: @ 8235C99
+CaveOfOrigin_B1F_Text_CantYouRememberSomehow:
 	.string "WALLACE: Huh? You don't remember?\n"
 	.string "Hmm… That's a problem…\p"
 	.string "Can't you remember somehow?$"
 
-CaveOfOrigin_B1F_Text_WellHeadToSkyPillar: @ 8235CEE
+CaveOfOrigin_B1F_Text_WellHeadToSkyPillar:
 	.string "WALLACE: The SKY PILLAR?\p"
 	.string "That's it!\n"
 	.string "It must be the SKY PILLAR!\p"
diff --git a/data/maps/CaveOfOrigin_Entrance/scripts.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc
index 76cdbc7ad..091246ae0 100644
--- a/data/maps/CaveOfOrigin_Entrance/scripts.inc
+++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc
@@ -1,8 +1,8 @@
-CaveOfOrigin_Entrance_MapScripts:: @ 8235759
+CaveOfOrigin_Entrance_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_OnResume
 	.byte 0
 
-CaveOfOrigin_Entrance_OnResume: @ 823575F
+CaveOfOrigin_Entrance_OnResume:
 	setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17
 	end
 
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
index 9f3fefdeb..25744c489 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc
@@ -1,7 +1,7 @@
-CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
+CaveOfOrigin_UnusedRubySapphireMap1_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_OnTransition
 	.byte 0
 
-CaveOfOrigin_UnusedRubySapphireMap1_OnTransition: @ 823577E
+CaveOfOrigin_UnusedRubySapphireMap1_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
 	end
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
index 60b1f0cca..53d7c03fc 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc
@@ -1,8 +1,8 @@
-CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
+CaveOfOrigin_UnusedRubySapphireMap2_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_OnTransition
 	.byte 0
 
-CaveOfOrigin_UnusedRubySapphireMap2_OnTransition: @ 823578E
+CaveOfOrigin_UnusedRubySapphireMap2_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
 	end
 
diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
index e30b50cbe..c476d672d 100644
--- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
+++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc
@@ -1,8 +1,8 @@
-CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
+CaveOfOrigin_UnusedRubySapphireMap3_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_OnTransition
 	.byte 0
 
-CaveOfOrigin_UnusedRubySapphireMap3_OnTransition: @ 823579E
+CaveOfOrigin_UnusedRubySapphireMap3_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
 	end
 
diff --git a/data/maps/ContestHall/scripts.inc b/data/maps/ContestHall/scripts.inc
index abde00cc2..535e28b78 100644
--- a/data/maps/ContestHall/scripts.inc
+++ b/data/maps/ContestHall/scripts.inc
@@ -1,4 +1,4 @@
-ContestHall_MapScripts:: @ 823B781
+ContestHall_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ContestHall_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, ContestHall_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, ContestHall_OnTransition
@@ -6,17 +6,17 @@ ContestHall_MapScripts:: @ 823B781
 	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, ContestHall_OnReturn
 	.byte 0
 
-ContestHall_OnReturn: @ 823B79B
+ContestHall_OnReturn:
 	special LoadLinkContestPlayerPalettes
 	end
 
-ContestHall_OnTransition: @ 823B79F
+ContestHall_OnTransition:
 	call ContestHall_EventScript_ReadyContestMusic
 	setvar VAR_TEMP_0, 1
 	call ContestHall_EventScript_AddRandomAudienceMembers
 	end
 
-ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
+ContestHall_EventScript_ReadyContestMusic::
 	call ContestHall_EventScript_TryWaitForLink
 	special GetContestMultiplayerId
 	compare VAR_RESULT, 0
@@ -31,49 +31,49 @@ ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
 	call_if_eq ContestHall_EventScript_SaveContestMusic
 	return
 
-ContestHall_EventScript_SaveContestMusicPlayer1:: @ 823B7EF
+ContestHall_EventScript_SaveContestMusicPlayer1::
 	savebgm MUS_LINK_CONTEST_P1
 	return
 
-ContestHall_EventScript_SaveContestMusicPlayer2:: @ 823B7F3
+ContestHall_EventScript_SaveContestMusicPlayer2::
 	savebgm MUS_LINK_CONTEST_P2
 	return
 
-ContestHall_EventScript_SaveContestMusicPlayer3:: @ 823B7F7
+ContestHall_EventScript_SaveContestMusicPlayer3::
 	savebgm MUS_LINK_CONTEST_P3
 	return
 
-ContestHall_EventScript_SaveContestMusicPlayer4:: @ 823B7FB
+ContestHall_EventScript_SaveContestMusicPlayer4::
 	savebgm MUS_LINK_CONTEST_P4
 	return
 
-ContestHall_EventScript_SaveContestMusic:: @ 823B7FF
+ContestHall_EventScript_SaveContestMusic::
 	savebgm MUS_CONTEST
 	return
 
-ContestHall_OnResume: @ 823B803
+ContestHall_OnResume:
 	compare VAR_TEMP_9, 1
 	call_if_eq ContestHall_EventScript_ReShowAudience
 	end
 
-ContestHall_EventScript_ReShowAudience:: @ 823B80F
+ContestHall_EventScript_ReShowAudience::
 	call ContestHall_EventScript_CreateAudience
 	return
 
-ContestHall_OnFrame: @ 823B815
+ContestHall_OnFrame:
 	map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_Contest
 	.2byte 0
 
-ContestHall_OnWarp: @ 823B81F
+ContestHall_OnWarp:
 	map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_SetContestObjects
 	.2byte 0
 
-ContestHall_EventScript_Contest:: @ 823B829
+ContestHall_EventScript_Contest::
 	call ContestHall_EventScript_DoContest
 	call ContestHall_EventScript_SetExitWarp
 	end
 
-ContestHall_EventScript_SetContestObjects:: @ 823B834
+ContestHall_EventScript_SetContestObjects::
 	special LoadLinkContestPlayerPalettes
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN
 	call ContestHall_EventScript_CreateAudience
@@ -81,14 +81,14 @@ ContestHall_EventScript_SetContestObjects:: @ 823B834
 
 @ There are 8 audience member object events, 7 of which are given random gfx below (the 8th is the Artist)
 @ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience
-ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842
+ContestHall_EventScript_AddRandomAudienceMembers::
 	call ContestHall_EventScript_GetRandomAudienceGfxId
 	call ContestHall_EventScript_SetRandomAudienceGfx
 	compare VAR_TEMP_0, 8
 	goto_if_lt ContestHall_EventScript_AddRandomAudienceMembers
 	return
 
-ContestHall_EventScript_SetRandomAudienceGfx:: @ 823B858
+ContestHall_EventScript_SetRandomAudienceGfx::
 	switch VAR_TEMP_0
 	case 1, ContestHall_EventScript_SetRandomAudience1
 	case 2, ContestHall_EventScript_SetRandomAudience2
@@ -99,42 +99,42 @@ ContestHall_EventScript_SetRandomAudienceGfx:: @ 823B858
 	case 7, ContestHall_EventScript_SetRandomAudience7
 	end
 
-ContestHall_EventScript_SetRandomAudience1:: @ 823B8AB
+ContestHall_EventScript_SetRandomAudience1::
 	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience2:: @ 823B8B6
+ContestHall_EventScript_SetRandomAudience2::
 	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience3:: @ 823B8C1
+ContestHall_EventScript_SetRandomAudience3::
 	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience4:: @ 823B8CC
+ContestHall_EventScript_SetRandomAudience4::
 	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience5:: @ 823B8D7
+ContestHall_EventScript_SetRandomAudience5::
 	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience6:: @ 823B8E2
+ContestHall_EventScript_SetRandomAudience6::
 	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience7:: @ 823B8ED
+ContestHall_EventScript_SetRandomAudience7::
 	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8
+ContestHall_EventScript_GetRandomAudienceGfxId::
 	setvar VAR_RESULT, 32
 	special GenerateContestRand
 	addvar VAR_RESULT, 1
@@ -173,135 +173,135 @@ ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8
 	case 32, ContestHall_EventScript_RandomAudienceScientist1
 	end
 
-ContestHall_EventScript_RandomAudienceNinjaBoy:: @ 823BA6B
+ContestHall_EventScript_RandomAudienceNinjaBoy::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_NINJA_BOY
 	return
 
-ContestHall_EventScript_RandomAudienceTwin:: @ 823BA71
+ContestHall_EventScript_RandomAudienceTwin::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_TWIN
 	return
 
-ContestHall_EventScript_RandomAudienceBoy1:: @ 823BA77
+ContestHall_EventScript_RandomAudienceBoy1::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_BOY_1
 	return
 
-ContestHall_EventScript_RandomAudienceGirl1:: @ 823BA7D
+ContestHall_EventScript_RandomAudienceGirl1::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_1
 	return
 
-ContestHall_EventScript_RandomAudienceGirl2:: @ 823BA83
+ContestHall_EventScript_RandomAudienceGirl2::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_2
 	return
 
-ContestHall_EventScript_RandomAudienceLittleBoy:: @ 823BA89
+ContestHall_EventScript_RandomAudienceLittleBoy::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_LITTLE_BOY
 	return
 
-ContestHall_EventScript_RandomAudienceGirl:: @ 823BA8F
+ContestHall_EventScript_RandomAudienceGirl::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_LITTLE_GIRL
 	return
 
-ContestHall_EventScript_RandomAudienceBoy3:: @ 823BA95
+ContestHall_EventScript_RandomAudienceBoy3::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_BOY_3
 	return
 
-ContestHall_EventScript_RandomAudienceGirl3:: @ 823BA9B
+ContestHall_EventScript_RandomAudienceGirl3::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_3
 	return
 
-ContestHall_EventScript_RandomAudienceRichBoy:: @ 823BAA1
+ContestHall_EventScript_RandomAudienceRichBoy::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_RICH_BOY
 	return
 
-ContestHall_EventScript_RandomAudienceFatMan:: @ 823BAA7
+ContestHall_EventScript_RandomAudienceFatMan::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_FAT_MAN
 	return
 
-ContestHall_EventScript_RandomAudiencePokefanF:: @ 823BAAD
+ContestHall_EventScript_RandomAudiencePokefanF::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_POKEFAN_F
 	return
 
-ContestHall_EventScript_RandomAudienceMan1:: @ 823BAB3
+ContestHall_EventScript_RandomAudienceMan1::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_MAN_1
 	return
 
-ContestHall_EventScript_RandomAudienceWoman2:: @ 823BAB9
+ContestHall_EventScript_RandomAudienceWoman2::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_2
 	return
 
-ContestHall_EventScript_RandomAudienceExpertM:: @ 823BABF
+ContestHall_EventScript_RandomAudienceExpertM::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_EXPERT_M
 	return
 
-ContestHall_EventScript_RandomAudienceExpertF:: @ 823BAC5
+ContestHall_EventScript_RandomAudienceExpertF::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_EXPERT_F
 	return
 
-ContestHall_EventScript_RandomAudiencePokefanM:: @ 823BACB
+ContestHall_EventScript_RandomAudiencePokefanM::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_POKEFAN_M
 	return
 
-ContestHall_EventScript_RandomAudienceWoman4:: @ 823BAD1
+ContestHall_EventScript_RandomAudienceWoman4::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_4
 	return
 
-ContestHall_EventScript_RandomAudienceCook:: @ 823BAD7
+ContestHall_EventScript_RandomAudienceCook::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_COOK
 	return
 
-ContestHall_EventScript_RandomAudienceLass:: @ 823BADD
+ContestHall_EventScript_RandomAudienceLass::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_LASS
 	return
 
-ContestHall_EventScript_RandomAudienceOldWoman:: @ 823BAE3
+ContestHall_EventScript_RandomAudienceOldWoman::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_OLD_WOMAN
 	return
 
-ContestHall_EventScript_RandomAudienceCamper:: @ 823BAE9
+ContestHall_EventScript_RandomAudienceCamper::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_CAMPER
 	return
 
-ContestHall_EventScript_RandomAudiencePicnicker:: @ 823BAEF
+ContestHall_EventScript_RandomAudiencePicnicker::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_PICNICKER
 	return
 
-ContestHall_EventScript_RandomAudienceMan3:: @ 823BAF5
+ContestHall_EventScript_RandomAudienceMan3::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_MAN_3
 	return
 
-ContestHall_EventScript_RandomAudienceWoman5:: @ 823BAFB
+ContestHall_EventScript_RandomAudienceWoman5::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_5
 	return
 
-ContestHall_EventScript_RandomAudienceYoungster:: @ 823BB01
+ContestHall_EventScript_RandomAudienceYoungster::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_YOUNGSTER
 	return
 
-ContestHall_EventScript_RandomAudienceBugCatcher:: @ 823BB07
+ContestHall_EventScript_RandomAudienceBugCatcher::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_BUG_CATCHER
 	return
 
-ContestHall_EventScript_RandomAudiencePsychicM:: @ 823BB0D
+ContestHall_EventScript_RandomAudiencePsychicM::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_PSYCHIC_M
 	return
 
-ContestHall_EventScript_RandomAudienceSchoolKidM:: @ 823BB13
+ContestHall_EventScript_RandomAudienceSchoolKidM::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_SCHOOL_KID_M
 	return
 
-ContestHall_EventScript_RandomAudienceBlackBelt:: @ 823BB19
+ContestHall_EventScript_RandomAudienceBlackBelt::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_BLACK_BELT
 	return
 
-ContestHall_EventScript_RandomAudienceBeauty:: @ 823BB1F
+ContestHall_EventScript_RandomAudienceBeauty::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_BEAUTY
 	return
 
-ContestHall_EventScript_RandomAudienceScientist1:: @ 823BB25
+ContestHall_EventScript_RandomAudienceScientist1::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_SCIENTIST_1
 	return
 
-ContestHall_EventScript_CreateAudience:: @ 823BB2B
+ContestHall_EventScript_CreateAudience::
 	specialvar VAR_RESULT, IsWirelessContest
 	compare VAR_RESULT, TRUE
 	goto_if_eq ContestHall_EventScript_CreateWirelessContestAudience
@@ -313,12 +313,12 @@ ContestHall_EventScript_CreateAudience:: @ 823BB2B
 	case CONTEST_TYPE_LINK, ContestHall_EventScript_CreateMasterContestAudience
 	return
 
-ContestHall_EventScript_CreateNormalContestAudience:: @ 823BB78
+ContestHall_EventScript_CreateNormalContestAudience::
 	createvobject OBJ_EVENT_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
 	return
 
-ContestHall_EventScript_CreateSuperContestAudience:: @ 823BB8B
+ContestHall_EventScript_CreateSuperContestAudience::
 	createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
@@ -331,7 +331,7 @@ ContestHall_EventScript_CreateSuperContestAudience:: @ 823BB8B
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
 	return
 
-ContestHall_EventScript_CreateHyperContestAudience:: @ 823BBE6
+ContestHall_EventScript_CreateHyperContestAudience::
 	createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
@@ -353,7 +353,7 @@ ContestHall_EventScript_CreateHyperContestAudience:: @ 823BBE6
 	createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
 	return
 
-ContestHall_EventScript_CreateMasterContestAudience:: @ 823BC92
+ContestHall_EventScript_CreateMasterContestAudience::
 	createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
@@ -383,7 +383,7 @@ ContestHall_EventScript_CreateMasterContestAudience:: @ 823BC92
 	createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
 	return
 
-ContestHall_EventScript_CreateWirelessContestAudience:: @ 823BD86
+ContestHall_EventScript_CreateWirelessContestAudience::
 	createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
@@ -407,7 +407,7 @@ ContestHall_EventScript_CreateWirelessContestAudience:: @ 823BD86
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
 	return
 
-ContestHall_EventScript_SetExitWarp:: @ 823BE44
+ContestHall_EventScript_SetExitWarp::
 	special ClearLinkContestFlags
 	switch VAR_CONTEST_TYPE
 	case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_SetExitWarpNormalContest
@@ -417,32 +417,32 @@ ContestHall_EventScript_SetExitWarp:: @ 823BE44
 	case CONTEST_TYPE_LINK, ContestHall_EventScript_SetExitWarpLinkContest
 	return
 
-ContestHall_EventScript_SetExitWarpNormalContest:: @ 823BE84
+ContestHall_EventScript_SetExitWarpNormalContest::
 	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
 	waitstate
 	end
 
-ContestHall_EventScript_SetExitWarpSuperContest:: @ 823BE8E
+ContestHall_EventScript_SetExitWarpSuperContest::
 	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
 	waitstate
 	end
 
-ContestHall_EventScript_SetExitWarpHyperContest:: @ 823BE98
+ContestHall_EventScript_SetExitWarpHyperContest::
 	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
 	waitstate
 	end
 
-ContestHall_EventScript_SetExitWarpMasterContest:: @ 823BEA2
+ContestHall_EventScript_SetExitWarpMasterContest::
 	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
 	waitstate
 	end
 
-ContestHall_EventScript_SetExitWarpLinkContest:: @ 823BEAC
+ContestHall_EventScript_SetExitWarpLinkContest::
 	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
 	waitstate
 	end
 
-LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: @ 823BEB6
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan
@@ -450,11 +450,11 @@ LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: @ 823BEB6
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan:: @ 823BECE
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan::
 	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay:: @ 823BED4
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay::
 	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc
index bd7b04fb4..414dbfc57 100644
--- a/data/maps/DesertRuins/scripts.inc
+++ b/data/maps/DesertRuins/scripts.inc
@@ -1,25 +1,25 @@
-DesertRuins_MapScripts:: @ 822D95B
+DesertRuins_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, DesertRuins_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, DesertRuins_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_OnTransition
 	.byte 0
 
-DesertRuins_OnResume: @ 822D96B
+DesertRuins_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_TryRemoveRegirock
 	end
 
-DesertRuins_EventScript_TryRemoveRegirock:: @ 822D975
+DesertRuins_EventScript_TryRemoveRegirock::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-DesertRuins_OnLoad: @ 822D989
+DesertRuins_OnLoad:
 	call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_HideRegiEntrance
 	end
 
-DesertRuins_EventScript_HideRegiEntrance:: @ 822D993
+DesertRuins_EventScript_HideRegiEntrance::
 	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
@@ -28,16 +28,16 @@ DesertRuins_EventScript_HideRegiEntrance:: @ 822D993
 	setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
-DesertRuins_OnTransition: @ 822D9CA
+DesertRuins_OnTransition:
 	setflag FLAG_LANDMARK_DESERT_RUINS
 	call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_ShowRegirock
 	end
 
-DesertRuins_EventScript_ShowRegirock:: @ 822D9D7
+DesertRuins_EventScript_ShowRegirock::
 	clearflag FLAG_HIDE_REGIROCK
 	return
 
-DesertRuins_EventScript_CaveEntranceMiddle:: @ 822D9DB
+DesertRuins_EventScript_CaveEntranceMiddle::
 	lockall
 	goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_BigHoleInWall
 	braillemessage DesertRuins_Braille_UseRockSmash
@@ -46,12 +46,12 @@ DesertRuins_EventScript_CaveEntranceMiddle:: @ 822D9DB
 	releaseall
 	end
 
-DesertRuins_EventScript_BigHoleInWall:: @ 822D9EE
+DesertRuins_EventScript_BigHoleInWall::
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DesertRuins_EventScript_CaveEntranceSide:: @ 822D9F8
+DesertRuins_EventScript_CaveEntranceSide::
 	lockall
 	braillemessage DesertRuins_Braille_UseRockSmash
 	waitbuttonpress
@@ -59,7 +59,7 @@ DesertRuins_EventScript_CaveEntranceSide:: @ 822D9F8
 	releaseall
 	end
 
-DesertRuins_EventScript_Regirock:: @ 822DA02
+DesertRuins_EventScript_Regirock::
 	lock
 	faceplayer
 	waitse
@@ -82,12 +82,12 @@ DesertRuins_EventScript_Regirock:: @ 822DA02
 	release
 	end
 
-DesertRuins_EventScript_DefeatedRegirock:: @ 822DA49
+DesertRuins_EventScript_DefeatedRegirock::
 	setflag FLAG_DEFEATED_REGIROCK
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-DesertRuins_EventScript_RanFromRegirock:: @ 822DA52
+DesertRuins_EventScript_RanFromRegirock::
 	setvar VAR_0x8004, SPECIES_REGIROCK
 	goto Common_EventScript_LegendaryFlewAway
 	end
diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc
index 7025a268b..518d98883 100644
--- a/data/maps/DesertUnderpass/scripts.inc
+++ b/data/maps/DesertUnderpass/scripts.inc
@@ -1,14 +1,14 @@
 .set LOCALID_FOSSIL, 1
 
-DesertUnderpass_MapScripts:: @ 823AF37
+DesertUnderpass_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, DesertUnderpass_OnTransition
 	.byte 0
 
-DesertUnderpass_OnTransition: @ 823AF3D
+DesertUnderpass_OnTransition:
 	setflag FLAG_LANDMARK_DESERT_UNDERPASS
 	end
 
-DesertUnderpass_EventScript_Fossil:: @ 823AF41
+DesertUnderpass_EventScript_Fossil::
 	lock
 	faceplayer
 	goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_GiveClawFossil
@@ -16,23 +16,23 @@ DesertUnderpass_EventScript_Fossil:: @ 823AF41
 	release
 	end
 
-DesertUnderpass_EventScript_GiveClawFossil:: @ 823AF57
+DesertUnderpass_EventScript_GiveClawFossil::
 	giveitem ITEM_CLAW_FOSSIL
 	removeobject LOCALID_FOSSIL
 	release
 	end
 
-DesertUnderpass_EventScript_GiveRootFossil:: @ 823AF68
+DesertUnderpass_EventScript_GiveRootFossil::
 	giveitem ITEM_ROOT_FOSSIL
 	removeobject LOCALID_FOSSIL
 	release
 	end
 
 @ Unused
-DesertUnderpass_Text_FoundRootFossil:: @ 823AF79
+DesertUnderpass_Text_FoundRootFossil::
 	.string "{PLAYER} found the ROOT FOSSIL.$"
 
 @ Unused
-DesertUnderpass_Text_FoundClawFossil:: @ 823AF93
+DesertUnderpass_Text_FoundClawFossil::
 	.string "{PLAYER} found the CLAW FOSSIL.$"
 
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
index 6298963c2..52b9be264 100644
--- a/data/maps/DewfordTown/scripts.inc
+++ b/data/maps/DewfordTown/scripts.inc
@@ -4,21 +4,21 @@
 .equ LOCALID_BRINEY_DEWFORD, 2
 .equ LOCALID_BOAT_DEWFORD, 4
 
-.equ LOCALID_BOAT_R109, 1 
+.equ LOCALID_BOAT_R109, 1
 .equ LOCALID_BRINEY_R109, 2
 
 .equ LOCALID_BOAT_R104, 7
 .equ LOCALID_BRINEY_R104, 8
 
-DewfordTown_MapScripts:: @ 81E9507
+DewfordTown_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_OnTransition
 	.byte 0
 
-DewfordTown_OnTransition: @ 81E950D
+DewfordTown_OnTransition:
 	setflag FLAG_VISITED_DEWFORD_TOWN
 	end
 
-DewfordTown_EventScript_Briney:: @ 81E9511
+DewfordTown_EventScript_Briney::
 	lock
 	faceplayer
 	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_ReturnToPetalburgPrompt
@@ -32,27 +32,27 @@ DewfordTown_EventScript_Briney:: @ 81E9511
 	case MULTI_B_PRESSED, DewfordTown_EventScript_CancelSailSelect
 	end
 
-DewfordTown_EventScript_ChoosePetalburg:: @ 81E955A
+DewfordTown_EventScript_ChoosePetalburg::
 	msgbox DewfordTown_Text_PetalburgWereSettingSail, MSGBOX_DEFAULT
 	closemessage
 	goto DewfordTown_EventScript_SailToPetalburg
 	release
 	end
 
-DewfordTown_EventScript_ChooseSlateport:: @ 81E956A
+DewfordTown_EventScript_ChooseSlateport::
 	msgbox DewfordTown_Text_SlateportWereSettingSail, MSGBOX_DEFAULT
 	closemessage
 	goto DewfordTown_EventScript_SailToSlateport
 	release
 	end
 
-DewfordTown_EventScript_CancelSailSelect:: @ 81E957A
+DewfordTown_EventScript_CancelSailSelect::
 	msgbox DewfordTown_Text_JustTellMeWhenYouNeedToSetSail, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
 
-DewfordTown_EventScript_ReturnToPetalburgPrompt:: @ 81E9585
+DewfordTown_EventScript_ReturnToPetalburgPrompt::
 	msgbox DewfordTown_Text_SetSailBackToPetalburg, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq DewfordTown_EventScript_SailBackToPetalburg
@@ -60,29 +60,29 @@ DewfordTown_EventScript_ReturnToPetalburgPrompt:: @ 81E9585
 	release
 	end
 
-DewfordTown_EventScript_SailBackToPetalburg:: @ 81E95A2
+DewfordTown_EventScript_SailBackToPetalburg::
 	msgbox DewfordTown_Text_PetalburgWereSettingSail2, MSGBOX_DEFAULT
 	closemessage
 	goto DewfordTown_EventScript_SailToPetalburg
 	end
 
-DewfordTown_EventScript_Woman:: @ 81E95B1
+DewfordTown_EventScript_Woman::
 	msgbox DewfordTown_Text_TinyIslandCommunity, MSGBOX_NPC
 	end
 
-DewfordTown_EventScript_TownSign:: @ 81E95BA
+DewfordTown_EventScript_TownSign::
 	msgbox DewfordTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-DewfordTown_EventScript_GymSign:: @ 81E95C3
+DewfordTown_EventScript_GymSign::
 	msgbox DewfordTown_Text_GymSign, MSGBOX_SIGN
 	end
 
-DewfordTown_EventScript_HallSign:: @ 81E95CC
+DewfordTown_EventScript_HallSign::
 	msgbox DewfordTown_Text_HallSign, MSGBOX_SIGN
 	end
 
-DewfordTown_EventScript_OldRodFisherman:: @ 81E95D5
+DewfordTown_EventScript_OldRodFisherman::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_HowsFishing
@@ -93,7 +93,7 @@ DewfordTown_EventScript_OldRodFisherman:: @ 81E95D5
 	goto_if_eq DewfordTown_EventScript_NotGettingItchToFish
 	end
 
-DewfordTown_EventScript_GiveOldRod:: @ 81E95FF
+DewfordTown_EventScript_GiveOldRod::
 	msgbox DewfordTown_Text_GiveYouOneOfMyRods, MSGBOX_DEFAULT
 	giveitem ITEM_OLD_ROD
 	setflag FLAG_RECEIVED_OLD_ROD
@@ -101,12 +101,12 @@ DewfordTown_EventScript_GiveOldRod:: @ 81E95FF
 	release
 	end
 
-DewfordTown_EventScript_NotGettingItchToFish:: @ 81E9620
+DewfordTown_EventScript_NotGettingItchToFish::
 	msgbox DewfordTown_Text_ThatsTooBadThen, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_HowsFishing:: @ 81E962A
+DewfordTown_EventScript_HowsFishing::
 	message DewfordTown_Text_HowsYourFishing
 	waitmessage
 	multichoice 20, 8, MULTI_HOWS_FISHING, TRUE
@@ -116,17 +116,17 @@ DewfordTown_EventScript_HowsFishing:: @ 81E962A
 	goto_if_eq DewfordTown_EventScript_FishingNotSoGood
 	end
 
-DewfordTown_EventScript_FishingExcellent:: @ 81E964C
+DewfordTown_EventScript_FishingExcellent::
 	msgbox DewfordTown_Text_GreatHaulInSomeBigOnes, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_FishingNotSoGood:: @ 81E9656
+DewfordTown_EventScript_FishingNotSoGood::
 	msgbox DewfordTown_Text_FishingAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_SailToPetalburg:: @ 81E9660
+DewfordTown_EventScript_SailToPetalburg::
 	call EventScript_BackupMrBrineyLocation
 	setobjectpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0
 	setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 0
@@ -158,7 +158,7 @@ DewfordTown_EventScript_SailToPetalburg:: @ 81E9660
 	release
 	end
 
-DewfordTown_EventScript_SailToSlateport:: @ 81E96E7
+DewfordTown_EventScript_SailToSlateport::
 	call EventScript_BackupMrBrineyLocation
 	setobjectpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0
 	setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 1
@@ -196,15 +196,15 @@ DewfordTown_EventScript_SailToSlateport:: @ 81E96E7
 	release
 	end
 
-DewfordTown_EventScript_LandedSlateportDeliverGoods:: @ 81E9790
+DewfordTown_EventScript_LandedSlateportDeliverGoods::
 	msgbox DewfordTown_Text_BrineyLandedInSlateportDeliverGoods, MSGBOX_DEFAULT
 	return
 
-DewfordTown_EventScript_LandedSlateport:: @ 81E9799
+DewfordTown_EventScript_LandedSlateport::
 	msgbox DewfordTown_Text_BrineyLandedInSlateport, MSGBOX_DEFAULT
 	return
 
-DewfordTown_Movement_SailToPetalburg: @ 81E97A2
+DewfordTown_Movement_SailToPetalburg:
 	walk_up
 	walk_up
 	walk_fast_up
@@ -401,7 +401,7 @@ DewfordTown_Movement_SailToPetalburg: @ 81E97A2
 	walk_up
 	step_end
 
-DewfordTown_Movement_SailToSlateport: @ 81E9865
+DewfordTown_Movement_SailToSlateport:
 	walk_right
 	walk_fast_right
 	walk_fast_right
@@ -575,34 +575,34 @@ DewfordTown_Movement_SailToSlateport: @ 81E9865
 	walk_fast_up
 	step_end
 
-DewfordTown_Movement_PlayerBoardBoat: @ 81E9911
+DewfordTown_Movement_PlayerBoardBoat:
 	walk_right
 	walk_up
 	step_end
 
-DewfordTown_Movement_ExitBoatPetalburg: @ 81E9914
+DewfordTown_Movement_ExitBoatPetalburg:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-DewfordTown_Movement_ExitBoatSlateport: @ 81E9918
+DewfordTown_Movement_ExitBoatSlateport:
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-DewfordTown_Movement_BrineyBoardBoat: @ 81E991D
+DewfordTown_Movement_BrineyBoardBoat:
 	walk_up
 	step_end
 
-DewfordTown_Movement_BrineyExitBoat: @ 81E991F
+DewfordTown_Movement_BrineyExitBoat:
 	walk_up
 	walk_up
 	step_end
 
-DewfordTown_EventScript_TrendyPhraseBoy:: @ 81E9922
+DewfordTown_EventScript_TrendyPhraseBoy::
 	lock
 	faceplayer
 	call Common_EventScript_BufferTrendyPhrase
@@ -613,12 +613,12 @@ DewfordTown_EventScript_TrendyPhraseBoy:: @ 81E9922
 	goto_if_eq DewfordTown_EventScript_RejectTrendyPhrase
 	end
 
-DewfordTown_EventScript_ConfirmTrendyPhrase:: @ 81E9948
+DewfordTown_EventScript_ConfirmTrendyPhrase::
 	msgbox DewfordTown_Text_YeahDefinitionOfInRightNow, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_RejectTrendyPhrase:: @ 81E9952
+DewfordTown_EventScript_RejectTrendyPhrase::
 	msgbox DewfordTown_Text_TellMeWhatsNewAndIn, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_TRENDY_PHRASE
 	call Common_ShowEasyChatScreen
@@ -630,7 +630,7 @@ DewfordTown_EventScript_RejectTrendyPhrase:: @ 81E9952
 	goto_if_eq DewfordTown_EventScript_CancelNewTrendyPhrase
 	end
 
-DewfordTown_EventScript_GiveNewTrendyPhrase:: @ 81E997D
+DewfordTown_EventScript_GiveNewTrendyPhrase::
 	incrementgamestat GAME_STAT_STARTED_TRENDS
 	compare VAR_0x8004, FALSE
 	goto_if_eq DewfordTown_EventScript_PhraseNotTrendyEnough
@@ -638,90 +638,90 @@ DewfordTown_EventScript_GiveNewTrendyPhrase:: @ 81E997D
 	release
 	end
 
-DewfordTown_EventScript_CancelNewTrendyPhrase:: @ 81E9994
+DewfordTown_EventScript_CancelNewTrendyPhrase::
 	msgbox DewfordTown_Text_HearOfAnyTrendsComeShareWithMe, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_EventScript_PhraseNotTrendyEnough:: @ 81E999E
+DewfordTown_EventScript_PhraseNotTrendyEnough::
 	msgbox DewfordTown_Text_XHuhIThinkYIsCool, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Text_TinyIslandCommunity: @ 81E99A8
+DewfordTown_Text_TinyIslandCommunity:
 	.string "DEWFORD is a tiny island community.\n"
 	.string "If something gets trendy here,\l"
 	.string "everyone picks up on it right away.$"
 
-DewfordTown_Text_TownSign: @ 81E9A0F
+DewfordTown_Text_TownSign:
 	.string "DEWFORD TOWN\n"
 	.string "“A tiny island in the blue sea.”$"
 
-DewfordTown_Text_GymSign: @ 81E9A3D
+DewfordTown_Text_GymSign:
 	.string "DEWFORD TOWN POKéMON GYM\n"
 	.string "LEADER: BRAWLY\l"
 	.string "“A big wave in fighting!”$"
 
-DewfordTown_Text_HallSign: @ 81E9A7F
+DewfordTown_Text_HallSign:
 	.string "DEWFORD HALL\n"
 	.string "“Everyone's information exchange!”$"
 
-Route104_Text_LandedInDewfordDeliverLetter: @ 81E9AAF
+Route104_Text_LandedInDewfordDeliverLetter:
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "We've hit land in DEWFORD.\p"
 	.string "I suppose you're off to deliver that\n"
 	.string "LETTER to, who was it now, STEVEN!$"
 
-DewfordTown_Text_SetSailBackToPetalburg: @ 81E9B24
+DewfordTown_Text_SetSailBackToPetalburg:
 	.string "MR. BRINEY: Have you delivered your\n"
 	.string "LETTER?\p"
 	.string "Or were you meaning to sail back to\n"
 	.string "PETALBURG?$"
 
-DewfordTown_Text_PetalburgWereSettingSail2: @ 81E9B7F
+DewfordTown_Text_PetalburgWereSettingSail2:
 	.string "MR. BRINEY: PETALBURG it is, then!\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-DewfordTown_Text_GoDeliverIllBeWaiting: @ 81E9BD9
+DewfordTown_Text_GoDeliverIllBeWaiting:
 	.string "MR. BRINEY: Then you go on and deliver\n"
 	.string "the LETTER. I'll be waiting.$"
 
-DewfordTown_Text_BrineyLandedInDewford: @ 81E9C1D
+DewfordTown_Text_BrineyLandedInDewford:
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "We've hit land in DEWFORD!\p"
 	.string "You just go on and tell me whenever\n"
 	.string "you want to set sail again!$"
 
-DewfordTown_Text_WhereAreWeBound: @ 81E9C8A
+DewfordTown_Text_WhereAreWeBound:
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "For you, I'll go out to sea anytime!\p"
 	.string "Now, my friend, where are we bound?$"
 
-DewfordTown_Text_PetalburgWereSettingSail: @ 81E9CE5
+DewfordTown_Text_PetalburgWereSettingSail:
 	.string "MR. BRINEY: PETALBURG, is it?\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-DewfordTown_Text_SlateportWereSettingSail: @ 81E9D3A
+DewfordTown_Text_SlateportWereSettingSail:
 	.string "MR. BRINEY: SLATEPORT, is it?\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-DewfordTown_Text_JustTellMeWhenYouNeedToSetSail: @ 81E9D8F
+DewfordTown_Text_JustTellMeWhenYouNeedToSetSail:
 	.string "MR. BRINEY: You just tell me whenever\n"
 	.string "you need to set sail again!$"
 
-DewfordTown_Text_GettingItchToFish: @ 81E9DD1
+DewfordTown_Text_GettingItchToFish:
 	.string "This is a renowned fishing spot.\n"
 	.string "Are you getting the itch to fish?$"
 
-DewfordTown_Text_GiveYouOneOfMyRods: @ 81E9E14
+DewfordTown_Text_GiveYouOneOfMyRods:
 	.string "I hear you, and I like what\n"
 	.string "you're saying!\p"
 	.string "I'll give you one of my fishing RODS.$"
 
-DewfordTown_Text_ThrowInFishingAdvice: @ 81E9E65
+DewfordTown_Text_ThrowInFishingAdvice:
 	.string "And, as an added bonus, I'll even throw\n"
 	.string "in a little fishing advice!\p"
 	.string "First, you want to face the water,\n"
@@ -733,19 +733,19 @@ DewfordTown_Text_ThrowInFishingAdvice: @ 81E9E65
 	.string "you need to time the pulls on your ROD\l"
 	.string "to haul them in.$"
 
-DewfordTown_Text_ThatsTooBadThen: @ 81E9F92
+DewfordTown_Text_ThatsTooBadThen:
 	.string "Oh, is that so?\n"
 	.string "That's too bad, then.$"
 
-DewfordTown_Text_HowsYourFishing: @ 81E9FB8
+DewfordTown_Text_HowsYourFishing:
 	.string "Yo!\n"
 	.string "How's your fishing?$"
 
-DewfordTown_Text_GreatHaulInSomeBigOnes: @ 81E9FD0
+DewfordTown_Text_GreatHaulInSomeBigOnes:
 	.string "Is that right! That's great!\n"
 	.string "Haul in some big ones!$"
 
-DewfordTown_Text_FishingAdvice: @ 81EA004
+DewfordTown_Text_FishingAdvice:
 	.string "Oh, hey, don't get down on yourself!\n"
 	.string "I'll give you a little fishing advice.\p"
 	.string "First, you want to face the water,\n"
@@ -757,7 +757,7 @@ DewfordTown_Text_FishingAdvice: @ 81EA004
 	.string "you need to time the pulls on your ROD\l"
 	.string "to haul them in.$"
 
-DewfordTown_Text_XIsTheBiggestHappeningThingRight: @ 81EA136
+DewfordTown_Text_XIsTheBiggestHappeningThingRight:
 	.string "I like what's hip, happening, and trendy.\n"
 	.string "I'm always checking it out.\p"
 	.string "Listen, have you heard about this new\n"
@@ -771,13 +771,13 @@ DewfordTown_Text_XIsTheBiggestHappeningThingRight: @ 81EA136
 	.string "“{STR_VAR_1}”\l"
 	.string "is the biggest happening thing, right?$"
 
-DewfordTown_Text_TellMeWhatsNewAndIn: @ 81EA242
+DewfordTown_Text_TellMeWhatsNewAndIn:
 	.string "Hunh?\n"
 	.string "It's not the hip and happening thing?\p"
 	.string "Well, hey, you have to tell me,\n"
 	.string "what's new and what's “in”?$"
 
-DewfordTown_Text_OfCourseIKnowAboutThat: @ 81EA2AA
+DewfordTown_Text_OfCourseIKnowAboutThat:
 	.string "Hunh?\n"
 	.string "“{STR_VAR_2}”?\p"
 	.string "… …\p"
@@ -795,18 +795,18 @@ DewfordTown_Text_OfCourseIKnowAboutThat: @ 81EA2AA
 	.string "Now, “{STR_VAR_2}” is\n"
 	.string "what's vital and in tune with the times!$"
 
-DewfordTown_Text_XHuhIThinkYIsCool: @ 81EA3FE
+DewfordTown_Text_XHuhIThinkYIsCool:
 	.string "Hmm…\n"
 	.string "“{STR_VAR_2},” huh?\p"
 	.string "But personally, I think\n"
 	.string "“{STR_VAR_1}”\l"
 	.string "is what's real in cool.$"
 
-DewfordTown_Text_HearOfAnyTrendsComeShareWithMe: @ 81EA443
+DewfordTown_Text_HearOfAnyTrendsComeShareWithMe:
 	.string "Well, if you hear of any happening new\n"
 	.string "trends, come share them with me, okay?$"
 
-DewfordTown_Text_YeahDefinitionOfInRightNow: @ 81EA491
+DewfordTown_Text_YeahDefinitionOfInRightNow:
 	.string "Yeah, absolutely right!\p"
 	.string "“{STR_VAR_1}” is the\n"
 	.string "definition of “in” right now.$"
diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc
index f67184045..d2b51766a 100644
--- a/data/maps/DewfordTown_Gym/scripts.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
@@ -1,12 +1,12 @@
-DewfordTown_Gym_MapScripts:: @ 81FC63C
+DewfordTown_Gym_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_Gym_OnTransition
 	.byte 0
 
-DewfordTown_Gym_OnTransition: @ 81FC642
+DewfordTown_Gym_OnTransition:
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	end
 
-DewfordTown_Gym_EventScript_SetFlashRadius:: @ 81FC648
+DewfordTown_Gym_EventScript_SetFlashRadius::
 	goto_if_defeated TRAINER_BRAWLY_1, DewfordTown_Gym_EventScript_SetLightsOn
 	call DewfordTown_Gym_EventScript_CountTrainersDefeated
 	copyvar VAR_0x8001, VAR_0x8000
@@ -24,39 +24,39 @@ DewfordTown_Gym_EventScript_SetFlashRadius:: @ 81FC648
 	goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius2
 	goto DewfordTown_Gym_EventScript_SetFlashRadius1
 
-DewfordTown_Gym_EventScript_SetLightsOn:: @ 81FC6A2
+DewfordTown_Gym_EventScript_SetLightsOn::
 	setflashradius 0
 	return
 
-DewfordTown_Gym_EventScript_SetFlashRadius1:: @ 81FC6A6
+DewfordTown_Gym_EventScript_SetFlashRadius1::
 	setflashradius 1
 	return
 
-DewfordTown_Gym_EventScript_SetFlashRadius2:: @ 81FC6AA
+DewfordTown_Gym_EventScript_SetFlashRadius2::
 	setflashradius 2
 	return
 
-DewfordTown_Gym_EventScript_SetFlashRadius3:: @ 81FC6AE
+DewfordTown_Gym_EventScript_SetFlashRadius3::
 	setflashradius 3
 	return
 
-DewfordTown_Gym_EventScript_SetFlashRadius4:: @ 81FC6B2
+DewfordTown_Gym_EventScript_SetFlashRadius4::
 	setflashradius 4
 	return
 
-DewfordTown_Gym_EventScript_SetFlashRadius5:: @ 81FC6B6
+DewfordTown_Gym_EventScript_SetFlashRadius5::
 	setflashradius 5
 	return
 
-DewfordTown_Gym_EventScript_SetFlashRadius6:: @ 81FC6BA
+DewfordTown_Gym_EventScript_SetFlashRadius6::
 	setflashradius 6
 	return
 
-DewfordTown_Gym_EventScript_SetFlashRadius7:: @ 81FC6BE
+DewfordTown_Gym_EventScript_SetFlashRadius7::
 	setflashradius 7
 	return
 
-DewfordTown_Gym_EventScript_BrightenRoom:: @ 81FC6C2
+DewfordTown_Gym_EventScript_BrightenRoom::
 	call DewfordTown_Gym_EventScript_CountTrainersDefeated
 	nop1
 	compare VAR_0x8000, VAR_0x8001
@@ -75,75 +75,75 @@ DewfordTown_Gym_EventScript_BrightenRoom:: @ 81FC6C2
 	compare VAR_0x8000, 6
 	goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash6Trainers
 
-DewfordTown_Gym_EventScript_NoLightChange:: @ 81FC71A
+DewfordTown_Gym_EventScript_NoLightChange::
 	return
 
 @ NOTE: A little confusingly, a larger animateflash param value is a smaller flash radius
-DewfordTown_Gym_EventScript_AnimateFlash1Trainer:: @ 81FC71B
+DewfordTown_Gym_EventScript_AnimateFlash1Trainer::
 	playse SE_SWITCH
 	animateflash 6
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_AnimateFlash2Trainers:: @ 81FC726
+DewfordTown_Gym_EventScript_AnimateFlash2Trainers::
 	playse SE_SWITCH
 	animateflash 5
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_AnimateFlash3Trainers:: @ 81FC731
+DewfordTown_Gym_EventScript_AnimateFlash3Trainers::
 	playse SE_SWITCH
 	animateflash 4
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_AnimateFlash4Trainers:: @ 81FC73C
+DewfordTown_Gym_EventScript_AnimateFlash4Trainers::
 	playse SE_SWITCH
 	animateflash 3
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_AnimateFlash5Trainers:: @ 81FC747
+DewfordTown_Gym_EventScript_AnimateFlash5Trainers::
 	playse SE_SWITCH
 	animateflash 2
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_AnimateFlash6Trainers:: @ 81FC752
+DewfordTown_Gym_EventScript_AnimateFlash6Trainers::
 	playse SE_SWITCH
 	animateflash 1
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: @ 81FC75D
+DewfordTown_Gym_EventScript_AnimateFlashFullBrightness::
 	playse SE_SWITCH
 	animateflash 0
 	call DewfordTown_Gym_EventScript_SetFlashRadius
 	return
 
-DewfordTown_Gym_EventScript_CountTrainersDefeated:: @ 81FC768
+DewfordTown_Gym_EventScript_CountTrainersDefeated::
 	setvar VAR_0x8000, 0
 	goto_if_not_defeated TRAINER_TAKAO, DewfordTown_Gym_EventScript_CheckJocelyn
 	addvar VAR_0x8000, 1
-DewfordTown_Gym_EventScript_CheckJocelyn:: @ 81FC77B
+DewfordTown_Gym_EventScript_CheckJocelyn::
 	goto_if_not_defeated TRAINER_JOCELYN, DewfordTown_Gym_EventScript_CheckLaura
 	addvar VAR_0x8000, 1
-DewfordTown_Gym_EventScript_CheckLaura:: @ 81FC789
+DewfordTown_Gym_EventScript_CheckLaura::
 	goto_if_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_CheckBrenden
 	addvar VAR_0x8000, 1
-DewfordTown_Gym_EventScript_CheckBrenden:: @ 81FC797
+DewfordTown_Gym_EventScript_CheckBrenden::
 	goto_if_not_defeated TRAINER_BRENDEN, DewfordTown_Gym_EventScript_CheckCristian
 	addvar VAR_0x8000, 1
-DewfordTown_Gym_EventScript_CheckCristian:: @ 81FC7A5
+DewfordTown_Gym_EventScript_CheckCristian::
 	goto_if_not_defeated TRAINER_CRISTIAN, DewfordTown_Gym_EventScript_CheckLilith
 	addvar VAR_0x8000, 1
-DewfordTown_Gym_EventScript_CheckLilith:: @ 81FC7B3
+DewfordTown_Gym_EventScript_CheckLilith::
 	goto_if_not_defeated TRAINER_LILITH, DewfordTown_Gym_EventScript_StopCountingTrainers
 	addvar VAR_0x8000, 1
-DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 81FC7C1
+DewfordTown_Gym_EventScript_StopCountingTrainers::
 	return
 
-DewfordTown_Gym_EventScript_Brawly:: @ 81FC7C2
+DewfordTown_Gym_EventScript_Brawly::
 	trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyIntro, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -153,7 +153,7 @@ DewfordTown_Gym_EventScript_Brawly:: @ 81FC7C2
 	release
 	end
 
-DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 81FC7F7
+DewfordTown_Gym_EventScript_BrawlyDefeated::
 	call DewfordTown_Gym_EventScript_AnimateFlashFullBrightness
 	message DewfordTown_Gym_Text_ReceivedKnuckleBadge
 	waitmessage
@@ -180,7 +180,7 @@ DewfordTown_Gym_EventScript_BrawlyDefeated:: @ 81FC7F7
 	release
 	end
 
-DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81FC855
+DewfordTown_Gym_EventScript_GiveBulkUp::
 	giveitem ITEM_TM08
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_BagIsFull
@@ -188,7 +188,7 @@ DewfordTown_Gym_EventScript_GiveBulkUp:: @ 81FC855
 	setflag FLAG_RECEIVED_TM08
 	return
 
-DewfordTown_Gym_EventScript_GiveBulkUp2: @ 81FC878
+DewfordTown_Gym_EventScript_GiveBulkUp2:
 	giveitem ITEM_TM08
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -197,72 +197,72 @@ DewfordTown_Gym_EventScript_GiveBulkUp2: @ 81FC878
 	release
 	end
 
-DewfordTown_Gym_EventScript_BrawlyRematch:: @ 81FC89C
+DewfordTown_Gym_EventScript_BrawlyRematch::
 	trainerbattle_rematch_double TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyPreRematch, DewfordTown_Gym_Text_BrawlyRematchDefeat, DewfordTown_Gym_Text_BrawlyRematchNeedTwoMons
 	msgbox DewfordTown_Gym_Text_BrawlyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_Takao:: @ 81FC8B7
+DewfordTown_Gym_EventScript_Takao::
 	trainerbattle_single TRAINER_TAKAO, DewfordTown_Gym_Text_TakaoIntro, DewfordTown_Gym_Text_TakaoDefeat, DewfordTown_Gym_EventScript_TakaoBrightenRoom
 	msgbox DewfordTown_Gym_Text_TakaoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_TakaoBrightenRoom:: @ 81FC8D2
+DewfordTown_Gym_EventScript_TakaoBrightenRoom::
 	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_Jocelyn:: @ 81FC8D9
+DewfordTown_Gym_EventScript_Jocelyn::
 	trainerbattle_single TRAINER_JOCELYN, DewfordTown_Gym_Text_JocelynIntro, DewfordTown_Gym_Text_JocelynDefeat, DewfordTown_Gym_EventScript_JocelynBrightenRoom
 	msgbox DewfordTown_Gym_Text_JocelynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_JocelynBrightenRoom:: @ 81FC8F4
+DewfordTown_Gym_EventScript_JocelynBrightenRoom::
 	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_Laura:: @ 81FC8FB
+DewfordTown_Gym_EventScript_Laura::
 	trainerbattle_single TRAINER_LAURA, DewfordTown_Gym_Text_LauraIntro, DewfordTown_Gym_Text_LauraDefeat, DewfordTown_Gym_EventScript_LauraBrightenRoom
 	msgbox DewfordTown_Gym_Text_LauraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_LauraBrightenRoom:: @ 81FC916
+DewfordTown_Gym_EventScript_LauraBrightenRoom::
 	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_Brenden:: @ 81FC91D
+DewfordTown_Gym_EventScript_Brenden::
 	trainerbattle_single TRAINER_BRENDEN, DewfordTown_Gym_Text_BrendenIntro, DewfordTown_Gym_Text_BrendenDefeat, DewfordTown_Gym_EventScript_BrendenBrightenRoom
 	msgbox DewfordTown_Gym_Text_BrendenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_BrendenBrightenRoom:: @ 81FC938
+DewfordTown_Gym_EventScript_BrendenBrightenRoom::
 	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_Cristian:: @ 81FC93F
+DewfordTown_Gym_EventScript_Cristian::
 	trainerbattle_single TRAINER_CRISTIAN, DewfordTown_Gym_Text_CristianIntro, DewfordTown_Gym_Text_CristianDefeat, DewfordTown_Gym_EventScript_CristianBrightenRoom
 	msgbox DewfordTown_Gym_Text_CristianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_CristianBrightenRoom:: @ 81FC95A
+DewfordTown_Gym_EventScript_CristianBrightenRoom::
 	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_Lilith:: @ 81FC961
+DewfordTown_Gym_EventScript_Lilith::
 	trainerbattle_single TRAINER_LILITH, DewfordTown_Gym_Text_LilithIntro, DewfordTown_Gym_Text_LilithDefeat, DewfordTown_Gym_EventScript_LilithBrightenRoom
 	msgbox DewfordTown_Gym_Text_LilithPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Gym_EventScript_LilithBrightenRoom:: @ 81FC97C
+DewfordTown_Gym_EventScript_LilithBrightenRoom::
 	call DewfordTown_Gym_EventScript_BrightenRoom
 	release
 	end
 
-DewfordTown_Gym_EventScript_GymGuide:: @ 81FC983
+DewfordTown_Gym_EventScript_GymGuide::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_GymGuidePostVictory
@@ -270,34 +270,34 @@ DewfordTown_Gym_EventScript_GymGuide:: @ 81FC983
 	release
 	end
 
-DewfordTown_Gym_EventScript_GymGuidePostVictory:: @ 81FC998
+DewfordTown_Gym_EventScript_GymGuidePostVictory::
 	msgbox DewfordTown_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Gym_EventScript_LeftGymStatue:: @ 81FC9A2
+DewfordTown_Gym_EventScript_LeftGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_GymStatueCertified
 	goto DewfordTown_Gym_EventScript_GymStatue
 	end
 
-DewfordTown_Gym_EventScript_RightGymStatue:: @ 81FC9B2
+DewfordTown_Gym_EventScript_RightGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_GymStatueCertified
 	goto DewfordTown_Gym_EventScript_GymStatue
 	end
 
-DewfordTown_Gym_EventScript_GymStatueCertified:: @ 81FC9C2
+DewfordTown_Gym_EventScript_GymStatueCertified::
 	msgbox DewfordTown_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Gym_EventScript_GymStatue:: @ 81FC9CC
+DewfordTown_Gym_EventScript_GymStatue::
 	msgbox DewfordTown_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Gym_Text_GymGuideAdvice: @ 81FC9D6
+DewfordTown_Gym_Text_GymGuideAdvice:
 	.string "Hey, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "DEWFORD's GYM LEADER BRAWLY commands\n"
@@ -313,88 +313,88 @@ DewfordTown_Gym_Text_GymGuideAdvice: @ 81FC9D6
 	.string "the TRAINERS in your way.\p"
 	.string "Hey, okay, go for it!$"
 
-DewfordTown_Gym_Text_GymGuidePostVictory: @ 81FCB5C
+DewfordTown_Gym_Text_GymGuidePostVictory:
 	.string "Whoah! It's turned too bright in here!\p"
 	.string "Your future is bright, too!$"
 
-DewfordTown_Gym_Text_TakaoIntro: @ 81FCB9F
+DewfordTown_Gym_Text_TakaoIntro:
 	.string "Might is right!\n"
 	.string "Come on!$"
 
-DewfordTown_Gym_Text_TakaoDefeat: @ 81FCBB8
+DewfordTown_Gym_Text_TakaoDefeat:
 	.string "Not enough power…$"
 
-DewfordTown_Gym_Text_TakaoPostBattle: @ 81FCBCA
+DewfordTown_Gym_Text_TakaoPostBattle:
 	.string "Your skill overcame my strength!\n"
 	.string "Your technique is commendable!$"
 
-DewfordTown_Gym_Text_JocelynIntro: @ 81FCC0A
+DewfordTown_Gym_Text_JocelynIntro:
 	.string "There's no need for BRAWLY to be\n"
 	.string "involved!\p"
 	.string "I'll crush you!$"
 
-DewfordTown_Gym_Text_JocelynDefeat: @ 81FCC45
+DewfordTown_Gym_Text_JocelynDefeat:
 	.string "But… How?\n"
 	.string "How could I lose so easily?$"
 
-DewfordTown_Gym_Text_JocelynPostBattle: @ 81FCC6B
+DewfordTown_Gym_Text_JocelynPostBattle:
 	.string "I'm not going to waste this loss.\n"
 	.string "I'll use it to motivate me to train!\p"
 	.string "One day I'll become a GYM LEADER…\p"
 	.string "No, I'll become the POKéMON LEAGUE\n"
 	.string "CHAMPION!$"
 
-DewfordTown_Gym_Text_LauraIntro: @ 81FCD01
+DewfordTown_Gym_Text_LauraIntro:
 	.string "Don't you dare brush me off!\n"
 	.string "It's not my fault if you cry!$"
 
-DewfordTown_Gym_Text_LauraDefeat: @ 81FCD3C
+DewfordTown_Gym_Text_LauraDefeat:
 	.string "Waaaaaaah!\n"
 	.string "I lost!$"
 
-DewfordTown_Gym_Text_LauraPostBattle: @ 81FCD4F
+DewfordTown_Gym_Text_LauraPostBattle:
 	.string "I battle in the dark to make my heart\n"
 	.string "stronger.\p"
 	.string "But because it's so dark, I can never\n"
 	.string "see BRAWLY's face…$"
 
-DewfordTown_Gym_Text_LilithIntro: @ 81FCDB8
+DewfordTown_Gym_Text_LilithIntro:
 	.string "Ufufu…\n"
 	.string "Are you stumbling around in the dark?$"
 
-DewfordTown_Gym_Text_LilithDefeat: @ 81FCDE5
+DewfordTown_Gym_Text_LilithDefeat:
 	.string "Oh, you…\n"
 	.string "I don't want to know you!$"
 
-DewfordTown_Gym_Text_LilithPostBattle: @ 81FCE08
+DewfordTown_Gym_Text_LilithPostBattle:
 	.string "You deserve to stay lost and end up\n"
 	.string "back at the entrance again!$"
 
-DewfordTown_Gym_Text_BrendenIntro: @ 81FCE48
+DewfordTown_Gym_Text_BrendenIntro:
 	.string "I'll show you the gumption of\n"
 	.string "a sailing man!$"
 
-DewfordTown_Gym_Text_BrendenDefeat: @ 81FCE75
+DewfordTown_Gym_Text_BrendenDefeat:
 	.string "How'd this happen?\n"
 	.string "It's not like me to lose this way!$"
 
-DewfordTown_Gym_Text_BrendenPostBattle: @ 81FCEAB
+DewfordTown_Gym_Text_BrendenPostBattle:
 	.string "Oh, aye! You're worthy of seeing\n"
 	.string "our GYM LEADER.$"
 
-DewfordTown_Gym_Text_CristianIntro: @ 81FCEDC
+DewfordTown_Gym_Text_CristianIntro:
 	.string "If you mean to pass, it has to be\n"
 	.string "through me!$"
 
-DewfordTown_Gym_Text_CristianDefeat: @ 81FCF0A
+DewfordTown_Gym_Text_CristianDefeat:
 	.string "Grrrrr!\n"
 	.string "Vastly overpowered!$"
 
-DewfordTown_Gym_Text_CristianPostBattle: @ 81FCF26
+DewfordTown_Gym_Text_CristianPostBattle:
 	.string "You win!\n"
 	.string "Go after that BADGE!$"
 
-DewfordTown_Gym_Text_BrawlyIntro: @ 81FCF44
+DewfordTown_Gym_Text_BrawlyIntro:
 	.string "I'm BRAWLY!\n"
 	.string "DEWFORD's GYM LEADER!\p"
 	.string "I've been churned in the rough waves\n"
@@ -403,18 +403,18 @@ DewfordTown_Gym_Text_BrawlyIntro: @ 81FCF44
 	.string "So you wanted to challenge me?\n"
 	.string "Let me see what you're made of!$"
 
-DewfordTown_Gym_Text_BrawlyDefeat: @ 81FD008
+DewfordTown_Gym_Text_BrawlyDefeat:
 	.string "Whoah, wow! You made a much bigger\n"
 	.string "splash than I expected!\p"
 	.string "You swamped me!\p"
 	.string "Okay, you've got me.\n"
 	.string "Take this GYM BADGE!$"
 
-DewfordTown_Gym_Text_ReceivedKnuckleBadge: @ 81FD07D
+DewfordTown_Gym_Text_ReceivedKnuckleBadge:
 	.string "{PLAYER} received the KNUCKLE BADGE\n"
 	.string "from BRAWLY.$"
 
-DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis: @ 81FD0A8
+DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis:
 	.string "The KNUCKLE BADGE makes all POKéMON\n"
 	.string "up to Level 30, even those you get in\l"
 	.string "trades, obey without question.\p"
@@ -423,30 +423,30 @@ DewfordTown_Gym_Text_KnuckleBadgeInfoTakeThis: @ 81FD0A8
 	.string "If you'd like, use this TECHNICAL\n"
 	.string "MACHINE, too.$"
 
-DewfordTown_Gym_Text_ExplainBulkUp: @ 81FD181
+DewfordTown_Gym_Text_ExplainBulkUp:
 	.string "That TM08 contains BULK UP.\p"
 	.string "It's a move that raises both ATTACK\n"
 	.string "and DEFENSE stats.\p"
 	.string "… … … … … …$"
 
-DewfordTown_Gym_Text_RegisteredBrawly: @ 81FD1E0
+DewfordTown_Gym_Text_RegisteredBrawly:
 	.string "Registered GYM LEADER BRAWLY\n"
 	.string "in the POKéNAV.$"
 
-DewfordTown_Gym_Text_BrawlyPostBattle: @ 81FD20D
+DewfordTown_Gym_Text_BrawlyPostBattle:
 	.string "I can see your talent becoming a giant\n"
 	.string "wave to cause a storm of astonishment\l"
 	.string "among TRAINERS one day!$"
 
-DewfordTown_Gym_Text_GymStatue: @ 81FD272
+DewfordTown_Gym_Text_GymStatue:
 	.string "DEWFORD TOWN POKéMON GYM$"
 
-DewfordTown_Gym_Text_GymStatueCertified: @ 81FD28B
+DewfordTown_Gym_Text_GymStatueCertified:
 	.string "DEWFORD TOWN POKéMON GYM\p"
 	.string "BRAWLY'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-DewfordTown_Gym_Text_BrawlyPreRematch: @ 81FD2C4
+DewfordTown_Gym_Text_BrawlyPreRematch:
 	.string "BRAWLY: A wave may draw back, but it\n"
 	.string "always returns to the shore.\p"
 	.string "A giant wave of a talent like you…\n"
@@ -454,16 +454,16 @@ DewfordTown_Gym_Text_BrawlyPreRematch: @ 81FD2C4
 	.string "Show me how much higher\n"
 	.string "you've gone!$"
 
-DewfordTown_Gym_Text_BrawlyRematchDefeat: @ 81FD367
+DewfordTown_Gym_Text_BrawlyRematchDefeat:
 	.string "Wow!\n"
 	.string "Swamped again!$"
 
-DewfordTown_Gym_Text_BrawlyPostRematch: @ 81FD37B
+DewfordTown_Gym_Text_BrawlyPostRematch:
 	.string "BRAWLY: Battling is vast and it's deep.\n"
 	.string "You can't see the bottom.\l"
 	.string "It's just like the sea of HOENN!$"
 
-DewfordTown_Gym_Text_BrawlyRematchNeedTwoMons: @ 81FD3DE
+DewfordTown_Gym_Text_BrawlyRematchNeedTwoMons:
 	.string "BRAWLY: A wave may draw back, but it\n"
 	.string "always returns to the shore.\p"
 	.string "A giant wave of a talent like you…\n"
diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc
index 814392b3d..db9d13518 100644
--- a/data/maps/DewfordTown_Hall/scripts.inc
+++ b/data/maps/DewfordTown_Hall/scripts.inc
@@ -3,10 +3,10 @@
 .set LOCALID_SCHOOL_KID_M, 7
 .set LOCALID_PSYCHIC_M, 8
 
-DewfordTown_Hall_MapScripts:: @ 81FD4CF
+DewfordTown_Hall_MapScripts::
 	.byte 0
 
-DewfordTown_Hall_EventScript_Girl:: @ 81FD4D0
+DewfordTown_Hall_EventScript_Girl::
 	lock
 	faceplayer
 	call Common_EventScript_BufferTrendyPhrase
@@ -17,12 +17,12 @@ DewfordTown_Hall_EventScript_Girl:: @ 81FD4D0
 	release
 	end
 
-DewfordTown_Hall_EventScript_GirlBoredOfTrend:: @ 81FD4EF
+DewfordTown_Hall_EventScript_GirlBoredOfTrend::
 	msgbox DewfordTown_Hall_Text_GettingBoredOfTrend, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_EventScript_Woman:: @ 81FD4F9
+DewfordTown_Hall_EventScript_Woman::
 	lock
 	faceplayer
 	call Common_EventScript_BufferTrendyPhrase
@@ -30,7 +30,7 @@ DewfordTown_Hall_EventScript_Woman:: @ 81FD4F9
 	release
 	end
 
-DewfordTown_Hall_EventScript_Man:: @ 81FD50A
+DewfordTown_Hall_EventScript_Man::
 	lock
 	faceplayer
 	call Common_EventScript_BufferTrendyPhrase
@@ -42,17 +42,17 @@ DewfordTown_Hall_EventScript_Man:: @ 81FD50A
 	goto_if_eq DewfordTown_Hall_EventScript_RejectTrendLink
 	end
 
-DewfordTown_Hall_EventScript_ConfirmTrendLink:: @ 81FD533
+DewfordTown_Hall_EventScript_ConfirmTrendLink::
 	msgbox DewfordTown_Hall_Text_MyHunchWasRight, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_EventScript_RejectTrendLink:: @ 81FD53D
+DewfordTown_Hall_EventScript_RejectTrendLink::
 	msgbox DewfordTown_Hall_Text_NotEasyToKeepUp, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_EventScript_ExpertM:: @ 81FD547
+DewfordTown_Hall_EventScript_ExpertM::
 	lock
 	faceplayer
 	call Common_EventScript_BufferTrendyPhrase
@@ -63,7 +63,7 @@ DewfordTown_Hall_EventScript_ExpertM:: @ 81FD547
 	release
 	end
 
-DewfordTown_Hall_EventScript_Twin:: @ 81FD563
+DewfordTown_Hall_EventScript_Twin::
 	lock
 	faceplayer
 	call Common_EventScript_BufferTrendyPhrase
@@ -74,7 +74,7 @@ DewfordTown_Hall_EventScript_Twin:: @ 81FD563
 	release
 	end
 
-DewfordTown_Hall_EventScript_LittleBoy:: @ 81FD57F
+DewfordTown_Hall_EventScript_LittleBoy::
 	lock
 	faceplayer
 	call Common_EventScript_BufferTrendyPhrase
@@ -82,14 +82,14 @@ DewfordTown_Hall_EventScript_LittleBoy:: @ 81FD57F
 	release
 	end
 
-DewfordTown_Hall_EventScript_Bookshelf:: @ 81FD590
+DewfordTown_Hall_EventScript_Bookshelf::
 	lockall
 	call Common_EventScript_BufferTrendyPhrase
 	msgbox DewfordTown_Hall_Text_BooksAboutTrend, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_Painting:: @ 81FD5A0
+DewfordTown_Hall_EventScript_Painting::
 	lockall
 	call Common_EventScript_BufferTrendyPhrase
 	special GetDewfordHallPaintingNameIndex
@@ -104,39 +104,39 @@ DewfordTown_Hall_EventScript_Painting:: @ 81FD5A0
 	case 7, DewfordTown_Hall_EventScript_LastTitle
 	end
 
-DewfordTown_Hall_EventScript_ScreamTitle:: @ 81FD607
+DewfordTown_Hall_EventScript_ScreamTitle::
 	msgbox DewfordTown_Hall_Text_TrendsScream, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_SmileTitle:: @ 81FD611
+DewfordTown_Hall_EventScript_SmileTitle::
 	msgbox DewfordTown_Hall_Text_TrendsSmile, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_LastTitle:: @ 81FD61B
+DewfordTown_Hall_EventScript_LastTitle::
 	msgbox DewfordTown_Hall_Text_LastTrend, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_BirthTitle:: @ 81FD625
+DewfordTown_Hall_EventScript_BirthTitle::
 	msgbox DewfordTown_Hall_Text_BirthOfTrend, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_SchoolKidM:: @ 81FD62F
+DewfordTown_Hall_EventScript_SchoolKidM::
 	lockall
 	setvar VAR_0x8008, 0
 	goto DewfordTown_Hall_EventScript_DoTrendDebate
 	end
 
-DewfordTown_Hall_EventScript_PsychicM:: @ 81FD63B
+DewfordTown_Hall_EventScript_PsychicM::
 	lockall
 	setvar VAR_0x8008, 1
 	goto DewfordTown_Hall_EventScript_DoTrendDebate
 	end
 
-DewfordTown_Hall_EventScript_DoTrendDebate:: @ 81FD647
+DewfordTown_Hall_EventScript_DoTrendDebate::
 	call Common_EventScript_BufferTrendyPhrase
 	special GetDewfordHallPaintingNameIndex
 	switch VAR_RESULT
@@ -150,7 +150,7 @@ DewfordTown_Hall_EventScript_DoTrendDebate:: @ 81FD647
 	case 7, DewfordTown_Hall_EventScript_TrendDebate5
 	end
 
-DewfordTown_Hall_EventScript_TrendDebate1:: @ 81FD6AD
+DewfordTown_Hall_EventScript_TrendDebate1::
 	call DewfordTown_Hall_EventScript_DebateReact1
 	msgbox DewfordTown_Hall_Text_SawTrendCoolestThing, MSGBOX_DEFAULT
 	call DewfordTown_Hall_EventScript_DebateReact2
@@ -158,7 +158,7 @@ DewfordTown_Hall_EventScript_TrendDebate1:: @ 81FD6AD
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_TrendDebate2:: @ 81FD6C9
+DewfordTown_Hall_EventScript_TrendDebate2::
 	call DewfordTown_Hall_EventScript_DebateReact1
 	msgbox DewfordTown_Hall_Text_ComposedTrendThemeSong, MSGBOX_DEFAULT
 	call DewfordTown_Hall_EventScript_DebateReact2
@@ -166,7 +166,7 @@ DewfordTown_Hall_EventScript_TrendDebate2:: @ 81FD6C9
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_TrendDebate3:: @ 81FD6E5
+DewfordTown_Hall_EventScript_TrendDebate3::
 	call DewfordTown_Hall_EventScript_DebateReact1
 	msgbox DewfordTown_Hall_Text_OrganizeTrendParty, MSGBOX_DEFAULT
 	call DewfordTown_Hall_EventScript_DebateReact2
@@ -174,7 +174,7 @@ DewfordTown_Hall_EventScript_TrendDebate3:: @ 81FD6E5
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_TrendDebate4:: @ 81FD701
+DewfordTown_Hall_EventScript_TrendDebate4::
 	call DewfordTown_Hall_EventScript_DebateReact1
 	msgbox DewfordTown_Hall_Text_TrendHasBecomePartOfLife, MSGBOX_DEFAULT
 	call DewfordTown_Hall_EventScript_DebateReact2
@@ -182,7 +182,7 @@ DewfordTown_Hall_EventScript_TrendDebate4:: @ 81FD701
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_TrendDebate5:: @ 81FD71D
+DewfordTown_Hall_EventScript_TrendDebate5::
 	call DewfordTown_Hall_EventScript_DebateReact1
 	msgbox DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible, MSGBOX_DEFAULT
 	call DewfordTown_Hall_EventScript_DebateReact2
@@ -190,10 +190,10 @@ DewfordTown_Hall_EventScript_TrendDebate5:: @ 81FD71D
 	releaseall
 	end
 
-DewfordTown_Hall_EventScript_DontMovePlayer1:: @ 81FD739
+DewfordTown_Hall_EventScript_DontMovePlayer1::
 	return
 
-DewfordTown_Hall_EventScript_DebateReact1:: @ 81FD73A
+DewfordTown_Hall_EventScript_DebateReact1::
 	applymovement LOCALID_PSYCHIC_M, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft
 	waitmovement 0
 	compare VAR_0x8008, 0
@@ -202,17 +202,17 @@ DewfordTown_Hall_EventScript_DebateReact1:: @ 81FD73A
 	goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer2
 	end
 
-DewfordTown_Hall_EventScript_PlayerReactWest:: @ 81FD75B
+DewfordTown_Hall_EventScript_PlayerReactWest::
 	compare VAR_FACING, DIR_EAST
 	goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-DewfordTown_Hall_EventScript_DontMovePlayer2:: @ 81FD771
+DewfordTown_Hall_EventScript_DontMovePlayer2::
 	return
 
-DewfordTown_Hall_EventScript_DebateReact2:: @ 81FD772
+DewfordTown_Hall_EventScript_DebateReact2::
 	applymovement LOCALID_SCHOOL_KID_M, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight
 	waitmovement 0
 	compare VAR_0x8008, 0
@@ -221,39 +221,39 @@ DewfordTown_Hall_EventScript_DebateReact2:: @ 81FD772
 	goto_if_eq DewfordTown_Hall_EventScript_PlayerReactEast
 	end
 
-DewfordTown_Hall_EventScript_PlayerReactNorthSouth:: @ 81FD793
+DewfordTown_Hall_EventScript_PlayerReactNorthSouth::
 	compare VAR_FACING, DIR_NORTH
 	call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp
 	compare VAR_FACING, DIR_SOUTH
 	call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown
 	return
 
-DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp:: @ 81FD7AA
+DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown:: @ 81FD7B5
+DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-DewfordTown_Hall_EventScript_PlayerReactEast:: @ 81FD7C0
+DewfordTown_Hall_EventScript_PlayerReactEast::
 	compare VAR_FACING, DIR_WEST
 	goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft: @ 81FD7D6
+DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft:
 	walk_in_place_left
 	step_end
 
-DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight: @ 81FD7D8
+DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight:
 	walk_in_place_right
 	step_end
 
-DewfordTown_Hall_EventScript_SludgeBombMan:: @ 81FD7DA
+DewfordTown_Hall_EventScript_SludgeBombMan::
 	lock
 	faceplayer
 	call Common_EventScript_BufferTrendyPhrase
@@ -266,59 +266,59 @@ DewfordTown_Hall_EventScript_SludgeBombMan:: @ 81FD7DA
 	release
 	end
 
-DewfordTown_Hall_EventScript_ReceivedSludgeBomb:: @ 81FD80E
+DewfordTown_Hall_EventScript_ReceivedSludgeBomb::
 	msgbox DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_Hall_Text_CantImagineLifeWithoutTrend: @ 81FD818
+DewfordTown_Hall_Text_CantImagineLifeWithoutTrend:
 	.string "What's in vogue? Why, it has to be\n"
 	.string "“{STR_VAR_1}”!\p"
 	.string "I can't imagine what life would be like\n"
 	.string "without “{STR_VAR_1}”!$"
 
-DewfordTown_Hall_Text_GettingBoredOfTrend: @ 81FD877
+DewfordTown_Hall_Text_GettingBoredOfTrend:
 	.string "What's in vogue? Why, it has to be\n"
 	.string "“{STR_VAR_1}”!\p"
 	.string "But I'm getting kind of bored with it.\p"
 	.string "I should look for the next big thing.$"
 
-DewfordTown_Hall_Text_TeachingMonAboutTrend: @ 81FD8ED
+DewfordTown_Hall_Text_TeachingMonAboutTrend:
 	.string "I'm teaching my POKéMON about\n"
 	.string "“{STR_VAR_1},”\l"
 	.string "but it's not going well.\p"
 	.string "It's a bit too much, I think.$"
 
-DewfordTown_Hall_Text_DeepLinkBetweenXAndY: @ 81FD948
+DewfordTown_Hall_Text_DeepLinkBetweenXAndY:
 	.string "I'm studying up on the hip and trendy\n"
 	.string "“{STR_VAR_1}” now.\p"
 	.string "Is it true that there's a deep link\n"
 	.string "between “{STR_VAR_1}”\l"
 	.string "and “{STR_VAR_2}”?$"
 
-DewfordTown_Hall_Text_MyHunchWasRight: @ 81FD9B3
+DewfordTown_Hall_Text_MyHunchWasRight:
 	.string "Oh!\n"
 	.string "So, my hunch was right!\p"
 	.string "I'm one step closer to being hip and\n"
 	.string "happening, yowza!$"
 
-DewfordTown_Hall_Text_NotEasyToKeepUp: @ 81FDA06
+DewfordTown_Hall_Text_NotEasyToKeepUp:
 	.string "What?!\n"
 	.string "Is that so?!\p"
 	.string "It's not easy for an older fellow like\n"
 	.string "me to keep up with trends!$"
 
-DewfordTown_Hall_Text_TVShowAboutTrend: @ 81FDA5C
+DewfordTown_Hall_Text_TVShowAboutTrend:
 	.string "This whole business about\n"
 	.string "“{STR_VAR_1}”…\l"
 	.string "Isn't there a TV show on it?$"
 
-DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea: @ 81FDA99
+DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea:
 	.string "Across the sea…\p"
 	.string "Is “{STR_VAR_1}”\n"
 	.string "even more popular?$"
 
-DewfordTown_Hall_Text_CollectTrendMerchandise: @ 81FDAC4
+DewfordTown_Hall_Text_CollectTrendMerchandise:
 	.string "I collect official\n"
 	.string "“{STR_VAR_1}”\l"
 	.string "licensed merchandise.\p"
@@ -332,7 +332,7 @@ DewfordTown_Hall_Text_CollectTrendMerchandise: @ 81FDAC4
 	.string "Heheh, I own!\n"
 	.string "I'm not sharing anything with you!$"
 
-DewfordTown_Hall_Text_BooksAboutTrend: @ 81FDB89
+DewfordTown_Hall_Text_BooksAboutTrend:
 	.string "IDENTIFYING GOOD\n"
 	.string "“{STR_VAR_1}” &\l"
 	.string "BAD “{STR_VAR_1}”…\p"
@@ -344,30 +344,30 @@ DewfordTown_Hall_Text_BooksAboutTrend: @ 81FDB89
 	.string "It's neatly jammed with books about\n"
 	.string "“{STR_VAR_1}.”$"
 
-DewfordTown_Hall_Text_TrendsScream: @ 81FDC05
+DewfordTown_Hall_Text_TrendsScream:
 	.string "“{STR_VAR_1}'S\n"
 	.string "SCREAM” is the title.$"
 
-DewfordTown_Hall_Text_TrendsSmile: @ 81FDC21
+DewfordTown_Hall_Text_TrendsSmile:
 	.string "“{STR_VAR_1}'S\n"
 	.string "SMILE” is the title.$"
 
-DewfordTown_Hall_Text_LastTrend: @ 81FDC3C
+DewfordTown_Hall_Text_LastTrend:
 	.string "It's titled “THE LAST\n"
 	.string "{STR_VAR_1}”.$"
 
-DewfordTown_Hall_Text_BirthOfTrend: @ 81FDC57
+DewfordTown_Hall_Text_BirthOfTrend:
 	.string "It's titled “THE BIRTH OF\n"
 	.string "{STR_VAR_1}”.$"
 
-DewfordTown_Hall_Text_SawTrendCoolestThing: @ 81FDC76
+DewfordTown_Hall_Text_SawTrendCoolestThing:
 	.string "I saw “{STR_VAR_1}”!\n"
 	.string "Cool, huh?\p"
 	.string "It's, like, the coolest thing going!\p"
 	.string "It was awesome!\n"
 	.string "It was the real thing, oh yeah!$"
 
-DewfordTown_Hall_Text_AllegedTrendNotAuthentic: @ 81FDCE2
+DewfordTown_Hall_Text_AllegedTrendNotAuthentic:
 	.string "Oh, no, no, no.\p"
 	.string "That alleged\n"
 	.string "“{STR_VAR_1}”\l"
@@ -377,7 +377,7 @@ DewfordTown_Hall_Text_AllegedTrendNotAuthentic: @ 81FDCE2
 	.string "Sharper, yet more mellow!\p"
 	.string "Ah, no matter. It's astonishing!$"
 
-DewfordTown_Hall_Text_ComposedTrendThemeSong: @ 81FDD95
+DewfordTown_Hall_Text_ComposedTrendThemeSong:
 	.string "Hey, listen, I composed a theme song\n"
 	.string "for “{STR_VAR_1}.”\p"
 	.string "“{STR_VAR_1}”\n"
@@ -389,20 +389,20 @@ DewfordTown_Hall_Text_ComposedTrendThemeSong: @ 81FDD95
 	.string "Wonderful\n"
 	.string "{STR_VAR_1}!$"
 
-DewfordTown_Hall_Text_WorkOnYourSinging: @ 81FDE0E
+DewfordTown_Hall_Text_WorkOnYourSinging:
 	.string "… …\p"
 	.string "I dare say, chap, it would pay for you\n"
 	.string "to work on your singing before you\l"
 	.string "trifle yourself with\l"
 	.string "“{STR_VAR_1}.”$"
 
-DewfordTown_Hall_Text_OrganizeTrendParty: @ 81FDE77
+DewfordTown_Hall_Text_OrganizeTrendParty:
 	.string "Anyway, as I was saying earlier, we\n"
 	.string "should get together and organize a\l"
 	.string "“{STR_VAR_1}” party\l"
 	.string "on the island.$"
 
-DewfordTown_Hall_Text_BrilliantIndeed: @ 81FDED8
+DewfordTown_Hall_Text_BrilliantIndeed:
 	.string "Oh, a smashing good idea!\p"
 	.string "It will settle once and for all\n"
 	.string "who is the best at\l"
@@ -411,14 +411,14 @@ DewfordTown_Hall_Text_BrilliantIndeed: @ 81FDED8
 	.string "Starting today, our lives will revolve\n"
 	.string "around “{STR_VAR_1}”!$"
 
-DewfordTown_Hall_Text_TrendHasBecomePartOfLife: @ 81FDF72
+DewfordTown_Hall_Text_TrendHasBecomePartOfLife:
 	.string "I was thinking, though…\p"
 	.string "Wouldn't you agree that\n"
 	.string "“{STR_VAR_1}” has\l"
 	.string "grown from being something trendy to\l"
 	.string "being a part of our daily lives?$"
 
-DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind: @ 81FDFF1
+DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind:
 	.string "Beg pardon?\n"
 	.string "That much, what?\p"
 	.string "However, it's true that\n"
@@ -429,19 +429,19 @@ DewfordTown_Hall_Text_TrendWeighsHeavilyOnMind: @ 81FDFF1
 	.string "“{STR_VAR_1}”\l"
 	.string "PROFESSOR, old sport!$"
 
-DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible: @ 81FE09A
+DewfordTown_Hall_Text_IfWeTeamUpWellBeInvincible:
 	.string "If you and me team up as a combo,\n"
 	.string "we'll be invincible when it comes to all\l"
 	.string "things “{STR_VAR_1}”!$"
 
-DewfordTown_Hall_Text_WellBeTrendDuo: @ 81FE0F2
+DewfordTown_Hall_Text_WellBeTrendDuo:
 	.string "Spot on, my friend!\p"
 	.string "We shall be the\n"
 	.string "“{STR_VAR_1}” DUO!\p"
 	.string "Isn't that a ripe image?\n"
 	.string "Hahahah!$"
 
-DewfordTown_Hall_Text_GiveYouSludgeBomb: @ 81FE142
+DewfordTown_Hall_Text_GiveYouSludgeBomb:
 	.string "For me, SLUDGE BOMB is at the peak\n"
 	.string "of popularity. It's the one.\p"
 	.string "Hunh? You're telling me that you don't\n"
@@ -449,7 +449,7 @@ DewfordTown_Hall_Text_GiveYouSludgeBomb: @ 81FE142
 	.string "That's outright pitiful.\n"
 	.string "I'll give you one.$"
 
-DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo: @ 81FE1ED
+DewfordTown_Hall_Text_LoveSludgeBombButTrendInToo:
 	.string "I love SLUDGE BOMB.\p"
 	.string "But POKéMON with the move\n"
 	.string "“{STR_VAR_1}”\l"
diff --git a/data/maps/DewfordTown_House1/scripts.inc b/data/maps/DewfordTown_House1/scripts.inc
index 06e377057..0aba45d3c 100644
--- a/data/maps/DewfordTown_House1/scripts.inc
+++ b/data/maps/DewfordTown_House1/scripts.inc
@@ -1,15 +1,15 @@
-DewfordTown_House1_MapScripts:: @ 81FC3CD
+DewfordTown_House1_MapScripts::
 	.byte 0
 
-DewfordTown_House1_EventScript_Man:: @ 81FC3CE
+DewfordTown_House1_EventScript_Man::
 	msgbox DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland, MSGBOX_NPC
 	end
 
-DewfordTown_House1_EventScript_Woman:: @ 81FC3D7
+DewfordTown_House1_EventScript_Woman::
 	msgbox DewfordTown_House1_Text_LifeGoesSlowlyOnIsland, MSGBOX_NPC
 	end
 
-DewfordTown_House1_EventScript_Zigzagoon:: @ 81FC3E0
+DewfordTown_House1_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
@@ -19,18 +19,18 @@ DewfordTown_House1_EventScript_Zigzagoon:: @ 81FC3E0
 	release
 	end
 
-DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland: @ 81FC3F3
+DewfordTown_House1_Text_LotToBeSaidForLivingOnIsland:
 	.string "There's a lot to be said for living on\n"
 	.string "a small island like this in harmony with\l"
 	.string "POKéMON and the family.$"
 
-DewfordTown_House1_Text_LifeGoesSlowlyOnIsland: @ 81FC45B
+DewfordTown_House1_Text_LifeGoesSlowlyOnIsland:
 	.string "I left the major port of SLATEPORT\n"
 	.string "CITY when I married my husband here.\p"
 	.string "Life goes by slowly on this little\n"
 	.string "island. But being surrounded by the\l"
 	.string "beautiful sea--that's happiness, too.$"
 
-DewfordTown_House1_Text_Zigzagoon: @ 81FC510
+DewfordTown_House1_Text_Zigzagoon:
 	.string "ZIGZAGOON: Guguuh!$"
 
diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc
index 4a57cfdcf..ae173f151 100644
--- a/data/maps/DewfordTown_House2/scripts.inc
+++ b/data/maps/DewfordTown_House2/scripts.inc
@@ -1,7 +1,7 @@
-DewfordTown_House2_MapScripts:: @ 81FE22D
+DewfordTown_House2_MapScripts::
 	.byte 0
 
-DewfordTown_House2_EventScript_Man:: @ 81FE22E
+DewfordTown_House2_EventScript_Man::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_ExplainSilkScarf
@@ -13,21 +13,21 @@ DewfordTown_House2_EventScript_Man:: @ 81FE22E
 	release
 	end
 
-DewfordTown_House2_EventScript_NoRoomForScarf:: @ 81FE25D
+DewfordTown_House2_EventScript_NoRoomForScarf::
 	msgbox DewfordTown_House2_Text_NoRoom, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_House2_EventScript_ExplainSilkScarf:: @ 81FE267
+DewfordTown_House2_EventScript_ExplainSilkScarf::
 	msgbox DewfordTown_House2_Text_ExplainSilkScarf, MSGBOX_DEFAULT
 	release
 	end
 
-DewfordTown_House2_EventScript_Boy:: @ 81FE271
+DewfordTown_House2_EventScript_Boy::
 	msgbox DewfordTown_House2_Text_BrawlySoCool, MSGBOX_NPC
 	end
 
-DewfordTown_House2_Text_WantYouToHaveSilkScarf: @ 81FE27A
+DewfordTown_House2_Text_WantYouToHaveSilkScarf:
 	.string "Gorge your eyes on this!\p"
 	.string "It's a SILK SCARF. It's right at the\n"
 	.string "cutting edge of fashion, yeah!\p"
@@ -36,19 +36,19 @@ DewfordTown_House2_Text_WantYouToHaveSilkScarf: @ 81FE27A
 	.string "Oh, you're a delight!\n"
 	.string "Here you go. I want you to have it!$"
 
-DewfordTown_House2_Text_NoRoom: @ 81FE356
+DewfordTown_House2_Text_NoRoom:
 	.string "Oh, you don't have room?\p"
 	.string "Now, listen tight, this SCARF is a must-\n"
 	.string "have! Why, I would sell all my items\l"
 	.string "in order to get it!$"
 
-DewfordTown_House2_Text_ExplainSilkScarf: @ 81FE3D1
+DewfordTown_House2_Text_ExplainSilkScarf:
 	.string "The SILK SCARF raises the power of\n"
 	.string "NORMAL-type moves.\p"
 	.string "It's a marvelous SCARF that will go\n"
 	.string "with almost all POKéMON!$"
 
-DewfordTown_House2_Text_BrawlySoCool: @ 81FE444
+DewfordTown_House2_Text_BrawlySoCool:
 	.string "Wow, you bothered to cross the sea\n"
 	.string "to visit DEWFORD?\p"
 	.string "Did you maybe come here because you\n"
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index 9873c9e7a..dbd9e1c8d 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
@@ -1,16 +1,16 @@
 .set LOCALID_NURSE, 1
 
-DewfordTown_PokemonCenter_1F_MapScripts:: @ 81FC523
+DewfordTown_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, DewfordTown_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-DewfordTown_PokemonCenter_1F_OnTransition: @ 81FC52E
+DewfordTown_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_DEWFORD_TOWN
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-DewfordTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC537
+DewfordTown_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -18,21 +18,21 @@ DewfordTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC537
 	release
 	end
 
-DewfordTown_PokemonCenter_1F_EventScript_PokefanF:: @ 81FC545
+DewfordTown_PokemonCenter_1F_EventScript_PokefanF::
 	msgbox DewfordTown_PokemonCenter_1F_Text_StoneCavern, MSGBOX_NPC
 	end
 
-DewfordTown_PokemonCenter_1F_EventScript_Man:: @ 81FC54E
+DewfordTown_PokemonCenter_1F_EventScript_Man::
 	msgbox DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM, MSGBOX_NPC
 	end
 
-DewfordTown_PokemonCenter_1F_Text_StoneCavern: @ 81FC557
+DewfordTown_PokemonCenter_1F_Text_StoneCavern:
 	.string "There's a stone cavern at the edge\n"
 	.string "of town.\p"
 	.string "I've heard you can find rare stones\n"
 	.string "there.$"
 
-DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM: @ 81FC5AE
+DewfordTown_PokemonCenter_1F_Text_FaintedMonCanUseHM:
 	.string "Even if a POKéMON faints and can't\n"
 	.string "battle, it can still use a move learned\l"
 	.string "from a HIDDEN MACHINE (HM).$"
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
index df8539f0b..625edea6c 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
+DewfordTown_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ DewfordTown_PokemonCenter_2F_MapScripts:: @ 81FC615
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-DewfordTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC62A
+DewfordTown_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-DewfordTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC630
+DewfordTown_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-DewfordTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC636
+DewfordTown_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/EverGrandeCity/scripts.inc b/data/maps/EverGrandeCity/scripts.inc
index 42392c7e9..de1ad9189 100644
--- a/data/maps/EverGrandeCity/scripts.inc
+++ b/data/maps/EverGrandeCity/scripts.inc
@@ -1,36 +1,36 @@
-EverGrandeCity_MapScripts:: @ 81E7D1B
+EverGrandeCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_OnTransition
 	.byte 0
 
-EverGrandeCity_OnTransition: @ 81E7D21
+EverGrandeCity_OnTransition:
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 
-EverGrandeCity_EventScript_VictoryRoadSign:: @ 81E7D2B
+EverGrandeCity_EventScript_VictoryRoadSign::
 	msgbox EverGrandeCity_Text_EnteringVictoryRoad, MSGBOX_SIGN
 	end
 
-EverGrandeCity_EventScript_CitySign:: @ 81E7D34
+EverGrandeCity_EventScript_CitySign::
 	msgbox EverGrandeCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-EverGrandeCity_EventScript_PokemonLeagueSign:: @ 81E7D3D
+EverGrandeCity_EventScript_PokemonLeagueSign::
 	msgbox EverGrandeCity_Text_EnteringPokemonLeague, MSGBOX_SIGN
 	end
 
-EverGrandeCity_EventScript_SetVisitedEverGrande:: @ 81E7D46
+EverGrandeCity_EventScript_SetVisitedEverGrande::
 	setflag FLAG_VISITED_EVER_GRANDE_CITY
 	setvar VAR_TEMP_1, 1
 	end
 
-EverGrandeCity_Text_EnteringVictoryRoad: @ 81E7D4F
+EverGrandeCity_Text_EnteringVictoryRoad:
 	.string "ENTERING VICTORY ROAD$"
 
-EverGrandeCity_Text_EnteringPokemonLeague: @ 81E7D65
+EverGrandeCity_Text_EnteringPokemonLeague:
 	.string "ENTERING POKéMON LEAGUE\n"
 	.string "CENTER GATE$"
 
-EverGrandeCity_Text_CitySign: @ 81E7D89
+EverGrandeCity_Text_CitySign:
 	.string "EVER GRANDE CITY\p"
 	.string "“The paradise of flowers, the sea,\n"
 	.string "and POKéMON.”$"
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index 7b75c8752..dc2bb4d72 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -2,29 +2,29 @@
 .set LOCALID_RIVAL, 2
 .set LOCALID_BIRCH, 3
 
-EverGrandeCity_ChampionsRoom_MapScripts:: @ 82289EF
+EverGrandeCity_ChampionsRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_ChampionsRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_ChampionsRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_ChampionsRoom_OnFrame
 	.byte 0
 
-EverGrandeCity_ChampionsRoom_OnTransition: @ 82289FF
+EverGrandeCity_ChampionsRoom_OnTransition:
 	call Common_EventScript_SetupRivalGfxId
 	end
 
-EverGrandeCity_ChampionsRoom_OnWarp: @ 8228A05
+EverGrandeCity_ChampionsRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth:: @ 8228A0F
+EverGrandeCity_ChampionsRoom_EventScript_PlayerTurnNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_ChampionsRoom_OnFrame: @ 8228A14
+EverGrandeCity_ChampionsRoom_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_EnterRoom
 	.2byte 0
 
-EverGrandeCity_ChampionsRoom_EventScript_EnterRoom:: @ 8228A1E
+EverGrandeCity_ChampionsRoom_EventScript_EnterRoom::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp4
 	waitmovement 0
@@ -36,19 +36,19 @@ EverGrandeCity_ChampionsRoom_EventScript_EnterRoom:: @ 8228A1E
     releaseall
     end
 
-EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: @ 8228A42
+EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace:
 	walk_up
 	walk_up
 	step_end
 
-EverGrandeCity_ChampionsRoom_EventScript_Wallace:: @ 8228A45
+EverGrandeCity_ChampionsRoom_EventScript_Wallace::
 	playbgm MUS_ENCOUNTER_CHAMPION, FALSE
 	msgbox EverGrandeCity_ChampionsRoom_Text_IntroSpeech, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_WALLACE, EverGrandeCity_ChampionsRoom_Text_Defeat
 	goto EverGrandeCity_ChampionsRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 8228A61
+EverGrandeCity_ChampionsRoom_EventScript_Defeated::
 	playse SE_DOOR
 	setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0
 	setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0
@@ -70,15 +70,15 @@ EverGrandeCity_ChampionsRoom_EventScript_Defeated:: @ 8228A61
 	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic:: @ 8228ABC
+EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic::
 	playbgm MUS_ENCOUNTER_MAY, FALSE
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic:: @ 8228AC1
+EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic::
 	playbgm MUS_ENCOUNTER_BRENDAN, FALSE
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 8228AC6
+EverGrandeCity_ChampionsRoom_EventScript_MayAdvice::
 	msgbox EverGrandeCity_ChampionsRoom_Text_MayAdvice, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
@@ -91,7 +91,7 @@ EverGrandeCity_ChampionsRoom_EventScript_MayAdvice:: @ 8228AC6
 	goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: @ 8228AFB
+EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice::
 	msgbox EverGrandeCity_ChampionsRoom_Text_BrendanAdvice, MSGBOX_DEFAULT
 	delay 40
 	playse SE_PIN
@@ -104,7 +104,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice:: @ 8228AFB
 	goto EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30
+EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF::
 	closemessage
 	addobject LOCALID_BIRCH
 	applymovement LOCALID_BIRCH, EverGrandeCity_ChampionsRoom_Movement_BirchArrives
@@ -146,32 +146,32 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30
 	releaseall
 	end
 
-EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations:: @ 8228BEB
+EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations::
 	msgbox EverGrandeCity_ChampionsRoom_Text_MayCongratulations, MSGBOX_DEFAULT
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: @ 8228BF4
+EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations::
 	msgbox EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations, MSGBOX_DEFAULT
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 8228BFD
+EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer::
 	applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth:: @ 8228C12
+EverGrandeCity_ChampionsRoom_EventScript_RivalLookBackAndForth::
 	applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth
 	waitmovement 0
 	return
 
-EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart: @ 8228C1D
+EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart:
 	walk_up
 	walk_up
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_PlayerExit: @ 8228C20
+EverGrandeCity_ChampionsRoom_Movement_PlayerExit:
 	walk_up
 	delay_16
 	walk_up
@@ -179,7 +179,7 @@ EverGrandeCity_ChampionsRoom_Movement_PlayerExit: @ 8228C20
 	set_invisible
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer: @ 8228C26
+EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer:
 	walk_up
 	walk_up
 	walk_up
@@ -190,7 +190,7 @@ EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer: @ 8228C26
 	walk_in_place_fastest_right
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth: @ 8228C2F
+EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth:
 	walk_in_place_fastest_up
 	delay_16
 	walk_in_place_fastest_right
@@ -201,24 +201,24 @@ EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth: @ 8228C2F
 	delay_16
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_RivalFollows: @ 8228C38
+EverGrandeCity_ChampionsRoom_Movement_RivalFollows:
 	walk_right
 	walk_up
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart: @ 8228C3B
+EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart:
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_WallaceExit: @ 8228C3F
+EverGrandeCity_ChampionsRoom_Movement_WallaceExit:
 	walk_up
 	delay_8
 	set_invisible
 	step_end
 
-EverGrandeCity_ChampionsRoom_Movement_BirchArrives: @ 8228C43
+EverGrandeCity_ChampionsRoom_Movement_BirchArrives:
 	walk_up
 	walk_up
 	walk_up
@@ -229,7 +229,7 @@ EverGrandeCity_ChampionsRoom_Movement_BirchArrives: @ 8228C43
 	walk_in_place_fastest_left
 	step_end
 
-EverGrandeCity_ChampionsRoom_Text_IntroSpeech: @ 8228C4C
+EverGrandeCity_ChampionsRoom_Text_IntroSpeech:
 	.string "WALLACE: Welcome, {PLAYER}{KUN}.\p"
 	.string "That incident in SOOTOPOLIS CITY…\n"
 	.string "That was superb work, putting an end\l"
@@ -252,7 +252,7 @@ EverGrandeCity_ChampionsRoom_Text_IntroSpeech: @ 8228C4C
 	.string "their POKéMON in HOENN?\p"
 	.string "Show me right here and now!$"
 
-EverGrandeCity_ChampionsRoom_Text_Defeat: @ 8228EAC
+EverGrandeCity_ChampionsRoom_Text_Defeat:
 	.string "I, the CHAMPION, fall in defeat…\p"
 	.string "That was wonderful work.\n"
 	.string "You were elegant, infuriatingly so.\l"
@@ -261,7 +261,7 @@ EverGrandeCity_ChampionsRoom_Text_Defeat: @ 8228EAC
 	.string "You are a truly noble POKéMON\n"
 	.string "TRAINER!$"
 
-EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech: @ 8228F66
+EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech:
 	.string "WALLACE: The POKéMON you sent into\n"
 	.string "battle…\p"
 	.string "At times they danced like a spring\n"
@@ -276,29 +276,29 @@ EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech: @ 8228F66
 	.string "I now proclaim you to be the new\n"
 	.string "HOENN region…$"
 
-EverGrandeCity_ChampionsRoom_Text_MayAdvice: @ 82290CA
+EverGrandeCity_ChampionsRoom_Text_MayAdvice:
 	.string "MAY: {PLAYER}{KUN}!\p"
 	.string "Here's some advice before you challenge\n"
 	.string "the CHAMPION…$"
 
-EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver: @ 822910B
+EverGrandeCity_ChampionsRoom_Text_MayItsAlreadyOver:
 	.string "MAY: Huh?\n"
 	.string "What, what, what?\p"
 	.string "{PLAYER}{KUN}…\n"
 	.string "Could it be that…\l"
 	.string "It's already over?$"
 
-EverGrandeCity_ChampionsRoom_Text_BrendanAdvice: @ 8229152
+EverGrandeCity_ChampionsRoom_Text_BrendanAdvice:
 	.string "BRENDAN: {PLAYER}!\p"
 	.string "How would you like some advice before\n"
 	.string "you challenge the CHAMPION?…$"
 
-EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon: @ 82291A2
+EverGrandeCity_ChampionsRoom_Text_BrendanYouveWon:
 	.string "BRENDAN: {PLAYER}…\p"
 	.string "Are you trying to tell me…\n"
 	.string "You've beaten the CHAMPION?$"
 
-EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex: @ 82291E6
+EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex:
 	.string "PROF. BIRCH: See?\n"
 	.string "What did I tell you, {RIVAL}?\p"
 	.string "Didn't I tell you that you don't need\n"
@@ -314,25 +314,25 @@ EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex: @ 82291E6
 	.string "What became of your POKéDEX?\n"
 	.string "Here, let me see.$"
 
-EverGrandeCity_ChampionsRoom_Text_BirchCongratulations: @ 822934D
+EverGrandeCity_ChampionsRoom_Text_BirchCongratulations:
 	.string "PROF. BIRCH: Anyways,\n"
 	.string "congratulations!\p"
 	.string "Now, go proudly into the final room!$"
 
-EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe: @ 8229399
+EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe:
 	.string "WALLACE: {PLAYER}{KUN}…\p"
 	.string "No, let me rephrase that properly.\p"
 	.string "The new CHAMPION!\p"
 	.string "Come with me.$"
 
-EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside: @ 82293EB
+EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside:
 	.string "WALLACE: I'm sorry, but…\p"
 	.string "From here on, only those TRAINERS who\n"
 	.string "have become CHAMPIONS may enter.\p"
 	.string "You'll have to wait outside with\n"
 	.string "PROF. BIRCH.$"
 
-EverGrandeCity_ChampionsRoom_Text_MayCongratulations: @ 8229479
+EverGrandeCity_ChampionsRoom_Text_MayCongratulations:
 	.string "MAY: Groan…\p"
 	.string "… … … … … … … …\n"
 	.string "… … … … … … … …\p"
@@ -341,7 +341,7 @@ EverGrandeCity_ChampionsRoom_Text_MayCongratulations: @ 8229479
 	.string "{PLAYER}{KUN}!\n"
 	.string "Honestly, congratulations!$"
 
-EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations: @ 82294F5
+EverGrandeCity_ChampionsRoom_Text_BrendanCongratulations:
 	.string "BRENDAN: Whaaaat?! … … … … …\n"
 	.string "… … … … … … … …\p"
 	.string "It can't be helped if that's the rule.\p"
diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
index 38762277f..75b16e775 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -1,44 +1,44 @@
-EverGrandeCity_DrakesRoom_MapScripts:: @ 822869C
+EverGrandeCity_DrakesRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_DrakesRoom_OnFrame
 	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_DrakesRoom_OnLoad
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp
 	.byte 0
 
 @ Unused, Drake uses Sidneys identical OnWarp for some reason
-EverGrandeCity_DrakesRoom_OnWarp: @ 82286AC
+EverGrandeCity_DrakesRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth:: @ 82286B6
+EverGrandeCity_DrakesRoom_EventScript_PlayerTurnNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_DrakesRoom_OnFrame: @ 82286BB
+EverGrandeCity_DrakesRoom_OnFrame:
 	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor:: @ 82286C5
+EverGrandeCity_DrakesRoom_EventScript_WalkInCloseDoor::
 	lockall
 	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 4
 	releaseall
 	end
 
-EverGrandeCity_DrakesRoom_OnLoad: @ 82286D2
+EverGrandeCity_DrakesRoom_OnLoad:
 	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 4
 	call_if_eq EverGrandeCity_DrakesRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom:: @ 82286E7
+EverGrandeCity_DrakesRoom_EventScript_ResetAdvanceToNextRoom::
 	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_DrakesRoom_EventScript_CloseDoor:: @ 82286ED
+EverGrandeCity_DrakesRoom_EventScript_CloseDoor::
 	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3
+EverGrandeCity_DrakesRoom_EventScript_Drake::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech
@@ -48,12 +48,12 @@ EverGrandeCity_DrakesRoom_EventScript_Drake:: @ 82286F3
 	goto EverGrandeCity_DrakesRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech:: @ 822871A
+EverGrandeCity_DrakesRoom_EventScript_PostBattleSpeech::
 	msgbox EverGrandeCity_DrakesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_DrakesRoom_EventScript_Defeated:: @ 8228724
+EverGrandeCity_DrakesRoom_EventScript_Defeated::
 	setvar VAR_0x8004, FANCOUNTER_DEFEATED_DRAKE
 	special Script_TryGainNewFanFromCounter
 	setflag FLAG_DEFEATED_ELITE_4_DRAKE
@@ -62,7 +62,7 @@ EverGrandeCity_DrakesRoom_EventScript_Defeated:: @ 8228724
 	release
 	end
 
-EverGrandeCity_DrakesRoom_Text_IntroSpeech: @ 822873E
+EverGrandeCity_DrakesRoom_Text_IntroSpeech:
 	.string "I am the last of the POKéMON LEAGUE\n"
 	.string "ELITE FOUR, DRAKE the DRAGON master!\p"
 	.string "In their natural state, POKéMON are\n"
@@ -75,10 +75,10 @@ EverGrandeCity_DrakesRoom_Text_IntroSpeech: @ 822873E
 	.string "If you don't, then you will never\n"
 	.string "prevail over me!$"
 
-EverGrandeCity_DrakesRoom_Text_Defeat: @ 8228895
+EverGrandeCity_DrakesRoom_Text_Defeat:
 	.string "Superb, it should be said.$"
 
-EverGrandeCity_DrakesRoom_Text_PostBattleSpeech: @ 82288B0
+EverGrandeCity_DrakesRoom_Text_PostBattleSpeech:
 	.string "You deserve every credit for coming\n"
 	.string "this far as a TRAINER of POKéMON.\p"
 	.string "You do seem to know what is needed.\p"
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
index 3529b746c..59f4440c4 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
@@ -1,43 +1,43 @@
-EverGrandeCity_GlaciasRoom_MapScripts:: @ 8228412
+EverGrandeCity_GlaciasRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_GlaciasRoom_OnFrame
 	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_GlaciasRoom_OnLoad
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_GlaciasRoom_OnWarp
 	.byte 0
 
-EverGrandeCity_GlaciasRoom_OnWarp: @ 8228422
+EverGrandeCity_GlaciasRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth:: @ 822842C
+EverGrandeCity_GlaciasRoom_EventScript_PlayerTurnNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_GlaciasRoom_OnFrame: @ 8228431
+EverGrandeCity_GlaciasRoom_OnFrame:
 	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor:: @ 822843B
+EverGrandeCity_GlaciasRoom_EventScript_WalkInCloseDoor::
 	lockall
 	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 3
 	releaseall
 	end
 
-EverGrandeCity_GlaciasRoom_OnLoad: @ 8228448
+EverGrandeCity_GlaciasRoom_OnLoad:
 	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 3
 	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom:: @ 822845D
+EverGrandeCity_GlaciasRoom_EventScript_ResetAdvanceToNextRoom::
 	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_GlaciasRoom_EventScript_CloseDoor:: @ 8228463
+EverGrandeCity_GlaciasRoom_EventScript_CloseDoor::
 	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469
+EverGrandeCity_GlaciasRoom_EventScript_Glacia::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech
@@ -47,19 +47,19 @@ EverGrandeCity_GlaciasRoom_EventScript_Glacia:: @ 8228469
 	goto EverGrandeCity_GlaciasRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech:: @ 8228490
+EverGrandeCity_GlaciasRoom_EventScript_PostBattleSpeech::
 	msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_GlaciasRoom_EventScript_Defeated:: @ 822849A
+EverGrandeCity_GlaciasRoom_EventScript_Defeated::
 	setflag FLAG_DEFEATED_ELITE_4_GLACIA
 	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_GlaciasRoom_Text_IntroSpeech: @ 82284AC
+EverGrandeCity_GlaciasRoom_Text_IntroSpeech:
 	.string "Welcome, my name is GLACIA\n"
 	.string "of the ELITE FOUR.\p"
 	.string "I've traveled from afar to HOENN\n"
@@ -70,14 +70,14 @@ EverGrandeCity_GlaciasRoom_Text_IntroSpeech: @ 82284AC
 	.string "It would please me to no end if I could\n"
 	.string "go all out against you!$"
 
-EverGrandeCity_GlaciasRoom_Text_Defeat: @ 82285B4
+EverGrandeCity_GlaciasRoom_Text_Defeat:
 	.string "You and your POKéMON…\n"
 	.string "How hot your spirits burn!\p"
 	.string "The all-consuming heat overwhelms.\p"
 	.string "It's no surprise that my icy skills\n"
 	.string "failed to harm you.$"
 
-EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech: @ 8228640
+EverGrandeCity_GlaciasRoom_Text_PostBattleSpeech:
 	.string "Advance to the next room.\p"
 	.string "And there, confirm the truly fearsome\n"
 	.string "side of the POKéMON LEAGUE.$"
diff --git a/data/maps/EverGrandeCity_Hall1/scripts.inc b/data/maps/EverGrandeCity_Hall1/scripts.inc
index cf68eb8c7..0d4b524c8 100644
--- a/data/maps/EverGrandeCity_Hall1/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall1/scripts.inc
@@ -1,12 +1,12 @@
-EverGrandeCity_Hall1_MapScripts:: @ 8229569
+EverGrandeCity_Hall1_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall1_OnWarp
 	.byte 0
 
-EverGrandeCity_Hall1_OnWarp: @ 822956F
+EverGrandeCity_Hall1_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall1_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_Hall1_EventScript_TurnPlayerNorth:: @ 8229579
+EverGrandeCity_Hall1_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
diff --git a/data/maps/EverGrandeCity_Hall2/scripts.inc b/data/maps/EverGrandeCity_Hall2/scripts.inc
index d8702657f..b81df8b40 100644
--- a/data/maps/EverGrandeCity_Hall2/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall2/scripts.inc
@@ -1,12 +1,12 @@
-EverGrandeCity_Hall2_MapScripts:: @ 822957E
+EverGrandeCity_Hall2_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall2_OnWarp
 	.byte 0
 
-EverGrandeCity_Hall2_OnWarp: @ 8229584
+EverGrandeCity_Hall2_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall2_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_Hall2_EventScript_TurnPlayerNorth:: @ 822958E
+EverGrandeCity_Hall2_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
diff --git a/data/maps/EverGrandeCity_Hall3/scripts.inc b/data/maps/EverGrandeCity_Hall3/scripts.inc
index 65dc3c44c..4f9245f64 100644
--- a/data/maps/EverGrandeCity_Hall3/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall3/scripts.inc
@@ -1,12 +1,12 @@
-EverGrandeCity_Hall3_MapScripts:: @ 8229593
+EverGrandeCity_Hall3_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall3_OnWarp
 	.byte 0
 
-EverGrandeCity_Hall3_OnWarp: @ 8229599
+EverGrandeCity_Hall3_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall3_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_Hall3_EventScript_TurnPlayerNorth:: @ 82295A3
+EverGrandeCity_Hall3_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
diff --git a/data/maps/EverGrandeCity_Hall4/scripts.inc b/data/maps/EverGrandeCity_Hall4/scripts.inc
index e75d12483..3d9ab4603 100644
--- a/data/maps/EverGrandeCity_Hall4/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall4/scripts.inc
@@ -1,12 +1,12 @@
-EverGrandeCity_Hall4_MapScripts:: @ 82295A8
+EverGrandeCity_Hall4_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall4_OnWarp
 	.byte 0
 
-EverGrandeCity_Hall4_OnWarp: @ 82295AE
+EverGrandeCity_Hall4_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall4_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_Hall4_EventScript_TurnPlayerNorth:: @ 82295B8
+EverGrandeCity_Hall4_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
diff --git a/data/maps/EverGrandeCity_Hall5/scripts.inc b/data/maps/EverGrandeCity_Hall5/scripts.inc
index b8eaed7b9..9781d114f 100644
--- a/data/maps/EverGrandeCity_Hall5/scripts.inc
+++ b/data/maps/EverGrandeCity_Hall5/scripts.inc
@@ -1,12 +1,12 @@
-EverGrandeCity_Hall5_MapScripts:: @ 82295BD
+EverGrandeCity_Hall5_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_Hall5_OnWarp
 	.byte 0
 
-EverGrandeCity_Hall5_OnWarp: @ 82295C3
+EverGrandeCity_Hall5_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Hall5_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_Hall5_EventScript_TurnPlayerNorth:: @ 82295CD
+EverGrandeCity_Hall5_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index c6281a684..f5e415565 100644
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -1,23 +1,23 @@
 .set LOCALID_WALLACE, 1
 
-EverGrandeCity_HallOfFame_MapScripts:: @ 822982C
+EverGrandeCity_HallOfFame_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_HallOfFame_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_HallOfFame_OnWarp
 	.byte 0
 
-EverGrandeCity_HallOfFame_OnWarp: @ 8229837
+EverGrandeCity_HallOfFame_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth
 	.2byte 0
 
-EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth:: @ 8229841
+EverGrandeCity_HallOfFame_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_HallOfFame_OnFrame: @ 8229846
+EverGrandeCity_HallOfFame_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame
 	.2byte 0
 
-EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850
+EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame::
 	lockall
 	applymovement LOCALID_WALLACE, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1
 	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1
@@ -52,7 +52,7 @@ EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame:: @ 8229850
 	goto_if_eq EverGrandeCity_HallOfFame_EventScript_GameClearFemale
 	end
 
-EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9
+EverGrandeCity_HallOfFame_EventScript_GameClearMale::
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
 	fadescreenspeed FADE_TO_BLACK, 24
 	special GameClear
@@ -60,7 +60,7 @@ EverGrandeCity_HallOfFame_EventScript_GameClearMale:: @ 82298E9
 	releaseall
 	end
 
-EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 82298F5
+EverGrandeCity_HallOfFame_EventScript_GameClearFemale::
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
 	fadescreenspeed FADE_TO_BLACK, 24
 	special GameClear
@@ -68,7 +68,7 @@ EverGrandeCity_HallOfFame_EventScript_GameClearFemale:: @ 82298F5
 	releaseall
 	end
 
-EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1: @ 8229901
+EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1:
 	walk_up
 	walk_up
 	walk_up
@@ -77,7 +77,7 @@ EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1: @ 8229901
 	walk_up
 	step_end
 
-EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2: @ 8229908
+EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2:
 	walk_up
 	walk_up
 	walk_up
@@ -85,7 +85,7 @@ EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2: @ 8229908
 	walk_up
 	step_end
 
-EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions: @ 822990E
+EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions:
 	.string "WALLACE: This room…\p"
 	.string "This is where we keep records of\n"
 	.string "POKéMON that prevailed through\l"
@@ -93,7 +93,7 @@ EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions: @ 822990E
 	.string "It is here that the LEAGUE CHAMPIONS\n"
 	.string "are honored.$"
 
-EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames: @ 82299A3
+EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames:
 	.string "WALLACE: Come on, let's record your\n"
 	.string "name as a TRAINER who triumphed over\l"
 	.string "the POKéMON LEAGUE, and the names of\l"
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
index c922ffe7a..b64f5145a 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
@@ -1,43 +1,43 @@
-EverGrandeCity_PhoebesRoom_MapScripts:: @ 8228174
+EverGrandeCity_PhoebesRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_PhoebesRoom_OnLoad
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_PhoebesRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_PhoebesRoom_OnFrame
 	.byte 0
 
-EverGrandeCity_PhoebesRoom_OnWarp: @ 8228184
+EverGrandeCity_PhoebesRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth:: @ 822818E
+EverGrandeCity_PhoebesRoom_EventScript_PlayerTurnNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_PhoebesRoom_OnFrame: @ 8228193
+EverGrandeCity_PhoebesRoom_OnFrame:
 	map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor:: @ 822819D
+EverGrandeCity_PhoebesRoom_EventScript_WalkInCloseDoor::
 	lockall
 	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 2
 	releaseall
 	end
 
-EverGrandeCity_PhoebesRoom_OnLoad: @ 82281AA
+EverGrandeCity_PhoebesRoom_OnLoad:
 	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 2
 	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom:: @ 82281BF
+EverGrandeCity_PhoebesRoom_EventScript_ResetAdvanceToNextRoom::
 	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_PhoebesRoom_EventScript_CloseDoor:: @ 82281C5
+EverGrandeCity_PhoebesRoom_EventScript_CloseDoor::
 	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB
+EverGrandeCity_PhoebesRoom_EventScript_Phoebe::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech
@@ -47,19 +47,19 @@ EverGrandeCity_PhoebesRoom_EventScript_Phoebe:: @ 82281CB
 	goto EverGrandeCity_PhoebesRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech:: @ 82281F2
+EverGrandeCity_PhoebesRoom_EventScript_PostBattleSpeech::
 	msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_PhoebesRoom_EventScript_Defeated:: @ 82281FC
+EverGrandeCity_PhoebesRoom_EventScript_Defeated::
 	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_PhoebesRoom_Text_IntroSpeech: @ 822820E
+EverGrandeCity_PhoebesRoom_Text_IntroSpeech:
 	.string "Ahahaha!\p"
 	.string "I'm PHOEBE of the ELITE FOUR.\n"
 	.string "I did my training on MT. PYRE.\p"
@@ -70,11 +70,11 @@ EverGrandeCity_PhoebesRoom_Text_IntroSpeech: @ 822820E
 	.string "So, come on, just try and see if you can\n"
 	.string "even inflict damage on my POKéMON!$"
 
-EverGrandeCity_PhoebesRoom_Text_Defeat: @ 8228325
+EverGrandeCity_PhoebesRoom_Text_Defeat:
 	.string "Oh, darn.\n"
 	.string "I've gone and lost.$"
 
-EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech: @ 8228343
+EverGrandeCity_PhoebesRoom_Text_PostBattleSpeech:
 	.string "There's a definite bond between you\n"
 	.string "and your POKéMON, too.\p"
 	.string "I didn't recognize it, so it's only\n"
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index a6cf1b74e..1244b82fd 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -1,22 +1,22 @@
 .set LOCALID_NURSE, 1
 .set LOCALID_SCOTT, 4
 
-EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34
+EverGrandeCity_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-EverGrandeCity_PokemonCenter_1F_OnTransition: @ 8229A3F
+EverGrandeCity_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY
 	call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott:: @ 8229A4C
+EverGrandeCity_PokemonCenter_1F_EventScript_TryShowScott::
 	goto_if_unset FLAG_BADGE06_GET, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	return
 
-EverGrandeCity_PokemonCenter_1F_EventScript_Nurse:: @ 8229A59
+EverGrandeCity_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -24,15 +24,15 @@ EverGrandeCity_PokemonCenter_1F_EventScript_Nurse:: @ 8229A59
 	release
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_Woman:: @ 8229A67
+EverGrandeCity_PokemonCenter_1F_EventScript_Woman::
 	msgbox EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad, MSGBOX_NPC
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_ExpertM:: @ 8229A70
+EverGrandeCity_PokemonCenter_1F_EventScript_ExpertM::
 	msgbox EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon, MSGBOX_NPC
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: @ 8229A79
+EverGrandeCity_PokemonCenter_1F_EventScript_Scott::
 	lock
 	faceplayer
 	msgbox EverGrandeCity_PokemonCenter_1F_Text_ScottHappyForYou, MSGBOX_DEFAULT
@@ -51,17 +51,17 @@ EverGrandeCity_PokemonCenter_1F_EventScript_Scott:: @ 8229A79
 	release
 	end
 
-EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth:: @ 8229AB6
+EverGrandeCity_PokemonCenter_1F_EventScript_ScottExitNorth::
 	applymovement LOCALID_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit:: @ 8229AC1
+EverGrandeCity_PokemonCenter_1F_EventScript_ScottExit::
 	applymovement LOCALID_SCOTT, EverGrandeCity_PokemonCenter_1F_Movement_ScottExit
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth: @ 8229ACC
+EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth:
 	walk_left
 	walk_down
 	walk_down
@@ -70,7 +70,7 @@ EverGrandeCity_PokemonCenter_1F_Movement_ScottExitNorth: @ 8229ACC
 	walk_down
 	step_end
 
-EverGrandeCity_PokemonCenter_1F_Movement_ScottExit: @ 8229AD3
+EverGrandeCity_PokemonCenter_1F_Movement_ScottExit:
 	walk_down
 	walk_down
 	walk_left
@@ -79,20 +79,20 @@ EverGrandeCity_PokemonCenter_1F_Movement_ScottExit: @ 8229AD3
 	walk_down
 	step_end
 
-EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad: @ 8229ADA
+EverGrandeCity_PokemonCenter_1F_Text_LeagueAfterVictoryRoad:
 	.string "The POKéMON LEAGUE is only a short\n"
 	.string "distance after the VICTORY ROAD.\p"
 	.string "If you've come this far, what choice\n"
 	.string "do you have but to keep going?$"
 
-EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon: @ 8229B62
+EverGrandeCity_PokemonCenter_1F_Text_BelieveInYourPokemon:
 	.string "The long and harrowing VICTORY ROAD…\p"
 	.string "It's like reliving the path one has\n"
 	.string "traveled in life…\p"
 	.string "Believe in your POKéMON and give it\n"
 	.string "your very best!$"
 
-EverGrandeCity_PokemonCenter_1F_Text_ScottHappyForYou: @ 8229BF1
+EverGrandeCity_PokemonCenter_1F_Text_ScottHappyForYou:
 	.string "SCOTT: {PLAYER}{KUN}, you've clawed your\n"
 	.string "way up to face the POKéMON LEAGUE!\p"
 	.string "I'm happy for you!\n"
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
index f52419d60..0c8c93d73 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
+EverGrandeCity_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ EverGrandeCity_PokemonCenter_2F_MapScripts:: @ 8229CE0
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-EverGrandeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8229CF5
+EverGrandeCity_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-EverGrandeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8229CFB
+EverGrandeCity_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-EverGrandeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8229D01
+EverGrandeCity_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
index 5eed4faa6..1be2e7c1f 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
@@ -2,23 +2,23 @@
 .set LOCALID_GUARD_1, 3
 .set LOCALID_GUARD_2, 4
 
-EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2
+EverGrandeCity_PokemonLeague_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_PokemonLeague_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-EverGrandeCity_PokemonLeague_1F_OnTransition: @ 82295DD
+EverGrandeCity_PokemonLeague_1F_OnTransition:
 	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_POKEMON_LEAGUE
 	setflag FLAG_LANDMARK_POKEMON_LEAGUE
 	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor:: @ 82295ED
+EverGrandeCity_PokemonLeague_1F_EventScript_GuardsBlockDoor::
 	setobjectxyperm LOCALID_GUARD_1, 9, 2
 	setobjectxyperm LOCALID_GUARD_2, 10, 2
 	return
 
-EverGrandeCity_PokemonLeague_1F_EventScript_Nurse:: @ 82295FC
+EverGrandeCity_PokemonLeague_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -26,7 +26,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_Nurse:: @ 82295FC
 	release
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_Clerk:: @ 822960A
+EverGrandeCity_PokemonLeague_1F_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -37,7 +37,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_Clerk:: @ 822960A
 	end
 
 	.align 2
-EverGrandeCity_PokemonLeague_1F_Pokemart: @ 8229624
+EverGrandeCity_PokemonLeague_1F_Pokemart:
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
@@ -51,7 +51,7 @@ EverGrandeCity_PokemonLeague_1F_Pokemart: @ 8229624
 
 @ The door guards only check for FLAG_BADGE06_GET because Winonas badge is the only one that can be skipped
 @ Its assumed the player has the remaining badges
-EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 8229636
+EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard::
 	lockall
 	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_GoForth
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
@@ -79,23 +79,23 @@ EverGrandeCity_PokemonLeague_1F_EventScript_DoorGuard:: @ 8229636
 	releaseall
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight:: @ 8229698
+EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromRight::
 	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft:: @ 82296A3
+EverGrandeCity_PokemonLeague_1F_EventScript_PlayerMoveToFrontFromLeft::
 	applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft
 	waitmovement 0
 	return
 
-EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges:: @ 82296AE
+EverGrandeCity_PokemonLeague_1F_EventScript_NotAllBadges::
 	playse SE_FAILURE
 	msgbox EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EverGrandeCity_PokemonLeague_1F_EventScript_GoForth:: @ 82296BB
+EverGrandeCity_PokemonLeague_1F_EventScript_GoForth::
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox EverGrandeCity_PokemonLeague_1F_Text_GoForth, MSGBOX_DEFAULT
@@ -105,41 +105,41 @@ EverGrandeCity_PokemonLeague_1F_EventScript_GoForth:: @ 82296BB
 	releaseall
 	end
 
-EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight: @ 82296DA
+EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight:
 	walk_down
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft: @ 82296DE
+EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft:
 	walk_down
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay: @ 82296E2
+EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay:
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay: @ 82296E5
+EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay:
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges: @ 82296E8
+EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges:
 	.string "Beyond this point, only those TRAINERS\n"
 	.string "who have collected all the GYM BADGES\l"
 	.string "are permitted to enter.\p"
 	.string "TRAINER, let us confirm that you have\n"
 	.string "all the GYM BADGES.$"
 
-EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges: @ 8229787
+EverGrandeCity_PokemonLeague_1F_Text_HaventObtainedAllBadges:
 	.string "You haven't obtained all the BADGES.\p"
 	.string "If you're bound for the POKéMON\n"
 	.string "LEAGUE, you must return with them.$"
 
-EverGrandeCity_PokemonLeague_1F_Text_GoForth: @ 82297EF
+EverGrandeCity_PokemonLeague_1F_Text_GoForth:
 	.string "TRAINER! Believe in yourself and your\n"
 	.string "POKéMON, and go forth!$"
 
diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
index b860f95b8..0ba84df34 100644
--- a/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague_2F/scripts.inc
@@ -1,4 +1,4 @@
-EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
+EverGrandeCity_PokemonLeague_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ EverGrandeCity_PokemonLeague_2F_MapScripts:: @ 8229D07
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-EverGrandeCity_PokemonLeague_2F_EventScript_Colosseum:: @ 8229D1C
+EverGrandeCity_PokemonLeague_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-EverGrandeCity_PokemonLeague_2F_EventScript_TradeCenter:: @ 8229D22
+EverGrandeCity_PokemonLeague_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-EverGrandeCity_PokemonLeague_2F_EventScript_RecordCorner:: @ 8229D28
+EverGrandeCity_PokemonLeague_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
index 4cd8f262e..3444d078b 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -1,49 +1,49 @@
-EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01
+EverGrandeCity_SidneysRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, EverGrandeCity_SidneysRoom_OnLoad
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, EverGrandeCity_SidneysRoom_OnWarp
 	map_script MAP_SCRIPT_ON_TRANSITION, EverGrandeCity_SidneysRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, EverGrandeCity_SidneysRoom_OnFrame
 	.byte 0
 
-EverGrandeCity_SidneysRoom_OnTransition: @ 8227F16
+EverGrandeCity_SidneysRoom_OnTransition:
 	setflag FLAG_MET_SCOTT_IN_EVERGRANDE
 	setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT
 	end
 
-EverGrandeCity_SidneysRoom_OnLoad: @ 8227F1D
+EverGrandeCity_SidneysRoom_OnLoad:
 	call_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom
 	compare VAR_ELITE_4_STATE, 1
 	call_if_eq EverGrandeCity_SidneysRoom_EventScript_CloseDoor
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom:: @ 8227F32
+EverGrandeCity_SidneysRoom_EventScript_ResetAdvanceToNextRoom::
 	call PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom
 	return
 
-EverGrandeCity_SidneysRoom_EventScript_CloseDoor:: @ 8227F38
+EverGrandeCity_SidneysRoom_EventScript_CloseDoor::
 	call PokemonLeague_EliteFour_EventScript_CloseDoor
 	return
 
-EverGrandeCity_SidneysRoom_OnWarp: @ 8227F3E
+EverGrandeCity_SidneysRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth
 	.2byte 0
 
-EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth:: @ 8227F48
+EverGrandeCity_SidneysRoom_EventScript_PlayerTurnNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-EverGrandeCity_SidneysRoom_OnFrame: @ 8227F4D
+EverGrandeCity_SidneysRoom_OnFrame:
 	map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor
 	.2byte 0
 
-EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor:: @ 8227F57
+EverGrandeCity_SidneysRoom_EventScript_WalkInCloseDoor::
 	lockall
 	call PokemonLeague_EliteFour_EventScript_WalkInCloseDoor
 	setvar VAR_ELITE_4_STATE, 1
 	releaseall
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64
+EverGrandeCity_SidneysRoom_EventScript_Sidney::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_ELITE_4_SIDNEY, EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech
@@ -53,19 +53,19 @@ EverGrandeCity_SidneysRoom_EventScript_Sidney:: @ 8227F64
 	goto EverGrandeCity_SidneysRoom_EventScript_Defeated
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech:: @ 8227F8B
+EverGrandeCity_SidneysRoom_EventScript_PostBattleSpeech::
 	msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_SidneysRoom_EventScript_Defeated:: @ 8227F95
+EverGrandeCity_SidneysRoom_EventScript_Defeated::
 	setflag FLAG_DEFEATED_ELITE_4_SIDNEY
 	call PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles
 	msgbox EverGrandeCity_SidneysRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
 	release
 	end
 
-EverGrandeCity_SidneysRoom_Text_IntroSpeech: @ 8227FA7
+EverGrandeCity_SidneysRoom_Text_IntroSpeech:
 	.string "Welcome, challenger!\n"
 	.string "I'm SIDNEY of the ELITE FOUR.\p"
 	.string "I like that look you're giving me.\n"
@@ -75,11 +75,11 @@ EverGrandeCity_SidneysRoom_Text_IntroSpeech: @ 8227FA7
 	.string "a battle that can only be staged\l"
 	.string "here in the POKéMON LEAGUE!$"
 
-EverGrandeCity_SidneysRoom_Text_Defeat: @ 82280A2
+EverGrandeCity_SidneysRoom_Text_Defeat:
 	.string "Well, how do you like that? I lost!\n"
 	.string "Eh, it was fun, so it doesn't matter.$"
 
-EverGrandeCity_SidneysRoom_Text_PostBattleSpeech: @ 82280EC
+EverGrandeCity_SidneysRoom_Text_PostBattleSpeech:
 	.string "Well, listen to what this loser has\n"
 	.string "to say.\p"
 	.string "You've got what it takes to go far.\n"
diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc
index a94c81ae9..809909a5c 100644
--- a/data/maps/FallarborTown/scripts.inc
+++ b/data/maps/FallarborTown/scripts.inc
@@ -1,14 +1,14 @@
-FallarborTown_MapScripts:: @ 81EB1FA
+FallarborTown_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_OnTransition
 	.byte 0
 
-FallarborTown_OnTransition: @ 81EB200
+FallarborTown_OnTransition:
 	setflag FLAG_VISITED_FALLARBOR_TOWN
 	setvar VAR_CONTEST_HALL_STATE, 0
 	clearflag FLAG_CONTEST_SKETCH_CREATED
 	end
 
-FallarborTown_EventScript_ExpertM:: @ 81EB20C
+FallarborTown_EventScript_ExpertM::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_ExpertMNormal
@@ -16,20 +16,20 @@ FallarborTown_EventScript_ExpertM:: @ 81EB20C
 	release
 	end
 
-FallarborTown_EventScript_ExpertMNormal:: @ 81EB221
+FallarborTown_EventScript_ExpertMNormal::
 	msgbox FallarborTown_Text_RegionKnownForMeteors, MSGBOX_DEFAULT
 	release
 	end
 
-FallarborTown_EventScript_Girl:: @ 81EB22B
+FallarborTown_EventScript_Girl::
 	msgbox FallarborTown_Text_MyPreciousAzurill, MSGBOX_NPC
 	end
 
-FallarborTown_EventScript_Gentleman:: @ 81EB234
+FallarborTown_EventScript_Gentleman::
 	msgbox FallarborTown_Text_HaveYouChallengedFlannery, MSGBOX_NPC
 	end
 
-FallarborTown_EventScript_Azurill:: @ 81EB23D
+FallarborTown_EventScript_Azurill::
 	lock
 	faceplayer
 	waitse
@@ -39,39 +39,39 @@ FallarborTown_EventScript_Azurill:: @ 81EB23D
 	release
 	end
 
-FallarborTown_EventScript_BattleTentSign:: @ 81EB250
+FallarborTown_EventScript_BattleTentSign::
 	msgbox FallarborTown_Text_BattleTentSign, MSGBOX_SIGN
 	end
 
-FallarborTown_EventScript_TownSign:: @ 81EB259
+FallarborTown_EventScript_TownSign::
 	msgbox FallarborTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-FallarborTown_EventScript_MoveTutorSign:: @ 81EB262
+FallarborTown_EventScript_MoveTutorSign::
 	msgbox FallarborTown_Text_MoveTutorSign, MSGBOX_SIGN
 	end
 
-FallarborTown_Text_ShadyCharactersCozmosHome: @ 81EB26B
+FallarborTown_Text_ShadyCharactersCozmosHome:
 	.string "Something's happening,\n"
 	.string "and I don't like it!\p"
 	.string "I've seen shady characters wandering\n"
 	.string "in and out of PROF. COZMO's home…$"
 
-FallarborTown_Text_RegionKnownForMeteors: @ 81EB2DE
+FallarborTown_Text_RegionKnownForMeteors:
 	.string "This region's been known for meteors\n"
 	.string "since the olden days.\p"
 	.string "They say METEOR FALLS was gouged out\n"
 	.string "by a falling meteorite long ago.$"
 
-FallarborTown_Text_MyPreciousAzurill: @ 81EB35F
+FallarborTown_Text_MyPreciousAzurill:
 	.string "See! Take a look!\n"
 	.string "This is my precious AZURILL!\p"
 	.string "It's slick and smooth and plushy, too!$"
 
-FallarborTown_Text_Azurill: @ 81EB3B5
+FallarborTown_Text_Azurill:
 	.string "AZURILL: Rooreelooo.$"
 
-FallarborTown_Text_HaveYouChallengedFlannery: @ 81EB3CA
+FallarborTown_Text_HaveYouChallengedFlannery:
 	.string "Have you already challenged FLANNERY,\n"
 	.string "the LEADER of LAVARIDGE GYM?\p"
 	.string "The girl's grandfather was famous.\n"
@@ -81,15 +81,15 @@ FallarborTown_Text_HaveYouChallengedFlannery: @ 81EB3CA
 	.string "become a great TRAINER in her own\l"
 	.string "right.$"
 
-FallarborTown_Text_BattleTentSign: @ 81EB4C2
+FallarborTown_Text_BattleTentSign:
 	.string "BATTLE TENT FALLARBOR SITE\n"
 	.string "“May the Greatest Teams Gather!”$"
 
-FallarborTown_Text_TownSign: @ 81EB4FE
+FallarborTown_Text_TownSign:
 	.string "FALLARBOR TOWN\n"
 	.string "“A farm community with small gardens.”$"
 
-FallarborTown_Text_MoveTutorSign: @ 81EB534
+FallarborTown_Text_MoveTutorSign:
 	.string "MOVE TUTOR'S HOUSE\n"
 	.string "“New moves taught to POKéMON.”$"
 
diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
index 83b91ab48..947bbb8bb 100644
--- a/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
@@ -2,7 +2,7 @@
 .set LOCALID_ATTENDANT, 2
 .set LOCALID_OPPONENT, 3
 
-FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899
+FallarborTown_BattleTentBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_BattleTentBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentBattleRoom_OnWarp
@@ -12,11 +12,11 @@ FallarborTown_BattleTentBattleRoom_MapScripts:: @ 8200899
 	@ The player is represented instead by object event 1, which has the gfx id VAR_OBJ_GFX_ID_1
 	@ The opponent is represented by object event 3, which has the gfx id VAR_OBJ_GFX_ID_0
 
-FallarborTown_BattleTentBattleRoom_OnTransition: @ 82008A9
+FallarborTown_BattleTentBattleRoom_OnTransition:
 	call FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfx
 	end
 
-FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 82008AF
+FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale
@@ -24,21 +24,21 @@ FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 82008AF
 	goto_if_eq FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale:: @ 82008C7
+FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale:: @ 82008D2
+FallarborTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-FallarborTown_BattleTentBattleRoom_OnFrame: @ 82008DD
+FallarborTown_BattleTentBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-FallarborTown_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82008E7
+FallarborTown_BattleTentBattleRoom_EventScript_EnterRoom::
 	lockall
 	showobjectat LOCALID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
 	applymovement LOCALID_PLAYER, FallarborTown_BattleTentBattleRoom_Movement_PlayerEnter
@@ -46,7 +46,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82008E7
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
 	goto_if_ne FallarborTown_BattleTentBattleRoom_EventScript_ResumeChallenge
-FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820090F
+FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter::
 	tower_setopponent
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter
@@ -68,20 +68,20 @@ FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820090F
 	waitmovement 0
 	fallarbortent_getopponentname
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT
-FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost:: @ 820097E
+FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
 	warp MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
-FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 820099C
+FallarborTown_BattleTentBattleRoom_EventScript_DefeatedOpponent::
 	applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantJump
 	playse SE_BANG
 	waitse
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer, MSGBOX_DEFAULT
 	closemessage
-FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum:: @ 82009B3
+FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
@@ -101,7 +101,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_IncrementBattleNum:: @ 82009B3
 	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
-FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 8200A2A
+FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent
@@ -113,14 +113,14 @@ FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 8200A2A
 	case 1, FallarborTown_BattleTentBattleRoom_EventScript_AskPauseChallenge
 	case 2, FallarborTown_BattleTentBattleRoom_EventScript_AskRetireChallenge
 
-FallarborTown_BattleTentBattleRoom_EventScript_AskPauseChallenge:: @ 8200A78
+FallarborTown_BattleTentBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 	case YES, FallarborTown_BattleTentBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 
-FallarborTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: @ 8200AA6
+FallarborTown_BattleTentBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -129,7 +129,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: @ 8200AA6
 	case 0, FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 
-FallarborTown_BattleTentBattleRoom_EventScript_ContinueChallenge:: @ 8200AD8
+FallarborTown_BattleTentBattleRoom_EventScript_ContinueChallenge::
 	closemessage
 	applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos
 	waitmovement 0
@@ -138,7 +138,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_ContinueChallenge:: @ 8200AD8
 	goto FallarborTown_BattleTentBattleRoom_EventScript_NextOpponentEnter
 	waitstate
 
-FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8200AF3
+FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon::
 	delay 60
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
@@ -153,17 +153,17 @@ FallarborTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8200AF3
 	arena_set ARENA_DATA_WIN_STREAK, VAR_RESULT
 @ See above
 
-FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8200B43
+FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8200B4A
+FallarborTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-FallarborTown_BattleTentBattleRoom_EventScript_PauseChallenge:: @ 8200B51
+FallarborTown_BattleTentBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait
 	waitmessage
 	fallarbortent_save CHALLENGE_STATUS_PAUSED
@@ -173,7 +173,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_PauseChallenge:: @ 8200B51
 	frontier_reset
 	end
 
-FallarborTown_BattleTentBattleRoom_EventScript_ResumeChallenge:: @ 8200B73
+FallarborTown_BattleTentBattleRoom_EventScript_ResumeChallenge::
 	applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer
 	waitmovement 0
 	applymovement LOCALID_PLAYER, FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant
@@ -181,22 +181,22 @@ FallarborTown_BattleTentBattleRoom_EventScript_ResumeChallenge:: @ 8200B73
 	goto FallarborTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 	end
 
-FallarborTown_BattleTentBattleRoom_Movement_PlayerEnter: @ 8200B8D
+FallarborTown_BattleTentBattleRoom_Movement_PlayerEnter:
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceBattle: @ 8200B92
+FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceBattle:
 	walk_in_place_fastest_right
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant: @ 8200B94
+FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant:
 	walk_in_place_fastest_left
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter: @ 8200B96
+FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -205,41 +205,41 @@ FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter: @ 8200B96
 	step_end
 
 @ Unused
-FallarborTown_BattleTentBattleRoom_Movement_OpponentStepForward: @ 8200B9C
+FallarborTown_BattleTentBattleRoom_Movement_OpponentStepForward:
 	walk_left
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_OpponentExit: @ 8200B9E
+FallarborTown_BattleTentBattleRoom_Movement_OpponentExit:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_AttendantJump: @ 8200BA3
+FallarborTown_BattleTentBattleRoom_Movement_AttendantJump:
 	disable_jump_landing_ground_effect
 	jump_in_place_down
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer: @ 8200BA6
+FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer:
 	walk_down
 	walk_down
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos: @ 8200BAB
+FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos:
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-FallarborTown_BattleTentBattleRoom_OnWarp: @ 8200BB0
+FallarborTown_BattleTentBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-FallarborTown_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 8200BBA
+FallarborTown_BattleTentBattleRoom_EventScript_SetUpObjects::
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
 	hideobjectat LOCALID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
 	removeobject LOCALID_OPPONENT
diff --git a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
index 89daef9b9..077cdfe79 100644
--- a/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentCorridor/scripts.inc
@@ -1,14 +1,14 @@
 .set LOCALID_ATTENDANT, 1
 
-FallarborTown_BattleTentCorridor_MapScripts:: @ 82006A7
+FallarborTown_BattleTentCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentCorridor_OnFrame
 	.byte 0
 
-FallarborTown_BattleTentCorridor_OnFrame: @ 82006AD
+FallarborTown_BattleTentCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-FallarborTown_BattleTentCorridor_EventScript_EnterCorridor:: @ 82006B7
+FallarborTown_BattleTentCorridor_EventScript_EnterCorridor::
 	lockall
 	setvar VAR_TEMP_0, 1
 	applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentCorridor_Movement_WalkToDoor
@@ -27,44 +27,44 @@ FallarborTown_BattleTentCorridor_EventScript_EnterCorridor:: @ 82006B7
 	releaseall
 	end
 
-FallarborTown_BattleTentCorridor_Movement_WalkToDoor: @ 82006FB
+FallarborTown_BattleTentCorridor_Movement_WalkToDoor:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-FallarborTown_BattleTentCorridor_Movement_PlayerEnterDoor: @ 8200700
+FallarborTown_BattleTentCorridor_Movement_PlayerEnterDoor:
 	walk_up
-FallarborTown_BattleTentCorridor_Movement_AttendantEnterDoor: @ 8200701
+FallarborTown_BattleTentCorridor_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
 @ Leftover text from when this was a Contest Hall in R/S
 @ Unused
-FallarborTown_ContestHall_Text_DoAllRightInPreliminary: @ 8200704
+FallarborTown_ContestHall_Text_DoAllRightInPreliminary:
 	.string "We do all right in the preliminary round,\n"
 	.string "but we can never win the appeals…\p"
 	.string "Maybe it means I have to watch what\n"
 	.string "other contestants are doing…$"
 
 @ Unused
-FallarborTown_ContestHall_Text_MonAllTheseRibbons: @ 8200791
+FallarborTown_ContestHall_Text_MonAllTheseRibbons:
 	.string "See!\n"
 	.string "My POKéMON won all these RIBBONS!\p"
 	.string "Have your POKéMON earned any RIBBONS?\n"
 	.string "You can check them on your POKéNAV.$"
 
 @ Unused
-FallarborTown_ContestHall_Text_CantWinEverywhere: @ 8200802
+FallarborTown_ContestHall_Text_CantWinEverywhere:
 	.string "I can't beat GYM LEADERS…\p"
 	.string "I can't win any CONTESTS…\p"
 	.string "I've been here, there, and everywhere,\n"
 	.string "and it's all for naught…$"
 
 @ Unused
-FallarborTown_ContestHall_Text_SuperRankStage: @ 8200876
+FallarborTown_ContestHall_Text_SuperRankStage:
 	.string "POKéMON CONTESTS\n"
 	.string "SUPER RANK STAGE!$"
 
diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
index 29fcb43a5..6a2c8713f 100644
--- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc
+++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc
@@ -1,20 +1,20 @@
 .set LOCALID_ATTENDANT, 1
 
-FallarborTown_BattleTentLobby_MapScripts:: @ 81FFE66
+FallarborTown_BattleTentLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, FallarborTown_BattleTentLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FallarborTown_BattleTentLobby_OnWarp
 	.byte 0
 
-FallarborTown_BattleTentLobby_OnWarp: @ 81FFE71
+FallarborTown_BattleTentLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, FallarborTown_BattleTentLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-FallarborTown_BattleTentLobby_EventScript_TurnPlayerNorth:: @ 81FFE7B
+FallarborTown_BattleTentLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-FallarborTown_BattleTentLobby_OnFrame: @ 81FFE85
+FallarborTown_BattleTentLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, FallarborTown_BattleTentLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, FallarborTown_BattleTentLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, FallarborTown_BattleTentLobby_EventScript_ResumeChallenge
@@ -22,11 +22,11 @@ FallarborTown_BattleTentLobby_OnFrame: @ 81FFE85
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, FallarborTown_BattleTentLobby_EventScript_LostChallenge
 	.2byte 0
 
-FallarborTown_BattleTentLobby_EventScript_GetChallengeStatus:: @ 81FFEAF
+FallarborTown_BattleTentLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-FallarborTown_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 81FFEB8
+FallarborTown_BattleTentLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox FallarborTown_BattleTentLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
@@ -36,7 +36,7 @@ FallarborTown_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 81FFEB8
 	releaseall
 	end
 
-FallarborTown_BattleTentLobby_EventScript_WonChallenge:: @ 81FFEED
+FallarborTown_BattleTentLobby_EventScript_WonChallenge::
 	lockall
 	msgbox FallarborTown_BattleTentLobby_Text_BeatThreeTrainers, MSGBOX_DEFAULT
 	message FallarborTown_BattleTentLobby_Text_WaitWhileSaveGame
@@ -47,7 +47,7 @@ FallarborTown_BattleTentLobby_EventScript_WonChallenge:: @ 81FFEED
 	playse SE_SAVE
 	waitse
 
-FallarborTown_BattleTentLobby_EventScript_GivePrize:: @ 81FFF27
+FallarborTown_BattleTentLobby_EventScript_GivePrize::
 	msgbox FallarborTown_BattleTentLobby_Text_PresentYouWithPrize, MSGBOX_DEFAULT
 	fallarbortent_giveprize
 	switch VAR_RESULT
@@ -63,7 +63,7 @@ FallarborTown_BattleTentLobby_EventScript_GivePrize:: @ 81FFF27
 	releaseall
 	end
 
-FallarborTown_BattleTentLobby_EventScript_NoRoomForPrize:: @ 81FFF73
+FallarborTown_BattleTentLobby_EventScript_NoRoomForPrize::
 	msgbox FallarborTown_BattleTentLobby_Text_BagFullReturnForPrize, MSGBOX_DEFAULT
 	waitmessage
 	closemessage
@@ -71,13 +71,13 @@ FallarborTown_BattleTentLobby_EventScript_NoRoomForPrize:: @ 81FFF73
 	releaseall
 	end
 
-FallarborTown_BattleTentLobby_EventScript_PrizeWaiting:: @ 81FFF84
+FallarborTown_BattleTentLobby_EventScript_PrizeWaiting::
 	lockall
 	msgbox FallarborTown_BattleTentLobby_Text_BeatThreeTrainers, MSGBOX_DEFAULT
 	goto FallarborTown_BattleTentLobby_EventScript_GivePrize
 	end
 
-FallarborTown_BattleTentLobby_EventScript_LostChallenge:: @ 81FFF93
+FallarborTown_BattleTentLobby_EventScript_LostChallenge::
 	lockall
 	message FallarborTown_BattleTentLobby_Text_ThankYouWaitWhileSaving
 	waitmessage
@@ -91,7 +91,7 @@ FallarborTown_BattleTentLobby_EventScript_LostChallenge:: @ 81FFF93
 	releaseall
 	end
 
-FallarborTown_BattleTentLobby_EventScript_ResumeChallenge:: @ 81FFFCD
+FallarborTown_BattleTentLobby_EventScript_ResumeChallenge::
 	lockall
 	message FallarborTown_BattleTentLobby_Text_LookingForwardToArrival
 	waitmessage
@@ -102,7 +102,7 @@ FallarborTown_BattleTentLobby_EventScript_ResumeChallenge:: @ 81FFFCD
 	setvar VAR_TEMP_0, 255
 	goto FallarborTown_BattleTentLobby_EventScript_EnterChallenge
 
-FallarborTown_BattleTentLobby_EventScript_Attendant:: @ 8200001
+FallarborTown_BattleTentLobby_EventScript_Attendant::
 	lock
 	faceplayer
 	fallarbortent_getprize
@@ -110,7 +110,7 @@ FallarborTown_BattleTentLobby_EventScript_Attendant:: @ 8200001
 	goto_if_ne FallarborTown_BattleTentLobby_EventScript_PrizeWaiting
 	special SavePlayerParty
 	msgbox FallarborTown_BattleTentLobby_Text_WelcomeToBattleTent, MSGBOX_DEFAULT
-FallarborTown_BattleTentLobby_EventScript_AskEnterChallenge:: @ 8200021
+FallarborTown_BattleTentLobby_EventScript_AskEnterChallenge::
 	message FallarborTown_BattleTentLobby_Text_TakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -120,7 +120,7 @@ FallarborTown_BattleTentLobby_EventScript_AskEnterChallenge:: @ 8200021
 	case 2, FallarborTown_BattleTentLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_CancelChallenge
 
-FallarborTown_BattleTentLobby_EventScript_TryEnterChallenge:: @ 820005D
+FallarborTown_BattleTentLobby_EventScript_TryEnterChallenge::
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_ARENA
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	setvar VAR_RESULT, 2
@@ -142,7 +142,7 @@ FallarborTown_BattleTentLobby_EventScript_TryEnterChallenge:: @ 820005D
 	case YES, FallarborTown_BattleTentLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
 
-FallarborTown_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 82000E2
+FallarborTown_BattleTentLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	fallarbortent_init
@@ -155,7 +155,7 @@ FallarborTown_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 82000E2
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq FallarborTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed
-FallarborTown_BattleTentLobby_EventScript_EnterChallenge:: @ 820013C
+FallarborTown_BattleTentLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox FallarborTown_BattleTentLobby_Text_GuideYouToBattleTent, MSGBOX_DEFAULT
@@ -166,35 +166,35 @@ FallarborTown_BattleTentLobby_EventScript_EnterChallenge:: @ 820013C
 	waitstate
 	end
 
-FallarborTown_BattleTentLobby_EventScript_ExplainChallenge:: @ 8200169
+FallarborTown_BattleTentLobby_EventScript_ExplainChallenge::
 	msgbox FallarborTown_BattleTentLobby_Text_ExplainFallarborTent, MSGBOX_DEFAULT
 	goto FallarborTown_BattleTentLobby_EventScript_AskEnterChallenge
 
-FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMons:: @ 8200176
+FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen
-FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50:: @ 8200191
+FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge
 
-FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 820019E
+FallarborTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge
 
-FallarborTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed:: @ 82001AB
+FallarborTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto FallarborTown_BattleTentLobby_EventScript_CancelChallenge
 
-FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge:: @ 82001C2
+FallarborTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge::
 	special LoadPlayerParty
-FallarborTown_BattleTentLobby_EventScript_CancelChallenge:: @ 82001C5
+FallarborTown_BattleTentLobby_EventScript_CancelChallenge::
 	msgbox FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge, MSGBOX_DEFAULT
-FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge:: @ 82001CD
+FallarborTown_BattleTentLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-FallarborTown_BattleTentLobby_EventScript_WalkToDoor:: @ 82001CF
+FallarborTown_BattleTentLobby_EventScript_WalkToDoor::
 	applymovement LOCALID_ATTENDANT, FallarborTown_BattleTentLobby_Movement_AttendantWalkToDoor
 	applymovement OBJ_EVENT_ID_PLAYER, FallarborTown_BattleTentLobby_Movement_PlayerWalkToDoor
 	waitmovement 0
@@ -207,42 +207,42 @@ FallarborTown_BattleTentLobby_EventScript_WalkToDoor:: @ 82001CF
 	waitdooranim
 	return
 
-FallarborTown_BattleTentLobby_Movement_AttendantWalkToDoor: @ 82001FE
+FallarborTown_BattleTentLobby_Movement_AttendantWalkToDoor:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-FallarborTown_BattleTentLobby_Movement_AttendantEnterDoor: @ 8200202
+FallarborTown_BattleTentLobby_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-FallarborTown_BattleTentLobby_Movement_PlayerWalkToDoor: @ 8200205
+FallarborTown_BattleTentLobby_Movement_PlayerWalkToDoor:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-FallarborTown_BattleTentLobby_Movement_PlayerEnterDoor: @ 8200209
+FallarborTown_BattleTentLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-FallarborTown_BattleTentLobby_EventScript_Hiker:: @ 820020D
+FallarborTown_BattleTentLobby_EventScript_Hiker::
 	msgbox FallarborTown_BattleTentLobby_Text_CameToCampOut, MSGBOX_NPC
 	end
 
-FallarborTown_BattleTentLobby_EventScript_LittleBoy:: @ 8200216
+FallarborTown_BattleTentLobby_EventScript_LittleBoy::
 	msgbox FallarborTown_BattleTentLobby_Text_MakeThinkImJustKid, MSGBOX_NPC
 	end
 
-FallarborTown_BattleTentLobby_EventScript_Lass:: @ 820021F
+FallarborTown_BattleTentLobby_EventScript_Lass::
 	msgbox FallarborTown_BattleTentLobby_Text_FallarborTentMyFavorite, MSGBOX_NPC
 	end
 
-FallarborTown_BattleTentLobby_EventScript_Scott:: @ 8200228
+FallarborTown_BattleTentLobby_EventScript_Scott::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo
@@ -252,18 +252,18 @@ FallarborTown_BattleTentLobby_EventScript_Scott:: @ 8200228
 	release
 	end
 
-FallarborTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo:: @ 8200245
+FallarborTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo::
 	msgbox FallarborTown_BattleTentLobby_Text_ScottMakeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-FallarborTown_BattleTentLobby_EventScript_RulesBoard:: @ 820024F
+FallarborTown_BattleTentLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattleArenaLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard:: @ 820025E
+FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 0, MULTI_FALLARBOR_TENT_RULES, FALSE
@@ -277,43 +277,43 @@ FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard:: @ 820025E
 	case MULTI_B_PRESSED, FallarborTown_BattleTentLobby_EventScript_ExitRules
 	end
 
-FallarborTown_BattleTentLobby_EventScript_RulesLevel:: @ 82002BC
+FallarborTown_BattleTentLobby_EventScript_RulesLevel::
 	msgbox BattleTentLobby_Text_ExplainLevelRules, MSGBOX_DEFAULT
 	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_RulesBattle:: @ 82002CA
+FallarborTown_BattleTentLobby_EventScript_RulesBattle::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules, MSGBOX_DEFAULT
 	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_RulesMind:: @ 82002D8
+FallarborTown_BattleTentLobby_EventScript_RulesMind::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainMindRules, MSGBOX_DEFAULT
 	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_RulesSkill:: @ 82002E6
+FallarborTown_BattleTentLobby_EventScript_RulesSkill::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules, MSGBOX_DEFAULT
 	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_RulesBody:: @ 82002F4
+FallarborTown_BattleTentLobby_EventScript_RulesBody::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules, MSGBOX_DEFAULT
 	goto FallarborTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-FallarborTown_BattleTentLobby_EventScript_ExitRules:: @ 8200302
+FallarborTown_BattleTentLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-FallarborTown_BattleTentLobby_Text_MakeThinkImJustKid: @ 8200304
+FallarborTown_BattleTentLobby_Text_MakeThinkImJustKid:
 	.string "Fufufufufu.\p"
 	.string "I'm going to make everyone think\n"
 	.string "I'm just a kid and let them play down.\p"
 	.string "Then, I'll shock them and grab\n"
 	.string "the title!$"
 
-FallarborTown_BattleTentLobby_Text_FallarborTentMyFavorite: @ 8200382
+FallarborTown_BattleTentLobby_Text_FallarborTentMyFavorite:
 	.string "You know how BATTLE TENTS offer\n"
 	.string "different events in different towns?\p"
 	.string "My favorite is definitely the BATTLE\n"
@@ -322,7 +322,7 @@ FallarborTown_BattleTentLobby_Text_FallarborTentMyFavorite: @ 8200382
 	.string "try to win with all their faith in\l"
 	.string "their POKéMON.$"
 
-FallarborTown_BattleTentLobby_Text_CameToCampOut: @ 820045A
+FallarborTown_BattleTentLobby_Text_CameToCampOut:
 	.string "I heard something about some tent,\n"
 	.string "so I came to camp out.\p"
 	.string "I didn't know that tents these days\n"
@@ -330,7 +330,7 @@ FallarborTown_BattleTentLobby_Text_CameToCampOut: @ 820045A
 	.string "Since I'm here, I may as well try\n"
 	.string "my hand at battling!$"
 
-FallarborTown_BattleTentLobby_Text_ScottLookingForSomeone: @ 8200501
+FallarborTown_BattleTentLobby_Text_ScottLookingForSomeone:
 	.string "SCOTT: Hi, {PLAYER}{KUN}!\n"
 	.string "So you came out to this BATTLE TENT!\p"
 	.string "The people in these parts tend to be\n"
@@ -345,7 +345,7 @@ FallarborTown_BattleTentLobby_Text_ScottLookingForSomeone: @ 8200501
 	.string "Whoops! Never mind!\n"
 	.string "Keep working at it!$"
 
-FallarborTown_BattleTentLobby_Text_ScottMakeChallenge: @ 8200653
+FallarborTown_BattleTentLobby_Text_ScottMakeChallenge:
 	.string "SCOTT: Instead of wasting your\n"
 	.string "time with the likes of me, why not\l"
 	.string "make a challenge?$"
diff --git a/data/maps/FallarborTown_CozmosHouse/scripts.inc b/data/maps/FallarborTown_CozmosHouse/scripts.inc
index 3f4db18d3..43a9dca7f 100644
--- a/data/maps/FallarborTown_CozmosHouse/scripts.inc
+++ b/data/maps/FallarborTown_CozmosHouse/scripts.inc
@@ -1,7 +1,7 @@
-FallarborTown_CozmosHouse_MapScripts:: @ 8200F12
+FallarborTown_CozmosHouse_MapScripts::
 	.byte 0
 
-FallarborTown_CozmosHouse_EventScript_ProfCozmo:: @ 8200F13
+FallarborTown_CozmosHouse_EventScript_ProfCozmo::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_GaveMeteorite
@@ -12,7 +12,7 @@ FallarborTown_CozmosHouse_EventScript_ProfCozmo:: @ 8200F13
 	release
 	end
 
-FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38
+FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite::
 	call_if_unset FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_NoticeMeteorite
 	call_if_set FLAG_TEMP_2, FallarborTown_CozmosHouse_EventScript_AskForMeteorite
 	compare VAR_RESULT, NO
@@ -28,27 +28,27 @@ FallarborTown_CozmosHouse_EventScript_PlayerHasMeteorite:: @ 8200F38
 	release
 	end
 
-FallarborTown_CozmosHouse_EventScript_NoticeMeteorite:: @ 8200F8B
+FallarborTown_CozmosHouse_EventScript_NoticeMeteorite::
 	msgbox FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow, MSGBOX_DEFAULT
 	msgbox FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt, MSGBOX_YESNO
 	return
 
-FallarborTown_CozmosHouse_EventScript_AskForMeteorite:: @ 8200F9C
+FallarborTown_CozmosHouse_EventScript_AskForMeteorite::
 	msgbox FallarborTown_CozmosHouse_Text_MayIHaveMeteorite, MSGBOX_YESNO
 	return
 
-FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite:: @ 8200FA5
+FallarborTown_CozmosHouse_EventScript_DeclineGiveMeteorite::
 	setflag FLAG_TEMP_2
 	msgbox FallarborTown_CozmosHouse_Text_CrushedWithDisappointment, MSGBOX_DEFAULT
 	release
 	end
 
-FallarborTown_CozmosHouse_EventScript_GaveMeteorite:: @ 8200FB2
+FallarborTown_CozmosHouse_EventScript_GaveMeteorite::
 	msgbox FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch, MSGBOX_DEFAULT
 	release
 	end
 
-FallarborTown_CozmosHouse_EventScript_CozmosWife:: @ 8200FBC
+FallarborTown_CozmosHouse_EventScript_CozmosWife::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM27, FallarborTown_CozmosHouse_EventScript_CozmoIsHappy
@@ -57,17 +57,17 @@ FallarborTown_CozmosHouse_EventScript_CozmosWife:: @ 8200FBC
 	release
 	end
 
-FallarborTown_CozmosHouse_EventScript_CozmoIsSad:: @ 8200FDA
+FallarborTown_CozmosHouse_EventScript_CozmoIsSad::
 	msgbox FallarborTown_CozmosHouse_Text_FeelSorryForCozmo, MSGBOX_DEFAULT
 	release
 	end
 
-FallarborTown_CozmosHouse_EventScript_CozmoIsHappy:: @ 8200FE4
+FallarborTown_CozmosHouse_EventScript_CozmoIsHappy::
 	msgbox FallarborTown_CozmosHouse_Text_CozmoIsSoHappy, MSGBOX_DEFAULT
 	release
 	end
 
-FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow: @ 8200FEE
+FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow:
 	.string "PROF. COZMO: Oh…\n"
 	.string "I never should have let myself be\l"
 	.string "conned into telling TEAM MAGMA where\l"
@@ -75,7 +75,7 @@ FallarborTown_CozmosHouse_Text_MeteoriteWillNeverBeMineNow: @ 8200FEE
 	.string "That METEORITE from METEOR FALLS…\n"
 	.string "It's never going to be mine now…$"
 
-FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt: @ 82010A2
+FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt:
 	.string "Oh!\n"
 	.string "Hah?\p"
 	.string "That item…\p"
@@ -86,36 +86,36 @@ FallarborTown_CozmosHouse_Text_IsThatMeteoriteMayIHaveIt: @ 82010A2
 	.string "I'm not asking for it for free.\n"
 	.string "How about in exchange for this TM?$"
 
-FallarborTown_CozmosHouse_Text_PleaseUseThisTM: @ 8201159
+FallarborTown_CozmosHouse_Text_PleaseUseThisTM:
 	.string "PROF. COZMO: This TM, it represents\n"
 	.string "my feeling of gratitude.\l"
 	.string "Please use it!$"
 
-FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch: @ 82011A5
+FallarborTown_CozmosHouse_Text_ReallyGoingToHelpMyResearch:
 	.string "PROF. COZMO: Oh, I can't believe it.\n"
 	.string "This is really, really great!\p"
 	.string "This is really going to help my research!$"
 
-FallarborTown_CozmosHouse_Text_CrushedWithDisappointment: @ 8201212
+FallarborTown_CozmosHouse_Text_CrushedWithDisappointment:
 	.string "PROF. COZMO: Oh, but…\n"
 	.string "I'm crushed with disappointment…$"
 
-FallarborTown_CozmosHouse_Text_MayIHaveMeteorite: @ 8201249
+FallarborTown_CozmosHouse_Text_MayIHaveMeteorite:
 	.string "PROF. COZMO: Please, may I have that\n"
 	.string "METEORITE?\p"
 	.string "I'm not asking for it for free.\n"
 	.string "How about in exchange for this TM?$"
 
-FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls: @ 82012BC
+FallarborTown_CozmosHouse_Text_CozmoWentToMeteorFalls:
 	.string "PROF. COZMO went off to METEOR FALLS\n"
 	.string "on ROUTE 114 with some people from\l"
 	.string "TEAM MAGMA.$"
 
-FallarborTown_CozmosHouse_Text_FeelSorryForCozmo: @ 8201310
+FallarborTown_CozmosHouse_Text_FeelSorryForCozmo:
 	.string "Poor PROF. COZMO…\n"
 	.string "He's so depressed… I feel sorry for him.$"
 
-FallarborTown_CozmosHouse_Text_CozmoIsSoHappy: @ 820134B
+FallarborTown_CozmosHouse_Text_CozmoIsSoHappy:
 	.string "Look at PROF. COZMO…\n"
 	.string "He's so happy! I think it's cute.$"
 
diff --git a/data/maps/FallarborTown_Mart/scripts.inc b/data/maps/FallarborTown_Mart/scripts.inc
index bf106781a..2b18a9e14 100644
--- a/data/maps/FallarborTown_Mart/scripts.inc
+++ b/data/maps/FallarborTown_Mart/scripts.inc
@@ -1,7 +1,7 @@
-FallarborTown_Mart_MapScripts:: @ 81FFCBE
+FallarborTown_Mart_MapScripts::
 	.byte 0
 
-FallarborTown_Mart_EventScript_Clerk:: @ 81FFCBF
+FallarborTown_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -12,7 +12,7 @@ FallarborTown_Mart_EventScript_Clerk:: @ 81FFCBF
 	end
 
 	.align 2
-FallarborTown_Mart_Pokemart: @ 81FFCD8
+FallarborTown_Mart_Pokemart:
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
@@ -29,15 +29,15 @@ FallarborTown_Mart_Pokemart: @ 81FFCD8
 	release
 	end
 
-FallarborTown_Mart_EventScript_Woman:: @ 81FFCF4
+FallarborTown_Mart_EventScript_Woman::
 	msgbox FallarborTown_Mart_Text_DecidingSkittyEvolve, MSGBOX_NPC
 	end
 
-FallarborTown_Mart_EventScript_PokefanM:: @ 81FFCFD
+FallarborTown_Mart_EventScript_PokefanM::
 	msgbox FallarborTown_Mart_Text_SellNuggetIFound, MSGBOX_NPC
 	end
 
-FallarborTown_Mart_EventScript_Skitty:: @ 81FFD06
+FallarborTown_Mart_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
@@ -47,7 +47,7 @@ FallarborTown_Mart_EventScript_Skitty:: @ 81FFD06
 	release
 	end
 
-FallarborTown_Mart_Text_DecidingSkittyEvolve: @ 81FFD19
+FallarborTown_Mart_Text_DecidingSkittyEvolve:
 	.string "I'm having a hard time deciding if I\n"
 	.string "should make my SKITTY evolve or not.\p"
 	.string "I only have to use this MOON STONE,\n"
@@ -56,10 +56,10 @@ FallarborTown_Mart_Text_DecidingSkittyEvolve: @ 81FFD19
 	.string "much stronger.\p"
 	.string "But it will look so different, too.$"
 
-FallarborTown_Mart_Text_Skitty: @ 81FFDFA
+FallarborTown_Mart_Text_Skitty:
 	.string "SKITTY: Miyao?$"
 
-FallarborTown_Mart_Text_SellNuggetIFound: @ 81FFE09
+FallarborTown_Mart_Text_SellNuggetIFound:
 	.string "This NUGGET I found here…\n"
 	.string "I suppose I'll have to sell it, seeing\l"
 	.string "as how it has no other use.$"
diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
index 780901c42..1bd54b4b8 100644
--- a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
+++ b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
@@ -1,9 +1,9 @@
 .set LOCALID_MOVE_RELEARNER, 1
 
-FallarborTown_MoveRelearnersHouse_MapScripts:: @ 8201382
+FallarborTown_MoveRelearnersHouse_MapScripts::
 	.byte 0
 
-FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner:: @ 8201383
+FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner::
 	lockall
 	applymovement LOCALID_MOVE_RELEARNER, Common_Movement_FacePlayer
 	waitmovement 0
@@ -13,7 +13,7 @@ FallarborTown_MoveRelearnersHouse_EventScript_MoveRelearner:: @ 8201383
 	goto FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove
 	end
 
-FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove:: @ 82013A8
+FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove::
 	checkitem ITEM_HEART_SCALE, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale
@@ -23,7 +23,7 @@ FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove:: @ 82013A8
 	goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon
 	end
 
-FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon:: @ 82013D6
+FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon::
 	msgbox FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon, MSGBOX_DEFAULT
 	special ChooseMonForMoveRelearner
 	waitstate
@@ -37,7 +37,7 @@ FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon:: @ 82013D6
 	goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove
 	end
 
-FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove:: @ 820140C
+FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove::
 	msgbox FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove, MSGBOX_DEFAULT
 	special TeachMoveRelearnerMove
 	waitstate
@@ -48,22 +48,22 @@ FallarborTown_MoveRelearnersHouse_EventScript_ChooseMove:: @ 820140C
 	goto FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale
 	end
 
-FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon:: @ 8201436
+FallarborTown_MoveRelearnersHouse_EventScript_NoMoveToTeachMon::
 	msgbox FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon, MSGBOX_DEFAULT
 	goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon
 	end
 
-FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg:: @ 8201444
+FallarborTown_MoveRelearnersHouse_EventScript_CantTeachEgg::
 	msgbox FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg, MSGBOX_DEFAULT
 	goto FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon
 	end
 
-FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale:: @ 8201452
+FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale::
 	msgbox FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor: @ 820145C
+FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor:
 	.string "I'm the MOVE TUTOR.\p"
 	.string "I know all the moves that POKéMON\n"
 	.string "learn--every one of them--and I can\l"
@@ -73,32 +73,32 @@ FallarborTown_MoveRelearnersHouse_Text_ImTheMoveTutor: @ 820145C
 	.string "I'll do it for a HEART SCALE.\n"
 	.string "I'm collecting those now.$"
 
-FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove: @ 8201541
+FallarborTown_MoveRelearnersHouse_Text_ThatsAHeartScaleWantMeToTeachMove:
 	.string "Oh! That's it! That's an honest to\n"
 	.string "goodness HEART SCALE!\p"
 	.string "Let me guess, you want me to teach\n"
 	.string "a move?$"
 
-FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon: @ 82015A5
+FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon:
 	.string "Which POKéMON needs tutoring?$"
 
-FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove: @ 82015C3
+FallarborTown_MoveRelearnersHouse_Text_TeachWhichMove:
 	.string "Which move should I teach?$"
 
-FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon: @ 82015DE
+FallarborTown_MoveRelearnersHouse_Text_DontHaveMoveToTeachPokemon:
 	.string "Sorry…\p"
 	.string "It doesn't appear as if I have any move\n"
 	.string "I can teach that POKéMON.$"
 
-FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale: @ 8201627
+FallarborTown_MoveRelearnersHouse_Text_HandedOverHeartScale:
 	.string "{PLAYER} handed over one HEART SCALE\n"
 	.string "in exchange.$"
 
-FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale: @ 8201653
+FallarborTown_MoveRelearnersHouse_Text_ComeBackWithHeartScale:
 	.string "If your POKéMON need to learn a move,\n"
 	.string "come back with a HEART SCALE.$"
 
-FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg: @ 8201697
+FallarborTown_MoveRelearnersHouse_Text_CantTeachEgg:
 	.string "Hunh? There isn't a single move that\n"
 	.string "I can teach an EGG.$"
 
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index e7967046d..bc9e7c25f 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -1,17 +1,17 @@
 .set LOCALID_NURSE, 1
 .set LOCALID_LANETTE, 4
 
-FallarborTown_PokemonCenter_1F_MapScripts:: @ 8200BCD
+FallarborTown_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FallarborTown_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-FallarborTown_PokemonCenter_1F_OnTransition: @ 8200BD8
+FallarborTown_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_FALLARBOR_TOWN
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_Nurse:: @ 8200BE1
+FallarborTown_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -19,15 +19,15 @@ FallarborTown_PokemonCenter_1F_EventScript_Nurse:: @ 8200BE1
 	release
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_Girl:: @ 8200BEF
+FallarborTown_PokemonCenter_1F_EventScript_Girl::
 	msgbox FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown, MSGBOX_NPC
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8200BF8
+FallarborTown_PokemonCenter_1F_EventScript_ExpertM::
 	msgbox FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees, MSGBOX_NPC
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_Lanette:: @ 8200C01
+FallarborTown_PokemonCenter_1F_EventScript_Lanette::
 	lock
 	faceplayer
 	msgbox FallarborTown_PokemonCenter_1F_Text_LanetteGreeting, MSGBOX_DEFAULT
@@ -37,26 +37,26 @@ FallarborTown_PokemonCenter_1F_EventScript_Lanette:: @ 8200C01
 	case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth:: @ 8200C28
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExitNorth::
 	applymovement LOCALID_LANETTE, FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth
 	waitmovement 0
 	goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest:: @ 8200C38
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExitWest::
 	applymovement LOCALID_LANETTE, FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest
 	waitmovement 0
 	goto FallarborTown_PokemonCenter_1F_EventScript_LanetteExited
 	end
 
-FallarborTown_PokemonCenter_1F_EventScript_LanetteExited:: @ 8200C48
+FallarborTown_PokemonCenter_1F_EventScript_LanetteExited::
 	playse SE_SLIDING_DOOR
 	removeobject LOCALID_LANETTE
 	clearflag FLAG_HIDE_LANETTES_HOUSE_LANETTE
 	release
 	end
 
-FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth: @ 8200C53
+FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth:
 	walk_right
 	walk_down
 	walk_down
@@ -71,7 +71,7 @@ FallarborTown_PokemonCenter_1F_Movement_LanetteExitNorth: @ 8200C53
 	delay_8
 	step_end
 
-FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest: @ 8200C60
+FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest:
 	walk_down
 	walk_down
 	walk_left
@@ -84,7 +84,7 @@ FallarborTown_PokemonCenter_1F_Movement_LanetteExitWest: @ 8200C60
 	delay_8
 	step_end
 
-FallarborTown_PokemonCenter_1F_Text_LanetteGreeting: @ 8200C6B
+FallarborTown_PokemonCenter_1F_Text_LanetteGreeting:
 	.string "Oh, hello.\n"
 	.string "You are?\p"
 	.string "Okay, your name's {PLAYER}{KUN}.\n"
@@ -101,13 +101,13 @@ FallarborTown_PokemonCenter_1F_Text_LanetteGreeting: @ 8200C6B
 	.string "If you could, please visit me at home.\n"
 	.string "My house is on ROUTE 114.$"
 
-FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown: @ 8200E22
+FallarborTown_PokemonCenter_1F_Text_FossilManiacEdgeOfTown:
 	.string "I wonder what POKéMON looked like\n"
 	.string "long, long ago?\p"
 	.string "Maybe the FOSSIL MANIAC at the edge\n"
 	.string "of town will know.$"
 
-FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees: @ 8200E8B
+FallarborTown_PokemonCenter_1F_Text_PlantHardyTrees:
 	.string "In the fields of FALLARBOR, we plant\n"
 	.string "seedlings of hardy trees that thrive\l"
 	.string "even in volcanic ash.$"
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
index e9912ee68..aa7dea8fa 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
+FallarborTown_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ FallarborTown_PokemonCenter_2F_MapScripts:: @ 8200EEB
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-FallarborTown_PokemonCenter_2F_EventScript_Colosseum:: @ 8200F00
+FallarborTown_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-FallarborTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8200F06
+FallarborTown_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-FallarborTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8200F0C
+FallarborTown_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc
index ce0c10c16..c4b4c9ab0 100644
--- a/data/maps/FarawayIsland_Entrance/scripts.inc
+++ b/data/maps/FarawayIsland_Entrance/scripts.inc
@@ -1,25 +1,25 @@
 .set LOCALID_SAILOR, 1
 .set LOCALID_SS_TIDAL, 2
 
-FarawayIsland_Entrance_MapScripts:: @ 8267C8E
+FarawayIsland_Entrance_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Entrance_OnTransition
 	.byte 0
 
-FarawayIsland_Entrance_OnTransition: @ 8267C94
+FarawayIsland_Entrance_OnTransition:
 	setflag FLAG_ARRIVED_ON_FARAWAY_ISLAND
 	end
 
-FarawayIsland_Entrance_EventScript_SetCloudsWeather:: @ 8267C98
+FarawayIsland_Entrance_EventScript_SetCloudsWeather::
 	setweather WEATHER_SUNNY_CLOUDS
 	doweather
 	end
 
-FarawayIsland_Entrance_EventScript_ClearWeather:: @ 8267C9D
+FarawayIsland_Entrance_EventScript_ClearWeather::
 	setweather WEATHER_NONE
 	doweather
 	end
 
-FarawayIsland_Entrance_EventScript_Sailor:: @ 8267CA2
+FarawayIsland_Entrance_EventScript_Sailor::
 	lock
 	faceplayer
 	msgbox FarawayIsland_Entrance_Text_SailorReturn, MSGBOX_YESNO
@@ -38,12 +38,12 @@ FarawayIsland_Entrance_EventScript_Sailor:: @ 8267CA2
 	release
 	end
 
-FarawayIsland_Entrance_EventScript_AsYouLike:: @ 8267CE7
+FarawayIsland_Entrance_EventScript_AsYouLike::
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
 
-FarawayIsland_Entrance_EventScript_Sign:: @ 8267CF1
+FarawayIsland_Entrance_EventScript_Sign::
 	msgbox FarawayIsland_Entrance_Text_Sign, MSGBOX_SIGN
 	end
 
diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc
index 59a90e357..bd2b479f7 100644
--- a/data/maps/FarawayIsland_Interior/scripts.inc
+++ b/data/maps/FarawayIsland_Interior/scripts.inc
@@ -1,17 +1,17 @@
 @ Note: LOCALID_FARAWAY_ISLAND_MEW is a local id for this map used elsewhere. It's defined in event_objects.h
 
-FarawayIsland_Interior_MapScripts:: @ 8267CFA
+FarawayIsland_Interior_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, FarawayIsland_Interior_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, FarawayIsland_Interior_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, FarawayIsland_Interior_OnFrame
 	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, FarawayIsland_Interior_OnReturnToField
 	.byte 0
 
-FarawayIsland_Interior_OnReturnToField: @ 8267D0F
+FarawayIsland_Interior_OnReturnToField:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_TrySetMewAboveGrass
 	end
 
-FarawayIsland_Interior_EventScript_TrySetMewAboveGrass:: @ 8267D19
+FarawayIsland_Interior_EventScript_TrySetMewAboveGrass::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq FarawayIsland_Interior_EventScript_SetMewAboveGrass
@@ -23,39 +23,39 @@ FarawayIsland_Interior_EventScript_TrySetMewAboveGrass:: @ 8267D19
 	goto_if_eq FarawayIsland_Interior_EventScript_SetMewAboveGrass
 	return
 
-FarawayIsland_Interior_EventScript_SetMewAboveGrass:: @ 8267D4B
+FarawayIsland_Interior_EventScript_SetMewAboveGrass::
 	setvar VAR_0x8004, 1
 	special SetMewAboveGrass
 	return
 
-FarawayIsland_Interior_OnResume: @ 8267D54
+FarawayIsland_Interior_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, FarawayIsland_Interior_EventScript_TryRemoveMew
 	end
 
-FarawayIsland_Interior_EventScript_TryRemoveMew:: @ 8267D5E
+FarawayIsland_Interior_EventScript_TryRemoveMew::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-FarawayIsland_Interior_OnTransition: @ 8267D72
+FarawayIsland_Interior_OnTransition:
 	setvar VAR_FARAWAY_ISLAND_STEP_COUNTER, 0
 	setvar VAR_TEMP_1, 1
 	call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_TryShowMew
 	end
 
-FarawayIsland_Interior_EventScript_TryShowMew:: @ 8267D86
+FarawayIsland_Interior_EventScript_TryShowMew::
 	goto_if_set FLAG_DEFEATED_MEW, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_MEW
 	setvar VAR_TEMP_1, 0
 	return
 
-FarawayIsland_Interior_OnFrame: @ 8267D98
+FarawayIsland_Interior_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, FarawayIsland_Interior_EventScript_FindMew
 	.2byte 0
 
-FarawayIsland_Interior_EventScript_FindMew:: @ 8267DA2
+FarawayIsland_Interior_EventScript_FindMew::
 	lockall
 	playse SE_PIN
 	applymovement LOCALID_FARAWAY_ISLAND_MEW, Common_Movement_ExclamationMark
@@ -69,7 +69,7 @@ FarawayIsland_Interior_EventScript_FindMew:: @ 8267DA2
 	releaseall
 	end
 
-FarawayIsland_Interior_Movement_MewMoveAndHide: @ 8267DCE
+FarawayIsland_Interior_Movement_MewMoveAndHide:
 	walk_up
 	walk_up
 	walk_up
@@ -77,11 +77,11 @@ FarawayIsland_Interior_Movement_MewMoveAndHide: @ 8267DCE
 	set_invisible
 	step_end
 
-FarawayIsland_Interior_Movement_MewAppear: @ 8267DD4
+FarawayIsland_Interior_Movement_MewAppear:
 	set_visible
 	step_end
 
-FarawayIsland_Interior_Movement_MewFloatUpNorth: @ 8267DD6
+FarawayIsland_Interior_Movement_MewFloatUpNorth:
 	lock_facing_direction
 	walk_fast_up
 	walk_fast_up
@@ -90,7 +90,7 @@ FarawayIsland_Interior_Movement_MewFloatUpNorth: @ 8267DD6
 	walk_in_place_down
 	step_end
 
-FarawayIsland_Interior_Movement_MewFloatUpSouth: @ 8267DDD
+FarawayIsland_Interior_Movement_MewFloatUpSouth:
 	lock_facing_direction
 	walk_fast_up
 	walk_fast_up
@@ -99,7 +99,7 @@ FarawayIsland_Interior_Movement_MewFloatUpSouth: @ 8267DDD
 	walk_in_place_up
 	step_end
 
-FarawayIsland_Interior_Movement_MewFloatUpWest: @ 8267DE4
+FarawayIsland_Interior_Movement_MewFloatUpWest:
 	lock_facing_direction
 	walk_fast_up
 	walk_fast_up
@@ -108,7 +108,7 @@ FarawayIsland_Interior_Movement_MewFloatUpWest: @ 8267DE4
 	walk_in_place_right
 	step_end
 
-FarawayIsland_Interior_Movement_MewFloatUpEast: @ 8267DEB
+FarawayIsland_Interior_Movement_MewFloatUpEast:
 	lock_facing_direction
 	walk_fast_up
 	walk_fast_up
@@ -117,7 +117,7 @@ FarawayIsland_Interior_Movement_MewFloatUpEast: @ 8267DEB
 	walk_in_place_left
 	step_end
 
-FarawayIsland_Interior_EventScript_Mew:: @ 8267DF2
+FarawayIsland_Interior_EventScript_Mew::
 	lock
 	faceplayer
 	applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewAppear
@@ -159,38 +159,38 @@ FarawayIsland_Interior_EventScript_Mew:: @ 8267DF2
 	release
 	end
 
-FarawayIsland_Interior_EventScript_MewDefeated:: @ 8267E96
+FarawayIsland_Interior_EventScript_MewDefeated::
 	setflag FLAG_DEFEATED_MEW
 	setvar VAR_0x8004, SPECIES_MEW
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-FarawayIsland_Interior_EventScript_PlayerOrMewRan:: @ 8267EA4
+FarawayIsland_Interior_EventScript_PlayerOrMewRan::
 	setvar VAR_0x8004, SPECIES_MEW
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-FarawayIsland_Interior_EventScript_FoundMewNorth:: @ 8267EAF
+FarawayIsland_Interior_EventScript_FoundMewNorth::
 	applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpNorth
 	waitmovement 0
 	return
 
-FarawayIsland_Interior_EventScript_FoundMewSouth:: @ 8267EBA
+FarawayIsland_Interior_EventScript_FoundMewSouth::
 	applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpSouth
 	waitmovement 0
 	return
 
-FarawayIsland_Interior_EventScript_FoundMewWest:: @ 8267EC5
+FarawayIsland_Interior_EventScript_FoundMewWest::
 	applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpWest
 	waitmovement 0
 	return
 
-FarawayIsland_Interior_EventScript_FoundMewEast:: @ 8267ED0
+FarawayIsland_Interior_EventScript_FoundMewEast::
 	applymovement LOCALID_FARAWAY_ISLAND_MEW, FarawayIsland_Interior_Movement_MewFloatUpEast
 	waitmovement 0
 	return
 
-FarawayIsland_Interior_EventScript_HideMewWhenGrassCut:: @ 8267EDB
+FarawayIsland_Interior_EventScript_HideMewWhenGrassCut::
 	lockall
 	fadescreenswapbuffers FADE_TO_BLACK
 	setflag FLAG_HIDE_MEW
@@ -201,5 +201,5 @@ FarawayIsland_Interior_EventScript_HideMewWhenGrassCut:: @ 8267EDB
 	releaseall
 	end
 
-FarawayIsland_Interior_Text_TheFeelingOfBeingWatchedFaded: @ 8267EF1
+FarawayIsland_Interior_Text_TheFeelingOfBeingWatchedFaded:
 	.string "The feeling of being watched faded…$"
diff --git a/data/maps/FieryPath/scripts.inc b/data/maps/FieryPath/scripts.inc
index ca259993e..c9dd7aed0 100644
--- a/data/maps/FieryPath/scripts.inc
+++ b/data/maps/FieryPath/scripts.inc
@@ -1,13 +1,13 @@
-FieryPath_MapScripts:: @ 8230F24
+FieryPath_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FieryPath_OnTransition
 	.byte 0
 
-FieryPath_OnTransition: @ 8230F2A
+FieryPath_OnTransition:
 	call_if_unset FLAG_LANDMARK_FIERY_PATH, FieryPath_EventScript_MoveScottToFallarbor
 	setflag FLAG_LANDMARK_FIERY_PATH
 	end
 
-FieryPath_EventScript_MoveScottToFallarbor:: @ 8230F37
+FieryPath_EventScript_MoveScottToFallarbor::
 	setflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT
 	clearflag FLAG_HIDE_FALLARBOR_TOWN_BATTLE_TENT_SCOTT
 	return
diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc
index 748ed2558..1ef3cffc7 100644
--- a/data/maps/FortreeCity/scripts.inc
+++ b/data/maps/FortreeCity/scripts.inc
@@ -1,21 +1,21 @@
-FortreeCity_MapScripts:: @ 81E25A4
+FortreeCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, FortreeCity_OnResume
 	.byte 0
 
-FortreeCity_OnTransition: @ 81E25AF
+FortreeCity_OnTransition:
 	setflag FLAG_VISITED_FORTREE_CITY
 	end
 
-FortreeCity_OnResume: @ 81E25B3
+FortreeCity_OnResume:
 	setstepcallback STEP_CB_FORTREE_BRIDGE
 	end
 
-FortreeCity_EventScript_Man:: @ 81E25B6
+FortreeCity_EventScript_Man::
 	msgbox FortreeCity_Text_SawGiganticPokemonInSky, MSGBOX_NPC
 	end
 
-FortreeCity_EventScript_Woman:: @ 81E25BF
+FortreeCity_EventScript_Woman::
 	lock
 	faceplayer
 	goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_WomanGymAccessible
@@ -23,36 +23,36 @@ FortreeCity_EventScript_Woman:: @ 81E25BF
 	release
 	end
 
-FortreeCity_EventScript_WomanGymAccessible:: @ 81E25D4
+FortreeCity_EventScript_WomanGymAccessible::
 	msgbox FortreeCity_Text_ThisTimeIllBeatWinona, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_EventScript_Girl:: @ 81E25DE
+FortreeCity_EventScript_Girl::
 	msgbox FortreeCity_Text_TreesGrowByDrinkingRainwater, MSGBOX_NPC
 	end
 
-FortreeCity_EventScript_OldMan:: @ 81E25E7
+FortreeCity_EventScript_OldMan::
 	msgbox FortreeCity_Text_EveryoneHealthyAndLively, MSGBOX_NPC
 	end
 
-FortreeCity_EventScript_Boy:: @ 81E25F0
+FortreeCity_EventScript_Boy::
 	msgbox FortreeCity_Text_BugPokemonComeThroughWindow, MSGBOX_NPC
 	end
 
-FortreeCity_EventScript_GameboyKid:: @ 81E25F9
+FortreeCity_EventScript_GameboyKid::
 	msgbox FortreeCity_Text_PokemonThatEvolveWhenTraded, MSGBOX_NPC
 	end
 
-FortreeCity_EventScript_CitySign:: @ 81E2602
+FortreeCity_EventScript_CitySign::
 	msgbox FortreeCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-FortreeCity_EventScript_GymSign:: @ 81E260B
+FortreeCity_EventScript_GymSign::
 	msgbox FortreeCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-FortreeCity_EventScript_Kecleon:: @ 81E2614
+FortreeCity_EventScript_Kecleon::
 	lock
 	faceplayer
 	checkitem ITEM_DEVON_SCOPE, 1
@@ -62,14 +62,14 @@ FortreeCity_EventScript_Kecleon:: @ 81E2614
 	release
 	end
 
-FortreeCity_EventScript_AskUseDevonScope:: @ 81E2630
+FortreeCity_EventScript_AskUseDevonScope::
 	msgbox FortreeCity_Text_UnseeableUseDevonScope, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq FortreeCity_EventScript_UseDevonScope
 	release
 	end
 
-FortreeCity_EventScript_UseDevonScope:: @ 81E2645
+FortreeCity_EventScript_UseDevonScope::
 	msgbox FortreeCity_Text_UsedDevonScopePokemonFled, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Movement_KecleonAppears
@@ -85,11 +85,11 @@ FortreeCity_EventScript_UseDevonScope:: @ 81E2645
 	release
 	end
 
-FortreeCity_Movement_KecleonFlee: @ 81E2674
+FortreeCity_Movement_KecleonFlee:
 	walk_right
 	step_end
 
-FortreeCity_Text_SawGiganticPokemonInSky: @ 81E2676
+FortreeCity_Text_SawGiganticPokemonInSky:
 	.string "No one believes me, but I saw this\n"
 	.string "gigantic POKéMON in the sky.\p"
 	.string "It seemed to squirm as it flew toward\n"
@@ -98,23 +98,23 @@ FortreeCity_Text_SawGiganticPokemonInSky: @ 81E2676
 	.string "Um… You, uh…smell singed.\p"
 	.string "Were you at a volcano or something?$"
 
-FortreeCity_Text_SomethingBlockingGym: @ 81E2738
+FortreeCity_Text_SomethingBlockingGym:
 	.string "I want to go to the POKéMON GYM,\n"
 	.string "but something's blocking the way.\p"
 	.string "After all the bother I went through\n"
 	.string "training on ROUTE 120…$"
 
-FortreeCity_Text_ThisTimeIllBeatWinona: @ 81E27B6
+FortreeCity_Text_ThisTimeIllBeatWinona:
 	.string "I've got my pride-and-joy POKéMON\n"
 	.string "with me. This time, I'll beat WINONA.$"
 
-FortreeCity_Text_TreesGrowByDrinkingRainwater: @ 81E27FE
+FortreeCity_Text_TreesGrowByDrinkingRainwater:
 	.string "The ground absorbs rainwater, and\n"
 	.string "trees grow by drinking that water…\p"
 	.string "Our FORTREE CITY exists because\n"
 	.string "there's both water and soil.$"
 
-FortreeCity_Text_EveryoneHealthyAndLively: @ 81E2880
+FortreeCity_Text_EveryoneHealthyAndLively:
 	.string "The CITY consists of homes built on\n"
 	.string "trees.\p"
 	.string "Perhaps because of that lifestyle,\n"
@@ -122,35 +122,35 @@ FortreeCity_Text_EveryoneHealthyAndLively: @ 81E2880
 	.string "Why, even myself--I feel as if I've\n"
 	.string "grown thirty years younger.$"
 
-FortreeCity_Text_BugPokemonComeThroughWindow: @ 81E292E
+FortreeCity_Text_BugPokemonComeThroughWindow:
 	.string "Living on top of trees is okay.\p"
 	.string "But sometimes BUG POKéMON come in\n"
 	.string "through windows.\l"
 	.string "It can be really startling.$"
 
-FortreeCity_Text_PokemonThatEvolveWhenTraded: @ 81E299D
+FortreeCity_Text_PokemonThatEvolveWhenTraded:
 	.string "There are POKéMON that evolve when\n"
 	.string "you trade them! That's what I heard.$"
 
-FortreeCity_Text_SomethingUnseeable: @ 81E29E5
+FortreeCity_Text_SomethingUnseeable:
 	.string "Something unseeable is in the way.$"
 
-FortreeCity_Text_UnseeableUseDevonScope: @ 81E2A08
+FortreeCity_Text_UnseeableUseDevonScope:
 	.string "Something unseeable is in the way.\p"
 	.string "Want to use the DEVON SCOPE?$"
 
-FortreeCity_Text_UsedDevonScopePokemonFled: @ 81E2A48
+FortreeCity_Text_UsedDevonScopePokemonFled:
 	.string "{PLAYER} used the DEVON SCOPE.\p"
 	.string "An invisible POKéMON became completely\n"
 	.string "visible!\p"
 	.string "The startled POKéMON fled!$"
 
-FortreeCity_Text_CitySign: @ 81E2AAC
+FortreeCity_Text_CitySign:
 	.string "FORTREE CITY\n"
 	.string "“The treetop city that frolics with\l"
 	.string "nature.”$"
 
-FortreeCity_Text_GymSign: @ 81E2AE6
+FortreeCity_Text_GymSign:
 	.string "FORTREE CITY POKéMON GYM\n"
 	.string "LEADER: WINONA\p"
 	.string "“The bird user taking flight into\n"
diff --git a/data/maps/FortreeCity_DecorationShop/scripts.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc
index 4dd751b0f..a42f47af7 100644
--- a/data/maps/FortreeCity_DecorationShop/scripts.inc
+++ b/data/maps/FortreeCity_DecorationShop/scripts.inc
@@ -1,15 +1,15 @@
-FortreeCity_DecorationShop_MapScripts:: @ 821800D
+FortreeCity_DecorationShop_MapScripts::
 	.byte 0
 
-FortreeCity_DecorationShop_EventScript_PokefanM:: @ 821800E
+FortreeCity_DecorationShop_EventScript_PokefanM::
 	msgbox FortreeCity_DecorationShop_Text_MerchandiseSentToPC, MSGBOX_NPC
 	end
 
-FortreeCity_DecorationShop_EventScript_Girl:: @ 8218017
+FortreeCity_DecorationShop_EventScript_Girl::
 	msgbox FortreeCity_DecorationShop_Text_BuyingDeskForDolls, MSGBOX_NPC
 	end
 
-FortreeCity_DecorationShop_EventScript_ClerkDesks:: @ 8218020
+FortreeCity_DecorationShop_EventScript_ClerkDesks::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -20,7 +20,7 @@ FortreeCity_DecorationShop_EventScript_ClerkDesks:: @ 8218020
 	end
 
     .align 2
-FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038
+FortreeCity_DecorationShop_PokemartDecor_Desks:
 	.2byte DECOR_SMALL_DESK
 	.2byte DECOR_POKEMON_DESK
 	.2byte DECOR_HEAVY_DESK
@@ -33,7 +33,7 @@ FortreeCity_DecorationShop_PokemartDecor_Desks: @ 8218038
 	release
 	end
 
-FortreeCity_DecorationShop_EventScript_ClerkChairs:: @ 821804C
+FortreeCity_DecorationShop_EventScript_ClerkChairs::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -44,7 +44,7 @@ FortreeCity_DecorationShop_EventScript_ClerkChairs:: @ 821804C
 	end
 
 	.align 2
-FortreeCity_DecorationShop_PokemartDecor_Chairs: @ 8218064
+FortreeCity_DecorationShop_PokemartDecor_Chairs:
 	.2byte DECOR_SMALL_CHAIR
 	.2byte DECOR_POKEMON_CHAIR
 	.2byte DECOR_HEAVY_CHAIR
@@ -57,13 +57,13 @@ FortreeCity_DecorationShop_PokemartDecor_Chairs: @ 8218064
 	release
 	end
 
-FortreeCity_DecorationShop_Text_MerchandiseSentToPC: @ 8218078
+FortreeCity_DecorationShop_Text_MerchandiseSentToPC:
 	.string "Merchandise you buy here is sent to\n"
 	.string "your own PC.\p"
 	.string "That's fantastic! I wish they could\n"
 	.string "also deliver me home like that.$"
 
-FortreeCity_DecorationShop_Text_BuyingDeskForDolls: @ 82180ED
+FortreeCity_DecorationShop_Text_BuyingDeskForDolls:
 	.string "I'm buying a pretty desk and I'm\n"
 	.string "putting my cute DOLLS on it.\p"
 	.string "If I don't, when I decorate my\n"
diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc
index 688c11645..caac72473 100644
--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -1,21 +1,21 @@
-FortreeCity_Gym_MapScripts:: @ 82165AB
+FortreeCity_Gym_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_Gym_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, FortreeCity_Gym_OnWarp
 	.byte 0
 
-FortreeCity_Gym_OnTransition: @ 82165B6
+FortreeCity_Gym_OnTransition:
 	special RotatingGate_InitPuzzle
 	end
 
-FortreeCity_Gym_OnWarp: @ 82165BA
+FortreeCity_Gym_OnWarp:
 	map_script_2 VAR_TEMP_0, VAR_TEMP_0, FortreeCity_Gym_EventScript_InitRotatingGates
 	.2byte 0
 
-FortreeCity_Gym_EventScript_InitRotatingGates:: @ 82165C4
+FortreeCity_Gym_EventScript_InitRotatingGates::
 	special RotatingGate_InitPuzzleAndGraphics
 	end
 
-FortreeCity_Gym_EventScript_Winona:: @ 82165C8
+FortreeCity_Gym_EventScript_Winona::
 	trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaIntro, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -25,7 +25,7 @@ FortreeCity_Gym_EventScript_Winona:: @ 82165C8
 	release
 	end
 
-FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD
+FortreeCity_Gym_EventScript_WinonaDefeated::
 	message FortreeCity_Gym_Text_ReceivedFeatherBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
@@ -48,7 +48,7 @@ FortreeCity_Gym_EventScript_WinonaDefeated:: @ 82165FD
 	release
 	end
 
-FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646
+FortreeCity_Gym_EventScript_GiveAerialAce2::
 	giveitem ITEM_TM40
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -57,7 +57,7 @@ FortreeCity_Gym_EventScript_GiveAerialAce2:: @ 8216646
 	release
 	end
 
-FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A
+FortreeCity_Gym_EventScript_GiveAerialAce::
 	giveitem ITEM_TM40
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_BagIsFull
@@ -65,42 +65,42 @@ FortreeCity_Gym_EventScript_GiveAerialAce:: @ 821666A
 	setflag FLAG_RECEIVED_TM40
 	return
 
-FortreeCity_Gym_EventScript_WinonaRematch:: @ 821668D
+FortreeCity_Gym_EventScript_WinonaRematch::
 	trainerbattle_rematch_double TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaPreRematch, FortreeCity_Gym_Text_WinonaRematchDefeat, FortreeCity_Gym_Text_WinonaRematchNeedTwoMons
 	msgbox FortreeCity_Gym_Text_WinonaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_Jared:: @ 82166A8
+FortreeCity_Gym_EventScript_Jared::
 	trainerbattle_single TRAINER_JARED, FortreeCity_Gym_Text_JaredIntro, FortreeCity_Gym_Text_JaredDefeat
 	msgbox FortreeCity_Gym_Text_JaredPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_Edwardo:: @ 82166BF
+FortreeCity_Gym_EventScript_Edwardo::
 	trainerbattle_single TRAINER_EDWARDO, FortreeCity_Gym_Text_EdwardoIntro, FortreeCity_Gym_Text_EdwardoDefeat
 	msgbox FortreeCity_Gym_Text_EdwardoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_Flint:: @ 82166D6
+FortreeCity_Gym_EventScript_Flint::
 	trainerbattle_single TRAINER_FLINT, FortreeCity_Gym_Text_FlintIntro, FortreeCity_Gym_Text_FlintDefeat
 	msgbox FortreeCity_Gym_Text_FlintPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_Ashley:: @ 82166ED
+FortreeCity_Gym_EventScript_Ashley::
 	trainerbattle_single TRAINER_ASHLEY, FortreeCity_Gym_Text_AshleyIntro, FortreeCity_Gym_Text_AshleyDefeat
 	msgbox FortreeCity_Gym_Text_AshleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_Humberto:: @ 8216704
+FortreeCity_Gym_EventScript_Humberto::
 	trainerbattle_single TRAINER_HUMBERTO, FortreeCity_Gym_Text_HumbertoIntro, FortreeCity_Gym_Text_HumbertoDefeat
 	msgbox FortreeCity_Gym_Text_HumbertoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_Darius:: @ 821671B
+FortreeCity_Gym_EventScript_Darius::
 	trainerbattle_single TRAINER_DARIUS, FortreeCity_Gym_Text_DariusIntro, FortreeCity_Gym_Text_DariusDefeat
 	msgbox FortreeCity_Gym_Text_DariusPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-FortreeCity_Gym_EventScript_GymGuide:: @ 8216732
+FortreeCity_Gym_EventScript_GymGuide::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_GymGuidePostVictory
@@ -108,34 +108,34 @@ FortreeCity_Gym_EventScript_GymGuide:: @ 8216732
 	release
 	end
 
-FortreeCity_Gym_EventScript_GymGuidePostVictory:: @ 8216747
+FortreeCity_Gym_EventScript_GymGuidePostVictory::
 	msgbox FortreeCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_Gym_EventScript_LeftGymStatue:: @ 8216751
+FortreeCity_Gym_EventScript_LeftGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified
 	goto FortreeCity_Gym_EventScript_GymStatue
 	end
 
-FortreeCity_Gym_EventScript_RightGymStatue:: @ 8216761
+FortreeCity_Gym_EventScript_RightGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_GymStatueCertified
 	goto FortreeCity_Gym_EventScript_GymStatue
 	end
 
-FortreeCity_Gym_EventScript_GymStatueCertified:: @ 8216771
+FortreeCity_Gym_EventScript_GymStatueCertified::
 	msgbox FortreeCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FortreeCity_Gym_EventScript_GymStatue:: @ 821677B
+FortreeCity_Gym_EventScript_GymStatue::
 	msgbox FortreeCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FortreeCity_Gym_Text_GymGuideAdvice: @ 8216785
+FortreeCity_Gym_Text_GymGuideAdvice:
 	.string "Yo, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "FORTREE GYM LEADER WINONA is\n"
@@ -146,94 +146,94 @@ FortreeCity_Gym_Text_GymGuideAdvice: @ 8216785
 	.string "who are trying to take wing!\p"
 	.string "Okay, go for it!$"
 
-FortreeCity_Gym_Text_GymGuidePostVictory: @ 821687D
+FortreeCity_Gym_Text_GymGuidePostVictory:
 	.string "You did it!\n"
 	.string "You've achieved liftoff!$"
 
-FortreeCity_Gym_Text_JaredIntro: @ 82168A2
+FortreeCity_Gym_Text_JaredIntro:
 	.string "Behold the elegant battle style of\n"
 	.string "BIRD POKéMON!$"
 
-FortreeCity_Gym_Text_JaredDefeat: @ 82168D3
+FortreeCity_Gym_Text_JaredDefeat:
 	.string "You…\n"
 	.string "You're strong…$"
 
-FortreeCity_Gym_Text_JaredPostBattle: @ 82168E7
+FortreeCity_Gym_Text_JaredPostBattle:
 	.string "A TRAINER has to be smart to keep\n"
 	.string "up with unexpected turns of events.\p"
 	.string "Do you have the smarts to get to\n"
 	.string "our LEADER?$"
 
-FortreeCity_Gym_Text_EdwardoIntro: @ 821695A
+FortreeCity_Gym_Text_EdwardoIntro:
 	.string "The lovers of BIRD POKéMON aspire\n"
 	.string "to join this GYM.\p"
 	.string "As a member of the FORTREE GYM,\n"
 	.string "I'm not allowed to lose!$"
 
-FortreeCity_Gym_Text_EdwardoDefeat: @ 82169C7
+FortreeCity_Gym_Text_EdwardoDefeat:
 	.string "It was too much of a load for me\n"
 	.string "to bear…$"
 
-FortreeCity_Gym_Text_EdwardoPostBattle: @ 82169F1
+FortreeCity_Gym_Text_EdwardoPostBattle:
 	.string "The world is huge, and there are\n"
 	.string "countless tough TRAINERS.\p"
 	.string "I'm going to keep training and make\n"
 	.string "myself even stronger.$"
 
-FortreeCity_Gym_Text_FlintIntro: @ 8216A66
+FortreeCity_Gym_Text_FlintIntro:
 	.string "There's no need for WINONA, our GYM\n"
 	.string "LEADER, to deal with you!\p"
 	.string "I'm plenty good enough for you!$"
 
-FortreeCity_Gym_Text_FlintDefeat: @ 8216AC4
+FortreeCity_Gym_Text_FlintDefeat:
 	.string "WINONA, I…\n"
 	.string "I lost!$"
 
-FortreeCity_Gym_Text_FlintPostBattle: @ 8216AD7
+FortreeCity_Gym_Text_FlintPostBattle:
 	.string "WINONA is cute and she's strong.\n"
 	.string "She's the ultimate LEADER!\p"
 	.string "Blush…$"
 
-FortreeCity_Gym_Text_AshleyIntro: @ 8216B1A
+FortreeCity_Gym_Text_AshleyIntro:
 	.string "WINONA taught me personally!\n"
 	.string "You can't beat me easily!$"
 
-FortreeCity_Gym_Text_AshleyDefeat: @ 8216B51
+FortreeCity_Gym_Text_AshleyDefeat:
 	.string "I was beaten…$"
 
-FortreeCity_Gym_Text_AshleyPostBattle: @ 8216B5F
+FortreeCity_Gym_Text_AshleyPostBattle:
 	.string "Thanks to WINONA, the people of\n"
 	.string "FORTREE can live without fear.$"
 
-FortreeCity_Gym_Text_HumbertoIntro: @ 8216B9E
+FortreeCity_Gym_Text_HumbertoIntro:
 	.string "When WINONA takes to battle, her face\n"
 	.string "shines with beautiful determination…\p"
 	.string "I'm not letting you witness that\n"
 	.string "lovely sight!$"
 
-FortreeCity_Gym_Text_HumbertoDefeat: @ 8216C18
+FortreeCity_Gym_Text_HumbertoDefeat:
 	.string "Urk!\n"
 	.string "I couldn't stop you.$"
 
-FortreeCity_Gym_Text_HumbertoPostBattle: @ 8216C32
+FortreeCity_Gym_Text_HumbertoPostBattle:
 	.string "You'd better watch it!\n"
 	.string "Don't get distracted staring at WINONA\l"
 	.string "or you'll go crashing down in a heap!$"
 
-FortreeCity_Gym_Text_DariusIntro: @ 8216C96
+FortreeCity_Gym_Text_DariusIntro:
 	.string "You'd better know that there are all\n"
 	.string "sorts of FLYING-type POKéMON.\p"
 	.string "You do know that, right?$"
 
-FortreeCity_Gym_Text_DariusDefeat: @ 8216CF2
+FortreeCity_Gym_Text_DariusDefeat:
 	.string "You seem to know your stuff!$"
 
-FortreeCity_Gym_Text_DariusPostBattle: @ 8216D0F
+FortreeCity_Gym_Text_DariusPostBattle:
 	.string "Sure, you beat me all right.\n"
 	.string "But you'd better watch it! Our LEADER\l"
 	.string "WINONA's POKéMON are all business.$"
 
-FortreeCity_Gym_Text_WinonaIntro: @ 8216D75
+FortreeCity_Gym_Text_WinonaIntro:
 	.string "I am WINONA. I am the LEADER of\n"
 	.string "the FORTREE POKéMON GYM.\p"
 	.string "I have become one with BIRD POKéMON\n"
@@ -243,18 +243,18 @@ FortreeCity_Gym_Text_WinonaIntro: @ 8216D75
 	.string "Witness the elegant choreography\n"
 	.string "of BIRD POKéMON and I!$"
 
-FortreeCity_Gym_Text_WinonaDefeat: @ 8216E60
+FortreeCity_Gym_Text_WinonaDefeat:
 	.string "Never before have I seen a TRAINER\n"
 	.string "command POKéMON with more grace\l"
 	.string "than I…\p"
 	.string "In recognition of your prowess,\n"
 	.string "I present to you this GYM BADGE.$"
 
-FortreeCity_Gym_Text_ReceivedFeatherBadge: @ 8216EEC
+FortreeCity_Gym_Text_ReceivedFeatherBadge:
 	.string "{PLAYER} received the FEATHER BADGE\n"
 	.string "from WINONA.$"
 
-FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis: @ 8216F17
+FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis:
 	.string "With the FEATHER BADGE, all POKéMON up\n"
 	.string "to LV 70, even those received through\l"
 	.string "trades, will obey your every command.\p"
@@ -263,29 +263,29 @@ FortreeCity_Gym_Text_ExplainFeatherBadgeTakeThis: @ 8216F17
 	.string "And this…\n"
 	.string "This is a gift from me.$"
 
-FortreeCity_Gym_Text_ExplainAerialAce: @ 8216FEC
+FortreeCity_Gym_Text_ExplainAerialAce:
 	.string "TM40 contains AERIAL ACE.\p"
 	.string "Its speed…\n"
 	.string "No POKéMON should be able to avoid it.\p"
 	.string "… … … … … …$"
 
-FortreeCity_Gym_Text_RegisteredWinona: @ 8217044
+FortreeCity_Gym_Text_RegisteredWinona:
 	.string "Registered GYM LEADER WINONA\n"
 	.string "in the POKéNAV.$"
 
-FortreeCity_Gym_Text_WinonaPostBattle: @ 8217071
+FortreeCity_Gym_Text_WinonaPostBattle:
 	.string "Though I fell to you, I will remain\n"
 	.string "devoted to BIRD POKéMON.$"
 
-FortreeCity_Gym_Text_GymStatue: @ 82170AE
+FortreeCity_Gym_Text_GymStatue:
 	.string "FORTREE CITY POKéMON GYM$"
 
-FortreeCity_Gym_Text_GymStatueCertified: @ 82170C7
+FortreeCity_Gym_Text_GymStatueCertified:
 	.string "FORTREE CITY POKéMON GYM\p"
 	.string "WINONA'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-FortreeCity_Gym_Text_WinonaPreRematch: @ 8217100
+FortreeCity_Gym_Text_WinonaPreRematch:
 	.string "WINONA: We humans can never escape\n"
 	.string "gravity's pull on the ground.\p"
 	.string "But by striving for excellence,\n"
@@ -295,17 +295,17 @@ FortreeCity_Gym_Text_WinonaPreRematch: @ 8217100
 	.string "Please, allow me to see your power\n"
 	.string "at full flight!$"
 
-FortreeCity_Gym_Text_WinonaRematchDefeat: @ 82171E6
+FortreeCity_Gym_Text_WinonaRematchDefeat:
 	.string "I failed to reach your height again…$"
 
-FortreeCity_Gym_Text_WinonaPostRematch: @ 821720B
+FortreeCity_Gym_Text_WinonaPostRematch:
 	.string "WINONA: Even though I have lost,\n"
 	.string "the wings of my heart remain unbroken.\p"
 	.string "I can rise and soar again and\n"
 	.string "yet again.\p"
 	.string "I am convinced of it!$"
 
-FortreeCity_Gym_Text_WinonaRematchNeedTwoMons: @ 8217292
+FortreeCity_Gym_Text_WinonaRematchNeedTwoMons:
 	.string "WINONA: We humans can never escape\n"
 	.string "gravity's pull on the ground.\p"
 	.string "But by striving for excellence,\n"
diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc
index c7f4a8d5b..3dd58ca34 100644
--- a/data/maps/FortreeCity_House1/scripts.inc
+++ b/data/maps/FortreeCity_House1/scripts.inc
@@ -1,7 +1,7 @@
-FortreeCity_House1_MapScripts:: @ 82162BA
+FortreeCity_House1_MapScripts::
 	.byte 0
 
-FortreeCity_House1_EventScript_Trader:: @ 82162BB
+FortreeCity_House1_EventScript_Trader::
 	lock
 	faceplayer
 	goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_TradeCompleted
@@ -33,27 +33,27 @@ FortreeCity_House1_EventScript_Trader:: @ 82162BB
 	release
 	end
 
-FortreeCity_House1_EventScript_DeclineTrade:: @ 821633D
+FortreeCity_House1_EventScript_DeclineTrade::
 	msgbox FortreeCity_House1_Text_YouWontTradeMe, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House1_EventScript_NotRequestedMon:: @ 8216347
+FortreeCity_House1_EventScript_NotRequestedMon::
 	bufferspeciesname 0, VAR_0x8009
 	msgbox FortreeCity_House1_Text_ThisIsntAMon, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House1_EventScript_TradeCompleted:: @ 8216355
+FortreeCity_House1_EventScript_TradeCompleted::
 	msgbox FortreeCity_House1_Text_GoingToMakeVolbeatStrong, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House1_EventScript_ExpertF:: @ 821635F
+FortreeCity_House1_EventScript_ExpertF::
 	msgbox FortreeCity_House1_Text_TradingMemoriesWithOthers, MSGBOX_NPC
 	end
 
-FortreeCity_House1_EventScript_Zigzagoon:: @ 8216368
+FortreeCity_House1_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
@@ -63,7 +63,7 @@ FortreeCity_House1_EventScript_Zigzagoon:: @ 8216368
 	release
 	end
 
-FortreeCity_House1_Text_YouWillTradeWontYou: @ 821637B
+FortreeCity_House1_Text_YouWillTradeWontYou:
 	.string "Wrooooaaar! I need it!\n"
 	.string "I have to get me a {STR_VAR_1}!\l"
 	.string "I'll do anything for it!\p"
@@ -73,29 +73,29 @@ FortreeCity_House1_Text_YouWillTradeWontYou: @ 821637B
 	.string "your {STR_VAR_1} for my {STR_VAR_2},\l"
 	.string "won't you?$"
 
-FortreeCity_House1_Text_MonYouTakeCare: @ 8216440
+FortreeCity_House1_Text_MonYouTakeCare:
 	.string "Oh, yeah, right on!\p"
 	.string "{STR_VAR_1}, welcome!\n"
 	.string "{STR_VAR_2}, you take care!$"
 
-FortreeCity_House1_Text_ThisIsntAMon: @ 8216474
+FortreeCity_House1_Text_ThisIsntAMon:
 	.string "Uh, no, I don't think so.\n"
 	.string "That isn't a {STR_VAR_1}.$"
 
-FortreeCity_House1_Text_YouWontTradeMe: @ 821649F
+FortreeCity_House1_Text_YouWontTradeMe:
 	.string "No? You won't trade me?\n"
 	.string "Even after I bared my heart to you?$"
 
-FortreeCity_House1_Text_GoingToMakeVolbeatStrong: @ 82164DB
+FortreeCity_House1_Text_GoingToMakeVolbeatStrong:
 	.string "I'm going to make VOLBEAT super\n"
 	.string "strong from this moment on!\p"
 	.string "I hope you do the same with PLUSLE!$"
 
-FortreeCity_House1_Text_TradingMemoriesWithOthers: @ 821653B
+FortreeCity_House1_Text_TradingMemoriesWithOthers:
 	.string "Trading POKéMON with others…\p"
 	.string "It's as if you're trading your own\n"
 	.string "memories with other people.$"
 
-FortreeCity_House1_Text_Zigzagoon: @ 8216597
+FortreeCity_House1_Text_Zigzagoon:
 	.string "ZIGZAGOON: Gumomoh?$"
 
diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc
index 394ad9ffc..29e9ea93c 100644
--- a/data/maps/FortreeCity_House2/scripts.inc
+++ b/data/maps/FortreeCity_House2/scripts.inc
@@ -1,7 +1,7 @@
-FortreeCity_House2_MapScripts:: @ 82177CA
+FortreeCity_House2_MapScripts::
 	.byte 0
 
-FortreeCity_House2_EventScript_HiddenPowerGiver:: @ 82177CB
+FortreeCity_House2_EventScript_HiddenPowerGiver::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_ExplainHiddenPower
@@ -27,56 +27,56 @@ FortreeCity_House2_EventScript_HiddenPowerGiver:: @ 82177CB
 	release
 	end
 
-FortreeCity_House2_EventScript_Greeting:: @ 8217862
+FortreeCity_House2_EventScript_Greeting::
 	msgbox FortreeCity_House2_Text_HiddenPowersArousedByNature, MSGBOX_DEFAULT
 	setflag FLAG_MET_HIDDEN_POWER_GIVER
 	return
 
-FortreeCity_House2_EventScript_ExplainHiddenPower:: @ 821786E
+FortreeCity_House2_EventScript_ExplainHiddenPower::
 	msgbox FortreeCity_House2_Text_ExplainHiddenPower, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House2_EventScript_WrongGuess:: @ 8217878
+FortreeCity_House2_EventScript_WrongGuess::
 	msgbox FortreeCity_House2_Text_YouGuessedWrong, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House2_Text_HiddenPowersArousedByNature: @ 8217882
+FortreeCity_House2_Text_HiddenPowersArousedByNature:
 	.string "People… POKéMON…\p"
 	.string "Their hidden powers are aroused by\n"
 	.string "living in natural environments…$"
 
-FortreeCity_House2_Text_CoinInWhichHand: @ 82178D6
+FortreeCity_House2_Text_CoinInWhichHand:
 	.string "Let this old woman see if your hidden\n"
 	.string "power has awoken…\p"
 	.string "I hold a coin in my hand.\p"
 	.string "Now, tell me, have I palmed it in\n"
 	.string "the right hand? Or in the left?$"
 
-FortreeCity_House2_Text_CorrectTryAgainWhichHand: @ 821796A
+FortreeCity_House2_Text_CorrectTryAgainWhichHand:
 	.string "Oh! Yes, correct!\p"
 	.string "We shall try again.\p"
 	.string "In which hand have I palmed the coin?\n"
 	.string "The right or left?$"
 
-FortreeCity_House2_Text_CorrectTryAgainWhichHand2: @ 82179C9
+FortreeCity_House2_Text_CorrectTryAgainWhichHand2:
 	.string "Oh! Yes, correct!\p"
 	.string "We shall try again.\p"
 	.string "In which hand have I palmed the coin?\n"
 	.string "The right or left?$"
 
-FortreeCity_House2_Text_YourHiddenPowerHasAwoken: @ 8217A28
+FortreeCity_House2_Text_YourHiddenPowerHasAwoken:
 	.string "Oh! Splendid!\n"
 	.string "Your hidden power has awoken!\p"
 	.string "Here, take this and awaken the hidden\n"
 	.string "power of your POKéMON.$"
 
-FortreeCity_House2_Text_ExplainHiddenPower: @ 8217A91
+FortreeCity_House2_Text_ExplainHiddenPower:
 	.string "HIDDEN POWER is a move that changes\n"
 	.string "with the POKéMON.$"
 
-FortreeCity_House2_Text_YouGuessedWrong: @ 8217AC7
+FortreeCity_House2_Text_YouGuessedWrong:
 	.string "No, too bad.\n"
 	.string "You guessed wrong.$"
 
diff --git a/data/maps/FortreeCity_House3/scripts.inc b/data/maps/FortreeCity_House3/scripts.inc
index 396bd4b22..1ae5a1ecb 100644
--- a/data/maps/FortreeCity_House3/scripts.inc
+++ b/data/maps/FortreeCity_House3/scripts.inc
@@ -1,15 +1,15 @@
-FortreeCity_House3_MapScripts:: @ 8217AE7
+FortreeCity_House3_MapScripts::
 	.byte 0
 
-FortreeCity_House3_EventScript_Maniac:: @ 8217AE8
+FortreeCity_House3_EventScript_Maniac::
 	msgbox FortreeCity_House3_Text_MetStevenHadAmazingPokemon, MSGBOX_NPC
 	end
 
-FortreeCity_House3_EventScript_SchoolKidM:: @ 8217AF1
+FortreeCity_House3_EventScript_SchoolKidM::
 	msgbox FortreeCity_House3_Text_OhYouHavePokedex, MSGBOX_NPC
 	end
 
-FortreeCity_House3_Text_MetStevenHadAmazingPokemon: @ 8217AFA
+FortreeCity_House3_Text_MetStevenHadAmazingPokemon:
 	.string "While speaking about POKéDEXES,\n"
 	.string "I remembered something.\p"
 	.string "I met this TRAINER, STEVEN, when\n"
@@ -21,7 +21,7 @@ FortreeCity_House3_Text_MetStevenHadAmazingPokemon: @ 8217AFA
 	.string "He might even be stronger than the\n"
 	.string "GYM LEADER in this town…$"
 
-FortreeCity_House3_Text_OhYouHavePokedex: @ 8217C22
+FortreeCity_House3_Text_OhYouHavePokedex:
 	.string "What's that thing you have there?\p"
 	.string "… … … … … …\p"
 	.string "Oh, it's called a POKéDEX?\n"
diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc
index 891e8eb75..8a6d71eb4 100644
--- a/data/maps/FortreeCity_House4/scripts.inc
+++ b/data/maps/FortreeCity_House4/scripts.inc
@@ -1,13 +1,13 @@
 .set LOCALID_WINGULL, 3
 
-FortreeCity_House4_MapScripts:: @ 8217C80
+FortreeCity_House4_MapScripts::
 	.byte 0
 
-FortreeCity_House4_EventScript_Woman:: @ 8217C81
+FortreeCity_House4_EventScript_Woman::
 	msgbox FortreeCity_House4_Text_BringsWorldCloserTogether, MSGBOX_NPC
 	end
 
-FortreeCity_House4_EventScript_Boy:: @ 8217C8A
+FortreeCity_House4_EventScript_Boy::
 	lockall
 	goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_ReceivedMentalHerb
 	goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_WingullReturned
@@ -22,14 +22,14 @@ FortreeCity_House4_EventScript_Boy:: @ 8217C8A
 	releaseall
 	end
 
-FortreeCity_House4_EventScript_WingullOnErrand:: @ 8217CC4
+FortreeCity_House4_EventScript_WingullOnErrand::
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_AskedWingullToRunErrand, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FortreeCity_House4_EventScript_WingullReturned:: @ 8217CD8
+FortreeCity_House4_EventScript_WingullReturned::
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb, MSGBOX_DEFAULT
@@ -40,14 +40,14 @@ FortreeCity_House4_EventScript_WingullReturned:: @ 8217CD8
 	releaseall
 	end
 
-FortreeCity_House4_EventScript_ReceivedMentalHerb:: @ 8217D06
+FortreeCity_House4_EventScript_ReceivedMentalHerb::
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox FortreeCity_House4_Text_FriendsFarAwayThanksToWingull, MSGBOX_DEFAULT
 	releaseall
 	end
 
-FortreeCity_House4_Movement_WingullExit: @ 8217D1A
+FortreeCity_House4_Movement_WingullExit:
 	walk_fast_down
 	walk_fast_down
 	walk_fast_right
@@ -55,7 +55,7 @@ FortreeCity_House4_Movement_WingullExit: @ 8217D1A
 	delay_8
 	step_end
 
-FortreeCity_House4_EventScript_Wingull:: @ 8217D20
+FortreeCity_House4_EventScript_Wingull::
 	lock
 	faceplayer
 	waitse
@@ -65,21 +65,21 @@ FortreeCity_House4_EventScript_Wingull:: @ 8217D20
 	release
 	end
 
-FortreeCity_House4_Text_BringsWorldCloserTogether: @ 8217D33
+FortreeCity_House4_Text_BringsWorldCloserTogether:
 	.string "By being together with POKéMON,\n"
 	.string "people make more and more friends.\p"
 	.string "And that brings the world closer\n"
 	.string "together. I think it's wonderful!$"
 
-FortreeCity_House4_Text_GoBirdPokemon: @ 8217DB9
+FortreeCity_House4_Text_GoBirdPokemon:
 	.string "There!\n"
 	.string "Go, BIRD POKéMON!$"
 
-FortreeCity_House4_Text_AskedWingullToRunErrand: @ 8217DD2
+FortreeCity_House4_Text_AskedWingullToRunErrand:
 	.string "Heheh, I asked my WINGULL to run\n"
 	.string "an errand for me.$"
 
-FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb: @ 8217E05
+FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb:
 	.string "Good!\n"
 	.string "Welcome back, WINGULL!\p"
 	.string "Huh? What is this?\n"
@@ -89,10 +89,10 @@ FortreeCity_House4_Text_WelcomeWingullTakeMentalHerb: @ 8217E05
 	.string "But I'm not a TRAINER, so you can\n"
 	.string "have it.$"
 
-FortreeCity_House4_Text_FriendsFarAwayThanksToWingull: @ 8217EA8
+FortreeCity_House4_Text_FriendsFarAwayThanksToWingull:
 	.string "Thanks to my WINGULL, I have friends\n"
 	.string "who live far away.$"
 
-FortreeCity_House4_Text_Wingull: @ 8217EE0
+FortreeCity_House4_Text_Wingull:
 	.string "WINGULL: Pihyoh!$"
 
diff --git a/data/maps/FortreeCity_House5/scripts.inc b/data/maps/FortreeCity_House5/scripts.inc
index 4d27c2f06..71fcc78ca 100644
--- a/data/maps/FortreeCity_House5/scripts.inc
+++ b/data/maps/FortreeCity_House5/scripts.inc
@@ -1,15 +1,15 @@
-FortreeCity_House5_MapScripts:: @ 8217EF1
+FortreeCity_House5_MapScripts::
 	.byte 0
 
-FortreeCity_House5_EventScript_PokefanF:: @ 8217EF2
+FortreeCity_House5_EventScript_PokefanF::
 	msgbox FortreeCity_House5_Text_TreeHousesAreGreat, MSGBOX_NPC
 	end
 
-FortreeCity_House5_EventScript_Man:: @ 8217EFB
+FortreeCity_House5_EventScript_Man::
 	msgbox FortreeCity_House5_Text_AdaptedToNature, MSGBOX_NPC
 	end
 
-FortreeCity_House5_EventScript_Zigzagoon:: @ 8217F04
+FortreeCity_House5_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
@@ -19,17 +19,17 @@ FortreeCity_House5_EventScript_Zigzagoon:: @ 8217F04
 	release
 	end
 
-FortreeCity_House5_Text_TreeHousesAreGreat: @ 8217F17
+FortreeCity_House5_Text_TreeHousesAreGreat:
 	.string "The tree houses of FORTREE are great!\p"
 	.string "I think it's the number one town for\n"
 	.string "living together with POKéMON.$"
 
-FortreeCity_House5_Text_AdaptedToNature: @ 8217F80
+FortreeCity_House5_Text_AdaptedToNature:
 	.string "POKéMON and people have adapted to\n"
 	.string "nature for survival.\p"
 	.string "There's no need to make nature\n"
 	.string "conform to the way we want to live.$"
 
-FortreeCity_House5_Text_Zigzagoon: @ 8217FFB
+FortreeCity_House5_Text_Zigzagoon:
 	.string "ZIGZAGOON: Bufuu!$"
 
diff --git a/data/maps/FortreeCity_Mart/scripts.inc b/data/maps/FortreeCity_Mart/scripts.inc
index 05318e7bd..c37716bc8 100644
--- a/data/maps/FortreeCity_Mart/scripts.inc
+++ b/data/maps/FortreeCity_Mart/scripts.inc
@@ -1,7 +1,7 @@
-FortreeCity_Mart_MapScripts:: @ 8217665
+FortreeCity_Mart_MapScripts::
 	.byte 0
 
-FortreeCity_Mart_EventScript_Clerk:: @ 8217666
+FortreeCity_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -12,7 +12,7 @@ FortreeCity_Mart_EventScript_Clerk:: @ 8217666
 	end
 
 	.align 2
-FortreeCity_Mart_Pokemart: @ 8217680
+FortreeCity_Mart_Pokemart:
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_SUPER_POTION
@@ -27,31 +27,31 @@ FortreeCity_Mart_Pokemart: @ 8217680
 	release
 	end
 
-FortreeCity_Mart_EventScript_Woman:: @ 8217698
+FortreeCity_Mart_EventScript_Woman::
 	msgbox FortreeCity_Mart_Text_SuperRepelBetter, MSGBOX_NPC
 	end
 
-FortreeCity_Mart_EventScript_Girl:: @ 82176A1
+FortreeCity_Mart_EventScript_Girl::
 	msgbox FortreeCity_Mart_Text_StockUpOnItems, MSGBOX_NPC
 	end
 
-FortreeCity_Mart_EventScript_Boy:: @ 82176AA
+FortreeCity_Mart_EventScript_Boy::
 	msgbox FortreeCity_Mart_Text_RareCandyMakesMonGrow, MSGBOX_NPC
 	end
 
-FortreeCity_Mart_Text_SuperRepelBetter: @ 82176B3
+FortreeCity_Mart_Text_SuperRepelBetter:
 	.string "SUPER REPEL lasts a long time,\n"
 	.string "and it gets the job done.\p"
 	.string "It's much better than an ordinary\n"
 	.string "REPEL.$"
 
-FortreeCity_Mart_Text_StockUpOnItems: @ 8217715
+FortreeCity_Mart_Text_StockUpOnItems:
 	.string "I always stock up on more items than\n"
 	.string "I'm sure I'll need.\p"
 	.string "You never know what might happen.\n"
 	.string "Better to be safe than sorry!$"
 
-FortreeCity_Mart_Text_RareCandyMakesMonGrow: @ 821778E
+FortreeCity_Mart_Text_RareCandyMakesMonGrow:
 	.string "A RARE CANDY makes a POKéMON grow\n"
 	.string "immediately by one level.$"
 
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index 5be9e6616..d1ea3d864 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_NURSE, 1
 
-FortreeCity_PokemonCenter_1F_MapScripts:: @ 82173D8
+FortreeCity_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, FortreeCity_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-FortreeCity_PokemonCenter_1F_OnTransition: @ 82173E3
+FortreeCity_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_FORTREE_CITY
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_Nurse:: @ 82173E7
+FortreeCity_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -17,25 +17,25 @@ FortreeCity_PokemonCenter_1F_EventScript_Nurse:: @ 82173E7
 	release
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_Gentleman:: @ 82173F5
+FortreeCity_PokemonCenter_1F_EventScript_Gentleman::
 	msgbox FortreeCity_PokemonCenter_1F_Text_GoToSafariZone, MSGBOX_NPC
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_Man:: @ 82173FE
+FortreeCity_PokemonCenter_1F_EventScript_Man::
 	msgbox FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat, MSGBOX_NPC
 	end
 
-FortreeCity_PokemonCenter_1F_EventScript_Boy:: @ 8217407
+FortreeCity_PokemonCenter_1F_EventScript_Boy::
 	msgbox FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav, MSGBOX_NPC
 	end
 
-FortreeCity_PokemonCenter_1F_Text_GoToSafariZone: @ 8217410
+FortreeCity_PokemonCenter_1F_Text_GoToSafariZone:
 	.string "Listen, kid, are you working\n"
 	.string "on a POKéDEX?\p"
 	.string "Hmm… Go to the SAFARI ZONE.\n"
 	.string "That's my suggestion.$"
 
-FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat: @ 821746D
+FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat:
 	.string "Have you done anything at\n"
 	.string "the RECORD CORNER?\p"
 	.string "It's pretty neat. It mixes and matches\n"
@@ -43,7 +43,7 @@ FortreeCity_PokemonCenter_1F_Text_RecordCornerIsNeat: @ 821746D
 	.string "I don't know quite how it works,\n"
 	.string "but it's cool. It's exciting, even!$"
 
-FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav: @ 821751F
+FortreeCity_PokemonCenter_1F_Text_DoYouKnowAboutPokenav:
 	.string "Oh, wow, you have a POKéNAV!\n"
 	.string "And it's just like mine!\p"
 	.string "Do you know about POKéNAV's\n"
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
index 183dbece0..cebae6b48 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
+FortreeCity_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ FortreeCity_PokemonCenter_2F_MapScripts:: @ 821763E
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-FortreeCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8217653
+FortreeCity_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-FortreeCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8217659
+FortreeCity_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-FortreeCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821765F
+FortreeCity_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc
index a35147691..1bf81b997 100644
--- a/data/maps/GraniteCave_1F/scripts.inc
+++ b/data/maps/GraniteCave_1F/scripts.inc
@@ -1,7 +1,7 @@
-GraniteCave_1F_MapScripts:: @ 822DA5D
+GraniteCave_1F_MapScripts::
 	.byte 0
 
-GraniteCave_1F_EventScript_Hiker:: @ 822DA5E
+GraniteCave_1F_EventScript_Hiker::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_ReceivedFlash
@@ -12,12 +12,12 @@ GraniteCave_1F_EventScript_Hiker:: @ 822DA5E
 	release
 	end
 
-GraniteCave_1F_EventScript_ReceivedFlash:: @ 822DA8A
+GraniteCave_1F_EventScript_ReceivedFlash::
 	msgbox GraniteCave_1F_Text_ExplainFlash, MSGBOX_DEFAULT
 	release
 	end
 
-GraniteCave_1F_Text_GetsDarkAheadHereYouGo: @ 822DA94
+GraniteCave_1F_Text_GetsDarkAheadHereYouGo:
 	.string "Hey, you.\n"
 	.string "It gets awfully dark ahead.\l"
 	.string "It'll be tough trying to explore.\p"
@@ -29,7 +29,7 @@ GraniteCave_1F_Text_GetsDarkAheadHereYouGo: @ 822DA94
 	.string "that we meet is our motto.\p"
 	.string "Here you go, I'll pass this on to you.$"
 
-GraniteCave_1F_Text_ExplainFlash: @ 822DBB7
+GraniteCave_1F_Text_ExplainFlash:
 	.string "Teach that hidden move FLASH to\n"
 	.string "a POKéMON and use it.\p"
 	.string "It lights up even the inky darkness\n"
diff --git a/data/maps/GraniteCave_B1F/scripts.inc b/data/maps/GraniteCave_B1F/scripts.inc
index f465b0694..f1b52ce66 100644
--- a/data/maps/GraniteCave_B1F/scripts.inc
+++ b/data/maps/GraniteCave_B1F/scripts.inc
@@ -1,10 +1,10 @@
-GraniteCave_B1F_MapScripts:: @ 822DC5E
+GraniteCave_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
 	map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_SetHoleWarp
 	.byte 0
 
-GraniteCave_B1F_SetHoleWarp: @ 822DC6E
+GraniteCave_B1F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
 	setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0
 	end
diff --git a/data/maps/GraniteCave_B2F/scripts.inc b/data/maps/GraniteCave_B2F/scripts.inc
index d8cacbe38..ac09ee9e9 100644
--- a/data/maps/GraniteCave_B2F/scripts.inc
+++ b/data/maps/GraniteCave_B2F/scripts.inc
@@ -1,3 +1,3 @@
-GraniteCave_B2F_MapScripts:: @ 822DC79
+GraniteCave_B2F_MapScripts::
 	.byte 0
 
diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index 650177b95..73c50b70a 100644
--- a/data/maps/GraniteCave_StevensRoom/scripts.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -1,9 +1,9 @@
 .set LOCALID_STEVEN, 1
 
-GraniteCave_StevensRoom_MapScripts:: @ 822DC7A
+GraniteCave_StevensRoom_MapScripts::
 	.byte 0
 
-GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B
+GraniteCave_StevensRoom_EventScript_Steven::
 	lock
 	faceplayer
 	msgbox GraniteCave_StevensRoom_Text_ImStevenLetterForMe, MSGBOX_DEFAULT
@@ -38,28 +38,28 @@ GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B
 	release
 	end
 
-GraniteCave_StevensRoom_EventScript_StevenExitNorth:: @ 822DD0D
+GraniteCave_StevensRoom_EventScript_StevenExitNorth::
 	applymovement LOCALID_STEVEN, GraniteCave_StevensRoom_Movement_StevenExit
 	waitmovement 0
 	return
 
-GraniteCave_StevensRoom_EventScript_StevenExitWestEast:: @ 822DD18
+GraniteCave_StevensRoom_EventScript_StevenExitWestEast::
 	applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit
 	applymovement LOCALID_STEVEN, GraniteCave_StevensRoom_Movement_StevenExit
 	waitmovement 0
 	return
 
-GraniteCave_StevensRoom_EventScript_StevenExitSouth:: @ 822DD2A
+GraniteCave_StevensRoom_EventScript_StevenExitSouth::
 	applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit
 	applymovement LOCALID_STEVEN, GraniteCave_StevensRoom_Movement_StevenExitSouth
 	waitmovement 0
 	return
 
-GraniteCave_StevensRoom_EventScript_BagFull:: @ 822DD3C
+GraniteCave_StevensRoom_EventScript_BagFull::
 	msgbox GraniteCave_StevensRoom_Text_OhBagIsFull, MSGBOX_DEFAULT
 	return
 
-GraniteCave_StevensRoom_Movement_StevenExit: @ 822DD45
+GraniteCave_StevensRoom_Movement_StevenExit:
 	walk_up
 	walk_up
 	walk_up
@@ -68,14 +68,14 @@ GraniteCave_StevensRoom_Movement_StevenExit: @ 822DD45
 	delay_8
 	step_end
 
-GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit: @ 822DD4C
+GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit:
 	delay_16
 	delay_16
 	delay_16
 	walk_in_place_fastest_up
 	step_end
 
-GraniteCave_StevensRoom_Movement_StevenExitSouth: @ 822DD51
+GraniteCave_StevensRoom_Movement_StevenExitSouth:
 	walk_left
 	walk_up
 	walk_up
@@ -86,14 +86,14 @@ GraniteCave_StevensRoom_Movement_StevenExitSouth: @ 822DD51
 	delay_8
 	step_end
 
-GraniteCave_StevensRoom_Text_ImStevenLetterForMe: @ 822DD5A
+GraniteCave_StevensRoom_Text_ImStevenLetterForMe:
 	.string "My name is STEVEN.\p"
 	.string "I'm interested in rare stones,\n"
 	.string "so I travel here and there.\p"
 	.string "Oh?\n"
 	.string "A LETTER for me?$"
 
-GraniteCave_StevensRoom_Text_ThankYouTakeThis: @ 822DDBD
+GraniteCave_StevensRoom_Text_ThankYouTakeThis:
 	.string "STEVEN: Okay, thank you.\p"
 	.string "You went through all this trouble to\n"
 	.string "deliver that. I need to thank you.\p"
@@ -102,7 +102,7 @@ GraniteCave_StevensRoom_Text_ThankYouTakeThis: @ 822DDBD
 	.string "It contains my favorite move,\n"
 	.string "STEEL WING.$"
 
-GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister: @ 822DE6B
+GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister:
 	.string "STEVEN: Your POKéMON appear quite\n"
 	.string "capable.\p"
 	.string "If you keep training, you could even\n"
@@ -113,14 +113,14 @@ GraniteCave_StevensRoom_Text_CouldBecomeChampionLetsRegister: @ 822DE6B
 	.string "our POKéNAVS.\p"
 	.string "… … … … … …$"
 
-GraniteCave_StevensRoom_Text_RegisteredSteven: @ 822DF6A
+GraniteCave_StevensRoom_Text_RegisteredSteven:
 	.string "Registered STEVEN\n"
 	.string "in the POKéNAV.$"
 
-GraniteCave_StevensRoom_Text_IveGotToHurryAlong: @ 822DF8C
+GraniteCave_StevensRoom_Text_IveGotToHurryAlong:
 	.string "Now, I've got to hurry along.$"
 
-GraniteCave_StevensRoom_Text_OhBagIsFull: @ 822DFAA
+GraniteCave_StevensRoom_Text_OhBagIsFull:
 	.string "Oh, your BAG is full…\n"
 	.string "That's too bad, then.$"
 
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index fb75273cc..3068b1184 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -1,19 +1,19 @@
-InsideOfTruck_MapScripts:: @ 823BEDA
+InsideOfTruck_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_OnLoad
 	map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_OnResume
 	.byte 0
 
-InsideOfTruck_OnLoad: @ 823BEE5
+InsideOfTruck_OnLoad:
 	setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, 0
 	setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, 0
 	setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, 0
 	end
 
-InsideOfTruck_OnResume: @ 823BF01
+InsideOfTruck_OnResume:
 	setstepcallback STEP_CB_TRUCK
 	end
 
-InsideOfTruck_EventScript_SetIntroFlags:: @ 823BF04
+InsideOfTruck_EventScript_SetIntroFlags::
 	lockall
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	checkplayergender
@@ -23,7 +23,7 @@ InsideOfTruck_EventScript_SetIntroFlags:: @ 823BF04
 	goto_if_eq InsideOfTruck_EventScript_SetIntroFlagsFemale
 	end
 
-InsideOfTruck_EventScript_SetIntroFlagsMale:: @ 823BF20
+InsideOfTruck_EventScript_SetIntroFlagsMale::
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
 	setvar VAR_LITTLEROOT_INTRO_STATE, 1
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM
@@ -36,7 +36,7 @@ InsideOfTruck_EventScript_SetIntroFlagsMale:: @ 823BF20
 	releaseall
 	end
 
-InsideOfTruck_EventScript_SetIntroFlagsFemale:: @ 823BF46
+InsideOfTruck_EventScript_SetIntroFlagsFemale::
 	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
 	setvar VAR_LITTLEROOT_INTRO_STATE, 2
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM
@@ -49,11 +49,11 @@ InsideOfTruck_EventScript_SetIntroFlagsFemale:: @ 823BF46
 	releaseall
 	end
 
-InsideOfTruck_EventScript_MovingBox:: @ 823BF6C
+InsideOfTruck_EventScript_MovingBox::
 	msgbox InsideOfTruck_Text_BoxPrintedWithMonLogo, MSGBOX_SIGN
 	end
 
-InsideOfTruck_Text_BoxPrintedWithMonLogo: @ 823BF75
+InsideOfTruck_Text_BoxPrintedWithMonLogo:
 	.string "The box is printed with a POKéMON logo.\p"
 	.string "It's a POKéMON brand moving and\n"
 	.string "delivery service.$"
diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc
index 56643a504..af93863b7 100644
--- a/data/maps/IslandCave/scripts.inc
+++ b/data/maps/IslandCave/scripts.inc
@@ -1,25 +1,25 @@
-IslandCave_MapScripts:: @ 8238E2A
+IslandCave_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, IslandCave_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, IslandCave_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, IslandCave_OnTransition
 	.byte 0
 
-IslandCave_OnResume: @ 8238E3A
+IslandCave_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_TryRemoveRegice
 	end
 
-IslandCave_EventScript_TryRemoveRegice:: @ 8238E44
+IslandCave_EventScript_TryRemoveRegice::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-IslandCave_OnLoad: @ 8238E58
+IslandCave_OnLoad:
 	call_if_unset FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_HideRegiEntrance
 	end
 
-IslandCave_EventScript_HideRegiEntrance:: @ 8238E62
+IslandCave_EventScript_HideRegiEntrance::
 	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
@@ -28,17 +28,17 @@ IslandCave_EventScript_HideRegiEntrance:: @ 8238E62
 	setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
-IslandCave_OnTransition: @ 8238E99
+IslandCave_OnTransition:
 	setflag FLAG_LANDMARK_ISLAND_CAVE
 	call IslandCave_EventScript_ClearSteps
 	call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_ShowRegice
 	end
 
-IslandCave_EventScript_ShowRegice:: @ 8238EAB
+IslandCave_EventScript_ShowRegice::
 	clearflag FLAG_HIDE_REGICE
 	return
 
-IslandCave_EventScript_OpenRegiEntrance:: @ 8238EAF
+IslandCave_EventScript_OpenRegiEntrance::
 	setmetatile 7, 19, METATILE_Cave_SealedChamberEntrance_TopLeft, 1
 	setmetatile 8, 19, METATILE_Cave_SealedChamberEntrance_TopMid, 1
 	setmetatile 9, 19, METATILE_Cave_SealedChamberEntrance_TopRight, 1
@@ -50,7 +50,7 @@ IslandCave_EventScript_OpenRegiEntrance:: @ 8238EAF
 	setflag FLAG_SYS_BRAILLE_REGICE_COMPLETED
 	end
 
-IslandCave_EventScript_CaveEntranceMiddle:: @ 8238EEF
+IslandCave_EventScript_CaveEntranceMiddle::
 	lockall
 	call_if_set FLAG_TEMP_3, IslandCave_EventScript_ClearSteps
 	goto_if_set FLAG_SYS_BRAILLE_REGICE_COMPLETED, IslandCave_EventScript_BigHoleInWall
@@ -60,12 +60,12 @@ IslandCave_EventScript_CaveEntranceMiddle:: @ 8238EEF
 	goto IslandCave_EventScript_CloseBrailleMsg
 	end
 
-IslandCave_EventScript_BigHoleInWall:: @ 8238F13
+IslandCave_EventScript_BigHoleInWall::
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-IslandCave_EventScript_CaveEntranceSide:: @ 8238F1D
+IslandCave_EventScript_CaveEntranceSide::
 	lockall
 	call_if_set FLAG_TEMP_3, IslandCave_EventScript_ClearSteps
 	braillemessage IslandCave_Braille_RunLapAroundWall
@@ -75,20 +75,20 @@ IslandCave_EventScript_CaveEntranceSide:: @ 8238F1D
 	goto IslandCave_EventScript_CloseBrailleMsg
 	end
 
-IslandCave_EventScript_CloseBrailleMsg:: @ 8238F41
+IslandCave_EventScript_CloseBrailleMsg::
 	waitbuttonpress
 	closebraillemessage
 	releaseall
 	end
 
-IslandCave_EventScript_ClearSteps:: @ 8238F45
+IslandCave_EventScript_ClearSteps::
 	setvar VAR_REGICE_STEPS_1, 0
 	setvar VAR_REGICE_STEPS_2, 0
 	setvar VAR_REGICE_STEPS_3, 0
 	clearflag FLAG_TEMP_3
 	return
 
-IslandCave_EventScript_Regice:: @ 8238F58
+IslandCave_EventScript_Regice::
 	lock
 	faceplayer
 	waitse
@@ -111,12 +111,12 @@ IslandCave_EventScript_Regice:: @ 8238F58
 	release
 	end
 
-IslandCave_EventScript_DefeatedRegice:: @ 8238F9F
+IslandCave_EventScript_DefeatedRegice::
 	setflag FLAG_DEFEATED_REGICE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-IslandCave_EventScript_RanFromRegice:: @ 8238FA8
+IslandCave_EventScript_RanFromRegice::
 	setvar VAR_0x8004, SPECIES_REGICE
 	goto Common_EventScript_LegendaryFlewAway
 	end
diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc
index c7fc95676..754ee00cf 100644
--- a/data/maps/JaggedPass/scripts.inc
+++ b/data/maps/JaggedPass/scripts.inc
@@ -1,48 +1,48 @@
 .set LOCALID_HIDEOUT_GUARD, 5
 
-JaggedPass_MapScripts:: @ 8230656
+JaggedPass_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, JaggedPass_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, JaggedPass_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, JaggedPass_OnLoad
 	.byte 0
 
-JaggedPass_OnResume: @ 8230666
+JaggedPass_OnResume:
 	setstepcallback STEP_CB_ASH
 	compare VAR_JAGGED_PASS_STATE, 0
 	call_if_eq JaggedPass_EventScript_CheckHasMagmaEmblem
 	end
 
-JaggedPass_EventScript_CheckHasMagmaEmblem:: @ 8230674
+JaggedPass_EventScript_CheckHasMagmaEmblem::
 	checkitem ITEM_MAGMA_EMBLEM, 1
 	compare VAR_RESULT, TRUE
 	goto_if_eq JaggedPass_EventScript_SetReadyToOpenHideout
 	return
 
-JaggedPass_EventScript_SetReadyToOpenHideout:: @ 8230685
+JaggedPass_EventScript_SetReadyToOpenHideout::
 	setvar VAR_JAGGED_PASS_STATE, 1
 	return
 
-JaggedPass_OnTransition: @ 823068B
+JaggedPass_OnTransition:
 	compare VAR_JAGGED_PASS_ASH_WEATHER, 1
 	call_if_eq JaggedPass_EventScript_SetWeatherAsh
 	end
 
-JaggedPass_EventScript_SetWeatherAsh:: @ 8230697
+JaggedPass_EventScript_SetWeatherAsh::
 	setweather WEATHER_VOLCANIC_ASH
 	doweather
 	return
 
-JaggedPass_OnLoad: @ 823069C
+JaggedPass_OnLoad:
 	compare VAR_JAGGED_PASS_STATE, 1
 	goto_if_le JaggedPass_EventScript_ConcealHideoutEntrance
 	end
 
-JaggedPass_EventScript_ConcealHideoutEntrance:: @ 82306A8
+JaggedPass_EventScript_ConcealHideoutEntrance::
 	setmetatile 16, 17, METATILE_Lavaridge_RockWall, 1
 	setmetatile 16, 18, METATILE_Lavaridge_RockWall, 1
 	end
 
-JaggedPass_EventScript_OpenMagmaHideout:: @ 82306BB
+JaggedPass_EventScript_OpenMagmaHideout::
 	lockall
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -68,7 +68,7 @@ JaggedPass_EventScript_OpenMagmaHideout:: @ 82306BB
 	releaseall
 	end
 
-JaggedPass_EventScript_MagmaHideoutGuard:: @ 8230718
+JaggedPass_EventScript_MagmaHideoutGuard::
 	lockall
 	goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_GuardDefeated
 	waitse
@@ -88,7 +88,7 @@ JaggedPass_EventScript_MagmaHideoutGuard:: @ 8230718
 	releaseall
 	end
 
-JaggedPass_EventScript_GuardDefeated:: @ 8230766
+JaggedPass_EventScript_GuardDefeated::
 	applymovement LOCALID_HIDEOUT_GUARD, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox JaggedPass_Text_GoWhereverYouWant, MSGBOX_DEFAULT
@@ -98,12 +98,12 @@ JaggedPass_EventScript_GuardDefeated:: @ 8230766
 	releaseall
 	end
 
-JaggedPass_EventScript_Eric:: @ 8230785
+JaggedPass_EventScript_Eric::
 	trainerbattle_single TRAINER_ERIC, JaggedPass_Text_EricIntro, JaggedPass_Text_EricDefeat
 	msgbox JaggedPass_Text_EricPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-JaggedPass_EventScript_Diana:: @ 823079C
+JaggedPass_EventScript_Diana::
 	trainerbattle_single TRAINER_DIANA_1, JaggedPass_Text_DianaIntro, JaggedPass_Text_DianaDefeat, JaggedPass_EventScript_RegisterDiana
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -112,19 +112,19 @@ JaggedPass_EventScript_Diana:: @ 823079C
 	release
 	end
 
-JaggedPass_EventScript_RegisterDiana:: @ 82307C8
+JaggedPass_EventScript_RegisterDiana::
 	special PlayerFaceTrainerAfterBattle
 	msgbox JaggedPass_Text_DianaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DIANA_1
 	release
 	end
 
-JaggedPass_EventScript_DianaRematch:: @ 82307E4
+JaggedPass_EventScript_DianaRematch::
 	trainerbattle_rematch TRAINER_DIANA_1, JaggedPass_Text_DianaRematchIntro, JaggedPass_Text_DianaRematchDefeat
 	msgbox JaggedPass_Text_DianaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-JaggedPass_EventScript_Ethan:: @ 82307FB
+JaggedPass_EventScript_Ethan::
 	trainerbattle_single TRAINER_ETHAN_1, JaggedPass_Text_EthanIntro, JaggedPass_Text_EthanDefeat, JaggedPass_EventScript_RegisterEthan
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -133,142 +133,142 @@ JaggedPass_EventScript_Ethan:: @ 82307FB
 	release
 	end
 
-JaggedPass_EventScript_RegisterEthan:: @ 8230827
+JaggedPass_EventScript_RegisterEthan::
 	special PlayerFaceTrainerAfterBattle
 	msgbox JaggedPass_Text_EthanRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ETHAN_1
 	release
 	end
 
-JaggedPass_EventScript_EthanRematch:: @ 8230843
+JaggedPass_EventScript_EthanRematch::
 	trainerbattle_rematch TRAINER_ETHAN_1, JaggedPass_Text_EthanRematchIntro, JaggedPass_Text_EthanRematchDefeat
 	msgbox JaggedPass_Text_EthanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-JaggedPass_EventScript_Julio:: @ 823085A
+JaggedPass_EventScript_Julio::
 	trainerbattle_single TRAINER_JULIO, JaggedPass_Text_JulioIntro, JaggedPass_Text_JulioDefeat
 	msgbox JaggedPass_Text_JulioPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-JaggedPass_EventScript_Autumn:: @ 8230871
+JaggedPass_EventScript_Autumn::
 	trainerbattle_single TRAINER_AUTUMN, JaggedPass_Text_AutumnIntro, JaggedPass_Text_AutumnDefeat
 	msgbox JaggedPass_Text_AutumnPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-JaggedPass_Text_EricIntro: @ 8230888
+JaggedPass_Text_EricIntro:
 	.string "MT. CHIMNEY's JAGGED PASS…\p"
 	.string "Now this is what I've always wanted\n"
 	.string "in a mountain.\p"
 	.string "This jagged bumpiness…\n"
 	.string "It rocks my soul!$"
 
-JaggedPass_Text_EricDefeat: @ 82308FF
+JaggedPass_Text_EricDefeat:
 	.string "Losing left me bitter!$"
 
-JaggedPass_Text_EricPostBattle: @ 8230916
+JaggedPass_Text_EricPostBattle:
 	.string "Yes, I did lose at POKéMON…\p"
 	.string "But, when it comes to the love of\n"
 	.string "the mountains, I have you beat!$"
 
-JaggedPass_Text_DianaIntro: @ 8230974
+JaggedPass_Text_DianaIntro:
 	.string "This place isn't your casual hike.\n"
 	.string "It's not suited for a picnic.$"
 
-JaggedPass_Text_DianaDefeat: @ 82309B5
+JaggedPass_Text_DianaDefeat:
 	.string "Ohhh, no!\n"
 	.string "The ground is too bumpy…$"
 
-JaggedPass_Text_DianaPostBattle: @ 82309D8
+JaggedPass_Text_DianaPostBattle:
 	.string "Did you know?\p"
 	.string "Some people cleverly ride their\n"
 	.string "bicycles up this horribly bumpy pass.$"
 
-JaggedPass_Text_DianaRegister: @ 8230A2C
+JaggedPass_Text_DianaRegister:
 	.string "Will you ever be back in this area?\n"
 	.string "If you do return, I'd like a rematch.$"
 
-JaggedPass_Text_DianaRematchIntro: @ 8230A76
+JaggedPass_Text_DianaRematchIntro:
 	.string "Picnics are fun wherever you go.\n"
 	.string "Just like POKéMON!$"
 
-JaggedPass_Text_DianaRematchDefeat: @ 8230AAA
+JaggedPass_Text_DianaRematchDefeat:
 	.string "I only lost because the ground is\n"
 	.string "too bumpy!$"
 
-JaggedPass_Text_DianaPostRematch: @ 8230AD7
+JaggedPass_Text_DianaPostRematch:
 	.string "I'll forget about losing and just\n"
 	.string "enjoy this bumpy hike.$"
 
-JaggedPass_Text_EthanIntro: @ 8230B10
+JaggedPass_Text_EthanIntro:
 	.string "JAGGED PASS is hard to walk on.\n"
 	.string "It's a good place for training.$"
 
-JaggedPass_Text_EthanDefeat: @ 8230B50
+JaggedPass_Text_EthanDefeat:
 	.string "It was all over while we were still\n"
 	.string "trying to find a good footing…$"
 
-JaggedPass_Text_EthanPostBattle: @ 8230B93
+JaggedPass_Text_EthanPostBattle:
 	.string "If I had an ACRO BIKE, I'd be able to\n"
 	.string "jump ledges.$"
 
-JaggedPass_Text_EthanRegister: @ 8230BC6
+JaggedPass_Text_EthanRegister:
 	.string "When I get more used to this bumpiness,\n"
 	.string "I'll be sure to win!\p"
 	.string "Can you register me in your POKéNAV?$"
 
-JaggedPass_Text_EthanRematchIntro: @ 8230C28
+JaggedPass_Text_EthanRematchIntro:
 	.string "I got used to this bumpiness.\n"
 	.string "I sing while I climb now.$"
 
-JaggedPass_Text_EthanRematchDefeat: @ 8230C60
+JaggedPass_Text_EthanRematchDefeat:
 	.string "It's still not easy to battle on this\n"
 	.string "bumpy ground…$"
 
-JaggedPass_Text_EthanPostRematch: @ 8230C94
+JaggedPass_Text_EthanPostRematch:
 	.string "I should get an ACRO BIKE from RYDEL\n"
 	.string "in MAUVILLE CITY…$"
 
-JaggedPass_Text_GruntIntro: @ 8230CCB
+JaggedPass_Text_GruntIntro:
 	.string "Wah!\n"
 	.string "What are you doing here?\p"
 	.string "What am I doing in a place like this?\p"
 	.string "What business is it of yours?$"
 
-JaggedPass_Text_GruntDefeat: @ 8230D2D
+JaggedPass_Text_GruntDefeat:
 	.string "Urrrgh…\p"
 	.string "I should've ducked into our HIDEOUT\n"
 	.string "right away…$"
 
-JaggedPass_Text_GoWhereverYouWant: @ 8230D65
+JaggedPass_Text_GoWhereverYouWant:
 	.string "Okay, oh-kay!\n"
 	.string "I admit it--you're strong!\p"
 	.string "Don't worry about me.\n"
 	.string "Go wherever you want!$"
 
-JaggedPass_Text_BoulderShakingInResponseToEmblem: @ 8230DBA
+JaggedPass_Text_BoulderShakingInResponseToEmblem:
 	.string "Oh! This boulder is shaking in response\n"
 	.string "to the MAGMA EMBLEM!$"
 
-JaggedPass_Text_JulioIntro: @ 8230DF7
+JaggedPass_Text_JulioIntro:
 	.string "Aiyeeh! It's awfully scary to shoot\n"
 	.string "down the mountain in one go!$"
 
-JaggedPass_Text_JulioDefeat: @ 8230E38
+JaggedPass_Text_JulioDefeat:
 	.string "I feel like I'm falling apart…$"
 
-JaggedPass_Text_JulioPostBattle: @ 8230E57
+JaggedPass_Text_JulioPostBattle:
 	.string "My bicycle bounced around so much,\n"
 	.string "my rear end's sore…$"
 
-JaggedPass_Text_AutumnIntro: @ 8230E8E
+JaggedPass_Text_AutumnIntro:
 	.string "I climb this hill every day.\n"
 	.string "I have confidence in my strength!$"
 
-JaggedPass_Text_AutumnDefeat: @ 8230ECD
+JaggedPass_Text_AutumnDefeat:
 	.string "Hmm…\n"
 	.string "What went wrong?$"
 
-JaggedPass_Text_AutumnPostBattle: @ 8230EE3
+JaggedPass_Text_AutumnPostBattle:
 	.string "What is that odd rock protrusion\n"
 	.string "a little up the hill from here?$"
 
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
index 59275c526..baa9027a9 100644
--- a/data/maps/LavaridgeTown/scripts.inc
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -1,12 +1,12 @@
 .set LOCALID_RIVAL_ON_BIKE, 7
 .set LOCALID_RIVAL, 8
 
-LavaridgeTown_MapScripts:: @ 81EA4D3
+LavaridgeTown_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, LavaridgeTown_OnFrame
 	.byte 0
 
-LavaridgeTown_OnTransition: @ 81EA4DE
+LavaridgeTown_OnTransition:
 	setflag FLAG_VISITED_LAVARIDGE_TOWN
 	call_if_set FLAG_WHITEOUT_TO_LAVARIDGE, LavaridgeTown_EventScript_ClearLavaridgeWhiteOut
 	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_ShowMtChimneyTrainers
@@ -18,36 +18,36 @@ LavaridgeTown_OnTransition: @ 81EA4DE
 	call_if_eq LavaridgeTown_EventScript_HideMapNamePopup
 	end
 
-LavaridgeTown_EventScript_ClearLavaridgeWhiteOut:: @ 81EA514
+LavaridgeTown_EventScript_ClearLavaridgeWhiteOut::
 	clearflag FLAG_WHITEOUT_TO_LAVARIDGE
 	return
 
-LavaridgeTown_EventScript_CheckSetRivalPos:: @ 81EA518
+LavaridgeTown_EventScript_CheckSetRivalPos::
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 9
 	goto_if_eq LavaridgeTown_EventScript_SetRivalPos
 	return
 
-LavaridgeTown_EventScript_SetRivalPos:: @ 81EA529
+LavaridgeTown_EventScript_SetRivalPos::
 	setobjectxyperm LOCALID_RIVAL, 11, 9
 	setobjectxyperm LOCALID_RIVAL_ON_BIKE, 9, 8
 	setobjectmovementtype LOCALID_RIVAL_ON_BIKE, MOVEMENT_TYPE_FACE_UP
 	clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL
 	return
 
-LavaridgeTown_EventScript_ShowMtChimneyTrainers:: @ 81EA53F
+LavaridgeTown_EventScript_ShowMtChimneyTrainers::
 	clearflag FLAG_HIDE_MT_CHIMNEY_TRAINERS
 	return
 
-LavaridgeTown_EventScript_HideMapNamePopup:: @ 81EA543
+LavaridgeTown_EventScript_HideMapNamePopup::
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-LavaridgeTown_OnFrame: @ 81EA547
+LavaridgeTown_OnFrame:
 	map_script_2 VAR_LAVARIDGE_TOWN_STATE, 1, LavaridgeTown_EventScript_RivalGiveGoGoggles
 	.2byte 0
 
-LavaridgeTown_EventScript_RivalGiveGoGoggles:: @ 81EA551
+LavaridgeTown_EventScript_RivalGiveGoGoggles::
 	lockall
 	getplayerxy VAR_0x8008, VAR_0x8009
 	compare VAR_0x8008, 9
@@ -71,7 +71,7 @@ LavaridgeTown_EventScript_RivalGiveGoGoggles:: @ 81EA551
 	goto_if_eq LavaridgeTown_EventScript_BrendanGiveGoGoggles
 	end
 
-LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5
+LavaridgeTown_EventScript_MayGiveGoGoggles::
 	msgbox LavaridgeTown_Text_MayNiceBadgesTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_GO_GOGGLES
 	setflag FLAG_RECEIVED_GO_GOGGLES
@@ -79,7 +79,7 @@ LavaridgeTown_EventScript_MayGiveGoGoggles:: @ 81EA5B5
 	goto LavaridgeTown_EventScript_RivalExit
 	end
 
-LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 81EA5DA
+LavaridgeTown_EventScript_BrendanGiveGoGoggles::
 	msgbox LavaridgeTown_Text_BrendanNiceBadgesTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_GO_GOGGLES
 	setflag FLAG_RECEIVED_GO_GOGGLES
@@ -87,7 +87,7 @@ LavaridgeTown_EventScript_BrendanGiveGoGoggles:: @ 81EA5DA
 	goto LavaridgeTown_EventScript_RivalExit
 	end
 
-LavaridgeTown_EventScript_RivalExit:: @ 81EA5FF
+LavaridgeTown_EventScript_RivalExit::
 	closemessage
 	removeobject LOCALID_RIVAL
 	addobject LOCALID_RIVAL_ON_BIKE
@@ -104,15 +104,15 @@ LavaridgeTown_EventScript_RivalExit:: @ 81EA5FF
 	releaseall
 	end
 
-LavaridgeTown_EventScript_PlayMayMusic:: @ 81EA630
+LavaridgeTown_EventScript_PlayMayMusic::
 	playbgm MUS_ENCOUNTER_MAY, TRUE
 	return
 
-LavaridgeTown_EventScript_PlayBrendanMusic:: @ 81EA635
+LavaridgeTown_EventScript_PlayBrendanMusic::
 	playbgm MUS_ENCOUNTER_BRENDAN, TRUE
 	return
 
-LavaridgeTown_EventScript_RivalNoticePlayer:: @ 81EA63A
+LavaridgeTown_EventScript_RivalNoticePlayer::
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
@@ -122,7 +122,7 @@ LavaridgeTown_EventScript_RivalNoticePlayer:: @ 81EA63A
 	waitmovement 0
 	return
 
-LavaridgeTown_EventScript_RivalExitHerbShop:: @ 81EA65C
+LavaridgeTown_EventScript_RivalExitHerbShop::
 	opendoor 12, 15
 	waitdooranim
 	addobject LOCALID_RIVAL
@@ -141,28 +141,28 @@ LavaridgeTown_EventScript_RivalExitHerbShop:: @ 81EA65C
 	waitmovement 0
 	return
 
-LavaridgeTown_EventScript_RivalApproachPlayer1:: @ 81EA6A1
+LavaridgeTown_EventScript_RivalApproachPlayer1::
 	applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer1
 	waitmovement 0
 	return
 
-LavaridgeTown_EventScript_RivalApproachPlayer2:: @ 81EA6AC
+LavaridgeTown_EventScript_RivalApproachPlayer2::
 	applymovement LOCALID_RIVAL, LavaridgeTown_Movement_RivalApproachPlayer2
 	waitmovement 0
 	return
 
-LavaridgeTown_EventScript_RivalExit1:: @ 81EA6B7
+LavaridgeTown_EventScript_RivalExit1::
 	applymovement OBJ_EVENT_ID_PLAYER, LavaridgeTown_Movement_PlayerWatchRivalExit
 	applymovement LOCALID_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit1
 	waitmovement 0
 	return
 
-LavaridgeTown_EventScript_RivalExit2:: @ 81EA6C9
+LavaridgeTown_EventScript_RivalExit2::
 	applymovement LOCALID_RIVAL_ON_BIKE, LavaridgeTown_Movement_RivalExit2
 	waitmovement 0
 	return
 
-LavaridgeTown_Movement_RivalExit2: @ 81EA6D4
+LavaridgeTown_Movement_RivalExit2:
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -175,13 +175,13 @@ LavaridgeTown_Movement_RivalExit2: @ 81EA6D4
 	walk_fast_up
 	step_end
 
-LavaridgeTown_Movement_PlayerWatchRivalExit: @ 81EA6DF
+LavaridgeTown_Movement_PlayerWatchRivalExit:
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-LavaridgeTown_Movement_RivalExit1: @ 81EA6E3
+LavaridgeTown_Movement_RivalExit1:
 	walk_fast_down
 	walk_fast_right
 	walk_fast_right
@@ -193,7 +193,7 @@ LavaridgeTown_Movement_RivalExit1: @ 81EA6E3
 	walk_fast_right
 	step_end
 
-LavaridgeTown_Movement_RivalApproachPlayer2: @ 81EA6ED
+LavaridgeTown_Movement_RivalApproachPlayer2:
 	walk_left
 	walk_left
 	walk_left
@@ -202,51 +202,51 @@ LavaridgeTown_Movement_RivalApproachPlayer2: @ 81EA6ED
 	walk_left
 	step_end
 
-LavaridgeTown_Movement_RivalApproachPlayer1: @ 81EA6F4
+LavaridgeTown_Movement_RivalApproachPlayer1:
 	walk_left
 	walk_left
 	walk_up
 	step_end
 
-LavaridgeTown_Movement_RivalExitHerbShop: @ 81EA6F8
+LavaridgeTown_Movement_RivalExitHerbShop:
 	walk_down
 	step_end
 
-LavaridgeTown_EventScript_HotSpringsTrigger:: @ 81EA6FA
+LavaridgeTown_EventScript_HotSpringsTrigger::
 	specialvar VAR_RESULT, GetPlayerFacingDirection
 	compare VAR_RESULT, DIR_SOUTH
 	goto_if_eq LavaridgeTown_EventScript_EnteredHotSprings
 	end
 
-LavaridgeTown_EventScript_EnteredHotSprings:: @ 81EA70B
+LavaridgeTown_EventScript_EnteredHotSprings::
 	incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS
 	end
 
-LavaridgeTown_EventScript_ExpertM:: @ 81EA70E
+LavaridgeTown_EventScript_ExpertM::
 	msgbox LavaridgeTown_Text_HotSpringsNeverRunDry, MSGBOX_NPC
 	end
 
-LavaridgeTown_EventScript_OldMan:: @ 81EA717
+LavaridgeTown_EventScript_OldMan::
 	msgbox LavaridgeTown_Text_PokemonNippedBackside, MSGBOX_SIGN
 	end
 
-LavaridgeTown_EventScript_Twin:: @ 81EA720
+LavaridgeTown_EventScript_Twin::
 	msgbox LavaridgeTown_Text_BatheInHotSpringsEveryDay, MSGBOX_NPC
 	end
 
-LavaridgeTown_EventScript_HotSpringsOldWoman1:: @ 81EA729
+LavaridgeTown_EventScript_HotSpringsOldWoman1::
 	msgbox LavaridgeTown_Text_IfPokemonInHotSprings, MSGBOX_NPC
 	end
 
-LavaridgeTown_EventScript_HotSpringsOldWoman2:: @ 81EA732
+LavaridgeTown_EventScript_HotSpringsOldWoman2::
 	msgbox LavaridgeTown_Text_HotSpringsClaims, MSGBOX_NPC
 	end
 
-LavaridgeTown_EventScript_ExpertF:: @ 81EA73B
+LavaridgeTown_EventScript_ExpertF::
 	msgbox LavaridgeTown_Text_OhYouLikeHotSprings, MSGBOX_NPC
 	end
 
-LavaridgeTown_EventScript_EggWoman:: @ 81EA744
+LavaridgeTown_EventScript_EggWoman::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_ReceivedEgg
@@ -265,34 +265,34 @@ LavaridgeTown_EventScript_EggWoman:: @ 81EA744
 	release
 	end
 
-LavaridgeTown_EventScript_ReceivedEgg:: @ 81EA787
+LavaridgeTown_EventScript_ReceivedEgg::
 	msgbox LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_EventScript_NoRoomForEgg:: @ 81EA791
+LavaridgeTown_EventScript_NoRoomForEgg::
 	msgbox LavaridgeTown_Text_NoRoomForThisEgg, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_EventScript_DeclineEgg:: @ 81EA79B
+LavaridgeTown_EventScript_DeclineEgg::
 	msgbox LavaridgeTown_Text_AsYouWishThen, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_EventScript_TownSign:: @ 81EA7A5
+LavaridgeTown_EventScript_TownSign::
 	msgbox LavaridgeTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-LavaridgeTown_EventScript_GymSign:: @ 81EA7AE
+LavaridgeTown_EventScript_GymSign::
 	msgbox LavaridgeTown_Text_GymSign, MSGBOX_SIGN
 	end
 
-LavaridgeTown_EventScript_HerbShopSign:: @ 81EA7B7
+LavaridgeTown_EventScript_HerbShopSign::
 	msgbox LavaridgeTown_Text_HerbShopSign, MSGBOX_SIGN
 	end
 
-LavaridgeTown_Text_MayNiceBadgesTakeThis: @ 81EA7C0
+LavaridgeTown_Text_MayNiceBadgesTakeThis:
 	.string "MAY: {PLAYER}{KUN}! Long time no see!\p"
 	.string "Oh? While I visited the hot springs,\n"
 	.string "you got the LAVARIDGE GYM BADGE.\p"
@@ -302,7 +302,7 @@ LavaridgeTown_Text_MayNiceBadgesTakeThis: @ 81EA7C0
 	.string "I guess it would be okay for you to\n"
 	.string "have this.$"
 
-LavaridgeTown_Text_MayExplainGoGogglesChallengeDad: @ 81EA897
+LavaridgeTown_Text_MayExplainGoGogglesChallengeDad:
 	.string "MAY: With those GO-GOGGLES, you'll\n"
 	.string "have no trouble getting through the\l"
 	.string "desert near ROUTE 111.\p"
@@ -314,7 +314,7 @@ LavaridgeTown_Text_MayExplainGoGogglesChallengeDad: @ 81EA897
 	.string "your dad in PETALBURG GYM.\p"
 	.string "See you again!$"
 
-LavaridgeTown_Text_BrendanNiceBadgesTakeThis: @ 81EA9A2
+LavaridgeTown_Text_BrendanNiceBadgesTakeThis:
 	.string "BRENDAN: {PLAYER}, hey, it's been a while.\n"
 	.string "How's it going?\p"
 	.string "Hmm…\n"
@@ -322,7 +322,7 @@ LavaridgeTown_Text_BrendanNiceBadgesTakeThis: @ 81EA9A2
 	.string "All right, then.\n"
 	.string "You may as well have this.$"
 
-LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad: @ 81EAA2E
+LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad:
 	.string "BRENDAN: Keep those with you if you're\n"
 	.string "planning on going into that desert near\l"
 	.string "ROUTE 111.\p"
@@ -336,7 +336,7 @@ LavaridgeTown_Text_BrendanExplainGoGogglesChallengeDad: @ 81EAA2E
 	.string "he really is tough.\p"
 	.string "See you around!$"
 
-LavaridgeTown_Text_HaveEggWillYouTakeIt: @ 81EAB80
+LavaridgeTown_Text_HaveEggWillYouTakeIt:
 	.string "I have here an EGG.\p"
 	.string "I'd hoped to hatch it by covering it in\n"
 	.string "hot sand by the hot springs.\l"
@@ -349,28 +349,28 @@ LavaridgeTown_Text_HaveEggWillYouTakeIt: @ 81EAB80
 	.string "So, what say you?\n"
 	.string "Will you take this EGG to hatch?$"
 
-LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg: @ 81EACC0
+LavaridgeTown_Text_HopeYoullWalkPlentyWithEgg:
 	.string "Good! I hope you'll walk plenty with\n"
 	.string "this here EGG!$"
 
-LavaridgeTown_Text_ReceivedTheEgg: @ 81EACF4
+LavaridgeTown_Text_ReceivedTheEgg:
 	.string "{PLAYER} received the EGG.$"
 
-LavaridgeTown_Text_NoRoomForThisEgg: @ 81EAD09
+LavaridgeTown_Text_NoRoomForThisEgg:
 	.string "Oh? You've too many POKéMON.\n"
 	.string "There's no room for this EGG…$"
 
-LavaridgeTown_Text_AsYouWishThen: @ 81EAD44
+LavaridgeTown_Text_AsYouWishThen:
 	.string "As you wish, then…\p"
 	.string "If you have a change of heart about\n"
 	.string "hatching this EGG, I will be here.$"
 
-LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare: @ 81EAD9E
+LavaridgeTown_Text_EverySoOftenEggFoundAtDayCare:
 	.string "Every so often, an EGG will be found at\n"
 	.string "the POKéMON DAY CARE.\p"
 	.string "Or at least that's how the rumor goes.$"
 
-LavaridgeTown_Text_HotSpringsNeverRunDry: @ 81EAE03
+LavaridgeTown_Text_HotSpringsNeverRunDry:
 	.string "We draw as much hot water as we need,\n"
 	.string "and yet the hot springs never run dry.\p"
 	.string "Isn't it magical?\p"
@@ -379,47 +379,47 @@ LavaridgeTown_Text_HotSpringsNeverRunDry: @ 81EAE03
 	.string "ground are heated by magma to well up\l"
 	.string "as hot springs.$"
 
-LavaridgeTown_Text_PokemonNippedBackside: @ 81EAEE1
+LavaridgeTown_Text_PokemonNippedBackside:
 	.string "Being buried in this hot sand is…\n"
 	.string "Sigh…\p"
 	.string "So warm and heavenly…\p"
 	.string "Eh? Gyaah! Ouch!\p"
 	.string "A POKéMON nipped my backside!$"
 
-LavaridgeTown_Text_OhYouLikeHotSprings: @ 81EAF4E
+LavaridgeTown_Text_OhYouLikeHotSprings:
 	.string "Oh, you like hot springs, do you?\p"
 	.string "That's surprising for one as young\n"
 	.string "as you.$"
 
-LavaridgeTown_Text_BatheInHotSpringsEveryDay: @ 81EAF9B
+LavaridgeTown_Text_BatheInHotSpringsEveryDay:
 	.string "I bathe in the hot springs every day.\p"
 	.string "I want to become a beautiful and strong\n"
 	.string "GYM LEADER like FLANNERY.$"
 
-LavaridgeTown_Text_IfPokemonInHotSprings: @ 81EB003
+LavaridgeTown_Text_IfPokemonInHotSprings:
 	.string "If people put POKéMON in hot springs,\n"
 	.string "it might be seriously strange.\p"
 	.string "Why, it might be an electric bath, or\n"
 	.string "a bubble bath, or even a lava bath…$"
 
-LavaridgeTown_Text_HotSpringsClaims: @ 81EB092
+LavaridgeTown_Text_HotSpringsClaims:
 	.string "They're claiming that these hot springs\n"
 	.string "are good for calming nervous tension,\l"
 	.string "relieving aching muscles, solving\l"
 	.string "romantic problems, and attracting\l"
 	.string "money…$"
 
-LavaridgeTown_Text_TownSign: @ 81EB12B
+LavaridgeTown_Text_TownSign:
 	.string "LAVARIDGE TOWN\p"
 	.string "“POKéMON CENTER HOT SPRINGS\n"
 	.string "An excellent place for relaxing!”$"
 
-LavaridgeTown_Text_GymSign: @ 81EB178
+LavaridgeTown_Text_GymSign:
 	.string "LAVARIDGE TOWN POKéMON GYM\n"
 	.string "LEADER: FLANNERY\l"
 	.string "“One with a fiery passion that burns!”$"
 
-LavaridgeTown_Text_HerbShopSign: @ 81EB1CB
+LavaridgeTown_Text_HerbShopSign:
 	.string "POKéMON HERB SHOP\n"
 	.string "“Bitter taste--better cure!”$"
 
diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index 901969416..608f32e24 100644
--- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
@@ -3,17 +3,17 @@
 .set LOCALID_AXLE, 4
 .set LOCALID_DANIELLE, 5
 
-LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4
+LavaridgeTown_Gym_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_1F_OnTransition
 	.byte 0
 
-LavaridgeTown_Gym_1F_OnTransition: @ 81FE6FA
+LavaridgeTown_Gym_1F_OnTransition:
 	call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars
 	call LavaridgeTown_Gym_1F_EventScript_CheckBuryTrainers
 	end
 
 @ Unclear where/if these temp vars are getting checked
-LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars:: @ 81FE705
+LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars::
 	setvar VAR_TEMP_B, 0
 	setvar VAR_TEMP_C, 0
 	setvar VAR_TEMP_D, 0
@@ -21,34 +21,34 @@ LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars:: @ 81FE705
 	setvar VAR_TEMP_F, 0
 	goto_if_defeated TRAINER_COLE LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar
 	setvar VAR_TEMP_B, 1
-LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar:: @ 81FE72C
+LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar::
 	goto_if_defeated TRAINER_GERALD, LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar
 	setvar VAR_TEMP_C, 1
-LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar:: @ 81FE73A
+LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar::
 	goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar
 	setvar VAR_TEMP_D, 1
-LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar:: @ 81FE748
+LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar::
 	goto_if_defeated TRAINER_DANIELLE, LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars
 	setvar VAR_TEMP_E, 1
-LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81FE756
+LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars::
 	return
 
-LavaridgeTown_Gym_1F_EventScript_CheckBuryTrainers:: @ 81FE757
+LavaridgeTown_Gym_1F_EventScript_CheckBuryTrainers::
 	goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_CheckBuryGerald
 	setobjectmovementtype LOCALID_COLE, MOVEMENT_TYPE_BURIED
-LavaridgeTown_Gym_1F_EventScript_CheckBuryGerald:: @ 81FE764
+LavaridgeTown_Gym_1F_EventScript_CheckBuryGerald::
 	goto_if_defeated TRAINER_GERALD, LavaridgeTown_Gym_1F_EventScript_CheckBuryAxle
 	setobjectmovementtype LOCALID_GERALD, MOVEMENT_TYPE_BURIED
-LavaridgeTown_Gym_1F_EventScript_CheckBuryAxle:: @ 81FE771
+LavaridgeTown_Gym_1F_EventScript_CheckBuryAxle::
 	goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_CheckBuryDanielle
 	setobjectmovementtype LOCALID_AXLE, MOVEMENT_TYPE_BURIED
-LavaridgeTown_Gym_1F_EventScript_CheckBuryDanielle:: @ 81FE77E
+LavaridgeTown_Gym_1F_EventScript_CheckBuryDanielle::
 	goto_if_defeated TRAINER_DANIELLE, LavaridgeTown_Gym_1F_EventScript_EndCheckBuryTrainers
 	setobjectmovementtype LOCALID_DANIELLE, MOVEMENT_TYPE_BURIED
-LavaridgeTown_Gym_1F_EventScript_EndCheckBuryTrainers:: @ 81FE78B
+LavaridgeTown_Gym_1F_EventScript_EndCheckBuryTrainers::
 	return
 
-LavaridgeTown_Gym_1F_EventScript_Flannery:: @ 81FE78C
+LavaridgeTown_Gym_1F_EventScript_Flannery::
 	trainerbattle_single TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryIntro, LavaridgeTown_Gym_1F_Text_FlanneryDefeat, LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -58,7 +58,7 @@ LavaridgeTown_Gym_1F_EventScript_Flannery:: @ 81FE78C
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1
+LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated::
 	message LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
@@ -85,7 +85,7 @@ LavaridgeTown_Gym_1F_EventScript_FlanneryDefeated:: @ 81FE7C1
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_GiveOverheat2:: @ 81FE81D
+LavaridgeTown_Gym_1F_EventScript_GiveOverheat2::
 	giveitem ITEM_TM50
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -94,7 +94,7 @@ LavaridgeTown_Gym_1F_EventScript_GiveOverheat2:: @ 81FE81D
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_GiveOverheat:: @ 81FE841
+LavaridgeTown_Gym_1F_EventScript_GiveOverheat::
 	giveitem ITEM_TM50
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_BagIsFull
@@ -102,17 +102,17 @@ LavaridgeTown_Gym_1F_EventScript_GiveOverheat:: @ 81FE841
 	setflag FLAG_RECEIVED_TM50
 	return
 
-LavaridgeTown_Gym_1F_EventScript_FlanneryRematch:: @ 81FE864
+LavaridgeTown_Gym_1F_EventScript_FlanneryRematch::
 	trainerbattle_rematch_double TRAINER_FLANNERY_1, LavaridgeTown_Gym_1F_Text_FlanneryPreRematch, LavaridgeTown_Gym_1F_Text_FlanneryRematchDefeat, LavaridgeTown_Gym_1F_Text_FlanneryRematchNeedTwoMons
 	msgbox LavaridgeTown_Gym_1F_Text_FlanneryPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_Cole:: @ 81FE87F
+LavaridgeTown_Gym_1F_EventScript_Cole::
 	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_COLE, LOCALID_COLE, LavaridgeTown_Gym_1F_Text_ColeIntro, LavaridgeTown_Gym_1F_Text_ColeDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_1F_Text_ColePostBattle MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_EventScript_CheckTrainerScript:: @ 81FE89A
+LavaridgeTown_Gym_EventScript_CheckTrainerScript::
 	call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars
 	release
 	special ShouldTryGetTrainerScript
@@ -120,42 +120,42 @@ LavaridgeTown_Gym_EventScript_CheckTrainerScript:: @ 81FE89A
 	goto_if_eq EventScript_GotoTrainerScript
 	end
 
-LavaridgeTown_Gym_1F_EventScript_Axle:: @ 81FE8AF
+LavaridgeTown_Gym_1F_EventScript_Axle::
 	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_AXLE, LOCALID_AXLE, LavaridgeTown_Gym_1F_Text_AxleIntro, LavaridgeTown_Gym_1F_Text_AxleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_1F_Text_AxlePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_Keegan:: @ 81FE8CA
+LavaridgeTown_Gym_B1F_EventScript_Keegan::
 	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_KEEGAN, LOCALID_KEEGAN, LavaridgeTown_Gym_B1F_Text_KeeganIntro, LavaridgeTown_Gym_B1F_Text_KeeganDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_B1F_Text_KeeganPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_Danielle:: @ 81FE8E5
+LavaridgeTown_Gym_1F_EventScript_Danielle::
 	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_DANIELLE, LOCALID_DANIELLE, LavaridgeTown_Gym_1F_Text_DanielleIntro, LavaridgeTown_Gym_1F_Text_DanielleDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_1F_Text_DaniellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_Gerald:: @ 81FE900
+LavaridgeTown_Gym_1F_EventScript_Gerald::
 	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_GERALD, LOCALID_GERALD, LavaridgeTown_Gym_1F_Text_GeraldIntro, LavaridgeTown_Gym_1F_Text_GeraldDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_1F_Text_GeraldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_Jace:: @ 81FE91B
+LavaridgeTown_Gym_B1F_EventScript_Jace::
 	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JACE, LOCALID_JACE, LavaridgeTown_Gym_B1F_Text_JaceIntro, LavaridgeTown_Gym_B1F_Text_JaceDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_B1F_Text_JacePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_Jeff:: @ 81FE936
+LavaridgeTown_Gym_B1F_EventScript_Jeff::
 	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_JEFF, LOCALID_JEFF, LavaridgeTown_Gym_B1F_Text_JeffIntro, LavaridgeTown_Gym_B1F_Text_JeffDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_B1F_Text_JeffPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_B1F_EventScript_Eli:: @ 81FE951
+LavaridgeTown_Gym_B1F_EventScript_Eli::
 	trainerbattle TRAINER_BATTLE_CONTINUE_SCRIPT, TRAINER_ELI, LOCALID_ELI, LavaridgeTown_Gym_B1F_Text_EliIntro, LavaridgeTown_Gym_B1F_Text_EliDefeat, LavaridgeTown_Gym_EventScript_CheckTrainerScript
 	msgbox LavaridgeTown_Gym_B1F_Text_EliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-LavaridgeTown_Gym_1F_EventScript_GymGuide:: @ 81FE96C
+LavaridgeTown_Gym_1F_EventScript_GymGuide::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory
@@ -163,34 +163,34 @@ LavaridgeTown_Gym_1F_EventScript_GymGuide:: @ 81FE96C
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory:: @ 81FE981
+LavaridgeTown_Gym_1F_EventScript_GymGuidePostVictory::
 	msgbox LavaridgeTown_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_Gym_1F_EventScript_LeftGymStatue:: @ 81FE98B
+LavaridgeTown_Gym_1F_EventScript_LeftGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_GymStatueCertified
 	goto LavaridgeTown_Gym_1F_EventScript_GymStatue
 	end
 
-LavaridgeTown_Gym_1F_EventScript_RightGymStatue:: @ 81FE99B
+LavaridgeTown_Gym_1F_EventScript_RightGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_GymStatueCertified
 	goto LavaridgeTown_Gym_1F_EventScript_GymStatue
 	end
 
-LavaridgeTown_Gym_1F_EventScript_GymStatueCertified:: @ 81FE9AB
+LavaridgeTown_Gym_1F_EventScript_GymStatueCertified::
 	msgbox LavaridgeTown_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LavaridgeTown_Gym_1F_EventScript_GymStatue:: @ 81FE9B5
+LavaridgeTown_Gym_1F_EventScript_GymStatue::
 	msgbox LavaridgeTown_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LavaridgeTown_Gym_1F_Text_GymGuideAdvice: @ 81FE9BF
+LavaridgeTown_Gym_1F_Text_GymGuideAdvice:
 	.string "Hey, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "LAVARIDGE's GYM LEADER FLANNERY\n"
@@ -201,35 +201,35 @@ LavaridgeTown_Gym_1F_Text_GymGuideAdvice: @ 81FE9BF
 	.string "Hose her down with water and then\l"
 	.string "go for it!$"
 
-LavaridgeTown_Gym_1F_Text_GymGuidePostVictory: @ 81FEAB8
+LavaridgeTown_Gym_1F_Text_GymGuidePostVictory:
 	.string "Yow! That was a scorching-hot battle!$"
 
-LavaridgeTown_Gym_1F_Text_ColeIntro: @ 81FEADE
+LavaridgeTown_Gym_1F_Text_ColeIntro:
 	.string "Owowowowow!\n"
 	.string "Yikes, it's hot!$"
 
-LavaridgeTown_Gym_1F_Text_ColeDefeat: @ 81FEAFB
+LavaridgeTown_Gym_1F_Text_ColeDefeat:
 	.string "I'm blinded by sweat in my eyes…$"
 
-LavaridgeTown_Gym_1F_Text_ColePostBattle: @ 81FEB1C
+LavaridgeTown_Gym_1F_Text_ColePostBattle:
 	.string "Being buried in hot sand promotes\n"
 	.string "circulation.\p"
 	.string "It's effective for healing pain in\n"
 	.string "your joints.$"
 
-LavaridgeTown_Gym_1F_Text_AxleIntro: @ 81FEB7B
+LavaridgeTown_Gym_1F_Text_AxleIntro:
 	.string "I'm trying to relieve my stress.\n"
 	.string "Don't come along and stress me out!$"
 
-LavaridgeTown_Gym_1F_Text_AxleDefeat: @ 81FEBC0
+LavaridgeTown_Gym_1F_Text_AxleDefeat:
 	.string "I hope FLANNERY flames you good!$"
 
-LavaridgeTown_Gym_1F_Text_AxlePostBattle: @ 81FEBE1
+LavaridgeTown_Gym_1F_Text_AxlePostBattle:
 	.string "Haaah… Whew…\p"
 	.string "If you spend too much time buried in\n"
 	.string "hot sand, it tuckers you out…$"
 
-LavaridgeTown_Gym_B1F_Text_KeeganIntro: @ 81FEC31
+LavaridgeTown_Gym_B1F_Text_KeeganIntro:
 	.string "You must be getting tired by now.\n"
 	.string "You'd like to rest in the hot sand,\l"
 	.string "wouldn't you?\p"
@@ -237,78 +237,78 @@ LavaridgeTown_Gym_B1F_Text_KeeganIntro: @ 81FEC31
 	.string "your willpower is an important ability\l"
 	.string "for all TRAINERS.$"
 
-LavaridgeTown_Gym_B1F_Text_KeeganDefeat: @ 81FECE3
+LavaridgeTown_Gym_B1F_Text_KeeganDefeat:
 	.string "Play with fire, and be burned…$"
 
-LavaridgeTown_Gym_B1F_Text_KeeganPostBattle: @ 81FED02
+LavaridgeTown_Gym_B1F_Text_KeeganPostBattle:
 	.string "Your skill is real…\n"
 	.string "But our LEADER FLANNERY is strong.\p"
 	.string "If you don't watch yourself, you'll be\n"
 	.string "burned seriously.$"
 
-LavaridgeTown_Gym_1F_Text_GeraldIntro: @ 81FED72
+LavaridgeTown_Gym_1F_Text_GeraldIntro:
 	.string "Can your POKéMON withstand\n"
 	.string "392-degree heat?$"
 
-LavaridgeTown_Gym_1F_Text_GeraldDefeat: @ 81FED9E
+LavaridgeTown_Gym_1F_Text_GeraldDefeat:
 	.string "It didn't burn hotly enough…$"
 
-LavaridgeTown_Gym_1F_Text_GeraldPostBattle: @ 81FEDBB
+LavaridgeTown_Gym_1F_Text_GeraldPostBattle:
 	.string "The temperature of magma is\n"
 	.string "392 degrees.\p"
 	.string "Your POKéMON beat me, so they should\n"
 	.string "easily survive in magma.$"
 
-LavaridgeTown_Gym_1F_Text_DanielleIntro: @ 81FEE22
+LavaridgeTown_Gym_1F_Text_DanielleIntro:
 	.string "Um…\n"
 	.string "Okay, I'll battle with you.$"
 
-LavaridgeTown_Gym_1F_Text_DanielleDefeat: @ 81FEE42
+LavaridgeTown_Gym_1F_Text_DanielleDefeat:
 	.string "Oh, but you're too strong.$"
 
-LavaridgeTown_Gym_1F_Text_DaniellePostBattle: @ 81FEE5D
+LavaridgeTown_Gym_1F_Text_DaniellePostBattle:
 	.string "I'm going to be a pretty and strong\n"
 	.string "TRAINER just like FLANNERY.$"
 
-LavaridgeTown_Gym_B1F_Text_JaceIntro: @ 81FEE9D
+LavaridgeTown_Gym_B1F_Text_JaceIntro:
 	.string "Come on, get with it!\n"
 	.string "Let's go before my feelings cool!$"
 
-LavaridgeTown_Gym_B1F_Text_JaceDefeat: @ 81FEED5
+LavaridgeTown_Gym_B1F_Text_JaceDefeat:
 	.string "It's so hot, and yet my heart is\n"
 	.string "clutched by ice…$"
 
-LavaridgeTown_Gym_B1F_Text_JacePostBattle: @ 81FEF07
+LavaridgeTown_Gym_B1F_Text_JacePostBattle:
 	.string "The way the battling spirit burns\n"
 	.string "within you, you may stand a chance\l"
 	.string "against our LEADER.$"
 
-LavaridgeTown_Gym_B1F_Text_JeffIntro: @ 81FEF60
+LavaridgeTown_Gym_B1F_Text_JeffIntro:
 	.string "See how the flames blaze wildly?\n"
 	.string "They flare in anticipation of my win!$"
 
-LavaridgeTown_Gym_B1F_Text_JeffDefeat: @ 81FEFA7
+LavaridgeTown_Gym_B1F_Text_JeffDefeat:
 	.string "Something didn't go right.$"
 
-LavaridgeTown_Gym_B1F_Text_JeffPostBattle: @ 81FEFC2
+LavaridgeTown_Gym_B1F_Text_JeffPostBattle:
 	.string "Well, so what? I say so what?\n"
 	.string "I can walk on hot coals barefoot!\p"
 	.string "…Don't even think about trying it!$"
 
-LavaridgeTown_Gym_B1F_Text_EliIntro: @ 81FF025
+LavaridgeTown_Gym_B1F_Text_EliIntro:
 	.string "As much as I love mountains,\n"
 	.string "I especially love volcanoes.$"
 
-LavaridgeTown_Gym_B1F_Text_EliDefeat: @ 81FF05F
+LavaridgeTown_Gym_B1F_Text_EliDefeat:
 	.string "Well, it seems to me I lost without\n"
 	.string "ever being in control.$"
 
-LavaridgeTown_Gym_B1F_Text_EliPostBattle: @ 81FF09A
+LavaridgeTown_Gym_B1F_Text_EliPostBattle:
 	.string "I stay here because I became a fan\n"
 	.string "of FLANNERY's power.\p"
 	.string "Hehehehe.$"
 
-LavaridgeTown_Gym_1F_Text_FlanneryIntro: @ 81FF0DC
+LavaridgeTown_Gym_1F_Text_FlanneryIntro:
 	.string "Welcome… No, wait.\p"
 	.string "Puny TRAINER, how good to see you've\n"
 	.string "made it here!\p"
@@ -323,7 +323,7 @@ LavaridgeTown_Gym_1F_Text_FlanneryIntro: @ 81FF0DC
 	.string "father, I shall, uh…demonstrate the\l"
 	.string "hot moves we have honed on this land!$"
 
-LavaridgeTown_Gym_1F_Text_FlanneryDefeat: @ 81FF233
+LavaridgeTown_Gym_1F_Text_FlanneryDefeat:
 	.string "Oh…\n"
 	.string "I guess I was trying too hard…\p"
 	.string "I… I've only recently become\n"
@@ -335,11 +335,11 @@ LavaridgeTown_Gym_1F_Text_FlanneryDefeat: @ 81FF233
 	.string "Thanks for teaching me that.\n"
 	.string "For that, you deserve this.$"
 
-LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge: @ 81FF32F
+LavaridgeTown_Gym_1F_Text_ReceivedHeatBadge:
 	.string "{PLAYER} received the HEAT BADGE\n"
 	.string "from FLANNERY.$"
 
-LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis: @ 81FF359
+LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis:
 	.string "If you have a HEAT BADGE, all POKéMON\n"
 	.string "up to Level 50, even those you get in\l"
 	.string "trades from other people, will obey\l"
@@ -349,7 +349,7 @@ LavaridgeTown_Gym_1F_Text_ExplainHeatBadgeTakeThis: @ 81FF359
 	.string "This is a token of my appreciation.\n"
 	.string "Don't be shy about taking it!$"
 
-LavaridgeTown_Gym_1F_Text_ExplainOverheat: @ 81FF45C
+LavaridgeTown_Gym_1F_Text_ExplainOverheat:
 	.string "That TM50 contains OVERHEAT.\p"
 	.string "That move inflicts serious damage on\n"
 	.string "the opponent.\p"
@@ -357,24 +357,24 @@ LavaridgeTown_Gym_1F_Text_ExplainOverheat: @ 81FF45C
 	.string "of the POKéMON using it. It might not\l"
 	.string "be suitable for longer battles.$"
 
-LavaridgeTown_Gym_1F_Text_RegisteredFlannery: @ 81FF517
+LavaridgeTown_Gym_1F_Text_RegisteredFlannery:
 	.string "Registered GYM LEADER FLANNERY\n"
 	.string "in the POKéNAV.$"
 
-LavaridgeTown_Gym_1F_Text_FlanneryPostBattle: @ 81FF546
+LavaridgeTown_Gym_1F_Text_FlanneryPostBattle:
 	.string "Your power reminds me of someone…\p"
 	.string "Oh! I know! You battle like NORMAN,\n"
 	.string "the GYM LEADER of PETALBURG.$"
 
-LavaridgeTown_Gym_1F_Text_GymStatue: @ 81FF5A9
+LavaridgeTown_Gym_1F_Text_GymStatue:
 	.string "LAVARIDGE TOWN POKéMON GYM$"
 
-LavaridgeTown_Gym_1F_Text_GymStatueCertified: @ 81FF5C4
+LavaridgeTown_Gym_1F_Text_GymStatueCertified:
 	.string "LAVARIDGE TOWN POKéMON GYM\p"
 	.string "FLANNERY'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-LavaridgeTown_Gym_1F_Text_FlanneryPreRematch: @ 81FF601
+LavaridgeTown_Gym_1F_Text_FlanneryPreRematch:
 	.string "FLANNERY: Losing a battle isn't going\n"
 	.string "to deflate me.\p"
 	.string "I love POKéMON.\n"
@@ -383,11 +383,11 @@ LavaridgeTown_Gym_1F_Text_FlanneryPreRematch: @ 81FF601
 	.string "Let's exchange superhot moves\n"
 	.string "in another battle!$"
 
-LavaridgeTown_Gym_1F_Text_FlanneryRematchDefeat: @ 81FF69F
+LavaridgeTown_Gym_1F_Text_FlanneryRematchDefeat:
 	.string "Whew!\n"
 	.string "On the verge of eruption!$"
 
-LavaridgeTown_Gym_1F_Text_FlanneryPostRematch: @ 81FF6BF
+LavaridgeTown_Gym_1F_Text_FlanneryPostRematch:
 	.string "FLANNERY: I lost the match,\n"
 	.string "but I'm completely satisfied.\p"
 	.string "It's not often I get to enjoy a battle\n"
@@ -395,7 +395,7 @@ LavaridgeTown_Gym_1F_Text_FlanneryPostRematch: @ 81FF6BF
 	.string "Let's have another one like this\n"
 	.string "again sometime!$"
 
-LavaridgeTown_Gym_1F_Text_FlanneryRematchNeedTwoMons: @ 81FF75E
+LavaridgeTown_Gym_1F_Text_FlanneryRematchNeedTwoMons:
 	.string "FLANNERY: Losing a battle isn't going\n"
 	.string "to deflate me.\p"
 	.string "I love POKéMON.\n"
diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
index f2e41ace4..3a9165bb1 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
@@ -3,47 +3,47 @@
 .equ LOCALID_JEFF, 3
 .equ LOCALID_ELI, 4
 
-LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E
+LavaridgeTown_Gym_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_Gym_B1F_OnTransition
 	.byte 0
 
-LavaridgeTown_Gym_B1F_OnTransition: @ 81FF884
+LavaridgeTown_Gym_B1F_OnTransition:
 	call LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars
 	call LavaridgeTown_Gym_B1F_EventScript_CheckBuryTrainers
 	end
 
 @ Unclear where/if these temp vars are getting checked
-LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars:: @ 81FF88F
+LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars::
 	setvar VAR_TEMP_7, 0
 	setvar VAR_TEMP_8, 0
 	setvar VAR_TEMP_9, 0
 	setvar VAR_TEMP_A, 0
 	goto_if_defeated TRAINER_KEEGAN, LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar
 	setvar VAR_TEMP_7, 1
-LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar:: @ 81FF8B1
+LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar::
 	goto_if_defeated TRAINER_JACE, LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar
 	setvar VAR_TEMP_8, 1
-LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar:: @ 81FF8BF
+LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar::
 	goto_if_defeated TRAINER_JEFF, LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar
 	setvar VAR_TEMP_9, 1
-LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar:: @ 81FF8CD
+LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar::
 	goto_if_defeated TRAINER_ELI, LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars
 	setvar VAR_TEMP_A, 1
-LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars:: @ 81FF8DB
+LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars::
 	return
 
-LavaridgeTown_Gym_B1F_EventScript_CheckBuryTrainers:: @ 81FF8DC
+LavaridgeTown_Gym_B1F_EventScript_CheckBuryTrainers::
 	goto_if_defeated TRAINER_KEEGAN, LavaridgeTown_Gym_B1F_EventScript_CheckBuryJace
 	setobjectmovementtype LOCALID_KEEGAN, MOVEMENT_TYPE_BURIED
-LavaridgeTown_Gym_B1F_EventScript_CheckBuryJace:: @ 81FF8E9
+LavaridgeTown_Gym_B1F_EventScript_CheckBuryJace::
 	goto_if_defeated TRAINER_JACE, LavaridgeTown_Gym_B1F_EventScript_CheckBuryJeff
 	setobjectmovementtype LOCALID_JACE, MOVEMENT_TYPE_BURIED
-LavaridgeTown_Gym_B1F_EventScript_CheckBuryJeff:: @ 81FF8F6
+LavaridgeTown_Gym_B1F_EventScript_CheckBuryJeff::
 	goto_if_defeated TRAINER_JEFF, LavaridgeTown_Gym_B1F_EventScript_CheckBuryEli
 	setobjectmovementtype LOCALID_JEFF, MOVEMENT_TYPE_BURIED
-LavaridgeTown_Gym_B1F_EventScript_CheckBuryEli:: @ 81FF903
+LavaridgeTown_Gym_B1F_EventScript_CheckBuryEli::
 	goto_if_defeated TRAINER_ELI, LavaridgeTown_Gym_B1F_EventScript_EndCheckBuryTrainers
 	setobjectmovementtype LOCALID_ELI, MOVEMENT_TYPE_BURIED
-LavaridgeTown_Gym_B1F_EventScript_EndCheckBuryTrainers:: @ 81FF910
+LavaridgeTown_Gym_B1F_EventScript_EndCheckBuryTrainers::
 	return
 
diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc
index d98d6ef49..2637f5c09 100644
--- a/data/maps/LavaridgeTown_HerbShop/scripts.inc
+++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc
@@ -1,7 +1,7 @@
-LavaridgeTown_HerbShop_MapScripts:: @ 81FE4D6
+LavaridgeTown_HerbShop_MapScripts::
 	.byte 0
 
-LavaridgeTown_HerbShop_EventScript_Clerk:: @ 81FE4D7
+LavaridgeTown_HerbShop_EventScript_Clerk::
 	lock
 	faceplayer
 	message LavaridgeTown_HerbShop_Text_WelcomeToHerbShop
@@ -12,7 +12,7 @@ LavaridgeTown_HerbShop_EventScript_Clerk:: @ 81FE4D7
 	end
 
 	.align 2
-LavaridgeTown_HerbShop_Pokemart: @ 81FE4F0
+LavaridgeTown_HerbShop_Pokemart:
 	.2byte ITEM_ENERGY_POWDER
 	.2byte ITEM_ENERGY_ROOT
 	.2byte ITEM_HEAL_POWDER
@@ -21,11 +21,11 @@ LavaridgeTown_HerbShop_Pokemart: @ 81FE4F0
 	release
 	end
 
-LavaridgeTown_HerbShop_EventScript_ExpertM:: @ 81FE4FC
+LavaridgeTown_HerbShop_EventScript_ExpertM::
 	msgbox LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike, MSGBOX_NPC
 	end
 
-LavaridgeTown_HerbShop_EventScript_OldMan:: @ 81FE505
+LavaridgeTown_HerbShop_EventScript_OldMan::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_ExplainCharcoal
@@ -37,22 +37,22 @@ LavaridgeTown_HerbShop_EventScript_OldMan:: @ 81FE505
 	release
 	end
 
-LavaridgeTown_HerbShop_EventScript_ExplainCharcoal:: @ 81FE534
+LavaridgeTown_HerbShop_EventScript_ExplainCharcoal::
 	msgbox LavaridgeTown_HerbShop_Text_ExplainCharcoal, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_HerbShop_Text_WelcomeToHerbShop: @ 81FE53E
+LavaridgeTown_HerbShop_Text_WelcomeToHerbShop:
 	.string "Welcome to the HERB SHOP, home of\n"
 	.string "effective and inexpensive medicine!$"
 
-LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine: @ 81FE584
+LavaridgeTown_HerbShop_Text_YouveComeToLookAtHerbalMedicine:
 	.string "You've come to look at herbal medicine\n"
 	.string "in LAVARIDGE?\p"
 	.string "That's rather commendable.\p"
 	.string "I like you! Take this!$"
 
-LavaridgeTown_HerbShop_Text_ExplainCharcoal: @ 81FE5EB
+LavaridgeTown_HerbShop_Text_ExplainCharcoal:
 	.string "That CHARCOAL I gave you, it's used\n"
 	.string "for making herbal medicine.\p"
 	.string "It also does wonders when held by\n"
@@ -60,7 +60,7 @@ LavaridgeTown_HerbShop_Text_ExplainCharcoal: @ 81FE5EB
 	.string "It intensifies the power of FIRE-type\n"
 	.string "moves.$"
 
-LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike: @ 81FE685
+LavaridgeTown_HerbShop_Text_HerbalMedicineWorksButMonWillDislike:
 	.string "Herbal medicine works impressively well.\n"
 	.string "But your POKéMON will dislike you for it.\l"
 	.string "It must be horribly bitter!$"
diff --git a/data/maps/LavaridgeTown_House/scripts.inc b/data/maps/LavaridgeTown_House/scripts.inc
index 6db5f9ee5..58fd8ecb2 100644
--- a/data/maps/LavaridgeTown_House/scripts.inc
+++ b/data/maps/LavaridgeTown_House/scripts.inc
@@ -1,11 +1,11 @@
-LavaridgeTown_House_MapScripts:: @ 81FF911
+LavaridgeTown_House_MapScripts::
 	.byte 0
 
-LavaridgeTown_House_EventScript_OldMan:: @ 81FF912
+LavaridgeTown_House_EventScript_OldMan::
 	msgbox LavaridgeTown_House_Text_WifeWarmingEggInHotSprings, MSGBOX_NPC
 	end
 
-LavaridgeTown_House_EventScript_Zigzagoon:: @ 81FF91B
+LavaridgeTown_House_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
@@ -15,12 +15,12 @@ LavaridgeTown_House_EventScript_Zigzagoon:: @ 81FF91B
 	release
 	end
 
-LavaridgeTown_House_Text_WifeWarmingEggInHotSprings: @ 81FF92E
+LavaridgeTown_House_Text_WifeWarmingEggInHotSprings:
 	.string "My wife's warming an EGG in the hot\n"
 	.string "springs. This is what she told me.\p"
 	.string "She left two POKéMON with the DAY CARE.\n"
 	.string "And they discovered that EGG!$"
 
-LavaridgeTown_House_Text_Zigzagoon: @ 81FF9BB
+LavaridgeTown_House_Text_Zigzagoon:
 	.string "ZIGZAGOON: Pshoo!$"
 
diff --git a/data/maps/LavaridgeTown_Mart/scripts.inc b/data/maps/LavaridgeTown_Mart/scripts.inc
index b5b3cb6f1..001df3140 100644
--- a/data/maps/LavaridgeTown_Mart/scripts.inc
+++ b/data/maps/LavaridgeTown_Mart/scripts.inc
@@ -1,7 +1,7 @@
-LavaridgeTown_Mart_MapScripts:: @ 81FF9CD
+LavaridgeTown_Mart_MapScripts::
 	.byte 0
 
-LavaridgeTown_Mart_EventScript_Clerk:: @ 81FF9CE
+LavaridgeTown_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -12,7 +12,7 @@ LavaridgeTown_Mart_EventScript_Clerk:: @ 81FF9CE
 	end
 
 	.align 2
-LavaridgeTown_Mart_Pokemart: @ 81FF9E8
+LavaridgeTown_Mart_Pokemart:
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
@@ -26,21 +26,21 @@ LavaridgeTown_Mart_Pokemart: @ 81FF9E8
 	release
 	end
 
-LavaridgeTown_Mart_EventScript_ExpertM:: @ 81FF9FE
+LavaridgeTown_Mart_EventScript_ExpertM::
 	msgbox LavaridgeTown_Mart_Text_XSpeedFirstStrike, MSGBOX_NPC
 	end
 
-LavaridgeTown_Mart_EventScript_OldWoman:: @ 81FFA07
+LavaridgeTown_Mart_EventScript_OldWoman::
 	msgbox LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney, MSGBOX_NPC
 	end
 
-LavaridgeTown_Mart_Text_XSpeedFirstStrike: @ 81FFA10
+LavaridgeTown_Mart_Text_XSpeedFirstStrike:
 	.string "Use X SPEED to add to a POKéMON's\n"
 	.string "SPEED in battle.\p"
 	.string "That will help it get in the first\n"
 	.string "strike--a decided advantage!$"
 
-LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney: @ 81FFA83
+LavaridgeTown_Mart_Text_LocalSpecialtyOnMtChimney:
 	.string "On MT. CHIMNEY's peak, there's a local\n"
 	.string "specialty that you can buy only there.\p"
 	.string "Give it to a POKéMON--it will be elated.$"
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index 0b596ba5b..9ff72aa81 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
@@ -1,16 +1,16 @@
 .set LOCALID_NURSE, 1
 
-LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 81FFAFA
+LavaridgeTown_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LavaridgeTown_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-LavaridgeTown_PokemonCenter_1F_OnTransition: @ 81FFB05
+LavaridgeTown_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FFB0E
+LavaridgeTown_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -18,31 +18,31 @@ LavaridgeTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FFB0E
 	release
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_Youngster:: @ 81FFB1C
+LavaridgeTown_PokemonCenter_1F_EventScript_Youngster::
 	msgbox LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate, MSGBOX_NPC
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_Woman:: @ 81FFB25
+LavaridgeTown_PokemonCenter_1F_EventScript_Woman::
 	msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether, MSGBOX_NPC
 	end
 
-LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman:: @ 81FFB2E
+LavaridgeTown_PokemonCenter_1F_EventScript_Gentleman::
 	msgbox LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo, MSGBOX_NPC
 	end
 
-LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether: @ 81FFB37
+LavaridgeTown_PokemonCenter_1F_Text_TrainersPokemonSpendTimeTogether:
 	.string "I think POKéMON get closer to their\n"
 	.string "TRAINERS if they spend time together.\p"
 	.string "The longer the better.\n"
 	.string "That's what I think.$"
 
-LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate: @ 81FFBAD
+LavaridgeTown_PokemonCenter_1F_Text_HotSpringCanInvigorate:
 	.string "It's sort of magical how just sitting\n"
 	.string "in a hot-spring pool can invigorate.\p"
 	.string "I wish I could let my POKéMON\n"
 	.string "soak, too.$"
 
-LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo: @ 81FFC21
+LavaridgeTown_PokemonCenter_1F_Text_TrainersShouldRestToo:
 	.string "Hohoho! Hey, kid, you can reach\n"
 	.string "the hot springs from here.\p"
 	.string "If POKéMON are getting rest, so too\n"
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
index 633f91e95..d61aa0fe7 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97
+LavaridgeTown_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ LavaridgeTown_PokemonCenter_2F_MapScripts:: @ 81FFC97
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-LavaridgeTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FFCAC
+LavaridgeTown_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-LavaridgeTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FFCB2
+LavaridgeTown_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-LavaridgeTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FFCB8
+LavaridgeTown_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
index b5748ef60..048cabacb 100644
--- a/data/maps/LilycoveCity/scripts.inc
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -1,12 +1,12 @@
 .set LOCALID_WOMAN_1, 19
 .set LOCALID_MAN_1, 20
 
-LilycoveCity_MapScripts:: @ 81E2B3C
+LilycoveCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_OnLoad
 	.byte 0
 
-LilycoveCity_OnTransition: @ 81E2B47
+LilycoveCity_OnTransition:
 	setflag FLAG_VISITED_LILYCOVE_CITY
 	setvar VAR_CONTEST_HALL_STATE, 0
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
@@ -14,11 +14,11 @@ LilycoveCity_OnTransition: @ 81E2B47
 	call Common_EventScript_SetupRivalGfxId
 	end
 
-LilycoveCity_OnLoad: @ 81E2B61
+LilycoveCity_OnLoad:
 	call_if_unset FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_SetWailmerMetatiles
 	end
 
-LilycoveCity_EventScript_SetWailmerMetatiles:: @ 81E2B6B
+LilycoveCity_EventScript_SetWailmerMetatiles::
 	setmetatile 76, 12, METATILE_Lilycove_Wailmer0, 1
 	setmetatile 77, 12, METATILE_Lilycove_Wailmer1, 1
 	setmetatile 76, 13, METATILE_Lilycove_Wailmer2, 1
@@ -33,7 +33,7 @@ LilycoveCity_EventScript_SetWailmerMetatiles:: @ 81E2B6B
 	setmetatile 78, 17, METATILE_Lilycove_Wailmer3, 1
 	return
 
-LilycoveCity_EventScript_BerryGentleman:: @ 81E2BD8
+LilycoveCity_EventScript_BerryGentleman::
 	lock
 	faceplayer
 	dotimebasedevents
@@ -49,16 +49,16 @@ LilycoveCity_EventScript_BerryGentleman:: @ 81E2BD8
 	release
 	end
 
-LilycoveCity_EventScript_ReceivedBerry:: @ 81E2C18
+LilycoveCity_EventScript_ReceivedBerry::
 	msgbox LilycoveCity_Text_PokeblocksSuitPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_Man3:: @ 81E2C22
+LilycoveCity_EventScript_Man3::
 	msgbox LilycoveCity_Text_ContestHallInTown, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_Girl:: @ 81E2C2B
+LilycoveCity_EventScript_Girl::
 	lock
 	faceplayer
 	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_GirlAquaGone
@@ -66,16 +66,16 @@ LilycoveCity_EventScript_Girl:: @ 81E2C2B
 	release
 	end
 
-LilycoveCity_EventScript_GirlAquaGone:: @ 81E2C40
+LilycoveCity_EventScript_GirlAquaGone::
 	msgbox LilycoveCity_Text_GoingToMoveDeleterForHMs, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_RichBoy:: @ 81E2C4A
+LilycoveCity_EventScript_RichBoy::
 	msgbox LilycoveCity_Text_ImFromKanto, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_Sailor2:: @ 81E2C53
+LilycoveCity_EventScript_Sailor2::
 	lock
 	faceplayer
 	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_Sailor2AquaGone
@@ -83,12 +83,12 @@ LilycoveCity_EventScript_Sailor2:: @ 81E2C53
 	release
 	end
 
-LilycoveCity_EventScript_Sailor2AquaGone:: @ 81E2C68
+LilycoveCity_EventScript_Sailor2AquaGone::
 	msgbox LilycoveCity_Text_SomeonePuntedTeamAquaOut, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_Woman2:: @ 81E2C72
+LilycoveCity_EventScript_Woman2::
 	lock
 	faceplayer
 	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_Woman2AquaGone
@@ -96,24 +96,24 @@ LilycoveCity_EventScript_Woman2:: @ 81E2C72
 	release
 	end
 
-LilycoveCity_EventScript_Woman2AquaGone:: @ 81E2C87
+LilycoveCity_EventScript_Woman2AquaGone::
 	msgbox LilycoveCity_Text_MissingPokemonCameBack, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_Man2:: @ 81E2C91
+LilycoveCity_EventScript_Man2::
 	msgbox LilycoveCity_Text_ImArtDealer, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_ExpertM1:: @ 81E2C9A
+LilycoveCity_EventScript_ExpertM1::
 	msgbox LilycoveCity_Text_SeaRemainsForeverYoung, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_ExpertF:: @ 81E2CA3
+LilycoveCity_EventScript_ExpertF::
 	msgbox LilycoveCity_Text_SixtyYearsAgoHusbandProposed, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_ExpertM2:: @ 81E2CAC
+LilycoveCity_EventScript_ExpertM2::
 	lock
 	faceplayer
 	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_ExpertM2AquaGone
@@ -121,44 +121,44 @@ LilycoveCity_EventScript_ExpertM2:: @ 81E2CAC
 	release
 	end
 
-LilycoveCity_EventScript_ExpertM2AquaGone:: @ 81E2CC1
+LilycoveCity_EventScript_ExpertM2AquaGone::
 	msgbox LilycoveCity_Text_TeamAquaLotGoneForGood, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_EventScript_Sailor1:: @ 81E2CCB
+LilycoveCity_EventScript_Sailor1::
 	msgbox LilycoveCity_Text_HeardTowerCalledSkyPillar, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_FatMan:: @ 81E2CD4
+LilycoveCity_EventScript_FatMan::
 	msgbox LilycoveCity_Text_SawTallTowerOnRoute131, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_Man1:: @ 81E2CDD
+LilycoveCity_EventScript_Man1::
 	lockall
 	msgbox LilycoveCity_Text_JustArrivedAndSawRarePokemon, MSGBOX_NPC
 	applymovement LOCALID_MAN_1, Common_Movement_FaceOriginalDirection
 	end
 
-LilycoveCity_EventScript_Woman1:: @ 81E2CEE
+LilycoveCity_EventScript_Woman1::
 	lockall
 	msgbox LilycoveCity_Text_HoneymoonVowToSeeRarePokemon, MSGBOX_NPC
 	applymovement LOCALID_WOMAN_1, Common_Movement_FaceOriginalDirection
 	end
 
-LilycoveCity_EventScript_CitySign:: @ 81E2CFF
+LilycoveCity_EventScript_CitySign::
 	msgbox LilycoveCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_ContestHallSign:: @ 81E2D08
+LilycoveCity_EventScript_ContestHallSign::
 	msgbox LilycoveCity_Text_ContestHallSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_MotelSign:: @ 81E2D11
+LilycoveCity_EventScript_MotelSign::
 	msgbox LilycoveCity_Text_MotelSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_MuseumSign:: @ 81E2D1A
+LilycoveCity_EventScript_MuseumSign::
 	lockall
 	specialvar VAR_0x8004, CountPlayerMuseumPaintings
 	switch VAR_0x8004
@@ -167,36 +167,36 @@ LilycoveCity_EventScript_MuseumSign:: @ 81E2D1A
 	releaseall
 	end
 
-LilycoveCity_EventScript_MuseumSignNoPaintings:: @ 81E2D3A
+LilycoveCity_EventScript_MuseumSignNoPaintings::
 	msgbox LilycoveCity_Text_MuseumSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_HarborSign:: @ 81E2D44
+LilycoveCity_EventScript_HarborSign::
 	lockall
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_HarborSignFerryReady
 	msgbox LilycoveCity_Text_HarborSignUnderConstruction, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_HarborSignFerryReady:: @ 81E2D58
+LilycoveCity_EventScript_HarborSignFerryReady::
 	msgbox LilycoveCity_Text_HarborSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_TrainerFanClubSign:: @ 81E2D62
+LilycoveCity_EventScript_TrainerFanClubSign::
 	msgbox LilycoveCity_Text_TrainerFanClubSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_DepartmentStoreSign:: @ 81E2D6B
+LilycoveCity_EventScript_DepartmentStoreSign::
 	msgbox LilycoveCity_Text_DepartmentStoreSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_MoveDeletersHouseSign:: @ 81E2D74
+LilycoveCity_EventScript_MoveDeletersHouseSign::
 	msgbox LilycoveCity_Text_MoveDeletersHouseSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_EventScript_WailmerTrainerGrunt:: @ 81E2D7D
+LilycoveCity_EventScript_WailmerTrainerGrunt::
 	lockall
 	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_MetWailmerTrainer
 	msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT
@@ -209,28 +209,28 @@ LilycoveCity_EventScript_WailmerTrainerGrunt:: @ 81E2D7D
 	releaseall
 	end
 
-LilycoveCity_EventScript_MetWailmerTrainer:: @ 81E2DB0
+LilycoveCity_EventScript_MetWailmerTrainer::
 	msgbox LilycoveCity_Text_WailmerLeapOutOfWater, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_EventScript_AquaGrunt1:: @ 81E2DBA
+LilycoveCity_EventScript_AquaGrunt1::
 	msgbox LilycoveCity_Text_MovedLootIntoHideoutToday, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_AquaGrunt2:: @ 81E2DC3
+LilycoveCity_EventScript_AquaGrunt2::
 	msgbox LilycoveCity_Text_ChanceToDoBigThings, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_AquaGrunt3:: @ 81E2DCC
+LilycoveCity_EventScript_AquaGrunt3::
 	msgbox LilycoveCity_Text_DontGoNearCaveInCove, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_AquaGrunt4:: @ 81E2DD5
+LilycoveCity_EventScript_AquaGrunt4::
 	msgbox LilycoveCity_Text_IfWorldBecomesOurs, MSGBOX_NPC
 	end
 
-LilycoveCity_EventScript_Rival:: @ 81E2DDE
+LilycoveCity_EventScript_Rival::
 	lock
 	faceplayer
 	checkplayergender
@@ -240,7 +240,7 @@ LilycoveCity_EventScript_Rival:: @ 81E2DDE
 	goto_if_eq LilycoveCity_EventScript_Brendan
 	end
 
-LilycoveCity_EventScript_May:: @ 81E2DF8
+LilycoveCity_EventScript_May::
 	playbgm MUS_ENCOUNTER_MAY, TRUE
 	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattleAgain
 	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_MayAskToBattle
@@ -253,15 +253,15 @@ LilycoveCity_EventScript_May:: @ 81E2DF8
 	case 2, LilycoveCity_EventScript_BattleMayMudkip
 	end
 
-LilycoveCity_EventScript_MayAskToBattleAgain:: @ 81E2E48
+LilycoveCity_EventScript_MayAskToBattleAgain::
 	msgbox LilycoveCity_Text_MayBattleMe, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_MayAskToBattle:: @ 81E2E51
+LilycoveCity_EventScript_MayAskToBattle::
 	msgbox LilycoveCity_Text_MayShoppingLetsBattle, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_DeclineMayBattle:: @ 81E2E5A
+LilycoveCity_EventScript_DeclineMayBattle::
 	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	msgbox LilycoveCity_Text_MayNotRaisingPokemon, MSGBOX_DEFAULT
 	savebgm MUS_DUMMY
@@ -269,7 +269,7 @@ LilycoveCity_EventScript_DeclineMayBattle:: @ 81E2E5A
 	release
 	end
 
-LilycoveCity_EventScript_Brendan:: @ 81E2E6B
+LilycoveCity_EventScript_Brendan::
 	playbgm MUS_ENCOUNTER_BRENDAN, TRUE
 	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattleAgain
 	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_BrendanAskToBattle
@@ -282,15 +282,15 @@ LilycoveCity_EventScript_Brendan:: @ 81E2E6B
 	case 2, LilycoveCity_EventScript_BattleBrendanMudkip
 	end
 
-LilycoveCity_EventScript_BrendanAskToBattleAgain:: @ 81E2EBB
+LilycoveCity_EventScript_BrendanAskToBattleAgain::
 	msgbox LilycoveCity_Text_BrendanBattleMe, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_BrendanAskToBattle:: @ 81E2EC4
+LilycoveCity_EventScript_BrendanAskToBattle::
 	msgbox LilycoveCity_Text_BrendanShoppingLetsBattle, MSGBOX_YESNO
 	return
 
-LilycoveCity_EventScript_DeclineBrendanBattle:: @ 81E2ECD
+LilycoveCity_EventScript_DeclineBrendanBattle::
 	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
 	msgbox LilycoveCity_Text_BrendanNoConfidence, MSGBOX_DEFAULT
 	savebgm MUS_DUMMY
@@ -298,37 +298,37 @@ LilycoveCity_EventScript_DeclineBrendanBattle:: @ 81E2ECD
 	release
 	end
 
-LilycoveCity_EventScript_BattleMayTreecko:: @ 81E2EDE
+LilycoveCity_EventScript_BattleMayTreecko::
 	trainerbattle_no_intro TRAINER_MAY_LILYCOVE_TREECKO, LilycoveCity_Text_MayDefeat
 	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
-LilycoveCity_EventScript_BattleMayTorchic:: @ 81E2EEE
+LilycoveCity_EventScript_BattleMayTorchic::
 	trainerbattle_no_intro TRAINER_MAY_LILYCOVE_TORCHIC, LilycoveCity_Text_MayDefeat
 	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
-LilycoveCity_EventScript_BattleMayMudkip:: @ 81E2EFE
+LilycoveCity_EventScript_BattleMayMudkip::
 	trainerbattle_no_intro TRAINER_MAY_LILYCOVE_MUDKIP, LilycoveCity_Text_MayDefeat
 	goto LilycoveCity_EventScript_DefeatedMay
 	end
 
-LilycoveCity_EventScript_BattleBrendanTreecko:: @ 81E2F0E
+LilycoveCity_EventScript_BattleBrendanTreecko::
 	trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_TREECKO, LilycoveCity_Text_BrendanDefeat
 	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
-LilycoveCity_EventScript_BattleBrendanTorchic:: @ 81E2F1E
+LilycoveCity_EventScript_BattleBrendanTorchic::
 	trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_TORCHIC, LilycoveCity_Text_BrendanDefeat
 	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
-LilycoveCity_EventScript_BattleBrendanMudkip:: @ 81E2F2E
+LilycoveCity_EventScript_BattleBrendanMudkip::
 	trainerbattle_no_intro TRAINER_BRENDAN_LILYCOVE_MUDKIP, LilycoveCity_Text_BrendanDefeat
 	goto LilycoveCity_EventScript_DefeatedBrendan
 	end
 
-LilycoveCity_EventScript_DefeatedMay:: @ 81E2F3E
+LilycoveCity_EventScript_DefeatedMay::
 	msgbox LilycoveCity_Text_MayGoingBackToLittleroot, MSGBOX_DEFAULT
 	setvar VAR_RESULT, FALSE
 	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge
@@ -341,28 +341,28 @@ LilycoveCity_EventScript_DefeatedMay:: @ 81E2F3E
 	goto LilycoveCity_EventScript_RivalFlyAway
 	end
 
-LilycoveCity_EventScript_CheckFinalBadge:: @ 81E2F76
+LilycoveCity_EventScript_CheckFinalBadge::
 	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_HasFinalBadge
 	return
 
-LilycoveCity_EventScript_HasFinalBadge:: @ 81E2F80
+LilycoveCity_EventScript_HasFinalBadge::
 	setvar VAR_RESULT, TRUE
 	return
 
-LilycoveCity_EventScript_MayCollectBadges:: @ 81E2F86
+LilycoveCity_EventScript_MayCollectBadges::
 	msgbox LilycoveCity_Text_MayYouGoingToCollectBadges, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_MayPokemonLeague:: @ 81E2F8F
+LilycoveCity_EventScript_MayPokemonLeague::
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_MayBattleFrontier
 	msgbox LilycoveCity_Text_MayYouGoingToPokemonLeague, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_MayBattleFrontier:: @ 81E2FA1
+LilycoveCity_EventScript_MayBattleFrontier::
 	msgbox LilycoveCity_Text_MayYouGoingToBattleFrontier, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_DefeatedBrendan:: @ 81E2FAA
+LilycoveCity_EventScript_DefeatedBrendan::
 	msgbox LilycoveCity_Text_BrendanGoingBackToLittleroot, MSGBOX_DEFAULT
 	setvar VAR_RESULT, FALSE
 	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_CheckFinalBadge
@@ -375,20 +375,20 @@ LilycoveCity_EventScript_DefeatedBrendan:: @ 81E2FAA
 	goto LilycoveCity_EventScript_RivalFlyAway
 	end
 
-LilycoveCity_EventScript_BrendanCollectBadges:: @ 81E2FE2
+LilycoveCity_EventScript_BrendanCollectBadges::
 	msgbox LilycoveCity_Text_BrendanYouGoingToCollectBadges, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_BrendanPokemonLeague:: @ 81E2FEB
+LilycoveCity_EventScript_BrendanPokemonLeague::
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_BrendanBattleFrontier
 	msgbox LilycoveCity_Text_BrendanYouGoingToPokemonLeague, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_BrendanBattleFrontier:: @ 81E2FFD
+LilycoveCity_EventScript_BrendanBattleFrontier::
 	msgbox LilycoveCity_Text_BrendanYouGoingToBattleFrontier, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_RivalFlyAway:: @ 81E3006
+LilycoveCity_EventScript_RivalFlyAway::
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -404,7 +404,7 @@ LilycoveCity_EventScript_RivalFlyAway:: @ 81E3006
 	release
 	end
 
-LilycoveCity_EventScript_SchoolKidM:: @ 81E302D
+LilycoveCity_EventScript_SchoolKidM::
 	lock
 	faceplayer
 	msgbox LilycoveCity_Text_DoYouKnowAboutBerryBlender, MSGBOX_YESNO
@@ -415,15 +415,15 @@ LilycoveCity_EventScript_SchoolKidM:: @ 81E302D
 	release
 	end
 
-LilycoveCity_EventScript_KnowAboutBerryBlender:: @ 81E304F
+LilycoveCity_EventScript_KnowAboutBerryBlender::
 	msgbox LilycoveCity_Text_FasterSpinBetterPokeblocks, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_EventScript_DontKnowAboutBerryBlender:: @ 81E3058
+LilycoveCity_EventScript_DontKnowAboutBerryBlender::
 	msgbox LilycoveCity_Text_ExplainBerryBlender, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_Text_MayShoppingLetsBattle: @ 81E3061
+LilycoveCity_Text_MayShoppingLetsBattle:
 	.string "MAY: Oh, hey?\n"
 	.string "{PLAYER}{KUN}, are you shopping, too?\p"
 	.string "I bought a whole bunch of DOLLS and\n"
@@ -436,35 +436,35 @@ LilycoveCity_Text_MayShoppingLetsBattle: @ 81E3061
 	.string "I'll battle with you, so you can show\n"
 	.string "me your POKéMON, {PLAYER}{KUN}.$"
 
-LilycoveCity_Text_MayNotRaisingPokemon: @ 81E318D
+LilycoveCity_Text_MayNotRaisingPokemon:
 	.string "MAY: Oh, why? {PLAYER}{KUN}, haven't you\n"
 	.string "been raising your POKéMON?\p"
 	.string "That's not a very good showing as a\n"
 	.string "TRAINER…$"
 
-LilycoveCity_Text_MayBattleMe: @ 81E31F5
+LilycoveCity_Text_MayBattleMe:
 	.string "MAY: Come on, battle with me, so I can\n"
 	.string "check out your POKéMON!$"
 
-LilycoveCity_Text_MayWontBeBeaten: @ 81E3234
+LilycoveCity_Text_MayWontBeBeaten:
 	.string "MAY: The POKéMON I raised won't be\n"
 	.string "beaten by your POKéMON, {PLAYER}{KUN}!$"
 
-LilycoveCity_Text_MayDefeat: @ 81E3275
+LilycoveCity_Text_MayDefeat:
 	.string "… … … … … … … …\p"
 	.string "I remember the battle I had with you,\n"
 	.string "{PLAYER}{KUN}, on ROUTE 103.\p"
 	.string "That battle helped you become this\n"
 	.string "strong, {PLAYER}{KUN}, didn't it?$"
 
-LilycoveCity_Text_MayGoingBackToLittleroot: @ 81E32FB
+LilycoveCity_Text_MayGoingBackToLittleroot:
 	.string "MAY: I'm thinking of going back to\n"
 	.string "LITTLEROOT soon.\p"
 	.string "I've caught a decent group of POKéMON,\n"
 	.string "and my POKéDEX is coming along, so\l"
 	.string "I'm going home to show my dad.$"
 
-LilycoveCity_Text_MayYouGoingToCollectBadges: @ 81E3398
+LilycoveCity_Text_MayYouGoingToCollectBadges:
 	.string "{PLAYER}{KUN}, what are you going to do?\p"
 	.string "Collect all the GYM BADGES and take\n"
 	.string "the POKéMON LEAGUE challenge?\p"
@@ -473,7 +473,7 @@ LilycoveCity_Text_MayYouGoingToCollectBadges: @ 81E3398
 	.string "POKéDEX. I'll complete it before you!\p"
 	.string "See you!$"
 
-LilycoveCity_Text_MayYouGoingToPokemonLeague: @ 81E346D
+LilycoveCity_Text_MayYouGoingToPokemonLeague:
 	.string "{PLAYER}{KUN}, what are you going to do?\p"
 	.string "Are you taking the POKéMON LEAGUE\n"
 	.string "challenge?\p"
@@ -483,7 +483,7 @@ LilycoveCity_Text_MayYouGoingToPokemonLeague: @ 81E346D
 	.string "but I'll finish my POKéDEX before you!\p"
 	.string "See you!$"
 
-LilycoveCity_Text_MayYouGoingToBattleFrontier: @ 81E353A
+LilycoveCity_Text_MayYouGoingToBattleFrontier:
 	.string "{PLAYER}{KUN}, what are you going to do?\p"
 	.string "Are you taking the BATTLE FRONTIER\n"
 	.string "challenge?\p"
@@ -493,7 +493,7 @@ LilycoveCity_Text_MayYouGoingToBattleFrontier: @ 81E353A
 	.string "but I'll finish my POKéDEX before you!\p"
 	.string "See you!$"
 
-LilycoveCity_Text_BrendanShoppingLetsBattle: @ 81E3608
+LilycoveCity_Text_BrendanShoppingLetsBattle:
 	.string "BRENDAN: Oh, hey, it's {PLAYER}.\p"
 	.string "I'm running an errand for my dad.\n"
 	.string "No, I'm not buying any DOLLS.\p"
@@ -501,39 +501,39 @@ LilycoveCity_Text_BrendanShoppingLetsBattle: @ 81E3608
 	.string "Want to have a battle to see who's been\n"
 	.string "raising POKéMON better?$"
 
-LilycoveCity_Text_BrendanNoConfidence: @ 81E36BF
+LilycoveCity_Text_BrendanNoConfidence:
 	.string "BRENDAN: Oh, what's the matter?\n"
 	.string "Don't have the confidence?$"
 
-LilycoveCity_Text_BrendanBattleMe: @ 81E36FA
+LilycoveCity_Text_BrendanBattleMe:
 	.string "BRENDAN: Want to battle to see who's\n"
 	.string "been raising POKéMON better?$"
 
-LilycoveCity_Text_BrendanWontBeBeaten: @ 81E373C
+LilycoveCity_Text_BrendanWontBeBeaten:
 	.string "BRENDAN: Aww, but you know I'm not\n"
 	.string "going to lose to no {PLAYER}.$"
 
-LilycoveCity_Text_BrendanDefeat: @ 81E3777
+LilycoveCity_Text_BrendanDefeat:
 	.string "Humph…\n"
 	.string "You've done a lot of raising.\p"
 	.string "That stings a bit--I had a head start\n"
 	.string "on you as a TRAINER…$"
 
-LilycoveCity_Text_BrendanGoingBackToLittleroot: @ 81E37D7
+LilycoveCity_Text_BrendanGoingBackToLittleroot:
 	.string "BRENDAN: I…\n"
 	.string "I plan on going home to LITTLEROOT.\p"
 	.string "You know I'm helping out my dad on his\n"
 	.string "POKéDEX. It's coming together pretty\l"
 	.string "decently, so I should go show him.$"
 
-LilycoveCity_Text_BrendanYouGoingToCollectBadges: @ 81E3876
+LilycoveCity_Text_BrendanYouGoingToCollectBadges:
 	.string "{PLAYER}, what are you going to do?\p"
 	.string "Collect all the GYM BADGES and take\n"
 	.string "the POKéMON LEAGUE challenge?\p"
 	.string "Maybe I'll do that, too…\p"
 	.string "Well, anyway, hang in there!$"
 
-LilycoveCity_Text_BrendanYouGoingToPokemonLeague: @ 81E390C
+LilycoveCity_Text_BrendanYouGoingToPokemonLeague:
 	.string "{PLAYER}, what are you going to do?\p"
 	.string "Since you're that strong, are you\n"
 	.string "taking the POKéMON LEAGUE challenge?\p"
@@ -542,7 +542,7 @@ LilycoveCity_Text_BrendanYouGoingToPokemonLeague: @ 81E390C
 	.string "you, {PLAYER}.\p"
 	.string "Well, anyway, hang in there!$"
 
-LilycoveCity_Text_BrendanYouGoingToBattleFrontier: @ 81E39E3
+LilycoveCity_Text_BrendanYouGoingToBattleFrontier:
 	.string "{PLAYER}, what are you going to do?\p"
 	.string "Are you taking the BATTLE FRONTIER\n"
 	.string "challenge?\p"
@@ -556,14 +556,14 @@ LilycoveCity_Text_BrendanYouGoingToBattleFrontier: @ 81E39E3
 	.string "FRONTIER.\p"
 	.string "Well, anyway, hang in there!$"
 
-LilycoveCity_Text_MovedLootIntoHideoutToday: @ 81E3B2C
+LilycoveCity_Text_MovedLootIntoHideoutToday:
 	.string "Fufufu…\p"
 	.string "We moved more loot into our secret\n"
 	.string "HIDEOUT today…\p"
 	.string "Wh-who are you?!\n"
 	.string "I was just talking to myself!$"
 
-LilycoveCity_Text_ChanceToDoBigThings: @ 81E3B95
+LilycoveCity_Text_ChanceToDoBigThings:
 	.string "I'm just a GRUNT, so I don't know what\n"
 	.string "the BOSS is thinking…\p"
 	.string "But being on TEAM AQUA, I know I'll get\n"
@@ -571,44 +571,44 @@ LilycoveCity_Text_ChanceToDoBigThings: @ 81E3B95
 	.string "Wh-who are you?!\n"
 	.string "I was just talking to myself!$"
 
-LilycoveCity_Text_DontGoNearCaveInCove: @ 81E3C46
+LilycoveCity_Text_DontGoNearCaveInCove:
 	.string "Hey, you!\p"
 	.string "Don't go near the cave in the cove!\p"
 	.string "Why? You don't need a reason why!\n"
 	.string "I'm an adult, so you just listen to me!$"
 
-LilycoveCity_Text_IfWorldBecomesOurs: @ 81E3CBE
+LilycoveCity_Text_IfWorldBecomesOurs:
 	.string "If this whole wide world becomes ours,\n"
 	.string "TEAM AQUA's, it will be a happier\l"
 	.string "place for POKéMON, too.$"
 
-LilycoveCity_Text_WailmerLeapOutOfWater: @ 81E3D1F
+LilycoveCity_Text_WailmerLeapOutOfWater:
 	.string "There! WAILMER!\n"
 	.string "Leap out of the water now!$"
 
-LilycoveCity_Text_GetLostMessingUpTraining: @ 81E3D4A
+LilycoveCity_Text_GetLostMessingUpTraining:
 	.string "Hunh? What do you want?\p"
 	.string "You're messing up our training,\n"
 	.string "so can you, like, get lost?$"
 
-LilycoveCity_Text_ContestHallInTown: @ 81E3D9E
+LilycoveCity_Text_ContestHallInTown:
 	.string "There's a POKéMON CONTEST HALL\n"
 	.string "right in this here town. \p"
 	.string "That means well-raised POKéMON will\n"
 	.string "come from all over the country.\p"
 	.string "My heart swells with excitement!$"
 
-LilycoveCity_Text_StrangeCaveInCove: @ 81E3E3C
+LilycoveCity_Text_StrangeCaveInCove:
 	.string "Have you seen that strange cave in\n"
 	.string "the cove at the edge of town?$"
 
-LilycoveCity_Text_GoingToMoveDeleterForHMs: @ 81E3E7D
+LilycoveCity_Text_GoingToMoveDeleterForHMs:
 	.string "I'm going to teach my POKéMON some new\n"
 	.string "moves for entering a CONTEST.\p"
 	.string "So, I'm going to see the MOVE DELETER\n"
 	.string "and make it forget HM moves.$"
 
-LilycoveCity_Text_ImFromKanto: @ 81E3F05
+LilycoveCity_Text_ImFromKanto:
 	.string "I came from KANTO.\p"
 	.string "The HOENN region is beautiful with\n"
 	.string "all its water and verdant nature.\p"
@@ -616,50 +616,50 @@ LilycoveCity_Text_ImFromKanto: @ 81E3F05
 	.string "Could there be rare POKéMON that live\n"
 	.string "only in this area?$"
 
-LilycoveCity_Text_TeamAquaBeenTrainingWailmer: @ 81E3FAB
+LilycoveCity_Text_TeamAquaBeenTrainingWailmer:
 	.string "TEAM AQUA's been training their\n"
 	.string "WAILMER in the cove.\p"
 	.string "We SAILORS can't get our boats out\n"
 	.string "to sea with them in the way!$"
 
-LilycoveCity_Text_SomeonePuntedTeamAquaOut: @ 81E4020
+LilycoveCity_Text_SomeonePuntedTeamAquaOut:
 	.string "Ahoy, did you know?\p"
 	.string "Someone punted TEAM AQUA out of\n"
 	.string "the way for us!\p"
 	.string "That got the WAILMER out of the cove,\n"
 	.string "so we can get our boats out again.$"
 
-LilycoveCity_Text_SomeoneStoleMyPokemon: @ 81E40AD
+LilycoveCity_Text_SomeoneStoleMyPokemon:
 	.string "I was taking a relaxing snooze at the\n"
 	.string "seaside inn to the sound of waves…\p"
 	.string "When someone stole my POKéMON!\p"
 	.string "Who's the abductor?\n"
 	.string "TEAM AQUA? Is it TEAM AQUA?$"
 
-LilycoveCity_Text_MissingPokemonCameBack: @ 81E4145
+LilycoveCity_Text_MissingPokemonCameBack:
 	.string "My missing POKéMON…\n"
 	.string "It came back without me noticing!$"
 
-LilycoveCity_Text_ImArtDealer: @ 81E417B
+LilycoveCity_Text_ImArtDealer:
 	.string "I'm an ART DEALER.\p"
 	.string "I am a buyer and seller of fine art,\n"
 	.string "especially paintings.\p"
 	.string "I've heard that the MUSEUM here has\n"
 	.string "magnificent works on exhibit…$"
 
-LilycoveCity_Text_SeaRemainsForeverYoung: @ 81E420B
+LilycoveCity_Text_SeaRemainsForeverYoung:
 	.string "Even as we grow old and wrinkled,\n"
 	.string "the sea remains forever young with\l"
 	.string "the vivid brilliance of life…\p"
 	.string "Fwohoho fwohohohoho…$"
 
-LilycoveCity_Text_SixtyYearsAgoHusbandProposed: @ 81E4283
+LilycoveCity_Text_SixtyYearsAgoHusbandProposed:
 	.string "It was sixty years ago that my husband\n"
 	.string "proposed to me here.\l"
 	.string "The sea remains as beautiful as ever.\p"
 	.string "Mufufufu mufufufufufu…$"
 
-LilycoveCity_Text_TeamAquaRenovatedCavern: @ 81E42FC
+LilycoveCity_Text_TeamAquaRenovatedCavern:
 	.string "Hm, you know of the peculiar cavern\n"
 	.string "in this cove?\p"
 	.string "That had been a natural formation,\n"
@@ -670,92 +670,92 @@ LilycoveCity_Text_TeamAquaRenovatedCavern: @ 81E42FC
 	.string "But what they do and what they say\n"
 	.string "don't match at all!$"
 
-LilycoveCity_Text_TeamAquaLotGoneForGood: @ 81E43FF
+LilycoveCity_Text_TeamAquaLotGoneForGood:
 	.string "That cave in the cove…\p"
 	.string "I didn't notice it right away,\n"
 	.string "but it's completely empty now.\p"
 	.string "That TEAM AQUA lot, they must\n"
 	.string "have gone away for good.$"
 
-LilycoveCity_Text_CitySign: @ 81E448B
+LilycoveCity_Text_CitySign:
 	.string "LILYCOVE CITY\p"
 	.string "“Where the land ends and the\n"
 	.string "sea begins.”$"
 
-LilycoveCity_Text_ContestHallSign: @ 81E44C3
+LilycoveCity_Text_ContestHallSign:
 	.string "POKéMON CONTEST HALL\n"
 	.string "“The gathering place for TRAINERS!”$"
 
-LilycoveCity_Text_MotelSign: @ 81E44FC
+LilycoveCity_Text_MotelSign:
 	.string "COVE LILY MOTEL\p"
 	.string "“Remember us as COVE LILY of\n"
 	.string "LILYCOVE.”$"
 
-LilycoveCity_Text_MuseumSign: @ 81E4534
+LilycoveCity_Text_MuseumSign:
 	.string "LILYCOVE MUSEUM\p"
 	.string "“POKéMON Masterpiece Collection\n"
 	.string "on exhibit!”$"
 
-LilycoveCity_Text_MuseumSignPlayersExhibit: @ 81E4571
+LilycoveCity_Text_MuseumSignPlayersExhibit:
 	.string "LILYCOVE MUSEUM\p"
 	.string "“{PLAYER}'s POKéMON Collection\n"
 	.string "on exhibit!”$"
 
-LilycoveCity_Text_HarborSignUnderConstruction: @ 81E45A7
+LilycoveCity_Text_HarborSignUnderConstruction:
 	.string "LILYCOVE CITY HARBOR\p"
 	.string "“The ferry S.S. TIDAL is under\n"
 	.string "construction in SLATEPORT CITY.\p"
 	.string "“Service is scheduled to begin\n"
 	.string "shortly.”$"
 
-LilycoveCity_Text_HarborSign: @ 81E4624
+LilycoveCity_Text_HarborSign:
 	.string "LILYCOVE CITY HARBOR\p"
 	.string "“Enjoy a delightful cruise on\n"
 	.string "the ferry S.S. TIDAL.”$"
 
-LilycoveCity_Text_TrainerFanClubSign: @ 81E466E
+LilycoveCity_Text_TrainerFanClubSign:
 	.string "POKéMON TRAINER FAN CLUB\p"
 	.string "The names of TRAINERS are scribbled\n"
 	.string "all over the sign…$"
 
-LilycoveCity_Text_DepartmentStoreSign: @ 81E46BE
+LilycoveCity_Text_DepartmentStoreSign:
 	.string "LILYCOVE DEPARTMENT STORE\p"
 	.string "“Overflowing with great merchandise\n"
 	.string "and excitement!\p"
 	.string "“A great place to find that something\n"
 	.string "you need!”$"
 
-LilycoveCity_Text_MoveDeletersHouseSign: @ 81E473D
+LilycoveCity_Text_MoveDeletersHouseSign:
 	.string "MOVE DELETER'S HOUSE\p"
 	.string "“Unwanted POKéMON moves deleted.”$"
 
-LilycoveCity_Text_DoYouKnowAboutBerryBlender: @ 81E4774
+LilycoveCity_Text_DoYouKnowAboutBerryBlender:
 	.string "Do you know about the machine\n"
 	.string "BERRY BLENDER?$"
 
-LilycoveCity_Text_FasterSpinBetterPokeblocks: @ 81E47A1
+LilycoveCity_Text_FasterSpinBetterPokeblocks:
 	.string "People have to work together to get it\n"
 	.string "to spin faster.\p"
 	.string "The faster you can make it spin, the\n"
 	.string "better {POKEBLOCK}S you can get, I've heard.$"
 
-LilycoveCity_Text_ExplainBerryBlender: @ 81E4824
+LilycoveCity_Text_ExplainBerryBlender:
 	.string "It's used for making a kind of candy\n"
 	.string "called a {POKEBLOCK}.\p"
 	.string "If you give a good {POKEBLOCK} to a POKéMON,\n"
 	.string "its condition will improve by a lot.$"
 
-LilycoveCity_Text_HeardTowerCalledSkyPillar: @ 81E48A5
+LilycoveCity_Text_HeardTowerCalledSkyPillar:
 	.string "I heard there's a tower somewhere out\n"
 	.string "on the sea routes.\p"
 	.string "It's called the SKY PILLAR, I hear.$"
 
-LilycoveCity_Text_SawTallTowerOnRoute131: @ 81E4902
+LilycoveCity_Text_SawTallTowerOnRoute131:
 	.string "I saw this tall tower somewhere\n"
 	.string "around ROUTE 131.\p"
 	.string "Could that possibly be…?$"
 
-LilycoveCity_Text_JustArrivedAndSawRarePokemon: @ 81E494D
+LilycoveCity_Text_JustArrivedAndSawRarePokemon:
 	.string "We just arrived here on our\n"
 	.string "honeymoon vacation.\p"
 	.string "We happened to see a DRAGON-type\n"
@@ -763,7 +763,7 @@ LilycoveCity_Text_JustArrivedAndSawRarePokemon: @ 81E494D
 	.string "Do cool POKéMON like that live in\n"
 	.string "the HOENN region?$"
 
-LilycoveCity_Text_HoneymoonVowToSeeRarePokemon: @ 81E49F4
+LilycoveCity_Text_HoneymoonVowToSeeRarePokemon:
 	.string "On our honeymoon, we vowed to see as\n"
 	.string "many rare POKéMON as we can.\p"
 	.string "So we were delighted to see a rare\n"
diff --git a/data/maps/LilycoveCity_ContestHall/scripts.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc
index f390e9b24..610611358 100644
--- a/data/maps/LilycoveCity_ContestHall/scripts.inc
+++ b/data/maps/LilycoveCity_ContestHall/scripts.inc
@@ -27,26 +27,26 @@
 .set LOCALID_CUTE_AUDIENCE_3, 30
 .set LOCALID_CUTE_AUDIENCE_2, 31
 
-LilycoveCity_ContestHall_MapScripts:: @ 821B484
+LilycoveCity_ContestHall_MapScripts::
 	.byte 0
 
-LilycoveCity_ContestHall_EventScript_Boy1:: @ 821B485
+LilycoveCity_ContestHall_EventScript_Boy1::
 	msgbox LilycoveCity_ContestHall_Text_TodayWonSmartnessContest, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_Boy2:: @ 821B48E
+LilycoveCity_ContestHall_EventScript_Boy2::
 	msgbox LilycoveCity_ContestHall_Text_EnteredBunchOfContests, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_Girl:: @ 821B497
+LilycoveCity_ContestHall_EventScript_Girl::
 	msgbox LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_Sailor:: @ 821B4A0
+LilycoveCity_ContestHall_EventScript_Sailor::
 	msgbox LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartContestMC:: @ 821B4A9
+LilycoveCity_ContestHall_EventScript_SmartContestMC::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal, MSGBOX_DEFAULT
@@ -56,7 +56,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestMC:: @ 821B4A9
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartContestJudge:: @ 821B4C0
+LilycoveCity_ContestHall_EventScript_SmartContestJudge::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest, MSGBOX_DEFAULT
@@ -66,7 +66,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestJudge:: @ 821B4C0
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartContestant1:: @ 821B4D7
+LilycoveCity_ContestHall_EventScript_SmartContestant1::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_EnteredWrongContest, MSGBOX_DEFAULT
@@ -76,7 +76,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestant1:: @ 821B4D7
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartContestant2:: @ 821B4EE
+LilycoveCity_ContestHall_EventScript_SmartContestant2::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_RaisedMonToBeSmart, MSGBOX_DEFAULT
@@ -86,7 +86,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestant2:: @ 821B4EE
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartContestant3:: @ 821B505
+LilycoveCity_ContestHall_EventScript_SmartContestant3::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext, MSGBOX_DEFAULT
@@ -96,7 +96,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestant3:: @ 821B505
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartContestant4:: @ 821B51C
+LilycoveCity_ContestHall_EventScript_SmartContestant4::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife, MSGBOX_DEFAULT
@@ -106,11 +106,11 @@ LilycoveCity_ContestHall_EventScript_SmartContestant4:: @ 821B51C
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartContestAudience1:: @ 821B533
+LilycoveCity_ContestHall_EventScript_SmartContestAudience1::
 	msgbox LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartContestAudience2:: @ 821B53C
+LilycoveCity_ContestHall_EventScript_SmartContestAudience2::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves, MSGBOX_DEFAULT
@@ -120,7 +120,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestAudience2:: @ 821B53C
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartContestAudience3:: @ 821B553
+LilycoveCity_ContestHall_EventScript_SmartContestAudience3::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers, MSGBOX_DEFAULT
@@ -130,7 +130,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestAudience3:: @ 821B553
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartContestAudience4:: @ 821B56A
+LilycoveCity_ContestHall_EventScript_SmartContestAudience4::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_StillLoveSmartnessContests, MSGBOX_DEFAULT
@@ -140,7 +140,7 @@ LilycoveCity_ContestHall_EventScript_SmartContestAudience4:: @ 821B56A
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_BeautyContestMC:: @ 821B581
+LilycoveCity_ContestHall_EventScript_BeautyContestMC::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest, MSGBOX_DEFAULT
@@ -150,7 +150,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestMC:: @ 821B581
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_BeautyContestJudge:: @ 821B598
+LilycoveCity_ContestHall_EventScript_BeautyContestJudge::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty, MSGBOX_DEFAULT
@@ -160,7 +160,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestJudge:: @ 821B598
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_BeautyContestant1:: @ 821B5AF
+LilycoveCity_ContestHall_EventScript_BeautyContestant1::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty, MSGBOX_DEFAULT
@@ -170,7 +170,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestant1:: @ 821B5AF
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_BeautyContestant2:: @ 821B5C6
+LilycoveCity_ContestHall_EventScript_BeautyContestant2::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_OverdidGrooming, MSGBOX_DEFAULT
@@ -180,7 +180,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestant2:: @ 821B5C6
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_BeautyContestant3:: @ 821B5DD
+LilycoveCity_ContestHall_EventScript_BeautyContestant3::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam, MSGBOX_DEFAULT
@@ -190,7 +190,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestant3:: @ 821B5DD
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_BeautyContestant4:: @ 821B5F4
+LilycoveCity_ContestHall_EventScript_BeautyContestant4::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe, MSGBOX_DEFAULT
@@ -200,7 +200,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestant4:: @ 821B5F4
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_BeautyContestAudience1:: @ 821B60B
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience1::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy, MSGBOX_DEFAULT
@@ -210,7 +210,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestAudience1:: @ 821B60B
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_BeautyContestAudience2:: @ 821B622
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience2::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon, MSGBOX_DEFAULT
@@ -220,7 +220,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestAudience2:: @ 821B622
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_BeautyContestAudience3:: @ 821B639
+LilycoveCity_ContestHall_EventScript_BeautyContestAudience3::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone, MSGBOX_DEFAULT
@@ -230,7 +230,7 @@ LilycoveCity_ContestHall_EventScript_BeautyContestAudience3:: @ 821B639
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_CuteContestMC:: @ 821B650
+LilycoveCity_ContestHall_EventScript_CuteContestMC::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_InTheMiddleOfContest, MSGBOX_DEFAULT
@@ -240,7 +240,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestMC:: @ 821B650
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_CuteContestJudge:: @ 821B667
+LilycoveCity_ContestHall_EventScript_CuteContestJudge::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals, MSGBOX_DEFAULT
@@ -250,7 +250,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestJudge:: @ 821B667
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_CuteContestant1:: @ 821B67E
+LilycoveCity_ContestHall_EventScript_CuteContestant1::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_MyAzurillWasDistracted, MSGBOX_DEFAULT
@@ -260,7 +260,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestant1:: @ 821B67E
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_CuteContestant2:: @ 821B695
+LilycoveCity_ContestHall_EventScript_CuteContestant2::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_NeverWonBattleButContest, MSGBOX_DEFAULT
@@ -270,7 +270,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestant2:: @ 821B695
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_CuteContestant3:: @ 821B6AC
+LilycoveCity_ContestHall_EventScript_CuteContestant3::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_PetalDanceIsMarvel, MSGBOX_DEFAULT
@@ -280,7 +280,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestant3:: @ 821B6AC
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_CuteContestant4:: @ 821B6C3
+LilycoveCity_ContestHall_EventScript_CuteContestant4::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter, MSGBOX_DEFAULT
@@ -290,7 +290,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestant4:: @ 821B6C3
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_CuteContestAudience1:: @ 821B6DA
+LilycoveCity_ContestHall_EventScript_CuteContestAudience1::
 	lockall
 	applymovement LOCALID_CUTE_AUDIENCE_1, Common_Movement_FacePlayer
 	waitmovement 0
@@ -303,7 +303,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestAudience1:: @ 821B6DA
 	releaseall
 	end
 
-LilycoveCity_ContestHall_EventScript_CuteContestAudience2:: @ 821B705
+LilycoveCity_ContestHall_EventScript_CuteContestAudience2::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn, MSGBOX_DEFAULT
@@ -313,7 +313,7 @@ LilycoveCity_ContestHall_EventScript_CuteContestAudience2:: @ 821B705
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_CuteContestAudience3:: @ 821B71C
+LilycoveCity_ContestHall_EventScript_CuteContestAudience3::
 	lock
 	faceplayer
 	msgbox LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest, MSGBOX_DEFAULT
@@ -323,26 +323,26 @@ LilycoveCity_ContestHall_EventScript_CuteContestAudience3:: @ 821B71C
 	release
 	end
 
-LilycoveCity_ContestHall_EventScript_BeautyStageSign:: @ 821B733
+LilycoveCity_ContestHall_EventScript_BeautyStageSign::
 	msgbox LilycoveCity_ContestHall_Text_BeautyContestStage, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_EventScript_CuteStageSign:: @ 821B73C
+LilycoveCity_ContestHall_EventScript_CuteStageSign::
 	msgbox LilycoveCity_ContestHall_Text_CuteContestStage, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_EventScript_SmartStageSign:: @ 821B745
+LilycoveCity_ContestHall_EventScript_SmartStageSign::
 	msgbox LilycoveCity_ContestHall_Text_SmartContestStage, MSGBOX_SIGN
 	end
 
-LilycoveCity_ContestHall_Text_TodayWonSmartnessContest: @ 821B74E
+LilycoveCity_ContestHall_Text_TodayWonSmartnessContest:
 	.string "This POKéMON won the BEAUTY CONTEST\n"
 	.string "here before.\p"
 	.string "Well, guess what? Today, I made it\n"
 	.string "win a SMARTNESS CONTEST!\p"
 	.string "My abilities scare even me…$"
 
-LilycoveCity_ContestHall_Text_EnteredBunchOfContests: @ 821B7D7
+LilycoveCity_ContestHall_Text_EnteredBunchOfContests:
 	.string "I've entered a bunch of CONTESTS,\n"
 	.string "so I'm seeing how things work.\p"
 	.string "If you're in a COOLNESS CONTEST,\n"
@@ -350,29 +350,29 @@ LilycoveCity_ContestHall_Text_EnteredBunchOfContests: @ 821B7D7
 	.string "But smart moves and cute moves\n"
 	.string "don't go over well, for instance.$"
 
-LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks: @ 821B899
+LilycoveCity_ContestHall_Text_ManWhoWonEarlierHadPokeblocks:
 	.string "That young man who won earlier had\n"
 	.string "a whole bunch of different {POKEBLOCK}S.\p"
 	.string "Can you win if you had that many\n"
 	.string "of those things?$"
 
-LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous: @ 821B911
+LilycoveCity_ContestHall_Text_IsntThisPlaceHumongous:
 	.string "Whoa, isn't this place humongous!\p"
 	.string "The tension in the air… It's not\n"
 	.string "like a CONTEST hall in the sticks.$"
 
-LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal: @ 821B977
+LilycoveCity_ContestHall_Text_GiveItBestSmartAppeal:
 	.string "MC: Okay, SMART POKéMON and their\n"
 	.string "TRAINERS, are you ready?!\p"
 	.string "Give it your best showing!\n"
 	.string "Let's appeal!$"
 
-LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest: @ 821B9DC
+LilycoveCity_ContestHall_Text_AreYouEnjoyingThisContest:
 	.string "JUDGE: Are you enjoying this CONTEST?\p"
 	.string "Come back with three friends, and\n"
 	.string "all of you may enter a CONTEST!$"
 
-LilycoveCity_ContestHall_Text_EnteredWrongContest: @ 821BA44
+LilycoveCity_ContestHall_Text_EnteredWrongContest:
 	.string "Ayayayay…\n"
 	.string "I entered the wrong CONTEST.\p"
 	.string "I entered this tough POKéMON in\n"
@@ -380,7 +380,7 @@ LilycoveCity_ContestHall_Text_EnteredWrongContest: @ 821BA44
 	.string "Come on, wow them with a smart-looking\n"
 	.string "ROCK SMASH.$"
 
-LilycoveCity_ContestHall_Text_RaisedMonToBeSmart: @ 821BAD5
+LilycoveCity_ContestHall_Text_RaisedMonToBeSmart:
 	.string "I've spent many a year, and all my\n"
 	.string "wisdom besides, raising this POKéMON\l"
 	.string "to be smart.\p"
@@ -388,54 +388,54 @@ LilycoveCity_ContestHall_Text_RaisedMonToBeSmart: @ 821BAD5
 	.string "young pup's POKéMON.\p"
 	.string "My dear wife, are you seeing this?$"
 
-LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext: @ 821BB84
+LilycoveCity_ContestHall_Text_IfMonPullsSmartMoveNext:
 	.string "There it is!\p"
 	.string "If my POKéMON pulls a smart move next,\n"
 	.string "the audience's excitement will peak!$"
 
-LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife: @ 821BBDD
+LilycoveCity_ContestHall_Text_DontAppreciateCuteLeechLife:
 	.string "Oh, dear, no!\p"
 	.string "My darling ZUBAT's LEECH LIFE is so\n"
 	.string "cute I kept using it over and over!\p"
 	.string "But these mean people don't appreciate\n"
 	.string "it at all!$"
 
-LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa: @ 821BC65
+LilycoveCity_ContestHall_Text_YoureBeautifulGrandpa:
 	.string "Kiyaaah! You're beautiful, Grandpa!$"
 
-LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves: @ 821BC89
+LilycoveCity_ContestHall_Text_AllSeemToUseDifferentMoves:
 	.string "Even when TRAINERS enter the same\n"
 	.string "kind of POKéMON, they all seem to use\l"
 	.string "different moves for appeals.\p"
 	.string "It's just like the way people have\n"
 	.string "different styles for battling.$"
 
-LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers: @ 821BD30
+LilycoveCity_ContestHall_Text_PokemonSmarterThanTrainers:
 	.string "I think the POKéMON look smarter\n"
 	.string "than their TRAINERS. By a lot.$"
 
-LilycoveCity_ContestHall_Text_StillLoveSmartnessContests: @ 821BD70
+LilycoveCity_ContestHall_Text_StillLoveSmartnessContests:
 	.string "When all's said and done, I still love\n"
 	.string "SMARTNESS CONTESTS.\p"
 	.string "That intellectual green color…\n"
 	.string "It's so… So… Cool.$"
 
-LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest: @ 821BDDD
+LilycoveCity_ContestHall_Text_AreYouEnteringBeautyContest:
 	.string "MC: Are you entering the BEAUTY\n"
 	.string "CONTEST, too? Good luck!$"
 
-LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty: @ 821BE16
+LilycoveCity_ContestHall_Text_EveryPokemonPristineBeauty:
 	.string "JUDGE: Ah, every POKéMON here is\n"
 	.string "a model of pristine beauty!\p"
 	.string "Why, I almost forgot to score them!$"
 
-LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty: @ 821BE77
+LilycoveCity_ContestHall_Text_EyesWillBeGluedToMyBeauty:
 	.string "A POKéMON this beautiful…\n"
 	.string "There isn't another one like it.\p"
 	.string "Everyone's eyes will be glued to\n"
 	.string "my beauty.$"
 
-LilycoveCity_ContestHall_Text_OverdidGrooming: @ 821BEDE
+LilycoveCity_ContestHall_Text_OverdidGrooming:
 	.string "Waaaah!\p"
 	.string "I brushed and groomed my POKéMON\n"
 	.string "carefully for this CONTEST…\p"
@@ -443,96 +443,96 @@ LilycoveCity_ContestHall_Text_OverdidGrooming: @ 821BEDE
 	.string "My POKéMON's coat turned all scraggly…\p"
 	.string "What should I do?$"
 
-LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam: @ 821BF6E
+LilycoveCity_ContestHall_Text_JudgeWontSeeAuroraBeam:
 	.string "This AURORA BEAM is so dazzling,\n"
 	.string "the JUDGE won't be able to see it.\p"
 	.string "Uh, wait a second…\n"
 	.string "That'll be meaningless, then!$"
 
-LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe: @ 821BFE3
+LilycoveCity_ContestHall_Text_PokemonLooksLikeYoungerMe:
 	.string "This pretty POKéMON looks just like\n"
 	.string "me when I was younger.\p"
 	.string "Right when I said that, my husband\n"
 	.string "spewed the coffee he was drinking.\p"
 	.string "Did I say something funny?$"
 
-LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy: @ 821C07F
+LilycoveCity_ContestHall_Text_WinBeautyContestMakesMeHappy:
 	.string "You know, if I win at a BEAUTY\n"
 	.string "CONTEST, sure it makes me\l"
 	.string "happy. More than usual, anyway.$"
 
-LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon: @ 821C0D8
+LilycoveCity_ContestHall_Text_GanderAtAllThosePrettyPokemon:
 	.string "Wahahahah!\p"
 	.string "Will you take a gander at all those\n"
 	.string "pretty POKéMON!\l"
 	.string "I just love this sort of glitz!$"
 
-LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone: @ 821C137
+LilycoveCity_ContestHall_Text_CantWinOnBeautyAlone:
 	.string "You can't always win on just beauty\n"
 	.string "alone.\p"
 	.string "You have to groom your POKéMON so\n"
 	.string "it's nice and glossy like mine.$"
 
-LilycoveCity_ContestHall_Text_InTheMiddleOfContest: @ 821C1A4
+LilycoveCity_ContestHall_Text_InTheMiddleOfContest:
 	.string "MC: Uh-oh! Hello!\n"
 	.string "We're in the middle of a CONTEST!\p"
 	.string "Please enter at our registration\n"
 	.string "counter and come out, okay?$"
 
-LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals: @ 821C215
+LilycoveCity_ContestHall_Text_SuchCharmingCuteAppeals:
 	.string "JUDGE: Oh, such charming and cute\n"
 	.string "appeals!\p"
 	.string "Oh, my goodness! What a perfectly\n"
 	.string "adorable WATER SPORT appeal!$"
 
-LilycoveCity_ContestHall_Text_MyAzurillWasDistracted: @ 821C27F
+LilycoveCity_ContestHall_Text_MyAzurillWasDistracted:
 	.string "Oh, no… My sweet AZURILL was\n"
 	.string "distracted by another POKéMON.$"
 
-LilycoveCity_ContestHall_Text_NeverWonBattleButContest: @ 821C2BB
+LilycoveCity_ContestHall_Text_NeverWonBattleButContest:
 	.string "My POKéMON has never won in a battle,\n"
 	.string "but put it in a CONTEST and look out!$"
 
-LilycoveCity_ContestHall_Text_PetalDanceIsMarvel: @ 821C307
+LilycoveCity_ContestHall_Text_PetalDanceIsMarvel:
 	.string "My POKéMON's PETAL DANCE is a marvel\n"
 	.string "of elegance.\p"
 	.string "I won't let anyone disturb its\n"
 	.string "performance.$"
 
-LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter: @ 821C365
+LilycoveCity_ContestHall_Text_MyMonAppealSoMuchCuter:
 	.string "Everyone's POKéMON are very cute.\p"
 	.string "However, if my POKéMON were to make\n"
 	.string "a cute appeal…\p"
 	.string "I'm sure that it would be so much \n"
 	.string "cuter than the others.$"
 
-LilycoveCity_ContestHall_Text_MyChildIsInContest: @ 821C3F4
+LilycoveCity_ContestHall_Text_MyChildIsInContest:
 	.string "My child is in this CONTEST.$"
 
-LilycoveCity_ContestHall_Text_ComeOnDear: @ 821C411
+LilycoveCity_ContestHall_Text_ComeOnDear:
 	.string "Come on, dear. Go for it!\n"
 	.string "Your POKéMON is the best!$"
 
-LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest: @ 821C445
+LilycoveCity_ContestHall_Text_ThatGirlThereIsCutest:
 	.string "I think that girl over there is\n"
 	.string "the cutest of the lot.\p"
 	.string "What's that? They're judging\n"
 	.string "POKéMON by their looks?$"
 
-LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn: @ 821C4B1
+LilycoveCity_ContestHall_Text_WantCuteMonOfMyOwn:
 	.string "Ohh, seeing all these cute POKéMON,\n"
 	.string "they make we want to get my own!\p"
 	.string "I'm going to go catch some!$"
 
-LilycoveCity_ContestHall_Text_BeautyContestStage: @ 821C512
+LilycoveCity_ContestHall_Text_BeautyContestStage:
 	.string "BEAUTY CONTEST STAGE\n"
 	.string "BE ALLURED BY BEAUTIFUL POKéMON!$"
 
-LilycoveCity_ContestHall_Text_CuteContestStage: @ 821C548
+LilycoveCity_ContestHall_Text_CuteContestStage:
 	.string "CUTENESS CONTEST STAGE\n"
 	.string "BE CHARMED BY CUTE POKéMON!$"
 
-LilycoveCity_ContestHall_Text_SmartContestStage: @ 821C57B
+LilycoveCity_ContestHall_Text_SmartContestStage:
 	.string "SMARTNESS CONTEST STAGE\n"
 	.string "BE IMPRESSED BY SMART POKéMON!$"
 
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 458585ea4..48a8e6b92 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -4,19 +4,19 @@
 .set LOCALID_ARTIST, 4
 .set LOCALID_ARTIST_LINK, 11
 
-LilycoveCity_ContestLobby_MapScripts:: @ 821A211
+LilycoveCity_ContestLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_ContestLobby_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_ContestLobby_OnFrame
 	.byte 0
 
 @ Some scripts for this room are split into data/scripts/contest_hall and data/scripts/berry_blender
 
-LilycoveCity_ContestLobby_OnTransition: @ 821A21C
+LilycoveCity_ContestLobby_OnTransition:
 	call LilycoveCity_ContestLobby_EventScript_TryShowContestReporter
 	call LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster:: @ 821A227
+LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster::
 	getpricereduction POKENEWS_BLENDMASTER
 	compare VAR_RESULT, TRUE
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_ShowBlendMaster
@@ -24,22 +24,22 @@ LilycoveCity_ContestLobby_EventScript_TryShowBlendMaster:: @ 821A227
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER
 	return
 
-LilycoveCity_ContestLobby_EventScript_ShowBlendMaster:: @ 821A23C
+LilycoveCity_ContestLobby_EventScript_ShowBlendMaster::
 	setflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_REPLACEMENT
 	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER
 	return
 
-LilycoveCity_ContestLobby_OnFrame: @ 821A243
+LilycoveCity_ContestLobby_OnFrame:
 	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_TryDoContestArtist
 	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist
 	.2byte 0
 
-LilycoveCity_ContestLobby_EventScript_TryDoContestArtist:: @ 821A255
+LilycoveCity_ContestLobby_EventScript_TryDoContestArtist::
 	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_ContestArtist
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	end
 
-LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264
+LilycoveCity_ContestLobby_EventScript_ContestArtist::
 	lockall
 	addobject LOCALID_ARTIST
 	applymovement LOCALID_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer
@@ -59,7 +59,7 @@ LilycoveCity_ContestLobby_EventScript_ContestArtist:: @ 821A264
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum:: @ 821A2AA
+LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum::
 	msgbox LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum, MSGBOX_DEFAULT
 	closemessage
 	special SaveMuseumContestPainting
@@ -75,7 +75,7 @@ LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum:: @ 821A2AA
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting:: @ 821A2E4
+LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting::
 	msgbox LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseum
@@ -88,7 +88,7 @@ LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePainting:: @ 821A2E4
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: @ 821A314
+LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon::
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
 	special BufferContestWinnerMonName
 	applymovement LOCALID_ARTIST, LilycoveCity_ContestLobby_Movement_ArtistBeginToExit
@@ -107,7 +107,7 @@ LilycoveCity_ContestLobby_EventScript_ReceivedArtistRibbon:: @ 821A314
 	closemessage
 	return
 
-LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons:: @ 821A360
+LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons::
 	specialvar VAR_0x8004, CountPlayerMuseumPaintings
 	switch VAR_0x8004
 	case 1, LilycoveCity_ContestLobby_EventScript_ShowPatron1
@@ -117,27 +117,27 @@ LilycoveCity_ContestLobby_EventScript_UpdateMuseumPatrons:: @ 821A360
 	case 5, LilycoveCity_ContestLobby_EventScript_ShowTourists
 	return
 
-LilycoveCity_ContestLobby_EventScript_ShowPatron1:: @ 821A3A2
+LilycoveCity_ContestLobby_EventScript_ShowPatron1::
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_1
 	return
 
-LilycoveCity_ContestLobby_EventScript_ShowPatron2:: @ 821A3A6
+LilycoveCity_ContestLobby_EventScript_ShowPatron2::
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2
 	return
 
-LilycoveCity_ContestLobby_EventScript_ShowPatron3:: @ 821A3AA
+LilycoveCity_ContestLobby_EventScript_ShowPatron3::
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3
 	return
 
-LilycoveCity_ContestLobby_EventScript_ShowPatron4:: @ 821A3AE
+LilycoveCity_ContestLobby_EventScript_ShowPatron4::
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_4
 	return
 
-LilycoveCity_ContestLobby_EventScript_ShowTourists:: @ 821A3B2
+LilycoveCity_ContestLobby_EventScript_ShowTourists::
 	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetPaintingFlag:: @ 821A3B6
+LilycoveCity_ContestLobby_EventScript_SetPaintingFlag::
 	switch VAR_CONTEST_CATEGORY
 	case CONTEST_CATEGORY_COOL, LilycoveCity_ContestLobby_EventScript_MadeCoolPainting
 	case CONTEST_CATEGORY_BEAUTY, LilycoveCity_ContestLobby_EventScript_MadeBeautyPainting
@@ -146,27 +146,27 @@ LilycoveCity_ContestLobby_EventScript_SetPaintingFlag:: @ 821A3B6
 	case CONTEST_CATEGORY_TOUGH, LilycoveCity_ContestLobby_EventScript_MadeToughPainting
 	return
 
-LilycoveCity_ContestLobby_EventScript_MadeCoolPainting:: @ 821A3F3
+LilycoveCity_ContestLobby_EventScript_MadeCoolPainting::
 	setflag FLAG_COOL_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_MadeBeautyPainting:: @ 821A3F7
+LilycoveCity_ContestLobby_EventScript_MadeBeautyPainting::
 	setflag FLAG_BEAUTY_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_MadeCutePainting:: @ 821A3FB
+LilycoveCity_ContestLobby_EventScript_MadeCutePainting::
 	setflag FLAG_CUTE_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_MadeSmartPainting:: @ 821A3FF
+LilycoveCity_ContestLobby_EventScript_MadeSmartPainting::
 	setflag FLAG_SMART_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_EventScript_MadeToughPainting:: @ 821A403
+LilycoveCity_ContestLobby_EventScript_MadeToughPainting::
 	setflag FLAG_TOUGH_PAINTING_MADE
 	return
 
-LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer: @ 821A407
+LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer:
 	walk_down
 	walk_down
 	walk_down
@@ -176,7 +176,7 @@ LilycoveCity_ContestLobby_Movement_ArtistApproachPlayer: @ 821A407
 	walk_right
 	step_end
 
-LilycoveCity_ContestLobby_Movement_ArtistExit: @ 821A40F
+LilycoveCity_ContestLobby_Movement_ArtistExit:
 	walk_down
 	walk_down
 	walk_down
@@ -187,17 +187,17 @@ LilycoveCity_ContestLobby_Movement_ArtistExit: @ 821A40F
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_PlayerFaceArtist: @ 821A418
+LilycoveCity_ContestLobby_Movement_PlayerFaceArtist:
 	walk_in_place_fastest_left
 	step_end
 
-LilycoveCity_ContestLobby_Movement_ArtistBeginToExit: @ 821A41A
+LilycoveCity_ContestLobby_Movement_ArtistBeginToExit:
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer: @ 821A41E
+LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer:
 	delay_16
 	delay_16
 	delay_16
@@ -208,12 +208,12 @@ LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer: @ 821A41E
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist:: @ 821A427
+LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist::
 	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_LinkContestArtist
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436
+LilycoveCity_ContestLobby_EventScript_LinkContestArtist::
 	lockall
 	addobject LOCALID_ARTIST_LINK
 	applymovement LOCALID_ARTIST_LINK, LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer
@@ -231,7 +231,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestArtist:: @ 821A436
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink
 	end
 
-LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink:: @ 821A47A
+LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink::
 	msgbox LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum, MSGBOX_DEFAULT
 	closemessage
 	special SaveMuseumContestPainting
@@ -247,7 +247,7 @@ LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink:: @ 821A47A
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink:: @ 821A4B4
+LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink::
 	msgbox LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_TakePaintingToMuseumLink
@@ -260,7 +260,7 @@ LilycoveCity_ContestLobby_EventScript_ConfirmDontTakePaintingLink:: @ 821A4B4
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon:: @ 821A4E4
+LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon::
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
 	setflag FLAG_SYS_RIBBON_GET
 	special BufferContestWinnerMonName
@@ -280,7 +280,7 @@ LilycoveCity_ContestLobby_EventScript_ReceivedLinkArtistRibbon:: @ 821A4E4
 	closemessage
 	return
 
-LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer: @ 821A533
+LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer:
 	walk_down
 	walk_down
 	walk_down
@@ -291,7 +291,7 @@ LilycoveCity_ContestLobby_Movement_LinkArtistApproachPlayer: @ 821A533
 	walk_left
 	step_end
 
-LilycoveCity_ContestLobby_Movement_LinkArtistExit: @ 821A53C
+LilycoveCity_ContestLobby_Movement_LinkArtistExit:
 	walk_down
 	walk_down
 	walk_down
@@ -302,17 +302,17 @@ LilycoveCity_ContestLobby_Movement_LinkArtistExit: @ 821A53C
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist: @ 821A545
+LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist:
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit: @ 821A547
+LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit:
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer: @ 821A54B
+LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer:
 	delay_16
 	delay_16
 	delay_16
@@ -324,7 +324,7 @@ LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer: @ 821A54B
 	step_end
 
 @ EventScript_SpeakToContestReceptionist either ends or returns after a contest entry is submitted
-LilycoveCity_ContestLobby_EventScript_ContestReceptionist:: @ 821A554
+LilycoveCity_ContestLobby_EventScript_ContestReceptionist::
 	special ClearLinkContestFlags
 	specialvar VAR_RESULT, IsContestDebugActive  @ Always FALSE
 	compare VAR_RESULT, TRUE
@@ -338,7 +338,7 @@ LilycoveCity_ContestLobby_EventScript_ContestReceptionist:: @ 821A554
 	waitstate
 	end
 
-LilycoveCity_ContestLobby_EventScript_SetContestType:: @ 821A585
+LilycoveCity_ContestLobby_EventScript_SetContestType::
 	switch VAR_CONTEST_RANK
 	case CONTEST_RANK_NORMAL, LilycoveCity_ContestLobby_EventScript_SetNormalContestType
 	case CONTEST_RANK_SUPER, LilycoveCity_ContestLobby_EventScript_SetSuperContestType
@@ -346,24 +346,24 @@ LilycoveCity_ContestLobby_EventScript_SetContestType:: @ 821A585
 	case CONTEST_RANK_MASTER, LilycoveCity_ContestLobby_EventScript_SetMasterContestType
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetNormalContestType:: @ 821A5B7
+LilycoveCity_ContestLobby_EventScript_SetNormalContestType::
 	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetSuperContestType:: @ 821A5BD
+LilycoveCity_ContestLobby_EventScript_SetSuperContestType::
 	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetHyperContestType:: @ 821A5C3
+LilycoveCity_ContestLobby_EventScript_SetHyperContestType::
 	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_HYPER
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetMasterContestType:: @ 821A5C9
+LilycoveCity_ContestLobby_EventScript_SetMasterContestType::
 	setvar VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_MASTER
 	return
 
 @ Functionally unused
-LilycoveCity_ContestLobby_EventScript_SetDebug:: @ 821A5CF
+LilycoveCity_ContestLobby_EventScript_SetDebug::
 	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
 	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
 	additem ITEM_CONTEST_PASS
@@ -373,7 +373,7 @@ LilycoveCity_ContestLobby_EventScript_SetDebug:: @ 821A5CF
 	setflag FLAG_SYS_RIBBON_GET
 	end
 
-LilycoveCity_ContestLobby_EventScript_WarpToContestHall:: @ 821A5EF
+LilycoveCity_ContestLobby_EventScript_WarpToContestHall::
 	setflag FLAG_ENTERED_CONTEST
 	switch VAR_CONTEST_CATEGORY
 	case CONTEST_CATEGORY_COOL, LilycoveCity_ContestLobby_EventScript_WarpToCoolContestHall
@@ -383,37 +383,37 @@ LilycoveCity_ContestLobby_EventScript_WarpToContestHall:: @ 821A5EF
 	case CONTEST_CATEGORY_TOUGH, LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall
 	return
 
-LilycoveCity_ContestLobby_EventScript_WarpToCoolContestHall:: @ 821A62F
+LilycoveCity_ContestLobby_EventScript_WarpToCoolContestHall::
 	setwarp MAP_CONTEST_HALL_COOL, 255, 7, 5
 	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_WarpToBeautyContestHall:: @ 821A63C
+LilycoveCity_ContestLobby_EventScript_WarpToBeautyContestHall::
 	setwarp MAP_CONTEST_HALL_BEAUTY, 255, 7, 5
 	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_WarpToCuteContestHall:: @ 821A649
+LilycoveCity_ContestLobby_EventScript_WarpToCuteContestHall::
 	setwarp MAP_CONTEST_HALL_CUTE, 255, 7, 5
 	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_WarpToSmartContestHall:: @ 821A656
+LilycoveCity_ContestLobby_EventScript_WarpToSmartContestHall::
 	setwarp MAP_CONTEST_HALL_SMART, 255, 7, 5
 	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall:: @ 821A663
+LilycoveCity_ContestLobby_EventScript_WarpToToughContestHall::
 	setwarp MAP_CONTEST_HALL_TOUGH, 255, 7, 5
 	special DoContestHallWarp
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: @ 821A670
+LilycoveCity_ContestLobby_EventScript_LeadToContestHall::
 	lockall
 	applymovement LOCALID_RECEPTIONIST, LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter
 	waitmovement 0
@@ -440,7 +440,7 @@ LilycoveCity_ContestLobby_EventScript_LeadToContestHall:: @ 821A670
 	releaseall
 	return
 
-LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall: @ 821A6E8
+LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall:
 	walk_left
 	walk_left
 	walk_left
@@ -452,24 +452,24 @@ LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall: @ 821A6E8
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist: @ 821A6F2
+LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist:
 	walk_in_place_fastest_left
 	walk_left
 	step_end
 
-LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter: @ 821A6F5
+LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter:
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter: @ 821A6F9
+LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter:
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall: @ 821A6FD
+LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall:
 	walk_left
 	walk_left
 	walk_left
@@ -480,85 +480,85 @@ LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall: @ 821A6FD
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer: @ 821A706
+LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer:
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_ContestLobby_EventScript_BlackBelt:: @ 821A708
+LilycoveCity_ContestLobby_EventScript_BlackBelt::
 	msgbox LilycoveCity_ContestLobby_Text_MasterRankHereICome, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_Girl:: @ 821A711
+LilycoveCity_ContestLobby_EventScript_Girl::
 	msgbox LilycoveCity_ContestLobby_Text_WholeVarietyOfPokemonHere, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_Artist:: @ 821A71A
+LilycoveCity_ContestLobby_EventScript_Artist::
 	msgbox LilycoveCity_ContestLobby_Text_ContestFeastForEyes, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_FatMan:: @ 821A723
+LilycoveCity_ContestLobby_EventScript_FatMan::
 	msgbox LilycoveCity_ContestLobby_Text_ToughContestIsExtreme, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_Fisherman:: @ 821A72C
+LilycoveCity_ContestLobby_EventScript_Fisherman::
 	msgbox LilycoveCity_ContestLobby_Text_LavishedCareOnMon, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_NinjaBoy:: @ 821A735
+LilycoveCity_ContestLobby_EventScript_NinjaBoy::
 	msgbox LilycoveCity_ContestLobby_Text_MadePokeblocksWithFamily, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_ContestWinner1:: @ 821A73E
+LilycoveCity_ContestLobby_EventScript_ContestWinner1::
 	lockall
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_HALL_1
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_ContestWinner2:: @ 821A745
+LilycoveCity_ContestLobby_EventScript_ContestWinner2::
 	lockall
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_HALL_2
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_ContestWinner3:: @ 821A74C
+LilycoveCity_ContestLobby_EventScript_ContestWinner3::
 	lockall
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_HALL_3
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_ContestWinner4:: @ 821A753
+LilycoveCity_ContestLobby_EventScript_ContestWinner4::
 	lockall
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_HALL_4
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_ContestWinner5:: @ 821A75A
+LilycoveCity_ContestLobby_EventScript_ContestWinner5::
 	lockall
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_HALL_5
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_ContestWinner6:: @ 821A761
+LilycoveCity_ContestLobby_EventScript_ContestWinner6::
 	lockall
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_HALL_6
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender3Boy:: @ 821A768
+LilycoveCity_ContestLobby_EventScript_Blender3Boy::
 	msgbox BerryBlender_Text_LetsGetBlendingAlready, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_Blender3Girl:: @ 821A771
+LilycoveCity_ContestLobby_EventScript_Blender3Girl::
 	msgbox BerryBlender_Text_WhatKindOfPokeblockWillIGet, MSGBOX_NPC
 	end
 
-LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords:: @ 821A77A
+LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords::
 	lockall
 	special ShowBerryBlenderRecordWindow
 	waitbuttonpress
@@ -566,7 +566,7 @@ LilycoveCity_ContestLobby_EventScript_BerryBlenderSpeedRecords:: @ 821A77A
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkContestResults:: @ 821A784
+LilycoveCity_ContestLobby_EventScript_LinkContestResults::
 	lockall
 	frontier_results FACILITY_LINK_CONTEST
 	waitbuttonpress
@@ -574,60 +574,60 @@ LilycoveCity_ContestLobby_EventScript_LinkContestResults:: @ 821A784
 	releaseall
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMaster:: @ 821A798
+LilycoveCity_ContestLobby_EventScript_BlendMaster::
 	lock
 	faceplayer
 	msgbox BerryBlender_Text_BlendWithTheBlendMaster, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1:: @ 821A7A8
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker1::
 	lock
 	msgbox BerryBlender_Text_WhoaAwesome, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2:: @ 821A7B3
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker2::
 	lock
 	msgbox BerryBlender_Text_WickedlyFast, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3:: @ 821A7BE
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker3::
 	lock
 	msgbox BerryBlender_Text_WhatAnExpert, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4:: @ 821A7C9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker4::
 	lock
 	faceplayer
 	msgbox BerryBlender_Text_MadeAmazingPokeblocksWithMaster, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5:: @ 821A7D9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker5::
 	lock
 	faceplayer
 	msgbox BerryBlender_Text_QualitiesOfBlendMaster, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6:: @ 821A7E9
+LilycoveCity_ContestLobby_EventScript_BlendMasterOnlooker6::
 	lock
 	faceplayer
 	msgbox BerryBlender_Text_MasterWorksOnSkillsInMountains, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection
 	end
 
-LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection:: @ 821A7F9
+LilycoveCity_ContestLobby_EventScript_FaceOriginalDirection::
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist:: @ 821A806
+LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist::
 	special ClearLinkContestFlags
 	lock
 	faceplayer
@@ -635,7 +635,7 @@ LilycoveCity_ContestLobby_EventScript_LinkContestReceptionist:: @ 821A806
 	goto LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest:: @ 821A819
+LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest::
 	message LilycoveCity_ContestLobby_Text_EnterContest3
 	waitmessage
 	multichoice 0, 0, MULTI_ENTERINFO, FALSE
@@ -646,7 +646,7 @@ LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest:: @ 821A819
 	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest:: @ 821A856
+LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest::
 	msgbox LilycoveCity_ContestLobby_Text_ProgressWillBeSaved, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkContest
@@ -664,19 +664,19 @@ LilycoveCity_ContestLobby_EventScript_TryEnterLinkContest:: @ 821A856
 	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_EmeraldMode:: @ 821A8BB
+LilycoveCity_ContestLobby_EventScript_EmeraldMode::
 	setvar VAR_TEMP_C, 0
 	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_GlobalMode:: @ 821A8C6
+LilycoveCity_ContestLobby_EventScript_GlobalMode::
 	setvar VAR_TEMP_C, 1
 	compare VAR_TEMP_D, 1
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_CancelLinkNoWirelessGMode
 	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType:: @ 821A8DC
+LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType::
 	message LilycoveCity_ContestLobby_Text_EnterWhichContest3
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_TYPE, FALSE
@@ -687,7 +687,7 @@ LilycoveCity_ContestLobby_EventScript_ChooseLinkContestType:: @ 821A8DC
 	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkContestInfo:: @ 821A90D
+LilycoveCity_ContestLobby_EventScript_LinkContestInfo::
 	message LilycoveCity_ContestLobby_Text_WhichTopic2
 	waitmessage
 	multichoice 0, 0, MULTI_LINK_CONTEST_INFO, FALSE
@@ -699,28 +699,28 @@ LilycoveCity_ContestLobby_EventScript_LinkContestInfo:: @ 821A90D
 	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_AskEnterLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExplainLinkContest:: @ 821A955
+LilycoveCity_ContestLobby_EventScript_ExplainLinkContest::
 	msgbox LilycoveCity_ContestLobby_Text_ExplainLinkContest, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExplainEMode:: @ 821A963
+LilycoveCity_ContestLobby_EventScript_ExplainEMode::
 	msgbox LilycoveCity_ContestLobby_Text_ExplainEMode, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExplainGMode:: @ 821A971
+LilycoveCity_ContestLobby_EventScript_ExplainGMode::
 	msgbox LilycoveCity_ContestLobby_Text_ExplainGMode, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_LinkContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_CancelLinkContest:: @ 821A97F
+LilycoveCity_ContestLobby_EventScript_CancelLinkContest::
 	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_ParticipateAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon:: @ 821A98C
+LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon::
 	msgbox LilycoveCity_ContestLobby_Text_EnterWhichPokemon3, MSGBOX_DEFAULT
 	setvar VAR_CONTEST_RANK, 0
 	choosecontestmon
@@ -739,27 +739,27 @@ LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon:: @ 821A98C
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkCantEnterFainted
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkCantEnterLowRank:: @ 821A9E0
+LilycoveCity_ContestLobby_EventScript_LinkCantEnterLowRank::
 	msgbox LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkCantEnterEgg:: @ 821A9EE
+LilycoveCity_ContestLobby_EventScript_LinkCantEnterEgg::
 	msgbox LilycoveCity_ContestLobby_Text_EggCannotTakePart2, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_LinkCantEnterFainted:: @ 821A9FC
+LilycoveCity_ContestLobby_EventScript_LinkCantEnterFainted::
 	msgbox LilycoveCity_ContestLobby_Text_MonInNoCondition2, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_ChooseLinkContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest:: @ 821AA0A
+LilycoveCity_ContestLobby_EventScript_EnterMonForLinkContest::
 	copyvar VAR_0x8008, VAR_0x8004
 	goto LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest:: @ 821AA15
+LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest::
 	compare VAR_TEMP_D, 1
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupType
 	compare VAR_TEMP_D, 2
@@ -791,49 +791,49 @@ LilycoveCity_ContestLobby_EventScript_TrySetUpLinkContest:: @ 821AA15
 	case 2, LilycoveCity_ContestLobby_EventScript_CancelLinkTransmissionError
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryLinkEMode:: @ 821AABB
+LilycoveCity_ContestLobby_EventScript_TryLinkEMode::
 	special TryContestEModeLinkup
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_TryLinkGMode:: @ 821AAC0
+LilycoveCity_ContestLobby_EventScript_TryLinkGMode::
 	special TryContestGModeLinkup
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentContest:: @ 821AAC5
+LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentContest::
 	msgbox LilycoveCity_ContestLobby_Text_PlayersChoseDifferentContest, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices:: @ 821AAD3
+LilycoveCity_ContestLobby_EventScript_CancelLinkDifferentChoices::
 	msgbox LilycoveCity_ContestLobby_Text_PlayersMadeDifferentChoice, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_CancelLinkModeDifference:: @ 821AAE1
+LilycoveCity_ContestLobby_EventScript_CancelLinkModeDifference::
 	msgbox LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_CancelLinkError:: @ 821AAEF
+LilycoveCity_ContestLobby_EventScript_CancelLinkError::
 	special CloseLink
 	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_CancelLinkNoWirelessGMode:: @ 821AAFC
+LilycoveCity_ContestLobby_EventScript_CancelLinkNoWirelessGMode::
 	special CloseLink
 	msgbox LilycoveCity_ContestLobby_Text_NoWirelessAdapterInGMode, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_CancelLinkTransmissionError:: @ 821AB09
+LilycoveCity_ContestLobby_EventScript_CancelLinkTransmissionError::
 	msgbox LilycoveCity_ContestLobby_Text_TransmissionError, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_StartLinkContest:: @ 821AB17
+LilycoveCity_ContestLobby_EventScript_StartLinkContest::
 	special GetContestPlayerId
 	addvar VAR_0x8004, 1
 	buffernumberstring 1, VAR_0x8004
@@ -848,7 +848,7 @@ LilycoveCity_ContestLobby_EventScript_StartLinkContest:: @ 821AB17
 	call LilycoveCity_ContestLobby_EventScript_WarpToContestHall
 	end
 
-LilycoveCity_ContestLobby_EventScript_SetLinkGroupType:: @ 821AB4B
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupType::
 	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_COOL
 	call_if_eq LilycoveCity_ContestLobby_EventScript_SetLinkGroupCoolContest
 	compare VAR_CONTEST_CATEGORY, CONTEST_CATEGORY_BEAUTY
@@ -862,27 +862,27 @@ LilycoveCity_ContestLobby_EventScript_SetLinkGroupType:: @ 821AB4B
 	goto LilycoveCity_ContestLobby_EventScript_DecideLinkLeader
 	end
 
-LilycoveCity_ContestLobby_EventScript_SetLinkGroupCoolContest:: @ 821AB88
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupCoolContest::
 	setvar VAR_0x8004, LINK_GROUP_COOL_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetLinkGroupBeautyContest:: @ 821AB8E
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupBeautyContest::
 	setvar VAR_0x8004, LINK_GROUP_BEAUTY_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetLinkGroupCuteContest:: @ 821AB94
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupCuteContest::
 	setvar VAR_0x8004, LINK_GROUP_CUTE_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetLinkGroupSmartContest:: @ 821AB9A
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupSmartContest::
 	setvar VAR_0x8004, LINK_GROUP_SMART_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetLinkGroupToughContest:: @ 821ABA0
+LilycoveCity_ContestLobby_EventScript_SetLinkGroupToughContest::
 	setvar VAR_0x8004, LINK_GROUP_TOUGH_CONTEST
 	return
 
-LilycoveCity_ContestLobby_EventScript_DecideLinkLeader:: @ 821ABA6
+LilycoveCity_ContestLobby_EventScript_DecideLinkLeader::
 	message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, FALSE
@@ -893,7 +893,7 @@ LilycoveCity_ContestLobby_EventScript_DecideLinkLeader:: @ 821ABA6
 	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryLeadGroup:: @ 821ABE3
+LilycoveCity_ContestLobby_EventScript_TryLeadGroup::
 	call LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided
@@ -904,7 +904,7 @@ LilycoveCity_ContestLobby_EventScript_TryLeadGroup:: @ 821ABE3
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryJoinGroup:: @ 821AC0B
+LilycoveCity_ContestLobby_EventScript_TryJoinGroup::
 	call LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided
@@ -915,23 +915,23 @@ LilycoveCity_ContestLobby_EventScript_TryJoinGroup:: @ 821AC0B
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader:: @ 821AC33
+LilycoveCity_ContestLobby_EventScript_TryBecomeLinkLeader::
 	special TryBecomeLinkLeader
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup:: @ 821AC38
+LilycoveCity_ContestLobby_EventScript_TryJoinLinkGroup::
 	special TryJoinLinkGroup
 	waitstate
 	return
 
-LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided:: @ 821AC3D
+LilycoveCity_ContestLobby_EventScript_LinkLeaderDecided::
 	messageinstant LilycoveCity_ContestLobby_Text_Transmitting
 	contestlinktransfer
 	goto LilycoveCity_ContestLobby_EventScript_StartLinkContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49
+LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall::
 	messageautoscroll LilycoveCity_ContestLobby_Text_ContestBeginShortly
 	waitmessage
 	delay 20
@@ -964,7 +964,7 @@ LilycoveCity_ContestLobby_EventScript_LeadToLinkContestHall:: @ 821AC49
 	release
 	return
 
-LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall: @ 821ACD0
+LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall:
 	walk_right
 	walk_right
 	walk_right
@@ -977,23 +977,23 @@ LilycoveCity_ContestLobby_Movement_PlayerWalkToLinkContestHall: @ 821ACD0
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist: @ 821ACDB
+LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist:
 	walk_right
 	step_end
 
-LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter: @ 821ACDD
+LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter:
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter: @ 821ACE1
+LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter:
 	walk_down
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall: @ 821ACE5
+LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall:
 	walk_right
 	walk_right
 	walk_right
@@ -1005,11 +1005,11 @@ LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall: @ 821ACE5
 	set_invisible
 	step_end
 
-LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer: @ 821ACEF
+LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer:
 	walk_in_place_fastest_left
 	step_end
 
-LilycoveCity_ContestLobby_EventScript_LittleGirl:: @ 821ACF1
+LilycoveCity_ContestLobby_EventScript_LittleGirl::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_LittleGirlHaveCase
@@ -1017,22 +1017,22 @@ LilycoveCity_ContestLobby_EventScript_LittleGirl:: @ 821ACF1
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_LittleGirlHaveCase:: @ 821AD06
+LilycoveCity_ContestLobby_EventScript_LittleGirlHaveCase::
 	msgbox LilycoveCity_ContestLobby_Text_MakePokeblocksDifferentBerries, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_Text_LadyGaveMePokeblockCase: @ 821AD10
+LilycoveCity_ContestLobby_Text_LadyGaveMePokeblockCase:
 	.string "Yippee!\p"
 	.string "The lady at the reception counter\n"
 	.string "gave me a case for {POKEBLOCK}S!$"
 
-LilycoveCity_ContestLobby_Text_MakePokeblocksDifferentBerries: @ 821AD55
+LilycoveCity_ContestLobby_Text_MakePokeblocksDifferentBerries:
 	.string "Make {POKEBLOCK}S and put them in there.\p"
 	.string "When you make a {POKEBLOCK}, everyone\n"
 	.string "has to put in a different BERRY.$"
 
-LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint: @ 821ADB9
+LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint:
 	.string "Congratulations!\p"
 	.string "I did a painting of your POKéMON to\n"
 	.string "commemorate its victory…\p"
@@ -1041,7 +1041,7 @@ LilycoveCity_ContestLobby_Text_YourPokemonSpurredMeToPaint: @ 821ADB9
 	.string "painting better than I usually do.\l"
 	.string "Look, see?$"
 
-LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum: @ 821AE78
+LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum:
 	.string "What do you think? I'm confident in\n"
 	.string "what I've done, but do you like it?\p"
 	.string "A work of this caliber, it wouldn't look\n"
@@ -1050,7 +1050,7 @@ LilycoveCity_ContestLobby_Text_ShouldITakePaintingToMuseum: @ 821AE78
 	.string "for paintings?\p"
 	.string "Do you think I should take this there?$"
 
-LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum: @ 821AF63
+LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum:
 	.string "What, really? Then, sure, I will take\n"
 	.string "this painting there right now.\p"
 	.string "I'll give it a proper title, too.\p"
@@ -1059,34 +1059,34 @@ LilycoveCity_ContestLobby_Text_IllTakePaintingToMuseum: @ 821AF63
 	.string "Please check if they did accept this.\n"
 	.string "Thank you!$"
 
-LilycoveCity_ContestLobby_Text_TakeMementoOfPainting: @ 821B030
+LilycoveCity_ContestLobby_Text_TakeMementoOfPainting:
 	.string "Oh, that's right!\p"
 	.string "As a memento of me painting your\n"
 	.string "POKéMON, please take this.$"
 
-LilycoveCity_ContestLobby_Text_ReceivedARibbon: @ 821B07E
+LilycoveCity_ContestLobby_Text_ReceivedARibbon:
 	.string "{PLAYER} received a RIBBON.$"
 
-LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon: @ 821B094
+LilycoveCity_ContestLobby_Text_PutTheRibbonOnMon:
 	.string "{PLAYER} put the RIBBON on\n"
 	.string "{STR_VAR_1}.$"
 
-LilycoveCity_ContestLobby_Text_OkaySeeYou: @ 821B0AD
+LilycoveCity_ContestLobby_Text_OkaySeeYou:
 	.string "Okay, see you!$"
 
-LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum: @ 821B0BC
+LilycoveCity_ContestLobby_Text_TakeHomeButIdLikeToTakeToMuseum:
 	.string "Oh… Then, I guess I'll just take\n"
 	.string "this home with me…\p"
 	.string "But, you know, I would like to take\n"
 	.string "this to the art museum… Okay?$"
 
-LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs: @ 821B132
+LilycoveCity_ContestLobby_Text_FineThatsTheWayItIs:
 	.string "Oh, fine, that's the way it is.\n"
 	.string "I will hang this in my own house.\p"
 	.string "I'll just have to try harder next time.\n"
 	.string "Well, be seeing you.$"
 
-LilycoveCity_ContestLobby_Text_MasterRankHereICome: @ 821B1B1
+LilycoveCity_ContestLobby_Text_MasterRankHereICome:
 	.string "Hoo, boy… Master Rank CONTESTS,\n"
 	.string "here I come.\p"
 	.string "The world will know that my dearest\n"
@@ -1094,31 +1094,31 @@ LilycoveCity_ContestLobby_Text_MasterRankHereICome: @ 821B1B1
 	.string "existence. The time has come!\l"
 	.string "Uheheheh.$"
 
-LilycoveCity_ContestLobby_Text_WholeVarietyOfPokemonHere: @ 821B24D
+LilycoveCity_ContestLobby_Text_WholeVarietyOfPokemonHere:
 	.string "You can see a whole variety of\n"
 	.string "POKéMON here.\p"
 	.string "That's why I make this place a regular\n"
 	.string "part of my daily stroll.$"
 
-LilycoveCity_ContestLobby_Text_ContestFeastForEyes: @ 821B2BA
+LilycoveCity_ContestLobby_Text_ContestFeastForEyes:
 	.string "Wow, coming out to a CONTEST is\n"
 	.string "a feast for these eyes!\p"
 	.string "Would you look at all the POKéMON\n"
 	.string "that just scream to be painted?$"
 
-LilycoveCity_ContestLobby_Text_ToughContestIsExtreme: @ 821B334
+LilycoveCity_ContestLobby_Text_ToughContestIsExtreme:
 	.string "The TOUGHNESS CONTEST is like\n"
 	.string "extreme, man!\p"
 	.string "Those muscular appeals…\n"
 	.string "Cascading sweat… I swoon!$"
 
-LilycoveCity_ContestLobby_Text_LavishedCareOnMon: @ 821B392
+LilycoveCity_ContestLobby_Text_LavishedCareOnMon:
 	.string "Day in and day out, I lavished my care\n"
 	.string "on this POKéMON.\p"
 	.string "Its condition is peaking.\n"
 	.string "Today, victory is mine!$"
 
-LilycoveCity_ContestLobby_Text_MadePokeblocksWithFamily: @ 821B3FC
+LilycoveCity_ContestLobby_Text_MadePokeblocksWithFamily:
 	.string "I made {POKEBLOCK}S with Mom, Dad, and\n"
 	.string "Big Sister. They turned out great!\p"
 	.string "I bet you can make smoother, better\n"
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
index 72667973d..8ce2a97df 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
@@ -1,9 +1,9 @@
 .set LOCALID_OWNER, 1
 
-LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 8218188
+LilycoveCity_CoveLilyMotel_1F_MapScripts::
 	.byte 0
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner:: @ 8218189
+LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner::
 	lockall
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear
 	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted
@@ -17,7 +17,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_MotelOwner:: @ 8218189
 	releaseall
 	end
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted:: @ 82181C3
+LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted::
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem, MSGBOX_DEFAULT
 	applymovement LOCALID_OWNER, Common_Movement_FacePlayer
 	waitmovement 0
@@ -28,7 +28,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_AquaHideoutBusted:: @ 82181C3
 	releaseall
 	end
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear:: @ 82181EA
+LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear::
 	msgbox LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar, MSGBOX_DEFAULT
 	applymovement LOCALID_OWNER, Common_Movement_FacePlayer
 	waitmovement 0
@@ -39,7 +39,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_GameClear:: @ 82181EA
 	releaseall
 	end
 
-LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV:: @ 8218211
+LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV::
 	lockall
 	playse SE_PIN
 	applymovement LOCALID_OWNER, Common_Movement_ExclamationMark
@@ -58,24 +58,24 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV:: @ 8218211
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV: @ 8218259
+LilycoveCity_CoveLilyMotel_1F_Movement_PlayerPushFromTV:
 	face_right
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer: @ 821825E
+LilycoveCity_CoveLilyMotel_1F_Movement_OwnerPushPlayer:
 	walk_up
 	step_end
 
-LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn: @ 8218260
+LilycoveCity_CoveLilyMotel_1F_Movement_OwnerReturn:
 	face_down
 	walk_down
 	face_up
 	step_end
 
-LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot: @ 8218264
+LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot:
 	.string "Hm, so they doubled the guests by\n"
 	.string "using POKéMON as attractions?\p"
 	.string "Hm, well, maybe I should make a cute\n"
@@ -83,17 +83,17 @@ LilycoveCity_CoveLilyMotel_1F_Text_GuestsDoubledByMascot: @ 8218264
 	.string "I wonder if that will attract more\n"
 	.string "guests to stay with us?$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithTeamAqua: @ 821831E
+LilycoveCity_CoveLilyMotel_1F_Text_NoGuestsWithTeamAqua:
 	.string "Oh, sorry, sorry!\n"
 	.string "I was too involved in watching TV!\p"
 	.string "Since that TEAM AQUA came to town,\n"
 	.string "the tourists have been staying away.$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV: @ 821839B
+LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV:
 	.string "Hey, down in front!\n"
 	.string "I can't see the TV!$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem: @ 82183C3
+LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem:
 	.string "Amazing! You're telling me a POKéMON\n"
 	.string "found someone's lost item?\p"
 	.string "That's something. If we had some smart\n"
@@ -101,7 +101,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_MonFoundLostItem: @ 82183C3
 	.string "We could recover anything that our\n"
 	.string "guests mislaid…$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted: @ 8218470
+LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted:
 	.string "Oh, sorry, sorry!\n"
 	.string "I was too involved in watching TV!\p"
 	.string "I heard that someone busted\n"
@@ -111,7 +111,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_HeardAquaHideoutBusted: @ 8218470
 	.string "It was a company called… Uh…\n"
 	.string "GAME something…$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar: @ 8218544
+LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar:
 	.string "Amazing! A house-sitting POKéMON\n"
 	.string "caught a burglar?\p"
 	.string "That's something. If we had a tough\n"
@@ -119,7 +119,7 @@ LilycoveCity_CoveLilyMotel_1F_Text_HouseSittingMonCaughtBurglar: @ 8218544
 	.string "We would be able to provide our guests\n"
 	.string "with greater safety.$"
 
-LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner: @ 82185F4
+LilycoveCity_CoveLilyMotel_1F_Text_BetterGetWorkingOnGuestsDinner:
 	.string "Oh, sorry, sorry!\n"
 	.string "I was too involved in watching TV.\p"
 	.string "Oh, yes. A big group of guests arrived\n"
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
index 9d3520be5..a5e8b40cf 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -1,7 +1,7 @@
-LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 82186D2
+LilycoveCity_CoveLilyMotel_2F_MapScripts::
 	.byte 0
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner:: @ 82186D3
+LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner::
 	lock
 	faceplayer
 	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex
@@ -12,18 +12,18 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_GameDesigner:: @ 82186D3
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex:: @ 82186F9
+LilycoveCity_CoveLilyMotel_2F_EventScript_ShowMeCompletedDex::
 	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare:: @ 8218702
+LilycoveCity_CoveLilyMotel_2F_EventScript_AllHoennMonsFanfare::
 	setflag FLAG_TEMP_2
 	playfanfare MUS_OBTAIN_ITEM
 	waitfanfare
 	goto LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma:: @ 821870F
+LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma::
 	message LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
@@ -32,27 +32,27 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_ShowDiploma:: @ 821870F
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer:: @ 8218720
+LilycoveCity_CoveLilyMotel_2F_EventScript_Programmer::
 	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist:: @ 8218729
+LilycoveCity_CoveLilyMotel_2F_EventScript_GraphicArtist::
 	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan:: @ 8218732
+LilycoveCity_CoveLilyMotel_2F_EventScript_FatMan::
 	msgbox LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_Woman:: @ 821873B
+LilycoveCity_CoveLilyMotel_2F_EventScript_Woman::
 	msgbox LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid:: @ 8218744
+LilycoveCity_CoveLilyMotel_2F_EventScript_GameBoyKid::
 	msgbox LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy, MSGBOX_NPC
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_Scott:: @ 821874D
+LilycoveCity_CoveLilyMotel_2F_EventScript_Scott::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_MetScott
@@ -62,12 +62,12 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_Scott:: @ 821874D
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_EventScript_MetScott:: @ 821876A
+LilycoveCity_CoveLilyMotel_2F_EventScript_MetScott::
 	msgbox LilycoveCity_CoveLilyMotel_2F_Text_ContestsDoTakeStrategy, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex: @ 8218774
+LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex:
 	.string "I'm the GAME DESIGNER.\p"
 	.string "Oh, is that right?\n"
 	.string "You're working on a POKéDEX?\p"
@@ -76,7 +76,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_ShowMeCompletedDex: @ 8218774
 	.string "If you do complete it, please come\n"
 	.string "show me.$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis: @ 821881C
+LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis:
 	.string "Wow! That's awesome!\n"
 	.string "Yep, it's totally awesome!\p"
 	.string "This POKéDEX is completely filled!\n"
@@ -85,17 +85,17 @@ LilycoveCity_CoveLilyMotel_2F_Text_FilledPokedexGiveYouThis: @ 821881C
 	.string "Let me give you something in\n"
 	.string "recognition of your feat!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer: @ 82188D6
+LilycoveCity_CoveLilyMotel_2F_Text_ImTheProgrammer:
 	.string "Me? You're talking to me?\n"
 	.string "I'm the PROGRAMMER.\p"
 	.string "I wonder what the SLOTS are\n"
 	.string "like here.$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist: @ 821892B
+LilycoveCity_CoveLilyMotel_2F_Text_ImTheGraphicArtist:
 	.string "I'm the GRAPHIC ARTIST! Aren't the\n"
 	.string "POKéMON of HOENN interesting?$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute: @ 821896C
+LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute:
 	.string "The girl TUBERS, they're cute, hey?\n"
 	.string "To battle against a cute TUBER…\p"
 	.string "Whoop, it's so awesome!\p"
@@ -103,17 +103,17 @@ LilycoveCity_CoveLilyMotel_2F_Text_GirlsAreCute: @ 821896C
 	.string "A 2-on-2 battle with TWINS…\p"
 	.string "Whoop, it's unbearably fun!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart: @ 8218A21
+LilycoveCity_CoveLilyMotel_2F_Text_SeaBreezeTicklesHeart:
 	.string "The sea breeze tickles my heart.\n"
 	.string "It feels wonderful here!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy: @ 8218A5B
+LilycoveCity_CoveLilyMotel_2F_Text_NeverLeaveWithoutGameBoy:
 	.string "You never know when and where\n"
 	.string "people will challenge you.\p"
 	.string "That's why I never leave home without\n"
 	.string "my GAME BOY ADVANCE.$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_SnoozingPreferBattles: @ 8218ACF
+LilycoveCity_CoveLilyMotel_2F_Text_SnoozingPreferBattles:
 	.string "SCOTT: … … … … …\n"
 	.string "… … … … … Zzz…\p"
 	.string "… … … … … Huh?!\n"
@@ -129,7 +129,7 @@ LilycoveCity_CoveLilyMotel_2F_Text_SnoozingPreferBattles: @ 8218ACF
 	.string "like the GYMS, CONTESTS, BATTLE TENT,\l"
 	.string "the whole works!$"
 
-LilycoveCity_CoveLilyMotel_2F_Text_ContestsDoTakeStrategy: @ 8218C33
+LilycoveCity_CoveLilyMotel_2F_Text_ContestsDoTakeStrategy:
 	.string "SCOTT: I think it does take strategy\n"
 	.string "to win a CONTEST.\p"
 	.string "Devising CONTEST strategies is one way\n"
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index 10bd9eee5..a7b062096 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
@@ -1,7 +1,7 @@
-LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 8220623
+LilycoveCity_DepartmentStoreElevator_MapScripts::
 	.byte 0
 
-LilycoveCity_DepartmentStoreElevator_EventScript_Attendant:: @ 8220624
+LilycoveCity_DepartmentStoreElevator_EventScript_Attendant::
 	lock
 	faceplayer
 	setvar VAR_0x8004, 0
@@ -21,32 +21,32 @@ LilycoveCity_DepartmentStoreElevator_EventScript_Attendant:: @ 8220624
 	end
 
 @ Below scripts ensure the cursor for floor select always starts on the current floor
-LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th:: @ 8220689
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom5th::
 	multichoicedefault 0, 0, MULTI_FLOORS, 0, FALSE
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th:: @ 8220695
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom4th::
 	multichoicedefault 0, 0, MULTI_FLOORS, 1, FALSE
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd:: @ 82206A1
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom3rd::
 	multichoicedefault 0, 0, MULTI_FLOORS, 2, FALSE
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd:: @ 82206AD
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom2nd::
 	multichoicedefault 0, 0, MULTI_FLOORS, 3, FALSE
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st:: @ 82206B9
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloorFrom1st::
 	multichoicedefault 0, 0, MULTI_FLOORS, 4, FALSE
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor:: @ 82206C5
+LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor::
 	switch VAR_RESULT
 	case 0, LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor
 	case 1, LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor
@@ -57,7 +57,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_ChooseFloor:: @ 82206C5
 	case MULTI_B_PRESSED, LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor:: @ 8220718
+LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor::
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_1F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_1F
@@ -67,7 +67,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_1stFloor:: @ 8220718
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor:: @ 8220740
+LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor::
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_2F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_2F
@@ -77,7 +77,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2ndFloor:: @ 8220740
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor:: @ 8220768
+LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor::
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_3F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_3F
@@ -87,7 +87,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_3rdFloor:: @ 8220768
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor:: @ 8220790
+LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor::
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_4F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_4F
@@ -97,7 +97,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_4thFloor:: @ 8220790
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor:: @ 82207B8
+LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor::
 	setvar VAR_0x8006, DEPT_STORE_FLOORNUM_5F
 	setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1
 	compare VAR_DEPT_STORE_FLOOR, DEPT_STORE_FLOORNUM_5F
@@ -107,12 +107,12 @@ LilycoveCity_DepartmentStoreElevator_EventScript_5thFloor:: @ 82207B8
 	goto LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect:: @ 82207E0
+LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect::
 	special CloseDeptStoreElevatorWindow
 	release
 	end
 
-LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator:: @ 82207E5
+LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator::
 	special CloseDeptStoreElevatorWindow
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
@@ -123,7 +123,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator:: @ 82207E5
 	setflag FLAG_TEMP_2
 	return
 
-LilycoveCity_DepartmentStoreElevator_EventScript_SetFloor:: @ 82207FC
+LilycoveCity_DepartmentStoreElevator_EventScript_SetFloor::
 	special SetDeptStoreFloor
 	return
 
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index 68771a2dd..e91ca7745 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -1,8 +1,8 @@
-LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 8220207
+LilycoveCity_DepartmentStoreRooftop_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_DepartmentStoreRooftop_OnTransition
 	.byte 0
 
-LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D
+LilycoveCity_DepartmentStoreRooftop_OnTransition:
 	getpricereduction POKENEWS_LILYCOVE
 	compare VAR_RESULT, TRUE
 	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman
@@ -10,15 +10,15 @@ LilycoveCity_DepartmentStoreRooftop_OnTransition: @ 822020D
 	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman:: @ 8220227
+LilycoveCity_DepartmentStoreRooftop_EventScript_ShowSaleWoman::
 	clearflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman:: @ 822022B
+LilycoveCity_DepartmentStoreRooftop_EventScript_HideSaleWoman::
 	setflag FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman:: @ 822022F
+LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -29,7 +29,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_SaleWoman:: @ 822022F
 	end
 
 	.align 2
-LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale: @ 8220248
+LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale:
 	.2byte DECOR_MUD_BALL
 	.2byte DECOR_FENCE_LENGTH
 	.2byte DECOR_FENCE_WIDTH
@@ -48,7 +48,7 @@ LilycoveCity_DepartmentStoreRooftop_PokemartDecor_ClearOutSale: @ 8220248
 	release
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_Man:: @ 8220268
+LilycoveCity_DepartmentStoreRooftop_EventScript_Man::
 	lock
 	faceplayer
 	getpricereduction POKENEWS_LILYCOVE
@@ -58,16 +58,16 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_Man:: @ 8220268
 	release
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale:: @ 8220282
+LilycoveCity_DepartmentStoreRooftop_EventScript_ManClearOutSale::
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_ThirstyMan:: @ 822028C
+LilycoveCity_DepartmentStoreRooftop_EventScript_ThirstyMan::
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine:: @ 8220295
+LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine::
 	lockall
 	message LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike
 	waitmessage
@@ -75,7 +75,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_VendingMachine:: @ 8220295
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink:: @ 82202A6
+LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink::
 	multichoice 16, 0, MULTI_VENDING_MACHINE, FALSE
 	copyvar VAR_TEMP_1, VAR_RESULT
 	switch VAR_TEMP_1
@@ -86,46 +86,46 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink:: @ 82202A6
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater:: @ 82202E4
+LilycoveCity_DepartmentStoreRooftop_EventScript_FreshWater::
 	setvar VAR_TEMP_0, ITEM_FRESH_WATER
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_SodaPop:: @ 82202EF
+LilycoveCity_DepartmentStoreRooftop_EventScript_SodaPop::
 	setvar VAR_TEMP_0, ITEM_SODA_POP
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_Lemonade:: @ 82202FA
+LilycoveCity_DepartmentStoreRooftop_EventScript_Lemonade::
 	setvar VAR_TEMP_0, ITEM_LEMONADE
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater:: @ 8220305
+LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater::
 	checkmoney 200, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneySodaPop:: @ 822030C
+LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneySodaPop::
 	checkmoney 300, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade:: @ 8220313
+LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyLemonade::
 	checkmoney 350, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyFreshWater:: @ 822031A
+LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyFreshWater::
 	removemoney 200, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneySodaPop:: @ 8220321
+LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneySodaPop::
 	removemoney 300, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade:: @ 8220328
+LilycoveCity_DepartmentStoreRooftop_EventScript_RemoveMoneyLemonade::
 	removemoney 350, 0
 	return
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
+LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink::
 	compare VAR_TEMP_1, 0
 	call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_CheckMoneyFreshWater
 	compare VAR_TEMP_1, 1
@@ -178,57 +178,57 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_TryBuyDrink:: @ 822032F
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink:: @ 8220436
+LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseNewDrink::
 	message LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike
 	waitmessage
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ChooseDrink
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_NotEnoughMoneyForDrink:: @ 8220442
+LilycoveCity_DepartmentStoreRooftop_EventScript_NotEnoughMoneyForDrink::
 	msgbox LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney, MSGBOX_DEFAULT
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink:: @ 8220450
+LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink::
 	msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
 	goto LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine:: @ 822045E
+LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine::
 	hidemoneybox
 	releaseall
 	end
 
-LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales: @ 8220463
+LilycoveCity_DepartmentStoreRooftop_Text_SetDatesForClearOutSales:
 	.string "Don't they have set dates for their\n"
 	.string "clear-out sales?\p"
 	.string "I watch TV, but they never show any\n"
 	.string "commercials.$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale: @ 82204C9
+LilycoveCity_DepartmentStoreRooftop_Text_BeenWaitingForClearOutSale:
 	.string "Yes! I've been waiting a long time for\n"
 	.string "this clear-out sale.\p"
 	.string "They have items that you can only get\n"
 	.string "here. I'm going to load up, that I am!$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty: @ 8220552
+LilycoveCity_DepartmentStoreRooftop_Text_BoneDryThirsty:
 	.string "Ohh… I'm bone-dry thirsty!$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike: @ 822056D
+LilycoveCity_DepartmentStoreRooftop_Text_WhichDrinkWouldYouLike:
 	.string "It's a VENDING MACHINE.\n"
 	.string "Which drink would you like?$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown: @ 82205A1
+LilycoveCity_DepartmentStoreRooftop_Text_CanOfDrinkDroppedDown:
 	.string "Clang!\p"
 	.string "A can of {STR_VAR_1} dropped down.$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown: @ 82205C2
+LilycoveCity_DepartmentStoreRooftop_Text_ExtraCanOfDrinkDroppedDown:
 	.string "Clang!\p"
 	.string "Score! An extra can of {STR_VAR_1}\n"
 	.string "dropped down!$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney: @ 82205F1
+LilycoveCity_DepartmentStoreRooftop_Text_NotEnoughMoney:
 	.string "Not enough money…$"
 
-LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink: @ 8220603
+LilycoveCity_DepartmentStoreRooftop_Text_DecidedAgainstBuyingDrink:
 	.string "Decided against buying a drink.$"
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
index 191220091..e1167ad7e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
@@ -1,13 +1,13 @@
 .set LOCALID_LOTTERY_CLERK, 2
 
-LilycoveCity_DepartmentStore_1F_MapScripts:: @ 821F692
+LilycoveCity_DepartmentStore_1F_MapScripts::
 	.byte 0
 
-LilycoveCity_DepartmentStore_1F_EventScript_Greeter:: @ 821F693
+LilycoveCity_DepartmentStore_1F_EventScript_Greeter::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk:: @ 821F69C
+LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk::
 	lock
 	faceplayer
 	dotimebasedevents
@@ -57,62 +57,62 @@ LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk:: @ 821F69C
 	goto LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon:: @ 821F77B
+LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPartyMon::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPCMon:: @ 821F784
+LilycoveCity_DepartmentStore_1F_EventScript_TicketMatchPCMon::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_ComeBackTomorrow:: @ 821F78D
+LilycoveCity_DepartmentStore_1F_EventScript_ComeBackTomorrow::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain:: @ 821F797
+LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_NoMatch:: @ 821F7A1
+LilycoveCity_DepartmentStore_1F_EventScript_NoMatch::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched, MSGBOX_DEFAULT
 	goto LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2:: @ 821F7AF
+LilycoveCity_DepartmentStore_1F_EventScript_PleaseVisitAgain2::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_TwoDigitMatch:: @ 821F7B9
+LilycoveCity_DepartmentStore_1F_EventScript_TwoDigitMatch::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_ThreeDigitMatch:: @ 821F7C2
+LilycoveCity_DepartmentStore_1F_EventScript_ThreeDigitMatch::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch:: @ 821F7CB
+LilycoveCity_DepartmentStore_1F_EventScript_FourDigitMatch::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_FullMatch:: @ 821F7D4
+LilycoveCity_DepartmentStore_1F_EventScript_FullMatch::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom:: @ 821F7DD
+LilycoveCity_DepartmentStore_1F_EventScript_RecordPrizeNoRoom::
 	copyvar VAR_POKELOT_PRIZE_PLACE, VAR_0x8004
 	copyvar VAR_POKELOT_PRIZE_ITEM, VAR_0x8005
 	goto LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize:: @ 821F7ED
+LilycoveCity_DepartmentStore_1F_EventScript_NoRoomForPrize::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier:: @ 821F7F7
+LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding, MSGBOX_DEFAULT
 	giveitem VAR_POKELOT_PRIZE_ITEM
 	compare VAR_RESULT, FALSE
@@ -125,19 +125,19 @@ LilycoveCity_DepartmentStore_1F_EventScript_GivePrizeFromEarlier:: @ 821F7F7
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_PokefanF:: @ 821F82F
+LilycoveCity_DepartmentStore_1F_EventScript_PokefanF::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_LittleGirl:: @ 821F838
+LilycoveCity_DepartmentStore_1F_EventScript_LittleGirl::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_PokefanM:: @ 821F841
+LilycoveCity_DepartmentStore_1F_EventScript_PokefanM::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_Azumarill:: @ 821F84A
+LilycoveCity_DepartmentStore_1F_EventScript_Azumarill::
 	lock
 	faceplayer
 	waitse
@@ -147,30 +147,30 @@ LilycoveCity_DepartmentStore_1F_EventScript_Azumarill:: @ 821F84A
 	release
 	end
 
-LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign:: @ 821F85D
+LilycoveCity_DepartmentStore_1F_EventScript_FloorNamesSign::
 	msgbox LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign, MSGBOX_SIGN
 	end
 
-LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore: @ 821F866
+LilycoveCity_DepartmentStore_1F_Text_WelcomeToDeptStore:
 	.string "Welcome to LILYCOVE DEPARTMENT STORE.$"
 
-LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings: @ 821F88C
+LilycoveCity_DepartmentStore_1F_Text_IBuyAllSortsOfThings:
 	.string "Whenever I come to the DEPARTMENT\n"
 	.string "STORE, I always end up buying all sorts\l"
 	.string "of things because it's so fun.$"
 
-LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture: @ 821F8F5
+LilycoveCity_DepartmentStore_1F_Text_MomBuyingMeFurniture:
 	.string "Today, my mom is going to buy me some\n"
 	.string "nice furniture.$"
 
-LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill: @ 821F92B
+LilycoveCity_DepartmentStore_1F_Text_BuyingSomethingForAzumarill:
 	.string "I'm buying something for my AZUMARILL\n"
 	.string "as a reward for winning a CONTEST.$"
 
-LilycoveCity_DepartmentStore_1F_Text_Azumarill: @ 821F974
+LilycoveCity_DepartmentStore_1F_Text_Azumarill:
 	.string "AZUMARILL: Maririroo!$"
 
-LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign: @ 821F98A
+LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign:
 	.string "1F: SERVICE COUNTER\n"
 	.string "    LOTTERY CORNER\p"
 	.string "2F: TRAINER'S ZONE\p"
@@ -180,7 +180,7 @@ LilycoveCity_DepartmentStore_1F_Text_FloorNamesSign: @ 821F98A
 	.string "ROOFTOP: ROOFTOP PLAZA$"
 
 @ Unused
-LilycoveCity_DepartmentStore_1F_Text_WirelessCommIsFun: @ 821FA13
+LilycoveCity_DepartmentStore_1F_Text_WirelessCommIsFun:
 	.string "Wireless Communication is a\n"
 	.string "lot of fun, isn't it?\p"
 	.string "I think it lets you do things that\n"
@@ -190,7 +190,7 @@ LilycoveCity_DepartmentStore_1F_Text_WirelessCommIsFun: @ 821FA13
 	.string "I think it's going to be exciting!$"
 
 @ Unused
-LilycoveCity_DepartmentStore_1F_Text_SpreadWordAboutWirelessComm: @ 821FAE5
+LilycoveCity_DepartmentStore_1F_Text_SpreadWordAboutWirelessComm:
 	.string "I want to spread the word about how\n"
 	.string "fun Wireless Communication can be.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
index 9ced6b347..478f5cfd3 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
@@ -1,19 +1,19 @@
-LilycoveCity_DepartmentStore_2F_MapScripts:: @ 821FB2C
+LilycoveCity_DepartmentStore_2F_MapScripts::
 	.byte 0
 
-LilycoveCity_DepartmentStore_2F_EventScript_Cook:: @ 821FB2D
+LilycoveCity_DepartmentStore_2F_EventScript_Cook::
 	msgbox LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_PokefanF:: @ 821FB36
+LilycoveCity_DepartmentStore_2F_EventScript_PokefanF::
 	msgbox LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_Sailor:: @ 821FB3F
+LilycoveCity_DepartmentStore_2F_EventScript_Sailor::
 	msgbox LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft:: @ 821FB48
+LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -24,7 +24,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_ClerkLeft:: @ 821FB48
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_2F_Pokemart1: @ 821FB60
+LilycoveCity_DepartmentStore_2F_Pokemart1:
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_ULTRA_BALL
@@ -40,7 +40,7 @@ LilycoveCity_DepartmentStore_2F_Pokemart1: @ 821FB60
 	release
 	end
 
-LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight:: @ 821FB7A
+LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -51,7 +51,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_ClerkRight:: @ 821FB7A
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_2F_Pokemart2: @ 821FB94
+LilycoveCity_DepartmentStore_2F_Pokemart2:
 	.2byte ITEM_POTION
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_HYPER_POTION
@@ -66,15 +66,15 @@ LilycoveCity_DepartmentStore_2F_Pokemart2: @ 821FB94
 	release
 	end
 
-LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly: @ 821FBAC
+LilycoveCity_DepartmentStore_2F_Text_LearnToUseItemsProperly:
 	.string "Learn to use items properly.\n"
 	.string "That's basic, really.$"
 
-LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband: @ 821FBDF
+LilycoveCity_DepartmentStore_2F_Text_GoodGiftForHusband:
 	.string "My husband is waiting at home.\n"
 	.string "What would make a good gift for him?$"
 
-LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems: @ 821FC23
+LilycoveCity_DepartmentStore_2F_Text_StockUpOnItems:
 	.string "I'm leaving on a long journey soon.\n"
 	.string "I need to stock up on items.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
index bec38867c..20480068b 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
@@ -1,7 +1,7 @@
-LilycoveCity_DepartmentStore_3F_MapScripts:: @ 821FC64
+LilycoveCity_DepartmentStore_3F_MapScripts::
 	.byte 0
 
-LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft:: @ 821FC65
+LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -11,7 +11,8 @@ LilycoveCity_DepartmentStore_3F_EventScript_ClerkLeft:: @ 821FC65
 	release
 	end
 
-LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins: @ 821FC7C
+	.align 2
+LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins:
 	.2byte ITEM_PROTEIN
 	.2byte ITEM_CALCIUM
 	.2byte ITEM_IRON
@@ -22,7 +23,7 @@ LilycoveCity_DepartmentStore_3F_Pokemart_Vitamins: @ 821FC7C
 	release
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight:: @ 821FC8C
+LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -33,7 +34,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_ClerkRight:: @ 821FC8C
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters: @ 821FCA4
+LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters:
 	.2byte ITEM_X_SPEED
 	.2byte ITEM_X_SPECIAL
 	.2byte ITEM_X_ATTACK
@@ -45,31 +46,31 @@ LilycoveCity_DepartmentStore_3F_Pokemart_StatBoosters: @ 821FCA4
 	release
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM:: @ 821FCB6
+LilycoveCity_DepartmentStore_3F_EventScript_TriathleteM::
 	msgbox LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_PokefanM:: @ 821FCBF
+LilycoveCity_DepartmentStore_3F_EventScript_PokefanM::
 	msgbox LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_3F_EventScript_Woman:: @ 821FCC8
+LilycoveCity_DepartmentStore_3F_EventScript_Woman::
 	msgbox LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon: @ 821FCD1
+LilycoveCity_DepartmentStore_3F_Text_ItemsBestForTougheningPokemon:
 	.string "For quickly toughening up POKéMON,\n"
 	.string "items are the best.\p"
 	.string "PROTEIN boosts ATTACK,\n"
 	.string "and CALCIUM raises SP. ATK.$"
 
-LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance: @ 821FD3B
+LilycoveCity_DepartmentStore_3F_Text_WantMoreEndurance:
 	.string "I want my POKéMON to have more\n"
 	.string "endurance.\p"
 	.string "I'm trying to decide whether to raise\n"
 	.string "DEFENSE with IRON, or SP. DEF with ZINC.$"
 
-LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon: @ 821FDB4
+LilycoveCity_DepartmentStore_3F_Text_GaveCarbosToSpeedUpMon:
 	.string "I gave a CARBOS to my POKéMON,\n"
 	.string "and its SPEED went up.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
index 441697a7c..d176781d6 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
@@ -1,19 +1,19 @@
-LilycoveCity_DepartmentStore_4F_MapScripts:: @ 821FDEA
+LilycoveCity_DepartmentStore_4F_MapScripts::
 	.byte 0
 
-LilycoveCity_DepartmentStore_4F_EventScript_Gentleman:: @ 821FDEB
+LilycoveCity_DepartmentStore_4F_EventScript_Gentleman::
 	msgbox LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_Woman:: @ 821FDF4
+LilycoveCity_DepartmentStore_4F_EventScript_Woman::
 	msgbox LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_Youngster:: @ 821FDFD
+LilycoveCity_DepartmentStore_4F_EventScript_Youngster::
 	msgbox LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft:: @ 821FE06
+LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -24,7 +24,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_ClerkLeft:: @ 821FE06
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs: @ 821FE20
+LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs:
 	.2byte ITEM_TM38  @ Fire Blast
 	.2byte ITEM_TM25  @ Thunder
 	.2byte ITEM_TM14  @ Blizzard
@@ -33,7 +33,7 @@ LilycoveCity_DepartmentStore_4F_Pokemart_AttackTMs: @ 821FE20
 	release
 	end
 
-LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight:: @ 821FE2C
+LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -44,7 +44,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_ClerkRight:: @ 821FE2C
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs: @ 821FE44
+LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs:
 	.2byte ITEM_TM17  @ Protect
 	.2byte ITEM_TM20  @ Safeguard
 	.2byte ITEM_TM33  @ Reflect
@@ -53,20 +53,20 @@ LilycoveCity_DepartmentStore_4F_Pokemart_DefenseTMs: @ 821FE44
 	release
 	end
 
-LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM: @ 821FE50
+LilycoveCity_DepartmentStore_4F_Text_AttackOrDefenseTM:
 	.string "Hmm…\p"
 	.string "An attacking move…\n"
 	.string "Or a defensive move…\p"
 	.string "It's no easy matter to decide which TM\n"
 	.string "moves should be taught to POKéMON…$"
 
-LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs: @ 821FEC7
+LilycoveCity_DepartmentStore_4F_Text_FiftyDifferentTMs:
 	.string "There are so many different kinds of\n"
 	.string "TM moves.\p"
 	.string "A catalog I read said there are fifty\n"
 	.string "different kinds.$"
 
-LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves: @ 821FF2D
+LilycoveCity_DepartmentStore_4F_Text_PokemonOnlyHaveFourMoves:
 	.string "I'd like to get all the different TMs,\n"
 	.string "but a POKéMON learns only four moves.$"
 
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
index 2b36e3d27..185d49551 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
@@ -1,23 +1,23 @@
 .set LOCALID_WOMAN, 7
 
-LilycoveCity_DepartmentStore_5F_MapScripts:: @ 821FF7A
+LilycoveCity_DepartmentStore_5F_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LilycoveCity_DepartmentStore_5F_OnWarp
 	.byte 0
 
 @ During the abnormal weather from Kyogre/Groudon awakening the dept store rooftop is inaccessible
 @ Likely done to avoid dealing with showing the weather. Technically the rooftop is indoors
-LilycoveCity_DepartmentStore_5F_OnWarp: @ 821FF80
+LilycoveCity_DepartmentStore_5F_OnWarp:
 	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
 	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 2, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
 	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs
 	.2byte 0
 
-LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs:: @ 821FF9A
+LilycoveCity_DepartmentStore_5F_EventScript_BlockRoofStairs::
 	setobjectxy LOCALID_WOMAN, 16, 2
 	turnobject LOCALID_WOMAN, DIR_NORTH
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft:: @ 821FFA6
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -28,12 +28,12 @@ LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarLeft:: @ 821FFA6
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0
+LilycoveCity_DepartmentStore_5F_Pokemart_Dolls:
 	.2byte DECOR_PICHU_DOLL
 	.2byte DECOR_PIKACHU_DOLL
 	.2byte DECOR_MARILL_DOLL
 	.2byte DECOR_JIGGLYPUFF_DOLL
-	.2byte DECOR_DUSKULL_DOLL 
+	.2byte DECOR_DUSKULL_DOLL
 	.2byte DECOR_WYNAUT_DOLL
 	.2byte DECOR_BALTOY_DOLL
 	.2byte DECOR_KECLEON_DOLL
@@ -45,7 +45,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls: @ 821FFC0
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft:: @ 821FFDC
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -56,7 +56,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidLeft:: @ 821FFDC
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4
+LilycoveCity_DepartmentStore_5F_Pokemart_Cushions:
 	.2byte DECOR_PIKA_CUSHION
 	.2byte DECOR_ROUND_CUSHION
 	.2byte DECOR_ZIGZAG_CUSHION
@@ -70,7 +70,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Cushions: @ 821FFF4
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight:: @ 822000A
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -81,7 +81,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_ClerkMidRight:: @ 822000A
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024
+LilycoveCity_DepartmentStore_5F_Pokemart_Posters:
 	.2byte DECOR_BALL_POSTER
 	.2byte DECOR_GREEN_POSTER
 	.2byte DECOR_RED_POSTER
@@ -95,7 +95,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Posters: @ 8220024
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight:: @ 822003A
+LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -106,7 +106,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_ClerkFarRight:: @ 822003A
 	end
 
 	.align 2
-LilycoveCity_DepartmentStore_5F_Pokemart_Mats: @ 8220054
+LilycoveCity_DepartmentStore_5F_Pokemart_Mats:
 	.2byte DECOR_SURF_MAT
 	.2byte DECOR_THUNDER_MAT
 	.2byte DECOR_FIRE_BLAST_MAT
@@ -121,11 +121,11 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Mats: @ 8220054
 	release
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_PokefanF:: @ 822006C
+LilycoveCity_DepartmentStore_5F_EventScript_PokefanF::
 	msgbox LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_Woman:: @ 8220075
+LilycoveCity_DepartmentStore_5F_EventScript_Woman::
 	lockall
 	applymovement LOCALID_WOMAN, Common_Movement_FacePlayer
 	waitmovement 0
@@ -136,13 +136,13 @@ LilycoveCity_DepartmentStore_5F_EventScript_Woman:: @ 8220075
 	goto LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal:: @ 822009C
+LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal::
 	msgbox LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather:: @ 82200A7
+LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather::
 	msgbox LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_WOMAN, Common_Movement_WalkInPlaceFastestUp
@@ -150,24 +150,24 @@ LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather:: @ 82200A7
 	releaseall
 	end
 
-LilycoveCity_DepartmentStore_5F_EventScript_LittleGirl:: @ 82200BC
+LilycoveCity_DepartmentStore_5F_EventScript_LittleGirl::
 	msgbox LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls: @ 82200C5
+LilycoveCity_DepartmentStore_5F_Text_PlaceFullOfCuteDolls:
 	.string "This place is full of cute DOLLS.\p"
 	.string "I should buy some for me, instead of\n"
 	.string "just for my children.$"
 
-LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon: @ 8220122
+LilycoveCity_DepartmentStore_5F_Text_GettingDollInsteadOfPokemon:
 	.string "I'm not big enough to raise POKéMON,\n"
 	.string "so I'm getting a cute DOLL instead.$"
 
-LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere: @ 822016B
+LilycoveCity_DepartmentStore_5F_Text_SellManyCuteMatsHere:
 	.string "They sell many cute MATS here.\p"
 	.string "I wonder which one I should get?\n"
 	.string "Maybe I'll buy them all…$"
 
-LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather: @ 82201C4
+LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather:
 	.string "I think they closed the rooftop\n"
 	.string "because the weather is wild today.$"
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index 1d9ae6a01..0e15c2048 100644
--- a/data/maps/LilycoveCity_Harbor/scripts.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -3,15 +3,15 @@
 .set LOCALID_FERRY_SAILOR, 4
 .set LOCALID_BRINEY, 5
 
-LilycoveCity_Harbor_MapScripts:: @ 821E000
+LilycoveCity_Harbor_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_Harbor_OnTransition
 	.byte 0
 
-LilycoveCity_Harbor_OnTransition: @ 821E006
+LilycoveCity_Harbor_OnTransition:
 	setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33
 	end
 
-LilycoveCity_Harbor_EventScript_FerryAttendant:: @ 821E00F
+LilycoveCity_Harbor_EventScript_FerryAttendant::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_FerryUnavailable
@@ -29,7 +29,7 @@ LilycoveCity_Harbor_EventScript_FerryAttendant:: @ 821E00F
 	goto_if_eq LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime
 	compare VAR_TEMP_B, 4
 	goto_if_eq LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime
-	compare VAR_TEMP_B, 8 
+	compare VAR_TEMP_B, 8
 	goto_if_eq LilycoveCity_Harbor_EventScript_MysticTicketFirstTime
 	compare VAR_TEMP_B, 0
 	goto_if_ne LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime
@@ -37,7 +37,7 @@ LilycoveCity_Harbor_EventScript_FerryAttendant:: @ 821E00F
 	end
 
 @ First goto_if_eq is unnecessary; identical scripts
-LilycoveCity_Harbor_EventScript_NoFirstTimeEventTickets:: @ 821E080
+LilycoveCity_Harbor_EventScript_NoFirstTimeEventTickets::
 	compare VAR_TEMP_A, 0
 	goto_if_eq LilycoveCity_Harbor_EventScript_NoEventTickets
 	msgbox LilycoveCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT
@@ -46,7 +46,7 @@ LilycoveCity_Harbor_EventScript_NoFirstTimeEventTickets:: @ 821E080
 	goto LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect
 	end
 
-LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect:: @ 821E09F
+LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect::
 	setvar VAR_0x8004, 0
 	special ScriptMenu_CreateLilycoveSSTidalMultichoice
 	waitstate
@@ -62,35 +62,35 @@ LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect:: @ 821E09F
 	case MULTI_B_PRESSED, LilycoveCity_Harbor_EventScript_ExitSailSelect
 	end
 
-LilycoveCity_Harbor_EventScript_GoToSouthernIsland:: @ 821E109
+LilycoveCity_Harbor_EventScript_GoToSouthernIsland::
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_GoToNavelRock:: @ 821E119
+LilycoveCity_Harbor_EventScript_GoToNavelRock::
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_GoToBirthIsland:: @ 821E129
+LilycoveCity_Harbor_EventScript_GoToBirthIsland::
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_GoToFarawayIsland:: @ 821E139
+LilycoveCity_Harbor_EventScript_GoToFarawayIsland::
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
 	waitstate
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149
+LilycoveCity_Harbor_EventScript_GoToSlateport::
 	msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
@@ -101,7 +101,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_GoToBattleFrontier:: @ 821E171
+LilycoveCity_Harbor_EventScript_GoToBattleFrontier::
 	msgbox LilycoveCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
@@ -111,7 +111,7 @@ LilycoveCity_Harbor_EventScript_GoToBattleFrontier:: @ 821E171
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_GetEonTicketState:: @ 821E194
+LilycoveCity_Harbor_EventScript_GetEonTicketState::
 	setvar VAR_TEMP_E, 0
 	goto_if_unset FLAG_ENABLE_SHIP_SOUTHERN_ISLAND, Common_EventScript_NopReturn
 	checkitem ITEM_EON_TICKET, 1
@@ -122,7 +122,7 @@ LilycoveCity_Harbor_EventScript_GetEonTicketState:: @ 821E194
 	setvar VAR_TEMP_E, 2
 	return
 
-LilycoveCity_Harbor_EventScript_GetAuroraTicketState:: @ 821E1C6
+LilycoveCity_Harbor_EventScript_GetAuroraTicketState::
 	setvar VAR_TEMP_D, 0
 	goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, Common_EventScript_NopReturn
 	checkitem ITEM_AURORA_TICKET, 1
@@ -133,7 +133,7 @@ LilycoveCity_Harbor_EventScript_GetAuroraTicketState:: @ 821E1C6
 	setvar VAR_TEMP_D, 2
 	return
 
-LilycoveCity_Harbor_EventScript_GetOldSeaMapState:: @ 821E1F8
+LilycoveCity_Harbor_EventScript_GetOldSeaMapState::
 	setvar VAR_TEMP_C, 0
 	goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, Common_EventScript_NopReturn
 	checkitem ITEM_OLD_SEA_MAP, 1
@@ -144,7 +144,7 @@ LilycoveCity_Harbor_EventScript_GetOldSeaMapState:: @ 821E1F8
 	setvar VAR_TEMP_C, 2
 	return
 
-LilycoveCity_Harbor_EventScript_GetMysticTicketState:: @ 821E22A
+LilycoveCity_Harbor_EventScript_GetMysticTicketState::
 	setvar VAR_TEMP_9, 0
 	goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, Common_EventScript_NopReturn
 	checkitem ITEM_MYSTIC_TICKET, 1
@@ -155,7 +155,7 @@ LilycoveCity_Harbor_EventScript_GetMysticTicketState:: @ 821E22A
 	setvar VAR_TEMP_9, 2
 	return
 
-LilycoveCity_Harbor_EventScript_GetFirstTimeShowingTicket:: @ 821E25C
+LilycoveCity_Harbor_EventScript_GetFirstTimeShowingTicket::
 	setvar VAR_TEMP_B, 0
 	compare VAR_TEMP_E, 2
 	call_if_eq LilycoveCity_Harbor_EventScript_SetFirstTimeShowingEonTicket
@@ -167,23 +167,23 @@ LilycoveCity_Harbor_EventScript_GetFirstTimeShowingTicket:: @ 821E25C
 	call_if_eq LilycoveCity_Harbor_EventScript_SetFirstTimeShowingMysticTicket
 	return
 
-LilycoveCity_Harbor_EventScript_SetFirstTimeShowingEonTicket:: @ 821E28E
+LilycoveCity_Harbor_EventScript_SetFirstTimeShowingEonTicket::
 	addvar VAR_TEMP_B, 1
 	return
 
-LilycoveCity_Harbor_EventScript_SetFirstTimeShowingAuroraTicket:: @ 821E294
+LilycoveCity_Harbor_EventScript_SetFirstTimeShowingAuroraTicket::
 	addvar VAR_TEMP_B, 2
 	return
 
-LilycoveCity_Harbor_EventScript_SetFirstTimeShowingOldSeaMap:: @ 821E29A
+LilycoveCity_Harbor_EventScript_SetFirstTimeShowingOldSeaMap::
 	addvar VAR_TEMP_B, 4
 	return
 
-LilycoveCity_Harbor_EventScript_SetFirstTimeShowingMysticTicket:: @ 821E2A0
+LilycoveCity_Harbor_EventScript_SetFirstTimeShowingMysticTicket::
 	addvar VAR_TEMP_B, 8
 	return
 
-LilycoveCity_Harbor_EventScript_GetHasTicketsState:: @ 821E2A6
+LilycoveCity_Harbor_EventScript_GetHasTicketsState::
 	setvar VAR_TEMP_A, 0
 	compare VAR_TEMP_E, 1
 	call_if_eq LilycoveCity_Harbor_EventScript_SetHasEonTicket
@@ -195,23 +195,23 @@ LilycoveCity_Harbor_EventScript_GetHasTicketsState:: @ 821E2A6
 	call_if_eq LilycoveCity_Harbor_EventScript_SetHasMysticTicket
 	return
 
-LilycoveCity_Harbor_EventScript_SetHasEonTicket:: @ 821E2D8
+LilycoveCity_Harbor_EventScript_SetHasEonTicket::
 	addvar VAR_TEMP_A, 1
 	return
 
-LilycoveCity_Harbor_EventScript_SetHasAuroraTicket:: @ 821E2DE
+LilycoveCity_Harbor_EventScript_SetHasAuroraTicket::
 	addvar VAR_TEMP_A, 2
 	return
 
-LilycoveCity_Harbor_EventScript_SetHasOldSeaMap:: @ 821E2E4
+LilycoveCity_Harbor_EventScript_SetHasOldSeaMap::
 	addvar VAR_TEMP_A, 4
 	return
 
-LilycoveCity_Harbor_EventScript_SetHasMysticTicket:: @ 821E2EA
+LilycoveCity_Harbor_EventScript_SetHasMysticTicket::
 	addvar VAR_TEMP_A, 8
 	return
 
-LilycoveCity_Harbor_EventScript_EonTicketFirstTime:: @ 821E2F0
+LilycoveCity_Harbor_EventScript_EonTicketFirstTime::
 	setflag FLAG_SHOWN_EON_TICKET
 	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
@@ -220,7 +220,7 @@ LilycoveCity_Harbor_EventScript_EonTicketFirstTime:: @ 821E2F0
 	goto LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime
 	end
 
-LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime:: @ 821E30F
+LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime::
 	closemessage
 	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
 	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
@@ -228,7 +228,7 @@ LilycoveCity_Harbor_EventScript_GoToSouthernIslandFirstTime:: @ 821E30F
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime:: @ 821E320
+LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime::
 	setflag FLAG_SHOWN_AURORA_TICKET
 	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
@@ -237,7 +237,7 @@ LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime:: @ 821E320
 	goto LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime
 	end
 
-LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime:: @ 821E33F
+LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime::
 	closemessage
 	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
 	warp MAP_BIRTH_ISLAND_HARBOR, 255, 8, 4
@@ -245,7 +245,7 @@ LilycoveCity_Harbor_EventScript_GoToBirthIslandFirstTime:: @ 821E33F
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: @ 821E350
+LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime::
 	setflag FLAG_SHOWN_OLD_SEA_MAP
 	msgbox EventTicket_Text_ShowOldSeaMap, MSGBOX_DEFAULT
 	closemessage
@@ -286,7 +286,7 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: @ 821E350
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_GoToFarawayIslandFirstTime:: @ 821E40C
+LilycoveCity_Harbor_EventScript_GoToFarawayIslandFirstTime::
 	closemessage
 	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
 	warp MAP_FARAWAY_ISLAND_ENTRANCE, 255, 13, 38
@@ -294,7 +294,7 @@ LilycoveCity_Harbor_EventScript_GoToFarawayIslandFirstTime:: @ 821E40C
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_MysticTicketFirstTime:: @ 821E41D
+LilycoveCity_Harbor_EventScript_MysticTicketFirstTime::
 	setflag FLAG_SHOWN_MYSTIC_TICKET
 	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
@@ -303,7 +303,7 @@ LilycoveCity_Harbor_EventScript_MysticTicketFirstTime:: @ 821E41D
 	goto LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime
 	end
 
-LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime:: @ 821E43C
+LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime::
 	closemessage
 	call LilycoveCity_Harbor_EventScript_BoardFerryWithSailor
 	warp MAP_NAVEL_ROCK_HARBOR, 255, 8, 4
@@ -311,7 +311,7 @@ LilycoveCity_Harbor_EventScript_GoToNavelRockFirstTime:: @ 821E43C
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime:: @ 821E44D
+LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime::
 	msgbox EventTicket_Text_ThatPass, MSGBOX_DEFAULT
 	closemessage
 	call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
@@ -331,7 +331,7 @@ LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime:: @ 821E44D
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6
+LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect::
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFastestUp
@@ -347,7 +347,7 @@ LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE
+LilycoveCity_Harbor_EventScript_GetEventTicketSailor::
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
@@ -359,7 +359,7 @@ LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514
+LilycoveCity_Harbor_EventScript_BoardFerryWithSailor::
 	applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
@@ -374,12 +374,12 @@ LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514
 	call Common_EventScript_FerryDepart
 	return
 
-LilycoveCity_Harbor_EventScript_FerryUnavailable:: @ 821E54D
+LilycoveCity_Harbor_EventScript_FerryUnavailable::
 	msgbox LilycoveCity_Harbor_Text_FerryUnavailable, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_NoEventTickets:: @ 821E557
+LilycoveCity_Harbor_EventScript_NoEventTickets::
 	msgbox LilycoveCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT
 	message LilycoveCity_Harbor_Text_FlashTicketWhereTo
 	waitmessage
@@ -387,13 +387,13 @@ LilycoveCity_Harbor_EventScript_NoEventTickets:: @ 821E557
 	end
 
 @ Unused
-LilycoveCity_Harbor_EventScript_NoTicket:: @ 821E56B
+LilycoveCity_Harbor_EventScript_NoTicket::
 	msgbox LilycoveCity_Harbor_Text_NoTicket, MSGBOX_DEFAULT
 	release
 	end
 
 @ Unused
-LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575
+LilycoveCity_Harbor_EventScript_GoToSlateportUnused::
 	msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
@@ -405,7 +405,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575
 	end
 
 @ Unused
-LilycoveCity_Harbor_EventScript_GoToBattleFrontierUnused:: @ 821E59D
+LilycoveCity_Harbor_EventScript_GoToBattleFrontierUnused::
 	msgbox LilycoveCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
@@ -415,13 +415,13 @@ LilycoveCity_Harbor_EventScript_GoToBattleFrontierUnused:: @ 821E59D
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind:: @ 821E5C0
+LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind::
 	message LilycoveCity_Harbor_Text_WhereWouldYouLikeToGo
 	waitmessage
 	goto LilycoveCity_Harbor_EventScript_FerryRegularLocationSelect
 	end
 
-LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC
+LilycoveCity_Harbor_EventScript_BoardFerry::
 	msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
@@ -438,35 +438,35 @@ LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC
 	call Common_EventScript_FerryDepart
 	return
 
-LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast:: @ 821E610
+LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast::
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryEast
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth:: @ 821E61B
+LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth::
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_ExitSailSelect:: @ 821E626
+LilycoveCity_Harbor_EventScript_ExitSailSelect::
 	msgbox LilycoveCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_Harbor_Movement_PlayerBoardFerryEast: @ 821E630
+LilycoveCity_Harbor_Movement_PlayerBoardFerryEast:
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth: @ 821E633
+LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth:
 	walk_up
 	step_end
 
-LilycoveCity_Harbor_Movement_UnusedBoardFerry: @ 821E635
+LilycoveCity_Harbor_Movement_UnusedBoardFerry:
 	walk_up
 	step_end
 
-LilycoveCity_Harbor_EventScript_Sailor:: @ 821E637
+LilycoveCity_Harbor_EventScript_Sailor::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_SailorFerryAvailable
@@ -474,82 +474,82 @@ LilycoveCity_Harbor_EventScript_Sailor:: @ 821E637
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_SailorFerryAvailable:: @ 821E64C
+LilycoveCity_Harbor_EventScript_SailorFerryAvailable::
 	msgbox LilycoveCity_Harbor_Text_SailorFerryAvailable, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayNorth:: @ 821E656
+LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayNorth::
 	applymovement LOCALID_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorOutOfWayNorth
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast:: @ 821E661
+LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast::
 	applymovement LOCALID_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorOutOfWayEast
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_Movement_SailorOutOfWayNorth: @ 821E66C
+LilycoveCity_Harbor_Movement_SailorOutOfWayNorth:
 	walk_in_place_fastest_right
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-LilycoveCity_Harbor_Movement_SailorOutOfWayEast: @ 821E671
+LilycoveCity_Harbor_Movement_SailorOutOfWayEast:
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: @ 821E675
+LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth::
 	applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: @ 821E680
+LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast::
 	applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: @ 821E68B
+LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth::
 	applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: @ 821E696
+LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast::
 	applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth:: @ 821E6A1
+LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorNorth::
 	applymovement LOCALID_BRINEY, LilycoveCity_Harbor_Movement_BrineyBoardFerry
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth
 	applymovement LOCALID_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast:: @ 821E6BA
+LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast::
 	applymovement LOCALID_BRINEY, LilycoveCity_Harbor_Movement_BrineyBoardFerry
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast
 	applymovement LOCALID_FERRY_SAILOR, LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast
 	waitmovement 0
 	return
 
-LilycoveCity_Harbor_Movement_BrineyBoardFerry: @ 821E6D3
+LilycoveCity_Harbor_Movement_BrineyBoardFerry:
 	walk_in_place_fastest_up
 	delay_8
 	set_invisible
 	step_end
 
-LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth: @ 821E6D7
+LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyNorth:
 	delay_16
 	walk_up
 	delay_16
 	set_invisible
 	step_end
 
-LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth: @ 821E6DC
+LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth:
 	delay_16
 	delay_16
 	delay_16
@@ -559,7 +559,7 @@ LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth: @ 821E6DC
 	set_invisible
 	step_end
 
-LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast: @ 821E6E4
+LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast:
 	delay_16
 	walk_right
 	walk_in_place_fastest_up
@@ -567,7 +567,7 @@ LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast: @ 821E6E4
 	set_invisible
 	step_end
 
-LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast: @ 821E6EA
+LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast:
 	delay_16
 	delay_16
 	delay_16
@@ -576,50 +576,50 @@ LilycoveCity_Harbor_Movement_SailorBoardWithBrineyEast: @ 821E6EA
 	set_invisible
 	step_end
 
-LilycoveCity_Harbor_Text_FerryUnavailable: @ 821E6F1
+LilycoveCity_Harbor_Text_FerryUnavailable:
 	.string "I beg your pardon?\n"
 	.string "You're looking for a ship?\p"
 	.string "I'm sorry, the ferry service isn't\n"
 	.string "available at present…$"
 
-LilycoveCity_Harbor_Text_MayISeeYourTicket: @ 821E758
+LilycoveCity_Harbor_Text_MayISeeYourTicket:
 	.string "Hello, are you here for the ferry?\n"
 	.string "May I see your TICKET?$"
 
-LilycoveCity_Harbor_Text_NoTicket: @ 821E792
+LilycoveCity_Harbor_Text_NoTicket:
 	.string "{PLAYER} doesn't have the TICKET…\p"
 	.string "I'm terribly sorry.\p"
 	.string "You must have a TICKET to board\n"
 	.string "the ferry.$"
 
-LilycoveCity_Harbor_Text_FlashTicketWhereTo: @ 821E7ED
+LilycoveCity_Harbor_Text_FlashTicketWhereTo:
 	.string "{PLAYER} flashed the TICKET.\p"
 	.string "Perfect! That's all you need!\p"
 	.string "And where would you like to go?$"
 
-LilycoveCity_Harbor_Text_SailAnotherTime: @ 821E842
+LilycoveCity_Harbor_Text_SailAnotherTime:
 	.string "Please sail with us another time!$"
 
-LilycoveCity_Harbor_Text_SlateportItIs: @ 821E864
+LilycoveCity_Harbor_Text_SlateportItIs:
 	.string "SLATEPORT CITY it is, then!$"
 
-LilycoveCity_Harbor_Text_BattleFrontierItIs: @ 821E880
+LilycoveCity_Harbor_Text_BattleFrontierItIs:
 	.string "BATTLE FRONTIER it is, then!$"
 
-LilycoveCity_Harbor_Text_PleaseBoard: @ 821E89D
+LilycoveCity_Harbor_Text_PleaseBoard:
 	.string "Please board the ferry and wait for\n"
 	.string "departure.$"
 
-LilycoveCity_Harbor_Text_WhereWouldYouLikeToGo: @ 821E8CC
+LilycoveCity_Harbor_Text_WhereWouldYouLikeToGo:
 	.string "Then, where would you like to go?$"
 
-LilycoveCity_Harbor_Text_SailorFerryUnavailable: @ 821E8EE
+LilycoveCity_Harbor_Text_SailorFerryUnavailable:
 	.string "Until they finish making the ferry,\n"
 	.string "we sailors have nothing to do…\p"
 	.string "I wish they'd get a move on, the folks\n"
 	.string "at the SHIPYARD in SLATEPORT.$"
 
-LilycoveCity_Harbor_Text_SailorFerryAvailable: @ 821E976
+LilycoveCity_Harbor_Text_SailorFerryAvailable:
 	.string "The ferry S.S. TIDAL is finally in\n"
 	.string "operation.\p"
 	.string "The folks at the SHIPYARD in SLATEPORT\n"
diff --git a/data/maps/LilycoveCity_House1/scripts.inc b/data/maps/LilycoveCity_House1/scripts.inc
index 207b27a11..34e9e6d90 100644
--- a/data/maps/LilycoveCity_House1/scripts.inc
+++ b/data/maps/LilycoveCity_House1/scripts.inc
@@ -1,11 +1,11 @@
-LilycoveCity_House1_MapScripts:: @ 821ECCD
+LilycoveCity_House1_MapScripts::
 	.byte 0
 
-LilycoveCity_House1_EventScript_ExpertM:: @ 821ECCE
+LilycoveCity_House1_EventScript_ExpertM::
 	msgbox LilycoveCity_House1_Text_PokemonPartnersNotTools, MSGBOX_NPC
 	end
 
-LilycoveCity_House1_EventScript_Kecleon:: @ 821ECD7
+LilycoveCity_House1_EventScript_Kecleon::
 	lock
 	faceplayer
 	waitse
@@ -15,12 +15,12 @@ LilycoveCity_House1_EventScript_Kecleon:: @ 821ECD7
 	release
 	end
 
-LilycoveCity_House1_Text_PokemonPartnersNotTools: @ 821ECEA
+LilycoveCity_House1_Text_PokemonPartnersNotTools:
 	.string "POKéMON are partners to people.\n"
 	.string "They aren't our tools.\p"
 	.string "Unfortunately, there are some people\n"
 	.string "who fail to understand that…$"
 
-LilycoveCity_House1_Text_Kecleon: @ 821ED63
+LilycoveCity_House1_Text_Kecleon:
 	.string "KECLEON: Ruroro?$"
 
diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc
index 29d741abd..c7664c641 100644
--- a/data/maps/LilycoveCity_House2/scripts.inc
+++ b/data/maps/LilycoveCity_House2/scripts.inc
@@ -1,7 +1,7 @@
-LilycoveCity_House2_MapScripts:: @ 821ED74
+LilycoveCity_House2_MapScripts::
 	.byte 0
 
-LilycoveCity_House2_EventScript_FatMan:: @ 821ED75
+LilycoveCity_House2_EventScript_FatMan::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_ReceivedRest
@@ -14,17 +14,17 @@ LilycoveCity_House2_EventScript_FatMan:: @ 821ED75
 	release
 	end
 
-LilycoveCity_House2_EventScript_ReceivedRest:: @ 821EDAC
+LilycoveCity_House2_EventScript_ReceivedRest::
 	msgbox LilycoveCity_House2_Text_SleepIsEssential, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House2_Text_NotAwakeYetHaveThis: @ 821EDB6
+LilycoveCity_House2_Text_NotAwakeYetHaveThis:
 	.string "Huh? What? What's that?\p"
 	.string "I'm not near awake yet…\n"
 	.string "You can have this…$"
 
-LilycoveCity_House2_Text_SleepIsEssential: @ 821EDF9
+LilycoveCity_House2_Text_SleepIsEssential:
 	.string "Yawn…\p"
 	.string "Sleep is essential for good health…\n"
 	.string "Sleep and regain health…$"
diff --git a/data/maps/LilycoveCity_House3/scripts.inc b/data/maps/LilycoveCity_House3/scripts.inc
index 8d4a1059e..de76c58b6 100644
--- a/data/maps/LilycoveCity_House3/scripts.inc
+++ b/data/maps/LilycoveCity_House3/scripts.inc
@@ -1,13 +1,13 @@
-LilycoveCity_House3_MapScripts:: @ 821EE3C
+LilycoveCity_House3_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_House3_OnTransition
 	.byte 0
 
-LilycoveCity_House3_OnTransition: @ 821EE42
+LilycoveCity_House3_OnTransition:
 	random 4
 	copyvar VAR_TEMP_1, VAR_RESULT
 	end
 
-LilycoveCity_House3_EventScript_PokefanF:: @ 821EE4B
+LilycoveCity_House3_EventScript_PokefanF::
 	lock
 	faceplayer
 	msgbox LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks, MSGBOX_YESNO
@@ -20,7 +20,7 @@ LilycoveCity_House3_EventScript_PokefanF:: @ 821EE4B
 	release
 	end
 
-LilycoveCity_House3_EventScript_DeclinePokeblockLearn:: @ 821EE75
+LilycoveCity_House3_EventScript_DeclinePokeblockLearn::
 	msgbox LilycoveCity_House3_Text_OhAreYouSure, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
@@ -28,7 +28,7 @@ LilycoveCity_House3_EventScript_DeclinePokeblockLearn:: @ 821EE75
 	release
 	end
 
-LilycoveCity_House3_EventScript_Man:: @ 821EE8A
+LilycoveCity_House3_EventScript_Man::
 	lock
 	faceplayer
 	msgbox LilycoveCity_House3_Text_HappyToHaveQuadruplets, MSGBOX_DEFAULT
@@ -38,7 +38,7 @@ LilycoveCity_House3_EventScript_Man:: @ 821EE8A
 	release
 	end
 
-LilycoveCity_House3_EventScript_GameBoyKid1:: @ 821EEA1
+LilycoveCity_House3_EventScript_GameBoyKid1::
 	lock
 	faceplayer
 	switch VAR_TEMP_1
@@ -48,7 +48,7 @@ LilycoveCity_House3_EventScript_GameBoyKid1:: @ 821EEA1
 	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_GameBoyKid2:: @ 821EED5
+LilycoveCity_House3_EventScript_GameBoyKid2::
 	lock
 	faceplayer
 	switch VAR_TEMP_1
@@ -58,7 +58,7 @@ LilycoveCity_House3_EventScript_GameBoyKid2:: @ 821EED5
 	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_GameBoyKid3:: @ 821EF09
+LilycoveCity_House3_EventScript_GameBoyKid3::
 	lock
 	faceplayer
 	switch VAR_TEMP_1
@@ -68,7 +68,7 @@ LilycoveCity_House3_EventScript_GameBoyKid3:: @ 821EF09
 	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_GameBoyKid4:: @ 821EF3D
+LilycoveCity_House3_EventScript_GameBoyKid4::
 	lock
 	faceplayer
 	switch VAR_TEMP_1
@@ -78,27 +78,27 @@ LilycoveCity_House3_EventScript_GameBoyKid4:: @ 821EF3D
 	case 3, LilycoveCity_House3_EventScript_WereDoingContest
 	end
 
-LilycoveCity_House3_EventScript_WereDoingMultiBattle:: @ 821EF71
+LilycoveCity_House3_EventScript_WereDoingMultiBattle::
 	msgbox LilycoveCity_House3_Text_GoingToWinMultiBattles, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_EventScript_WereMixingRecords:: @ 821EF7B
+LilycoveCity_House3_EventScript_WereMixingRecords::
 	msgbox LilycoveCity_House3_Text_LikeMixingAtRecordCorner, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_EventScript_WereBlendingBerries:: @ 821EF85
+LilycoveCity_House3_EventScript_WereBlendingBerries::
 	msgbox LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_EventScript_WereDoingContest:: @ 821EF8F
+LilycoveCity_House3_EventScript_WereDoingContest::
 	msgbox LilycoveCity_House3_Text_GoingToEnterContest, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks: @ 821EF99
+LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks:
 	.string "Oh, my, my! Are you traveling alone?\n"
 	.string "But you're so young! Good for you!\p"
 	.string "I'm sure my kids could learn a thing\n"
@@ -109,12 +109,12 @@ LilycoveCity_House3_Text_LearnFromMasterOfPokeblocks: @ 821EF99
 	.string "Would you like to learn from me,\n"
 	.string "a master of {POKEBLOCK}S?$"
 
-LilycoveCity_House3_Text_OhAreYouSure: @ 821F0A9
+LilycoveCity_House3_Text_OhAreYouSure:
 	.string "Oh? Are you sure?\p"
 	.string "You shouldn't always try to do\n"
 	.string "everything by yourself, dear!$"
 
-LilycoveCity_House3_Text_ExplainPokeblocks: @ 821F0F8
+LilycoveCity_House3_Text_ExplainPokeblocks:
 	.string "Oh, good! You're a smart soul!\n"
 	.string "This is a bit long, so listen up!\p"
 	.string "Are you ready?\p"
@@ -143,26 +143,26 @@ LilycoveCity_House3_Text_ExplainPokeblocks: @ 821F0F8
 	.string "the world would be a happier place.\p"
 	.string "Don't give up, dear!$"
 
-LilycoveCity_House3_Text_HappyToHaveQuadruplets: @ 821F430
+LilycoveCity_House3_Text_HappyToHaveQuadruplets:
 	.string "When my wife gave birth to quadruplets,\n"
 	.string "you bet I was shocked.\p"
 	.string "But, now, seeing them play together,\n"
 	.string "it makes me happy.$"
 
-LilycoveCity_House3_Text_GoingToWinMultiBattles: @ 821F4A7
+LilycoveCity_House3_Text_GoingToWinMultiBattles:
 	.string "We're having MULTI BATTLES, but I know\n"
 	.string "I'm going to win.$"
 
-LilycoveCity_House3_Text_LikeMixingAtRecordCorner: @ 821F4E0
+LilycoveCity_House3_Text_LikeMixingAtRecordCorner:
 	.string "We like mixing stuff at\n"
 	.string "the RECORD CORNER.\p"
 	.string "But what gets mixed up?$"
 
-LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender: @ 821F523
+LilycoveCity_House3_Text_MakePokeblocksWithBerryBlender:
 	.string "We're going to make super {POKEBLOCK}S\n"
 	.string "with a BERRY BLENDER!$"
 
-LilycoveCity_House3_Text_GoingToEnterContest: @ 821F55A
+LilycoveCity_House3_Text_GoingToEnterContest:
 	.string "I want to brag about how tough my\n"
 	.string "POKéMON is, so we're going to enter\l"
 	.string "a CONTEST together.$"
diff --git a/data/maps/LilycoveCity_House4/scripts.inc b/data/maps/LilycoveCity_House4/scripts.inc
index 685a91b7d..0160ae763 100644
--- a/data/maps/LilycoveCity_House4/scripts.inc
+++ b/data/maps/LilycoveCity_House4/scripts.inc
@@ -1,20 +1,20 @@
-LilycoveCity_House4_MapScripts:: @ 821F5B4
+LilycoveCity_House4_MapScripts::
 	.byte 0
 
-LilycoveCity_House4_EventScript_Man1:: @ 821F5B5
+LilycoveCity_House4_EventScript_Man1::
 	msgbox LilycoveCity_House4_Text_MysteriesAtBottomOfSea, MSGBOX_NPC
 	end
 
-LilycoveCity_House4_EventScript_Man2:: @ 821F5BE
+LilycoveCity_House4_EventScript_Man2::
 	msgbox LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis, MSGBOX_NPC
 	end
 
-LilycoveCity_House4_Text_MysteriesAtBottomOfSea: @ 821F5C7
+LilycoveCity_House4_Text_MysteriesAtBottomOfSea:
 	.string "This planet's biggest mysteries are\n"
 	.string "at the bottom of the sea.\p"
 	.string "Somebody said that, but I don't know…$"
 
-LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis: @ 821F62B
+LilycoveCity_House4_Text_UnderwaterTrenchMossdeepSootopolis:
 	.string "There's a deep underwater trench\n"
 	.string "between MOSSDEEP and SOOTOPOLIS.\p"
 	.string "That's what someone told me, anyway.$"
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
index ded9ed53d..e5d855633 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
@@ -1,14 +1,14 @@
 .set LOCALID_CURATOR, 2
 .set LOCALID_ARTIST_2, 8
 
-LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 8218CB8
+LilycoveCity_LilycoveMuseum_1F_MapScripts::
 	.byte 0
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter:: @ 8218CB9
+LilycoveCity_LilycoveMuseum_1F_EventScript_Greeter::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_Curator:: @ 8218CC2
+LilycoveCity_LilycoveMuseum_1F_EventScript_Curator::
 	lockall
 	applymovement LOCALID_CURATOR, Common_Movement_FacePlayer
 	message LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings
@@ -20,11 +20,11 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_Curator:: @ 8218CC2
 	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet:: @ 8218CEC
+LilycoveCity_LilycoveMuseum_1F_EventScript_NotYet::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings:: @ 8218CF5
+LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested
@@ -32,12 +32,12 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_SawPaintings:: @ 8218CF5
 	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested:: @ 8218D14
+LilycoveCity_LilycoveMuseum_1F_EventScript_NotInterested::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat, MSGBOX_SIGN
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: @ 8218D1E
+LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe, MSGBOX_SIGN
 	applymovement LOCALID_CURATOR, LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs
 	waitmovement 0
@@ -48,7 +48,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_InterestedInPaintings:: @ 8218D1E
 	case DIR_EAST, LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: @ 8218D5A
+LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth
 	waitmovement 0
@@ -56,7 +56,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorNorth:: @ 8218D5A
 	waitstate
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: @ 8218D6F
+LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest
 	waitmovement 0
@@ -64,7 +64,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorWest:: @ 8218D6F
 	waitstate
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast:: @ 8218D84
+LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast
 	waitmovement 0
@@ -72,86 +72,86 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_FollowCuratorEast:: @ 8218D84
 	waitstate
 	end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs: @ 8218D99
+LilycoveCity_LilycoveMuseum_1F_Movement_CuratorEnterStairs:
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest: @ 8218D9B
+LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorWest:
 	walk_left
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast: @ 8218D9E
+LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorEast:
 	walk_right
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth: @ 8218DA1
+LilycoveCity_LilycoveMuseum_1F_Movement_FollowCuratorNorth:
 	walk_up
 	walk_up
 	step_end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting:: @ 8218DA4
+LilycoveCity_LilycoveMuseum_1F_EventScript_OldPainting::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting:: @ 8218DAD
+LilycoveCity_LilycoveMuseum_1F_EventScript_FantasyPainting::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting:: @ 8218DB6
+LilycoveCity_LilycoveMuseum_1F_EventScript_WomanPainting::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting:: @ 8218DBF
+LilycoveCity_LilycoveMuseum_1F_EventScript_LegendaryPokemonPainting::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_GrassPokemonPainting:: @ 8218DC8
+LilycoveCity_LilycoveMuseum_1F_EventScript_GrassPokemonPainting::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting:: @ 8218DD1
+LilycoveCity_LilycoveMuseum_1F_EventScript_BerryPainting::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture:: @ 8218DDA
+LilycoveCity_LilycoveMuseum_EventScript_BirdSculpture::
 	msgbox LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_PokeBallSculpture:: @ 8218DE3
+LilycoveCity_LilycoveMuseum_1F_EventScript_PokeBallSculpture::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet:: @ 8218DEC
+LilycoveCity_LilycoveMuseum_1F_EventScript_StoneTablet::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_SchoolKidM:: @ 8218DF5
+LilycoveCity_LilycoveMuseum_1F_EventScript_SchoolKidM::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_Artist1:: @ 8218DFE
+LilycoveCity_LilycoveMuseum_1F_EventScript_Artist1::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_NinjaBoy:: @ 8218E07
+LilycoveCity_LilycoveMuseum_1F_EventScript_NinjaBoy::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_Woman1:: @ 8218E10
+LilycoveCity_LilycoveMuseum_1F_EventScript_Woman1::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_Woman2:: @ 8218E19
+LilycoveCity_LilycoveMuseum_1F_EventScript_Woman2::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_PsychicM:: @ 8218E22
+LilycoveCity_LilycoveMuseum_1F_EventScript_PsychicM::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2:: @ 8218E2B
+LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2::
 	lock
 	faceplayer
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings, MSGBOX_DEFAULT
@@ -161,17 +161,17 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_Artist2:: @ 8218E2B
 	release
 	end
 
-LilycoveCity_LilycoveMuseum_1F_EventScript_FatMan:: @ 8218E42
+LilycoveCity_LilycoveMuseum_1F_EventScript_FatMan::
 	msgbox LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum: @ 8218E4B
+LilycoveCity_LilycoveMuseum_1F_Text_WelcomeToLilycoveMuseum:
 	.string "Welcome to LILYCOVE MUSEUM.\p"
 	.string "Please take the time to enjoy our\n"
 	.string "collection of fantastic artwork\l"
 	.string "featuring POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings: @ 8218EBC
+LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings:
 	.string "I'm the CURATOR of this MUSEUM of\n"
 	.string "fine arts.\p"
 	.string "It's heartening to see someone so\n"
@@ -179,116 +179,116 @@ LilycoveCity_LilycoveMuseum_1F_Text_ImCuratorHaveYouViewedOurPaintings: @ 8218EB
 	.string "Have you viewed our collection of\n"
 	.string "paintings already?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime: @ 8218F5C
+LilycoveCity_LilycoveMuseum_1F_Text_NotDisturbYouTakeYourTime:
 	.string "Ah, then let me not disturb you.\n"
 	.string "Please, do take your time.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings: @ 8218F98
+LilycoveCity_LilycoveMuseum_1F_Text_HaveYouAnInterestInPaintings:
 	.string "Oh? I do believe that you seem to\n"
 	.string "be a POKéMON TRAINER.\p"
 	.string "Have you an interest in paintings,\n"
 	.string "too?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat: @ 8218FF8
+LilycoveCity_LilycoveMuseum_1F_Text_HonoredYoudVisitInSpiteOfThat:
 	.string "I see…\p"
 	.string "I'm honored that you would visit\n"
 	.string "us in spite of that.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe: @ 8219035
+LilycoveCity_LilycoveMuseum_1F_Text_ExcellentCanYouComeWithMe:
 	.string "Ah, excellent!\n"
 	.string "You do like paintings!\p"
 	.string "Then, may I ask you to come with me?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting: @ 8219080
+LilycoveCity_LilycoveMuseum_1F_Text_VeryOldPainting:
 	.string "It's a very old painting.\n"
 	.string "The paint is peeling here and there.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery: @ 82190BF
+LilycoveCity_LilycoveMuseum_1F_Text_OddLandscapeFantasticScenery:
 	.string "It's an odd landscape with bizarre\n"
 	.string "and fantastic scenery.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman: @ 82190F9
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBeautifulWoman:
 	.string "It's a painting of a beautiful, smiling\n"
 	.string "woman with a POKéMON on her lap.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon: @ 8219142
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfLegendaryPokemon:
 	.string "It's a painting of a legendary POKéMON\n"
 	.string "from long ago.\p"
 	.string "The artist painted this from\n"
 	.string "imagination.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon: @ 82191A2
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfGrassPokemon:
 	.string "It's a painting of GRASS POKéMON\n"
 	.string "swaying in a breeze.\p"
 	.string "They appear to be enjoying the wind's\n"
 	.string "gentle caress.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries: @ 821920D
+LilycoveCity_LilycoveMuseum_1F_Text_PaintingOfBerries:
 	.string "It's a delicious-looking painting\n"
 	.string "of BERRIES.\p"
 	.string "This painting could make you hungry!$"
 
-LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica: @ 8219260
+LilycoveCity_LilycoveMuseum_Text_BirdPokemonSculptureReplica:
 	.string "It's a replica of a famous sculpture.\p"
 	.string "It depicts an ancient BIRD POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone: @ 82192AA
+LilycoveCity_LilycoveMuseum_1F_Text_BigPokeBallCarvedFromStone:
 	.string "It's a big POKé BALL carved from\n"
 	.string "a black stone.\p"
 	.string "It was apparently used in festivals\n"
 	.string "in the olden days.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText: @ 8219311
+LilycoveCity_LilycoveMuseum_1F_Text_StoneTabletWithAncientText:
 	.string "It's a huge stone tablet inscribed\n"
 	.string "with POKéMON and dense text in the\l"
 	.string "small characters of an ancient,\l"
 	.string "unreadable language.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_WorksOfMagnificence: @ 821938C
+LilycoveCity_LilycoveMuseum_1F_Text_WorksOfMagnificence:
 	.string "Hmmm…\n"
 	.string "What works of great magnificence…$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts: @ 82193B4
+LilycoveCity_LilycoveMuseum_1F_Text_MustntForgetLoveForFineArts:
 	.string "Battling with POKéMON is fun,\n"
 	.string "I'll grant you that.\p"
 	.string "But one mustn't forget our love for\n"
 	.string "the fine arts.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration: @ 821941A
+LilycoveCity_LilycoveMuseum_1F_Text_ThisMuseumIsInspiration:
 	.string "This ART MUSEUM… Well, you could\n"
 	.string "see many fantastic paintings.\p"
 	.string "And the CURATOR is a wonderful person.\p"
 	.string "Among artists like myself, this MUSEUM\n"
 	.string "is an inspiration.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty: @ 82194BA
+LilycoveCity_LilycoveMuseum_1F_Text_ThisLadyIsPretty:
 	.string "This lady is pretty!\n"
 	.string "She's like Mommy!$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable: @ 82194E1
+LilycoveCity_LilycoveMuseum_1F_Text_ThisPokemonIsAdorable:
 	.string "This POKéMON is adorable!\n"
 	.string "Just like our little boy!$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings: @ 8219515
+LilycoveCity_LilycoveMuseum_1F_Text_HeardMuseumGotNewPaintings:
 	.string "I'd heard that this ART MUSEUM got\n"
 	.string "in some new paintings.\p"
 	.string "So, naturally I hurried over.\p"
 	.string "Are the new paintings up on\n"
 	.string "the second floor?$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful: @ 821959B
+LilycoveCity_LilycoveMuseum_1F_Text_CuratorHasBeenCheerful:
 	.string "Lately, the CURATOR has been\n"
 	.string "unusually cheerful.\p"
 	.string "I bet something good happened for him.\n"
 	.string "Definitely.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings: @ 82195FF
+LilycoveCity_LilycoveMuseum_1F_Text_AimToSeeGreatPaintings:
 	.string "I aim to see many great paintings\n"
 	.string "here and learn from them.\p"
 	.string "I have this dream of one day having\n"
 	.string "my artwork exhibited here.$"
 
-LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination: @ 821967A
+LilycoveCity_LilycoveMuseum_1F_Text_MuseumTouristDestination:
 	.string "The ART MUSEUM has become a favorite\n"
 	.string "tourist destination.\p"
 	.string "It's great for LILYCOVE…\n"
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index 6f51d1cac..27b59502c 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -1,68 +1,68 @@
 .set LOCALID_CURATOR, 1
 
-LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A
+LilycoveCity_LilycoveMuseum_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, LilycoveCity_LilycoveMuseum_2F_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_LilycoveMuseum_2F_OnFrame
 	.byte 0
 
-LilycoveCity_LilycoveMuseum_2F_OnLoad: @ 8219745
+LilycoveCity_LilycoveMuseum_2F_OnLoad:
 	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting:: @ 8219754
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting::
 	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting:: @ 8219763
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting::
 	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting:: @ 8219772
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting::
 	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting:: @ 8219781
+LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting::
 	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting:: @ 821978B
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetCoolPainting::
 	setmetatile 10, 6, METATILE_LilycoveMuseum_Painting2_Left, 1
 	setmetatile 11, 6, METATILE_LilycoveMuseum_Painting2_Right, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckBeautyPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting:: @ 82197A3
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetBeautyPainting::
 	setmetatile 18, 6, METATILE_LilycoveMuseum_Painting1_Left, 1
 	setmetatile 19, 6, METATILE_LilycoveMuseum_Painting1_Right, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckCutePainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting:: @ 82197BB
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetCutePainting::
 	setmetatile 14, 10, METATILE_LilycoveMuseum_Painting3_Left, 1
 	setmetatile 15, 10, METATILE_LilycoveMuseum_Painting3_Right, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckSmartPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting:: @ 82197D3
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetSmartPainting::
 	setmetatile 6, 10, METATILE_LilycoveMuseum_Painting0_Left, 1
 	setmetatile 7, 10, METATILE_LilycoveMuseum_Painting0_Right, 1
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_CheckToughPainting
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting:: @ 82197EB
+LilycoveCity_LilycoveMuseum_2F_EventScript_SetToughPainting::
 	setmetatile 2, 6, METATILE_LilycoveMuseum_Painting4_Left, 1
 	setmetatile 3, 6, METATILE_LilycoveMuseum_Painting4_Right, 1
 	end
 
-LilycoveCity_LilycoveMuseum_2F_OnFrame: @ 82197FE
+LilycoveCity_LilycoveMuseum_2F_OnFrame:
 	map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall
 	.2byte 0
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall:: @ 8219808
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall::
 	lockall
 	applymovement LOCALID_CURATOR, Common_Movement_FacePlayer
 	applymovement OBJ_EVENT_ID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft
@@ -82,16 +82,16 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall:: @ 8219808
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft: @ 8219861
+LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft:
 	walk_in_place_fastest_left
 	step_end
 
-LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall: @ 8219863
+LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall:
 	face_up
 	delay_16
 	step_end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_Curator:: @ 8219866
+LilycoveCity_LilycoveMuseum_2F_EventScript_Curator::
 	lockall
 	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament
 	specialvar VAR_0x8004, CountPlayerMuseumPaintings
@@ -104,11 +104,11 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_Curator:: @ 8219866
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting:: @ 82198BA
+LilycoveCity_LilycoveMuseum_2F_EventScript_AddedPainting::
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer:: @ 82198C3
+LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer::
 	applymovement LOCALID_CURATOR, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer, MSGBOX_DEFAULT
@@ -117,7 +117,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_ThankPlayer:: @ 82198C3
 	goto LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament:: @ 82198EA
+LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament::
 	applymovement LOCALID_CURATOR, Common_Movement_FacePlayer
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude, MSGBOX_DEFAULT
 	givedecoration DECOR_GLASS_ORNAMENT
@@ -128,99 +128,99 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_GiveGlassOrnament:: @ 82198EA
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament:: @ 8219911
+LilycoveCity_LilycoveMuseum_2F_EventScript_NoRoomForGlassOrnament::
 	call Common_EventScript_NoRoomForDecor
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament:: @ 8219921
+LilycoveCity_LilycoveMuseum_2F_EventScript_ReceivedGlassOrnament::
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit, MSGBOX_NPC
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting:: @ 821992B
+LilycoveCity_LilycoveMuseum_2F_EventScript_CutePainting::
 	lockall
 	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting:: @ 821993E
+LilycoveCity_LilycoveMuseum_2F_EventScript_ToughPainting::
 	lockall
 	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting:: @ 8219951
+LilycoveCity_LilycoveMuseum_2F_EventScript_CoolPainting::
 	lockall
 	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting:: @ 8219964
+LilycoveCity_LilycoveMuseum_2F_EventScript_BeautyPainting::
 	lockall
 	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting:: @ 8219977
+LilycoveCity_LilycoveMuseum_2F_EventScript_SmartPainting::
 	lockall
 	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame, MSGBOX_SIGN
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_Girl:: @ 821998A
+LilycoveCity_LilycoveMuseum_2F_EventScript_Girl::
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_ExpertM:: @ 8219993
+LilycoveCity_LilycoveMuseum_2F_EventScript_ExpertM::
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy:: @ 821999C
+LilycoveCity_LilycoveMuseum_2F_EventScript_RichBoy::
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting:: @ 82199A5
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCoolPainting::
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_MUSEUM_COOL
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting:: @ 82199B3
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowBeautyPainting::
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_MUSEUM_BEAUTY
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting:: @ 82199C1
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowCutePainting::
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_MUSEUM_CUTE
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting:: @ 82199CF
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowSmartPainting::
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_MUSEUM_SMART
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting:: @ 82199DD
+LilycoveCity_LilycoveMuseum_2F_EventScript_ShowToughPainting::
 	msgbox LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon, MSGBOX_SIGN
 	fadescreen FADE_TO_BLACK
 	showcontestpainting CONTEST_WINNER_MUSEUM_TOUGH
 	releaseall
 	end
 
-LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall: @ 82199EB
+LilycoveCity_LilycoveMuseum_2F_Text_ThisIsExhibitHall:
 	.string "This is our special exhibit hall.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall: @ 8219A0D
+LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall:
 	.string "As you can plainly see, there is not\n"
 	.string "a single painting on exhibit.\p"
 	.string "Here, I don't wish to exhibit works of\n"
@@ -236,7 +236,7 @@ LilycoveCity_LilycoveMuseum_2F_Text_ExplainExhibitHall: @ 8219A0D
 	.string "POKéMON seemingly ready to spring\l"
 	.string "forth into glorious life!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit: @ 8219BC4
+LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit:
 	.string "I beg your pardon. I didn't intend\n"
 	.string "to monopolize the conversation.\p"
 	.string "Now, as you are young, and yet\n"
@@ -248,23 +248,23 @@ LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit: @ 8219BC4
 	.string "the artist's permission to exhibit\l"
 	.string "it here?$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit: @ 8219CF3
+LilycoveCity_LilycoveMuseum_2F_Text_WishToFillExhibit:
 	.string "I wish to fill this exhibit hall with\n"
 	.string "modern and vibrant paintings of\l"
 	.string "POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting: @ 8219D42
+LilycoveCity_LilycoveMuseum_2F_Text_ThanksAddedNewPainting:
 	.string "Thanks to you, we've added a new\n"
 	.string "painting to our collection!\p"
 	.string "I've heard it depicts your POKéMON.\n"
 	.string "Truly magnificent!\p"
 	.string "Thank you so very, very much!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer: @ 8219DD4
+LilycoveCity_LilycoveMuseum_2F_Text_ItsYouPlayer:
 	.string "Ah! It's you!\n"
 	.string "{PLAYER}!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests: @ 8219DE6
+LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests:
 	.string "Isn't this marvelous?\n"
 	.string "This collection of paintings!\p"
 	.string "Each one of them flawless!\n"
@@ -274,56 +274,56 @@ LilycoveCity_LilycoveMuseum_2F_Text_PaintingsAttractedMoreGuests: @ 8219DE6
 	.string "Sincerely, I thank you, {PLAYER}.\n"
 	.string "This is my dream come true!$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude: @ 8219EC5
+LilycoveCity_LilycoveMuseum_2F_Text_TokenOfGratitude:
 	.string "This is merely a token of my gratitude.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou: @ 8219EED
+LilycoveCity_LilycoveMuseum_2F_Text_KeepThisForYou:
 	.string "I will keep this for you until we\n"
 	.string "meet again.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit: @ 8219F1B
+LilycoveCity_LilycoveMuseum_2F_Text_HonorToHaveYouVisit:
 	.string "Ah, so good to see you, {PLAYER}!\p"
 	.string "It's an honor to have you visit us\n"
 	.string "on your busy journeys.\p"
 	.string "Please, relax and do enjoy your\n"
 	.string "visit with us.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame: @ 8219FA0
+LilycoveCity_LilycoveMuseum_2F_Text_ItsPinkPictureFrame:
 	.string "It's a picture frame with pink-colored\n"
 	.string "adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame: @ 8219FD3
+LilycoveCity_LilycoveMuseum_2F_Text_ItsYellowPictureFrame:
 	.string "It's a picture frame with\n"
 	.string "yellow-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame: @ 821A008
+LilycoveCity_LilycoveMuseum_2F_Text_ItsBluePictureFrame:
 	.string "It's a picture frame with\n"
 	.string "blue-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame: @ 821A03B
+LilycoveCity_LilycoveMuseum_2F_Text_ItsRedPictureFrame:
 	.string "It's a picture frame with\n"
 	.string "red-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame: @ 821A06D
+LilycoveCity_LilycoveMuseum_2F_Text_ItsGreenPictureFrame:
 	.string "It's a picture frame with\n"
 	.string "green-colored adornments.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon: @ 821A0A1
+LilycoveCity_LilycoveMuseum_2F_Text_ItsPaintingOfPokemon:
 	.string "It's a painting of POKéMON.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe: @ 821A0BD
+LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsSurprisedMe:
 	.string "I've been away awhile, so the new\n"
 	.string "paintings up here surprised me.\p"
 	.string "I wish someone would paint my POKéMON\n"
 	.string "this pretty.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing: @ 821A132
+LilycoveCity_LilycoveMuseum_2F_Text_NewPaintingsRatherAmusing:
 	.string "Well… So this is where they show\n"
 	.string "the topical POKéMON paintings.\p"
 	.string "I see, these new paintings are indeed\n"
 	.string "rather amusing.$"
 
-LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon: @ 821A1A8
+LilycoveCity_LilycoveMuseum_2F_Text_ThesePaintingsOfYourPokemon:
 	.string "Wow, is that right?\n"
 	.string "These paintings are of your POKéMON.\p"
 	.string "Isn't that just the ultimate joy for\n"
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
index 1a27e3b8f..ff340c9f3 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
@@ -1,9 +1,9 @@
 .set LOCALID_MOVE_DELETER, 1
 
-LilycoveCity_MoveDeletersHouse_MapScripts:: @ 821EA0A
+LilycoveCity_MoveDeletersHouse_MapScripts::
 	.byte 0
 
-LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter:: @ 821EA0B
+LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter::
 	lockall
 	applymovement LOCALID_MOVE_DELETER, Common_Movement_FacePlayer
 	waitmovement 0
@@ -14,7 +14,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_MoveDeleter:: @ 821EA0B
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget:: @ 821EA3B
+LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget::
 	msgbox LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget, MSGBOX_DEFAULT
 	special ChoosePartyMon
 	waitstate
@@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_ChooseMonAndMoveToForget:: @ 821EA3B
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove:: @ 821EAB0
+LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove::
 	special IsLastMonThatKnowsSurf
 	compare VAR_RESULT, TRUE
 	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf
@@ -51,62 +51,62 @@ LilycoveCity_MoveDeletersHouse_EventScript_TryForgetMove:: @ 821EAB0
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove:: @ 821EACF
+LilycoveCity_MoveDeletersHouse_EventScript_MonOnlyKnowsOneMove::
 	special BufferMoveDeleterNicknameAndMove
 	msgbox LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_EggCantForgetMoves:: @ 821EADC
+LilycoveCity_MoveDeletersHouse_EventScript_EggCantForgetMoves::
 	msgbox LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain:: @ 821EAE6
+LilycoveCity_MoveDeletersHouse_EventScript_ComeAgain::
 	msgbox LilycoveCity_MoveDeletersHouse_Text_ComeAgain, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf:: @ 821EAF0
+LilycoveCity_MoveDeletersHouse_EventScript_LastMonWithSurf::
 	special BufferMoveDeleterNicknameAndMove
 	msgbox LilycoveCity_MoveDeletersHouse_Text_CantForgetSurf, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove: @ 821EAFD
+LilycoveCity_MoveDeletersHouse_Text_ICanMakeMonForgetMove:
 	.string "Uh…\n"
 	.string "Oh, yes, I'm the MOVE DELETER.\p"
 	.string "I can make POKéMON forget their moves.\p"
 	.string "Would you like me to do that?$"
 
-LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget: @ 821EB65
+LilycoveCity_MoveDeletersHouse_Text_WhichMonShouldForget:
 	.string "Which POKéMON should forget a move?$"
 
-LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten: @ 821EB89
+LilycoveCity_MoveDeletersHouse_Text_WhichMoveShouldBeForgotten:
 	.string "Which move should be forgotten?$"
 
-LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove: @ 821EBA9
+LilycoveCity_MoveDeletersHouse_Text_MonOnlyKnowsOneMove:
 	.string "{STR_VAR_1} knows only one move\n"
 	.string "so it can't be forgotten…$"
 
-LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten: @ 821EBDA
+LilycoveCity_MoveDeletersHouse_Text_MonsMoveShouldBeForgotten:
 	.string "Hm! {STR_VAR_1}'s {STR_VAR_2}?\n"
 	.string "That move should be forgotten?$"
 
-LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove: @ 821EC06
+LilycoveCity_MoveDeletersHouse_Text_MonHasForgottenMove:
 	.string "It worked to perfection!\p"
 	.string "{STR_VAR_1} has forgotten\n"
 	.string "{STR_VAR_2} completely.$"
 
-LilycoveCity_MoveDeletersHouse_Text_ComeAgain: @ 821EC3F
+LilycoveCity_MoveDeletersHouse_Text_ComeAgain:
 	.string "Come again if there are moves that\n"
 	.string "need to be forgotten.$"
 
-LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves: @ 821EC78
+LilycoveCity_MoveDeletersHouse_Text_EggCantForgetMoves:
 	.string "What?\n"
 	.string "No EGG should know any moves.$"
 
-LilycoveCity_MoveDeletersHouse_Text_CantForgetSurf: @ 821EC9C
+LilycoveCity_MoveDeletersHouse_Text_CantForgetSurf:
 	.string "Hm!\p"
 	.string "Your {STR_VAR_1} doesn't seem willing\n"
 	.string "to forget SURF.$"
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index 829c55646..03f2657e7 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
@@ -1,17 +1,17 @@
 .set LOCALID_NURSE, 1
 
-LilycoveCity_PokemonCenter_1F_MapScripts:: @ 821C5B2
+LilycoveCity_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-LilycoveCity_PokemonCenter_1F_OnTransition: @ 821C5BD
+LilycoveCity_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_LILYCOVE_CITY
 	goto LilycoveCity_PokemonCenter_1F_EventScript_SetLilycoveLadyGfx
 	end
 
 @ SetLilycoveLadyGfx returns TRUE if its the Contest Lady
-LilycoveCity_PokemonCenter_1F_EventScript_SetLilycoveLadyGfx:: @ 821C5C6
+LilycoveCity_PokemonCenter_1F_EventScript_SetLilycoveLadyGfx::
 	special SetLilycoveLadyGfx
 	compare VAR_RESULT, FALSE
 	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_HideContestLadyMon
@@ -19,15 +19,15 @@ LilycoveCity_PokemonCenter_1F_EventScript_SetLilycoveLadyGfx:: @ 821C5C6
 	goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ShowContestLadyMon
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_HideContestLadyMon:: @ 821C5E0
+LilycoveCity_PokemonCenter_1F_EventScript_HideContestLadyMon::
 	setflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_ShowContestLadyMon:: @ 821C5E4
+LilycoveCity_PokemonCenter_1F_EventScript_ShowContestLadyMon::
 	clearflag FLAG_HIDE_LILYCOVE_POKEMON_CENTER_CONTEST_LADY_MON
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_Nurse:: @ 821C5E8
+LilycoveCity_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -35,11 +35,11 @@ LilycoveCity_PokemonCenter_1F_EventScript_Nurse:: @ 821C5E8
 	release
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_Boy:: @ 821C5F6
+LilycoveCity_PokemonCenter_1F_EventScript_Boy::
 	msgbox LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon, MSGBOX_NPC
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_Maniac:: @ 821C5FF
+LilycoveCity_PokemonCenter_1F_EventScript_Maniac::
 	lock
 	faceplayer
 	goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone
@@ -47,23 +47,23 @@ LilycoveCity_PokemonCenter_1F_EventScript_Maniac:: @ 821C5FF
 	release
 	end
 
-LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone:: @ 821C614
+LilycoveCity_PokemonCenter_1F_EventScript_ManiacBadTeamGone::
 	msgbox LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon: @ 821C61E
+LilycoveCity_PokemonCenter_1F_Text_HowManyKindsOfPokemon:
 	.string "I wonder how many kinds of POKéMON\n"
 	.string "there are in the world.\p"
 	.string "It'd be great to cross seas and\n"
 	.string "trade POKéMON with people far away.$"
 
-LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels: @ 821C69D
+LilycoveCity_PokemonCenter_1F_Text_HeardAboutRottenScoundrels:
 	.string "I've been hearing about some rotten\n"
 	.string "scoundrels who steal POKéMON and rip\l"
 	.string "off METEORITES.$"
 
-LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels: @ 821C6F6
+LilycoveCity_PokemonCenter_1F_Text_HaventSeenRottenScoundrels:
 	.string "Those rotten scoundrels who steal\n"
 	.string "POKéMON and rip off METEORITES…\p"
 	.string "I haven't seen them around recently.$"
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
index 965580da5..b5321cbe0 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D
+LilycoveCity_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ LilycoveCity_PokemonCenter_2F_MapScripts:: @ 821C75D
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-LilycoveCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821C772
+LilycoveCity_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-LilycoveCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 821C778
+LilycoveCity_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-LilycoveCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 821C77E
+LilycoveCity_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
index 86544d3e9..211073c58 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -7,18 +7,18 @@
 .set LOCALID_WOMAN, 7
 .set LOCALID_EXPERT_F, 8
 
-LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 821C785
+LilycoveCity_PokemonTrainerFanClub_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, LilycoveCity_PokemonTrainerFanClub_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, LilycoveCity_PokemonTrainerFanClub_OnTransition
 	.byte 0
 
 	@ See field_specials.c for a breakdown of the Fan Club and its variables
 
-LilycoveCity_PokemonTrainerFanClub_OnFrame: @ 821C790
+LilycoveCity_PokemonTrainerFanClub_OnFrame:
 	map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans
 	.2byte 0
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 821C79A
+LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans::
 	lockall
 	applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -39,7 +39,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: @ 821C79A
 	releaseall
 	end
 
-LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer: @ 821C7F5
+LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:
 	delay_8
 	walk_in_place_fastest_down
 	walk_down
@@ -49,7 +49,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer: @ 821C7F5
 	walk_left
 	step_end
 
-LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer: @ 821C7FD
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:
 	walk_fast_left
 	walk_fast_left
 	walk_fast_down
@@ -58,12 +58,12 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer: @ 821C7FD
 	walk_fast_down
 	step_end
 
-LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer: @ 821C804
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer: @ 821C807
+LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:
 	jump_in_place_right
 	walk_fast_up
 	walk_fast_up
@@ -71,7 +71,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer: @ 821C807
 	walk_in_place_fastest_down
 	step_end
 
-LilycoveCity_PokemonTrainerFanClub_OnTransition: @ 821C80D
+LilycoveCity_PokemonTrainerFanClub_OnTransition:
 	call LilycoveCity_PokemonTrainerFanClub_EventScript_HideOrShowInterviewer
 	compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_SetFanMemberPositionsForFirstFanMeeting
@@ -79,7 +79,7 @@ LilycoveCity_PokemonTrainerFanClub_OnTransition: @ 821C80D
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 821C829
+LilycoveCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions::
 	special TryLoseFansFromPlayTime
 	call LilycoveCity_PokemonTrainerFanClub_EventScript_CheckSetUpTVShow
 	setvar VAR_0x8004, FANCLUB_MEMBER1
@@ -116,7 +116,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_UpdateFanMemberPositions:: @ 821C
 	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_HideOrShowInterviewer:: @ 821C8DA
+LilycoveCity_PokemonTrainerFanClub_EventScript_HideOrShowInterviewer::
 	specialvar VAR_RESULT, ShouldHideFanClubInterviewer
 	compare VAR_RESULT, TRUE
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_HideInterviewer
@@ -124,13 +124,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_HideOrShowInterviewer:: @ 821C8DA
 	clearflag FLAG_FAN_CLUB_STRENGTH_SHARED
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_HideInterviewer:: @ 821C8F1
+LilycoveCity_PokemonTrainerFanClub_EventScript_HideInterviewer::
 	setflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER
 	return
 
 @ Set up the fan club TV show, if the player has at least 5 fans in the club
 @ Rather than counting up, 1 is subtracted from the total for each member not a fan of the players
-LilycoveCity_PokemonTrainerFanClub_EventScript_CheckSetUpTVShow:: @ 821C8F5
+LilycoveCity_PokemonTrainerFanClub_EventScript_CheckSetUpTVShow::
 	setvar VAR_0x8005, NUM_TRAINER_FAN_CLUB_MEMBERS
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	specialvar VAR_RESULT, IsFanClubMemberFanOfPlayer
@@ -168,47 +168,47 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_CheckSetUpTVShow:: @ 821C8F5
 	goto_if_ge LilycoveCity_PokemonTrainerFanClub_EventScript_TrySetUpTVShow
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan:: @ 821C9AE
+LilycoveCity_PokemonTrainerFanClub_EventScript_CountNotPlayersFan::
 	subvar VAR_0x8005, 1
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_TrySetUpTVShow:: @ 821C9B4
+LilycoveCity_PokemonTrainerFanClub_EventScript_TrySetUpTVShow::
 	special TryPutTrainerFanClubOnAir
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable:: @ 821C9B8
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember1ToFarTable::
 	setobjectxyperm LOCALID_LASS, 7, 5
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable:: @ 821C9C0
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable::
 	setobjectxyperm LOCALID_POKEFAN_M, 3, 4
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable:: @ 821C9C8
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember3ToFarTable::
 	setobjectxyperm LOCALID_LITTLE_GIRL, 7, 2
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable:: @ 821C9D0
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable::
 	setobjectxyperm LOCALID_NINJA_BOY, 5, 5
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable:: @ 821C9D8
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember5ToFarTable::
 	setobjectxyperm LOCALID_BOY, 5, 2
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable:: @ 821C9E0
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember6ToFarTable::
 	setobjectxyperm LOCALID_MAN, 8, 4
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable:: @ 821C9E8
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember7ToFarTable::
 	setobjectxyperm LOCALID_WOMAN, 3, 3
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable:: @ 821C9F0
+LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable::
 	setobjectxyperm LOCALID_EXPERT_F, 8, 3
 	return
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_SetFanMemberPositionsForFirstFanMeeting:: @ 821C9F8
+LilycoveCity_PokemonTrainerFanClub_EventScript_SetFanMemberPositionsForFirstFanMeeting::
 	call LilycoveCity_PokemonTrainerFanClub_EventScript_CheckSetUpTVShow
 	call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember2ToFarTable
 	call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember4ToFarTable
@@ -217,7 +217,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_SetFanMemberPositionsForFirstFanM
 	call LilycoveCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_Man:: @ 821CA17
+LilycoveCity_PokemonTrainerFanClub_EventScript_Man::
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER6
@@ -234,7 +234,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_Man:: @ 821CA17
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayersFan:: @ 821CA56
+LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayersFan::
 	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyFan
@@ -242,22 +242,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayersFan:: @ 821CA56
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyFan:: @ 821CA70
+LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_OthersDontKnowYoureTheBest, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyNonFan:: @ 821CA7A
+LilycoveCity_PokemonTrainerFanClub_EventScript_ManOnlyNonFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsBestNoOneWantsToListen, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayerNotChampion:: @ 821CA84
+LilycoveCity_PokemonTrainerFanClub_EventScript_ManPlayerNotChampion::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HearingAboutToughNewTrainer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_Lass:: @ 821CA8E
+LilycoveCity_PokemonTrainerFanClub_EventScript_Lass::
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER1
@@ -274,7 +274,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_Lass:: @ 821CA8E
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayersFan:: @ 821CACD
+LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayersFan::
 	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyFan
@@ -282,22 +282,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayersFan:: @ 821CACD
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyFan:: @ 821CAE7
+LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_BrawlyNoImYourFan, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyNonFan:: @ 821CAF1
+LilycoveCity_PokemonTrainerFanClub_EventScript_LassOnlyNonFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_NobodyUnderstandsBrawly, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayerNotChampion:: @ 821CAFB
+LilycoveCity_PokemonTrainerFanClub_EventScript_LassPlayerNotChampion::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_MyFavoriteTrainerIsBrawly, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanM:: @ 821CB05
+LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanM::
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER2
@@ -314,7 +314,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanM:: @ 821CB05
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayersFan:: @ 821CB44
+LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayersFan::
 	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyFan
@@ -322,22 +322,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayersFan:: @ 821CB44
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyFan:: @ 821CB5E
+LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YourFatherNeverGaveUpSoKeepOnBattling, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyNonFan:: @ 821CB68
+LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMOnlyNonFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouAndNormanAreDifferent, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayerNotChampion:: @ 821CB72
+LilycoveCity_PokemonTrainerFanClub_EventScript_PokefanMPlayerNotChampion::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_WeDiscussStrongestTrainers, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 821CB7C
+LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirl::
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER3
@@ -354,7 +354,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirl:: @ 821CB7C
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 821CBBB
+LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan::
 	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan
@@ -362,22 +362,22 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayersFan:: @ 821CBBB
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan:: @ 821CBD5
+LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan:: @ 821CBDF
+LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlOnlyNonFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsReallyCoolItsJustMe, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion:: @ 821CBE9
+LilycoveCity_PokemonTrainerFanClub_EventScript_LittleGirlPlayerNotChampion::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_WishThereWasTrainerLikeThat, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoy:: @ 821CBF3
+LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoy::
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER4
@@ -392,7 +392,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoy:: @ 821CBF3
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyPlayersFan:: @ 821CC27
+LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyPlayersFan::
 	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyFan
@@ -400,17 +400,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyPlayersFan:: @ 821CC27
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyFan:: @ 821CC41
+LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_OnlyOneWhoCheersForYou, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyNonFan:: @ 821CC4B
+LilycoveCity_PokemonTrainerFanClub_EventScript_NinjaBoyOnlyNonFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_NeverGoingToStopBeingTrainersFan, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_Boy:: @ 821CC55
+LilycoveCity_PokemonTrainerFanClub_EventScript_Boy::
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER5
@@ -425,7 +425,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_Boy:: @ 821CC55
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_BoyPlayersFan:: @ 821CC89
+LilycoveCity_PokemonTrainerFanClub_EventScript_BoyPlayersFan::
 	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyFan
@@ -433,17 +433,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_BoyPlayersFan:: @ 821CC89
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyFan:: @ 821CCA3
+LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ImInYourCorner, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyNonFan:: @ 821CCAD
+LilycoveCity_PokemonTrainerFanClub_EventScript_BoyOnlyNonFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YoureMaybeStrongerThanTrainer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_Woman:: @ 821CCB7
+LilycoveCity_PokemonTrainerFanClub_EventScript_Woman::
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER7
@@ -458,7 +458,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_Woman:: @ 821CCB7
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 821CCEB
+LilycoveCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan::
 	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan
@@ -466,17 +466,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_WomanPlayersFan:: @ 821CCEB
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan:: @ 821CD05
+LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouBattleAttractivelyInToughSituation, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan:: @ 821CD0F
+LilycoveCity_PokemonTrainerFanClub_EventScript_WomanOnlyNonFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_NoOneCanKnockYouButTrainerStronger, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertF:: @ 821CD19
+LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertF::
 	lock
 	faceplayer
 	setvar VAR_0x8004, FANCLUB_MEMBER8
@@ -491,7 +491,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertF:: @ 821CD19
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFPlayersFan:: @ 821CD4D
+LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFPlayersFan::
 	specialvar VAR_RESULT, GetNumFansOfPlayerInTrainerFanClub
 	compare VAR_RESULT, 1
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyFan
@@ -499,17 +499,17 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFPlayersFan:: @ 821CD4D
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyFan:: @ 821CD67
+LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyNonFan:: @ 821CD71
+LilycoveCity_PokemonTrainerFanClub_EventScript_ExpertFOnlyNonFan::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YourePowerfulButNotTrueStrength, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer:: @ 821CD7B
+LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer::
 	lock
 	faceplayer
 	goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed
@@ -518,7 +518,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_Interviewer:: @ 821CD7B
 
 @ The interviewer doesnt count as an individual fan club member
 @ Instead they always ask about whoever the Lass would be interested in, if not the player
-LilycoveCity_PokemonTrainerFanClub_EventScript_Interview:: @ 821CD90
+LilycoveCity_PokemonTrainerFanClub_EventScript_Interview::
 	setvar VAR_0x8005, TVSHOW_FAN_CLUB_SPECIAL
 	special InterviewBefore
 	compare VAR_RESULT, TRUE
@@ -538,12 +538,12 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_Interview:: @ 821CD90
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion:: @ 821CDE0
+LilycoveCity_PokemonTrainerFanClub_EventScript_SubmitOpinion::
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThatsWhatYouThink, MSGBOX_DEFAULT
 	goto LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion:: @ 821CDEE
+LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion::
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	special BufferFanClubTrainerName
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer, MSGBOX_YESNO
@@ -553,7 +553,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion:: @ 821CDEE
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion:: @ 821CE15
+LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion::
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	special BufferFanClubTrainerName
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer2, MSGBOX_DEFAULT
@@ -568,7 +568,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_AskForOpinion:: @ 821CE15
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_CancelGiveOpinion
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer:: @ 821CE4D
+LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer::
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	special BufferFanClubTrainerName
 	message LilycoveCity_PokemonTrainerFanClub_Text_HowStrongRateTrainer
@@ -588,7 +588,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer:: @ 821CE4D
 	goto LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer:: @ 821CE9F
+LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer::
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	special BufferFanClubTrainerName
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer2, MSGBOX_YESNO
@@ -598,14 +598,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_CancelRateTrainer:: @ 821CE9F
 	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_RateTrainer
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer:: @ 821CEC6
+LilycoveCity_PokemonTrainerFanClub_EventScript_ForgetTrainer::
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	special BufferFanClubTrainerName
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_YouShouldMeetTrainer, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview:: @ 821CED8
+LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview::
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	special BufferFanClubTrainerName
 	msgbox LilycoveCity_PokemonTrainerFanClub_Text_ThankYouIllShareThisInfo, MSGBOX_DEFAULT
@@ -613,7 +613,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_CompleteInterview:: @ 821CED8
 	release
 	end
 
-LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed:: @ 821CEED
+LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed::
 	setvar VAR_0x8004, FANCLUB_MEMBER1
 	special BufferFanClubTrainerName
 	msgbox LilycoveCity_PokemonTrainerFanClub_HopeYouCatchTVSpecial, MSGBOX_DEFAULT
@@ -621,14 +621,14 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed:: @ 821CEED
 	end
 
 @ Shouldnt be reached
-LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2:: @ 821CEFF
+LilycoveCity_PokemonTrainerFanClub_EventScript_AlreadyInterviewed2::
 	end
 
-LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer: @ 821CF00
+LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer:
 	.string "Oh, wow!\n"
 	.string "It's {PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan: @ 821CF12
+LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan:
 	.string "I've heard the news!\n"
 	.string "You're really strong, aren't you?\p"
 	.string "We always argue about who is the\n"
@@ -644,29 +644,29 @@ LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan: @ 821CF12
 	.string "Remember, I'm cheering for you,\n"
 	.string "{PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YoureOneWeWantToWin: @ 821D094
+LilycoveCity_PokemonTrainerFanClub_Text_YoureOneWeWantToWin:
 	.string "Yo, {PLAYER}!\n"
 	.string "You're the one we want to win!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_OthersDontKnowYoureTheBest: @ 821D0BB
+LilycoveCity_PokemonTrainerFanClub_Text_OthersDontKnowYoureTheBest:
 	.string "The others, they don't know that\n"
 	.string "you're the best of the best!\p"
 	.string "Isn't that right, {PLAYER}?\n"
 	.string "Show them you've got guts!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_TrainersPowerIsOutOfTheOrdinary: @ 821D12A
+LilycoveCity_PokemonTrainerFanClub_Text_TrainersPowerIsOutOfTheOrdinary:
 	.string "I hate to say this, but the TRAINER\n"
 	.string "everybody's talking about is\l"
 	.string "{STR_VAR_1}, no question about it!\p"
 	.string "That TRAINER's power…\n"
 	.string "It's out of the ordinary.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsBestNoOneWantsToListen: @ 821D1B5
+LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsBestNoOneWantsToListen:
 	.string "Darn it… I've been telling people\n"
 	.string "that {STR_VAR_1} is the best now…\p"
 	.string "But no one wants to listen…$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_HearingAboutToughNewTrainer: @ 821D20C
+LilycoveCity_PokemonTrainerFanClub_Text_HearingAboutToughNewTrainer:
 	.string "I've been hearing things about\n"
 	.string "a tough new TRAINER.\p"
 	.string "This TRAINER's supposed to be beating\n"
@@ -674,13 +674,13 @@ LilycoveCity_PokemonTrainerFanClub_Text_HearingAboutToughNewTrainer: @ 821D20C
 	.string "Do you know anything about this\n"
 	.string "new TRAINER?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_ImPullingForYou: @ 821D2A6
+LilycoveCity_PokemonTrainerFanClub_Text_ImPullingForYou:
 	.string "Oh!\n"
 	.string "{PLAYER}!\p"
 	.string "Go for it!\n"
 	.string "I'm pulling for you!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_BrawlyNoImYourFan: @ 821D2CE
+LilycoveCity_PokemonTrainerFanClub_Text_BrawlyNoImYourFan:
 	.string "Sigh…\n"
 	.string "BRAWLY…\p"
 	.string "Oh, no! Wait!\n"
@@ -689,36 +689,36 @@ LilycoveCity_PokemonTrainerFanClub_Text_BrawlyNoImYourFan: @ 821D2CE
 	.string "So make me proud!\n"
 	.string "Go for it!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_ICantHelpLikingBrawly: @ 821D347
+LilycoveCity_PokemonTrainerFanClub_Text_ICantHelpLikingBrawly:
 	.string "I can't help it, I can only get to\n"
 	.string "like BRAWLY…$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_NobodyUnderstandsBrawly: @ 821D377
+LilycoveCity_PokemonTrainerFanClub_Text_NobodyUnderstandsBrawly:
 	.string "Nobody understands the charm of\n"
 	.string "BRAWLY…\p"
 	.string "I don't care!\p"
 	.string "Even if I'm the only one, I'm going\n"
 	.string "to keep cheering for BRAWLY!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_MyFavoriteTrainerIsBrawly: @ 821D3EE
+LilycoveCity_PokemonTrainerFanClub_Text_MyFavoriteTrainerIsBrawly:
 	.string "Whatever anyone says, my favorite\n"
 	.string "TRAINER is DEWFORD's GYM LEADER\l"
 	.string "BRAWLY!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YouveSurpassedYourFather: @ 821D438
+LilycoveCity_PokemonTrainerFanClub_Text_YouveSurpassedYourFather:
 	.string "You've surpassed your own father in\n"
 	.string "every regard!\p"
 	.string "I'm telling you, so there's no question\n"
 	.string "about it at all!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YourFatherNeverGaveUpSoKeepOnBattling: @ 821D4A3
+LilycoveCity_PokemonTrainerFanClub_Text_YourFatherNeverGaveUpSoKeepOnBattling:
 	.string "Even when things turned bleak,\n"
 	.string "your father never gave up.\p"
 	.string "This I know to be true.\p"
 	.string "You never give up even if you lose!\n"
 	.string "So keep on battling!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_LongWayToGoComparedToNorman: @ 821D52E
+LilycoveCity_PokemonTrainerFanClub_Text_LongWayToGoComparedToNorman:
 	.string "NORMAN battled with more power,\n"
 	.string "charisma, and showmanship than you.\p"
 	.string "Even though people may say that\n"
@@ -726,7 +726,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_LongWayToGoComparedToNorman: @ 821D52E
 	.string "You've still got a long way to go\n"
 	.string "compared to your father.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YouAndNormanAreDifferent: @ 821D5DC
+LilycoveCity_PokemonTrainerFanClub_Text_YouAndNormanAreDifferent:
 	.string "You're beginning to get the same\n"
 	.string "air of awe NORMAN exudes.\p"
 	.string "But there's something conclusively\n"
@@ -734,7 +734,7 @@ LilycoveCity_PokemonTrainerFanClub_Text_YouAndNormanAreDifferent: @ 821D5DC
 	.string "I can't tell you what that is.\n"
 	.string "You'll have to find it yourself.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_WeDiscussStrongestTrainers: @ 821D69C
+LilycoveCity_PokemonTrainerFanClub_Text_WeDiscussStrongestTrainers:
 	.string "Everyone here, we're all huge fans\n"
 	.string "of POKéMON battles.\p"
 	.string "We discuss who we consider to be\n"
@@ -742,12 +742,12 @@ LilycoveCity_PokemonTrainerFanClub_Text_WeDiscussStrongestTrainers: @ 821D69C
 	.string "If you were to become famous,\n"
 	.string "we might even become your fans!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_OhWoweeItsPlayer: @ 821D751
+LilycoveCity_PokemonTrainerFanClub_Text_OhWoweeItsPlayer:
 	.string "Oh, woweee! It's {PLAYER}!\n"
 	.string "For real, too!\p"
 	.string "Please, shake my hand, shake my hand!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou: @ 821D79B
+LilycoveCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou:
 	.string "I'll always cheer for you, {PLAYER}!\n"
 	.string "Always, always!\p"
 	.string "I don't want to see you lose ever,\n"
@@ -755,60 +755,60 @@ LilycoveCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou: @ 821D79B
 	.string "Because I know you're really,\n"
 	.string "really strong, {PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_EveryoneThinksTrainerIsCool: @ 821D822
+LilycoveCity_PokemonTrainerFanClub_Text_EveryoneThinksTrainerIsCool:
 	.string "{STR_VAR_1} is really cool…\p"
 	.string "Everyone thinks so, right, right?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsReallyCoolItsJustMe: @ 821D857
+LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsReallyCoolItsJustMe:
 	.string "{STR_VAR_1} really is cool, don't\n"
 	.string "you think so?\p"
 	.string "Even if it's just me, I'm going to keep\n"
 	.string "cheering my favorite TRAINER.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_WishThereWasTrainerLikeThat: @ 821D8C4
+LilycoveCity_PokemonTrainerFanClub_Text_WishThereWasTrainerLikeThat:
 	.string "My favorite TRAINER is…\p"
 	.string "Cool…\p"
 	.string "Strong…\p"
 	.string "And really nice…\p"
 	.string "I wish there was a TRAINER like that…$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_WantToBeStrongLikeYou: @ 821D921
+LilycoveCity_PokemonTrainerFanClub_Text_WantToBeStrongLikeYou:
 	.string "Whoa! It's {PLAYER}!\n"
 	.string "Wicked!\p"
 	.string "When I grow up, I want to be strong\n"
 	.string "like you, {PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_OnlyOneWhoCheersForYou: @ 821D96A
+LilycoveCity_PokemonTrainerFanClub_Text_OnlyOneWhoCheersForYou:
 	.string "Even if I'm the only one…\p"
 	.string "You'll always be the only one\n"
 	.string "I cheer for, {PLAYER}!\p"
 	.string "Because I believe in you, {PLAYER}!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsWickedlyCool: @ 821D9D1
+LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsWickedlyCool:
 	.string "{STR_VAR_1} is so wickedly cool…\n"
 	.string "I want to shake hands with my hero.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_NeverGoingToStopBeingTrainersFan: @ 821DA0D
+LilycoveCity_PokemonTrainerFanClub_Text_NeverGoingToStopBeingTrainersFan:
 	.string "Even if I'm the only one…\p"
 	.string "I'm never going to stop being\n"
 	.string "{STR_VAR_1}'s fan!\p"
 	.string "Because I've heard, {STR_VAR_1}\n"
 	.string "never loses!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YoureAmazingAfterAll: @ 821DA73
+LilycoveCity_PokemonTrainerFanClub_Text_YoureAmazingAfterAll:
 	.string "{PLAYER}!\n"
 	.string "You are amazing after all!\p"
 	.string "Ever since I set eyes on you,\n"
 	.string "I knew that you were great.\p"
 	.string "It looks like my eyes didn't deceive me.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_ImInYourCorner: @ 821DAF5
+LilycoveCity_PokemonTrainerFanClub_Text_ImInYourCorner:
 	.string "Who cares about the others.\n"
 	.string "I'm in your corner!\p"
 	.string "You don't need to worry. Just get\n"
 	.string "out there and battle like always.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_ThinkTrainerIsNumberOne: @ 821DB69
+LilycoveCity_PokemonTrainerFanClub_Text_ThinkTrainerIsNumberOne:
 	.string "You're a pretty decent TRAINER,\n"
 	.string "I think.\p"
 	.string "But I also think that {STR_VAR_1}\n"
@@ -816,32 +816,32 @@ LilycoveCity_PokemonTrainerFanClub_Text_ThinkTrainerIsNumberOne: @ 821DB69
 	.string "That's just my opinion.\n"
 	.string "Don't worry about it too much.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YoureMaybeStrongerThanTrainer: @ 821DBFB
+LilycoveCity_PokemonTrainerFanClub_Text_YoureMaybeStrongerThanTrainer:
 	.string "Wow, you really are strong.\n"
 	.string "Maybe even stronger than {STR_VAR_1}.\p"
 	.string "But {STR_VAR_1} needs me.\p"
 	.string "If I don't cheer for {STR_VAR_1},\n"
 	.string "who will?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YouChangedMyMind: @ 821DC68
+LilycoveCity_PokemonTrainerFanClub_Text_YouChangedMyMind:
 	.string "You've changed my mind!\n"
 	.string "You are strong, aren't you?\p"
 	.string "I'd like you to tell me how you managed\n"
 	.string "to get so strong!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YouBattleAttractivelyInToughSituation: @ 821DCD6
+LilycoveCity_PokemonTrainerFanClub_Text_YouBattleAttractivelyInToughSituation:
 	.string "The tougher the situation, the more\n"
 	.string "attractively you battle.\p"
 	.string "I can't wait for your next battle!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsStandout: @ 821DD36
+LilycoveCity_PokemonTrainerFanClub_Text_TrainerIsStandout:
 	.string "Among the recently hot TRAINERS,\n"
 	.string "{STR_VAR_1} is the standout.\p"
 	.string "That toughness, it's simply not normal.\p"
 	.string "You're doing okay, but you're not in\n"
 	.string "the same class as {STR_VAR_1}.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_NoOneCanKnockYouButTrainerStronger: @ 821DDCE
+LilycoveCity_PokemonTrainerFanClub_Text_NoOneCanKnockYouButTrainerStronger:
 	.string "You are really popular…\p"
 	.string "You're strong, and you're caring to\n"
 	.string "POKéMON. No one can knock you.\p"
@@ -849,23 +849,23 @@ LilycoveCity_PokemonTrainerFanClub_Text_NoOneCanKnockYouButTrainerStronger: @ 82
 	.string "{STR_VAR_1} is definitely stronger!\n"
 	.string "I'm positive!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive: @ 821DE72
+LilycoveCity_PokemonTrainerFanClub_Text_YouImpressive:
 	.string "You…\p"
 	.string "Impressive!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth: @ 821DE83
+LilycoveCity_PokemonTrainerFanClub_Text_OnlyIRecognizeYourTrueWorth:
 	.string "Your true worth, it is fine if only\n"
 	.string "I recognized it.\p"
 	.string "The others I doubt will understand\n"
 	.string "the hidden power that beats within.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_HaventRealizedPotential: @ 821DEFF
+LilycoveCity_PokemonTrainerFanClub_Text_HaventRealizedPotential:
 	.string "Yes, I see strength in your eyes.\p"
 	.string "But!\p"
 	.string "You still haven't realized your\n"
 	.string "potential.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YourePowerfulButNotTrueStrength: @ 821DF51
+LilycoveCity_PokemonTrainerFanClub_Text_YourePowerfulButNotTrueStrength:
 	.string "It is true that you are tremendously\n"
 	.string "powerful.\p"
 	.string "But!\n"
diff --git a/data/maps/LilycoveCity_UnusedMart/scripts.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc
index fa0405f68..5b98e21cd 100644
--- a/data/maps/LilycoveCity_UnusedMart/scripts.inc
+++ b/data/maps/LilycoveCity_UnusedMart/scripts.inc
@@ -1,3 +1,3 @@
-LilycoveCity_UnusedMart_MapScripts:: @ 821C784
+LilycoveCity_UnusedMart_MapScripts::
 	.byte 0
 
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index ba5832309..2d74a2618 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -3,7 +3,7 @@
 .set LOCALID_RIVAL, 7
 .set LOCALID_BIRCH, 8
 
-LittlerootTown_MapScripts:: @ 81E7DCB
+LittlerootTown_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_OnWarp
@@ -39,7 +39,7 @@ LittlerootTown_MapScripts:: @ 81E7DCB
 	@ 4: Received Pokedex
 
 
-LittlerootTown_OnTransition: @ 81E7DDB
+LittlerootTown_OnTransition:
 	setflag FLAG_VISITED_LITTLEROOT_TOWN
 	call Common_EventScript_SetupRivalGfxId
 	compare VAR_LITTLEROOT_INTRO_STATE, 2
@@ -61,45 +61,45 @@ LittlerootTown_OnTransition: @ 81E7DDB
 	call_if_eq LittlerootTown_EventScript_LeftLabAfterDexUpgrade
 	end
 
-LittlerootTown_EventScript_LeftLabAfterDexUpgrade:: @ 81E7E45
+LittlerootTown_EventScript_LeftLabAfterDexUpgrade::
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
 	return
 
-LittlerootTown_EventScript_HideMapNamePopup:: @ 81E7E4B
+LittlerootTown_EventScript_HideMapNamePopup::
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-LittlerootTown_EventScript_SetRivalLeftForRoute103:: @ 81E7E4F
+LittlerootTown_EventScript_SetRivalLeftForRoute103::
 	setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
 	return
 
-LittlerootTown_EventScript_MoveRivalFromOldale:: @ 81E7E53
+LittlerootTown_EventScript_MoveRivalFromOldale::
 	setvar VAR_OLDALE_RIVAL_STATE, 2
 	setflag FLAG_HIDE_OLDALE_TOWN_RIVAL
 	return
 
-LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent:: @ 81E7E5C
+LittlerootTown_EventScript_SetExitedHouseAfterLatiSSTicketEvent::
 	setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 5
 	setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 5
 	return
 
-LittlerootTown_EventScript_MoveMomToMaysDoor:: @ 81E7E67
+LittlerootTown_EventScript_MoveMomToMaysDoor::
 	setobjectxyperm LOCALID_MOM, 14, 8
 	return
 
-LittlerootTown_EventScript_SetTwinPos:: @ 81E7E6F
+LittlerootTown_EventScript_SetTwinPos::
 	compare VAR_LITTLEROOT_TOWN_STATE, 0
 	goto_if_eq LittlerootTown_EventScript_SetTwinGuardingRoutePos
 	setobjectxyperm LOCALID_TWIN, 10, 1
 	setobjectmovementtype LOCALID_TWIN, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_EventScript_SetTwinGuardingRoutePos:: @ 81E7E86
+LittlerootTown_EventScript_SetTwinGuardingRoutePos::
 	setobjectxyperm LOCALID_TWIN, 7, 2
 	setobjectmovementtype LOCALID_TWIN, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos:: @ 81E7E92
+LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos::
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
 	setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_DOWN
 	checkplayergender
@@ -109,21 +109,21 @@ LittlerootTown_EventScript_SetMomStandingInFrontOfDoorPos:: @ 81E7E92
 	call_if_eq LittlerootTown_EventScript_SetMomInFrontOfDoorFemale
 	return
 
-LittlerootTown_EventScript_SetMomInFrontOfDoorMale:: @ 81E7EB1
+LittlerootTown_EventScript_SetMomInFrontOfDoorMale::
 	setobjectxyperm LOCALID_MOM, 5, 9
 	return
 
-LittlerootTown_EventScript_SetMomInFrontOfDoorFemale:: @ 81E7EB9
+LittlerootTown_EventScript_SetMomInFrontOfDoorFemale::
 	setobjectxyperm LOCALID_MOM, 14, 9
 	return
 
-LittlerootTown_OnFrame: @ 81E7EC1
+LittlerootTown_OnFrame:
 	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_StepOffTruckMale
 	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_StepOffTruckFemale
 	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_BeginDexUpgradeScene
 	.2byte 0
 
-LittlerootTown_EventScript_StepOffTruckMale:: @ 81E7EDB
+LittlerootTown_EventScript_StepOffTruckMale::
 	lockall
 	setvar VAR_0x8004, 5
 	setvar VAR_0x8005, 8
@@ -134,7 +134,7 @@ LittlerootTown_EventScript_StepOffTruckMale:: @ 81E7EDB
 	releaseall
 	end
 
-LittlerootTown_EventScript_StepOffTruckFemale:: @ 81E7EF9
+LittlerootTown_EventScript_StepOffTruckFemale::
 	lockall
 	setvar VAR_0x8004, 14
 	setvar VAR_0x8005, 8
@@ -145,7 +145,7 @@ LittlerootTown_EventScript_StepOffTruckFemale:: @ 81E7EF9
 	releaseall
 	end
 
-LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17
+LittlerootTown_EventScript_GoInsideWithMom::
 	delay 15
 	playse SE_LEDGE
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_Movement_PlayerStepOffTruck
@@ -179,46 +179,46 @@ LittlerootTown_EventScript_GoInsideWithMom:: @ 81E7F17
 	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-LittlerootTown_Movement_MomExitHouse: @ 81E7F98
+LittlerootTown_Movement_MomExitHouse:
 	walk_down
 	step_end
 
-LittlerootTown_Movement_MomApproachPlayerAtTruck: @ 81E7F9A
+LittlerootTown_Movement_MomApproachPlayerAtTruck:
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_Movement_MomApproachDoor: @ 81E7F9D
+LittlerootTown_Movement_MomApproachDoor:
 	delay_16
 	delay_8
 	walk_up
 	step_end
 
-LittlerootTown_Movement_MomEnterHouse: @ 81E7FA1
+LittlerootTown_Movement_MomEnterHouse:
 	walk_up
 	set_invisible
 	step_end
 
-LittlerootTown_Movement_PlayerApproachDoor: @ 81E7FA4
+LittlerootTown_Movement_PlayerApproachDoor:
 	delay_16
 	delay_8
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_PlayerEnterHouse: @ 81E7FA9
+LittlerootTown_Movement_PlayerEnterHouse:
 	walk_up
 	walk_up
 	step_end
 
-LittlerootTown_Movement_PlayerStepOffTruck: @ 81E7FAC
+LittlerootTown_Movement_PlayerStepOffTruck:
 	jump_right
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-LittlerootTown_EventScript_BeginDexUpgradeScene:: @ 81E7FB1
+LittlerootTown_EventScript_BeginDexUpgradeScene::
 	lockall
 	playse SE_PIN
 	applymovement LOCALID_BIRCH, Common_Movement_ExclamationMark
@@ -235,11 +235,11 @@ LittlerootTown_EventScript_BeginDexUpgradeScene:: @ 81E7FB1
 	releaseall
 	end
 
-LittlerootTown_OnWarp: @ 81E7FE2
+LittlerootTown_OnWarp:
 	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade
 	.2byte 0
 
-LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade:: @ 81E7FEC
+LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade::
 	addobject LOCALID_BIRCH
 	addobject LOCALID_RIVAL
 	checkplayergender
@@ -248,25 +248,25 @@ LittlerootTown_EventScript_SetRivalBirchPosForDexUpgrade:: @ 81E7FEC
 	goto LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale
 	end
 
-LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeMale:: @ 81E8004
+LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeMale::
 	setobjectxy LOCALID_RIVAL, 6, 10
 	setobjectxy LOCALID_BIRCH, 5, 10
 	end
 
-LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale:: @ 81E8013
+LittlerootTown_EventScript_SetRivalBirchPosForDexUpgradeFemale::
 	setobjectxy LOCALID_RIVAL, 13, 10
 	setobjectxy LOCALID_BIRCH, 14, 10
 	end
 
-LittlerootTown_EventScript_FatMan:: @ 81E8022
+LittlerootTown_EventScript_FatMan::
 	msgbox LittlerootTown_Text_CanUsePCToStoreItems, MSGBOX_NPC
 	end
 
-LittlerootTown_EventScript_Boy:: @ 81E802B
+LittlerootTown_EventScript_Boy::
 	msgbox LittlerootTown_Text_BirchSpendsDaysInLab, MSGBOX_NPC
 	end
 
-LittlerootTown_EventScript_Twin:: @ 81E8034
+LittlerootTown_EventScript_Twin::
 	lock
 	faceplayer
 	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_GoodLuck
@@ -277,7 +277,7 @@ LittlerootTown_EventScript_Twin:: @ 81E8034
 	release
 	end
 
-LittlerootTown_EventScript_GoSaveBirch:: @ 81E805D
+LittlerootTown_EventScript_GoSaveBirch::
 	special GetPlayerBigGuyGirlString
 	msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT
 	closemessage
@@ -287,18 +287,18 @@ LittlerootTown_EventScript_GoSaveBirch:: @ 81E805D
 	release
 	end
 
-LittlerootTown_EventScript_YouSavedBirch:: @ 81E807A
+LittlerootTown_EventScript_YouSavedBirch::
 	special GetPlayerBigGuyGirlString
 	msgbox LittlerootTown_Text_YouSavedBirch, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_EventScript_GoodLuck:: @ 81E8087
+LittlerootTown_EventScript_GoodLuck::
 	msgbox LittlerootTown_Text_GoodLuckCatchingPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_EventScript_NeedPokemonTriggerLeft:: @ 81E8091
+LittlerootTown_EventScript_NeedPokemonTriggerLeft::
 	lockall
 	applymovement LOCALID_TWIN, LittlerootTown_Movement_TwinApproachPlayerLeft
 	waitmovement 0
@@ -308,7 +308,7 @@ LittlerootTown_EventScript_NeedPokemonTriggerLeft:: @ 81E8091
 	releaseall
 	end
 
-LittlerootTown_EventScript_DangerousWithoutPokemon:: @ 81E80AD
+LittlerootTown_EventScript_DangerousWithoutPokemon::
 	msgbox LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_TWIN, LittlerootTown_Movement_TwinPushPlayerFromRoute
@@ -318,7 +318,7 @@ LittlerootTown_EventScript_DangerousWithoutPokemon:: @ 81E80AD
 	closemessage
 	return
 
-LittlerootTown_Movement_TwinApproachPlayerLeft: @ 81E80D1
+LittlerootTown_Movement_TwinApproachPlayerLeft:
 	face_right
 	delay_8
 	disable_jump_landing_ground_effect
@@ -334,11 +334,11 @@ LittlerootTown_Movement_TwinApproachPlayerLeft: @ 81E80D1
 	face_down
 	step_end
 
-LittlerootTown_Movement_TwinPushPlayerFromRoute: @ 81E80DF
+LittlerootTown_Movement_TwinPushPlayerFromRoute:
 	walk_down
 	step_end
 
-LittlerootTown_Movement_TwinReturnLeft: @ 81E80E1
+LittlerootTown_Movement_TwinReturnLeft:
 	walk_right
 	walk_down
 	walk_down
@@ -350,13 +350,13 @@ LittlerootTown_Movement_TwinReturnLeft: @ 81E80E1
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_Movement_PushPlayerBackFromRoute: @ 81E80EB
+LittlerootTown_Movement_PushPlayerBackFromRoute:
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-LittlerootTown_EventScript_NeedPokemonTriggerRight:: @ 81E80EF
+LittlerootTown_EventScript_NeedPokemonTriggerRight::
 	lockall
 	applymovement LOCALID_TWIN, LittlerootTown_Movement_TwinApproachPlayerRight
 	waitmovement 0
@@ -366,7 +366,7 @@ LittlerootTown_EventScript_NeedPokemonTriggerRight:: @ 81E80EF
 	releaseall
 	end
 
-LittlerootTown_Movement_TwinApproachPlayerRight: @ 81E810B
+LittlerootTown_Movement_TwinApproachPlayerRight:
 	face_right
 	delay_8
 	disable_jump_landing_ground_effect
@@ -381,7 +381,7 @@ LittlerootTown_Movement_TwinApproachPlayerRight: @ 81E810B
 	face_down
 	step_end
 
-LittlerootTown_Movement_TwinReturnRight: @ 81E8118
+LittlerootTown_Movement_TwinReturnRight:
 	walk_left
 	walk_down
 	walk_left
@@ -390,7 +390,7 @@ LittlerootTown_Movement_TwinReturnRight: @ 81E8118
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_EventScript_GoSaveBirchTrigger:: @ 81E811F
+LittlerootTown_EventScript_GoSaveBirchTrigger::
 	lockall
 	applymovement LOCALID_TWIN, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
@@ -405,15 +405,15 @@ LittlerootTown_EventScript_GoSaveBirchTrigger:: @ 81E811F
 	releaseall
 	end
 
-LittlerootTown_EventScript_TownSign:: @ 81E8151
+LittlerootTown_EventScript_TownSign::
 	msgbox LittlerootTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-LittlerootTown_EventScript_BirchsLabSign:: @ 81E815A
+LittlerootTown_EventScript_BirchsLabSign::
 	msgbox LittlerootTown_Text_ProfBirchsLab, MSGBOX_SIGN
 	end
 
-LittlerootTown_EventScript_BrendansHouseSign:: @ 81E8163
+LittlerootTown_EventScript_BrendansHouseSign::
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -423,15 +423,15 @@ LittlerootTown_EventScript_BrendansHouseSign:: @ 81E8163
 	releaseall
 	end
 
-LittlerootTown_EventScript_PlayersHouseSignMale:: @ 81E817D
+LittlerootTown_EventScript_PlayersHouseSignMale::
 	msgbox LittlerootTown_Text_PlayersHouse, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_EventScript_BirchsHouseSignFemale:: @ 81E8186
+LittlerootTown_EventScript_BirchsHouseSignFemale::
 	msgbox LittlerootTown_Text_ProfBirchsHouse, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_EventScript_MaysHouseSign:: @ 81E818F
+LittlerootTown_EventScript_MaysHouseSign::
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -441,53 +441,53 @@ LittlerootTown_EventScript_MaysHouseSign:: @ 81E818F
 	releaseall
 	end
 
-LittlerootTown_EventScript_BirchsHouseSignMale:: @ 81E81A9
+LittlerootTown_EventScript_BirchsHouseSignMale::
 	msgbox LittlerootTown_Text_ProfBirchsHouse, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_EventScript_PlayersHouseSignFemale:: @ 81E81B2
+LittlerootTown_EventScript_PlayersHouseSignFemale::
 	msgbox LittlerootTown_Text_PlayersHouse, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_EventScript_GiveRunningShoesTrigger0:: @ 81E81BB
+LittlerootTown_EventScript_GiveRunningShoesTrigger0::
 	lockall
 	setvar VAR_0x8008, 0
 	setobjectxy LOCALID_MOM, 10, 9
 	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_GiveRunningShoesTrigger1:: @ 81E81CE
+LittlerootTown_EventScript_GiveRunningShoesTrigger1::
 	lockall
 	setvar VAR_0x8008, 1
 	setobjectxy LOCALID_MOM, 11, 9
 	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_GiveRunningShoesTrigger2:: @ 81E81E1
+LittlerootTown_EventScript_GiveRunningShoesTrigger2::
 	lockall
 	setvar VAR_0x8008, 2
 	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_GiveRunningShoesTrigger3:: @ 81E81ED
+LittlerootTown_EventScript_GiveRunningShoesTrigger3::
 	lockall
 	setvar VAR_0x8008, 3
 	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_GiveRunningShoesTrigger4:: @ 81E81F9
+LittlerootTown_EventScript_GiveRunningShoesTrigger4::
 	lockall
 	setvar VAR_0x8008, 4
 	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_GiveRunningShoesTrigger5:: @ 81E8205
+LittlerootTown_EventScript_GiveRunningShoesTrigger5::
 	lockall
 	setvar VAR_0x8008, 5
 	goto LittlerootTown_EventScript_GiveRunningShoesTrigger
 	end
 
-LittlerootTown_EventScript_GiveRunningShoesTrigger:: @ 81E8211
+LittlerootTown_EventScript_GiveRunningShoesTrigger::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq LittlerootTown_EventScript_MomNoticePlayerMale
@@ -514,27 +514,27 @@ LittlerootTown_EventScript_GiveRunningShoesTrigger:: @ 81E8211
 	goto LittlerootTown_EventScript_SetReceivedRunningShoes
 	end
 
-LittlerootTown_EventScript_SetHomeDoorCoordsMale:: @ 81E8281
+LittlerootTown_EventScript_SetHomeDoorCoordsMale::
 	setvar VAR_0x8009, 5
 	setvar VAR_0x800A, 8
 	return
 
-LittlerootTown_EventScript_SetHomeDoorCoordsFemale:: @ 81E828C
+LittlerootTown_EventScript_SetHomeDoorCoordsFemale::
 	setvar VAR_0x8009, 14
 	setvar VAR_0x800A, 8
 	return
 
-LittlerootTown_EventScript_MomNoticePlayerMale:: @ 81E8297
+LittlerootTown_EventScript_MomNoticePlayerMale::
 	applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomNoticePlayerFemale:: @ 81E82A2
+LittlerootTown_EventScript_MomNoticePlayerFemale::
 	applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomApproachPlayerMale:: @ 81E82AD
+LittlerootTown_EventScript_MomApproachPlayerMale::
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_EventScript_MomApproachPlayer0
 	compare VAR_0x8008, 1
@@ -549,7 +549,7 @@ LittlerootTown_EventScript_MomApproachPlayerMale:: @ 81E82AD
 	call_if_eq LittlerootTown_EventScript_MomApproachPlayerMale5
 	return
 
-LittlerootTown_EventScript_MomApproachPlayerFemale:: @ 81E82F0
+LittlerootTown_EventScript_MomApproachPlayerFemale::
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_EventScript_MomApproachPlayer0
 	compare VAR_0x8008, 1
@@ -564,77 +564,77 @@ LittlerootTown_EventScript_MomApproachPlayerFemale:: @ 81E82F0
 	call_if_eq LittlerootTown_EventScript_MomApproachPlayerFemale5
 	return
 
-LittlerootTown_EventScript_MomApproachPlayer0:: @ 81E8333
+LittlerootTown_EventScript_MomApproachPlayer0::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayer0
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomApproachPlayer1:: @ 81E8348
+LittlerootTown_EventScript_MomApproachPlayer1::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayer1
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomApproachPlayerMale2:: @ 81E835D
+LittlerootTown_EventScript_MomApproachPlayerMale2::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale2
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomApproachPlayerMale3:: @ 81E8372
+LittlerootTown_EventScript_MomApproachPlayerMale3::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale3
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomApproachPlayerMale4:: @ 81E8387
+LittlerootTown_EventScript_MomApproachPlayerMale4::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale4
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomApproachPlayerMale5:: @ 81E839C
+LittlerootTown_EventScript_MomApproachPlayerMale5::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale5
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomApproachPlayerFemale2:: @ 81E83B1
+LittlerootTown_EventScript_MomApproachPlayerFemale2::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale2
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomApproachPlayerFemale3:: @ 81E83C6
+LittlerootTown_EventScript_MomApproachPlayerFemale3::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale3
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomApproachPlayerFemale4:: @ 81E83DB
+LittlerootTown_EventScript_MomApproachPlayerFemale4::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale4
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomApproachPlayerFemale5:: @ 81E83F0
+LittlerootTown_EventScript_MomApproachPlayerFemale5::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale5
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomReturnHomeMale:: @ 81E8405
+LittlerootTown_EventScript_MomReturnHomeMale::
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_EventScript_MomReturnHome0
 	compare VAR_0x8008, 1
@@ -649,7 +649,7 @@ LittlerootTown_EventScript_MomReturnHomeMale:: @ 81E8405
 	call_if_eq LittlerootTown_EventScript_MomReturnHomeMale5
 	return
 
-LittlerootTown_EventScript_MomReturnHomeFemale:: @ 81E8448
+LittlerootTown_EventScript_MomReturnHomeFemale::
 	compare VAR_0x8008, 0
 	call_if_eq LittlerootTown_EventScript_MomReturnHome0
 	compare VAR_0x8008, 1
@@ -664,17 +664,17 @@ LittlerootTown_EventScript_MomReturnHomeFemale:: @ 81E8448
 	call_if_eq LittlerootTown_EventScript_MomReturnHomeFemale5
 	return
 
-LittlerootTown_EventScript_MomReturnHome0:: @ 81E848B
+LittlerootTown_EventScript_MomReturnHome0::
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomReturnHome0
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomReturnHome1:: @ 81E8496
+LittlerootTown_EventScript_MomReturnHome1::
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomReturnHome1
 	waitmovement 0
 	return
 
-LittlerootTown_EventScript_MomReturnHomeMale2:: @ 81E84A1
+LittlerootTown_EventScript_MomReturnHomeMale2::
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomReturnHomeMale2
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
@@ -686,7 +686,7 @@ LittlerootTown_EventScript_MomReturnHomeMale2:: @ 81E84A1
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_MomReturnHomeMale3:: @ 81E84C7
+LittlerootTown_EventScript_MomReturnHomeMale3::
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomReturnHomeMale3
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
@@ -698,7 +698,7 @@ LittlerootTown_EventScript_MomReturnHomeMale3:: @ 81E84C7
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_MomReturnHomeMale4:: @ 81E84ED
+LittlerootTown_EventScript_MomReturnHomeMale4::
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomReturnHomeMale4
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
@@ -710,7 +710,7 @@ LittlerootTown_EventScript_MomReturnHomeMale4:: @ 81E84ED
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_MomReturnHomeMale5:: @ 81E8513
+LittlerootTown_EventScript_MomReturnHomeMale5::
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomReturnHomeMale5
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
@@ -722,7 +722,7 @@ LittlerootTown_EventScript_MomReturnHomeMale5:: @ 81E8513
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_MomReturnHomeFemale2:: @ 81E8539
+LittlerootTown_EventScript_MomReturnHomeFemale2::
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomReturnHomeFemale2
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
@@ -734,7 +734,7 @@ LittlerootTown_EventScript_MomReturnHomeFemale2:: @ 81E8539
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_MomReturnHomeFemale3:: @ 81E855F
+LittlerootTown_EventScript_MomReturnHomeFemale3::
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomReturnHomeFemale3
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
@@ -746,7 +746,7 @@ LittlerootTown_EventScript_MomReturnHomeFemale3:: @ 81E855F
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_MomReturnHomeFemale4:: @ 81E8585
+LittlerootTown_EventScript_MomReturnHomeFemale4::
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomReturnHomeFemale4
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
@@ -758,7 +758,7 @@ LittlerootTown_EventScript_MomReturnHomeFemale4:: @ 81E8585
 	waitdooranim
 	return
 
-LittlerootTown_EventScript_MomReturnHomeFemale5:: @ 81E85AB
+LittlerootTown_EventScript_MomReturnHomeFemale5::
 	applymovement LOCALID_MOM, LittlerootTown_Movement_MomReturnHomeFemale5
 	waitmovement 0
 	opendoor VAR_0x8009, VAR_0x800A
@@ -770,7 +770,7 @@ LittlerootTown_EventScript_MomReturnHomeFemale5:: @ 81E85AB
 	waitdooranim
 	return
 
-LittlerootTown_Movement_MomApproachPlayer0: @ 81E85D1
+LittlerootTown_Movement_MomApproachPlayer0:
 	walk_up
 	walk_up
 	walk_up
@@ -779,7 +779,7 @@ LittlerootTown_Movement_MomApproachPlayer0: @ 81E85D1
 	walk_up
 	step_end
 
-LittlerootTown_Movement_MomApproachPlayer1: @ 81E85D8
+LittlerootTown_Movement_MomApproachPlayer1:
 	walk_up
 	walk_up
 	walk_up
@@ -788,14 +788,14 @@ LittlerootTown_Movement_MomApproachPlayer1: @ 81E85D8
 	walk_up
 	step_end
 
-LittlerootTown_Movement_MomApproachPlayerMale2: @ 81E85DF
+LittlerootTown_Movement_MomApproachPlayerMale2:
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-LittlerootTown_Movement_MomApproachPlayerMale3: @ 81E85E4
+LittlerootTown_Movement_MomApproachPlayerMale3:
 	walk_right
 	walk_right
 	walk_right
@@ -803,29 +803,29 @@ LittlerootTown_Movement_MomApproachPlayerMale3: @ 81E85E4
 	walk_right
 	step_end
 
-LittlerootTown_Movement_MomApproachPlayerMale4: @ 81E85EA
+LittlerootTown_Movement_MomApproachPlayerMale4:
 	walk_right
 	walk_right
 	step_end
 
-LittlerootTown_Movement_MomApproachPlayerMale5: @ 81E85ED
+LittlerootTown_Movement_MomApproachPlayerMale5:
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-LittlerootTown_Movement_MomApproachPlayerFemale2: @ 81E85F1
+LittlerootTown_Movement_MomApproachPlayerFemale2:
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-LittlerootTown_Movement_MomApproachPlayerFemale3: @ 81E85F5
+LittlerootTown_Movement_MomApproachPlayerFemale3:
 	walk_left
 	walk_left
 	step_end
 
-LittlerootTown_Movement_MomApproachPlayerFemale4: @ 81E85F8
+LittlerootTown_Movement_MomApproachPlayerFemale4:
 	walk_left
 	walk_left
 	walk_left
@@ -833,14 +833,14 @@ LittlerootTown_Movement_MomApproachPlayerFemale4: @ 81E85F8
 	walk_left
 	step_end
 
-LittlerootTown_Movement_MomApproachPlayerFemale5: @ 81E85FE
+LittlerootTown_Movement_MomApproachPlayerFemale5:
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-LittlerootTown_Movement_MomReturnHome0: @ 81E8603
+LittlerootTown_Movement_MomReturnHome0:
 	walk_down
 	walk_down
 	walk_down
@@ -848,7 +848,7 @@ LittlerootTown_Movement_MomReturnHome0: @ 81E8603
 	walk_down
 	step_end
 
-LittlerootTown_Movement_MomReturnHome1: @ 81E8609
+LittlerootTown_Movement_MomReturnHome1:
 	walk_down
 	walk_down
 	walk_down
@@ -856,7 +856,7 @@ LittlerootTown_Movement_MomReturnHome1: @ 81E8609
 	walk_down
 	step_end
 
-LittlerootTown_Movement_MomReturnHomeMale2: @ 81E860F
+LittlerootTown_Movement_MomReturnHomeMale2:
 	walk_left
 	walk_left
 	walk_left
@@ -864,7 +864,7 @@ LittlerootTown_Movement_MomReturnHomeMale2: @ 81E860F
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_MomReturnHomeMale3: @ 81E8615
+LittlerootTown_Movement_MomReturnHomeMale3:
 	walk_left
 	walk_left
 	walk_left
@@ -873,33 +873,33 @@ LittlerootTown_Movement_MomReturnHomeMale3: @ 81E8615
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_MomReturnHomeMale4: @ 81E861C
+LittlerootTown_Movement_MomReturnHomeMale4:
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_MomReturnHomeMale5: @ 81E8620
+LittlerootTown_Movement_MomReturnHomeMale5:
 	walk_left
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_MomReturnHomeFemale2: @ 81E8625
+LittlerootTown_Movement_MomReturnHomeFemale2:
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_MomReturnHomeFemale3: @ 81E862A
+LittlerootTown_Movement_MomReturnHomeFemale3:
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_MomReturnHomeFemale4: @ 81E862E
+LittlerootTown_Movement_MomReturnHomeFemale4:
 	walk_right
 	walk_right
 	walk_right
@@ -908,7 +908,7 @@ LittlerootTown_Movement_MomReturnHomeFemale4: @ 81E862E
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_MomReturnHomeFemale5: @ 81E8635
+LittlerootTown_Movement_MomReturnHomeFemale5:
 	walk_right
 	walk_right
 	walk_right
@@ -916,11 +916,11 @@ LittlerootTown_Movement_MomReturnHomeFemale5: @ 81E8635
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_Movement_MomExitThroughDoor: @ 81E863B
+LittlerootTown_Movement_MomExitThroughDoor:
 	walk_up
 	step_end
 
-LittlerootTown_EventScript_Mom:: @ 81E863D
+LittlerootTown_EventScript_Mom::
 	lock
 	faceplayer
 	checkplayergender
@@ -941,14 +941,14 @@ LittlerootTown_EventScript_Mom:: @ 81E863D
 	goto LittlerootTown_EventScript_SetReceivedRunningShoes
 	end
 
-LittlerootTown_EventScript_SetReceivedRunningShoes:: @ 81E8686
+LittlerootTown_EventScript_SetReceivedRunningShoes::
 	removeobject LOCALID_MOM
 	setflag FLAG_SYS_B_DASH
 	setvar VAR_LITTLEROOT_TOWN_STATE, 4
 	release
 	end
 
-LittlerootTown_EventScript_GiveRunningShoes:: @ 81E8693
+LittlerootTown_EventScript_GiveRunningShoes::
 	msgbox LittlerootTown_Text_WearTheseRunningShoes, MSGBOX_DEFAULT
 	playfanfare MUS_OBTAIN_ITEM
 	message LittlerootTown_Text_SwitchShoesWithRunningShoes
@@ -960,7 +960,7 @@ LittlerootTown_EventScript_GiveRunningShoes:: @ 81E8693
 	delay 30
 	return
 
-LittlerootTown_Text_OurNewHomeLetsGoInside: @ 81E86BC
+LittlerootTown_Text_OurNewHomeLetsGoInside:
 	.string "MOM: {PLAYER}, we're here, honey!\p"
 	.string "It must be tiring riding with our things\n"
 	.string "in the moving truck.\p"
@@ -972,10 +972,10 @@ LittlerootTown_Text_OurNewHomeLetsGoInside: @ 81E86BC
 	.string "And, you get your own room, {PLAYER}!\n"
 	.string "Let's go inside.$"
 
-LittlerootTown_Text_WaitPlayer: @ 81E87E1
+LittlerootTown_Text_WaitPlayer:
 	.string "MOM: Wait, {PLAYER}!$"
 
-LittlerootTown_Text_WearTheseRunningShoes: @ 81E87F0
+LittlerootTown_Text_WearTheseRunningShoes:
 	.string "MOM: {PLAYER}! {PLAYER}! Did you\n"
 	.string "introduce yourself to PROF. BIRCH?\p"
 	.string "Oh! What an adorable POKéMON!\n"
@@ -986,11 +986,11 @@ LittlerootTown_Text_WearTheseRunningShoes: @ 81E87F0
 	.string "adventure, wear these RUNNING SHOES.\p"
 	.string "They'll put a zip in your step!$"
 
-LittlerootTown_Text_SwitchShoesWithRunningShoes: @ 81E8925
+LittlerootTown_Text_SwitchShoesWithRunningShoes:
 	.string "{PLAYER} switched shoes with the\n"
 	.string "RUNNING SHOES.$"
 
-LittlerootTown_Text_ExplainRunningShoes: @ 81E894F
+LittlerootTown_Text_ExplainRunningShoes:
 	.string "MOM: {PLAYER}, those shoes came with\n"
 	.string "instructions.\p"
 	.string "“Press the B Button while wearing these\n"
@@ -998,7 +998,7 @@ LittlerootTown_Text_ExplainRunningShoes: @ 81E894F
 	.string "“Slip on these RUNNING SHOES and race\n"
 	.string "in the great outdoors!”$"
 
-LittlerootTown_Text_ComeHomeIfAnythingHappens: @ 81E8A03
+LittlerootTown_Text_ComeHomeIfAnythingHappens:
 	.string "… … … … … … … …\n"
 	.string "… … … … … … … …\p"
 	.string "To think that you have your very own\n"
@@ -1008,28 +1008,28 @@ LittlerootTown_Text_ComeHomeIfAnythingHappens: @ 81E8A03
 	.string "If anything happens, you can come home.\p"
 	.string "Go on, go get them, honey!$"
 
-LittlerootTown_Text_CanUsePCToStoreItems: @ 81E8ACF
+LittlerootTown_Text_CanUsePCToStoreItems:
 	.string "If you use a PC, you can store items\n"
 	.string "and POKéMON.\p"
 	.string "The power of science is staggering!$"
 
-LittlerootTown_Text_BirchSpendsDaysInLab: @ 81E8B25
+LittlerootTown_Text_BirchSpendsDaysInLab:
 	.string "PROF. BIRCH spends days in his LAB\n"
 	.string "studying, then he'll suddenly go out in\l"
 	.string "the wild to do more research…\p"
 	.string "When does PROF. BIRCH spend time\n"
 	.string "at home?$"
 
-LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut: @ 81E8BB8
+LittlerootTown_Text_IfYouGoInGrassPokemonWillJumpOut:
 	.string "Um, um, um!\p"
 	.string "If you go outside and go in the grass,\n"
 	.string "wild POKéMON will jump out!$"
 
-LittlerootTown_Text_DangerousIfYouDontHavePokemon: @ 81E8C07
+LittlerootTown_Text_DangerousIfYouDontHavePokemon:
 	.string "It's dangerous if you don't have\n"
 	.string "your own POKéMON.$"
 
-LittlerootTown_Text_CanYouGoSeeWhatsHappening: @ 81E8C3A
+LittlerootTown_Text_CanYouGoSeeWhatsHappening:
 	.string "Um, hi!\p"
 	.string "There are scary POKéMON outside!\n"
 	.string "I can hear their cries!\p"
@@ -1038,28 +1038,28 @@ LittlerootTown_Text_CanYouGoSeeWhatsHappening: @ 81E8C3A
 	.string "Can you go see what's happening\n"
 	.string "for me?$"
 
-LittlerootTown_Text_YouSavedBirch: @ 81E8CE3
+LittlerootTown_Text_YouSavedBirch:
 	.string "You saved PROF. BIRCH!\n"
 	.string "I'm so glad!$"
 
-LittlerootTown_Text_GoodLuckCatchingPokemon: @ 81E8D07
+LittlerootTown_Text_GoodLuckCatchingPokemon:
 	.string "Are you going to catch POKéMON?\n"
 	.string "Good luck!$"
 
-LittlerootTown_Text_TownSign: @ 81E8D32
+LittlerootTown_Text_TownSign:
 	.string "LITTLEROOT TOWN\n"
 	.string "“A town that can't be shaded any hue.”$"
 
-LittlerootTown_Text_ProfBirchsLab: @ 81E8D69
+LittlerootTown_Text_ProfBirchsLab:
 	.string "PROF. BIRCH'S POKéMON LAB$"
 
-LittlerootTown_Text_PlayersHouse: @ 81E8D83
+LittlerootTown_Text_PlayersHouse:
 	.string "{PLAYER}'s HOUSE$"
 
-LittlerootTown_Text_ProfBirchsHouse: @ 81E8D8E
+LittlerootTown_Text_ProfBirchsHouse:
 	.string "PROF. BIRCH'S HOUSE$"
 
-LittlerootTown_Text_BirchSomethingToShowYouAtLab: @ 81E8DA2
+LittlerootTown_Text_BirchSomethingToShowYouAtLab:
 	.string "PROF. BIRCH: Well, well, {PLAYER}{KUN}!\n"
 	.string "That was good work out there!\p"
 	.string "I knew there was something special\n"
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
index 4b5679ad9..9d19519c8 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -2,34 +2,34 @@
 .set LOCALID_RIVAL_MOM, 4
 .set LOCALID_RIVAL, 7
 
-LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755
+LittlerootTown_BrendansHouse_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_BrendansHouse_1F_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_1F_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_BrendansHouse_1F_OnFrame
 	.byte 0
 
-LittlerootTown_BrendansHouse_1F_OnLoad: @ 81F7765
+LittlerootTown_BrendansHouse_1F_OnLoad:
 	compare VAR_LITTLEROOT_INTRO_STATE, 6
 	call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes
 	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes:: @ 81F777A
+LittlerootTown_BrendansHouse_1F_EventScript_SetMovingBoxes::
 	setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
 	setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual:: @ 81F778D
+LittlerootTown_BrendansHouse_1F_EventScript_CheckShowShoesManual::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual:: @ 81F779A
+LittlerootTown_BrendansHouse_1F_EventScript_ShowRunningShoesManual::
 	setmetatile 3, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
 	return
 
-LittlerootTown_BrendansHouse_1F_OnTransition: @ 81F77A4
+LittlerootTown_BrendansHouse_1F_OnTransition:
 	compare VAR_LITTLEROOT_INTRO_STATE, 3
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor
 	compare VAR_LITTLEROOT_INTRO_STATE, 5
@@ -38,24 +38,24 @@ LittlerootTown_BrendansHouse_1F_OnTransition: @ 81F77A4
 	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToStairs:: @ 81F77C6
+LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToStairs::
 	setobjectxyperm LOCALID_MOM, 8, 4
 	setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV:: @ 81F77D2
+LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToTV::
 	setobjectxyperm LOCALID_MOM, 4, 5
 	setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor:: @ 81F77DE
+LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor::
 	setobjectxyperm LOCALID_MOM, 9, 8
 	setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
 	return
 
 @ Many of the below scripts have no gender check because they assume youre in the correct house
 @ The below SS Ticket script uses Mays house state by accident(?), but theyre both set identically after the intro
-LittlerootTown_BrendansHouse_1F_OnFrame: @ 81F77EA
+LittlerootTown_BrendansHouse_1F_OnFrame:
 	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn
 	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock
 	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport
@@ -63,7 +63,7 @@ LittlerootTown_BrendansHouse_1F_OnFrame: @ 81F77EA
 	map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV
 	.2byte 0
 
-LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814
+LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock::
 	lockall
 	msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT
 	closemessage
@@ -75,25 +75,25 @@ LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs: @ 81F783A
+LittlerootTown_BrendansHouse_1F_Movement_PushTowardStairs:
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn:: @ 81F783C
+LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn::
 	lockall
 	setvar VAR_0x8004, LOCALID_MOM
 	setvar VAR_0x8005, MALE
 	goto PlayersHouse_1F_EventScript_EnterHouseMovingIn
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport:: @ 81F784D
+LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport::
 	lockall
 	setvar VAR_0x8004, MALE
 	setvar VAR_0x8005, LOCALID_MOM
 	goto PlayersHouse_1F_EventScript_PetalburgGymReportMale
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 81F785E
+LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor::
 	lockall
 	playse SE_PIN
 	applymovement LOCALID_RIVAL_MOM, Common_Movement_ExclamationMark
@@ -110,7 +110,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 81F785E
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach: @ 81F789C
+LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach:
 	walk_down
 	walk_right
 	walk_right
@@ -119,7 +119,7 @@ LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach: @ 81F789C
 	walk_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom:: @ 81F78A3
+LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom::
 	lockall
 	setvar VAR_0x8004, LOCALID_MOM
 	setvar VAR_0x8005, MALE
@@ -128,25 +128,25 @@ LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom:: @ 81F78A3
 	goto PlayersHouse_1F_EventScript_MomGoSeeRoom
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_MeetRival0:: @ 81F78BE
+LittlerootTown_BrendansHouse_1F_EventScript_MeetRival0::
 	lockall
 	setvar VAR_0x8008, 0
 	goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_MeetRival1:: @ 81F78CA
+LittlerootTown_BrendansHouse_1F_EventScript_MeetRival1::
 	lockall
 	setvar VAR_0x8008, 1
 	goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2:: @ 81F78D6
+LittlerootTown_BrendansHouse_1F_EventScript_MeetRival2::
 	lockall
 	setvar VAR_0x8008, 2
 	goto LittlerootTown_BrendansHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2
+LittlerootTown_BrendansHouse_1F_EventScript_MeetRival::
 	playse SE_EXIT
 	delay 10
 	addobject LOCALID_RIVAL
@@ -186,27 +186,27 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival:: @ 81F78E2
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan:: @ 81F7981
+LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0:: @ 81F798C
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer0::
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer1:: @ 81F7997
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer1::
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer2:: @ 81F79A2
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer2::
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0: @ 81F79AD
+LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0:
 	walk_in_place_fastest_left
 	walk_left
 	walk_in_place_fastest_up
@@ -216,13 +216,13 @@ LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0: @ 81F79AD
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1: @ 81F79B5
+LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2: @ 81F79B9
+LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2:
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -232,31 +232,31 @@ LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2: @ 81F79B9
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs0:: @ 81F79C1
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs0::
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1:: @ 81F79D3
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs1::
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2:: @ 81F79E5
+LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2::
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0: @ 81F79F7
+LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0:
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1: @ 81F79FB
+LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1:
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
@@ -265,13 +265,13 @@ LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1: @ 81F79FB
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2: @ 81F7A02
+LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2:
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0: @ 81F7A06
+LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0:
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -279,7 +279,7 @@ LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0: @ 81F7A06
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1: @ 81F7A0C
+LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1:
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -291,7 +291,7 @@ LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1: @ 81F7A0C
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2: @ 81F7A16
+LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2:
 	walk_in_place_fastest_left
 	walk_left
 	walk_in_place_fastest_up
@@ -299,11 +299,11 @@ LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2: @ 81F7A16
 	walk_up
 	step_end
 
-PlayersHouse_1F_Text_IsntItNiceInHere: @ 81F7A1C
+PlayersHouse_1F_Text_IsntItNiceInHere:
 	.string "MOM: See, {PLAYER}?\n"
 	.string "Isn't it nice in here, too?$"
 
-PlayersHouse_1F_Text_MoversPokemonGoSetClock: @ 81F7A46
+PlayersHouse_1F_Text_MoversPokemonGoSetClock:
 	.string "The mover's POKéMON do all the work\n"
 	.string "of moving us in and cleaning up after.\l"
 	.string "This is so convenient!\p"
@@ -313,87 +313,87 @@ PlayersHouse_1F_Text_MoversPokemonGoSetClock: @ 81F7A46
 	.string "our move here.\l"
 	.string "Don't forget to set it!$"
 
-PlayersHouse_1F_Text_ArentYouInterestedInRoom: @ 81F7B24
+PlayersHouse_1F_Text_ArentYouInterestedInRoom:
 	.string "MOM: Well, {PLAYER}?\p"
 	.string "Aren't you interested in seeing your\n"
 	.string "very own room?$"
 
-PlayersHouse_1F_Text_GoSetTheClock: @ 81F7B67
+PlayersHouse_1F_Text_GoSetTheClock:
 	.string "MOM: {PLAYER}.\p"
 	.string "Go set the clock in your room, honey.$"
 
-PlayersHouse_1F_Text_OhComeQuickly: @ 81F7B96
+PlayersHouse_1F_Text_OhComeQuickly:
 	.string "MOM: Oh! {PLAYER}, {PLAYER}!\n"
 	.string "Quick! Come quickly!$"
 
-PlayersHouse_1F_Text_MaybeDadWillBeOn: @ 81F7BBC
+PlayersHouse_1F_Text_MaybeDadWillBeOn:
 	.string "MOM: Look! It's PETALBURG GYM!\n"
 	.string "Maybe DAD will be on!$"
 
-PlayersHouse_1F_Text_ItsOverWeMissedHim: @ 81F7BF1
+PlayersHouse_1F_Text_ItsOverWeMissedHim:
 	.string "MOM: Oh… It's over.\p"
 	.string "I think DAD was on, but we missed him.\n"
 	.string "Too bad.$"
 
-PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor: @ 81F7C35
+PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor:
 	.string "Oh, yes.\n"
 	.string "One of DAD's friends lives in town.\p"
 	.string "PROF. BIRCH is his name.\p"
 	.string "He lives right next door, so you should\n"
 	.string "go over and introduce yourself.$"
 
-PlayersHouse_1F_Text_SeeYouHoney: @ 81F7CC3
+PlayersHouse_1F_Text_SeeYouHoney:
 	.string "MOM: See you, honey!$"
 
-PlayersHouse_1F_Text_DidYouMeetProfBirch: @ 81F7CD8
+PlayersHouse_1F_Text_DidYouMeetProfBirch:
 	.string "MOM: Did you introduce yourself to\n"
 	.string "PROF. BIRCH?$"
 
-PlayersHouse_1F_Text_YouShouldRestABit: @ 81F7D08
+PlayersHouse_1F_Text_YouShouldRestABit:
 	.string "MOM: How are you doing, {PLAYER}?\n"
 	.string "You look a little tired.\p"
 	.string "I think you should rest a bit.$"
 
-PlayersHouse_1F_Text_TakeCareHoney: @ 81F7D5C
+PlayersHouse_1F_Text_TakeCareHoney:
 	.string "MOM: Take care, honey!$"
 
-PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom: @ 81F7D73
+PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom:
 	.string "MOM: Oh? Did DAD give you that BADGE?\p"
 	.string "Then here's something from your MOM!$"
 
-PlayersHouse_1F_Text_DontPushYourselfTooHard: @ 81F7DBE
+PlayersHouse_1F_Text_DontPushYourselfTooHard:
 	.string "Don't push yourself too hard, dear.\n"
 	.string "You can always come home.\p"
 	.string "Go for it, honey!$"
 
-PlayersHouse_1F_Text_IsThatAPokenav: @ 81F7E0E
+PlayersHouse_1F_Text_IsThatAPokenav:
 	.string "MOM: What is that, honey? A POKéNAV?\n"
 	.string "Someone from DEVON gave it to you?\p"
 	.string "Well, honey, how about registering\n"
 	.string "your mom?\p"
 	.string "… … …$"
 
-PlayersHouse_1F_Text_RegisteredMom: @ 81F7E89
+PlayersHouse_1F_Text_RegisteredMom:
 	.string "Registered MOM\n"
 	.string "in the POKéNAV.$"
 
-PlayersHouse_1F_Text_Vigoroth1: @ 81F7EA8
+PlayersHouse_1F_Text_Vigoroth1:
 	.string "Fugiiiiih!$"
 
-PlayersHouse_1F_Text_Vigoroth2: @ 81F7EB3
+PlayersHouse_1F_Text_Vigoroth2:
 	.string "Huggoh, uggo uggo…$"
 
-PlayersHouse_1F_Text_ReportFromPetalburgGym: @ 81F7EC6
+PlayersHouse_1F_Text_ReportFromPetalburgGym:
 	.string "INTERVIEWER: …We brought you this\n"
 	.string "report from in front of PETALBURG GYM.$"
 
-PlayersHouse_1F_Text_TheresAMovieOnTV: @ 81F7F0F
+PlayersHouse_1F_Text_TheresAMovieOnTV:
 	.string "There is a movie on TV.\p"
 	.string "Two men are dancing on a big piano\n"
 	.string "keyboard.\p"
 	.string "Better get going!$"
 
-PlayersHouse_1F_Text_RunningShoesManual: @ 81F7F66
+PlayersHouse_1F_Text_RunningShoesManual:
 	.string "It's the instruction booklet for the\n"
 	.string "RUNNING SHOES.\p"
 	.string "“Press the B Button to run while\n"
@@ -401,7 +401,7 @@ PlayersHouse_1F_Text_RunningShoesManual: @ 81F7F66
 	.string "“Lace up your RUNNING SHOES and hit\n"
 	.string "the road running!”$"
 
-PlayersHouse_1F_Text_TicketFromBrineyCameForYou: @ 81F800E
+PlayersHouse_1F_Text_TicketFromBrineyCameForYou:
 	.string "DAD: Hm?\p"
 	.string "Hey, it's {PLAYER}!\p"
 	.string "It's been a while since I saw you,\n"
@@ -412,26 +412,26 @@ PlayersHouse_1F_Text_TicketFromBrineyCameForYou: @ 81F800E
 	.string "This came to you from someone named\l"
 	.string "MR. BRINEY.$"
 
-PlayersHouse_1F_Text_PortsInSlateportLilycove: @ 81F80FE
+PlayersHouse_1F_Text_PortsInSlateportLilycove:
 	.string "DAD: Hm, a TICKET for a ferry?\p"
 	.string "If I recall, there are ferry ports in\n"
 	.string "SLATEPORT and LILYCOVE.$"
 
-PlayersHouse_1F_Text_BetterGetBackToGym: @ 81F815B
+PlayersHouse_1F_Text_BetterGetBackToGym:
 	.string "I'd better get back to PETALBURG GYM.\p"
 	.string "MOM, thanks for looking after the house\n"
 	.string "while I'm away.$"
 
-PlayersHouse_1F_Text_DadShouldStayLonger: @ 81F81B9
+PlayersHouse_1F_Text_DadShouldStayLonger:
 	.string "MOM: That DAD of yours…\p"
 	.string "He comes home for the first time in a\n"
 	.string "while, but all he talks about is POKéMON.\p"
 	.string "He should relax and stay a little longer.$"
 
-PlayersHouse_1F_Text_IsThatABreakingStory: @ 81F824B
+PlayersHouse_1F_Text_IsThatABreakingStory:
 	.string "MOM: Is that a breaking news story?$"
 
-PlayersHouse_1F_Text_LatiEmergencyNewsFlash: @ 81F826F
+PlayersHouse_1F_Text_LatiEmergencyNewsFlash:
 	.string "We bring you this emergency\n"
 	.string "news flash!\p"
 	.string "In various HOENN locales, there have\n"
@@ -442,11 +442,11 @@ PlayersHouse_1F_Text_LatiEmergencyNewsFlash: @ 81F826F
 	.string "We now return you to the regular\n"
 	.string "movie program.$"
 
-PlayersHouse_1F_Text_WhatColorDidTheySay: @ 81F8351
+PlayersHouse_1F_Text_WhatColorDidTheySay:
 	.string "MOM: {PLAYER}, did you catch that?\p"
 	.string "What color did the announcer say\n"
 	.string "that POKéMON was?$"
 
-PlayersHouse_1F_Text_StillUnknownPokemon: @ 81F83A1
+PlayersHouse_1F_Text_StillUnknownPokemon:
 	.string "MOM: Well, isn't that something!\n"
 	.string "There are still unknown POKéMON.$"
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.json b/data/maps/LittlerootTown_BrendansHouse_2F/map.json
index 03e2dcd82..c938aaae2 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/map.json
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/map.json
@@ -194,7 +194,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM"
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index 6cfeea7e4..5d6af5cf0 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
@@ -1,11 +1,11 @@
 .set LOCALID_RIVAL, 1
 
-LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81F83E3
+LittlerootTown_BrendansHouse_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_BrendansHouse_2F_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_BrendansHouse_2F_OnWarp
 	.byte 0
 
-LittlerootTown_BrendansHouse_2F_OnTransition: @ 81F83EE
+LittlerootTown_BrendansHouse_2F_OnTransition:
 	compare VAR_LITTLEROOT_RIVAL_STATE, 2
 	call_if_lt LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
@@ -16,13 +16,13 @@ LittlerootTown_BrendansHouse_2F_OnTransition: @ 81F83EE
 	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_CheckShouldUpdateBrendanPos:: @ 81F841A
+LittlerootTown_BrendansHouse_2F_EventScript_CheckShouldUpdateBrendanPos::
 	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos
 	compare VAR_BIRCH_LAB_STATE, 2
 	goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_Ret
 	goto LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos
 
-LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos:: @ 81F8433
+LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_Ret
@@ -32,30 +32,30 @@ LittlerootTown_BrendansHouse_2F_EventScript_TryUpdateBrendanPos:: @ 81F8433
 	setobjectmovementtype LOCALID_RIVAL, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_Ret:: @ 81F8456
+LittlerootTown_BrendansHouse_2F_EventScript_Ret::
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan:: @ 81F8457
+LittlerootTown_BrendansHouse_2F_EventScript_CheckSetReadyToMeetBrendan::
 	checkplayergender
 	compare VAR_RESULT, FEMALE
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan:: @ 81F8464
+LittlerootTown_BrendansHouse_2F_EventScript_SetReadyToMeetBrendan::
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 2
 	return
 
-LittlerootTown_BrendansHouse_2F_OnWarp: @ 81F846A
+LittlerootTown_BrendansHouse_2F_OnWarp:
 	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor
 	.2byte 0
 
-LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor:: @ 81F8474
+LittlerootTown_BrendansHouse_2F_EventScript_CheckInitDecor::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq SecretBase_EventScript_InitDecorations
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall:: @ 81F8481
+LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall::
 	lockall
 	compare VAR_LITTLEROOT_RIVAL_STATE, 2
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan
@@ -63,7 +63,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_RivalsPokeBall:: @ 81F8481
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497
+LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan::
 	delay 10
 	addobject LOCALID_RIVAL
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters
@@ -92,7 +92,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan:: @ 81F8497
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507
+LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth::
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
@@ -104,7 +104,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: @ 81F8507
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536
+LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth::
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
@@ -116,7 +116,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: @ 81F8536
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565
+LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest::
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
@@ -128,7 +128,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: @ 81F8565
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: @ 81F8594
+LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast::
 	applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
@@ -139,13 +139,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: @ 81F8594
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters: @ 81F85BC
+LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters:
 	walk_down
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth: @ 81F85C0
+LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth:
 	walk_left
 	walk_left
 	walk_down
@@ -153,7 +153,7 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth: @ 81F85C0
 	walk_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth: @ 81F85C6
+LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth:
 	walk_up
 	walk_up
 	walk_up
@@ -164,7 +164,7 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth: @ 81F85C6
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth: @ 81F85CF
+LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth:
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -174,13 +174,13 @@ LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth: @ 81F85CF
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth: @ 81F85D7
+LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth:
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth: @ 81F85DB
+LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth:
 	walk_up
 	walk_left
 	walk_left
@@ -189,7 +189,7 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth: @ 81F85DB
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth: @ 81F85E2
+LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth:
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -197,14 +197,14 @@ LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth: @ 81F85E2
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest: @ 81F85E8
+LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest:
 	walk_left
 	walk_left
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest: @ 81F85ED
+LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest:
 	walk_up
 	walk_up
 	walk_left
@@ -215,7 +215,7 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest: @ 81F85ED
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest: @ 81F85F6
+LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest:
 	delay_8
 	delay_16
 	walk_in_place_fastest_up
@@ -224,7 +224,7 @@ LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest: @ 81F85F6
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast: @ 81F85FD
+LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast:
 	walk_left
 	walk_left
 	walk_left
@@ -233,7 +233,7 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast: @ 81F85FD
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast: @ 81F8604
+LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast:
 	walk_up
 	walk_left
 	walk_left
@@ -241,13 +241,13 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast: @ 81F8604
 	step_end
 
 @ Unused, the player is already facing this direction so its unneeded
-LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanEast: @ 81F8609
+LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanEast:
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_EventScript_PC:: @ 81F860D
+LittlerootTown_BrendansHouse_2F_EventScript_PC::
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -256,7 +256,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_PC:: @ 81F860D
 	goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC:: @ 81F8626
+LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC::
 	setvar VAR_0x8004, 1
 	special DoPCTurnOnEffect
 	playse SE_PC_ON
@@ -266,31 +266,31 @@ LittlerootTown_BrendansHouse_2F_EventScript_CheckPlayersPC:: @ 81F8626
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC:: @ 81F863F
+LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC::
 	setvar VAR_0x8004, 1
 	playse SE_PC_OFF
 	special DoPCTurnOffEffect
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC:: @ 81F864C
+LittlerootTown_BrendansHouse_2F_EventScript_CheckRivalsPC::
 	msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT
 	releaseall
 	end
 
-PlayersHouse_2F_EventScript_Notebook:: @ 81F8656
+PlayersHouse_2F_EventScript_Notebook::
 	msgbox PlayersHouse_2F_Text_Notebook, MSGBOX_SIGN
 	end
 
-PlayersHouse_2F_EventScript_GameCube:: @ 81F865F
+PlayersHouse_2F_EventScript_GameCube::
 	msgbox PlayersHouse_2F_Text_ItsAGameCube, MSGBOX_SIGN
 	end
 
-PlayersHouse_2F_Text_ClockIsStopped: @ 81F8668
+PlayersHouse_2F_Text_ClockIsStopped:
 	.string "The clock is stopped…\p"
 	.string "Better set it and start it!$"
 
-PlayersHouse_2F_Text_HowDoYouLikeYourRoom: @ 81F869A
+PlayersHouse_2F_Text_HowDoYouLikeYourRoom:
 	.string "MOM: {PLAYER}, how do you like your\n"
 	.string "new room?\p"
 	.string "Good! Everything's put away neatly!\p"
@@ -300,7 +300,7 @@ PlayersHouse_2F_Text_HowDoYouLikeYourRoom: @ 81F869A
 	.string "Oh, you should make sure that\n"
 	.string "everything's all there on your desk.$"
 
-PlayersHouse_2F_Text_Notebook: @ 81F877F
+PlayersHouse_2F_Text_Notebook:
 	.string "{PLAYER} flipped open the notebook.\p"
 	.string "ADVENTURE RULE NO. 1\n"
 	.string "Open the MENU with START.\p"
@@ -308,11 +308,11 @@ PlayersHouse_2F_Text_Notebook: @ 81F877F
 	.string "Record your progress with SAVE.\p"
 	.string "The remaining pages are blank…$"
 
-Common_Text_LookCloserAtMap: @ 81F8820
+Common_Text_LookCloserAtMap:
 	.string "{PLAYER} took a closer look at the\n"
 	.string "HOENN region map.$"
 
-PlayersHouse_2F_Text_ItsAGameCube: @ 81F884F
+PlayersHouse_2F_Text_ItsAGameCube:
 	.string "It's a Nintendo GameCube.\p"
 	.string "A Game Boy Advance is connected to\n"
 	.string "serve as the Controller.$"
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
index f1df425b7..80c8c919e 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -2,34 +2,34 @@
 .set LOCALID_RIVAL_MOM, 4
 .set LOCALID_RIVAL, 7
 
-LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5
+LittlerootTown_MaysHouse_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, LittlerootTown_MaysHouse_1F_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_1F_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_MaysHouse_1F_OnFrame
 	.byte 0
 
-LittlerootTown_MaysHouse_1F_OnLoad: @ 81F88B5
+LittlerootTown_MaysHouse_1F_OnLoad:
 	compare VAR_LITTLEROOT_INTRO_STATE, 6
 	call_if_lt LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes
 	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes:: @ 81F88CA
+LittlerootTown_MaysHouse_1F_EventScript_SetMovingBoxes::
 	setmetatile 5, 4, METATILE_BrendansMaysHouse_MovingBox_Open, 1
 	setmetatile 5, 2, METATILE_BrendansMaysHouse_MovingBox_Closed, 1
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual:: @ 81F88DD
+LittlerootTown_MaysHouse_1F_EventScript_CheckShowShoesManual::
 	checkplayergender
 	compare VAR_RESULT, FEMALE
 	goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual:: @ 81F88EA
+LittlerootTown_MaysHouse_1F_EventScript_ShowRunningShoesManual::
 	setmetatile 6, 7, METATILE_BrendansMaysHouse_BookOnTable, 1
 	return
 
-LittlerootTown_MaysHouse_1F_OnTransition: @ 81F88F4
+LittlerootTown_MaysHouse_1F_OnTransition:
 	compare VAR_LITTLEROOT_INTRO_STATE, 3
 	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor
 	compare VAR_LITTLEROOT_INTRO_STATE, 5
@@ -38,23 +38,23 @@ LittlerootTown_MaysHouse_1F_OnTransition: @ 81F88F4
 	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs:: @ 81F8916
+LittlerootTown_MaysHouse_1F_EventScript_MoveMomToStairs::
 	setobjectxyperm LOCALID_MOM, 2, 4
 	setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV:: @ 81F8922
+LittlerootTown_MaysHouse_1F_EventScript_MoveMomToTV::
 	setobjectxyperm LOCALID_MOM, 6, 5
 	setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor:: @ 81F892E
+LittlerootTown_MaysHouse_1F_EventScript_MoveMomToDoor::
 	setobjectxyperm LOCALID_MOM, 1, 8
 	setobjectmovementtype LOCALID_MOM, MOVEMENT_TYPE_FACE_UP
 	return
 
 @ Many of the below scripts have no gender check because they assume youre in the correct house
-LittlerootTown_MaysHouse_1F_OnFrame: @ 81F893A
+LittlerootTown_MaysHouse_1F_OnFrame:
 	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn
 	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock
 	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport
@@ -62,7 +62,7 @@ LittlerootTown_MaysHouse_1F_OnFrame: @ 81F893A
 	map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV
 	.2byte 0
 
-LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964
+LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock::
 	lockall
 	msgbox PlayersHouse_1F_Text_GoSetTheClock, MSGBOX_DEFAULT
 	closemessage
@@ -74,25 +74,25 @@ LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs: @ 81F898A
+LittlerootTown_MaysHouse_1F_Movement_PushTowardStairs:
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn:: @ 81F898C
+LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn::
 	lockall
 	setvar VAR_0x8004, LOCALID_MOM
 	setvar VAR_0x8005, FEMALE
 	goto PlayersHouse_1F_EventScript_EnterHouseMovingIn
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport:: @ 81F899D
+LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport::
 	lockall
 	setvar VAR_0x8004, FEMALE
 	setvar VAR_0x8005, LOCALID_MOM
 	goto PlayersHouse_1F_EventScript_PetalburgGymReportFemale
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE
+LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor::
 	lockall
 	playse SE_PIN
 	applymovement LOCALID_RIVAL_MOM, Common_Movement_ExclamationMark
@@ -109,7 +109,7 @@ LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach: @ 81F89EC
+LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach:
 	walk_down
 	walk_left
 	walk_left
@@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach: @ 81F89EC
 	walk_left
 	step_end
 
-RivalsHouse_1F_EventScript_RivalMom:: @ 81F89F3
+RivalsHouse_1F_EventScript_RivalMom::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, RivalsHouse_1F_EventScript_GoHomeEverySoOften
@@ -130,22 +130,22 @@ RivalsHouse_1F_EventScript_RivalMom:: @ 81F89F3
 	release
 	end
 
-RivalsHouse_1F_EventScript_RivalTooBusy:: @ 81F8A1F
+RivalsHouse_1F_EventScript_RivalTooBusy::
 	msgbox RivalsHouse_1F_Text_TooBusyToNoticeVisit, MSGBOX_DEFAULT
 	release
 	end
 
-RivalsHouse_1F_EventScript_RivalIsOnRoute103:: @ 81F8A29
+RivalsHouse_1F_EventScript_RivalIsOnRoute103::
 	msgbox RivalsHouse_1F_Text_WentOutToRoute103, MSGBOX_DEFAULT
 	release
 	end
 
-RivalsHouse_1F_EventScript_GoHomeEverySoOften:: @ 81F8A33
+RivalsHouse_1F_EventScript_GoHomeEverySoOften::
 	msgbox RivalsHouse_1F_Text_ShouldGoHomeEverySoOften, MSGBOX_DEFAULT
 	release
 	end
 
-RivalsHouse_1F_EventScript_RivalSibling:: @ 81F8A3D
+RivalsHouse_1F_EventScript_RivalSibling::
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
@@ -153,7 +153,7 @@ RivalsHouse_1F_EventScript_RivalSibling:: @ 81F8A3D
 	release
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom:: @ 81F8A4C
+LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom::
 	lockall
 	setvar VAR_0x8004, LOCALID_MOM
 	setvar VAR_0x8005, FEMALE
@@ -162,25 +162,25 @@ LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom:: @ 81F8A4C
 	goto PlayersHouse_1F_EventScript_MomGoSeeRoom
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_MeetRival0:: @ 81F8A67
+LittlerootTown_MaysHouse_1F_EventScript_MeetRival0::
 	lockall
 	setvar VAR_0x8008, 0
 	goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_MeetRival1:: @ 81F8A73
+LittlerootTown_MaysHouse_1F_EventScript_MeetRival1::
 	lockall
 	setvar VAR_0x8008, 1
 	goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_MeetRival2:: @ 81F8A7F
+LittlerootTown_MaysHouse_1F_EventScript_MeetRival2::
 	lockall
 	setvar VAR_0x8008, 2
 	goto LittlerootTown_MaysHouse_1F_EventScript_MeetRival
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
+LittlerootTown_MaysHouse_1F_EventScript_MeetRival::
 	playse SE_EXIT
 	delay 10
 	addobject LOCALID_RIVAL
@@ -220,27 +220,27 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival:: @ 81F8A8B
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay:: @ 81F8B2A
+LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0:: @ 81F8B35
+LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer0::
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1:: @ 81F8B40
+LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer1::
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2:: @ 81F8B4B
+LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2::
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0: @ 81F8B56
+LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0:
 	walk_in_place_fastest_left
 	walk_left
 	walk_in_place_fastest_up
@@ -250,13 +250,13 @@ LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0: @ 81F8B56
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1: @ 81F8B5E
+LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: @ 81F8B62
+LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2:
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -266,31 +266,31 @@ LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: @ 81F8B62
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0:: @ 81F8B6A
+LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs0::
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1:: @ 81F8B7C
+LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs1::
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2:: @ 81F8B8E
+LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2::
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0: @ 81F8BA0
+LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0:
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1: @ 81F8BA4
+LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1:
 	delay_16
 	delay_8
 	walk_in_place_fastest_right
@@ -299,13 +299,13 @@ LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1: @ 81F8BA4
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2: @ 81F8BAB
+LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2:
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0: @ 81F8BAF
+LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0:
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -313,7 +313,7 @@ LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0: @ 81F8BAF
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1: @ 81F8BB5
+LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1:
 	walk_in_place_fastest_right
 	walk_right
 	walk_in_place_fastest_up
@@ -325,7 +325,7 @@ LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1: @ 81F8BB5
 	walk_up
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2: @ 81F8BBF
+LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2:
 	walk_in_place_fastest_left
 	walk_left
 	walk_in_place_fastest_up
@@ -333,7 +333,7 @@ LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2: @ 81F8BBF
 	walk_up
 	step_end
 
-RivalsHouse_1F_Text_OhYoureTheNewNeighbor: @ 81F8BC5
+RivalsHouse_1F_Text_OhYoureTheNewNeighbor:
 	.string "Oh, hello. And you are?\p"
 	.string "… … … … … … … … …\n"
 	.string "… … … … … … … … …\p"
@@ -345,26 +345,26 @@ RivalsHouse_1F_Text_OhYoureTheNewNeighbor: @ 81F8BC5
 	.string "a new friend.\p"
 	.string "Our {STR_VAR_1} is upstairs, I think.$"
 
-RivalsHouse_1F_Text_LikeChildLikeFather: @ 81F8CA5
+RivalsHouse_1F_Text_LikeChildLikeFather:
 	.string "Like child, like father.\p"
 	.string "My husband is as wild about POKéMON\n"
 	.string "as our child.\p"
 	.string "If he's not at his LAB, he's likely\n"
 	.string "scrabbling about in grassy places.$"
 
-RivalsHouse_1F_Text_TooBusyToNoticeVisit: @ 81F8D37
+RivalsHouse_1F_Text_TooBusyToNoticeVisit:
 	.string "That {RIVAL}!\p"
 	.string "I guess our child is too busy with\n"
 	.string "POKéMON to notice that you came\l"
 	.string "to visit, {PLAYER}{KUN}.$"
 
-RivalsHouse_1F_Text_WentOutToRoute103: @ 81F8D93
+RivalsHouse_1F_Text_WentOutToRoute103:
 	.string "Oh, {RIVAL} went out to ROUTE 103\n"
 	.string "just a little while ago.\p"
 	.string "Like father, like child.\n"
 	.string "{RIVAL} can't stay quietly at home.$"
 
-RivalsHouse_1F_Text_ShouldGoHomeEverySoOften: @ 81F8E01
+RivalsHouse_1F_Text_ShouldGoHomeEverySoOften:
 	.string "I think it's wonderful for people to\n"
 	.string "travel with POKéMON.\p"
 	.string "But you should go home every so often\n"
@@ -372,7 +372,7 @@ RivalsHouse_1F_Text_ShouldGoHomeEverySoOften: @ 81F8E01
 	.string "She might not say it, but I'm sure she\n"
 	.string "worries about you, {PLAYER}{KUN}.$"
 
-RivalsHouse_1F_Text_MayWhoAreYou: @ 81F8EC6
+RivalsHouse_1F_Text_MayWhoAreYou:
 	.string "Huh?\n"
 	.string "Who… Who are you?\p"
 	.string "… … … … … … … …\n"
@@ -396,7 +396,7 @@ RivalsHouse_1F_Text_MayWhoAreYou: @ 81F8EC6
 	.string "some wild POKéMON!\p"
 	.string "{PLAYER}{KUN}, I'll catch you later!$"
 
-RivalsHouse_1F_Text_BrendanWhoAreYou: @ 81F90B4
+RivalsHouse_1F_Text_BrendanWhoAreYou:
 	.string "Hey!\n"
 	.string "You…\p"
 	.string "Who are you?\p"
@@ -416,7 +416,7 @@ RivalsHouse_1F_Text_BrendanWhoAreYou: @ 81F90B4
 	.string "some wild POKéMON.\p"
 	.string "Some other time, okay?$"
 
-RivalsHouse_1F_Text_DoYouHavePokemon: @ 81F9262
+RivalsHouse_1F_Text_DoYouHavePokemon:
 	.string "Hi, neighbor!\p"
 	.string "Do you already have your\n"
 	.string "own POKéMON?$"
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.json b/data/maps/LittlerootTown_MaysHouse_2F/map.json
index 1fa2ff01d..080eb0fe5 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/map.json
+++ b/data/maps/LittlerootTown_MaysHouse_2F/map.json
@@ -194,7 +194,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM"
+      "flag": "FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_PICHU_DOLL",
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
index a0583841c..1483a845c 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -1,11 +1,11 @@
 .set LOCALID_RIVAL, 1
 
-LittlerootTown_MaysHouse_2F_MapScripts:: @ 81F9296
+LittlerootTown_MaysHouse_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_MaysHouse_2F_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_MaysHouse_2F_OnWarp
 	.byte 0
 
-LittlerootTown_MaysHouse_2F_OnTransition: @ 81F92A1
+LittlerootTown_MaysHouse_2F_OnTransition:
 	compare VAR_LITTLEROOT_RIVAL_STATE, 2
 	call_if_lt LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay
 	compare VAR_LITTLEROOT_RIVAL_STATE, 3
@@ -16,13 +16,13 @@ LittlerootTown_MaysHouse_2F_OnTransition: @ 81F92A1
 	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_CheckShouldUpdateMayPos:: @ 81F92CD
+LittlerootTown_MaysHouse_2F_EventScript_CheckShouldUpdateMayPos::
 	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos
 	compare VAR_BIRCH_LAB_STATE, 2
 	goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_Ret
 	goto LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos
 
-LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos:: @ 81F92E6
+LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos::
 	checkplayergender
 	compare VAR_RESULT, FEMALE
 	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_Ret
@@ -32,30 +32,30 @@ LittlerootTown_MaysHouse_2F_EventScript_TryUpdateMayPos:: @ 81F92E6
 	setobjectmovementtype LOCALID_RIVAL, MOVEMENT_TYPE_FACE_UP
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_Ret:: @ 81F9309
+LittlerootTown_MaysHouse_2F_EventScript_Ret::
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay:: @ 81F930A
+LittlerootTown_MaysHouse_2F_EventScript_CheckSetReadyToMeetMay::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay:: @ 81F9317
+LittlerootTown_MaysHouse_2F_EventScript_SetReadyToMeetMay::
 	setvar VAR_LITTLEROOT_RIVAL_STATE, 2
 	return
 
-LittlerootTown_MaysHouse_2F_OnWarp: @ 81F931D
+LittlerootTown_MaysHouse_2F_OnWarp:
 	map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor
 	.2byte 0
 
-LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor:: @ 81F9327
+LittlerootTown_MaysHouse_2F_EventScript_CheckInitDecor::
 	checkplayergender
 	compare VAR_RESULT, FEMALE
 	goto_if_eq SecretBase_EventScript_InitDecorations
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall:: @ 81F9334
+LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall::
 	lockall
 	compare VAR_LITTLEROOT_RIVAL_STATE, 2
 	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_MeetMay
@@ -63,7 +63,7 @@ LittlerootTown_MaysHouse_2F_EventScript_RivalsPokeBall:: @ 81F9334
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A
+LittlerootTown_MaysHouse_2F_EventScript_MeetMay::
 	delay 10
 	addobject LOCALID_RIVAL
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayEnters
@@ -92,7 +92,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMay:: @ 81F934A
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA
+LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth::
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -104,7 +104,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: @ 81F93BA
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9
+LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth::
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -116,7 +116,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: @ 81F93E9
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418
+LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest::
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
@@ -127,7 +127,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: @ 81F9418
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: @ 81F9440
+LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast::
 	applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -139,13 +139,13 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: @ 81F9440
 	waitmovement 0
 	return
 
-LittlerootTown_MaysHouse_2F_Movement_MayEnters: @ 81F946F
+LittlerootTown_MaysHouse_2F_Movement_MayEnters:
 	walk_down
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth: @ 81F9473
+LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth:
 	walk_right
 	walk_right
 	walk_down
@@ -153,7 +153,7 @@ LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth: @ 81F9473
 	walk_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth: @ 81F9479
+LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth:
 	walk_up
 	walk_up
 	walk_up
@@ -165,7 +165,7 @@ LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth: @ 81F9479
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth: @ 81F9483
+LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth:
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -175,13 +175,13 @@ LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth: @ 81F9483
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth: @ 81F948B
+LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth:
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth: @ 81F948F
+LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth:
 	walk_up
 	walk_in_place_fastest_right
 	walk_right
@@ -191,7 +191,7 @@ LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth: @ 81F948F
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth: @ 81F9497
+LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth:
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -199,7 +199,7 @@ LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth: @ 81F9497
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest: @ 81F949D
+LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest:
 	walk_right
 	walk_right
 	walk_right
@@ -208,7 +208,7 @@ LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest: @ 81F949D
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest: @ 81F94A4
+LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest:
 	walk_up
 	walk_right
 	walk_right
@@ -216,20 +216,20 @@ LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest: @ 81F94A4
 	step_end
 
 @ Unused, the player is already facing this direction so its unneeded
-LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayWest: @ 81F94A9
+LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayWest:
 	delay_16
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast: @ 81F94AD
+LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast:
 	walk_right
 	walk_right
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast: @ 81F94B2
+LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast:
 	walk_up
 	walk_up
 	walk_right
@@ -240,7 +240,7 @@ LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast: @ 81F94B2
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast: @ 81F94BB
+LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast:
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -248,7 +248,7 @@ LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast: @ 81F94BB
 	walk_in_place_fastest_right
 	step_end
 
-RivalsHouse_2F_EventScript_Rival:: @ 81F94C1
+RivalsHouse_2F_EventScript_Rival::
 	lockall
 	goto_if_set FLAG_MET_RIVAL_LILYCOVE, RivalsHouse_2F_EventScript_RivalPostLilycove
 	checkplayergender
@@ -258,17 +258,17 @@ RivalsHouse_2F_EventScript_Rival:: @ 81F94C1
 	goto_if_eq RivalsHouse_2F_EventScript_Brendan
 	end
 
-RivalsHouse_2F_EventScript_May:: @ 81F94E3
+RivalsHouse_2F_EventScript_May::
 	msgbox RivalsHouse_2F_Text_MayGettingReady, MSGBOX_DEFAULT
 	releaseall
 	end
 
-RivalsHouse_2F_EventScript_Brendan:: @ 81F94ED
+RivalsHouse_2F_EventScript_Brendan::
 	msgbox RivalsHouse_2F_Text_BrendanGettingReady, MSGBOX_DEFAULT
 	releaseall
 	end
 
-RivalsHouse_2F_EventScript_RivalPostLilycove:: @ 81F94F7
+RivalsHouse_2F_EventScript_RivalPostLilycove::
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	checkplayergender
@@ -280,25 +280,25 @@ RivalsHouse_2F_EventScript_RivalPostLilycove:: @ 81F94F7
 	releaseall
 	end
 
-RivalsHouse_2F_EventScript_MayPostLilycove:: @ 81F951D
+RivalsHouse_2F_EventScript_MayPostLilycove::
 	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_MayWhereShouldIGoNext
 	msgbox RivalsHouse_2F_Text_MayJustCheckingMyPokedex, MSGBOX_DEFAULT
 	return
 
-RivalsHouse_2F_EventScript_BrendanPostLilycove:: @ 81F952F
+RivalsHouse_2F_EventScript_BrendanPostLilycove::
 	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext
 	msgbox RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex, MSGBOX_DEFAULT
 	return
 
-RivalsHouse_2F_EventScript_MayWhereShouldIGoNext:: @ 81F9541
+RivalsHouse_2F_EventScript_MayWhereShouldIGoNext::
 	msgbox RivalsHouse_2F_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT
 	return
 
-RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext:: @ 81F954A
+RivalsHouse_2F_EventScript_BrendanWhereShouldIGoNext::
 	msgbox RivalsHouse_2F_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_MaysHouse_2F_EventScript_PC:: @ 81F9553
+LittlerootTown_MaysHouse_2F_EventScript_PC::
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -307,12 +307,12 @@ LittlerootTown_MaysHouse_2F_EventScript_PC:: @ 81F9553
 	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC:: @ 81F956C
+LittlerootTown_MaysHouse_2F_EventScript_CheckRivalsPC::
 	msgbox gText_PokemonTrainerSchoolEmail, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC:: @ 81F9576
+LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC::
 	setvar VAR_0x8004, 2
 	special DoPCTurnOnEffect
 	playse SE_PC_ON
@@ -322,14 +322,14 @@ LittlerootTown_MaysHouse_2F_EventScript_CheckPlayersPC:: @ 81F9576
 	releaseall
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC:: @ 81F958F
+LittlerootTown_MaysHouse_2F_EventScript_TurnOffPlayerPC::
 	setvar VAR_0x8004, 2
 	playse SE_PC_OFF
 	special DoPCTurnOffEffect
 	releaseall
 	end
 
-RivalsHouse_2F_Text_MayWhoAreYou: @ 81F959C
+RivalsHouse_2F_Text_MayWhoAreYou:
 	.string "Huh?\n"
 	.string "Who… Who are you?\p"
 	.string "… … … … … … … …\n"
@@ -353,11 +353,11 @@ RivalsHouse_2F_Text_MayWhoAreYou: @ 81F959C
 	.string "some wild POKéMON!\p"
 	.string "{PLAYER}{KUN}, I'll catch you later!$"
 
-RivalsHouse_2F_Text_MayGettingReady: @ 81F978A
+RivalsHouse_2F_Text_MayGettingReady:
 	.string "POKéMON fully restored!\n"
 	.string "Items ready, and…$"
 
-RivalsHouse_2F_Text_BrendanWhoAreYou: @ 81F97B4
+RivalsHouse_2F_Text_BrendanWhoAreYou:
 	.string "Hey!\n"
 	.string "You…\p"
 	.string "Who are you?\p"
@@ -377,15 +377,15 @@ RivalsHouse_2F_Text_BrendanWhoAreYou: @ 81F97B4
 	.string "some wild POKéMON.\p"
 	.string "Some other time, okay?$"
 
-RivalsHouse_2F_Text_BrendanGettingReady: @ 81F9962
+RivalsHouse_2F_Text_BrendanGettingReady:
 	.string "POKéMON fully restored…\n"
 	.string "Items all packed, and…$"
 
-RivalsHouse_2F_Text_ItsRivalsPokeBall: @ 81F9991
+RivalsHouse_2F_Text_ItsRivalsPokeBall:
 	.string "It's {RIVAL}'s POKé BALL!\p"
 	.string "Better leave it right where it is.$"
 
-RivalsHouse_2F_Text_MayJustCheckingMyPokedex: @ 81F99C9
+RivalsHouse_2F_Text_MayJustCheckingMyPokedex:
 	.string "MAY: {PLAYER}{KUN}!\p"
 	.string "I was just checking my POKéDEX.\p"
 	.string "There's still a lot of POKéMON that\n"
@@ -395,13 +395,13 @@ RivalsHouse_2F_Text_MayJustCheckingMyPokedex: @ 81F99C9
 	.string "I wonder where I should go catch\n"
 	.string "some POKéMON next?$"
 
-RivalsHouse_2F_Text_MayWhereShouldIGoNext: @ 81F9A9E
+RivalsHouse_2F_Text_MayWhereShouldIGoNext:
 	.string "MAY: I wonder where I should go catch\n"
 	.string "some POKéMON next?\p"
 	.string "Wouldn't it be funny if we ran into each\n"
 	.string "other, {PLAYER}{KUN}?$"
 
-RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex: @ 81F9B0D
+RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex:
 	.string "BRENDAN: Hey, it's {PLAYER}.\p"
 	.string "I was just checking out my POKéDEX.\p"
 	.string "There are still many POKéMON that\n"
@@ -410,7 +410,7 @@ RivalsHouse_2F_Text_BrendanJustCheckingMyPokedex: @ 81F9B0D
 	.string "Checking this POKéDEX out gives me\n"
 	.string "the urge to hit the road again.$"
 
-RivalsHouse_2F_Text_BrendanWhereShouldIGoNext: @ 81F9BE7
+RivalsHouse_2F_Text_BrendanWhereShouldIGoNext:
 	.string "BRENDAN: I'm having a hard time deciding\n"
 	.string "where I should catch POKéMON next.\p"
 	.string "Hey, {PLAYER}, if I see you while I'm out\n"
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
index bc03be7b2..2bff65b31 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -5,7 +5,7 @@
 .set LOCALID_BALL_TOTODILE, 5
 .set LOCALID_BALL_CHIKORITA, 6
 
-LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
+LittlerootTown_ProfessorBirchsLab_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, LittlerootTown_ProfessorBirchsLab_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, LittlerootTown_ProfessorBirchsLab_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, LittlerootTown_ProfessorBirchsLab_OnFrame
@@ -26,7 +26,7 @@ LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 81F9C91
 	@ 4: Defeated rival on Route 103
 	@ 5: Received pokedex
 
-LittlerootTown_ProfessorBirchsLab_OnTransition: @ 81F9CA1
+LittlerootTown_ProfessorBirchsLab_OnTransition:
 	call Common_EventScript_SetupRivalGfxId
 	call ProfBirch_EventScript_UpdateLocation
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
@@ -37,7 +37,7 @@ LittlerootTown_ProfessorBirchsLab_OnTransition: @ 81F9CA1
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter:: @ 81F9CCD
+LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter::
 	specialvar VAR_RESULT, HasAllHoennMons
 	compare VAR_RESULT, TRUE
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter
@@ -45,21 +45,21 @@ LittlerootTown_ProfessorBirchsLab_EventScript_CheckReadyForJohtoStarter:: @ 81F9
 	setobjectxyperm LOCALID_RIVAL, 5, 10
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter:: @ 81F9CE9
+LittlerootTown_ProfessorBirchsLab_EventScript_SetReadyForJohtoStarter::
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 4
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout:: @ 81F9CF3
+LittlerootTown_ProfessorBirchsLab_EventScript_SetJohtoStarterLayout::
 	setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout:: @ 81F9CF7
+LittlerootTown_ProfessorBirchsLab_EventScript_SetAfterJohtoStarterLayout::
 	setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE
 	setobjectmovementtype LOCALID_RIVAL, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
 	setobjectxyperm LOCALID_RIVAL, 5, 10
 	end
 
-LittlerootTown_ProfessorBirchsLab_OnWarp: @ 81F9D06
+LittlerootTown_ProfessorBirchsLab_OnWarp:
 	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter
 	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade
 	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade
@@ -69,11 +69,11 @@ LittlerootTown_ProfessorBirchsLab_OnWarp: @ 81F9D06
 	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5, LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters
 	.2byte 0
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter:: @ 81F9D40
+LittlerootTown_ProfessorBirchsLab_EventScript_SetPlayerPosForReceiveStarter::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade:: @ 81F9D45
+LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	addobject LOCALID_BIRCH
 	addobject LOCALID_RIVAL
@@ -85,11 +85,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForDexUpgrade:: @ 81F9
 	setobjectxy LOCALID_AIDE, 10, 10
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject:: @ 81F9D71
+LittlerootTown_ProfessorBirchsLab_EventScript_AddRivalObject::
 	addobject LOCALID_RIVAL
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters:: @ 81F9D75
+LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters::
 	addobject LOCALID_BALL_CYNDAQUIL
 	addobject LOCALID_BALL_TOTODILE
 	addobject LOCALID_BALL_CHIKORITA
@@ -106,7 +106,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SetObjectPosForJohtoStarters:: @ 8
 	setobjectxy LOCALID_RIVAL, 5, 5
 	end
 
-LittlerootTown_ProfessorBirchsLab_OnFrame: @ 81F9DB9
+LittlerootTown_ProfessorBirchsLab_OnFrame:
 	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent
 	map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent
 	map_script_2 VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1, LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex
@@ -115,7 +115,7 @@ LittlerootTown_ProfessorBirchsLab_OnFrame: @ 81F9DB9
 
 @ The starter is technically given prior to this on Route 101 by special ChooseStarter
 @ This is just where the game tells you its yours and lets you nickname it
-LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent:: @ 81F9DDB
+LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent::
 	lockall
 	bufferleadmonspeciesname 0
 	message LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon
@@ -129,13 +129,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveStarterEvent:: @ 81F9DDB
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter:: @ 81F9E07
+LittlerootTown_ProfessorBirchsLab_EventScript_NicknameStarter::
 	setvar VAR_0x8004, 0
 	call Common_EventScript_NameReceivedPartyMon
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival:: @ 81F9E17
+LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival
@@ -143,14 +143,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GoSeeRival:: @ 81F9E17
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival:: @ 81F9E36
+LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou, MSGBOX_DEFAULT
 	clearflag FLAG_HIDE_ROUTE_101_BOY
 	setvar VAR_BIRCH_LAB_STATE, 3
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival:: @ 81F9E48
+LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_AgreeToSeeRival
@@ -158,14 +158,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival:: @ 81F9E48
 	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_DeclineSeeingRival
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent:: @ 81F9E67
+LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedexEvent::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex
 	waitmovement 0
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex
 	end
 
-LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex: @ 81F9E78
+LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex:
 	walk_up
 	walk_up
 	walk_up
@@ -175,7 +175,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForPokedex: @ 81F9E78
 	walk_up
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80
+LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex::
 	lockall
 	delay 30
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational, MSGBOX_DEFAULT
@@ -224,17 +224,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex:: @ 81F9E80
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_MayUpgradeComment:: @ 81F9F32
+LittlerootTown_ProfessorBirchsLab_EventScript_MayUpgradeComment::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayUpgradeSoCool, MSGBOX_DEFAULT
 	closemessage
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment:: @ 81F9F3C
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanYouCanThankMe, MSGBOX_DEFAULT
 	closemessage
 	return
 
-LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes: @ 81F9F46
+LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes:
 	walk_left
 	walk_in_place_fastest_down
 	delay_16
@@ -254,7 +254,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes: @ 81F9F46
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex: @ 81F9F58
+LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex:
 	walk_left
 	walk_left
 	walk_left
@@ -266,7 +266,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex: @ 81F9F58
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter:: @ 81F9F62
+LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter
 	waitmovement 0
@@ -275,7 +275,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter:: @ 81F9F62
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter: @ 81F9F7C
+LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter:
 	walk_up
 	walk_up
 	walk_up
@@ -285,7 +285,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_PlayerEnterLabForJohtoStarter: @ 81F9
 	walk_up
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_Aide:: @ 81F9F84
+LittlerootTown_ProfessorBirchsLab_EventScript_Aide::
 	lock
 	faceplayer
 	compare VAR_BIRCH_LAB_STATE, 3
@@ -296,17 +296,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Aide:: @ 81F9F84
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet:: @ 81F9FA7
+LittlerootTown_ProfessorBirchsLab_EventScript_AideAlreadyMet::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter:: @ 81F9FB1
+LittlerootTown_ProfessorBirchsLab_EventScript_AideReceivedStarter::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil:: @ 81F9FBB
+LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil::
 	release
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
@@ -319,7 +319,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil:: @ 81F9FBB
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_Totodile:: @ 81F9FEF
+LittlerootTown_ProfessorBirchsLab_EventScript_Totodile::
 	release
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
@@ -332,7 +332,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Totodile:: @ 81F9FEF
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita:: @ 81FA023
+LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita::
 	release
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
@@ -345,18 +345,18 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita:: @ 81FA023
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter:: @ 81FA057
+LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BetterLeaveOthersAlone, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime:: @ 81FA061
+LittlerootTown_ProfessorBirchsLab_EventScript_TakeYourTime::
 	hidemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_TakeYourTimeAllInvaluable, MSGBOX_DEFAULT
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil:: @ 81FA06C
+LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil::
 	bufferspeciesname 0, SPECIES_CYNDAQUIL
 	setvar VAR_TEMP_1, SPECIES_CYNDAQUIL
 	givemon SPECIES_CYNDAQUIL, 5, ITEM_NONE
@@ -368,7 +368,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveCyndaquil:: @ 81FA06C
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty:: @ 81FA0A1
+LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty::
 	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject LOCALID_BALL_CYNDAQUIL
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
@@ -379,7 +379,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToParty:: @ 81FA0A1
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC:: @ 81FA0CC
+LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC::
 	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject LOCALID_BALL_CYNDAQUIL
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
@@ -389,19 +389,19 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendCyndaquilToPC:: @ 81FA0CC
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC:: @ 81FA0F2
+LittlerootTown_ProfessorBirchsLab_EventScript_CyndaquilTransferredToPC::
 	call Common_EventScript_TransferredToPC
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil:: @ 81FA0FD
+LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedCyndaquil::
 	hidemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile:: @ 81FA10D
+LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile::
 	bufferspeciesname 0, SPECIES_TOTODILE
 	setvar VAR_TEMP_1, SPECIES_TOTODILE
 	givemon SPECIES_TOTODILE, 5, ITEM_NONE
@@ -413,7 +413,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveTotodile:: @ 81FA10D
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty:: @ 81FA142
+LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty::
 	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject LOCALID_BALL_TOTODILE
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
@@ -424,7 +424,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToParty:: @ 81FA142
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC:: @ 81FA16D
+LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC::
 	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject LOCALID_BALL_TOTODILE
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
@@ -434,19 +434,19 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendTotodileToPC:: @ 81FA16D
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC:: @ 81FA193
+LittlerootTown_ProfessorBirchsLab_EventScript_TotodileTransferredToPC::
 	call Common_EventScript_TransferredToPC
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile:: @ 81FA19E
+LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedTotodile::
 	hidemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita:: @ 81FA1AE
+LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita::
 	bufferspeciesname 0, SPECIES_CHIKORITA
 	setvar VAR_TEMP_1, SPECIES_CHIKORITA
 	givemon SPECIES_CHIKORITA, 5, ITEM_NONE
@@ -458,7 +458,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GiveChikorita:: @ 81FA1AE
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty:: @ 81FA1E3
+LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty::
 	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject LOCALID_BALL_CHIKORITA
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
@@ -469,7 +469,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToParty:: @ 81FA1E3
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC:: @ 81FA20E
+LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC::
 	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter
 	removeobject LOCALID_BALL_CHIKORITA
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
@@ -479,26 +479,26 @@ LittlerootTown_ProfessorBirchsLab_EventScript_SendChikoritaToPC:: @ 81FA20E
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC:: @ 81FA234
+LittlerootTown_ProfessorBirchsLab_EventScript_ChikoritaTransferredToPC::
 	call Common_EventScript_TransferredToPC
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita:: @ 81FA23F
+LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedChikorita::
 	hidemonpic
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting, MSGBOX_DEFAULT
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter:: @ 81FA24F
+LittlerootTown_ProfessorBirchsLab_EventScript_ReceivedJohtoStarter::
 	playfanfare MUS_OBTAIN_ITEM
 	message LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter
 	waitmessage
 	waitfanfare
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_Birch:: @ 81FA25A
+LittlerootTown_ProfessorBirchsLab_EventScript_Birch::
 	lock
 	faceplayer
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
@@ -510,17 +510,17 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Birch:: @ 81FA25A
 	goto LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_CanHaveAnyOneOfRarePokemon:: @ 81FA28A
+LittlerootTown_ProfessorBirchsLab_EventScript_CanHaveAnyOneOfRarePokemon::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_CanHaveAnyOneOfRarePokemon, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting:: @ 81FA294
+LittlerootTown_ProfessorBirchsLab_EventScript_GrassyPatchWaiting::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister:: @ 81FA29E
+LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister::
 	goto_if_unset FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380, ProfBirch_EventScript_RatePokedexOrRegister
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 3
 	goto_if_eq ProfBirch_EventScript_RatePokedexOrRegister
@@ -532,7 +532,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_TryRatePokedexOrRegister:: @ 81FA2
 	release
 	end
 
-EventScript_RegisterProfBirch:: @ 81FA2D2
+EventScript_RegisterProfBirch::
 	msgbox MatchCall_Text_BirchRegisterCall, MSGBOX_DEFAULT
 	closemessage
 	delay 30
@@ -546,7 +546,7 @@ EventScript_RegisterProfBirch:: @ 81FA2D2
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 81FA2F8
+LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex, MSGBOX_DEFAULT
 	call LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex, MSGBOX_DEFAULT
@@ -568,7 +568,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex:: @ 81FA2F8
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls:: @ 81FA352
+LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese, MSGBOX_DEFAULT
 	giveitem ITEM_POKE_BALL, 5
 	compare VAR_RESULT, FALSE
@@ -577,7 +577,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_MayGivePokeBalls:: @ 81FA352
 	setvar VAR_RESULT, 0
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 81FA37F
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese, MSGBOX_DEFAULT
 	giveitem ITEM_POKE_BALL, 5
 	compare VAR_RESULT, FALSE
@@ -586,7 +586,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_BrendanGivePokeBalls:: @ 81FA37F
 	setvar VAR_RESULT, 1
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC
+LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex::
 	playfanfare MUS_OBTAIN_ITEM
 	message LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex
 	waitfanfare
@@ -596,29 +596,29 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ReceivePokedex:: @ 81FA3AC
 	setvar VAR_CABLE_CLUB_TUTORIAL_STATE, 1
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait:: @ 81FA3C4
+LittlerootTown_ProfessorBirchsLab_EventScript_PokemonAwait::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls:: @ 81FA3CE
+LittlerootTown_ProfessorBirchsLab_EventScript_MayNoRoomForPokeBalls::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls:: @ 81FA3D7
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer: @ 81FA3E0
+LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer:
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_Machine:: @ 81FA3E3
+LittlerootTown_ProfessorBirchsLab_EventScript_Machine::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine, MSGBOX_SIGN
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_Rival:: @ 81FA3EC
+LittlerootTown_ProfessorBirchsLab_EventScript_Rival::
 	lock
 	faceplayer
 	compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 5
@@ -635,15 +635,15 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Rival:: @ 81FA3EC
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext:: @ 81FA428
+LittlerootTown_ProfessorBirchsLab_EventScript_MayWhereShouldIGoNext::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext:: @ 81FA431
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanWhereShouldIGoNext::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans:: @ 81FA43A
+LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere
@@ -652,15 +652,15 @@ LittlerootTown_ProfessorBirchsLab_EventScript_RivalFuturePlans:: @ 81FA43A
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere:: @ 81FA453
+LittlerootTown_ProfessorBirchsLab_EventScript_MayWhatNextImStayingHere::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayWhatNextImStayingHere, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly: @ 81FA45C
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanPreferCollectingSlowly:
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanPreferCollectingSlowly, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier:: @ 81FA465
+LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier
@@ -669,15 +669,15 @@ LittlerootTown_ProfessorBirchsLab_EventScript_RivalHaveYouGoneToBattleFrontier::
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier:: @ 81FA47E
+LittlerootTown_ProfessorBirchsLab_EventScript_MayHaveYouGoneToBattleFrontier::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayHaveYouGoneToBattleFrontier, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier:: @ 81FA487
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanHaveYouGoneToBattleFrontier::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanHaveYouGoneToBattleFrontier, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork:: @ 81FA490
+LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork
@@ -686,27 +686,27 @@ LittlerootTown_ProfessorBirchsLab_EventScript_RivalTakeBreakFromFieldwork:: @ 81
 	release
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork:: @ 81FA4A9
+LittlerootTown_ProfessorBirchsLab_EventScript_MayTakeBreakFromFieldwork::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_MayTakeBreakFromFieldwork, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork:: @ 81FA4B2
+LittlerootTown_ProfessorBirchsLab_EventScript_BrendanTakeBreakFromFieldwork::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BrendanTakeBreakFromFieldwork, MSGBOX_DEFAULT
 	return
 
-LittlerootTown_ProfessorBirchsLab_EventScript_PC:: @ 81FA4BB
+LittlerootTown_ProfessorBirchsLab_EventScript_PC::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch, MSGBOX_SIGN
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf:: @ 81FA4C4
+LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon, MSGBOX_SIGN
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_Book:: @ 81FA4CD
+LittlerootTown_ProfessorBirchsLab_EventScript_Book::
 	msgbox LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead, MSGBOX_SIGN
 	end
 
-LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall:: @ 81FA4D6
+LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall::
 	lockall
 	pokenavcall LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall
 	waitmessage
@@ -714,7 +714,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall:: @ 81FA4D6
 	releaseall
 	end
 
-LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork: @ 81FA4E2
+LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork:
 	.string "Hunh? PROF. BIRCH?\p"
 	.string "The PROF's away on fieldwork.\n"
 	.string "Ergo, he isn't here.\p"
@@ -727,19 +727,19 @@ LittlerootTown_ProfessorBirchsLab_Text_BirchAwayOnFieldwork: @ 81FA4E2
 	.string "rather go outside and experience\l"
 	.string "things than read about them here.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork: @ 81FA641
+LittlerootTown_ProfessorBirchsLab_Text_BirchIsntOneForDeskWork:
 	.string "The PROF isn't one for doing desk work.\n"
 	.string "He's the type of person who would\l"
 	.string "rather go outside and experience\l"
 	.string "things than read about them here.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo: @ 81FA6CE
+LittlerootTown_ProfessorBirchsLab_Text_BirchEnjoysRivalsHelpToo:
 	.string "PROF. BIRCH is studying the habitats\n"
 	.string "and distribution of POKéMON.\p"
 	.string "The PROF enjoys {RIVAL}'s help, too.\n"
 	.string "There's a lot of love there.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon: @ 81FA74D
+LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon:
 	.string "PROF. BIRCH: So, {PLAYER}{KUN}.\p"
 	.string "I've heard so much about you from\n"
 	.string "your father.\p"
@@ -754,11 +754,11 @@ LittlerootTown_ProfessorBirchsLab_Text_LikeYouToHavePokemon: @ 81FA74D
 	.string "used earlier.\p"
 	.string "{PLAYER} received the {STR_VAR_1}!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon: @ 81FA8B1
+LittlerootTown_ProfessorBirchsLab_Text_WhyNotGiveNicknameToMon:
 	.string "PROF. BIRCH: While you're at it, why not\n"
 	.string "give a nickname to that {STR_VAR_1}?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival: @ 81FA8F6
+LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival:
 	.string "PROF. BIRCH: If you work at POKéMON\n"
 	.string "and gain experience, I think you'll make\l"
 	.string "an extremely good TRAINER.\p"
@@ -767,17 +767,17 @@ LittlerootTown_ProfessorBirchsLab_Text_MightBeGoodIdeaToGoSeeRival: @ 81FA8F6
 	.string "{PLAYER}{KUN}, don't you think it might be\n"
 	.string "a good idea to go see {RIVAL}?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou: @ 81FA9D5
+LittlerootTown_ProfessorBirchsLab_Text_GetRivalToTeachYou:
 	.string "PROF. BIRCH: Great!\n"
 	.string "{RIVAL} should be happy, too.\p"
 	.string "Get {RIVAL} to teach you what it\n"
 	.string "means to be a TRAINER.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay: @ 81FAA35
+LittlerootTown_ProfessorBirchsLab_Text_DontBeThatWay:
 	.string "PROF. BIRCH: Oh, don't be that way.\n"
 	.string "You should go meet my kid.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BirchRivalGoneHome: @ 81FAA74
+LittlerootTown_ProfessorBirchsLab_Text_BirchRivalGoneHome:
 	.string "PROF. BIRCH: {RIVAL}?\n"
 	.string "Gone home, I think.\p"
 	.string "Or maybe that kid's scrabbling around\n"
@@ -785,7 +785,7 @@ LittlerootTown_ProfessorBirchsLab_Text_BirchRivalGoneHome: @ 81FAA74
 	.string "If you or your POKéMON get tired,\n"
 	.string "you should get some rest at home.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex: @ 81FAB22
+LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex:
 	.string "PROF. BIRCH: Oh, hi, {PLAYER}{KUN}!\p"
 	.string "I heard you beat {RIVAL} on\n"
 	.string "your first try. That's excellent!\p"
@@ -797,10 +797,10 @@ LittlerootTown_ProfessorBirchsLab_Text_HeardYouBeatRivalTakePokedex: @ 81FAB22
 	.string "research, but I think you should have\l"
 	.string "this POKéDEX.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex: @ 81FAC32
+LittlerootTown_ProfessorBirchsLab_Text_ReceivedPokedex:
 	.string "{PLAYER} received the POKéDEX!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex: @ 81FAC4B
+LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex:
 	.string "PROF. BIRCH: The POKéDEX is a high-tech\n"
 	.string "tool that automatically makes a record\l"
 	.string "of any POKéMON you meet or catch.\p"
@@ -811,19 +811,19 @@ LittlerootTown_ProfessorBirchsLab_Text_ExplainPokedex: @ 81FAC4B
 	.string "why, {RIVAL} looks for me while I'm out\l"
 	.string "doing fieldwork, and shows me.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait: @ 81FAD6F
+LittlerootTown_ProfessorBirchsLab_Text_CountlessPokemonAwait:
 	.string "PROF. BIRCH: Countless POKéMON\n"
 	.string "await you!\p"
 	.string "Argh, I'm getting the itch to get out\n"
 	.string "and do fieldwork again!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese: @ 81FADD7
+LittlerootTown_ProfessorBirchsLab_Text_MayGotPokedexTooTakeThese:
 	.string "MAY: Oh, wow, {PLAYER}{KUN}!\n"
 	.string "You got a POKéDEX, too!\p"
 	.string "That's great! Just like me!\n"
 	.string "I've got something for you, too!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls: @ 81FAE40
+LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls:
 	.string "MAY: It's fun if you can get a lot of\n"
 	.string "POKéMON!\p"
 	.string "I'm going to look all over the place\n"
@@ -831,20 +831,20 @@ LittlerootTown_ProfessorBirchsLab_Text_CatchCutePokemonWithPokeBalls: @ 81FAE40
 	.string "If I find any cute POKéMON, I'll catch\n"
 	.string "them with POKé BALLS!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull: @ 81FAEF3
+LittlerootTown_ProfessorBirchsLab_Text_OhYourBagsFull:
 	.string "Oh? Your BAG's full.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext: @ 81FAF08
+LittlerootTown_ProfessorBirchsLab_Text_MayWhereShouldIGoNext:
 	.string "MAY: I wonder where I should go look\n"
 	.string "for POKéMON next?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese: @ 81FAF3F
+LittlerootTown_ProfessorBirchsLab_Text_BrendanGotPokedexTooTakeThese:
 	.string "BRENDAN: Huh…\n"
 	.string "So you got a POKéDEX, too.\p"
 	.string "Well then, here.\n"
 	.string "I'll give you these.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls: @ 81FAF8E
+LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls:
 	.string "BRENDAN: You know it's more fun to\n"
 	.string "have a whole bunch of POKéMON.\p"
 	.string "I'm going to explore all over the place\n"
@@ -852,28 +852,28 @@ LittlerootTown_ProfessorBirchsLab_Text_CatchCoolPokemonWithPokeBalls: @ 81FAF8E
 	.string "If I find any cool POKéMON, you bet\n"
 	.string "I'll try to get them with POKé BALLS.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull: @ 81FB05D
+LittlerootTown_ProfessorBirchsLab_Text_HeyYourBagsFull:
 	.string "Hey, your BAG's full.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext: @ 81FB073
+LittlerootTown_ProfessorBirchsLab_Text_BrendanWhereShouldIGoNext:
 	.string "BRENDAN: Where should I look for\n"
 	.string "POKéMON next…$"
 
-LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine: @ 81FB0A2
+LittlerootTown_ProfessorBirchsLab_Text_SeriousLookingMachine:
 	.string "It's a serious-looking machine.\n"
 	.string "The PROF must use this for research.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch: @ 81FB0E7
+LittlerootTown_ProfessorBirchsLab_Text_PCUsedForResearch:
 	.string "It's a PC used for research.\n"
 	.string "Better not mess around with it.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon: @ 81FB124
+LittlerootTown_ProfessorBirchsLab_Text_CrammedWithBooksOnPokemon:
 	.string "It's crammed with books on POKéMON.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead: @ 81FB148
+LittlerootTown_ProfessorBirchsLab_Text_BookTooHardToRead:
 	.string "It's a book that's too hard to read.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational: @ 81FB16D
+LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational:
 	.string "PROF. BIRCH: Now…\p"
 	.string "{PLAYER}{KUN} and {RIVAL}, I've had the two\n"
 	.string "of you help me study POKéMON.\p"
@@ -890,28 +890,28 @@ LittlerootTown_ProfessorBirchsLab_Text_OtherRegionsUpgradeToNational: @ 81FB16D
 	.string "the NATIONAL Mode.\p"
 	.string "Here, let me see your POKéDEX units.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_MayUpgradeSoCool: @ 81FB30F
+LittlerootTown_ProfessorBirchsLab_Text_MayUpgradeSoCool:
 	.string "MAY: Eheheh!\p"
 	.string "It's so cool that even my POKéDEX\n"
 	.string "is getting updated!\p"
 	.string "It's because you went out and caught\n"
 	.string "so many POKéMON, {PLAYER}{KUN}!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BrendanYouCanThankMe: @ 81FB38E
+LittlerootTown_ProfessorBirchsLab_Text_BrendanYouCanThankMe:
 	.string "BRENDAN: I went out all over HOENN\n"
 	.string "and checked out POKéMON.\p"
 	.string "You can thank me for getting\n"
 	.string "the NATIONAL Mode POKéDEX.\p"
 	.string "Yep, you're lucky, {PLAYER}!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone: @ 81FB419
+LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone:
 	.string "PROF. BIRCH: Okay, all done!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational: @ 81FB436
+LittlerootTown_ProfessorBirchsLab_Text_PokedexUpgradedToNational:
 	.string "{PLAYER}'s POKéDEX was upgraded\n"
 	.string "to the NATIONAL Mode!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2: @ 81FB466
+LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2:
 	.string "PROF. BIRCH: But listen.\n"
 	.string "You've become the CHAMPION,\l"
 	.string "but your POKéMON journey isn't over.\p"
@@ -920,19 +920,19 @@ LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting2: @ 81FB466
 	.string "Somewhere, there is a grassy patch\n"
 	.string "that's waiting for you!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_MayTakeBreakFromFieldwork: @ 81FB528
+LittlerootTown_ProfessorBirchsLab_Text_MayTakeBreakFromFieldwork:
 	.string "MAY: I think I'll take a short break\n"
 	.string "from fieldwork.\p"
 	.string "I think I'll help the PROF here for\n"
 	.string "a while.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BrendanTakeBreakFromFieldwork: @ 81FB58A
+LittlerootTown_ProfessorBirchsLab_Text_BrendanTakeBreakFromFieldwork:
 	.string "BRENDAN: For the time being,\n"
 	.string "I'm taking a break from fieldwork.\p"
 	.string "I'll be helping out the PROF here\n"
 	.string "for a while.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon: @ 81FB5F9
+LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon:
 	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
 	.string "Let's have a look at your POKéDEX.\p"
 	.string "… … … … … …\n"
@@ -949,50 +949,50 @@ LittlerootTown_ProfessorBirchsLab_Text_CompletedDexChoosePokemon: @ 81FB5F9
 	.string "You can have any one of these\n"
 	.string "three POKéMON!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_CanHaveAnyOneOfRarePokemon: @ 81FB787
+LittlerootTown_ProfessorBirchsLab_Text_CanHaveAnyOneOfRarePokemon:
 	.string "PROF. BIRCH: These are rare POKéMON\n"
 	.string "only found in another region!\p"
 	.string "You can have any one of these\n"
 	.string "three POKéMON!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil: @ 81FB7F6
+LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil:
 	.string "PROF. BIRCH: The FIRE POKéMON\n"
 	.string "CYNDAQUIL caught your eye!\p"
 	.string "You're as sharp as ever!\p"
 	.string "So the CYNDAQUIL is your choice?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile: @ 81FB869
+LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile:
 	.string "PROF. BIRCH: The WATER POKéMON\n"
 	.string "TOTODILE is your choice!\p"
 	.string "You know how to pick a good one.\p"
 	.string "So, you'll take the TOTODILE?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita: @ 81FB8E0
+LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita:
 	.string "PROF. BIRCH: The GRASS POKéMON\n"
 	.string "CHIKORITA is your choice!\p"
 	.string "You sure know what you're doing.\p"
 	.string "So, you'll take the CHIKORITA?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_TakeYourTimeAllInvaluable: @ 81FB959
+LittlerootTown_ProfessorBirchsLab_Text_TakeYourTimeAllInvaluable:
 	.string "PROF. BIRCH: Take your time before\n"
 	.string "you decide.\p"
 	.string "They're all invaluable POKéMON.$"
 
 @ Unused
-LittlerootTown_ProfessorBirchsLab_Text_PickedFinePokemon: @ 81FB9A8
+LittlerootTown_ProfessorBirchsLab_Text_PickedFinePokemon:
 	.string "PROF. BIRCH: I see!\n"
 	.string "You picked a fine POKéMON!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter: @ 81FB9D7
+LittlerootTown_ProfessorBirchsLab_Text_ReceivedJohtoStarter:
 	.string "{PLAYER} received the {STR_VAR_1}\n"
 	.string "from PROF. BIRCH!$"
 
 @ Unused
-LittlerootTown_ProfessorBirchsLab_Text_NicknameJohtoStarter: @ 81FB9FC
+LittlerootTown_ProfessorBirchsLab_Text_NicknameJohtoStarter:
 	.string "Want to give a nickname to\n"
 	.string "the {STR_VAR_1} you received?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting: @ 81FBA2C
+LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting:
 	.string "PROF. BIRCH: Listen, {PLAYER}{KUN}.\n"
 	.string "You've completed the HOENN POKéDEX,\l"
 	.string "but your POKéMON journey isn't over.\p"
@@ -1001,16 +1001,16 @@ LittlerootTown_ProfessorBirchsLab_Text_GrassyPatchWaiting: @ 81FBA2C
 	.string "Somewhere, there is a grassy patch\n"
 	.string "that's waiting for you!$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BetterLeaveOthersAlone: @ 81FBAF8
+LittlerootTown_ProfessorBirchsLab_Text_BetterLeaveOthersAlone:
 	.string "You received the promised POKéMON.\n"
 	.string "Better leave the others alone.$"
 
 @ Unused
-LittlerootTown_ProfessorBirchsLab_Text_DontHaveAnyRoomForPokemon: @ 81FBB3A
+LittlerootTown_ProfessorBirchsLab_Text_DontHaveAnyRoomForPokemon:
 	.string "Oh, you don't have any room for\n"
 	.string "this POKéMON.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_MayWhatNextImStayingHere: @ 81FBB68
+LittlerootTown_ProfessorBirchsLab_Text_MayWhatNextImStayingHere:
 	.string "MAY: {PLAYER}{KUN}, after this…\n"
 	.string "What are you going to do?\p"
 	.string "Are you going to keep battling\n"
@@ -1019,22 +1019,22 @@ LittlerootTown_ProfessorBirchsLab_Text_MayWhatNextImStayingHere: @ 81FBB68
 	.string "the NATIONAL POKéDEX?\p"
 	.string "I'm staying here to help the PROF.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BrendanPreferCollectingSlowly: @ 81FBC2D
+LittlerootTown_ProfessorBirchsLab_Text_BrendanPreferCollectingSlowly:
 	.string "BRENDAN: Rather than collecting\n"
 	.string "POKéMON, I prefer slowly and \l"
 	.string "steadily raising the one I chose.$"
 
-LittlerootTown_ProfessorBirchsLab_Text_MayHaveYouGoneToBattleFrontier: @ 81FBC8D
+LittlerootTown_ProfessorBirchsLab_Text_MayHaveYouGoneToBattleFrontier:
 	.string "MAY: Oh, hi, {PLAYER}{KUN}!\n"
 	.string "Have you gone to that place,\l"
 	.string "the BATTLE FRONTIER?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_BrendanHaveYouGoneToBattleFrontier: @ 81FBCD2
+LittlerootTown_ProfessorBirchsLab_Text_BrendanHaveYouGoneToBattleFrontier:
 	.string "BRENDAN: Hey, {PLAYER}!\n"
 	.string "Have you gone out to that place,\l"
 	.string "the BATTLE FRONTIER?$"
 
-LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall: @ 81FBD1A
+LittlerootTown_ProfessorBirchsLab_Text_ScottAboardSSTidalCall:
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "SCOTT: Hi, hi, {PLAYER}!\n"
diff --git a/data/maps/MagmaHideout_1F/scripts.inc b/data/maps/MagmaHideout_1F/scripts.inc
index 7c6997ca2..d4e22477e 100644
--- a/data/maps/MagmaHideout_1F/scripts.inc
+++ b/data/maps/MagmaHideout_1F/scripts.inc
@@ -1,38 +1,38 @@
-MagmaHideout_1F_MapScripts:: @ 8239880
+MagmaHideout_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MagmaHideout_1F_OnTransition
 	.byte 0
 
-MagmaHideout_1F_OnTransition: @ 8239886
+MagmaHideout_1F_OnTransition:
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
-MagmaHideout_1F_EventScript_Grunt1:: @ 823988C
+MagmaHideout_1F_EventScript_Grunt1::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_1, MagmaHideout_1F_Text_Grunt1Intro, MagmaHideout_1F_Text_Grunt1Defeat
 	msgbox MagmaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_1F_EventScript_Grunt2:: @ 82398A3
+MagmaHideout_1F_EventScript_Grunt2::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_2, MagmaHideout_1F_Text_Grunt2Intro, MagmaHideout_1F_Text_Grunt2Defeat
 	msgbox MagmaHideout_1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_1F_Text_Grunt1Intro: @ 82398BA
+MagmaHideout_1F_Text_Grunt1Intro:
 	.string "When TEAM MAGMA has roll call, we get\n"
 	.string "important guarding assignments in\l"
 	.string "the order that we line up.\p"
 	.string "That's why I'm stuck off in this corner.\n"
 	.string "I'm always late to roll call!$"
 
-MagmaHideout_1F_Text_Grunt1Defeat: @ 8239964
+MagmaHideout_1F_Text_Grunt1Defeat:
 	.string "I'm always late for training sessions,\n"
 	.string "too!\p"
 	.string "I hate to say it, but I'm wimpy…$"
 
-MagmaHideout_1F_Text_Grunt1PostBattle: @ 82399B1
+MagmaHideout_1F_Text_Grunt1PostBattle:
 	.string "Okay, I'll try to put a little more\n"
 	.string "effort into things from now on…$"
 
-MagmaHideout_1F_Text_Grunt2Intro: @ 82399F5
+MagmaHideout_1F_Text_Grunt2Intro:
 	.string "Our leader told us to dig into\n"
 	.string "MT. CHIMNEY, so we dug and dug.\p"
 	.string "And in the course of digging, we came\n"
@@ -41,11 +41,11 @@ MagmaHideout_1F_Text_Grunt2Intro: @ 82399F5
 	.string "Fuhahaha!\n"
 	.string "I'll tell you if you beat me!$"
 
-MagmaHideout_1F_Text_Grunt2Defeat: @ 8239ABA
+MagmaHideout_1F_Text_Grunt2Defeat:
 	.string "Arrgh!\n"
 	.string "Taken down!$"
 
-MagmaHideout_1F_Text_Grunt2PostBattle: @ 8239ACD
+MagmaHideout_1F_Text_Grunt2PostBattle:
 	.string "I won't tell you after all.\n"
 	.string "You'll find out when you get there!\p"
 	.string "It'd be better if you saved surprises\n"
diff --git a/data/maps/MagmaHideout_2F_1R/scripts.inc b/data/maps/MagmaHideout_2F_1R/scripts.inc
index 6f117c006..ab5603e4e 100644
--- a/data/maps/MagmaHideout_2F_1R/scripts.inc
+++ b/data/maps/MagmaHideout_2F_1R/scripts.inc
@@ -1,27 +1,27 @@
-MagmaHideout_2F_1R_MapScripts:: @ 8239B50
+MagmaHideout_2F_1R_MapScripts::
 	.byte 0
 
-MagmaHideout_2F_1R_EventScript_Grunt14:: @ 8239B51
+MagmaHideout_2F_1R_EventScript_Grunt14::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_14, MagmaHideout_2F_1R_Text_Grunt14Intro, MagmaHideout_2F_1R_Text_Grunt14Defeat
 	msgbox MagmaHideout_2F_1R_Text_Grunt14PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_EventScript_Grunt3:: @ 8239B68
+MagmaHideout_2F_1R_EventScript_Grunt3::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_3, MagmaHideout_2F_1R_Text_Grunt3Intro, MagmaHideout_2F_1R_Text_Grunt3Defeat
 	msgbox MagmaHideout_2F_1R_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_EventScript_Grunt4:: @ 8239B7F
+MagmaHideout_2F_1R_EventScript_Grunt4::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_4, MagmaHideout_2F_1R_Text_Grunt4Intro, MagmaHideout_2F_1R_Text_Grunt4Defeat
 	msgbox MagmaHideout_2F_1R_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_EventScript_Grunt5:: @ 8239B96
+MagmaHideout_2F_1R_EventScript_Grunt5::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_5, MagmaHideout_2F_1R_Text_Grunt5Intro, MagmaHideout_2F_1R_Text_Grunt5Defeat
 	msgbox MagmaHideout_2F_1R_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_1R_Text_Grunt14Intro: @ 8239BAD
+MagmaHideout_2F_1R_Text_Grunt14Intro:
 	.string "What, what, what?\p"
 	.string "Only TEAM MAGMA members are supposed\n"
 	.string "to be in here!\p"
@@ -30,46 +30,46 @@ MagmaHideout_2F_1R_Text_Grunt14Intro: @ 8239BAD
 	.string "You rouse my suspicion!\n"
 	.string "Battle with me!$"
 
-MagmaHideout_2F_1R_Text_Grunt14Defeat: @ 8239C4B
+MagmaHideout_2F_1R_Text_Grunt14Defeat:
 	.string "Aiyiyi…\n"
 	.string "My pride as a TEAM MAGMA member…$"
 
-MagmaHideout_2F_1R_Text_Grunt14PostBattle: @ 8239C74
+MagmaHideout_2F_1R_Text_Grunt14PostBattle:
 	.string "If you suffer from chills, you should\n"
 	.string "join TEAM MAGMA.$"
 
-MagmaHideout_2F_1R_Text_Grunt3Intro: @ 8239CAB
+MagmaHideout_2F_1R_Text_Grunt3Intro:
 	.string "Hold it right there!\p"
 	.string "You don't really expect me to keep\n"
 	.string "my trap shut and let you waltz by me?$"
 
-MagmaHideout_2F_1R_Text_Grunt3Defeat: @ 8239D09
+MagmaHideout_2F_1R_Text_Grunt3Defeat:
 	.string "Ooh wow!\n"
 	.string "I concede!$"
 
-MagmaHideout_2F_1R_Text_Grunt3PostBattle: @ 8239D1D
+MagmaHideout_2F_1R_Text_Grunt3PostBattle:
 	.string "Maybe it would've been better if I did\n"
 	.string "just let you go unchallenged…$"
 
-MagmaHideout_2F_1R_Text_Grunt4Intro: @ 8239D62
+MagmaHideout_2F_1R_Text_Grunt4Intro:
 	.string "Ahah!\n"
 	.string "An intruder!$"
 
-MagmaHideout_2F_1R_Text_Grunt4Defeat: @ 8239D75
+MagmaHideout_2F_1R_Text_Grunt4Defeat:
 	.string "Graaah!$"
 
-MagmaHideout_2F_1R_Text_Grunt4PostBattle: @ 8239D7D
+MagmaHideout_2F_1R_Text_Grunt4PostBattle:
 	.string "I've already lost.\p"
 	.string "Do I really need to keep running\n"
 	.string "around in a circle?$"
 
-MagmaHideout_2F_1R_Text_Grunt5Intro: @ 8239DC5
+MagmaHideout_2F_1R_Text_Grunt5Intro:
 	.string "Oh, oh!\n"
 	.string "An intruder!$"
 
-MagmaHideout_2F_1R_Text_Grunt5Defeat: @ 8239DDA
+MagmaHideout_2F_1R_Text_Grunt5Defeat:
 	.string "Mutter…$"
 
-MagmaHideout_2F_1R_Text_Grunt5PostBattle: @ 8239DE2
+MagmaHideout_2F_1R_Text_Grunt5PostBattle:
 	.string "Actually, I'm no expert at battling…$"
 
diff --git a/data/maps/MagmaHideout_2F_2R/scripts.inc b/data/maps/MagmaHideout_2F_2R/scripts.inc
index d0121f953..8c7702eeb 100644
--- a/data/maps/MagmaHideout_2F_2R/scripts.inc
+++ b/data/maps/MagmaHideout_2F_2R/scripts.inc
@@ -1,78 +1,78 @@
-MagmaHideout_2F_2R_MapScripts:: @ 8239E07
+MagmaHideout_2F_2R_MapScripts::
 	.byte 0
 
-MagmaHideout_2F_2R_EventScript_Grunt15:: @ 8239E08
+MagmaHideout_2F_2R_EventScript_Grunt15::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_15, MagmaHideout_2F_2R_Text_Grunt15Intro, MagmaHideout_2F_2R_Text_Grunt15Defeat
 	msgbox MagmaHideout_2F_2R_Text_Grunt15PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_EventScript_Grunt6:: @ 8239E1F
+MagmaHideout_2F_2R_EventScript_Grunt6::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_6, MagmaHideout_2F_2R_Text_Grunt6Intro, MagmaHideout_2F_2R_Text_Grunt6Defeat
 	msgbox MagmaHideout_2F_2R_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_EventScript_Grunt7:: @ 8239E36
+MagmaHideout_2F_2R_EventScript_Grunt7::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_7, MagmaHideout_2F_2R_Text_Grunt7Intro, MagmaHideout_2F_2R_Text_Grunt7Defeat
 	msgbox MagmaHideout_2F_2R_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_EventScript_Grunt8:: @ 8239E4D
+MagmaHideout_2F_2R_EventScript_Grunt8::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_8, MagmaHideout_2F_2R_Text_Grunt8Intro, MagmaHideout_2F_2R_Text_Grunt8Defeat
 	msgbox MagmaHideout_2F_2R_Text_Grunt8PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_2F_2R_Text_Grunt15Intro: @ 8239E64
+MagmaHideout_2F_2R_Text_Grunt15Intro:
 	.string "I don't have a bone to pick with you.\n"
 	.string "I'm just following orders!$"
 
-MagmaHideout_2F_2R_Text_Grunt15Defeat: @ 8239EA5
+MagmaHideout_2F_2R_Text_Grunt15Defeat:
 	.string "I may have lost, but…$"
 
-MagmaHideout_2F_2R_Text_Grunt15PostBattle: @ 8239EBB
+MagmaHideout_2F_2R_Text_Grunt15PostBattle:
 	.string "We dug up something beyond belief!\n"
 	.string "And, we got the BLUE ORB!\p"
 	.string "All that's left is for our leader to…\n"
 	.string "Fufufu… Fwahahaha!$"
 
-MagmaHideout_2F_2R_Text_Grunt6Intro: @ 8239F31
+MagmaHideout_2F_2R_Text_Grunt6Intro:
 	.string "I can't stand heat. Maybe I should've\n"
 	.string "joined TEAM AQUA instead…$"
 
-MagmaHideout_2F_2R_Text_Grunt6Defeat: @ 8239F71
+MagmaHideout_2F_2R_Text_Grunt6Defeat:
 	.string "Yeah, I really may not be right for\n"
 	.string "TEAM MAGMA…$"
 
-MagmaHideout_2F_2R_Text_Grunt6PostBattle: @ 8239FA1
+MagmaHideout_2F_2R_Text_Grunt6PostBattle:
 	.string "Don't you get lonely for the sea\n"
 	.string "being in a place like this?$"
 
-MagmaHideout_2F_2R_Text_Grunt7Intro: @ 8239FDE
+MagmaHideout_2F_2R_Text_Grunt7Intro:
 	.string "You can hear tremors here sometimes.\p"
 	.string "Could it be the volcano rattling?\n"
 	.string "Or is it GROU…\p"
 	.string "Whoops!\n"
 	.string "No, no, never mind!$"
 
-MagmaHideout_2F_2R_Text_Grunt7Defeat: @ 823A050
+MagmaHideout_2F_2R_Text_Grunt7Defeat:
 	.string "You're a fiery battler.\n"
 	.string "Just like a volcano!$"
 
-MagmaHideout_2F_2R_Text_Grunt7PostBattle: @ 823A07D
+MagmaHideout_2F_2R_Text_Grunt7PostBattle:
 	.string "You just happened to win this time,\n"
 	.string "but that doesn't matter.\p"
 	.string "TEAM MAGMA's goal is about to be\n"
 	.string "reached!$"
 
-MagmaHideout_2F_2R_Text_Grunt8Intro: @ 823A0E4
+MagmaHideout_2F_2R_Text_Grunt8Intro:
 	.string "One of our guys was freaking out that\n"
 	.string "he lost his MAGMA EMBLEM…\p"
 	.string "Wait a minute!\n"
 	.string "Was it you who found it?$"
 
-MagmaHideout_2F_2R_Text_Grunt8Defeat: @ 823A14C
+MagmaHideout_2F_2R_Text_Grunt8Defeat:
 	.string "I'm having trouble believing this…$"
 
-MagmaHideout_2F_2R_Text_Grunt8PostBattle: @ 823A16F
+MagmaHideout_2F_2R_Text_Grunt8PostBattle:
 	.string "I'm getting this feeling that our plan\n"
 	.string "is going to end in failure…$"
 
diff --git a/data/maps/MagmaHideout_2F_3R/scripts.inc b/data/maps/MagmaHideout_2F_3R/scripts.inc
index cbcb3fd52..12b076d78 100644
--- a/data/maps/MagmaHideout_2F_3R/scripts.inc
+++ b/data/maps/MagmaHideout_2F_3R/scripts.inc
@@ -1,3 +1,3 @@
-MagmaHideout_2F_3R_MapScripts:: @ 823AD00
+MagmaHideout_2F_3R_MapScripts::
 	.byte 0
 
diff --git a/data/maps/MagmaHideout_3F_1R/scripts.inc b/data/maps/MagmaHideout_3F_1R/scripts.inc
index 04e5526ae..dafb96a5c 100644
--- a/data/maps/MagmaHideout_3F_1R/scripts.inc
+++ b/data/maps/MagmaHideout_3F_1R/scripts.inc
@@ -1,29 +1,29 @@
-MagmaHideout_3F_1R_MapScripts:: @ 823A1B2
+MagmaHideout_3F_1R_MapScripts::
 	.byte 0
 
-MagmaHideout_3F_1R_EventScript_Grunt9:: @ 823A1B3
+MagmaHideout_3F_1R_EventScript_Grunt9::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_9, MagmaHideout_3F_1R_Text_Grunt9Intro, MagmaHideout_3F_1R_Text_Grunt9Defeat
 	msgbox MagmaHideout_3F_1R_Text_Grunt9PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_3F_1R_EventScript_Grunt16:: @ 823A1CA
+MagmaHideout_3F_1R_EventScript_Grunt16::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_16, MagmaHideout_3F_1R_Text_Grunt16Intro, MagmaHideout_3F_1R_Text_Grunt16Defeat
 	msgbox MagmaHideout_3F_1R_Text_Grunt16PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_3F_1R_Text_Grunt9Intro: @ 823A1E1
+MagmaHideout_3F_1R_Text_Grunt9Intro:
 	.string "What did I do to deserve this guard\n"
 	.string "posting?\p"
 	.string "My left ear is burning up!$"
 
-MagmaHideout_3F_1R_Text_Grunt9Defeat: @ 823A229
+MagmaHideout_3F_1R_Text_Grunt9Defeat:
 	.string "I'm getting heat exhaustion…$"
 
-MagmaHideout_3F_1R_Text_Grunt9PostBattle: @ 823A246
+MagmaHideout_3F_1R_Text_Grunt9PostBattle:
 	.string "Do you think it's odd that we're wearing\n"
 	.string "hoods in this magma-filled volcano?$"
 
-MagmaHideout_3F_1R_Text_Grunt16Intro: @ 823A293
+MagmaHideout_3F_1R_Text_Grunt16Intro:
 	.string "We joined so we can help our leader\n"
 	.string "achieve his fantastic vision.\p"
 	.string "I don't care if you're with TEAM AQUA\n"
@@ -31,11 +31,11 @@ MagmaHideout_3F_1R_Text_Grunt16Intro: @ 823A293
 	.string "No one interferes with us and gets\n"
 	.string "away with it!$"
 
-MagmaHideout_3F_1R_Text_Grunt16Defeat: @ 823A353
+MagmaHideout_3F_1R_Text_Grunt16Defeat:
 	.string "Oh, no!\n"
 	.string "You're not to be trusted at all!$"
 
-MagmaHideout_3F_1R_Text_Grunt16PostBattle: @ 823A37C
+MagmaHideout_3F_1R_Text_Grunt16PostBattle:
 	.string "Listen to me.\n"
 	.string "TEAM MAGMA is right!\p"
 	.string "Don't listen to TEAM AQUA.\n"
diff --git a/data/maps/MagmaHideout_3F_2R/scripts.inc b/data/maps/MagmaHideout_3F_2R/scripts.inc
index 06f371151..93a25f424 100644
--- a/data/maps/MagmaHideout_3F_2R/scripts.inc
+++ b/data/maps/MagmaHideout_3F_2R/scripts.inc
@@ -1,12 +1,12 @@
-MagmaHideout_3F_2R_MapScripts:: @ 823A3D4
+MagmaHideout_3F_2R_MapScripts::
 	.byte 0
 
-MagmaHideout_3F_2R_EventScript_Grunt10:: @ 823A3D5
+MagmaHideout_3F_2R_EventScript_Grunt10::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_10, MagmaHideout_3F_2R_Text_Grunt10Intro, MagmaHideout_3F_2R_Text_Grunt10Defeat
 	msgbox MagmaHideout_3F_2R_Text_Grunt10PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_3F_2R_Text_Grunt10Intro: @ 823A3EC
+MagmaHideout_3F_2R_Text_Grunt10Intro:
 	.string "I understand everything our leader\n"
 	.string "says. But you know what?\p"
 	.string "Doing stuff like digging up a super-\n"
@@ -15,11 +15,11 @@ MagmaHideout_3F_2R_Text_Grunt10Intro: @ 823A3EC
 	.string "I think we're going a little too far.\n"
 	.string "What do you think?$"
 
-MagmaHideout_3F_2R_Text_Grunt10Defeat: @ 823A4BB
+MagmaHideout_3F_2R_Text_Grunt10Defeat:
 	.string "Yeah, I think we are doing something\n"
 	.string "wrong somehow.$"
 
-MagmaHideout_3F_2R_Text_Grunt10PostBattle: @ 823A4EF
+MagmaHideout_3F_2R_Text_Grunt10PostBattle:
 	.string "You know, losing to you cleared my mind.\p"
 	.string "The next time I see our leader,\n"
 	.string "I'm going to ask him about what we do.$"
diff --git a/data/maps/MagmaHideout_3F_3R/scripts.inc b/data/maps/MagmaHideout_3F_3R/scripts.inc
index e85cff9a3..94afdddbf 100644
--- a/data/maps/MagmaHideout_3F_3R/scripts.inc
+++ b/data/maps/MagmaHideout_3F_3R/scripts.inc
@@ -1,3 +1,3 @@
-MagmaHideout_3F_3R_MapScripts:: @ 823ACFF
+MagmaHideout_3F_3R_MapScripts::
 	.byte 0
 
diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc
index 199e3c1bc..a89054b7a 100644
--- a/data/maps/MagmaHideout_4F/scripts.inc
+++ b/data/maps/MagmaHideout_4F/scripts.inc
@@ -6,10 +6,10 @@
 .set LOCALID_MAXIE, 6
 .set LOCALID_GROUDON_SLEEPING, 7
 
-MagmaHideout_4F_MapScripts:: @ 823A55F
+MagmaHideout_4F_MapScripts::
 	.byte 0
 
-MagmaHideout_4F_EventScript_Maxie:: @ 823A560
+MagmaHideout_4F_EventScript_Maxie::
 	lockall
 	playbgm MUS_ENCOUNTER_MAGMA, FALSE
 	msgbox MagmaHideout_4F_Text_MaxieAwakenGroudon, MSGBOX_DEFAULT
@@ -81,7 +81,7 @@ MagmaHideout_4F_EventScript_Maxie:: @ 823A560
 	releaseall
 	end
 
-MagmaHideout_4F_Movement_GroudonApproach: @ 823A672
+MagmaHideout_4F_Movement_GroudonApproach:
 	delay_16
 	delay_16
 	walk_slow_down
@@ -94,12 +94,12 @@ MagmaHideout_4F_Movement_GroudonApproach: @ 823A672
 	delay_16
 	step_end
 
-MagmaHideout_4F_Movement_GroudonExit: @ 823A67D
+MagmaHideout_4F_Movement_GroudonExit:
 	slide_up
 	slide_up
 	step_end
 
-MagmaHideout_4F_Movement_MaxieLookAround: @ 823A680
+MagmaHideout_4F_Movement_MaxieLookAround:
 	face_left
 	delay_16
 	face_right
@@ -113,64 +113,64 @@ MagmaHideout_4F_Movement_MaxieLookAround: @ 823A680
 	delay_16
 	step_end
 
-MagmaHideout_4F_EventScript_Grunt11:: @ 823A68C
+MagmaHideout_4F_EventScript_Grunt11::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_11, MagmaHideout_4F_Text_Grunt11Intro, MagmaHideout_4F_Text_Grunt11Defeat
 	msgbox MagmaHideout_4F_Text_Grunt11PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_EventScript_Grunt12:: @ 823A6A3
+MagmaHideout_4F_EventScript_Grunt12::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_12, MagmaHideout_4F_Text_Grunt12Intro, MagmaHideout_4F_Text_Grunt12Defeat
 	msgbox MagmaHideout_4F_Text_Grunt12PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_EventScript_Grunt13:: @ 823A6BA
+MagmaHideout_4F_EventScript_Grunt13::
 	trainerbattle_single TRAINER_GRUNT_MAGMA_HIDEOUT_13, MagmaHideout_4F_Text_Grunt13Intro, MagmaHideout_4F_Text_Grunt13Defeat
 	msgbox MagmaHideout_4F_Text_Grunt13PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_EventScript_Tabitha:: @ 823A6D1
+MagmaHideout_4F_EventScript_Tabitha::
 	trainerbattle_single TRAINER_TABITHA_MAGMA_HIDEOUT, MagmaHideout_4F_Text_TabithaIntro, MagmaHideout_4F_Text_TabithaDefeat
 	msgbox MagmaHideout_4F_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MagmaHideout_4F_Text_Grunt11Intro: @ 823A6E8
+MagmaHideout_4F_Text_Grunt11Intro:
 	.string "I want to see GROUDON, too, but they\n"
 	.string "won't let me see even its tail…\p"
 	.string "It's got me feeling really frustrated.\p"
 	.string "Oh, no!\n"
 	.string "I blabbed about GROUDON!$"
 
-MagmaHideout_4F_Text_Grunt11Defeat: @ 823A775
+MagmaHideout_4F_Text_Grunt11Defeat:
 	.string "I guess it's impossible to win if one\n"
 	.string "doesn't have a calm mind…$"
 
-MagmaHideout_4F_Text_Grunt11PostBattle: @ 823A7B5
+MagmaHideout_4F_Text_Grunt11PostBattle:
 	.string "I wonder if GROUDON even has a tail?$"
 
-MagmaHideout_4F_Text_Grunt12Intro: @ 823A7DA
+MagmaHideout_4F_Text_Grunt12Intro:
 	.string "Fuhahaha!\n"
 	.string "Soon! Very soon!\l"
 	.string "Our grand objective will be achieved!$"
 
-MagmaHideout_4F_Text_Grunt12Defeat: @ 823A81B
+MagmaHideout_4F_Text_Grunt12Defeat:
 	.string "Grrr…\n"
 	.string "I've come so far, but now this?$"
 
-MagmaHideout_4F_Text_Grunt12PostBattle: @ 823A841
+MagmaHideout_4F_Text_Grunt12PostBattle:
 	.string "MAXIE, sir!\n"
 	.string "An intruder is headed your way!$"
 
-MagmaHideout_4F_Text_Grunt13Intro: @ 823A86D
+MagmaHideout_4F_Text_Grunt13Intro:
 	.string "You're not finished yet!\n"
 	.string "You're not getting by me easily!$"
 
-MagmaHideout_4F_Text_Grunt13Defeat: @ 823A8A7
+MagmaHideout_4F_Text_Grunt13Defeat:
 	.string "Was I that easy to knock down?$"
 
-MagmaHideout_4F_Text_Grunt13PostBattle: @ 823A8C6
+MagmaHideout_4F_Text_Grunt13PostBattle:
 	.string "C-come on, one more match…$"
 
-MagmaHideout_4F_Text_TabithaIntro: @ 823A8E1
+MagmaHideout_4F_Text_TabithaIntro:
 	.string "Hehehe!\n"
 	.string "You made it this far, so I'll tell you!\p"
 	.string "That's right!\n"
@@ -180,15 +180,15 @@ MagmaHideout_4F_Text_TabithaIntro: @ 823A8E1
 	.string "It's going to awaken real soon!\n"
 	.string "Hehe! Hehehe!$"
 
-MagmaHideout_4F_Text_TabithaDefeat: @ 823A994
+MagmaHideout_4F_Text_TabithaDefeat:
 	.string "Taken down again…\n"
 	.string "Hehe…$"
 
-MagmaHideout_4F_Text_TabithaPostBattle: @ 823A9AC
+MagmaHideout_4F_Text_TabithaPostBattle:
 	.string "…And while you wasted time with me,\n"
 	.string "MAXIE should have awakened GROUDON…$"
 
-MagmaHideout_4F_Text_MaxieAwakenGroudon: @ 823A9F4
+MagmaHideout_4F_Text_MaxieAwakenGroudon:
 	.string "MAXIE: GROUDON…\p"
 	.string "Nothing could awaken you from your\n"
 	.string "sleep bathed in magma…\p"
@@ -199,25 +199,25 @@ MagmaHideout_4F_Text_MaxieAwakenGroudon: @ 823A9F4
 	.string "And show me…\n"
 	.string "Show me the full extent of your power!$"
 
-MagmaHideout_4F_Text_MaxieGroudonWhatsWrong: @ 823AADA
+MagmaHideout_4F_Text_MaxieGroudonWhatsWrong:
 	.string "MAXIE: GROUDON!\n"
 	.string "What's wrong?\p"
 	.string "Wasn't the BLUE ORB the key?\p"
 	.string "GROUDON!\n"
 	.string "Where have you gone…$"
 
-MagmaHideout_4F_Text_MaxieOhItWasYou: @ 823AB33
+MagmaHideout_4F_Text_MaxieOhItWasYou:
 	.string "MAXIE: Oh, so it was you?\p"
 	.string "I've seen you poking around uninvited\n"
 	.string "here and there…\p"
 	.string "I get it now!\n"
 	.string "You must have pulled a cheap stunt!$"
 
-MagmaHideout_4F_Text_MaxieDefeat: @ 823ABB5
+MagmaHideout_4F_Text_MaxieDefeat:
 	.string "What makes you so adept at handling\n"
 	.string "POKéMON?$"
 
-MagmaHideout_4F_Text_MaxieImGoingAfterGroudon: @ 823ABE2
+MagmaHideout_4F_Text_MaxieImGoingAfterGroudon:
 	.string "MAXIE: There has to be some reason\n"
 	.string "why GROUDON fled…\p"
 	.string "That's what you're trying to say,\n"
diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc
index a6d894793..47bbf9aad 100644
--- a/data/maps/MarineCave_End/scripts.inc
+++ b/data/maps/MarineCave_End/scripts.inc
@@ -1,31 +1,31 @@
 .set LOCALID_KYOGRE, 1
 
-MarineCave_End_MapScripts:: @ 823AFDF
+MarineCave_End_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, MarineCave_End_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, MarineCave_End_OnTransition
 	.byte 0
 
-MarineCave_End_OnResume: @ 823AFEA
+MarineCave_End_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MarineCave_End_EventScript_TryRemoveKyogre
 	end
 
-MarineCave_End_EventScript_TryRemoveKyogre:: @ 823AFF4
+MarineCave_End_EventScript_TryRemoveKyogre::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject LOCALID_KYOGRE
 	return
 
-MarineCave_End_OnTransition: @ 823B008
+MarineCave_End_OnTransition:
 	call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_ShowKyogre
 	end
 
-MarineCave_End_EventScript_ShowKyogre:: @ 823B012
+MarineCave_End_EventScript_ShowKyogre::
 	clearflag FLAG_HIDE_MARINE_CAVE_KYOGRE
 	setvar VAR_TEMP_1, 1
 	return
 
-MarineCave_End_EventScript_Kyogre:: @ 823B01B
+MarineCave_End_EventScript_Kyogre::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
@@ -54,18 +54,18 @@ MarineCave_End_EventScript_Kyogre:: @ 823B01B
 	releaseall
 	end
 
-MarineCave_End_EventScript_DefeatedKyogre:: @ 823B084
+MarineCave_End_EventScript_DefeatedKyogre::
 	setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	setflag FLAG_DEFEATED_KYOGRE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-MarineCave_End_EventScript_RanFromKyogre:: @ 823B092
+MarineCave_End_EventScript_RanFromKyogre::
 	setvar VAR_0x8004, SPECIES_KYOGRE
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-MarineCave_End_Movement_KyogreApproach: @ 823B09D
+MarineCave_End_Movement_KyogreApproach:
 	init_affine_anim
 	walk_down_start_affine
 	delay_16
diff --git a/data/maps/MarineCave_Entrance/scripts.inc b/data/maps/MarineCave_Entrance/scripts.inc
index 1ba4546e3..a075d2c30 100644
--- a/data/maps/MarineCave_Entrance/scripts.inc
+++ b/data/maps/MarineCave_Entrance/scripts.inc
@@ -1,8 +1,8 @@
-MarineCave_Entrance_MapScripts:: @ 823AFD0
+MarineCave_Entrance_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, MarineCave_Entrance_OnResume
 	.byte 0
 
-MarineCave_Entrance_OnResume: @ 823AFD6
+MarineCave_Entrance_OnResume:
 	setdivewarp MAP_UNDERWATER_MARINE_CAVE, 255, 9, 6
 	end
 
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
index 7107f4754..748fbd3c7 100644
--- a/data/maps/MauvilleCity/scripts.inc
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -2,11 +2,11 @@
 .set LOCALID_WALLYS_UNCLE, 7
 .set LOCALID_SCOTT, 11
 
-MauvilleCity_MapScripts:: @ 81DF385
+MauvilleCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_OnTransition
 	.byte 0
 
-MauvilleCity_OnTransition: @ 81DF38B
+MauvilleCity_OnTransition:
 	setflag FLAG_VISITED_MAUVILLE_CITY
 	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
 	clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
@@ -16,45 +16,45 @@ MauvilleCity_OnTransition: @ 81DF38B
 	call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_MoveWattsonBackToGym
 	end
 
-MauvilleCity_EventScript_MoveWattsonBackToGym:: @ 81DF3A9
+MauvilleCity_EventScript_MoveWattsonBackToGym::
 	clearflag FLAG_HIDE_MAUVILLE_GYM_WATTSON
 	setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON
 	setflag FLAG_WATTSON_REMATCH_AVAILABLE
 	return
 
-MauvilleCity_EventScript_Boy:: @ 81DF3B3
+MauvilleCity_EventScript_Boy::
 	msgbox MauvilleCity_Text_NurseHurtMonBackToHealth, MSGBOX_NPC
 	end
 
-MauvilleCity_EventScript_Maniac:: @ 81DF3BC
+MauvilleCity_EventScript_Maniac::
 	msgbox MauvilleCity_Text_AllSortsOfPeopleComeThrough, MSGBOX_NPC
 	end
 
-MauvilleCity_EventScript_Woman:: @ 81DF3C5
+MauvilleCity_EventScript_Woman::
 	msgbox MauvilleCity_Text_RydelVeryGenerous, MSGBOX_NPC
 	end
 
-MauvilleCity_EventScript_RichBoy:: @ 81DF3CE
+MauvilleCity_EventScript_RichBoy::
 	msgbox MauvilleCity_Text_PokemonCanJumpYouOnBike, MSGBOX_NPC
 	end
 
-MauvilleCity_EventScript_CitySign:: @ 81DF3D7
+MauvilleCity_EventScript_CitySign::
 	msgbox MauvilleCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-MauvilleCity_EventScript_GymSign:: @ 81DF3E0
+MauvilleCity_EventScript_GymSign::
 	msgbox MauvilleCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-MauvilleCity_EventScript_BikeShopSign:: @ 81DF3E9
+MauvilleCity_EventScript_BikeShopSign::
 	msgbox MauvilleCity_Text_BikeShopSign, MSGBOX_SIGN
 	end
 
-MauvilleCity_EventScript_GameCornerSign:: @ 81DF3F2
+MauvilleCity_EventScript_GameCornerSign::
 	msgbox MauvilleCity_Text_GameCornerSign, MSGBOX_SIGN
 	end
 
-MauvilleCity_EventScript_SchoolKidM:: @ 81DF3FB
+MauvilleCity_EventScript_SchoolKidM::
 	lock
 	faceplayer
 	goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_TVExplained
@@ -63,12 +63,12 @@ MauvilleCity_EventScript_SchoolKidM:: @ 81DF3FB
 	release
 	end
 
-MauvilleCity_EventScript_TVExplained:: @ 81DF413
+MauvilleCity_EventScript_TVExplained::
 	msgbox MauvilleCity_Text_BeenCheckingOutTV, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_WallysUncle:: @ 81DF41D
+MauvilleCity_EventScript_WallysUncle::
 	lock
 	faceplayer
 	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_UncleAskPlayerToBattleWally
@@ -79,7 +79,7 @@ MauvilleCity_EventScript_WallysUncle:: @ 81DF41D
 	release
 	end
 
-MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: @ 81DF43D
+MauvilleCity_EventScript_UncleAskPlayerToBattleWally::
 	msgbox MauvilleCity_Text_UncleCanYouBattleWally, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_WALLYS_UNCLE, Common_Movement_FaceOriginalDirection
@@ -87,7 +87,7 @@ MauvilleCity_EventScript_UncleAskPlayerToBattleWally:: @ 81DF43D
 	release
 	end
 
-MauvilleCity_EventScript_Wally:: @ 81DF452
+MauvilleCity_EventScript_Wally::
 	lockall
 	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain
 	applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight
@@ -106,7 +106,7 @@ MauvilleCity_EventScript_Wally:: @ 81DF452
 	goto MauvilleCity_EventScript_BattleWallyPrompt
 	end
 
-MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD
+MauvilleCity_EventScript_BattleWallyPrompt::
 	compare VAR_RESULT, YES
 	call_if_eq MauvilleCity_EventScript_BattleWally
 	compare VAR_RESULT, NO
@@ -117,7 +117,7 @@ MauvilleCity_EventScript_BattleWallyPrompt:: @ 81DF4AD
 	case DIR_EAST, MauvilleCity_EventScript_WallyAndUncleExitEast
 	end
 
-MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0
+MauvilleCity_EventScript_WallyAndUncleExitNorth::
 	applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitNorth1
 	applymovement LOCALID_WALLY, MauvilleCity_Movement_WallyExitNorth1
 	applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitNorth1
@@ -137,7 +137,7 @@ MauvilleCity_EventScript_WallyAndUncleExitNorth:: @ 81DF4E0
 	goto MauvilleCity_EventScript_DefeatedWally
 	end
 
-MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D
+MauvilleCity_EventScript_WallyAndUncleExitEast::
 	applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchWallyExitEast1
 	applymovement LOCALID_WALLY, MauvilleCity_Movement_WallyExitEast1
 	applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitEast1
@@ -156,7 +156,7 @@ MauvilleCity_EventScript_WallyAndUncleExitEast:: @ 81DF53D
 	goto MauvilleCity_EventScript_DefeatedWally
 	end
 
-MauvilleCity_EventScript_DefeatedWally:: @ 81DF593
+MauvilleCity_EventScript_DefeatedWally::
 	removeobject LOCALID_WALLY
 	removeobject LOCALID_WALLYS_UNCLE
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY
@@ -181,32 +181,32 @@ MauvilleCity_EventScript_DefeatedWally:: @ 81DF593
 	releaseall
 	end
 
-MauvilleCity_EventScript_ScottApproachPlayerNorth:: @ 81DF5F3
+MauvilleCity_EventScript_ScottApproachPlayerNorth::
 	addobject LOCALID_SCOTT
 	applymovement LOCALID_SCOTT, MauvilleCity_Movement_ScottApproachPlayerNorth
 	waitmovement 0
 	return
 
-MauvilleCity_EventScript_ScottApproachPlayerEast:: @ 81DF601
+MauvilleCity_EventScript_ScottApproachPlayerEast::
 	setobjectxyperm LOCALID_SCOTT, 12, 13
 	addobject LOCALID_SCOTT
 	applymovement LOCALID_SCOTT, MauvilleCity_Movement_ScottApproachPlayerEast
 	waitmovement 0
 	return
 
-MauvilleCity_EventScript_ScottExitNorth:: @ 81DF616
+MauvilleCity_EventScript_ScottExitNorth::
 	applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitNorth
 	applymovement LOCALID_SCOTT, MauvilleCity_Movement_ScottExitNorth
 	waitmovement 0
 	return
 
-MauvilleCity_EventScript_ScottExitEast:: @ 81DF628
+MauvilleCity_EventScript_ScottExitEast::
 	applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerWatchScottExitEast
 	applymovement LOCALID_SCOTT, MauvilleCity_Movement_ScottExitEast
 	waitmovement 0
 	return
 
-MauvilleCity_EventScript_BattleWally:: @ 81DF63A
+MauvilleCity_EventScript_BattleWally::
 	msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_WALLY_MAUVILLE, MauvilleCity_Text_WallyDefeat
 	applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight
@@ -220,20 +220,20 @@ MauvilleCity_EventScript_BattleWally:: @ 81DF63A
 	msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT
 	return
 
-MauvilleCity_EventScript_DeclineWallyBattle:: @ 81DF683
+MauvilleCity_EventScript_DeclineWallyBattle::
 	setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
 	msgbox MauvilleCity_Text_WallyMyUncleWontKnowImStrong, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_WallyRequestBattleAgain:: @ 81DF690
+MauvilleCity_EventScript_WallyRequestBattleAgain::
 	applymovement LOCALID_WALLY, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MauvilleCity_Text_WallyPleaseBattleMe, MSGBOX_YESNO
 	goto MauvilleCity_EventScript_BattleWallyPrompt
 	end
 
-MauvilleCity_Movement_WallyExitNorth1: @ 81DF6A8
+MauvilleCity_Movement_WallyExitNorth1:
 	walk_left
 	walk_left
 	walk_down
@@ -241,7 +241,7 @@ MauvilleCity_Movement_WallyExitNorth1: @ 81DF6A8
 	walk_left
 	step_end
 
-MauvilleCity_Movement_WallyExitEast1: @ 81DF6AE
+MauvilleCity_Movement_WallyExitEast1:
 	walk_down
 	walk_down
 	walk_left
@@ -249,7 +249,7 @@ MauvilleCity_Movement_WallyExitEast1: @ 81DF6AE
 	walk_left
 	step_end
 
-MauvilleCity_Movement_WallyExitNorth2: @ 81DF6B4
+MauvilleCity_Movement_WallyExitNorth2:
 	delay_16
 	delay_16
 	walk_left
@@ -263,7 +263,7 @@ MauvilleCity_Movement_WallyExitNorth2: @ 81DF6B4
 	delay_8
 	step_end
 
-MauvilleCity_Movement_WallyExitEast2: @ 81DF6C0
+MauvilleCity_Movement_WallyExitEast2:
 	delay_16
 	delay_16
 	walk_left
@@ -277,41 +277,41 @@ MauvilleCity_Movement_WallyExitEast2: @ 81DF6C0
 	delay_8
 	step_end
 
-MauvilleCity_Movement_PlayerWatchWallyExitNorth2: @ 81DF6CC
+MauvilleCity_Movement_PlayerWatchWallyExitNorth2:
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
 	step_end
 
-MauvilleCity_Movement_PlayerWatchWallyExitEast2: @ 81DF6D0
+MauvilleCity_Movement_PlayerWatchWallyExitEast2:
 	delay_16
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MauvilleCity_Movement_PlayerWatchScottExitNorth: @ 81DF6D5
+MauvilleCity_Movement_PlayerWatchScottExitNorth:
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MauvilleCity_Movement_PlayerWatchScottExitEast: @ 81DF6D8
+MauvilleCity_Movement_PlayerWatchScottExitEast:
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MauvilleCity_Movement_PlayerWatchWallyExitEast1: @ 81DF6DC
+MauvilleCity_Movement_PlayerWatchWallyExitEast1:
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-MauvilleCity_Movement_PlayerWatchWallyExitNorth1: @ 81DF6DF
+MauvilleCity_Movement_PlayerWatchWallyExitNorth1:
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MauvilleCity_Movement_WallysUncleExitNorth1: @ 81DF6E2
+MauvilleCity_Movement_WallysUncleExitNorth1:
 	walk_left
 	walk_left
 	walk_left
@@ -319,7 +319,7 @@ MauvilleCity_Movement_WallysUncleExitNorth1: @ 81DF6E2
 	walk_down
 	step_end
 
-MauvilleCity_Movement_WallysUncleExitEast1: @ 81DF6E8
+MauvilleCity_Movement_WallysUncleExitEast1:
 	walk_left
 	walk_down
 	walk_down
@@ -327,25 +327,25 @@ MauvilleCity_Movement_WallysUncleExitEast1: @ 81DF6E8
 	walk_left
 	step_end
 
-MauvilleCity_Movement_PlayerFaceUncleNorth: @ 81DF6EE
+MauvilleCity_Movement_PlayerFaceUncleNorth:
 	delay_16
 	delay_8
 	delay_4
 	walk_in_place_fastest_down
 	step_end
 
-MauvilleCity_Movement_WallysUncleApproachPlayerNorth: @ 81DF6F3
+MauvilleCity_Movement_WallysUncleApproachPlayerNorth:
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MauvilleCity_Movement_WallysUncleApproachPlayerEast: @ 81DF6F7
+MauvilleCity_Movement_WallysUncleApproachPlayerEast:
 	walk_right
 	walk_up
 	step_end
 
-MauvilleCity_Movement_WallysUncleExitNorth2: @ 81DF6FA
+MauvilleCity_Movement_WallysUncleExitNorth2:
 	walk_left
 	walk_left
 	walk_left
@@ -356,7 +356,7 @@ MauvilleCity_Movement_WallysUncleExitNorth2: @ 81DF6FA
 	walk_left
 	step_end
 
-MauvilleCity_Movement_WallysUncleExitEast2: @ 81DF703
+MauvilleCity_Movement_WallysUncleExitEast2:
 	walk_down
 	walk_left
 	walk_left
@@ -368,7 +368,7 @@ MauvilleCity_Movement_WallysUncleExitEast2: @ 81DF703
 	walk_left
 	step_end
 
-MauvilleCity_Movement_ScottApproachPlayerNorth: @ 81DF70D
+MauvilleCity_Movement_ScottApproachPlayerNorth:
 	walk_up
 	walk_up
 	walk_up
@@ -382,7 +382,7 @@ MauvilleCity_Movement_ScottApproachPlayerNorth: @ 81DF70D
 	walk_in_place_fastest_up
 	step_end
 
-MauvilleCity_Movement_ScottApproachPlayerEast: @ 81DF719
+MauvilleCity_Movement_ScottApproachPlayerEast:
 	walk_up
 	walk_up
 	walk_up
@@ -396,7 +396,7 @@ MauvilleCity_Movement_ScottApproachPlayerEast: @ 81DF719
 	walk_up
 	step_end
 
-MauvilleCity_Movement_ScottExitNorth: @ 81DF725
+MauvilleCity_Movement_ScottExitNorth:
 	walk_left
 	walk_left
 	walk_left
@@ -408,7 +408,7 @@ MauvilleCity_Movement_ScottExitNorth: @ 81DF725
 	walk_left
 	step_end
 
-MauvilleCity_Movement_ScottExitEast: @ 81DF72F
+MauvilleCity_Movement_ScottExitEast:
 	walk_down
 	walk_left
 	walk_left
@@ -421,7 +421,7 @@ MauvilleCity_Movement_ScottExitEast: @ 81DF72F
 	walk_left
 	step_end
 
-MauvilleCity_EventScript_Wattson:: @ 81DF73A
+MauvilleCity_EventScript_Wattson::
 	lock
 	faceplayer
 	goto_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_ReceivedThunderbolt
@@ -435,12 +435,12 @@ MauvilleCity_EventScript_Wattson:: @ 81DF73A
 	release
 	end
 
-MauvilleCity_EventScript_BegunNewMauville:: @ 81DF77A
+MauvilleCity_EventScript_BegunNewMauville::
 	msgbox MauvilleCity_Text_WattsonWontBeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_CompletedNewMauville:: @ 81DF784
+MauvilleCity_EventScript_CompletedNewMauville::
 	msgbox MauvilleCity_Text_WattsonThanksTakeTM, MSGBOX_DEFAULT
 	giveitem ITEM_TM24
 	compare VAR_RESULT, FALSE
@@ -450,12 +450,12 @@ MauvilleCity_EventScript_CompletedNewMauville:: @ 81DF784
 	release
 	end
 
-MauvilleCity_EventScript_ReceivedThunderbolt:: @ 81DF7B0
+MauvilleCity_EventScript_ReceivedThunderbolt::
 	msgbox MauvilleCity_Text_WattsonYoungTakeCharge, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_RegisterWallyCall:: @ 81DF7BA
+MauvilleCity_EventScript_RegisterWallyCall::
 	lockall
 	pokenavcall MauvilleCity_Text_WallyPokenavCall
 	waitmessage
@@ -470,30 +470,30 @@ MauvilleCity_EventScript_RegisterWallyCall:: @ 81DF7BA
 	releaseall
 	end
 
-MauvilleCity_Text_UncleHesTooPeppy: @ 81DF7DC
+MauvilleCity_Text_UncleHesTooPeppy:
 	.string "UNCLE: It's because of POKéMON that\n"
 	.string "this boy's got more pep, I suppose…\l"
 	.string "But he's become a bit too peppy…$"
 
-MauvilleCity_Text_WallyWantToChallengeGym: @ 81DF845
+MauvilleCity_Text_WallyWantToChallengeGym:
 	.string "WALLY: Aww, UNCLE, please?\p"
 	.string "I want to challenge this GYM and see\n"
 	.string "how much better I've become.\p"
 	.string "Please? May I, please?$"
 
-MauvilleCity_Text_UncleYourePushingIt: @ 81DF8B9
+MauvilleCity_Text_UncleYourePushingIt:
 	.string "UNCLE: Now hold on, WALLY.\p"
 	.string "Since you started living with POKéMON,\n"
 	.string "you have grown quite a lot stronger.\p"
 	.string "But don't you think you're pushing it\n"
 	.string "to suddenly challenge a GYM?$"
 
-MauvilleCity_Text_WallyWeCanBeatAnyone: @ 81DF963
+MauvilleCity_Text_WallyWeCanBeatAnyone:
 	.string "WALLY: I'm not pushing it.\p"
 	.string "If I combine forces with RALTS,\n"
 	.string "we can beat anyone!$"
 
-MauvilleCity_Text_WallyWillYouBattleMe: @ 81DF9B2
+MauvilleCity_Text_WallyWillYouBattleMe:
 	.string "WALLY: Oh! Hi, {PLAYER}!\p"
 	.string "I've gotten a lot stronger since\n"
 	.string "we met.\p"
@@ -502,43 +502,43 @@ MauvilleCity_Text_WallyWillYouBattleMe: @ 81DF9B2
 	.string "{PLAYER}, please, will you have\n"
 	.string "a battle with me?$"
 
-MauvilleCity_Text_WallyMyUncleWontKnowImStrong: @ 81DFA4A
+MauvilleCity_Text_WallyMyUncleWontKnowImStrong:
 	.string "WALLY: Oh… If you won't battle me,\n"
 	.string "{PLAYER}, my UNCLE won't know that I've\l"
 	.string "become really strong.$"
 
-MauvilleCity_Text_UncleCanYouBattleWally: @ 81DFAA5
+MauvilleCity_Text_UncleCanYouBattleWally:
 	.string "UNCLE: {PLAYER}{KUN}, was it?\n"
 	.string "On WALLY's behalf, can I ask you to\l"
 	.string "battle with him just this once?\p"
 	.string "I don't think he's going to listen to\n"
 	.string "any reason the way he is now.$"
 
-MauvilleCity_Text_WallyPleaseBattleMe: @ 81DFB42
+MauvilleCity_Text_WallyPleaseBattleMe:
 	.string "WALLY: {PLAYER}, please!\n"
 	.string "Battle with me, please.$"
 
-MauvilleCity_Text_WallyHereICome: @ 81DFB6D
+MauvilleCity_Text_WallyHereICome:
 	.string "WALLY: {PLAYER}, thank you.\p"
 	.string "Okay… Here I come!$"
 
-MauvilleCity_Text_WallyDefeat: @ 81DFB96
+MauvilleCity_Text_WallyDefeat:
 	.string "WALLY: … … … … … … …\p"
 	.string "… … … … … … … …\p"
 	.string "I lost…$"
 
-MauvilleCity_Text_WallyIllGoBackToVerdanturf: @ 81DFBC3
+MauvilleCity_Text_WallyIllGoBackToVerdanturf:
 	.string "WALLY: UNCLE…\n"
 	.string "I'll go back to VERDANTURF…$"
 
-MauvilleCity_Text_ThankYouNotEnoughToBattle: @ 81DFBED
+MauvilleCity_Text_ThankYouNotEnoughToBattle:
 	.string "{PLAYER}, thank you.\n"
 	.string "Being a TRAINER is tough, isn't it?\p"
 	.string "It's not enough just to have POKéMON\n"
 	.string "and make them battle. That isn't what\l"
 	.string "being a real TRAINER is about.$"
 
-MauvilleCity_Text_UncleNoNeedToBeDown: @ 81DFC8A
+MauvilleCity_Text_UncleNoNeedToBeDown:
 	.string "UNCLE: WALLY, there's no need to be so\n"
 	.string "down on yourself.\p"
 	.string "Why, what's keeping you from becoming\n"
@@ -546,7 +546,7 @@ MauvilleCity_Text_UncleNoNeedToBeDown: @ 81DFC8A
 	.string "Come on, let's go home.\n"
 	.string "Everyone's waiting for you.$"
 
-MauvilleCity_Text_UncleVisitUsSometime: @ 81DFD34
+MauvilleCity_Text_UncleVisitUsSometime:
 	.string "UNCLE: {PLAYER}{KUN}, it just dawned on me\n"
 	.string "that you must be the TRAINER who kept\l"
 	.string "an eye out for WALLY when he caught\l"
@@ -556,7 +556,7 @@ MauvilleCity_Text_UncleVisitUsSometime: @ 81DFD34
 	.string "I'm sure WALLY would enjoy it.$"
 
 
-MauvilleCity_Text_WallyPokenavCall: @ 81DFDFB
+MauvilleCity_Text_WallyPokenavCall:
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "WALLY: Oh, hello, {PLAYER}!\p"
@@ -567,11 +567,11 @@ MauvilleCity_Text_WallyPokenavCall: @ 81DFDFB
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-MauvilleCity_Text_RegisteredWally: @ 81DFEB4
+MauvilleCity_Text_RegisteredWally:
 	.string "Registered WALLY\n"
 	.string "in the POKéNAV.$"
 
-MauvilleCity_Text_ScottYouDidntHoldBack: @ 81DFED5
+MauvilleCity_Text_ScottYouDidntHoldBack:
 	.string "SCOTT: Hehe…\n"
 	.string "I was watching that match!\p"
 	.string "You're friends with that boy WALLY,\n"
@@ -584,7 +584,7 @@ MauvilleCity_Text_ScottYouDidntHoldBack: @ 81DFED5
 	.string "… … … … … …\n"
 	.string "I'll be cheering for you!$"
 
-MauvilleCity_Text_WattsonNeedFavorTakeKey: @ 81DFFE4
+MauvilleCity_Text_WattsonNeedFavorTakeKey:
 	.string "WATTSON: Oh, {PLAYER}{KUN}!\n"
 	.string "You look like you have a lot of zip!\l"
 	.string "That's a good thing, wahahahaha!\p"
@@ -599,7 +599,7 @@ MauvilleCity_Text_WattsonNeedFavorTakeKey: @ 81DFFE4
 	.string "Here, this is the KEY to get into\n"
 	.string "NEW MAUVILLE.$"
 
-MauvilleCity_Text_WattsonWontBeChallenge: @ 81E0154
+MauvilleCity_Text_WattsonWontBeChallenge:
 	.string "WATTSON: Don't you worry about it.\n"
 	.string "It won't be a challenge to you.\p"
 	.string "The entrance to NEW MAUVILLE is just\n"
@@ -607,7 +607,7 @@ MauvilleCity_Text_WattsonWontBeChallenge: @ 81E0154
 	.string "That's it, then, you have my trust!\n"
 	.string "Wahahahaha!$"
 
-MauvilleCity_Text_WattsonThanksTakeTM: @ 81E020E
+MauvilleCity_Text_WattsonThanksTakeTM:
 	.string "WATTSON: Wahahahaha!\p"
 	.string "I knew it, {PLAYER}{KUN}! I knew I'd made\n"
 	.string "the right choice asking you!\p"
@@ -615,51 +615,51 @@ MauvilleCity_Text_WattsonThanksTakeTM: @ 81E020E
 	.string "THUNDERBOLT!\p"
 	.string "Go on, you've earned it!$"
 
-MauvilleCity_Text_WattsonYoungTakeCharge: @ 81E02AA
+MauvilleCity_Text_WattsonYoungTakeCharge:
 	.string "WATTSON: Wahahahaha!\p"
 	.string "It pleases me to no end to see\n"
 	.string "the young step up and take charge!$"
 
-MauvilleCity_Text_NurseHurtMonBackToHealth: @ 81E0301
+MauvilleCity_Text_NurseHurtMonBackToHealth:
 	.string "You know, it's cool to have POKéMON\n"
 	.string "battles and stuff…\p"
 	.string "But if your POKéMON gets hurt,\n"
 	.string "you have to nurse it back to health.$"
 
-MauvilleCity_Text_AllSortsOfPeopleComeThrough: @ 81E037C
+MauvilleCity_Text_AllSortsOfPeopleComeThrough:
 	.string "The roads of this town stretch north\n"
 	.string "and south, and east and west.\p"
 	.string "Because of that, we get all sorts of\n"
 	.string "people coming through.$"
 
-MauvilleCity_Text_RydelVeryGenerous: @ 81E03FB
+MauvilleCity_Text_RydelVeryGenerous:
 	.string "Have you been to RYDEL'S CYCLES yet?\p"
 	.string "RYDEL, the owner, is a very generous\n"
 	.string "man.$"
 
-MauvilleCity_Text_PokemonCanJumpYouOnBike: @ 81E044A
+MauvilleCity_Text_PokemonCanJumpYouOnBike:
 	.string "Even if you're riding a BIKE,\n"
 	.string "wild POKéMON could jump you.$"
 
-MauvilleCity_Text_CitySign: @ 81E0485
+MauvilleCity_Text_CitySign:
 	.string "MAUVILLE CITY\n"
 	.string "“The bright and shiny city of fun!”$"
 
-MauvilleCity_Text_GymSign: @ 81E04B7
+MauvilleCity_Text_GymSign:
 	.string "MAUVILLE CITY POKéMON GYM\n"
 	.string "LEADER: WATTSON\l"
 	.string "“The cheerfully electrifying man!”$"
 
-MauvilleCity_Text_BikeShopSign: @ 81E0504
+MauvilleCity_Text_BikeShopSign:
 	.string "“Ride in gravel and shake up your\n"
 	.string "soul!”\l"
 	.string "RYDEL'S CYCLES$"
 
-MauvilleCity_Text_GameCornerSign: @ 81E053C
+MauvilleCity_Text_GameCornerSign:
 	.string "“The play spot for all!”\n"
 	.string "MAUVILLE GAME CORNER$"
 
-MauvilleCity_Text_ExplainTV: @ 81E056A
+MauvilleCity_Text_ExplainTV:
 	.string "Hi, do you check out TV at all?\p"
 	.string "They've added a bunch of cool new\n"
 	.string "shows recently.\p"
@@ -671,5 +671,5 @@ MauvilleCity_Text_ExplainTV: @ 81E056A
 	.string "That's why I think you should check\n"
 	.string "out TVs whenever you can.$"
 
-MauvilleCity_Text_BeenCheckingOutTV: @ 81E0699
+MauvilleCity_Text_BeenCheckingOutTV:
 	.string "Hi, have you been checking out TVs?$"
diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc
index 6832554e4..45efbe8f3 100644
--- a/data/maps/MauvilleCity_BikeShop/scripts.inc
+++ b/data/maps/MauvilleCity_BikeShop/scripts.inc
@@ -1,7 +1,7 @@
-MauvilleCity_BikeShop_MapScripts:: @ 820EBBB
+MauvilleCity_BikeShop_MapScripts::
 	.byte 0
 
-MauvilleCity_BikeShop_EventScript_Rydel:: @ 820EBBC
+MauvilleCity_BikeShop_EventScript_Rydel::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_AskSwitchBikes
@@ -14,7 +14,7 @@ MauvilleCity_BikeShop_EventScript_Rydel:: @ 820EBBC
 	goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar
 	end
 
-MauvilleCity_BikeShop_EventScript_SkipGreeting:: @ 820EBF7
+MauvilleCity_BikeShop_EventScript_SkipGreeting::
 	msgbox MauvilleCity_BikeShop_Text_DidYouComeFromFarAway, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq MauvilleCity_BikeShop_EventScript_YesFar
@@ -22,7 +22,7 @@ MauvilleCity_BikeShop_EventScript_SkipGreeting:: @ 820EBF7
 	goto_if_eq MauvilleCity_BikeShop_EventScript_NotFar
 	end
 
-MauvilleCity_BikeShop_EventScript_ChooseBike:: @ 820EC16
+MauvilleCity_BikeShop_EventScript_ChooseBike::
 	message MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne
 	waitmessage
 	multichoice 21, 8, MULTI_BIKE, TRUE
@@ -31,36 +31,36 @@ MauvilleCity_BikeShop_EventScript_ChooseBike:: @ 820EC16
 	case 1, MauvilleCity_BikeShop_EventScript_GetAcroBike
 	end
 
-MauvilleCity_BikeShop_EventScript_NotFar:: @ 820EC3D
+MauvilleCity_BikeShop_EventScript_NotFar::
 	setflag FLAG_DECLINED_BIKE
 	msgbox MauvilleCity_BikeShop_Text_GuessYouDontNeedBike, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_BikeShop_EventScript_YesFar:: @ 820EC4A
+MauvilleCity_BikeShop_EventScript_YesFar::
 	setflag FLAG_RECEIVED_BIKE
 	goto MauvilleCity_BikeShop_EventScript_ChooseBike
 	end
 
-MauvilleCity_BikeShop_EventScript_GetMachBike:: @ 820EC53
+MauvilleCity_BikeShop_EventScript_GetMachBike::
 	msgbox MauvilleCity_BikeShop_Text_ChoseMachBike, MSGBOX_DEFAULT
 	giveitem ITEM_MACH_BIKE
 	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
-MauvilleCity_BikeShop_EventScript_GetAcroBike:: @ 820EC6D
+MauvilleCity_BikeShop_EventScript_GetAcroBike::
 	msgbox MauvilleCity_BikeShop_Text_ChoseAcroBike, MSGBOX_DEFAULT
 	giveitem ITEM_ACRO_BIKE
 	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
-MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes:: @ 820EC87
+MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes::
 	msgbox MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes, MSGBOX_DEFAULT
 	special SwapRegisteredBike
 	release
 	end
 
-MauvilleCity_BikeShop_EventScript_AskSwitchBikes:: @ 820EC94
+MauvilleCity_BikeShop_EventScript_AskSwitchBikes::
 	msgbox MauvilleCity_BikeShop_Text_WantToSwitchBikes, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq MauvilleCity_BikeShop_EventScript_SwitchBikes
@@ -69,7 +69,7 @@ MauvilleCity_BikeShop_EventScript_AskSwitchBikes:: @ 820EC94
 	end
 
 @ If the player does not have a bike on them Rydel assumes its stored in the PC
-MauvilleCity_BikeShop_EventScript_SwitchBikes:: @ 820ECB3
+MauvilleCity_BikeShop_EventScript_SwitchBikes::
 	msgbox MauvilleCity_BikeShop_Text_IllSwitchBikes, MSGBOX_DEFAULT
 	checkitem ITEM_ACRO_BIKE, 1
 	compare VAR_RESULT, TRUE
@@ -81,12 +81,12 @@ MauvilleCity_BikeShop_EventScript_SwitchBikes:: @ 820ECB3
 	release
 	end
 
-MauvilleCity_BikeShop_EventScript_KeepBike:: @ 820ECE5
+MauvilleCity_BikeShop_EventScript_KeepBike::
 	msgbox MauvilleCity_BikeShop_Text_HappyYouLikeIt, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_BikeShop_EventScript_SwitchAcroForMach:: @ 820ECEF
+MauvilleCity_BikeShop_EventScript_SwitchAcroForMach::
 	incrementgamestat GAME_STAT_TRADED_BIKES
 	msgbox MauvilleCity_BikeShop_Text_ExchangedAcroForMach, MSGBOX_DEFAULT
 	removeitem ITEM_ACRO_BIKE
@@ -94,7 +94,7 @@ MauvilleCity_BikeShop_EventScript_SwitchAcroForMach:: @ 820ECEF
 	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
-MauvilleCity_BikeShop_EventScript_SwitchMachForAcro:: @ 820ED10
+MauvilleCity_BikeShop_EventScript_SwitchMachForAcro::
 	incrementgamestat GAME_STAT_TRADED_BIKES
 	msgbox MauvilleCity_BikeShop_Text_ExchangedMachForAcro, MSGBOX_DEFAULT
 	removeitem ITEM_MACH_BIKE
@@ -102,17 +102,17 @@ MauvilleCity_BikeShop_EventScript_SwitchMachForAcro:: @ 820ED10
 	goto MauvilleCity_BikeShop_EventScript_ComeBackToSwitchBikes
 	end
 
-MauvilleCity_BikeShop_EventScript_Assistant:: @ 820ED31
+MauvilleCity_BikeShop_EventScript_Assistant::
 	msgbox MauvilleCity_BikeShop_Text_HandbooksAreInBack, MSGBOX_NPC
 	end
 
-MauvilleCity_BikeShop_EventScript_MachBikeHandbook:: @ 820ED3A
+MauvilleCity_BikeShop_EventScript_MachBikeHandbook::
 	message MauvilleCity_BikeShop_Text_MachHandbookWhichPage
 	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage:: @ 820ED46
+MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage::
 	multichoice 0, 0, MULTI_MACH_BIKE_INFO, FALSE
 	switch VAR_RESULT
 	case 0, MauvilleCity_BikeShop_EventScript_HowToRide
@@ -122,35 +122,35 @@ MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage:: @ 820ED46
 	case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_ExitMachHandbook
 	end
 
-MauvilleCity_BikeShop_EventScript_HowToRide:: @ 820ED88
+MauvilleCity_BikeShop_EventScript_HowToRide::
 	message MauvilleCity_BikeShop_Text_HowToRideMachBike
 	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_HowToTurn:: @ 820ED94
+MauvilleCity_BikeShop_EventScript_HowToTurn::
 	message MauvilleCity_BikeShop_Text_HowToTurnMachBike
 	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_SandySlopes:: @ 820EDA0
+MauvilleCity_BikeShop_EventScript_SandySlopes::
 	message MauvilleCity_BikeShop_Text_SandySlopes
 	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_ChooseMachHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_ExitMachHandbook:: @ 820EDAC
+MauvilleCity_BikeShop_EventScript_ExitMachHandbook::
 	release
 	end
 
-MauvilleCity_BikeShop_EventScript_AcroBikeHandbook:: @ 820EDAE
+MauvilleCity_BikeShop_EventScript_AcroBikeHandbook::
 	message MauvilleCity_BikeShop_Text_AcroHandbookWhichPage
 	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage:: @ 820EDBA
+MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage::
 	multichoice 0, 0, MULTI_ACRO_BIKE_INFO, FALSE
 	switch VAR_RESULT
 	case 0, MauvilleCity_BikeShop_EventScript_Wheelies
@@ -160,45 +160,45 @@ MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage:: @ 820EDBA
 	case MULTI_B_PRESSED, MauvilleCity_BikeShop_EventScript_ExitAcroHandbook
 	end
 
-MauvilleCity_BikeShop_EventScript_Wheelies:: @ 820EDFC
+MauvilleCity_BikeShop_EventScript_Wheelies::
 	message MauvilleCity_BikeShop_Text_Wheelies
 	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_BunnyHops:: @ 820EE08
+MauvilleCity_BikeShop_EventScript_BunnyHops::
 	message MauvilleCity_BikeShop_Text_BunnyHops
 	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_Jumps:: @ 820EE14
+MauvilleCity_BikeShop_EventScript_Jumps::
 	message MauvilleCity_BikeShop_Text_Jumps
 	waitmessage
 	goto MauvilleCity_BikeShop_EventScript_ChooseAcroHandbookPage
 	end
 
-MauvilleCity_BikeShop_EventScript_ExitAcroHandbook:: @ 820EE20
+MauvilleCity_BikeShop_EventScript_ExitAcroHandbook::
 	release
 	end
 
-MauvilleCity_BikeShop_Text_RydelGreeting: @ 820EE22
+MauvilleCity_BikeShop_Text_RydelGreeting:
 	.string "Well, well, what have we here?\n"
 	.string "A most energetic customer!\p"
 	.string "Me? You may call me RYDEL.\n"
 	.string "I'm the owner of this cycle shop.$"
 
-MauvilleCity_BikeShop_Text_DidYouComeFromFarAway: @ 820EE99
+MauvilleCity_BikeShop_Text_DidYouComeFromFarAway:
 	.string "RYDEL: Your RUNNING SHOES…\n"
 	.string "They're awfully filthy.\p"
 	.string "Did you come from far away?$"
 
-MauvilleCity_BikeShop_Text_GuessYouDontNeedBike: @ 820EEE8
+MauvilleCity_BikeShop_Text_GuessYouDontNeedBike:
 	.string "RYDEL: Is that right?\p"
 	.string "Then, I guess you have no need for\n"
 	.string "any of my BIKES.$"
 
-MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne: @ 820EF32
+MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne:
 	.string "RYDEL: Hm, hm… … … … …\p"
 	.string "You're saying that you came all this\n"
 	.string "way from LITTLEROOT?\p"
@@ -222,37 +222,37 @@ MauvilleCity_BikeShop_Text_ExplainBikesChooseWhichOne: @ 820EF32
 	.string "have whichever one you like!\p"
 	.string "Which one will you choose?$"
 
-MauvilleCity_BikeShop_Text_ChoseMachBike: @ 820F18D
+MauvilleCity_BikeShop_Text_ChoseMachBike:
 	.string "{PLAYER} chose the MACH BIKE.$"
 
-MauvilleCity_BikeShop_Text_ChoseAcroBike: @ 820F1A5
+MauvilleCity_BikeShop_Text_ChoseAcroBike:
 	.string "{PLAYER} chose the ACRO BIKE.$"
 
-MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes: @ 820F1BD
+MauvilleCity_BikeShop_Text_ComeBackToSwitchBikes:
 	.string "RYDEL: If you get the urge to switch\n"
 	.string "BIKES, just come see me!$"
 
-MauvilleCity_BikeShop_Text_WantToSwitchBikes: @ 820F1FB
+MauvilleCity_BikeShop_Text_WantToSwitchBikes:
 	.string "RYDEL: Oh? Were you thinking about\n"
 	.string "switching BIKES?$"
 
-MauvilleCity_BikeShop_Text_IllSwitchBikes: @ 820F22F
+MauvilleCity_BikeShop_Text_IllSwitchBikes:
 	.string "RYDEL: Okay, no problem!\n"
 	.string "I'll switch BIKES for you!$"
 
-MauvilleCity_BikeShop_Text_ExchangedMachForAcro: @ 820F263
+MauvilleCity_BikeShop_Text_ExchangedMachForAcro:
 	.string "{PLAYER} got the MACH BIKE exchanged\n"
 	.string "for an ACRO BIKE.$"
 
-MauvilleCity_BikeShop_Text_ExchangedAcroForMach: @ 820F294
+MauvilleCity_BikeShop_Text_ExchangedAcroForMach:
 	.string "{PLAYER} got the ACRO BIKE exchanged\n"
 	.string "for a MACH BIKE.$"
 
-MauvilleCity_BikeShop_Text_HappyYouLikeIt: @ 820F2C4
+MauvilleCity_BikeShop_Text_HappyYouLikeIt:
 	.string "RYDEL: Good, good!\n"
 	.string "I'm happy that you like it!$"
 
-MauvilleCity_BikeShop_Text_OhYourBikeIsInPC: @ 820F2F3
+MauvilleCity_BikeShop_Text_OhYourBikeIsInPC:
 	.string "Oh? What happened to that BIKE\n"
 	.string "I gave you?\p"
 	.string "Oh, I get it, you stored it using your PC.\p"
@@ -261,18 +261,18 @@ MauvilleCity_BikeShop_Text_OhYourBikeIsInPC: @ 820F2F3
 	.string "May the wind always be at your back\n"
 	.string "on your adventure!$"
 
-MauvilleCity_BikeShop_Text_HandbooksAreInBack: @ 820F3C3
+MauvilleCity_BikeShop_Text_HandbooksAreInBack:
 	.string "I'm learning about BIKES while\n"
 	.string "I work here.\p"
 	.string "If you need advice on how to ride your\n"
 	.string "BIKE, there're a couple handbooks in\l"
 	.string "the back.$"
 
-MauvilleCity_BikeShop_Text_MachHandbookWhichPage: @ 820F445
+MauvilleCity_BikeShop_Text_MachHandbookWhichPage:
 	.string "It's a handbook on the MACH BIKE.\p"
 	.string "Which page do you want to read?$"
 
-MauvilleCity_BikeShop_Text_HowToRideMachBike: @ 820F487
+MauvilleCity_BikeShop_Text_HowToRideMachBike:
 	.string "A BIKE moves in the direction that\n"
 	.string "the + Control Pad is pressed.\p"
 	.string "It will speed up once it gets rolling.\p"
@@ -280,7 +280,7 @@ MauvilleCity_BikeShop_Text_HowToRideMachBike: @ 820F487
 	.string "The BIKE will slow to a stop.\p"
 	.string "Want to read a different page?$"
 
-MauvilleCity_BikeShop_Text_HowToTurnMachBike: @ 820F550
+MauvilleCity_BikeShop_Text_HowToTurnMachBike:
 	.string "A MACH BIKE is speedy, but it can't\n"
 	.string "stop very quickly.\p"
 	.string "It gets a little tricky to get around\n"
@@ -289,7 +289,7 @@ MauvilleCity_BikeShop_Text_HowToTurnMachBike: @ 820F550
 	.string "before the corner and slow down.\p"
 	.string "Want to read a different page?$"
 
-MauvilleCity_BikeShop_Text_SandySlopes: @ 820F61A
+MauvilleCity_BikeShop_Text_SandySlopes:
 	.string "There are small sandy slopes\n"
 	.string "throughout the HOENN region.\p"
 	.string "The loose, crumbly sand makes it\n"
@@ -298,11 +298,11 @@ MauvilleCity_BikeShop_Text_SandySlopes: @ 820F61A
 	.string "zip up a sandy slope.\p"
 	.string "Want to read a different page?$"
 
-MauvilleCity_BikeShop_Text_AcroHandbookWhichPage: @ 820F6ED
+MauvilleCity_BikeShop_Text_AcroHandbookWhichPage:
 	.string "It's a handbook on the ACRO BIKE.\p"
 	.string "Which page do you want to read?$"
 
-MauvilleCity_BikeShop_Text_Wheelies: @ 820F72F
+MauvilleCity_BikeShop_Text_Wheelies:
 	.string "Press the B Button while riding,\n"
 	.string "and the front wheel lifts up.\p"
 	.string "You can zip around with the front\n"
@@ -310,14 +310,14 @@ MauvilleCity_BikeShop_Text_Wheelies: @ 820F72F
 	.string "This technique is called a wheelie.\p"
 	.string "Want to read a different page?$"
 
-MauvilleCity_BikeShop_Text_BunnyHops: @ 820F7F5
+MauvilleCity_BikeShop_Text_BunnyHops:
 	.string "Keeping the B Button pressed,\n"
 	.string "your BIKE can hop on the spot.\p"
 	.string "This technique is called a bunny hop.\p"
 	.string "You can ride while hopping, too.\p"
 	.string "Want to read a different page?$"
 
-MauvilleCity_BikeShop_Text_Jumps: @ 820F898
+MauvilleCity_BikeShop_Text_Jumps:
 	.string "Press the B Button and the + Control\n"
 	.string "Pad at the same time to jump.\p"
 	.string "Press the + Control Pad to the side\n"
diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index f8cf2ea18..896dfa680 100644
--- a/data/maps/MauvilleCity_GameCorner/scripts.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
@@ -1,4 +1,4 @@
-MauvilleCity_GameCorner_MapScripts:: @ 820FBB8
+MauvilleCity_GameCorner_MapScripts::
 	.byte 0
 
     @ Game Corner prices
@@ -12,7 +12,7 @@ MauvilleCity_GameCorner_MapScripts:: @ 820FBB8
 	.set COINS_PRICE_50,  1000
 	.set COINS_PRICE_500, 10000
 
-MauvilleCity_GameCorner_EventScript_CoinsClerk:: @ 820FBB9
+MauvilleCity_GameCorner_EventScript_CoinsClerk::
 	lock
 	faceplayer
 	msgbox MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner, MSGBOX_DEFAULT
@@ -25,7 +25,7 @@ MauvilleCity_GameCorner_EventScript_CoinsClerk:: @ 820FBB9
 	showcoinsbox 1, 6
 	goto MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50
 
-MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50:: @ 820FBE5
+MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50::
 	multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 0, FALSE
 	switch VAR_RESULT
 	case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins
@@ -34,7 +34,7 @@ MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault50:: @ 820FBE5
 	end
 
 @ Unused
-MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault500:: @ 820FC0C
+MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault500::
 	multichoicedefault 15, 0, MULTI_GAME_CORNER_COINS, 1, FALSE
 	switch VAR_RESULT
 	case 0, MauvilleCity_GameCorner_EventScript_Buy50Coins
@@ -42,7 +42,7 @@ MauvilleCity_GameCorner_EventScript_ChooseCoinsDefault500:: @ 820FC0C
 	goto MauvilleCity_GameCorner_EventScript_CancelBuyCoins
 	end
 
-MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33
+MauvilleCity_GameCorner_EventScript_Buy50Coins::
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, (MAX_COINS + 1 - 50)
 	goto_if_ge MauvilleCity_GameCorner_EventScript_NoRoomForCoins
@@ -60,7 +60,7 @@ MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75
+MauvilleCity_GameCorner_EventScript_Buy500Coins::
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, (MAX_COINS + 1 - 500)
 	goto_if_ge MauvilleCity_GameCorner_EventScript_NoRoomForCoins
@@ -78,33 +78,33 @@ MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_NeedCoinCase:: @ 820FCB7
+MauvilleCity_GameCorner_EventScript_NeedCoinCase::
 	msgbox MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_NotEnoughMoney:: @ 820FCC1
+MauvilleCity_GameCorner_EventScript_NotEnoughMoney::
 	msgbox MauvilleCity_GameCorner_Text_DontHaveEnoughMoney, MSGBOX_DEFAULT
 	hidemoneybox
 	hidecoinsbox 0, 5
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_CancelBuyCoins:: @ 820FCD1
+MauvilleCity_GameCorner_EventScript_CancelBuyCoins::
 	msgbox MauvilleCity_GameCorner_Text_DontNeedCoinsThen, MSGBOX_DEFAULT
 	hidemoneybox
 	hidecoinsbox 0, 5
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_NoRoomForCoins:: @ 820FCE1
+MauvilleCity_GameCorner_EventScript_NoRoomForCoins::
 	msgbox MauvilleCity_GameCorner_Text_CoinCaseIsFull, MSGBOX_DEFAULT
 	hidemoneybox
 	hidecoinsbox 0, 5
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_PrizeCornerDolls:: @ 820FCF1
+MauvilleCity_GameCorner_EventScript_PrizeCornerDolls::
 	lock
 	faceplayer
 	msgbox MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes, MSGBOX_DEFAULT
@@ -114,19 +114,19 @@ MauvilleCity_GameCorner_EventScript_PrizeCornerDolls:: @ 820FCF1
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_ChooseDollPrizeMessage:: @ 820FD0D
+MauvilleCity_GameCorner_EventScript_ChooseDollPrizeMessage::
 	message MauvilleCity_GameCorner_Text_WhichPrize
 	waitmessage
 	setvar VAR_TEMP_1, 0
 	showcoinsbox 1, 1
 	goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize
 
-MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize:: @ 820FD20
+MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize::
 	message MauvilleCity_GameCorner_Text_WhichPrize
 	waitmessage
 	goto MauvilleCity_GameCorner_EventScript_ChooseDollPrize
 
-MauvilleCity_GameCorner_EventScript_ChooseDollPrize:: @ 820FD2B
+MauvilleCity_GameCorner_EventScript_ChooseDollPrize::
 	multichoice 12, 0, MULTI_GAME_CORNER_DOLLS, FALSE
 	switch VAR_RESULT
 	case 0, MauvilleCity_GameCorner_EventScript_TreeckoDoll
@@ -136,22 +136,22 @@ MauvilleCity_GameCorner_EventScript_ChooseDollPrize:: @ 820FD2B
 	goto MauvilleCity_GameCorner_EventScript_CancelDollSelect
 	end
 
-MauvilleCity_GameCorner_EventScript_TreeckoDoll:: @ 820FD67
+MauvilleCity_GameCorner_EventScript_TreeckoDoll::
 	setvar VAR_TEMP_1, 1
 	bufferdecorationname 0, DECOR_TREECKO_DOLL
 	goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize
 
-MauvilleCity_GameCorner_EventScript_TorchicDoll:: @ 820FD75
+MauvilleCity_GameCorner_EventScript_TorchicDoll::
 	setvar VAR_TEMP_1, 2
 	bufferdecorationname 0, DECOR_TORCHIC_DOLL
 	goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize
 
-MauvilleCity_GameCorner_EventScript_MudkipDoll:: @ 820FD83
+MauvilleCity_GameCorner_EventScript_MudkipDoll::
 	setvar VAR_TEMP_1, 3
 	bufferdecorationname 0, DECOR_MUDKIP_DOLL
 	goto MauvilleCity_GameCorner_EventScript_ConfirmDollPrize
 
-MauvilleCity_GameCorner_EventScript_ConfirmDollPrize:: @ 820FD91
+MauvilleCity_GameCorner_EventScript_ConfirmDollPrize::
 	msgbox MauvilleCity_GameCorner_Text_SoYourChoiceIsX, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_GameCorner_EventScript_CancelDollSelect
@@ -161,7 +161,7 @@ MauvilleCity_GameCorner_EventScript_ConfirmDollPrize:: @ 820FD91
 	case 3, MauvilleCity_GameCorner_EventScript_BuyMudkipDoll
 	end
 
-MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 820FDCB
+MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll::
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, DOLL_COINS
 	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll
@@ -177,7 +177,7 @@ MauvilleCity_GameCorner_EventScript_BuyTreeckoDoll:: @ 820FDCB
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 820FE05
+MauvilleCity_GameCorner_EventScript_BuyTorchicDoll::
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, DOLL_COINS
 	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll
@@ -193,7 +193,7 @@ MauvilleCity_GameCorner_EventScript_BuyTorchicDoll:: @ 820FE05
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 820FE3F
+MauvilleCity_GameCorner_EventScript_BuyMudkipDoll::
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, DOLL_COINS
 	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll
@@ -209,23 +209,23 @@ MauvilleCity_GameCorner_EventScript_BuyMudkipDoll:: @ 820FE3F
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll:: @ 820FE79
+MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForDoll::
 	msgbox MauvilleCity_GameCorner_Text_NotEnoughCoins, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_NoRoomForDoll:: @ 820FE87
+MauvilleCity_GameCorner_EventScript_NoRoomForDoll::
 	call Common_EventScript_NoRoomForDecor
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseDollPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_CancelDollSelect:: @ 820FE92
+MauvilleCity_GameCorner_EventScript_CancelDollSelect::
 	msgbox MauvilleCity_GameCorner_Text_OhIsThatSo, MSGBOX_DEFAULT
 	hidecoinsbox 0, 0
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_PrizeCornerTMs:: @ 820FE9F
+MauvilleCity_GameCorner_EventScript_PrizeCornerTMs::
 	lock
 	faceplayer
 	msgbox MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes, MSGBOX_DEFAULT
@@ -235,19 +235,19 @@ MauvilleCity_GameCorner_EventScript_PrizeCornerTMs:: @ 820FE9F
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage:: @ 820FEBB
+MauvilleCity_GameCorner_EventScript_ChooseTMPrizeMessage::
 	message MauvilleCity_GameCorner_Text_WhichPrize
 	waitmessage
 	setvar VAR_TEMP_1, 0
 	showcoinsbox 1, 1
 	goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize
 
-MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize:: @ 820FECE
+MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize::
 	message MauvilleCity_GameCorner_Text_WhichPrize
 	waitmessage
 	goto MauvilleCity_GameCorner_EventScript_ChooseTMPrize
 
-MauvilleCity_GameCorner_EventScript_ChooseTMPrize:: @ 820FED9
+MauvilleCity_GameCorner_EventScript_ChooseTMPrize::
 	multichoice 12, 0, MULTI_GAME_CORNER_TMS, FALSE
 	switch VAR_RESULT
 	case 0, MauvilleCity_GameCorner_EventScript_TM32
@@ -259,37 +259,37 @@ MauvilleCity_GameCorner_EventScript_ChooseTMPrize:: @ 820FED9
 	goto MauvilleCity_GameCorner_EventScript_CancelTMSelect
 	end
 
-MauvilleCity_GameCorner_EventScript_TM32:: @ 820FF2B
+MauvilleCity_GameCorner_EventScript_TM32::
 	setvar VAR_TEMP_1, 1
 	bufferitemname 0, ITEM_TM32
 	setvar VAR_0x8004, ITEM_TM32
 	goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
 
-MauvilleCity_GameCorner_EventScript_TM29:: @ 820FF3E
+MauvilleCity_GameCorner_EventScript_TM29::
 	setvar VAR_TEMP_1, 2
 	bufferitemname 0, ITEM_TM29
 	setvar VAR_0x8004, ITEM_TM29
 	goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
 
-MauvilleCity_GameCorner_EventScript_TM35:: @ 820FF51
+MauvilleCity_GameCorner_EventScript_TM35::
 	setvar VAR_TEMP_1, 3
 	bufferitemname 0, ITEM_TM35
 	setvar VAR_0x8004, ITEM_TM35
 	goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
 
-MauvilleCity_GameCorner_EventScript_TM24:: @ 820FF64
+MauvilleCity_GameCorner_EventScript_TM24::
 	setvar VAR_TEMP_1, 4
 	bufferitemname 0, ITEM_TM24
 	setvar VAR_0x8004, ITEM_TM24
 	goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
 
-MauvilleCity_GameCorner_EventScript_TM13:: @ 820FF77
+MauvilleCity_GameCorner_EventScript_TM13::
 	setvar VAR_TEMP_1, 5
 	bufferitemname 0, ITEM_TM13
 	setvar VAR_0x8004, ITEM_TM13
 	goto MauvilleCity_GameCorner_EventScript_ConfirmTMPrize
 
-MauvilleCity_GameCorner_EventScript_ConfirmTMPrize:: @ 820FF8A
+MauvilleCity_GameCorner_EventScript_ConfirmTMPrize::
 	special BufferTMHMMoveName
 	msgbox MauvilleCity_GameCorner_Text_SoYourChoiceIsTheTMX, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -302,7 +302,7 @@ MauvilleCity_GameCorner_EventScript_ConfirmTMPrize:: @ 820FF8A
 	case 5, MauvilleCity_GameCorner_EventScript_BuyTM13
 	end
 
-MauvilleCity_GameCorner_EventScript_BuyTM32:: @ 820FFDD
+MauvilleCity_GameCorner_EventScript_BuyTM32::
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, TM32_COINS
 	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
@@ -317,7 +317,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM32:: @ 820FFDD
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_BuyTM29:: @ 8210017
+MauvilleCity_GameCorner_EventScript_BuyTM29::
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, TM29_COINS
 	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
@@ -332,7 +332,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM29:: @ 8210017
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_BuyTM35:: @ 8210051
+MauvilleCity_GameCorner_EventScript_BuyTM35::
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, TM35_COINS
 	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
@@ -347,7 +347,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM35:: @ 8210051
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_BuyTM24:: @ 821008B
+MauvilleCity_GameCorner_EventScript_BuyTM24::
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, TM24_COINS
 	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
@@ -362,7 +362,7 @@ MauvilleCity_GameCorner_EventScript_BuyTM24:: @ 821008B
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_BuyTM13:: @ 82100C5
+MauvilleCity_GameCorner_EventScript_BuyTM13::
 	checkcoins VAR_TEMP_2
 	compare VAR_TEMP_2, TM13_COINS
 	goto_if_lt MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM
@@ -377,31 +377,31 @@ MauvilleCity_GameCorner_EventScript_BuyTM13:: @ 82100C5
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM:: @ 82100FF
+MauvilleCity_GameCorner_EventScript_NotEnoughCoinsForTM::
 	msgbox MauvilleCity_GameCorner_Text_NotEnoughCoins, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_NoRoomForTM:: @ 821010D
+MauvilleCity_GameCorner_EventScript_NoRoomForTM::
 	call Common_EventScript_BagIsFull
 	goto MauvilleCity_GameCorner_EventScript_ReturnToChooseTMPrize
 	end
 
-MauvilleCity_GameCorner_EventScript_CancelTMSelect:: @ 8210118
+MauvilleCity_GameCorner_EventScript_CancelTMSelect::
 	msgbox MauvilleCity_GameCorner_Text_OhIsThatSo, MSGBOX_DEFAULT
 	hidecoinsbox 0, 0
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_Woman2:: @ 8210125
+MauvilleCity_GameCorner_EventScript_Woman2::
 	msgbox MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay, MSGBOX_NPC
 	end
 
-MauvilleCity_GameCorner_EventScript_Gentleman:: @ 821012E
+MauvilleCity_GameCorner_EventScript_Gentleman::
 	msgbox MauvilleCity_GameCorner_Text_RouletteOnlyLuck, MSGBOX_NPC
 	end
 
-MauvilleCity_GameCorner_EventScript_Girl:: @ 8210137
+MauvilleCity_GameCorner_EventScript_Girl::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
@@ -414,7 +414,7 @@ MauvilleCity_GameCorner_EventScript_Girl:: @ 8210137
 	case 2, MauvilleCity_GameCorner_EventScript_GiveMudkipDoll
 	end
 
-MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll:: @ 821017C
+MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll::
 	bufferdecorationname 1, DECOR_TREECKO_DOLL
 	checkdecorspace DECOR_TREECKO_DOLL
 	compare VAR_RESULT, FALSE
@@ -425,7 +425,7 @@ MauvilleCity_GameCorner_EventScript_GiveTreeckoDoll:: @ 821017C
 	goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
 	end
 
-MauvilleCity_GameCorner_EventScript_GiveTorchicDoll:: @ 82101A6
+MauvilleCity_GameCorner_EventScript_GiveTorchicDoll::
 	bufferdecorationname 1, DECOR_TORCHIC_DOLL
 	checkdecorspace DECOR_TORCHIC_DOLL
 	compare VAR_RESULT, FALSE
@@ -436,7 +436,7 @@ MauvilleCity_GameCorner_EventScript_GiveTorchicDoll:: @ 82101A6
 	goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
 	end
 
-MauvilleCity_GameCorner_EventScript_GiveMudkipDoll:: @ 82101D0
+MauvilleCity_GameCorner_EventScript_GiveMudkipDoll::
 	bufferdecorationname 1, DECOR_MUDKIP_DOLL
 	checkdecorspace DECOR_MUDKIP_DOLL
 	compare VAR_RESULT, FALSE
@@ -447,23 +447,23 @@ MauvilleCity_GameCorner_EventScript_GiveMudkipDoll:: @ 82101D0
 	goto MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll
 	end
 
-MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll:: @ 82101FA
+MauvilleCity_GameCorner_EventScript_NoRoomForStarterDoll::
 	call Common_EventScript_NoRoomForDecor
 	msgbox MauvilleCity_GameCorner_Text_YouWantItButNotNow, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_DeclineStarterDoll:: @ 8210209
+MauvilleCity_GameCorner_EventScript_DeclineStarterDoll::
 	msgbox MauvilleCity_GameCorner_Text_DontBeNegative, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll:: @ 8210213
+MauvilleCity_GameCorner_EventScript_ReceivedStarterDoll::
 	msgbox MauvilleCity_GameCorner_Text_CantWinJackpot, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_PokefanM:: @ 821021D
+MauvilleCity_GameCorner_EventScript_PokefanM::
 	lock
 	faceplayer
 	checkitem ITEM_COIN_CASE, 1
@@ -473,7 +473,7 @@ MauvilleCity_GameCorner_EventScript_PokefanM:: @ 821021D
 	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 821023D
+MauvilleCity_GameCorner_EventScript_TryGive20Coins::
 	goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_PokefanMNormal
 	checkcoins VAR_TEMP_1
 	compare VAR_TEMP_1, 1  @ Only give 20 coins if player has no coins
@@ -485,54 +485,54 @@ MauvilleCity_GameCorner_EventScript_TryGive20Coins:: @ 821023D
 	goto MauvilleCity_GameCorner_EventScript_PokefanMNormal
 	end
 
-MauvilleCity_GameCorner_EventScript_PokefanMNormal:: @ 821026B
+MauvilleCity_GameCorner_EventScript_PokefanMNormal::
 	msgbox MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_OldMan:: @ 8210279
+MauvilleCity_GameCorner_EventScript_OldMan::
 	lock
 	faceplayer
 	msgbox MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_Cook:: @ 8210289
+MauvilleCity_GameCorner_EventScript_Cook::
 	lock
 	faceplayer
 	msgbox MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_Man:: @ 8210299
+MauvilleCity_GameCorner_EventScript_Man::
 	lock
 	faceplayer
 	msgbox MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_NPCReturnToSlots:: @ 82102A9
+MauvilleCity_GameCorner_EventScript_NPCReturnToSlots::
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MauvilleCity_GameCorner_EventScript_Maniac:: @ 82102B6
+MauvilleCity_GameCorner_EventScript_Maniac::
 	lock
 	faceplayer
 	msgbox MauvilleCity_GameCorner_Text_DifficultToStopOn7, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_Woman:: @ 82102C6
+MauvilleCity_GameCorner_EventScript_Woman::
 	lock
 	faceplayer
 	msgbox MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo, MSGBOX_DEFAULT
 	goto MauvilleCity_GameCorner_EventScript_NPCReturnToSlots
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine0:: @ 82102D6
+MauvilleCity_GameCorner_EventScript_SlotMachine0::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -543,7 +543,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine0:: @ 82102D6
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine1:: @ 82102F6
+MauvilleCity_GameCorner_EventScript_SlotMachine1::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -554,7 +554,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine1:: @ 82102F6
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine2:: @ 8210316
+MauvilleCity_GameCorner_EventScript_SlotMachine2::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -565,7 +565,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine2:: @ 8210316
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine3:: @ 8210336
+MauvilleCity_GameCorner_EventScript_SlotMachine3::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -576,7 +576,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine3:: @ 8210336
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine4:: @ 8210356
+MauvilleCity_GameCorner_EventScript_SlotMachine4::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -587,7 +587,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine4:: @ 8210356
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine5:: @ 8210376
+MauvilleCity_GameCorner_EventScript_SlotMachine5::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -598,7 +598,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine5:: @ 8210376
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine6:: @ 8210396
+MauvilleCity_GameCorner_EventScript_SlotMachine6::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -609,7 +609,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine6:: @ 8210396
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine7:: @ 82103B6
+MauvilleCity_GameCorner_EventScript_SlotMachine7::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -620,7 +620,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine7:: @ 82103B6
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine8:: @ 82103D6
+MauvilleCity_GameCorner_EventScript_SlotMachine8::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -631,7 +631,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine8:: @ 82103D6
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine9:: @ 82103F6
+MauvilleCity_GameCorner_EventScript_SlotMachine9::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -642,7 +642,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine9:: @ 82103F6
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine10:: @ 8210416
+MauvilleCity_GameCorner_EventScript_SlotMachine10::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -653,7 +653,7 @@ MauvilleCity_GameCorner_EventScript_SlotMachine10:: @ 8210416
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_SlotMachine11:: @ 8210436
+MauvilleCity_GameCorner_EventScript_SlotMachine11::
 	lockall
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
@@ -664,146 +664,146 @@ MauvilleCity_GameCorner_EventScript_SlotMachine11:: @ 8210436
 	releaseall
 	end
 
-MauvilleCity_GameCorner_EventScript_NoCoinCase:: @ 8210456
+MauvilleCity_GameCorner_EventScript_NoCoinCase::
 	msgbox MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner: @ 8210460
+MauvilleCity_GameCorner_Text_ThisIsMauvilleGameCorner:
 	.string "This is MAUVILLE GAME CORNER.$"
 
-MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins: @ 821047E
+MauvilleCity_GameCorner_Text_NeedCoinCaseForCoins:
 	.string "Okay, you wanted some COINS for\n"
 	.string "the games?\p"
 	.string "But you don't have a COIN CASE for\n"
 	.string "stowing the COINS.$"
 
-MauvilleCity_GameCorner_Text_WereYouLookingForCoins: @ 82104DF
+MauvilleCity_GameCorner_Text_WereYouLookingForCoins:
 	.string "Were you looking for COINS?\p"
 	.string "It's ¥1000 for 50 COINS.\n"
 	.string "Would you like some?$"
 
-MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins: @ 8210529
+MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins:
 	.string "Thank you very much!\n"
 	.string "Here are your COINS!$"
 
-MauvilleCity_GameCorner_Text_DontHaveEnoughMoney: @ 8210553
+MauvilleCity_GameCorner_Text_DontHaveEnoughMoney:
 	.string "Um… You don't appear to have\n"
 	.string "enough money…$"
 
-MauvilleCity_GameCorner_Text_CoinCaseIsFull: @ 821057E
+MauvilleCity_GameCorner_Text_CoinCaseIsFull:
 	.string "Oh?\n"
 	.string "Your COIN CASE is full.$"
 
-MauvilleCity_GameCorner_Text_DontNeedCoinsThen: @ 821059A
+MauvilleCity_GameCorner_Text_DontNeedCoinsThen:
 	.string "Oh… You don't need COINS, then?\n"
 	.string "Good luck on your adventure!$"
 
-MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes: @ 82105D7
+MauvilleCity_GameCorner_Text_ExchangeCoinsForPrizes:
 	.string "Welcome.\p"
 	.string "You can exchange your COINS for\n"
 	.string "prizes here.$"
 
-MauvilleCity_GameCorner_Text_WhichPrize: @ 821060D
+MauvilleCity_GameCorner_Text_WhichPrize:
 	.string "Which prize would you like?$"
 
-MauvilleCity_GameCorner_Text_SoYourChoiceIsTheTMX: @ 8210629
+MauvilleCity_GameCorner_Text_SoYourChoiceIsTheTMX:
 	.string "So your choice is\n"
 	.string "the {STR_VAR_1} {STR_VAR_2}?$"
 
-MauvilleCity_GameCorner_Text_SendToYourHomePC: @ 8210646
+MauvilleCity_GameCorner_Text_SendToYourHomePC:
 	.string "Thank you!\n"
 	.string "We'll send it to your PC at home.$"
 
-MauvilleCity_GameCorner_Text_NotEnoughCoins: @ 8210673
+MauvilleCity_GameCorner_Text_NotEnoughCoins:
 	.string "You don't have enough COINS.$"
 
 @ Unused
-MauvilleCity_GameCorner_Text_NoRoomForPlacingDecor: @ 8210690
+MauvilleCity_GameCorner_Text_NoRoomForPlacingDecor:
 	.string "There isn't any room available for\n"
 	.string "placing {STR_VAR_1}.$"
 
-MauvilleCity_GameCorner_Text_OhIsThatSo: @ 82106BF
+MauvilleCity_GameCorner_Text_OhIsThatSo:
 	.string "Oh, is that so? \n"
 	.string "You need to save some COINS before\l"
 	.string "coming back here.$"
 
-MauvilleCity_GameCorner_Text_SoYourChoiceIsX: @ 8210705
+MauvilleCity_GameCorner_Text_SoYourChoiceIsX:
 	.string "So your choice is {STR_VAR_1}?$"
 
-MauvilleCity_GameCorner_Text_HereYouGo: @ 821071B
+MauvilleCity_GameCorner_Text_HereYouGo:
 	.string "Here you go!$"
 
 @ Unused
-MauvilleCity_GameCorner_Text_CantCarryAnyMore: @ 8210728
+MauvilleCity_GameCorner_Text_CantCarryAnyMore:
 	.string "Oh, you can't carry any more than that.$"
 
-MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne: @ 8210750
+MauvilleCity_GameCorner_Text_GotTwoOfSameDollWantOne:
 	.string "I made a mistake and got two of\n"
 	.string "the same DOLLS.\p"
 	.string "Would you like one of them?$"
 
-MauvilleCity_GameCorner_Text_HereYouGo2: @ 821079C
+MauvilleCity_GameCorner_Text_HereYouGo2:
 	.string "Here you go!$"
 
-MauvilleCity_GameCorner_Text_YouWantItButNotNow: @ 82107A9
+MauvilleCity_GameCorner_Text_YouWantItButNotNow:
 	.string "Huh?\n"
 	.string "You want it, but not right now?$"
 
-MauvilleCity_GameCorner_Text_DontBeNegative: @ 82107CE
+MauvilleCity_GameCorner_Text_DontBeNegative:
 	.string "Oh, don't be so negative!\n"
 	.string "You can have this!$"
 
-MauvilleCity_GameCorner_Text_CantWinJackpot: @ 82107FB
+MauvilleCity_GameCorner_Text_CantWinJackpot:
 	.string "There's a prize I want, but I can't win\n"
 	.string "the jackpot.$"
 
-MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor: @ 8210830
+MauvilleCity_GameCorner_Text_NeedCoinCaseGoNextDoor:
 	.string "Hey, kid, if you want to play here,\n"
 	.string "you need a COIN CASE.\p"
 	.string "I think the young lady next door\n"
 	.string "had one. Go see her!$"
 
-MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins: @ 82108A0
+MauvilleCity_GameCorner_Text_LuckOnlyLastSoLongTakeCoins:
 	.string "My luck can only last so long.\n"
 	.string "This is too much for me.\l"
 	.string "Here, take some COINS!$"
 
-MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone: @ 82108EF
+MauvilleCity_GameCorner_Text_MauvilleSomethingForEveryone:
 	.string "MAUVILLE has something for\n"
 	.string "everyone.\p"
 	.string "For me, it's the GAME CORNER.$"
 
-MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates: @ 8210932
+MauvilleCity_GameCorner_Text_RouletteTablesDifferentRates:
 	.string "The ROULETTE tables have different\n"
 	.string "rates.\p"
 	.string "Check your COINS if you're going to\n"
 	.string "pick a table.$"
 
-MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime: @ 821098E
+MauvilleCity_GameCorner_Text_EasyToLoseTrackOfTime:
 	.string "It's easy to lose track of time in here. \n"
 	.string "I should get back to work.$"
 
-MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay: @ 82109D3
+MauvilleCity_GameCorner_Text_CoinsAreNeededToPlay:
 	.string "COINS are needed to play here\n"
 	.string "in the GAME CORNER.$"
 
-MauvilleCity_GameCorner_Text_RouletteOnlyLuck: @ 8210A05
+MauvilleCity_GameCorner_Text_RouletteOnlyLuck:
 	.string "This ROULETTE thing…\n"
 	.string "It's rather demanding.\p"
 	.string "Win or lose, it's only by luck.$"
 
-MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed: @ 8210A51
+MauvilleCity_GameCorner_Text_UpTo3CoinsCanBeUsed:
 	.string "Up to three COINS can be used to play\n"
 	.string "the SLOTS.$"
 
-MauvilleCity_GameCorner_Text_DifficultToStopOn7: @ 8210A82
+MauvilleCity_GameCorner_Text_DifficultToStopOn7:
 	.string "It's very difficult to make it stop\n"
 	.string "right on “7.”\p"
 	.string "If it stops on “7” during the REEL TIME\n"
 	.string "bonus game, you'll receive extra COINS.$"
 
-MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo: @ 8210B04
+MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo:
 	.string "Here's some information for you\n"
 	.string "about the SLOTS.\p"
 	.string "The more lightning bolts you stock,\n"
@@ -815,7 +815,7 @@ MauvilleCity_GameCorner_Text_HeresSomeSlotsInfo: @ 8210B04
 	.string "That would total 660 COINS, but it's\n"
 	.string "very difficult to get.$"
 
-MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase: @ 8210C2E
+MauvilleCity_GameCorner_Text_CantPlayWithNoCoinCase:
 	.string "You can't play if you don't have\n"
 	.string "a COIN CASE.$"
 
diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index 3fa7dc8c9..3c09ecfa2 100644
--- a/data/maps/MauvilleCity_Gym/scripts.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
@@ -1,8 +1,8 @@
-MauvilleCity_Gym_MapScripts:: @ 820DD6E
+MauvilleCity_Gym_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, MauvilleCity_Gym_OnLoad
 	.byte 0
 
-MauvilleCity_Gym_OnLoad: @ 820DD74
+MauvilleCity_Gym_OnLoad:
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_DeactivatePuzzle
 	switch VAR_MAUVILLE_GYM_STATE
 	case 0, MauvilleCity_Gym_EventScript_UpdateBarriers
@@ -12,11 +12,11 @@ MauvilleCity_Gym_OnLoad: @ 820DD74
 	case 4, MauvilleCity_Gym_EventScript_Switch4Pressed
 	end
 
-MauvilleCity_Gym_EventScript_UpdateBarriers:: @ 820DDBA
+MauvilleCity_Gym_EventScript_UpdateBarriers::
 	goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_SetAltBarriers
 	end
 
-MauvilleCity_Gym_EventScript_SetAltBarriers:: @ 820DDC4
+MauvilleCity_Gym_EventScript_SetAltBarriers::
 	setmetatile 3, 11, METATILE_MauvilleGym_RedBeamV1_On, 1
 	setmetatile 3, 12, METATILE_MauvilleGym_RedBeamV2_On, 1
 	setmetatile 3, 13, METATILE_MauvilleGym_PoleTop_On, 1
@@ -45,35 +45,35 @@ MauvilleCity_Gym_EventScript_SetAltBarriers:: @ 820DDC4
 	setmetatile 5, 7, METATILE_MauvilleGym_GreenBeamH4_Off, 0
 	end
 
-MauvilleCity_Gym_EventScript_Switch1Pressed:: @ 820DEAF
+MauvilleCity_Gym_EventScript_Switch1Pressed::
 	setvar VAR_0x8004, 0
 	special MauvilleGymPressSwitch
 	goto MauvilleCity_Gym_EventScript_UpdateBarriers
 	end
 
-MauvilleCity_Gym_EventScript_Switch2Pressed:: @ 820DEBD
+MauvilleCity_Gym_EventScript_Switch2Pressed::
 	setvar VAR_0x8004, 1
 	special MauvilleGymPressSwitch
 	goto MauvilleCity_Gym_EventScript_UpdateBarriers
 	end
 
-MauvilleCity_Gym_EventScript_Switch3Pressed:: @ 820DECB
+MauvilleCity_Gym_EventScript_Switch3Pressed::
 	setvar VAR_0x8004, 2
 	special MauvilleGymPressSwitch
 	goto MauvilleCity_Gym_EventScript_UpdateBarriers
 	end
 
-MauvilleCity_Gym_EventScript_Switch4Pressed:: @ 820DED9
+MauvilleCity_Gym_EventScript_Switch4Pressed::
 	setvar VAR_0x8004, 3
 	special MauvilleGymPressSwitch
 	goto MauvilleCity_Gym_EventScript_UpdateBarriers
 	end
 
-MauvilleCity_Gym_EventScript_DeactivatePuzzle:: @ 820DEE7
+MauvilleCity_Gym_EventScript_DeactivatePuzzle::
 	special MauvilleGymDeactivatePuzzle
 	end
 
-MauvilleCity_Gym_EventScript_Wattson:: @ 820DEEB
+MauvilleCity_Gym_EventScript_Wattson::
 	trainerbattle_single TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonIntro, MauvilleCity_Gym_Text_WattsonDefeat, MauvilleCity_Gym_EventScript_WattsonDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -85,7 +85,7 @@ MauvilleCity_Gym_EventScript_Wattson:: @ 820DEEB
 	release
 	end
 
-MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B
+MauvilleCity_Gym_EventScript_WattsonDefeated::
 	message MauvilleCity_Gym_Text_ReceivedDynamoBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
@@ -114,7 +114,7 @@ MauvilleCity_Gym_EventScript_WattsonDefeated:: @ 820DF2B
 	release
 	end
 
-MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D
+MauvilleCity_Gym_EventScript_GiveShockWave2::
 	giveitem ITEM_TM34
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -123,7 +123,7 @@ MauvilleCity_Gym_EventScript_GiveShockWave2:: @ 820DF8D
 	release
 	end
 
-MauvilleCity_Gym_EventScript_GiveShockWave:: @ 820DFB1
+MauvilleCity_Gym_EventScript_GiveShockWave::
 	giveitem ITEM_TM34
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_BagIsFull
@@ -131,17 +131,17 @@ MauvilleCity_Gym_EventScript_GiveShockWave:: @ 820DFB1
 	setflag FLAG_RECEIVED_TM34
 	return
 
-MauvilleCity_Gym_EventScript_CompletedNewMauville:: @ 820DFD4
+MauvilleCity_Gym_EventScript_CompletedNewMauville::
 	msgbox MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_Gym_EventScript_WattsonRematch:: @ 820DFDE
+MauvilleCity_Gym_EventScript_WattsonRematch::
 	trainerbattle_rematch_double TRAINER_WATTSON_1, MauvilleCity_Gym_Text_WattsonPreRematch, MauvilleCity_Gym_Text_WattsonRematchDefeat, MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons
 	msgbox MauvilleCity_Gym_Text_WattsonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_Switch1:: @ 820DFF9
+MauvilleCity_Gym_EventScript_Switch1::
 	lockall
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
 	compare VAR_MAUVILLE_GYM_STATE, 1
@@ -151,7 +151,7 @@ MauvilleCity_Gym_EventScript_Switch1:: @ 820DFF9
 	goto MauvilleCity_Gym_EventScript_PressFloorSwitch
 	end
 
-MauvilleCity_Gym_EventScript_Switch2:: @ 820E01E
+MauvilleCity_Gym_EventScript_Switch2::
 	lockall
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
 	compare VAR_MAUVILLE_GYM_STATE, 2
@@ -161,7 +161,7 @@ MauvilleCity_Gym_EventScript_Switch2:: @ 820E01E
 	goto MauvilleCity_Gym_EventScript_PressFloorSwitch
 	end
 
-MauvilleCity_Gym_EventScript_Switch3:: @ 820E043
+MauvilleCity_Gym_EventScript_Switch3::
 	lockall
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
 	compare VAR_MAUVILLE_GYM_STATE, 3
@@ -171,7 +171,7 @@ MauvilleCity_Gym_EventScript_Switch3:: @ 820E043
 	goto MauvilleCity_Gym_EventScript_PressFloorSwitch
 	end
 
-MauvilleCity_Gym_EventScript_Switch4:: @ 820E068
+MauvilleCity_Gym_EventScript_Switch4::
 	lockall
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_SwitchDoNothing
 	compare VAR_MAUVILLE_GYM_STATE, 4
@@ -181,7 +181,7 @@ MauvilleCity_Gym_EventScript_Switch4:: @ 820E068
 	goto MauvilleCity_Gym_EventScript_PressFloorSwitch
 	end
 
-MauvilleCity_Gym_EventScript_PressFloorSwitch:: @ 820E08D
+MauvilleCity_Gym_EventScript_PressFloorSwitch::
 	special MauvilleGymSetDefaultBarriers
 	special MauvilleGymPressSwitch
 	special DrawWholeMapView
@@ -191,46 +191,46 @@ MauvilleCity_Gym_EventScript_PressFloorSwitch:: @ 820E08D
 	releaseall
 	end
 
-MauvilleCity_Gym_EventScript_SwitchDoNothing:: @ 820E0AD
+MauvilleCity_Gym_EventScript_SwitchDoNothing::
 	releaseall
 	end
 
-MauvilleCity_Gym_EventScript_SetBarriersAltState:: @ 820E0AF
+MauvilleCity_Gym_EventScript_SetBarriersAltState::
 	setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	releaseall
 	end
 
-MauvilleCity_Gym_EventScript_ClearBarriersAltState:: @ 820E0B4
+MauvilleCity_Gym_EventScript_ClearBarriersAltState::
 	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
 	releaseall
 	end
 
-MauvilleCity_Gym_EventScript_Kirk:: @ 820E0B9
+MauvilleCity_Gym_EventScript_Kirk::
 	trainerbattle_single TRAINER_KIRK, MauvilleCity_Gym_Text_KirkIntro, MauvilleCity_Gym_Text_KirkDefeat
 	msgbox MauvilleCity_Gym_Text_KirkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_Shawn:: @ 820E0D0
+MauvilleCity_Gym_EventScript_Shawn::
 	trainerbattle_single TRAINER_SHAWN, MauvilleCity_Gym_Text_ShawnIntro, MauvilleCity_Gym_Text_ShawnDefeat
 	msgbox MauvilleCity_Gym_Text_ShawnPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_Ben:: @ 820E0E7
+MauvilleCity_Gym_EventScript_Ben::
 	trainerbattle_single TRAINER_BEN, MauvilleCity_Gym_Text_BenIntro, MauvilleCity_Gym_Text_BenDefeat
 	msgbox MauvilleCity_Gym_Text_BenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_Vivian:: @ 820E0FE
+MauvilleCity_Gym_EventScript_Vivian::
 	trainerbattle_single TRAINER_VIVIAN, MauvilleCity_Gym_Text_VivianIntro, MauvilleCity_Gym_Text_VivianDefeat
 	msgbox MauvilleCity_Gym_Text_VivianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_Angelo:: @ 820E115
+MauvilleCity_Gym_EventScript_Angelo::
 	trainerbattle_single TRAINER_ANGELO, MauvilleCity_Gym_Text_AngeloIntro, MauvilleCity_Gym_Text_AngeloDefeat
 	msgbox MauvilleCity_Gym_Text_AngeloPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MauvilleCity_Gym_EventScript_GymGuide:: @ 820E12C
+MauvilleCity_Gym_EventScript_GymGuide::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_GymGuidePostVictory
@@ -238,34 +238,34 @@ MauvilleCity_Gym_EventScript_GymGuide:: @ 820E12C
 	release
 	end
 
-MauvilleCity_Gym_EventScript_GymGuidePostVictory:: @ 820E141
+MauvilleCity_Gym_EventScript_GymGuidePostVictory::
 	msgbox MauvilleCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_Gym_EventScript_LeftGymStatue:: @ 820E14B
+MauvilleCity_Gym_EventScript_LeftGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_GymStatueCertified
 	goto MauvilleCity_Gym_EventScript_GymStatue
 	end
 
-MauvilleCity_Gym_EventScript_RightGymStatue:: @ 820E15B
+MauvilleCity_Gym_EventScript_RightGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_GymStatueCertified
 	goto MauvilleCity_Gym_EventScript_GymStatue
 	end
 
-MauvilleCity_Gym_EventScript_GymStatueCertified:: @ 820E16B
+MauvilleCity_Gym_EventScript_GymStatueCertified::
 	msgbox MauvilleCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MauvilleCity_Gym_EventScript_GymStatue:: @ 820E175
+MauvilleCity_Gym_EventScript_GymStatue::
 	msgbox MauvilleCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MauvilleCity_Gym_Text_GymGuideAdvice: @ 820E17F
+MauvilleCity_Gym_Text_GymGuideAdvice:
 	.string "Hey, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "WATTSON, the LEADER of MAUVILLE\n"
@@ -276,72 +276,72 @@ MauvilleCity_Gym_Text_GymGuideAdvice: @ 820E17F
 	.string "doors all over his GYM! Eccentric!\p"
 	.string "Hey, go for it!$"
 
-MauvilleCity_Gym_Text_GymGuidePostVictory: @ 820E283
+MauvilleCity_Gym_Text_GymGuidePostVictory:
 	.string "Whoa, you're electrifying!\n"
 	.string "You've powered the door open!$"
 
-MauvilleCity_Gym_Text_KirkIntro: @ 820E2BC
+MauvilleCity_Gym_Text_KirkIntro:
 	.string "My electric soul, it'll shatter your\n"
 	.string "dreams whole, whoa-yeahah!$"
 
-MauvilleCity_Gym_Text_KirkDefeat: @ 820E2FC
+MauvilleCity_Gym_Text_KirkDefeat:
 	.string "That was plugged in, amped up,\n"
 	.string "over-driven electric, man!$"
 
-MauvilleCity_Gym_Text_KirkPostBattle: @ 820E336
+MauvilleCity_Gym_Text_KirkPostBattle:
 	.string "POKéMON and rock, it's all about heart,\n"
 	.string "whoa-yeah!$"
 
-MauvilleCity_Gym_Text_ShawnIntro: @ 820E369
+MauvilleCity_Gym_Text_ShawnIntro:
 	.string "I trained under WATTSON!\n"
 	.string "There ain't no way I'll lose easily!$"
 
-MauvilleCity_Gym_Text_ShawnDefeat: @ 820E3A7
+MauvilleCity_Gym_Text_ShawnDefeat:
 	.string "Unplugged and turned off…$"
 
-MauvilleCity_Gym_Text_ShawnPostBattle: @ 820E3C1
+MauvilleCity_Gym_Text_ShawnPostBattle:
 	.string "WATTSON, our GYM LEADER, has been\n"
 	.string "around for a long, long time.\p"
 	.string "He was battling even before your\n"
 	.string "daddy was born, that tough coot.$"
 
-MauvilleCity_Gym_Text_BenIntro: @ 820E443
+MauvilleCity_Gym_Text_BenIntro:
 	.string "This GYM's got puzzles!\n"
 	.string "Isn't it fun?$"
 
-MauvilleCity_Gym_Text_BenDefeat: @ 820E469
+MauvilleCity_Gym_Text_BenDefeat:
 	.string "It's no fun to lose…$"
 
-MauvilleCity_Gym_Text_BenPostBattle: @ 820E47E
+MauvilleCity_Gym_Text_BenPostBattle:
 	.string "WATTSON says he likes setting up\n"
 	.string "little traps with switches.$"
 
-MauvilleCity_Gym_Text_VivianIntro: @ 820E4BB
+MauvilleCity_Gym_Text_VivianIntro:
 	.string "With my charm and my POKéMON's moves,\n"
 	.string "you'll be shocked!$"
 
-MauvilleCity_Gym_Text_VivianDefeat: @ 820E4F4
+MauvilleCity_Gym_Text_VivianDefeat:
 	.string "I'm shocked by your power!$"
 
-MauvilleCity_Gym_Text_VivianPostBattle: @ 820E50F
+MauvilleCity_Gym_Text_VivianPostBattle:
 	.string "I've heard that MAUVILLE was founded\n"
 	.string "by WATTSON.\p"
 	.string "He was a TRAINER long before we\n"
 	.string "became TRAINERS.\l"
 	.string "He must know all sorts of things!$"
 
-MauvilleCity_Gym_Text_AngeloIntro: @ 820E593
+MauvilleCity_Gym_Text_AngeloIntro:
 	.string "I love shiny things!$"
 
-MauvilleCity_Gym_Text_AngeloDefeat: @ 820E5A8
+MauvilleCity_Gym_Text_AngeloDefeat:
 	.string "Oh…\n"
 	.string "My eyes are frazzled…$"
 
-MauvilleCity_Gym_Text_AngeloPostBattle: @ 820E5C2
+MauvilleCity_Gym_Text_AngeloPostBattle:
 	.string "MAUVILLE GYM's WATTSON has a shiny\n"
 	.string "forehead. It makes me happy!$"
 
-MauvilleCity_Gym_Text_WattsonIntro: @ 820E602
+MauvilleCity_Gym_Text_WattsonIntro:
 	.string "I've given up on my plans to convert\n"
 	.string "the city, I have.\p"
 	.string "And so, I put my time into making\n"
@@ -354,17 +354,17 @@ MauvilleCity_Gym_Text_WattsonIntro: @ 820E602
 	.string "Then, I, WATTSON, the LEADER of\n"
 	.string "MAUVILLE GYM, shall electrify you!$"
 
-MauvilleCity_Gym_Text_WattsonDefeat: @ 820E734
+MauvilleCity_Gym_Text_WattsonDefeat:
 	.string "Wahahahah!\n"
 	.string "Fine, I lost!\p"
 	.string "You ended up giving me a thrill!\n"
 	.string "Take this BADGE!$"
 
-MauvilleCity_Gym_Text_ReceivedDynamoBadge: @ 820E77F
+MauvilleCity_Gym_Text_ReceivedDynamoBadge:
 	.string "{PLAYER} received the DYNAMO BADGE\n"
 	.string "from WATTSON.$"
 
-MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis: @ 820E7AA
+MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis:
 	.string "With the DYNAMO BADGE, POKéMON can\n"
 	.string "use ROCK SMASH out of battle.\p"
 	.string "And, it will make your POKéMON a little\n"
@@ -372,33 +372,33 @@ MauvilleCity_Gym_Text_ExplainDynamoBadgeTakeThis: @ 820E7AA
 	.string "Hmm…\n"
 	.string "You should take this, too!$"
 
-MauvilleCity_Gym_Text_ExplainShockWave: @ 820E844
+MauvilleCity_Gym_Text_ExplainShockWave:
 	.string "That TM34 there contains SHOCK WAVE.\p"
 	.string "It's a trustworthy move that never\n"
 	.string "misses! You can count on it!\p"
 	.string "… … … … … …$"
 
-MauvilleCity_Gym_Text_RegisteredWattson: @ 820E8B5
+MauvilleCity_Gym_Text_RegisteredWattson:
 	.string "Registered GYM LEADER WATTSON\n"
 	.string "in the POKéNAV.$"
 
-MauvilleCity_Gym_Text_WattsonPostBattle: @ 820E8E3
+MauvilleCity_Gym_Text_WattsonPostBattle:
 	.string "I swell with optimism, seeing a promising\n"
 	.string "young TRAINER like you!$"
 
-MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor: @ 820E925
+MauvilleCity_Gym_Text_WattsonGoForthAndEndeavor:
 	.string "Wahahahah!\n"
 	.string "Go forth and endeavor, youngster!$"
 
-MauvilleCity_Gym_Text_GymStatue: @ 820E952
+MauvilleCity_Gym_Text_GymStatue:
 	.string "MAUVILLE CITY POKéMON GYM$"
 
-MauvilleCity_Gym_Text_GymStatueCertified: @ 820E96C
+MauvilleCity_Gym_Text_GymStatueCertified:
 	.string "MAUVILLE CITY POKéMON GYM\p"
 	.string "WATTSON'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-MauvilleCity_Gym_Text_WattsonPreRematch: @ 820E9A7
+MauvilleCity_Gym_Text_WattsonPreRematch:
 	.string "WATTSON: Ah-ha! Here at last!\n"
 	.string "I know what you want.\l"
 	.string "You want to battle my POKéMON!\p"
@@ -406,11 +406,11 @@ MauvilleCity_Gym_Text_WattsonPreRematch: @ 820E9A7
 	.string "I'll make sparks fly from you!\n"
 	.string "Don't say I didn't warn you!$"
 
-MauvilleCity_Gym_Text_WattsonRematchDefeat: @ 820EA42
+MauvilleCity_Gym_Text_WattsonRematchDefeat:
 	.string "Oof…\n"
 	.string "Our batteries ran dry…$"
 
-MauvilleCity_Gym_Text_WattsonPostRematch: @ 820EA5E
+MauvilleCity_Gym_Text_WattsonPostRematch:
 	.string "WATTSON: We'll have to recharge our\n"
 	.string "batteries again.\p"
 	.string "When we're fully charged up, we'll\n"
@@ -418,7 +418,7 @@ MauvilleCity_Gym_Text_WattsonPostRematch: @ 820EA5E
 	.string "So, come back again sometime,\n"
 	.string "won't you?$"
 
-MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons: @ 820EAFD
+MauvilleCity_Gym_Text_WattsonRematchNeedTwoMons:
 	.string "WATTSON: Ah-ha! Here at last!\n"
 	.string "I know what you want.\l"
 	.string "You want to battle my POKéMON!\p"
diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc
index 21655a1b8..d0d3481a6 100644
--- a/data/maps/MauvilleCity_House1/scripts.inc
+++ b/data/maps/MauvilleCity_House1/scripts.inc
@@ -1,7 +1,7 @@
-MauvilleCity_House1_MapScripts:: @ 820F975
+MauvilleCity_House1_MapScripts::
 	.byte 0
 
-MauvilleCity_House1_EventScript_RockSmashDude:: @ 820F976
+MauvilleCity_House1_EventScript_RockSmashDude::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_ReceivedRockSmash
@@ -13,12 +13,12 @@ MauvilleCity_House1_EventScript_RockSmashDude:: @ 820F976
 	release
 	end
 
-MauvilleCity_House1_EventScript_ReceivedRockSmash:: @ 820F9A5
+MauvilleCity_House1_EventScript_ReceivedRockSmash::
 	msgbox MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_House1_Text_ImRockSmashDudeTakeThis: @ 820F9AF
+MauvilleCity_House1_Text_ImRockSmashDudeTakeThis:
 	.string "Woohoo!\p"
 	.string "I hear people call me the ROCK SMASH\n"
 	.string "GUY, but I find that sort of degrading.\p"
@@ -30,7 +30,7 @@ MauvilleCity_House1_Text_ImRockSmashDudeTakeThis: @ 820F9AF
 	.string "I like that!\n"
 	.string "Here, take this HIDDEN MACHINE!$"
 
-MauvilleCity_House1_Text_ExplainRockSmash: @ 820FAA9
+MauvilleCity_House1_Text_ExplainRockSmash:
 	.string "That HM contains ROCK SMASH.\p"
 	.string "If you come across large boulders\n"
 	.string "that block your path…\p"
@@ -39,7 +39,7 @@ MauvilleCity_House1_Text_ExplainRockSmash: @ 820FAA9
 	.string "Yes, sir! Smash rocks aside, I say!\n"
 	.string "Woohoo!$"
 
-MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock: @ 820FB67
+MauvilleCity_House1_Text_MonCanFlyOutOfSmashedRock:
 	.string "Oh, yes, if you smash a rock, a POKéMON\n"
 	.string "could come flying out of hiding.\p"
 	.string "Woohoo!$"
diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc
index 06ec830ea..178b79f9b 100644
--- a/data/maps/MauvilleCity_House2/scripts.inc
+++ b/data/maps/MauvilleCity_House2/scripts.inc
@@ -1,7 +1,7 @@
-MauvilleCity_House2_MapScripts:: @ 8210C5C
+MauvilleCity_House2_MapScripts::
 	.byte 0
 
-MauvilleCity_House2_EventScript_Woman:: @ 8210C5D
+MauvilleCity_House2_EventScript_Woman::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_ReceivedCoinCase
@@ -12,7 +12,7 @@ MauvilleCity_House2_EventScript_Woman:: @ 8210C5D
 	release
 	end
 
-MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: @ 8210C82
+MauvilleCity_House2_EventScript_AskToTradeForHarborMail::
 	playse SE_PIN
 	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -25,7 +25,7 @@ MauvilleCity_House2_EventScript_AskToTradeForHarborMail:: @ 8210C82
 	goto_if_eq MauvilleCity_House2_EventScript_DeclineTrade
 	end
 
-MauvilleCity_House2_EventScript_AcceptTrade:: @ 8210CB8
+MauvilleCity_House2_EventScript_AcceptTrade::
 	msgbox MauvilleCity_House2_Text_IllTradeYouCoinCase, MSGBOX_DEFAULT
 	removeitem ITEM_HARBOR_MAIL
 	giveitem ITEM_COIN_CASE
@@ -33,35 +33,35 @@ MauvilleCity_House2_EventScript_AcceptTrade:: @ 8210CB8
 	goto MauvilleCity_House2_EventScript_ReceivedCoinCase
 	end
 
-MauvilleCity_House2_EventScript_ReceivedCoinCase:: @ 8210CDA
+MauvilleCity_House2_EventScript_ReceivedCoinCase::
 	msgbox MauvilleCity_House2_Text_UseCoinCaseAtGameCorner, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_House2_EventScript_DeclineTrade:: @ 8210CE4
+MauvilleCity_House2_EventScript_DeclineTrade::
 	msgbox MauvilleCity_House2_Text_ThatsDisappointing, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_House2_Text_BuyHarborMailAtSlateport: @ 8210CEE
+MauvilleCity_House2_Text_BuyHarborMailAtSlateport:
 	.string "If I had a BIKE, it'd be easy to cycle to\n"
 	.string "SLATEPORT for some shopping.\p"
 	.string "I'd be able to buy HARBOR MAIL at the\n"
 	.string "POKéMON MART in SLATEPORT…$"
 
-MauvilleCity_House2_Text_TradeHarborMailForCoinCase: @ 8210D76
+MauvilleCity_House2_Text_TradeHarborMailForCoinCase:
 	.string "Oh! You have HARBOR MAIL?\n"
 	.string "Will you trade it for a COIN CASE?$"
 
-MauvilleCity_House2_Text_IllTradeYouCoinCase: @ 8210DB3
+MauvilleCity_House2_Text_IllTradeYouCoinCase:
 	.string "Oh, I'm so happy!\n"
 	.string "Okay, I'll trade you a COIN CASE!$"
 
-MauvilleCity_House2_Text_UseCoinCaseAtGameCorner: @ 8210DE7
+MauvilleCity_House2_Text_UseCoinCaseAtGameCorner:
 	.string "That COIN CASE can be used\n"
 	.string "at the GAME CORNER.$"
 
-MauvilleCity_House2_Text_ThatsDisappointing: @ 8210E16
+MauvilleCity_House2_Text_ThatsDisappointing:
 	.string "Oh, that's disappointing.\p"
 	.string "A COIN CASE is needed for the\n"
 	.string "GAME CORNER.$"
diff --git a/data/maps/MauvilleCity_Mart/scripts.inc b/data/maps/MauvilleCity_Mart/scripts.inc
index b288d42b7..4cf5bc20bb 100644
--- a/data/maps/MauvilleCity_Mart/scripts.inc
+++ b/data/maps/MauvilleCity_Mart/scripts.inc
@@ -1,7 +1,7 @@
-MauvilleCity_Mart_MapScripts:: @ 82110E5
+MauvilleCity_Mart_MapScripts::
 	.byte 0
 
-MauvilleCity_Mart_EventScript_Clerk:: @ 82110E6
+MauvilleCity_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -12,7 +12,7 @@ MauvilleCity_Mart_EventScript_Clerk:: @ 82110E6
 	end
 
 	.align 2
-MauvilleCity_Mart_Pokemart: @ 8211100
+MauvilleCity_Mart_Pokemart:
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_SUPER_POTION
@@ -29,15 +29,15 @@ MauvilleCity_Mart_Pokemart: @ 8211100
 	release
 	end
 
-MauvilleCity_Mart_EventScript_ExpertM:: @ 821111C
+MauvilleCity_Mart_EventScript_ExpertM::
 	msgbox MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats, MSGBOX_NPC
 	end
 
-MauvilleCity_Mart_EventScript_Man:: @ 8211125
+MauvilleCity_Mart_EventScript_Man::
 	msgbox MauvilleCity_Mart_Text_DecisionsDetermineBattle, MSGBOX_NPC
 	end
 
-MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats: @ 821112E
+MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats:
 	.string "There are items that temporarily\n"
 	.string "elevate the stats of POKéMON.\p"
 	.string "The ones I know you use in battle\n"
@@ -45,7 +45,7 @@ MauvilleCity_Mart_Text_ItemsToTemporarilyElevateStats: @ 821112E
 	.string "I do believe that there are others\n"
 	.string "like them.$"
 
-MauvilleCity_Mart_Text_DecisionsDetermineBattle: @ 82111D8
+MauvilleCity_Mart_Text_DecisionsDetermineBattle:
 	.string "Use a certain move, or use an item\n"
 	.string "instead…\p"
 	.string "The TRAINER's decisions determine how\n"
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index 179dfad8a..4347c4773 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
@@ -1,21 +1,21 @@
 .set LOCALID_NURSE, 1
 
-MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8210E5B
+MauvilleCity_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MauvilleCity_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-MauvilleCity_PokemonCenter_1F_OnTransition: @ 8210E66
+MauvilleCity_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_MAUVILLE_CITY
 	call Common_EventScript_UpdateBrineyLocation
 	goto MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx:: @ 8210E74
+MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx::
 	special ScrSpecial_SetMauvilleOldManObjEventGfx
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_Nurse:: @ 8210E78
+MauvilleCity_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -23,32 +23,32 @@ MauvilleCity_PokemonCenter_1F_EventScript_Nurse:: @ 8210E78
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_Woman1:: @ 8210E86
+MauvilleCity_PokemonCenter_1F_EventScript_Woman1::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings, MSGBOX_NPC
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_Woman2:: @ 8210E8F
+MauvilleCity_PokemonCenter_1F_EventScript_Woman2::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner, MSGBOX_NPC
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_Youngster:: @ 8210E98
+MauvilleCity_PokemonCenter_1F_EventScript_Youngster::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun, MSGBOX_NPC
 	end
 
-MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings: @ 8210EA1
+MauvilleCity_PokemonCenter_1F_Text_ManOverThereSaysWeirdThings:
 	.string "That man over there, he says weird\n"
 	.string "things!\p"
 	.string "He's funny in a weird way.\n"
 	.string "I doubt I'll forget about him!$"
 
-MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner: @ 8210F06
+MauvilleCity_PokemonCenter_1F_Text_MyDataUpdatedFromRecordCorner:
 	.string "When I accessed the RECORD CORNER,\n"
 	.string "the data for what's hot in DEWFORD\l"
 	.string "got updated.\p"
 	.string "Now that bit of data is the same\n"
 	.string "as my friend's!$"
 
-MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun: @ 8210F8A
+MauvilleCity_PokemonCenter_1F_Text_RecordCornerSoundsFun:
 	.string "A RECORD CORNER opened upstairs in\n"
 	.string "the POKéMON CENTER.\p"
 	.string "I don't know what it's about, but it\n"
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
index 9626e4882..e6a716ec2 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008
+MauvilleCity_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,23 +6,23 @@ MauvilleCity_PokemonCenter_2F_MapScripts:: @ 8211008
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-MauvilleCity_PokemonCenter_2F_EventScript_Colosseum:: @ 821101D
+MauvilleCity_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-MauvilleCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8211023
+MauvilleCity_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-MauvilleCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8211029
+MauvilleCity_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
-MauvilleCity_PokemonCenter_2F_EventScript_Youngster:: @ 821102F
+MauvilleCity_PokemonCenter_2F_EventScript_Youngster::
 	msgbox MauvilleCity_PokemonCenter_2F_Text_Youngster, MSGBOX_NPC
 	end
 
-MauvilleCity_PokemonCenter_2F_Text_Youngster: @ 8211038
+MauvilleCity_PokemonCenter_2F_Text_Youngster:
 	.string "Did you know that you can link battle\n"
 	.string "at the COLOSSEUM here?\p"
 	.string "They put up your record on the wall\n"
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
index 8202267b9..4a4091269 100644
--- a/data/maps/MeteorFalls_1F_1R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -4,22 +4,22 @@
 .set LOCALID_AQUA_GRUNT_1, 8
 .set LOCALID_AQUA_GRUNT_2, 9
 
-MeteorFalls_1F_1R_MapScripts:: @ 822BD2A
+MeteorFalls_1F_1R_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, MeteorFalls_1F_1R_OnLoad
 	.byte 0
 
-MeteorFalls_1F_1R_OnLoad: @ 822BD30
+MeteorFalls_1F_1R_OnLoad:
 	call_if_set FLAG_SYS_GAME_CLEAR, MeteorFalls_1F_1R_EventScript_OpenStevensCave
 	end
 
-MeteorFalls_1F_1R_EventScript_OpenStevensCave:: @ 822BD3A
+MeteorFalls_1F_1R_EventScript_OpenStevensCave::
 	setmetatile 4, 1, METATILE_MeteorFalls_CaveEntrance_Top, 1
 	setmetatile 3, 2, METATILE_MeteorFalls_CaveEntrance_Left, 1
 	setmetatile 4, 2, METATILE_MeteorFalls_CaveEntrance_Bottom, 0
 	setmetatile 5, 2, METATILE_MeteorFalls_CaveEntrance_Right, 1
 	return
 
-MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
+MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene::
 	lockall
 	playbgm MUS_ENCOUNTER_MAGMA, FALSE
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceDown
@@ -96,13 +96,13 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene:: @ 822BD5F
 	releaseall
 	end
 
-MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer: @ 822BEC0
+MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer:
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit: @ 822BEC4
+MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_right
@@ -114,7 +114,7 @@ MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit: @ 822BEC4
 	walk_fast_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit: @ 822BECE
+MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -127,7 +127,7 @@ MeteorFalls_1F_1R_Movement_MagmaGrunt2Exit: @ 822BECE
 	walk_fast_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_ArchieArrive: @ 822BED9
+MeteorFalls_1F_1R_Movement_ArchieArrive:
 	walk_right
 	walk_right
 	walk_right
@@ -136,7 +136,7 @@ MeteorFalls_1F_1R_Movement_ArchieArrive: @ 822BED9
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive: @ 822BEE0
+MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive:
 	delay_16
 	delay_16
 	walk_right
@@ -146,7 +146,7 @@ MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive: @ 822BEE0
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive: @ 822BEE8
+MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive:
 	delay_16
 	delay_16
 	walk_right
@@ -156,7 +156,7 @@ MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive: @ 822BEE8
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_ArchieExit: @ 822BEF0
+MeteorFalls_1F_1R_Movement_ArchieExit:
 	walk_right
 	walk_right
 	walk_right
@@ -166,7 +166,7 @@ MeteorFalls_1F_1R_Movement_ArchieExit: @ 822BEF0
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_ArchieApproachPlayer: @ 822BEF8
+MeteorFalls_1F_1R_Movement_ArchieApproachPlayer:
 	walk_right
 	walk_right
 	walk_up
@@ -174,7 +174,7 @@ MeteorFalls_1F_1R_Movement_ArchieApproachPlayer: @ 822BEF8
 	walk_in_place_fastest_left
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt1Exit: @ 822BEFE
+MeteorFalls_1F_1R_Movement_AquaGrunt1Exit:
 	walk_up
 	walk_up
 	walk_right
@@ -186,14 +186,14 @@ MeteorFalls_1F_1R_Movement_AquaGrunt1Exit: @ 822BEFE
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie: @ 822BF08
+MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie:
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt2Exit: @ 822BF0D
+MeteorFalls_1F_1R_Movement_AquaGrunt2Exit:
 	walk_up
 	walk_up
 	walk_up
@@ -206,14 +206,14 @@ MeteorFalls_1F_1R_Movement_AquaGrunt2Exit: @ 822BF0D
 	walk_right
 	step_end
 
-MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie: @ 822BF18
+MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie:
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay: @ 822BF1D
+MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay:
 	walk_in_place_fastest_down
 	delay_4
 	walk_in_place_fastest_right
@@ -223,7 +223,7 @@ MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay: @ 822BF1D
 	face_right
 	step_end
 
-MeteorFalls_1F_1R_EventScript_ProfCozmo:: @ 822BF25
+MeteorFalls_1F_1R_EventScript_ProfCozmo::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_PROF_COZMO, MeteorFalls_1F_1R_EventScript_MetCozmo
@@ -232,28 +232,28 @@ MeteorFalls_1F_1R_EventScript_ProfCozmo:: @ 822BF25
 	release
 	end
 
-MeteorFalls_1F_1R_EventScript_MetCozmo:: @ 822BF3D
+MeteorFalls_1F_1R_EventScript_MetCozmo::
 	msgbox MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_1F_1R_Text_WithThisMeteorite: @ 822BF47
+MeteorFalls_1F_1R_Text_WithThisMeteorite:
 	.string "Hehehe!\p"
 	.string "With this METEORITE, that thing in\n"
 	.string "MT. CHIMNEY will…$"
 
-MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma: @ 822BF84
+MeteorFalls_1F_1R_Text_DontExpectMercyFromMagma:
 	.string "Heh?\p"
 	.string "I don't know who you are, but if you get\n"
 	.string "in the way of TEAM MAGMA, don't\l"
 	.string "expect any mercy!$"
 
-MeteorFalls_1F_1R_Text_HoldItRightThereMagma: @ 822BFE4
+MeteorFalls_1F_1R_Text_HoldItRightThereMagma:
 	.string "Hold it right there, TEAM MAGMA!\p"
 	.string "You're badly mistaken if you think you\n"
 	.string "can have your way with the world!$"
 
-MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua: @ 822C04E
+MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua:
 	.string "Hehehe!\n"
 	.string "Even TEAM AQUA joins us!\p"
 	.string "But it's too much trouble to deal with\n"
@@ -264,7 +264,7 @@ MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua: @ 822C04E
 	.string "Hehehe! Be seeing you, you TEAM\n"
 	.string "AQUA dingbats!$"
 
-MeteorFalls_1F_1R_Text_ArchieSeenYouBefore: @ 822C11C
+MeteorFalls_1F_1R_Text_ArchieSeenYouBefore:
 	.string "ARCHIE: Didn't I see you before?\n"
 	.string "At SLATEPORT's MUSEUM?\p"
 	.string "Ah, so your name is {PLAYER}.\p"
@@ -279,22 +279,22 @@ MeteorFalls_1F_1R_Text_ArchieSeenYouBefore: @ 822C11C
 	.string "They are the rivals to us,\n"
 	.string "the sea-loving TEAM AQUA!$"
 
-MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma: @ 822C268
+MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma:
 	.string "BOSS, we should give chase to\n"
 	.string "TEAM MAGMA…$"
 
-MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo: @ 822C292
+MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo:
 	.string "ARCHIE: Yes, yes, we must!\n"
 	.string "We've got to hurry.\p"
 	.string "There's no telling what TEAM MAGMA\n"
 	.string "will do at MT. CHIMNEY!$"
 
-MeteorFalls_1F_1R_Text_ArchieFarewell: @ 822C2FC
+MeteorFalls_1F_1R_Text_ArchieFarewell:
 	.string "ARCHIE: {PLAYER}, you should keep\n"
 	.string "an eye out for TEAM MAGMA, too.\p"
 	.string "Farewell!$"
 
-MeteorFalls_1F_1R_Text_MeetProfCozmo: @ 822C342
+MeteorFalls_1F_1R_Text_MeetProfCozmo:
 	.string "I… I'm COZMO…\n"
 	.string "I'm a PROFESSOR…\p"
 	.string "TEAM MAGMA asked me to guide them\n"
@@ -309,7 +309,7 @@ MeteorFalls_1F_1R_Text_MeetProfCozmo: @ 822C342
 	.string "What are they going to do with that\n"
 	.string "METEORITE at MT. CHIMNEY?$"
 
-MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney: @ 822C47D
+MeteorFalls_1F_1R_Text_WhatsTeamMagmaDoingAtMtChimney:
 	.string "PROF. COZMO: But that TEAM MAGMA…\p"
 	.string "What are they going to do with that\n"
 	.string "METEORITE at MT. CHIMNEY?$"
diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc
index 0fa73212e..706d362be 100644
--- a/data/maps/MeteorFalls_1F_2R/scripts.inc
+++ b/data/maps/MeteorFalls_1F_2R/scripts.inc
@@ -1,7 +1,7 @@
-MeteorFalls_1F_2R_MapScripts:: @ 822C4DD
+MeteorFalls_1F_2R_MapScripts::
 	.byte 0
 
-MeteorFalls_1F_2R_EventScript_Nicolas:: @ 822C4DE
+MeteorFalls_1F_2R_EventScript_Nicolas::
 	trainerbattle_single TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasIntro, MeteorFalls_1F_2R_Text_NicolasDefeat, MeteorFalls_1F_2R_EventScript_RegisterNicolas
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -10,7 +10,7 @@ MeteorFalls_1F_2R_EventScript_Nicolas:: @ 822C4DE
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RegisterNicolas:: @ 822C50A
+MeteorFalls_1F_2R_EventScript_RegisterNicolas::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox MeteorFalls_1F_2R_Text_NicolasRegister, MSGBOX_DEFAULT
@@ -18,12 +18,12 @@ MeteorFalls_1F_2R_EventScript_RegisterNicolas:: @ 822C50A
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RematchNicolas:: @ 822C529
+MeteorFalls_1F_2R_EventScript_RematchNicolas::
 	trainerbattle_rematch TRAINER_NICOLAS_1, MeteorFalls_1F_2R_Text_NicolasRematchIntro, MeteorFalls_1F_2R_Text_NicolasRematchDefeat
 	msgbox MeteorFalls_1F_2R_Text_NicolasPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_EventScript_John:: @ 822C540
+MeteorFalls_1F_2R_EventScript_John::
 	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnIntro, MeteorFalls_1F_2R_Text_JohnDefeat, MeteorFalls_1F_2R_Text_JohnNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJohn
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -32,18 +32,18 @@ MeteorFalls_1F_2R_EventScript_John:: @ 822C540
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RegisterJohn:: @ 822C570
+MeteorFalls_1F_2R_EventScript_RegisterJohn::
 	msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JOHN_AND_JAY_1
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RematchJohn:: @ 822C589
+MeteorFalls_1F_2R_EventScript_RematchJohn::
 	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JohnRematchIntro, MeteorFalls_1F_2R_Text_JohnRematchDefeat, MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons
 	msgbox MeteorFalls_1F_2R_Text_JohnPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_EventScript_Jay:: @ 822C5A4
+MeteorFalls_1F_2R_EventScript_Jay::
 	trainerbattle_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayIntro, MeteorFalls_1F_2R_Text_JayDefeat, MeteorFalls_1F_2R_Text_JayNotEnoughMons, MeteorFalls_1F_2R_EventScript_RegisterJay
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -52,133 +52,133 @@ MeteorFalls_1F_2R_EventScript_Jay:: @ 822C5A4
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RegisterJay:: @ 822C5D4
+MeteorFalls_1F_2R_EventScript_RegisterJay::
 	msgbox MeteorFalls_1F_2R_Text_JohnRegister, MSGBOX_DEFAULT  @ John speaks for both during register
 	register_matchcall TRAINER_JOHN_AND_JAY_1
 	release
 	end
 
-MeteorFalls_1F_2R_EventScript_RematchJay:: @ 822C5ED
+MeteorFalls_1F_2R_EventScript_RematchJay::
 	trainerbattle_rematch_double TRAINER_JOHN_AND_JAY_1, MeteorFalls_1F_2R_Text_JayRematchIntro, MeteorFalls_1F_2R_Text_JayRematchDefeat, MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons
 	msgbox MeteorFalls_1F_2R_Text_JayPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MeteorFalls_1F_2R_Text_NicolasIntro: @ 822C608
+MeteorFalls_1F_2R_Text_NicolasIntro:
 	.string "This is where we DRAGON users do our\n"
 	.string "training.\p"
 	.string "The CHAMPION even visits.\n"
 	.string "Now do you see how special it is here?$"
 
-MeteorFalls_1F_2R_Text_NicolasDefeat: @ 822C678
+MeteorFalls_1F_2R_Text_NicolasDefeat:
 	.string "Urgh!\n"
 	.string "I didn't expect you to be so strong!$"
 
-MeteorFalls_1F_2R_Text_NicolasPostBattle: @ 822C6A3
+MeteorFalls_1F_2R_Text_NicolasPostBattle:
 	.string "The road ahead remains long and harsh.\p"
 	.string "When will my POKéMON and I become\n"
 	.string "the best?$"
 
-MeteorFalls_1F_2R_Text_NicolasRegister: @ 822C6F6
+MeteorFalls_1F_2R_Text_NicolasRegister:
 	.string "I want to know more about your power.\n"
 	.string "Let me register you in my POKéNAV.$"
 
-MeteorFalls_1F_2R_Text_NicolasRematchIntro: @ 822C73F
+MeteorFalls_1F_2R_Text_NicolasRematchIntro:
 	.string "Since we met, we have trained hard\n"
 	.string "with our sights on number one.\p"
 	.string "Help us see how much stronger we've\n"
 	.string "become!$"
 
-MeteorFalls_1F_2R_Text_NicolasRematchDefeat: @ 822C7AD
+MeteorFalls_1F_2R_Text_NicolasRematchDefeat:
 	.string "Urgh!\n"
 	.string "I didn't expect you to be so strong!$"
 
-MeteorFalls_1F_2R_Text_NicolasPostRematch: @ 822C7D8
+MeteorFalls_1F_2R_Text_NicolasPostRematch:
 	.string "You've obviously kept up your\n"
 	.string "POKéMON training.\p"
 	.string "So long as you remain strong, I, too,\n"
 	.string "can become stronger!$"
 
-MeteorFalls_1F_2R_Text_JohnIntro: @ 822C843
+MeteorFalls_1F_2R_Text_JohnIntro:
 	.string "JOHN: We've always battled POKéMON\n"
 	.string "together as a twosome.\l"
 	.string "We've confidence in ourselves.$"
 
-MeteorFalls_1F_2R_Text_JohnDefeat: @ 822C89C
+MeteorFalls_1F_2R_Text_JohnDefeat:
 	.string "JOHN: Oh, my.\n"
 	.string "We've lost, dear wife.$"
 
-MeteorFalls_1F_2R_Text_JohnPostBattle: @ 822C8C1
+MeteorFalls_1F_2R_Text_JohnPostBattle:
 	.string "JOHN: We've been married for\n"
 	.string "fifty years.\p"
 	.string "Come to think of it, I've yet to beat\n"
 	.string "my dear wife in a battle.$"
 
-MeteorFalls_1F_2R_Text_JohnNotEnoughMons: @ 822C92B
+MeteorFalls_1F_2R_Text_JohnNotEnoughMons:
 	.string "JOHN: Well, well, what a young TRAINER!\p"
 	.string "Will you battle with us? If so, you'll\n"
 	.string "have to return with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_JohnRegister: @ 822C99C
+MeteorFalls_1F_2R_Text_JohnRegister:
 	.string "JOHN: Young TRAINER, if the chance\n"
 	.string "arises, will you battle with us again?$"
 
-MeteorFalls_1F_2R_Text_JayIntro: @ 822C9E6
+MeteorFalls_1F_2R_Text_JayIntro:
 	.string "JAY: We've been married for\n"
 	.string "fifty years.\p"
 	.string "The bond we share as a couple could\n"
 	.string "never be broken.$"
 
-MeteorFalls_1F_2R_Text_JayDefeat: @ 822CA44
+MeteorFalls_1F_2R_Text_JayDefeat:
 	.string "JAY: Oh, dear.\n"
 	.string "We've lost, my dear husband.$"
 
-MeteorFalls_1F_2R_Text_JayPostBattle: @ 822CA70
+MeteorFalls_1F_2R_Text_JayPostBattle:
 	.string "JAY: Fifty years of marriage…\p"
 	.string "If we ever argued, we always settled\n"
 	.string "it with a POKéMON battle…$"
 
-MeteorFalls_1F_2R_Text_JayNotEnoughMons: @ 822CACD
+MeteorFalls_1F_2R_Text_JayNotEnoughMons:
 	.string "JAY: Well, well, aren't you a young\n"
 	.string "TRAINER?\p"
 	.string "If you'd care to battle with us, you'll\n"
 	.string "have to come back with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_JohnRematchIntro: @ 822CB47
+MeteorFalls_1F_2R_Text_JohnRematchIntro:
 	.string "JOHN: We've always battled POKéMON\n"
 	.string "together as a twosome.\l"
 	.string "We've confidence in ourselves.$"
 
-MeteorFalls_1F_2R_Text_JohnRematchDefeat: @ 822CBA0
+MeteorFalls_1F_2R_Text_JohnRematchDefeat:
 	.string "JOHN: Oh, my.\n"
 	.string "We've lost, dear wife.$"
 
-MeteorFalls_1F_2R_Text_JohnPostRematch: @ 822CBC5
+MeteorFalls_1F_2R_Text_JohnPostRematch:
 	.string "JOHN: Married for fifty years…\p"
 	.string "On reflection, the dear wife and I,\n"
 	.string "we battled day in and day out…$"
 
-MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons: @ 822CC27
+MeteorFalls_1F_2R_Text_JohnRematchNotEnoughMons:
 	.string "JOHN: Well, well, what a young TRAINER!\p"
 	.string "Will you battle with us? If so, you'll\n"
 	.string "have to return with more POKéMON.$"
 
-MeteorFalls_1F_2R_Text_JayRematchIntro: @ 822CC98
+MeteorFalls_1F_2R_Text_JayRematchIntro:
 	.string "JAY: We've been married for\n"
 	.string "fifty years.\p"
 	.string "We've supported each other all that\n"
 	.string "time. We've made ourselves strong.$"
 
-MeteorFalls_1F_2R_Text_JayRematchDefeat: @ 822CD08
+MeteorFalls_1F_2R_Text_JayRematchDefeat:
 	.string "JAY: Oh, dear.\n"
 	.string "We've lost, my dear husband.$"
 
-MeteorFalls_1F_2R_Text_JayPostRematch: @ 822CD34
+MeteorFalls_1F_2R_Text_JayPostRematch:
 	.string "JAY: Fifty years of marriage…\n"
 	.string "Many things have happened.\p"
 	.string "I hope that we will continue to make\n"
 	.string "happy memories together.$"
 
-MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons: @ 822CDAB
+MeteorFalls_1F_2R_Text_JayRematchNotEnoughMons:
 	.string "JAY: Well, well, aren't you a young\n"
 	.string "TRAINER?\p"
 	.string "If you'd care to battle with us, you'll\n"
diff --git a/data/maps/MeteorFalls_B1F_1R/scripts.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc
index 551e68180..6d7af8ed9 100644
--- a/data/maps/MeteorFalls_B1F_1R/scripts.inc
+++ b/data/maps/MeteorFalls_B1F_1R/scripts.inc
@@ -1,3 +1,3 @@
-MeteorFalls_B1F_1R_MapScripts:: @ 822CE25
+MeteorFalls_B1F_1R_MapScripts::
 	.byte 0
 
diff --git a/data/maps/MeteorFalls_B1F_2R/scripts.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc
index 775b5787c..a1d8d5b65 100644
--- a/data/maps/MeteorFalls_B1F_2R/scripts.inc
+++ b/data/maps/MeteorFalls_B1F_2R/scripts.inc
@@ -1,3 +1,3 @@
-MeteorFalls_B1F_2R_MapScripts:: @ 822CE26
+MeteorFalls_B1F_2R_MapScripts::
 	.byte 0
 
diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc
index 9ccc2ca68..a1c9e74ec 100644
--- a/data/maps/MeteorFalls_StevensCave/scripts.inc
+++ b/data/maps/MeteorFalls_StevensCave/scripts.inc
@@ -1,9 +1,9 @@
 .set LOCALID_STEVEN, 1
 
-MeteorFalls_StevensCave_MapScripts:: @ 823B181
+MeteorFalls_StevensCave_MapScripts::
 	.byte 0
 
-MeteorFalls_StevensCave_EventScript_Steven:: @ 823B182
+MeteorFalls_StevensCave_EventScript_Steven::
 	lock
 	goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_Defeated
 	waitse
@@ -21,14 +21,14 @@ MeteorFalls_StevensCave_EventScript_Steven:: @ 823B182
 	release
 	end
 
-MeteorFalls_StevensCave_EventScript_Defeated:: @ 823B1CD
+MeteorFalls_StevensCave_EventScript_Defeated::
 	applymovement LOCALID_STEVEN, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MeteorFalls_StevensCave_Text_MyPredictionCameTrue, MSGBOX_DEFAULT
 	release
 	end
 
-MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst: @ 823B1E1
+MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst:
 	.string "STEVEN: Oh, wow, {PLAYER}{KUN}.\n"
 	.string "I'm amazed you knew where to find me.\p"
 	.string "Do you, uh…maybe think of me as\n"
@@ -41,11 +41,11 @@ MeteorFalls_StevensCave_Text_ShouldKnowHowGoodIAmExpectWorst: @ 823B1E1
 	.string "Okay, {PLAYER}{KUN}, if you're going to mount\n"
 	.string "a serious challenge, expect the worst!$"
 
-MeteorFalls_StevensCave_Text_StevenDefeat: @ 823B32D
+MeteorFalls_StevensCave_Text_StevenDefeat:
 	.string "You…\n"
 	.string "I had no idea you'd become so strong…$"
 
-MeteorFalls_StevensCave_Text_MyPredictionCameTrue: @ 823B358
+MeteorFalls_StevensCave_Text_MyPredictionCameTrue:
 	.string "STEVEN: Come to think of it, ever since\n"
 	.string "our paths first crossed in GRANITE\l"
 	.string "CAVE in DEWFORD, I had this feeling.\p"
diff --git a/data/maps/MirageTower_1F/scripts.inc b/data/maps/MirageTower_1F/scripts.inc
index 74ec749fa..6a6b4f50e 100644
--- a/data/maps/MirageTower_1F/scripts.inc
+++ b/data/maps/MirageTower_1F/scripts.inc
@@ -1,8 +1,8 @@
-MirageTower_1F_MapScripts:: @ 823AD01
+MirageTower_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_1F_OnTransition
 	.byte 0
 
-MirageTower_1F_OnTransition: @ 823AD07
+MirageTower_1F_OnTransition:
 	setflag FLAG_ENTERED_MIRAGE_TOWER
 	setflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
 	setflag FLAG_LANDMARK_MIRAGE_TOWER
diff --git a/data/maps/MirageTower_2F/scripts.inc b/data/maps/MirageTower_2F/scripts.inc
index 888288633..3d53359d4 100644
--- a/data/maps/MirageTower_2F/scripts.inc
+++ b/data/maps/MirageTower_2F/scripts.inc
@@ -1,10 +1,10 @@
-MirageTower_2F_MapScripts:: @ 823AD11
+MirageTower_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
 	map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_SetHoleWarp
 	.byte 0
 
-MirageTower_2F_SetHoleWarp: @ 823AD21
+MirageTower_2F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
 	setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0
 	end
diff --git a/data/maps/MirageTower_3F/scripts.inc b/data/maps/MirageTower_3F/scripts.inc
index a54b2ccca..02b086400 100644
--- a/data/maps/MirageTower_3F/scripts.inc
+++ b/data/maps/MirageTower_3F/scripts.inc
@@ -1,10 +1,10 @@
-MirageTower_3F_MapScripts:: @ 823AD2C
+MirageTower_3F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
 	map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_SetHoleWarp
 	.byte 0
 
-MirageTower_3F_SetHoleWarp: @ 823AD3C
+MirageTower_3F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
 	setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0
 	end
diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc
index a258f9dec..2c96710d1 100644
--- a/data/maps/MirageTower_4F/scripts.inc
+++ b/data/maps/MirageTower_4F/scripts.inc
@@ -1,10 +1,10 @@
 .set LOCALID_ROOT_FOSSIL, 1
 .set LOCALID_CLAW_FOSSIL, 2
 
-MirageTower_4F_MapScripts:: @ 823AD47
+MirageTower_4F_MapScripts::
 	.byte 0
 
-MirageTower_4F_EventScript_RootFossil:: @ 823AD48
+MirageTower_4F_EventScript_RootFossil::
 	lock
 	faceplayer
 	msgbox MirageTower_4F_Text_TakeRootFossil, MSGBOX_YESNO
@@ -20,12 +20,12 @@ MirageTower_4F_EventScript_RootFossil:: @ 823AD48
 	goto MirageTower_4F_EventScript_CollapseMirageTower
 	end
 
-MirageTower_4F_EventScript_LeaveRootFossil:: @ 823AD7F
+MirageTower_4F_EventScript_LeaveRootFossil::
 	msgbox MirageTower_4F_Text_LeftRootFossilAlone, MSGBOX_DEFAULT
 	release
 	end
 
-MirageTower_4F_EventScript_ClawFossil:: @ 823AD89
+MirageTower_4F_EventScript_ClawFossil::
 	lock
 	faceplayer
 	msgbox MirageTower_4F_Text_TakeClawFossil, MSGBOX_YESNO
@@ -41,12 +41,12 @@ MirageTower_4F_EventScript_ClawFossil:: @ 823AD89
 	goto MirageTower_4F_EventScript_CollapseMirageTower
 	end
 
-MirageTower_4F_EventScript_LeaveClawFossil:: @ 823ADC0
+MirageTower_4F_EventScript_LeaveClawFossil::
 	msgbox MirageTower_4F_Text_LeaveClawFossilAlone, MSGBOX_DEFAULT
 	release
 	end
 
-MirageTower_4F_EventScript_CollapseMirageTower:: @ 823ADCA
+MirageTower_4F_EventScript_CollapseMirageTower::
 	setvar VAR_0x8004, 1   @ vertical pan
 	setvar VAR_0x8005, 1   @ horizontal pan
 	setvar VAR_0x8006, 32  @ num shakes
@@ -62,21 +62,21 @@ MirageTower_4F_EventScript_CollapseMirageTower:: @ 823ADCA
 	release
 	end
 
-MirageTower_4F_Text_TakeRootFossil: @ 823ADF9
+MirageTower_4F_Text_TakeRootFossil:
 	.string "You found the ROOT FOSSIL.\p"
 	.string "If this FOSSIL is taken, the ground\n"
 	.string "around it will likely crumble away…\p"
 	.string "Take the ROOT FOSSIL anyway?$"
 
-MirageTower_4F_Text_LeftRootFossilAlone: @ 823AE79
+MirageTower_4F_Text_LeftRootFossilAlone:
 	.string "{PLAYER} left the ROOT FOSSIL alone.$"
 
-MirageTower_4F_Text_TakeClawFossil: @ 823AE98
+MirageTower_4F_Text_TakeClawFossil:
 	.string "You found the CLAW FOSSIL.\p"
 	.string "If this FOSSIL is taken, the ground\n"
 	.string "around it will likely crumble away…\p"
 	.string "Take the CLAW FOSSIL anyway?$"
 
-MirageTower_4F_Text_LeaveClawFossilAlone: @ 823AF18
+MirageTower_4F_Text_LeaveClawFossilAlone:
 	.string "{PLAYER} left the CLAW FOSSIL alone.$"
 
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc
index 963635ccd..07758873d 100644
--- a/data/maps/MossdeepCity/scripts.inc
+++ b/data/maps/MossdeepCity/scripts.inc
@@ -5,11 +5,11 @@
 .set LOCALID_MAXIE, 14
 .set LOCALID_SCOTT, 16
 
-MossdeepCity_MapScripts:: @ 81E4A96
+MossdeepCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_OnTransition
 	.byte 0
 
-MossdeepCity_OnTransition: @ 81E4A9C
+MossdeepCity_OnTransition:
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
@@ -17,7 +17,7 @@ MossdeepCity_OnTransition: @ 81E4A9C
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 
-MossdeepCity_EventScript_PokefanF:: @ 81E4AB2
+MossdeepCity_EventScript_PokefanF::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_PokefanFMagmaGone
@@ -25,12 +25,12 @@ MossdeepCity_EventScript_PokefanF:: @ 81E4AB2
 	release
 	end
 
-MossdeepCity_EventScript_PokefanFMagmaGone:: @ 81E4AC7
+MossdeepCity_EventScript_PokefanFMagmaGone::
 	msgbox MossdeepCity_Text_SpaceCenterLaunchingRockets, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_Sailor:: @ 81E4AD1
+MossdeepCity_EventScript_Sailor::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_SailorMagmaGone
@@ -38,49 +38,49 @@ MossdeepCity_EventScript_Sailor:: @ 81E4AD1
 	release
 	end
 
-MossdeepCity_EventScript_SailorMagmaGone:: @ 81E4AE6
+MossdeepCity_EventScript_SailorMagmaGone::
 	msgbox MossdeepCity_Text_FeelReliefOnLand, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_NinjaBoy:: @ 81E4AF0
+MossdeepCity_EventScript_NinjaBoy::
 	msgbox MossdeepCity_Text_WailmerWatching, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_ExpertM:: @ 81E4AF9
+MossdeepCity_EventScript_ExpertM::
 	msgbox MossdeepCity_Text_LifeNeedsSeaToLive, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_Girl:: @ 81E4B02
+MossdeepCity_EventScript_Girl::
 	msgbox MossdeepCity_Text_NiceIfWorldCoveredByFlowers, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_Woman:: @ 81E4B0B
+MossdeepCity_EventScript_Woman::
 	msgbox MossdeepCity_Text_SpecialSpaceCenterRock, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_WhiteRock:: @ 81E4B14
+MossdeepCity_EventScript_WhiteRock::
 	msgbox MossdeepCity_Text_ItsAWhiteRock, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_GymSign:: @ 81E4B1D
+MossdeepCity_EventScript_GymSign::
 	msgbox MossdeepCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_CitySign:: @ 81E4B26
+MossdeepCity_EventScript_CitySign::
 	msgbox MossdeepCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_SpaceCenterSign:: @ 81E4B2F
+MossdeepCity_EventScript_SpaceCenterSign::
 	msgbox MossdeepCity_Text_SpaceCenterSign, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_VisitedMossdeep:: @ 81E4B38
+MossdeepCity_EventScript_VisitedMossdeep::
 	setflag FLAG_VISITED_MOSSDEEP_CITY
 	setvar VAR_TEMP_1, 1
 	end
 
-MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter:: @ 81E4B41
+MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter::
 	lockall
 	applymovement LOCALID_MAXIE, MossdeepCity_Movement_MaxieGestureToSpaceCenter
 	waitmovement 0
@@ -106,7 +106,7 @@ MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter:: @ 81E4B41
 	releaseall
 	end
 
-MossdeepCity_Movement_MaxieGestureToSpaceCenter: @ 81E4BAD
+MossdeepCity_Movement_MaxieGestureToSpaceCenter:
 	delay_16
 	face_right
 	delay_16
@@ -118,14 +118,14 @@ MossdeepCity_Movement_MaxieGestureToSpaceCenter: @ 81E4BAD
 	delay_16
 	step_end
 
-MossdeepCity_Movement_GruntFaceSpaceCenter: @ 81E4BB7
+MossdeepCity_Movement_GruntFaceSpaceCenter:
 	face_right
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-MossdeepCity_Movement_MaxieEnterSpaceCenter: @ 81E4BBC
+MossdeepCity_Movement_MaxieEnterSpaceCenter:
 	walk_down
 	walk_right
 	walk_right
@@ -141,7 +141,7 @@ MossdeepCity_Movement_MaxieEnterSpaceCenter: @ 81E4BBC
 	walk_right
 	step_end
 
-MossdeepCity_Movement_Grunt1EnterSpaceCenter: @ 81E4BCA
+MossdeepCity_Movement_Grunt1EnterSpaceCenter:
 	delay_16
 	delay_8
 	walk_down
@@ -162,7 +162,7 @@ MossdeepCity_Movement_Grunt1EnterSpaceCenter: @ 81E4BCA
 	walk_right
 	step_end
 
-MossdeepCity_Movement_Grunt2EnterSpaceCenter: @ 81E4BDD
+MossdeepCity_Movement_Grunt2EnterSpaceCenter:
 	delay_16
 	delay_8
 	walk_down
@@ -182,7 +182,7 @@ MossdeepCity_Movement_Grunt2EnterSpaceCenter: @ 81E4BDD
 	walk_right
 	step_end
 
-MossdeepCity_Movement_Grunt3EnterSpaceCenter: @ 81E4BEF
+MossdeepCity_Movement_Grunt3EnterSpaceCenter:
 	delay_16
 	delay_8
 	walk_down
@@ -201,7 +201,7 @@ MossdeepCity_Movement_Grunt3EnterSpaceCenter: @ 81E4BEF
 	walk_right
 	step_end
 
-MossdeepCity_Movement_Grunt4EnterSpaceCenter: @ 81E4C00
+MossdeepCity_Movement_Grunt4EnterSpaceCenter:
 	delay_16
 	delay_8
 	walk_right
@@ -219,7 +219,7 @@ MossdeepCity_Movement_Grunt4EnterSpaceCenter: @ 81E4C00
 	walk_right
 	step_end
 
-MossdeepCity_EventScript_Man:: @ 81E4C10
+MossdeepCity_EventScript_Man::
 	lock
 	faceplayer
 	msgbox MossdeepCity_Text_SurfExhilarating, MSGBOX_DEFAULT
@@ -228,7 +228,7 @@ MossdeepCity_EventScript_Man:: @ 81E4C10
 	release
 	end
 
-MossdeepCity_EventScript_KingsRockBoy:: @ 81E4C26
+MossdeepCity_EventScript_KingsRockBoy::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_ReceivedKingsRock
@@ -243,21 +243,21 @@ MossdeepCity_EventScript_KingsRockBoy:: @ 81E4C26
 	release
 	end
 
-MossdeepCity_EventScript_ReceivedKingsRock:: @ 81E4C68
+MossdeepCity_EventScript_ReceivedKingsRock::
 	msgbox MossdeepCity_Text_StevensHouseOverThere, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_DeclineKingsRock:: @ 81E4C72
+MossdeepCity_EventScript_DeclineKingsRock::
 	msgbox MossdeepCity_Text_WhatToDoWithWeirdRock, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_BlackBelt:: @ 81E4C7C
+MossdeepCity_EventScript_BlackBelt::
 	msgbox MossdeepCity_Text_SootopolisNewGymLeader, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_Scott:: @ 81E4C85
+MossdeepCity_EventScript_Scott::
 	lock
 	faceplayer
 	msgbox MossdeepCity_Text_ScottSomethingWrongWithTown, MSGBOX_DEFAULT
@@ -271,25 +271,25 @@ MossdeepCity_EventScript_Scott:: @ 81E4C85
 	release
 	end
 
-MossdeepCity_EventScript_ScottExitNorth:: @ 81E4CB0
+MossdeepCity_EventScript_ScottExitNorth::
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit
 	applymovement LOCALID_SCOTT, MossdeepCity_Movement_ScottExitNorth
 	waitmovement 0
 	return
 
-MossdeepCity_EventScript_ScottExitEast:: @ 81E4CC2
+MossdeepCity_EventScript_ScottExitEast::
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit
 	applymovement LOCALID_SCOTT, MossdeepCity_Movement_ScottExitEast
 	waitmovement 0
 	return
 
-MossdeepCity_Movement_PlayerWatchScottExit: @ 81E4CD4
+MossdeepCity_Movement_PlayerWatchScottExit:
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MossdeepCity_Movement_ScottExitNorth: @ 81E4CD8
+MossdeepCity_Movement_ScottExitNorth:
 	walk_left
 	walk_left
 	walk_left
@@ -301,7 +301,7 @@ MossdeepCity_Movement_ScottExitNorth: @ 81E4CD8
 	walk_left
 	step_end
 
-MossdeepCity_Movement_ScottExitEast: @ 81E4CE2
+MossdeepCity_Movement_ScottExitEast:
 	walk_down
 	walk_left
 	walk_left
@@ -314,26 +314,26 @@ MossdeepCity_Movement_ScottExitEast: @ 81E4CE2
 	walk_left
 	step_end
 
-MossdeepCity_Text_WantKingsRockStevenGaveMe: @ 81E4CED
+MossdeepCity_Text_WantKingsRockStevenGaveMe:
 	.string "I got this from STEVEN, but I don't\n"
 	.string "know what it's good for.\p"
 	.string "I think it's called KING'S ROCK.\n"
 	.string "Do you want it?$"
 
-MossdeepCity_Text_YouCanKeepIt: @ 81E4D5B
+MossdeepCity_Text_YouCanKeepIt:
 	.string "Why would you want it?\n"
 	.string "You're weird.\p"
 	.string "You can keep it, but keep it a secret\n"
 	.string "from STEVEN.$"
 
-MossdeepCity_Text_StevensHouseOverThere: @ 81E4DB3
+MossdeepCity_Text_StevensHouseOverThere:
 	.string "STEVEN's house is right over there!$"
 
-MossdeepCity_Text_WhatToDoWithWeirdRock: @ 81E4DD7
+MossdeepCity_Text_WhatToDoWithWeirdRock:
 	.string "Yeah, you think so, too! What are you\n"
 	.string "supposed to do with some weird rock?$"
 
-MossdeepCity_Text_WailmerWatching: @ 81E4E22
+MossdeepCity_Text_WailmerWatching:
 	.string "Around MOSSDEEP, you can see wild\n"
 	.string "WAILMER.\p"
 	.string "It's called, uh…\n"
@@ -341,17 +341,17 @@ MossdeepCity_Text_WailmerWatching: @ 81E4E22
 	.string "WAI, WAI, WAI…\p"
 	.string "WAILMER watching!$"
 
-MossdeepCity_Text_SpaceCenterReceivedLetter: @ 81E4E90
+MossdeepCity_Text_SpaceCenterReceivedLetter:
 	.string "The island's SPACE CENTER has been\n"
 	.string "launching huge rockets.\p"
 	.string "There's been some kind of an uproar\n"
 	.string "over a letter they received recently.$"
 
-MossdeepCity_Text_SpaceCenterLaunchingRockets: @ 81E4F15
+MossdeepCity_Text_SpaceCenterLaunchingRockets:
 	.string "The island's SPACE CENTER has been\n"
 	.string "launching huge rockets.$"
 
-MossdeepCity_Text_MossdeepTargetedByMagma: @ 81E4F50
+MossdeepCity_Text_MossdeepTargetedByMagma:
 	.string "I heard from a SAILOR buddy that\n"
 	.string "TEAM AQUA set up shop in LILYCOVE.\p"
 	.string "I also heard that someone came along\n"
@@ -361,18 +361,18 @@ MossdeepCity_Text_MossdeepTargetedByMagma: @ 81E4F50
 	.string "If you want to know what they're up to,\n"
 	.string "go visit the SPACE CENTER.$"
 
-MossdeepCity_Text_FeelReliefOnLand: @ 81E5051
+MossdeepCity_Text_FeelReliefOnLand:
 	.string "I'm a SAILOR, so the sea's obviously\n"
 	.string "more important to me.\p"
 	.string "But you know? When I get back on land\n"
 	.string "after a long voyage, I do feel relief!$"
 
-MossdeepCity_Text_NiceIfWorldCoveredByFlowers: @ 81E50D9
+MossdeepCity_Text_NiceIfWorldCoveredByFlowers:
 	.string "Wouldn't it be nice?\p"
 	.string "If the whole world was covered in\n"
 	.string "plants and flowers like this island?$"
 
-MossdeepCity_Text_LifeNeedsSeaToLive: @ 81E5135
+MossdeepCity_Text_LifeNeedsSeaToLive:
 	.string "All life needs the sea to live, even\n"
 	.string "though it makes its home on the land.\p"
 	.string "Life, having run its course, becomes\n"
@@ -381,14 +381,14 @@ MossdeepCity_Text_LifeNeedsSeaToLive: @ 81E5135
 	.string "the land.\p"
 	.string "Yes, like the very shoreline here.$"
 
-MossdeepCity_Text_SurfExhilarating: @ 81E5213
+MossdeepCity_Text_SurfExhilarating:
 	.string "A voyage on a ship is fine.\p"
 	.string "But crossing the sea with POKéMON\n"
 	.string "using SURF…\p"
 	.string "Now that's an exhilarating trip!\n"
 	.string "Wouldn't you agree, youngster?$"
 
-MossdeepCity_Text_SpecialSpaceCenterRock: @ 81E529D
+MossdeepCity_Text_SpecialSpaceCenterRock:
 	.string "This rock has a special meaning to\n"
 	.string "the people at the SPACE CENTER.\p"
 	.string "They put it here as their wish for\n"
@@ -398,23 +398,23 @@ MossdeepCity_Text_SpecialSpaceCenterRock: @ 81E529D
 	.string "I use a wish tag to make it happen.\n"
 	.string "That's what I do.$"
 
-MossdeepCity_Text_ItsAWhiteRock: @ 81E5396
+MossdeepCity_Text_ItsAWhiteRock:
 	.string "It's a white rock.$"
 
-MossdeepCity_Text_GymSign: @ 81E53A9
+MossdeepCity_Text_GymSign:
 	.string "MOSSDEEP CITY POKéMON GYM\n"
 	.string "LEADERS: LIZA & TATE\p"
 	.string "“The mystic combination!”$"
 
-MossdeepCity_Text_CitySign: @ 81E53F2
+MossdeepCity_Text_CitySign:
 	.string "MOSSDEEP CITY\n"
 	.string "“Our slogan: Cherish POKéMON!”$"
 
-MossdeepCity_Text_SpaceCenterSign: @ 81E541F
+MossdeepCity_Text_SpaceCenterSign:
 	.string "MOSSDEEP SPACE CENTER\n"
 	.string "“The closest place to space.”$"
 
-MossdeepCity_Text_ScottSomethingWrongWithTown: @ 81E5453
+MossdeepCity_Text_ScottSomethingWrongWithTown:
 	.string "SCOTT: {PLAYER}{KUN}, feeling good?\n"
 	.string "I'm doing great!\p"
 	.string "I'd heard MOSSDEEP's GYM LEADER is\n"
@@ -427,7 +427,7 @@ MossdeepCity_Text_ScottSomethingWrongWithTown: @ 81E5453
 	.string "I don't think it concerns me in any\n"
 	.string "way, though.$"
 
-MossdeepCity_Text_SootopolisNewGymLeader: @ 81E5581
+MossdeepCity_Text_SootopolisNewGymLeader:
 	.string "Ahh… It feels great letting the waves\n"
 	.string "wash over my feet…\p"
 	.string "Speaking of the waves, you know that\n"
diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
index 95b08256e..b2780df04 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
@@ -1,19 +1,19 @@
-MossdeepCity_GameCorner_1F_MapScripts:: @ 8224B27
+MossdeepCity_GameCorner_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_GameCorner_1F_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, MossdeepCity_GameCorner_1F_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
 	.byte 0
 
-MossdeepCity_GameCorner_1F_OnWarp: @ 8224B37
+MossdeepCity_GameCorner_1F_OnWarp:
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant
 	.2byte 0
 
-MossdeepCity_GameCorner_1F_OnFrame: @ 8224B41
+MossdeepCity_GameCorner_1F_OnFrame:
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
 	.2byte 0
 
 @ Script is redundant, the label in the goto also does lock and faceplayer
-MossdeepCity_GameCorner_1F_EventScript_InfoMan:: @ 8224B4B
+MossdeepCity_GameCorner_1F_EventScript_InfoMan::
 	lock
 	faceplayer
 	goto MossdeepCity_GameCorner_1F_EventScript_InfoMan2
@@ -21,7 +21,7 @@ MossdeepCity_GameCorner_1F_EventScript_InfoMan:: @ 8224B4B
 	end
 
 @ Script is redundant, the label in the goto also does lock and faceplayer
-MossdeepCity_GameCorner_1F_EventScript_OldMan:: @ 8224B54
+MossdeepCity_GameCorner_1F_EventScript_OldMan::
 	lock
 	faceplayer
 	goto MossdeepCity_GameCorner_1F_EventScript_OldMan2
@@ -34,54 +34,54 @@ MossdeepCity_GameCorner_1F_EventScript_OldMan:: @ 8224B54
 @ The text below is unused and duplicated in its replacement in Sootopolis City
 @ And the BG Door event was moved inaccessibly into a wall
 
-RS_MysteryEventsHouse_EventScript_Door:: @ 8224B5D
+RS_MysteryEventsHouse_EventScript_Door::
 	msgbox RS_MysteryEventsHouse_Text_DoorIsLocked, MSGBOX_SIGN
 	end
 
-RS_MysteryEventsHouse_Text_OldManGreeting: @ 8224B66
+RS_MysteryEventsHouse_Text_OldManGreeting:
 	.string "When I was young, I traveled the world\n"
 	.string "as a POKéMON TRAINER.\p"
 	.string "Now that I've become an old buzzard,\n"
 	.string "my only amusement is watching young\l"
 	.string "TRAINERS battle.$"
 
-RS_MysteryEventsHouse_Text_DoorIsLocked: @ 8224BFD
+RS_MysteryEventsHouse_Text_DoorIsLocked:
 	.string "The door appears to be locked.$"
 
-RS_MysteryEventsHouse_Text_ChallengeVisitingTrainer: @ 8224C1C
+RS_MysteryEventsHouse_Text_ChallengeVisitingTrainer:
 	.string "A TRAINER named {STR_VAR_1} is\n"
 	.string "visiting my home.\p"
 	.string "Would you like to challenge\n"
 	.string "{STR_VAR_1}?$"
 
-RS_MysteryEventsHouse_Text_YouWontBattle: @ 8224C64
+RS_MysteryEventsHouse_Text_YouWontBattle:
 	.string "You won't battle? I'm disappointed\n"
 	.string "that I can't see you battle…$"
 
-RS_MysteryEventsHouse_Text_KeepItToA3On3: @ 8224CA4
+RS_MysteryEventsHouse_Text_KeepItToA3On3:
 	.string "Oh, good, good!\p"
 	.string "But my house isn't all that sturdy.\p"
 	.string "Could I ask you to keep it down to\n"
 	.string "a 3-on-3 match?$"
 
-RS_MysteryEventsHouse_Text_SaveYourProgress: @ 8224D0B
+RS_MysteryEventsHouse_Text_SaveYourProgress:
 	.string "Before you two battle, you should\n"
 	.string "save your progress.$"
 
-RS_MysteryEventsHouse_Text_HopeToSeeAGoodMatch: @ 8224D41
+RS_MysteryEventsHouse_Text_HopeToSeeAGoodMatch:
 	.string "I hope to see a good match!$"
 
-RS_MysteryEventsHouse_Text_BattleTie: @ 8224D5D
+RS_MysteryEventsHouse_Text_BattleTie:
 	.string "So, it became a standoff.\p"
 	.string "It was a brilliant match in which\n"
 	.string "neither side conceded a step!$"
 
-RS_MysteryEventsHouse_Text_BattleWon: @ 8224DB7
+RS_MysteryEventsHouse_Text_BattleWon:
 	.string "That was superlative!\p"
 	.string "Why, it was like seeing myself in\n"
 	.string "my youth again!$"
 
-RS_MysteryEventsHouse_Text_BattleLost: @ 8224DFF
+RS_MysteryEventsHouse_Text_BattleLost:
 	.string "Ah, too bad for you!\p"
 	.string "But it was a good match.\n"
 	.string "I hope you can win next time.$"
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
index 695be3c6e..c9387646a 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
@@ -1,3 +1,3 @@
-MossdeepCity_GameCorner_B1F_MapScripts:: @ 8224E4B
+MossdeepCity_GameCorner_B1F_MapScripts::
 	.byte 0
 
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
index 0e6487e16..22c2e17ab 100644
--- a/data/maps/MossdeepCity_Gym/scripts.inc
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -1,54 +1,54 @@
-MossdeepCity_Gym_MapScripts:: @ 8220800
+MossdeepCity_Gym_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_Gym_OnLoad
 	.byte 0
 
 @ NOTE: Mossdeep Gym was redesigned between R/S and E. Leftover (and now functionally unused) scripts are commented below
 
 @ All the below checks are leftover from RS. FLAG_MOSSDEEP_GYM_SWITCH_X is never set
-MossdeepCity_Gym_OnLoad: @ 8220806
+MossdeepCity_Gym_OnLoad:
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_SetSwitch1Metatiles
 	goto MossdeepCity_Gym_EventScript_CheckSwitch2
 	end
 
-MossdeepCity_Gym_EventScript_CheckSwitch2:: @ 8220815
+MossdeepCity_Gym_EventScript_CheckSwitch2::
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_SetSwitch2Metatiles
 	goto MossdeepCity_Gym_EventScript_CheckSwitch3
 	end
 
-MossdeepCity_Gym_EventScript_CheckSwitch3:: @ 8220824
+MossdeepCity_Gym_EventScript_CheckSwitch3::
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_SetSwitch3Metatiles
 	goto MossdeepCity_Gym_EventScript_CheckSwitch4
 	end
 
-MossdeepCity_Gym_EventScript_CheckSwitch4:: @ 8220833
+MossdeepCity_Gym_EventScript_CheckSwitch4::
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_SetSwitch4Metatiles
 	end
 
 @ All the below set metatile scripts are leftover from RS and are functionally unused
-MossdeepCity_Gym_EventScript_SetSwitch1Metatiles:: @ 822083D
+MossdeepCity_Gym_EventScript_SetSwitch1Metatiles::
 	setmetatile 5, 5, METATILE_RS_MossdeepGym_RedArrow_Right, 0
 	setmetatile 2, 7, METATILE_RS_MossdeepGym_Switch_Down, 1
 	goto MossdeepCity_Gym_EventScript_CheckSwitch2
 	end
 
-MossdeepCity_Gym_EventScript_SetSwitch2Metatiles:: @ 8220855
+MossdeepCity_Gym_EventScript_SetSwitch2Metatiles::
 	setmetatile 8, 14, METATILE_RS_MossdeepGym_RedArrow_Right, 0
 	setmetatile 8, 10, METATILE_RS_MossdeepGym_Switch_Down, 1
 	goto MossdeepCity_Gym_EventScript_CheckSwitch3
 	end
 
-MossdeepCity_Gym_EventScript_SetSwitch3Metatiles:: @ 822086D
+MossdeepCity_Gym_EventScript_SetSwitch3Metatiles::
 	setmetatile 15, 17, METATILE_RS_MossdeepGym_RedArrow_Left, 0
 	setmetatile 17, 15, METATILE_RS_MossdeepGym_Switch_Down, 1
 	goto MossdeepCity_Gym_EventScript_CheckSwitch4
 	end
 
-MossdeepCity_Gym_EventScript_SetSwitch4Metatiles:: @ 8220885
+MossdeepCity_Gym_EventScript_SetSwitch4Metatiles::
 	setmetatile 1, 23, METATILE_RS_MossdeepGym_RedArrow_Up, 0
 	setmetatile 5, 24, METATILE_RS_MossdeepGym_Switch_Down, 1
 	end
 
-MossdeepCity_Gym_EventScript_TateAndLiza:: @ 8220898
+MossdeepCity_Gym_EventScript_TateAndLiza::
 	trainerbattle_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaIntro, MossdeepCity_Gym_Text_TateAndLizaDefeat, MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons, MossdeepCity_Gym_EventScript_TateAndLizaDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -58,7 +58,7 @@ MossdeepCity_Gym_EventScript_TateAndLiza:: @ 8220898
 	release
 	end
 
-MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1
+MossdeepCity_Gym_EventScript_TateAndLizaDefeated::
 	message MossdeepCity_Gym_Text_ReceivedMindBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
@@ -90,7 +90,7 @@ MossdeepCity_Gym_EventScript_TateAndLizaDefeated:: @ 82208D1
 	release
 	end
 
-MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937
+MossdeepCity_Gym_EventScript_GiveCalmMind2::
 	giveitem ITEM_TM04
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -99,7 +99,7 @@ MossdeepCity_Gym_EventScript_GiveCalmMind2:: @ 8220937
 	release
 	end
 
-MossdeepCity_Gym_EventScript_GiveCalmMind:: @ 822095B
+MossdeepCity_Gym_EventScript_GiveCalmMind::
 	giveitem ITEM_TM04
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_BagIsFull
@@ -107,13 +107,13 @@ MossdeepCity_Gym_EventScript_GiveCalmMind:: @ 822095B
 	setflag FLAG_RECEIVED_TM04
 	return
 
-MossdeepCity_Gym_EventScript_TateAndLizaRematch:: @ 822097E
+MossdeepCity_Gym_EventScript_TateAndLizaRematch::
 	trainerbattle_rematch_double TRAINER_TATE_AND_LIZA_1, MossdeepCity_Gym_Text_TateAndLizaPreRematch, MossdeepCity_Gym_Text_TateAndLizaRematchDefeat, MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons
 	msgbox MossdeepCity_Gym_Text_TateAndLizaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
 @ All the below switch scripts are leftover from RS and are functionally unused
-MossdeepCity_Gym_EventScript_Switch1:: @ 8220999
+MossdeepCity_Gym_EventScript_Switch1::
 	lockall
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_ClearSwitch1
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
@@ -124,13 +124,13 @@ MossdeepCity_Gym_EventScript_Switch1:: @ 8220999
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
-MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed:: @ 82209C8
+MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed::
 	special DrawWholeMapView
 	playse SE_CLICK
 	releaseall
 	end
 
-MossdeepCity_Gym_EventScript_ClearSwitch1:: @ 82209D0
+MossdeepCity_Gym_EventScript_ClearSwitch1::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
@@ -139,7 +139,7 @@ MossdeepCity_Gym_EventScript_ClearSwitch1:: @ 82209D0
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
-MossdeepCity_Gym_EventScript_Switch2:: @ 82209F5
+MossdeepCity_Gym_EventScript_Switch2::
 	lockall
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_ClearSwitch2
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
@@ -150,7 +150,7 @@ MossdeepCity_Gym_EventScript_Switch2:: @ 82209F5
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
-MossdeepCity_Gym_EventScript_ClearSwitch2:: @ 8220A24
+MossdeepCity_Gym_EventScript_ClearSwitch2::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
@@ -159,7 +159,7 @@ MossdeepCity_Gym_EventScript_ClearSwitch2:: @ 8220A24
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
-MossdeepCity_Gym_EventScript_Switch3:: @ 8220A49
+MossdeepCity_Gym_EventScript_Switch3::
 	lockall
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_ClearSwitch3
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
@@ -170,7 +170,7 @@ MossdeepCity_Gym_EventScript_Switch3:: @ 8220A49
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
-MossdeepCity_Gym_EventScript_ClearSwitch3:: @ 8220A78
+MossdeepCity_Gym_EventScript_ClearSwitch3::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
@@ -179,7 +179,7 @@ MossdeepCity_Gym_EventScript_ClearSwitch3:: @ 8220A78
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
-MossdeepCity_Gym_EventScript_Switch4:: @ 8220A9D
+MossdeepCity_Gym_EventScript_Switch4::
 	lockall
 	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_ClearSwitch4
 	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
@@ -190,7 +190,7 @@ MossdeepCity_Gym_EventScript_Switch4:: @ 8220A9D
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
-MossdeepCity_Gym_EventScript_ClearSwitch4:: @ 8220ACC
+MossdeepCity_Gym_EventScript_ClearSwitch4::
 	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
 	applymovement OBJ_EVENT_ID_PLAYER, MossdeepCity_Gym_Movement_WaitAfterSwitchUse
 	waitmovement 0
@@ -199,74 +199,74 @@ MossdeepCity_Gym_EventScript_ClearSwitch4:: @ 8220ACC
 	goto MossdeepCity_Gym_EventScript_DrawMapAfterSwitchUsed
 	end
 
-MossdeepCity_Gym_EventScript_WarpToEntrance:: @ 8220AF1
+MossdeepCity_Gym_EventScript_WarpToEntrance::
 	lockall
 	warpmossdeepgym MAP_MOSSDEEP_CITY_GYM, 255, 7, 30
 	waitstate
 	releaseall
 	end
 
-MossdeepCity_Gym_EventScript_Preston:: @ 8220AFD
+MossdeepCity_Gym_EventScript_Preston::
 	trainerbattle_single TRAINER_PRESTON, MossdeepCity_Gym_Text_PrestonIntro, MossdeepCity_Gym_Text_PrestonDefeat
 	msgbox MossdeepCity_Gym_Text_PrestonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Virgil:: @ 8220B14
+MossdeepCity_Gym_EventScript_Virgil::
 	trainerbattle_single TRAINER_VIRGIL, MossdeepCity_Gym_Text_VirgilIntro, MossdeepCity_Gym_Text_VirgilDefeat
 	msgbox MossdeepCity_Gym_Text_VirgilPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Blake:: @ 8220B2B
+MossdeepCity_Gym_EventScript_Blake::
 	trainerbattle_single TRAINER_BLAKE, MossdeepCity_Gym_Text_BlakeIntro, MossdeepCity_Gym_Text_BlakeDefeat
 	msgbox MossdeepCity_Gym_Text_BlakePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Hannah:: @ 8220B42
+MossdeepCity_Gym_EventScript_Hannah::
 	trainerbattle_single TRAINER_HANNAH, MossdeepCity_Gym_Text_HannahIntro, MossdeepCity_Gym_Text_HannahDefeat
 	msgbox MossdeepCity_Gym_Text_HannahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Samantha:: @ 8220B59
+MossdeepCity_Gym_EventScript_Samantha::
 	trainerbattle_single TRAINER_SAMANTHA, MossdeepCity_Gym_Text_SamanthaIntro, MossdeepCity_Gym_Text_SamanthaDefeat
 	msgbox MossdeepCity_Gym_Text_SamanthaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Maura:: @ 8220B70
+MossdeepCity_Gym_EventScript_Maura::
 	trainerbattle_single TRAINER_MAURA, MossdeepCity_Gym_Text_MauraIntro, MossdeepCity_Gym_Text_MauraDefeat
 	msgbox MossdeepCity_Gym_Text_MauraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Sylvia:: @ 8220B87
+MossdeepCity_Gym_EventScript_Sylvia::
 	trainerbattle_single TRAINER_SYLVIA, MossdeepCity_Gym_Text_SylviaIntro, MossdeepCity_Gym_Text_SylviaDefeat
 	msgbox MossdeepCity_Gym_Text_SylviaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Nate:: @ 8220B9E
+MossdeepCity_Gym_EventScript_Nate::
 	trainerbattle_single TRAINER_NATE, MossdeepCity_Gym_Text_NateIntro, MossdeepCity_Gym_Text_NateDefeat
 	msgbox MossdeepCity_Gym_Text_NatePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Macey:: @ 8220BB5
+MossdeepCity_Gym_EventScript_Macey::
 	trainerbattle_single TRAINER_MACEY, MossdeepCity_Gym_Text_MaceyIntro, MossdeepCity_Gym_Text_MaceyDefeat
 	msgbox MossdeepCity_Gym_Text_MaceyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Clifford:: @ 8220BCC
+MossdeepCity_Gym_EventScript_Clifford::
 	trainerbattle_single TRAINER_CLIFFORD, MossdeepCity_Gym_Text_CliffordIntro, MossdeepCity_Gym_Text_CliffordDefeat
 	msgbox MossdeepCity_Gym_Text_CliffordPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Nicholas:: @ 8220BE3
+MossdeepCity_Gym_EventScript_Nicholas::
 	trainerbattle_single TRAINER_NICHOLAS, MossdeepCity_Gym_Text_NicholasIntro, MossdeepCity_Gym_Text_NicholasDefeat
 	msgbox MossdeepCity_Gym_Text_NicholasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_Kathleen:: @ 8220BFA
+MossdeepCity_Gym_EventScript_Kathleen::
 	trainerbattle_single TRAINER_KATHLEEN, MossdeepCity_Gym_Text_KathleenIntro, MossdeepCity_Gym_Text_KathleenDefeat
 	msgbox MossdeepCity_Gym_Text_KathleenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_Gym_EventScript_GymGuide:: @ 8220C11
+MossdeepCity_Gym_EventScript_GymGuide::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_GymGuidePostVictory
@@ -274,40 +274,40 @@ MossdeepCity_Gym_EventScript_GymGuide:: @ 8220C11
 	release
 	end
 
-MossdeepCity_Gym_EventScript_GymGuidePostVictory:: @ 8220C26
+MossdeepCity_Gym_EventScript_GymGuidePostVictory::
 	msgbox MossdeepCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
 @ Leftover from RS, functionally unused
-MossdeepCity_Gym_Movement_WaitAfterSwitchUse: @ 8220C30
+MossdeepCity_Gym_Movement_WaitAfterSwitchUse:
 	delay_16
 	delay_16
 	step_end
 
-MossdeepCity_Gym_EventScript_LeftGymStatue:: @ 8220C33
+MossdeepCity_Gym_EventScript_LeftGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified
 	goto MossdeepCity_Gym_EventScript_GymStatue
 	end
 
-MossdeepCity_Gym_EventScript_RightGymStatue:: @ 8220C43
+MossdeepCity_Gym_EventScript_RightGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_GymStatueCertified
 	goto MossdeepCity_Gym_EventScript_GymStatue
 	end
 
-MossdeepCity_Gym_EventScript_GymStatueCertified:: @ 8220C53
+MossdeepCity_Gym_EventScript_GymStatueCertified::
 	msgbox MossdeepCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_Gym_EventScript_GymStatue:: @ 8220C5D
+MossdeepCity_Gym_EventScript_GymStatue::
 	msgbox MossdeepCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67
+MossdeepCity_Gym_EventScript_YellowFloorSwitch::
 	playse SE_SWITCH
 	waitse
 	playse SE_REPEL
@@ -319,7 +319,7 @@ MossdeepCity_Gym_EventScript_YellowFloorSwitch:: @ 8220C67
 	freerotatingtilepuzzle
 	end
 
-MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D
+MossdeepCity_Gym_EventScript_BlueFloorSwitch::
 	playse SE_SWITCH
 	waitse
 	playse SE_REPEL
@@ -331,7 +331,7 @@ MossdeepCity_Gym_EventScript_BlueFloorSwitch:: @ 8220C7D
 	freerotatingtilepuzzle
 	end
 
-MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93
+MossdeepCity_Gym_EventScript_GreenFloorSwitch::
 	playse SE_SWITCH
 	waitse
 	playse SE_REPEL
@@ -343,7 +343,7 @@ MossdeepCity_Gym_EventScript_GreenFloorSwitch:: @ 8220C93
 	freerotatingtilepuzzle
 	end
 
-MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9
+MossdeepCity_Gym_EventScript_PurpleFloorSwitch::
 	playse SE_SWITCH
 	waitse
 	playse SE_REPEL
@@ -355,7 +355,7 @@ MossdeepCity_Gym_EventScript_PurpleFloorSwitch:: @ 8220CA9
 	freerotatingtilepuzzle
 	end
 
-MossdeepCity_Gym_EventScript_RedFloorSwitch:: @ 8220CBF
+MossdeepCity_Gym_EventScript_RedFloorSwitch::
 	playse SE_SWITCH
 	waitse
 	playse SE_REPEL
@@ -367,7 +367,7 @@ MossdeepCity_Gym_EventScript_RedFloorSwitch:: @ 8220CBF
 	freerotatingtilepuzzle
 	end
 
-MossdeepCity_Gym_Text_GymGuideAdvice: @ 8220CD5
+MossdeepCity_Gym_Text_GymGuideAdvice:
 	.string "Yo, how's it going, CHAMPION-bound\n"
 	.string "{PLAYER}?\p"
 	.string "The GYM LEADERS here use\n"
@@ -381,46 +381,46 @@ MossdeepCity_Gym_Text_GymGuideAdvice: @ 8220CD5
 	.string "them how tight you are with your\l"
 	.string "POKéMON. Go for it!$"
 
-MossdeepCity_Gym_Text_GymGuidePostVictory: @ 8220E2A
+MossdeepCity_Gym_Text_GymGuidePostVictory:
 	.string "Wow, you're astounding!\n"
 	.string "You're one great TRAINER!$"
 
-MossdeepCity_Gym_Text_PrestonIntro: @ 8220E5C
+MossdeepCity_Gym_Text_PrestonIntro:
 	.string "Battles hinge on the strength of your\n"
 	.string "spirit! The weak-spirited will never win!$"
 
-MossdeepCity_Gym_Text_PrestonDefeat: @ 8220EAC
+MossdeepCity_Gym_Text_PrestonDefeat:
 	.string "I lost!\n"
 	.string "I must temper my spirit again!$"
 
-MossdeepCity_Gym_Text_PrestonPostBattle: @ 8220ED3
+MossdeepCity_Gym_Text_PrestonPostBattle:
 	.string "The indecisive lose.\n"
 	.string "That's my warning to you.$"
 
-MossdeepCity_Gym_Text_VirgilIntro: @ 8220F02
+MossdeepCity_Gym_Text_VirgilIntro:
 	.string "Let me see your talent!$"
 
-MossdeepCity_Gym_Text_VirgilDefeat: @ 8220F1A
+MossdeepCity_Gym_Text_VirgilDefeat:
 	.string "You possess spectacular talent!$"
 
-MossdeepCity_Gym_Text_VirgilPostBattle: @ 8220F3A
+MossdeepCity_Gym_Text_VirgilPostBattle:
 	.string "If there are prodigies in the world,\n"
 	.string "then our GYM LEADERS are them!\p"
 	.string "However, you may be even more talented\n"
 	.string "than them…$"
 
-MossdeepCity_Gym_Text_BlakeIntro: @ 8220FB0
+MossdeepCity_Gym_Text_BlakeIntro:
 	.string "Fufufufu… Watch me levitate a POKé\n"
 	.string "BALL telekinetically!\p"
 	.string "Wrooooooooaaaar!\n"
 	.string "… … … … … … …\p"
 	.string "Sometimes, I'm out of sync…$"
 
-MossdeepCity_Gym_Text_BlakeDefeat: @ 8221024
+MossdeepCity_Gym_Text_BlakeDefeat:
 	.string "My POKéMON battling skills are out\n"
 	.string "of sync, too!$"
 
-MossdeepCity_Gym_Text_BlakePostBattle: @ 8221055
+MossdeepCity_Gym_Text_BlakePostBattle:
 	.string "A POKé BALL was too heavy to lift\n"
 	.string "psychically. But this dust bunny…\p"
 	.string "Whoooooooooooooooh!\n"
@@ -428,127 +428,127 @@ MossdeepCity_Gym_Text_BlakePostBattle: @ 8221055
 	.string "No, I'm not cheating!\n"
 	.string "I didn't blow on it! Honestly!$"
 
-MossdeepCity_Gym_Text_HannahIntro: @ 82210EE
+MossdeepCity_Gym_Text_HannahIntro:
 	.string "When you lose to me, don't be too hard\n"
 	.string "on yourself.\p"
 	.string "It's not that you're weak--I'm just\n"
 	.string "too strong!$"
 
-MossdeepCity_Gym_Text_HannahDefeat: @ 8221152
+MossdeepCity_Gym_Text_HannahDefeat:
 	.string "You're just too strong!$"
 
-MossdeepCity_Gym_Text_HannahPostBattle: @ 822116A
+MossdeepCity_Gym_Text_HannahPostBattle:
 	.string "I'm not going to get down on myself for\n"
 	.string "losing. I just need to train harder.\p"
 	.string "Positive thinking--that's my strong\n"
 	.string "point!$"
 
-MossdeepCity_Gym_Text_SamanthaIntro: @ 82211E2
+MossdeepCity_Gym_Text_SamanthaIntro:
 	.string "I see it…\n"
 	.string "I see your future…\p"
 	.string "If you can beat me, I will tell you\n"
 	.string "your future!$"
 
-MossdeepCity_Gym_Text_SamanthaDefeat: @ 8221230
+MossdeepCity_Gym_Text_SamanthaDefeat:
 	.string "I surrender!$"
 
-MossdeepCity_Gym_Text_SamanthaPostBattle: @ 822123D
+MossdeepCity_Gym_Text_SamanthaPostBattle:
 	.string "You will wage a terrifically intense\n"
 	.string "battle with our GYM LEADERS…\p"
 	.string "The result…\n"
 	.string "You won't hear it from me!$"
 
-MossdeepCity_Gym_Text_MauraIntro: @ 82212A6
+MossdeepCity_Gym_Text_MauraIntro:
 	.string "The roads you have traveled…\n"
 	.string "What you have experienced…\p"
 	.string "Come at me with everything you've\n"
 	.string "learned!$"
 
-MossdeepCity_Gym_Text_MauraDefeat: @ 8221309
+MossdeepCity_Gym_Text_MauraDefeat:
 	.string "You've traveled a path of greatness!$"
 
-MossdeepCity_Gym_Text_MauraPostBattle: @ 822132E
+MossdeepCity_Gym_Text_MauraPostBattle:
 	.string "A bright future awaits those who have\n"
 	.string "worked diligently.\p"
 	.string "For those who lazed idly, there is\n"
 	.string "only despair at the end.\p"
 	.string "What goes around comes around…$"
 
-MossdeepCity_Gym_Text_SylviaIntro: @ 82213C2
+MossdeepCity_Gym_Text_SylviaIntro:
 	.string "Even at the risk of life, I will win\n"
 	.string "this battle!$"
 
-MossdeepCity_Gym_Text_SylviaDefeat: @ 82213F4
+MossdeepCity_Gym_Text_SylviaDefeat:
 	.string "What you do…\n"
 	.string "It horrifies me…$"
 
-MossdeepCity_Gym_Text_SylviaPostBattle: @ 8221412
+MossdeepCity_Gym_Text_SylviaPostBattle:
 	.string "How dare you beat me…\p"
 	.string "It won't be my fault if something\n"
 	.string "horrible befalls you…$"
 
-MossdeepCity_Gym_Text_NateIntro: @ 8221460
+MossdeepCity_Gym_Text_NateIntro:
 	.string "Hohoho.\p"
 	.string "You need me to show you how tenacious\n"
 	.string "the PSYCHIC type can be.$"
 
-MossdeepCity_Gym_Text_NateDefeat: @ 82214A7
+MossdeepCity_Gym_Text_NateDefeat:
 	.string "Oh! My, my!\n"
 	.string "Your battle style is fantastic!$"
 
-MossdeepCity_Gym_Text_NatePostBattle: @ 82214D3
+MossdeepCity_Gym_Text_NatePostBattle:
 	.string "I… I don't let defeat rattle m-me,\n"
 	.string "however b-badly.$"
 
-MossdeepCity_Gym_Text_KathleenIntro: @ 8221507
+MossdeepCity_Gym_Text_KathleenIntro:
 	.string "Let me show you a perfectly awful,\n"
 	.string "horrifying time!$"
 
-MossdeepCity_Gym_Text_KathleenDefeat: @ 822153B
+MossdeepCity_Gym_Text_KathleenDefeat:
 	.string "N-nooooo!$"
 
-MossdeepCity_Gym_Text_KathleenPostBattle: @ 8221545
+MossdeepCity_Gym_Text_KathleenPostBattle:
 	.string "Your vitality is contagious!\n"
 	.string "Get away from me quickly!$"
 
-MossdeepCity_Gym_Text_CliffordIntro: @ 822157C
+MossdeepCity_Gym_Text_CliffordIntro:
 	.string "I may be past my prime, but I suggest\n"
 	.string "you not patronize me.$"
 
-MossdeepCity_Gym_Text_CliffordDefeat: @ 82215B8
+MossdeepCity_Gym_Text_CliffordDefeat:
 	.string "Ah, you overflow with the power\n"
 	.string "of youth!$"
 
-MossdeepCity_Gym_Text_CliffordPostBattle: @ 82215E2
+MossdeepCity_Gym_Text_CliffordPostBattle:
 	.string "It seems that I could not overcome\n"
 	.string "your youthful energy.$"
 
-MossdeepCity_Gym_Text_MaceyIntro: @ 822161B
+MossdeepCity_Gym_Text_MaceyIntro:
 	.string "You're not getting through to the end!\n"
 	.string "Not if I can help it!$"
 
-MossdeepCity_Gym_Text_MaceyDefeat: @ 8221658
+MossdeepCity_Gym_Text_MaceyDefeat:
 	.string "How could you be so ludicrously\n"
 	.string "strong?$"
 
-MossdeepCity_Gym_Text_MaceyPostBattle: @ 8221680
+MossdeepCity_Gym_Text_MaceyPostBattle:
 	.string "Humph! You may be strong, but you're\n"
 	.string "not suitable for the PSYCHIC type!\p"
 	.string "The way you battle is somehow brutal!$"
 
-MossdeepCity_Gym_Text_NicholasIntro: @ 82216EE
+MossdeepCity_Gym_Text_NicholasIntro:
 	.string "Wroooar! Have a taste of my super\n"
 	.string "POKéMON hard-battling power!$"
 
-MossdeepCity_Gym_Text_NicholasDefeat: @ 822172D
+MossdeepCity_Gym_Text_NicholasDefeat:
 	.string "Oh!\n"
 	.string "Done in!$"
 
-MossdeepCity_Gym_Text_NicholasPostBattle: @ 822173A
+MossdeepCity_Gym_Text_NicholasPostBattle:
 	.string "All right! I think I'll develop a special\n"
 	.string "invincible POKéMON power next.$"
 
-MossdeepCity_Gym_Text_TateAndLizaIntro: @ 8221783
+MossdeepCity_Gym_Text_TateAndLizaIntro:
 	.string "TATE: Hehehe… Were you surprised?\p"
 	.string "LIZA: Fufufu… Were you surprised?\p"
 	.string "TATE: That there are two GYM LEADERS?\n"
@@ -562,24 +562,24 @@ MossdeepCity_Gym_Text_TateAndLizaIntro: @ 8221783
 	.string "TATE: This combination of ours…\n"
 	.string "LIZA: Can you beat it?$"
 
-MossdeepCity_Gym_Text_TateAndLizaDefeat: @ 82218EC
+MossdeepCity_Gym_Text_TateAndLizaDefeat:
 	.string "TATE: What?! Our combination…\n"
 	.string "LIZA: Was shattered!\p"
 	.string "TATE: It can't be helped. You've won…\n"
 	.string "LIZA: So, in recognition, take this.$"
 
-MossdeepCity_Gym_Text_ReceivedMindBadge: @ 822196A
+MossdeepCity_Gym_Text_ReceivedMindBadge:
 	.string "{PLAYER} received the MIND BADGE\n"
 	.string "from TATE and LIZA.$"
 
-MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis: @ 8221999
+MossdeepCity_Gym_Text_ExplainMindBadgeTakeThis:
 	.string "TATE: The MIND BADGE enhances the\n"
 	.string "SP. ATK and SP. DEF of POKéMON.\p"
 	.string "LIZA: It also lets you use the HM move\n"
 	.string "DIVE outside of battle.\p"
 	.string "TATE: You should also take this, too.$"
 
-MossdeepCity_Gym_Text_ExplainCalmMind: @ 8221A40
+MossdeepCity_Gym_Text_ExplainCalmMind:
 	.string "TATE: That TM04 contains…\n"
 	.string "LIZA: CALM MIND!\p"
 	.string "TATE: It raises SP. ATK and…\n"
@@ -588,18 +588,18 @@ MossdeepCity_Gym_Text_ExplainCalmMind: @ 8221A40
 	.string "LIZA: For PSYCHIC POKéMON!\p"
 	.string "… … … … … …$"
 
-MossdeepCity_Gym_Text_RegisteredTateAndLiza: @ 8221AEA
+MossdeepCity_Gym_Text_RegisteredTateAndLiza:
 	.string "Registered GYM LEADERS TATE & LIZA\n"
 	.string "in the POKéNAV.$"
 
-MossdeepCity_Gym_Text_TateAndLizaPostBattle: @ 8221B1D
+MossdeepCity_Gym_Text_TateAndLizaPostBattle:
 	.string "TATE: Looks like the bond between you\n"
 	.string "and your POKéMON is far stronger than\l"
 	.string "the bond that we share as twins.\p"
 	.string "LIZA: You will become even stronger!\n"
 	.string "We've battled you, so we know.$"
 
-MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons: @ 8221BCE
+MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons:
 	.string "TATE: Hehehe… Were you surprised?\p"
 	.string "LIZA: That there are two GYM LEADERS?\p"
 	.string "TATE: Oops, you have only one…\n"
@@ -608,15 +608,15 @@ MossdeepCity_Gym_Text_TateAndLizaNeedTwoMons: @ 8221BCE
 	.string "LIZA: If you want to challenge us,\n"
 	.string "bring some more POKéMON.$"
 
-MossdeepCity_Gym_Text_GymStatue: @ 8221CB0
+MossdeepCity_Gym_Text_GymStatue:
 	.string "MOSSDEEP CITY POKéMON GYM$"
 
-MossdeepCity_Gym_Text_GymStatueCertified: @ 8221CCA
+MossdeepCity_Gym_Text_GymStatueCertified:
 	.string "MOSSDEEP CITY POKéMON GYM\p"
 	.string "LIZA AND TATE'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-MossdeepCity_Gym_Text_TateAndLizaPreRematch: @ 8221D0B
+MossdeepCity_Gym_Text_TateAndLizaPreRematch:
 	.string "TATE: POKéMON…\n"
 	.string "LIZA: POKéMON…\p"
 	.string "TATE: By changing the party's mix…\n"
@@ -628,17 +628,17 @@ MossdeepCity_Gym_Text_TateAndLizaPreRematch: @ 8221D0B
 	.string "TATE: Our combination…\n"
 	.string "LIZA: We'll show you again and again!$"
 
-MossdeepCity_Gym_Text_TateAndLizaRematchDefeat: @ 8221E05
+MossdeepCity_Gym_Text_TateAndLizaRematchDefeat:
 	.string "TATE: You and your POKéMON…\n"
 	.string "LIZA: It's as if you were siblings!$"
 
-MossdeepCity_Gym_Text_TateAndLizaPostRematch: @ 8221E45
+MossdeepCity_Gym_Text_TateAndLizaPostRematch:
 	.string "TATE: You can knock us down,\n"
 	.string "but we'll never stay down!\p"
 	.string "LIZA: Because the two of us,\n"
 	.string "we always support each other!$"
 
-MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons: @ 8221EB8
+MossdeepCity_Gym_Text_TateAndLizaRematchNeedTwoMons:
 	.string "TATE: You're back again…\n"
 	.string "LIZA: You're back again…\p"
 	.string "TATE: To give us a rematch.\n"
diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc
index 3ad07e023..99224a795 100644
--- a/data/maps/MossdeepCity_House1/scripts.inc
+++ b/data/maps/MossdeepCity_House1/scripts.inc
@@ -1,7 +1,7 @@
-MossdeepCity_House1_MapScripts:: @ 8221FD5
+MossdeepCity_House1_MapScripts::
 	.byte 0
 
-MossdeepCity_House1_EventScript_BlackBelt:: @ 8221FD6
+MossdeepCity_House1_EventScript_BlackBelt::
 	lock
 	faceplayer
 	bufferleadmonspeciesname 0
@@ -13,30 +13,30 @@ MossdeepCity_House1_EventScript_BlackBelt:: @ 8221FD6
 	release
 	end
 
-MossdeepCity_House1_EventScript_NeutralNature:: @ 8221FFC
+MossdeepCity_House1_EventScript_NeutralNature::
 	msgbox MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House1_EventScript_Woman:: @ 8222006
+MossdeepCity_House1_EventScript_Woman::
 	msgbox MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes, MSGBOX_NPC
 	end
 
-MossdeepCity_House1_Text_HmmYourPokemon: @ 822200F
+MossdeepCity_House1_Text_HmmYourPokemon:
 	.string "Hmm!\n"
 	.string "Your {STR_VAR_1}…$"
 
-MossdeepCity_House1_Text_ItLikesXPokeblocks: @ 822201D
+MossdeepCity_House1_Text_ItLikesXPokeblocks:
 	.string "It likes {STR_VAR_1}S,\n"
 	.string "doesn't it?\p"
 	.string "No, I'm positive of it! It definitely\n"
 	.string "likes {STR_VAR_1}S!$"
 
-MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks: @ 8222068
+MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks:
 	.string "It doesn't appear to like or dislike\n"
 	.string "any {POKEBLOCK}S.$"
 
-MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes: @ 8222099
+MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes:
 	.string "My husband can tell what kind of\n"
 	.string "{POKEBLOCK}S a POKéMON likes at a glance.$"
 
diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc
index 5e4b3b342..63036814b 100644
--- a/data/maps/MossdeepCity_House2/scripts.inc
+++ b/data/maps/MossdeepCity_House2/scripts.inc
@@ -1,17 +1,17 @@
 .set LOCALID_WINGULL, 3
 
-MossdeepCity_House2_MapScripts:: @ 82220DE
+MossdeepCity_House2_MapScripts::
 	.byte 0
 
-MossdeepCity_House2_EventScript_Man:: @ 82220DF
+MossdeepCity_House2_EventScript_Man::
 	msgbox MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree, MSGBOX_NPC
 	end
 
-MossdeepCity_House2_EventScript_Twin:: @ 82220E8
+MossdeepCity_House2_EventScript_Twin::
 	msgbox MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth, MSGBOX_NPC
 	end
 
-MossdeepCity_House2_EventScript_Wingull:: @ 82220F1
+MossdeepCity_House2_EventScript_Wingull::
 	lock
 	faceplayer
 	waitse
@@ -29,17 +29,17 @@ MossdeepCity_House2_EventScript_Wingull:: @ 82220F1
 	release
 	end
 
-MossdeepCity_House2_EventScript_WingullExitNorth:: @ 8222124
+MossdeepCity_House2_EventScript_WingullExitNorth::
 	applymovement LOCALID_WINGULL, MossdeepCity_House2_Movement_WingullExitNorth
 	waitmovement 0
 	return
 
-MossdeepCity_House2_EventScript_WingullExitWest:: @ 822212F
+MossdeepCity_House2_EventScript_WingullExitWest::
 	applymovement LOCALID_WINGULL, MossdeepCity_House2_Movement_WingullExitEast
 	waitmovement 0
 	return
 
-MossdeepCity_House2_Movement_WingullExitNorth: @ 822213A
+MossdeepCity_House2_Movement_WingullExitNorth:
 	walk_fast_right
 	walk_fast_down
 	walk_fast_down
@@ -48,25 +48,25 @@ MossdeepCity_House2_Movement_WingullExitNorth: @ 822213A
 	delay_8
 	step_end
 
-MossdeepCity_House2_Movement_WingullExitEast: @ 8222141
+MossdeepCity_House2_Movement_WingullExitEast:
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
 	delay_8
 	step_end
 
-MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree: @ 8222146
+MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree:
 	.string "My little sister exchanges MAIL with\n"
 	.string "her boyfriend in FORTREE.\p"
 	.string "I don't envy her one bit at all.$"
 
-MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth: @ 82221A6
+MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth:
 	.string "Even though I can't see my friend in\n"
 	.string "FORTREE, my POKéMON carries MAIL\l"
 	.string "back and forth for us.\p"
 	.string "I'm not lonesome, even though we're\n"
 	.string "apart.$"
 
-MossdeepCity_House2_Text_Wingull: @ 822222E
+MossdeepCity_House2_Text_Wingull:
 	.string "WINGULL: Pihyoh!$"
 
diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc
index b968dfc04..51df05fe0 100644
--- a/data/maps/MossdeepCity_House3/scripts.inc
+++ b/data/maps/MossdeepCity_House3/scripts.inc
@@ -1,7 +1,7 @@
-MossdeepCity_House3_MapScripts:: @ 82225C2
+MossdeepCity_House3_MapScripts::
 	.byte 0
 
-MossdeepCity_House3_EventScript_SuperRodFisherman:: @ 82225C3
+MossdeepCity_House3_EventScript_SuperRodFisherman::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_ReceivedSuperRod
@@ -15,17 +15,17 @@ MossdeepCity_House3_EventScript_SuperRodFisherman:: @ 82225C3
 	release
 	end
 
-MossdeepCity_House3_EventScript_ReceivedSuperRod:: @ 8222602
+MossdeepCity_House3_EventScript_ReceivedSuperRod::
 	msgbox MossdeepCity_House3_Text_GoAfterSeafloorPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House3_EventScript_DeclineSuperRod:: @ 822260C
+MossdeepCity_House3_EventScript_DeclineSuperRod::
 	msgbox MossdeepCity_House3_Text_DontYouLikeToFish, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House3_Text_YouWantSuperRod: @ 8222616
+MossdeepCity_House3_Text_YouWantSuperRod:
 	.string "Hey there, TRAINER!\n"
 	.string "A SUPER ROD really is super!\p"
 	.string "Say all you want, but this baby can\n"
@@ -33,19 +33,19 @@ MossdeepCity_House3_Text_YouWantSuperRod: @ 8222616
 	.string "What do you think?\n"
 	.string "You want it, don't you?$"
 
-MossdeepCity_House3_Text_SuperRodIsSuper: @ 82226B6
+MossdeepCity_House3_Text_SuperRodIsSuper:
 	.string "You bet, you bet!\n"
 	.string "After all, a SUPER ROD is really super!$"
 
-MossdeepCity_House3_Text_TryDroppingRodInWater: @ 82226F0
+MossdeepCity_House3_Text_TryDroppingRodInWater:
 	.string "If there's any water, try dropping in\n"
 	.string "your ROD and see what bites!$"
 
-MossdeepCity_House3_Text_DontYouLikeToFish: @ 8222733
+MossdeepCity_House3_Text_DontYouLikeToFish:
 	.string "Hunh?\n"
 	.string "Don't you like to fish?$"
 
-MossdeepCity_House3_Text_GoAfterSeafloorPokemon: @ 8222751
+MossdeepCity_House3_Text_GoAfterSeafloorPokemon:
 	.string "Go after the seafloor POKéMON with\n"
 	.string "your SUPER ROD.$"
 
diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc
index 473c1cfbd..85c0e5ebc 100644
--- a/data/maps/MossdeepCity_House4/scripts.inc
+++ b/data/maps/MossdeepCity_House4/scripts.inc
@@ -1,7 +1,7 @@
-MossdeepCity_House4_MapScripts:: @ 8222DD7
+MossdeepCity_House4_MapScripts::
 	.byte 0
 
-MossdeepCity_House4_EventScript_Woman:: @ 8222DD8
+MossdeepCity_House4_EventScript_Woman::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_CanBattleAtSecretBases
@@ -9,12 +9,12 @@ MossdeepCity_House4_EventScript_Woman:: @ 8222DD8
 	release
 	end
 
-MossdeepCity_House4_EventScript_CanBattleAtSecretBases:: @ 8222DED
+MossdeepCity_House4_EventScript_CanBattleAtSecretBases::
 	msgbox MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House4_EventScript_NinjaBoy:: @ 8222DF7
+MossdeepCity_House4_EventScript_NinjaBoy::
 	lock
 	faceplayer
 	special CheckPlayerHasSecretBase
@@ -25,12 +25,12 @@ MossdeepCity_House4_EventScript_NinjaBoy:: @ 8222DF7
 	release
 	end
 
-MossdeepCity_House4_EventScript_NoSecretBase:: @ 8222E14
+MossdeepCity_House4_EventScript_NoSecretBase::
 	msgbox MossdeepCity_House4_Text_MakeSecretBase, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House4_EventScript_Skitty:: @ 8222E1E
+MossdeepCity_House4_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
@@ -40,23 +40,23 @@ MossdeepCity_House4_EventScript_Skitty:: @ 8222E1E
 	release
 	end
 
-MossdeepCity_House4_Text_BrotherLikesToFindBases: @ 8222E31
+MossdeepCity_House4_Text_BrotherLikesToFindBases:
 	.string "My little brother says he likes to go\n"
 	.string "find people's SECRET BASES.$"
 
-MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle: @ 8222E73
+MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle:
 	.string "My little brother says he likes to\n"
 	.string "visit people's SECRET BASES and have\l"
 	.string "POKéMON battles.$"
 
-MossdeepCity_House4_Text_YouMadeSecretBaseNearX: @ 8222ECC
+MossdeepCity_House4_Text_YouMadeSecretBaseNearX:
 	.string "Was it you who made a SECRET BASE\n"
 	.string "near {STR_VAR_1}?$"
 
-MossdeepCity_House4_Text_MakeSecretBase: @ 8222EF7
+MossdeepCity_House4_Text_MakeSecretBase:
 	.string "You should make a SECRET BASE\n"
 	.string "somewhere. I'll go find it!$"
 
-MossdeepCity_House4_Text_Skitty: @ 8222F31
+MossdeepCity_House4_Text_Skitty:
 	.string "SKITTY: Miyaan?$"
 
diff --git a/data/maps/MossdeepCity_Mart/scripts.inc b/data/maps/MossdeepCity_Mart/scripts.inc
index c0d0ae311..50edddd09 100644
--- a/data/maps/MossdeepCity_Mart/scripts.inc
+++ b/data/maps/MossdeepCity_Mart/scripts.inc
@@ -1,7 +1,7 @@
-MossdeepCity_Mart_MapScripts:: @ 82223C7
+MossdeepCity_Mart_MapScripts::
 	.byte 0
 
-MossdeepCity_Mart_EventScript_Clerk:: @ 82223C8
+MossdeepCity_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -12,7 +12,7 @@ MossdeepCity_Mart_EventScript_Clerk:: @ 82223C8
 	end
 
 	.align 2
-MossdeepCity_Mart_Pokemart: @ 82223E0
+MossdeepCity_Mart_Pokemart:
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_NET_BALL
 	.2byte ITEM_DIVE_BALL
@@ -26,31 +26,31 @@ MossdeepCity_Mart_Pokemart: @ 82223E0
 	release
 	end
 
-MossdeepCity_Mart_EventScript_Woman:: @ 82223F6
+MossdeepCity_Mart_EventScript_Woman::
 	msgbox MossdeepCity_Mart_Text_ReviveIsFantastic, MSGBOX_NPC
 	end
 
-MossdeepCity_Mart_EventScript_Boy:: @ 82223FF
+MossdeepCity_Mart_EventScript_Boy::
 	msgbox MossdeepCity_Mart_Text_MaxRepelLastsLongest, MSGBOX_NPC
 	end
 
-MossdeepCity_Mart_EventScript_Sailor:: @ 8222408
+MossdeepCity_Mart_EventScript_Sailor::
 	msgbox MossdeepCity_Mart_Text_NetAndDiveBallsRare, MSGBOX_NPC
 	end
 
-MossdeepCity_Mart_Text_ReviveIsFantastic: @ 8222411
+MossdeepCity_Mart_Text_ReviveIsFantastic:
 	.string "REVIVE is fantastic!\p"
 	.string "Give it to a fainted POKéMON,\n"
 	.string "and the POKéMON will arise.\p"
 	.string "But be careful, REVIVE doesn't restore\n"
 	.string "the used-up PP of moves.$"
 
-MossdeepCity_Mart_Text_MaxRepelLastsLongest: @ 82224A0
+MossdeepCity_Mart_Text_MaxRepelLastsLongest:
 	.string "MAX REPEL keeps all weak POKéMON away.\p"
 	.string "Out of all the REPEL sprays, it lasts\n"
 	.string "the longest.$"
 
-MossdeepCity_Mart_Text_NetAndDiveBallsRare: @ 82224FA
+MossdeepCity_Mart_Text_NetAndDiveBallsRare:
 	.string "The NET and DIVE BALLS are rare POKé\n"
 	.string "BALLS that are only made in MOSSDEEP.\p"
 	.string "A NET BALL is effective against\n"
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index 7cefc796a..bfd3561d2 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_NURSE, 1
 
-MossdeepCity_PokemonCenter_1F_MapScripts:: @ 822223F
+MossdeepCity_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-MossdeepCity_PokemonCenter_1F_OnTransition: @ 822224A
+MossdeepCity_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_MOSSDEEP_CITY
 	end
 
-MossdeepCity_PokemonCenter_1F_EventScript_Nurse:: @ 822224E
+MossdeepCity_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -17,21 +17,21 @@ MossdeepCity_PokemonCenter_1F_EventScript_Nurse:: @ 822224E
 	release
 	end
 
-MossdeepCity_PokemonCenter_1F_EventScript_Woman:: @ 822225C
+MossdeepCity_PokemonCenter_1F_EventScript_Woman::
 	msgbox MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable, MSGBOX_NPC
 	end
 
-MossdeepCity_PokemonCenter_1F_EventScript_Girl:: @ 8222265
+MossdeepCity_PokemonCenter_1F_EventScript_Girl::
 	msgbox MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves, MSGBOX_NPC
 	end
 
-MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable: @ 822226E
+MossdeepCity_PokemonCenter_1F_Text_GymLeaderDuoFormidable:
 	.string "The GYM LEADERS in this town are\n"
 	.string "a formidable duo.\p"
 	.string "Their combination attacks are, like,\n"
 	.string "excellent and wow!$"
 
-MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves: @ 82222D9
+MossdeepCity_PokemonCenter_1F_Text_AbilitiesMightChangeMoves:
 	.string "Depending on the special abilities of\n"
 	.string "POKéMON, some moves might change\l"
 	.string "or not work at all.$"
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
index 1d88c9ca2..3b41bff6c 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334
+MossdeepCity_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,23 +6,23 @@ MossdeepCity_PokemonCenter_2F_MapScripts:: @ 8222334
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-MossdeepCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8222349
+MossdeepCity_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-MossdeepCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 822234F
+MossdeepCity_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-MossdeepCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8222355
+MossdeepCity_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
-MossdeepCity_PokemonCenter_2F_EventScript_Woman5:: @ 822235B
+MossdeepCity_PokemonCenter_2F_EventScript_Woman5::
 	msgbox MossdeepCity_PokemonCenter_2F_Text_Woman5, MSGBOX_NPC
 	end
 
-MossdeepCity_PokemonCenter_2F_Text_Woman5: @ 8222364
+MossdeepCity_PokemonCenter_2F_Text_Woman5:
 	.string "If I win a whole lot of link battles\n"
 	.string "and show everyone how good I am,\l"
 	.string "I might get a fan following!$"
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index eb081dbbb..4d69725b4 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -5,17 +5,17 @@
 .set LOCALID_WOMAN, 5
 .set LOCALID_STAIR_GRUNT, 9
 
-MossdeepCity_SpaceCenter_1F_MapScripts:: @ 8222F41
+MossdeepCity_SpaceCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_SpaceCenter_1F_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_1F_OnTransition
 	.byte 0
 
-MossdeepCity_SpaceCenter_1F_OnTransition: @ 8222F4C
+MossdeepCity_SpaceCenter_1F_OnTransition:
 	compare VAR_MOSSDEEP_CITY_STATE, 2
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma:: @ 8222F58
+MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma::
 	setobjectxyperm LOCALID_SAILOR, 1, 9
 	setobjectmovementtype LOCALID_SAILOR, MOVEMENT_TYPE_FACE_RIGHT
 	setobjectxyperm LOCALID_WOMAN, 0, 8
@@ -33,29 +33,29 @@ MossdeepCity_SpaceCenter_1F_EventScript_MoveObjectsForTeamMagma:: @ 8222F58
 	goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft:: @ 8222FAA
+MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardLeft::
 	setobjectxyperm LOCALID_STAIR_GRUNT, 12, 2
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown:: @ 8222FB2
+MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardDown::
 	setobjectxyperm LOCALID_STAIR_GRUNT, 13, 3
 	end
 
 @ Functionally unused. See comment on MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
-MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight:: @ 8222FBA
+MossdeepCity_SpaceCenter_1F_EventScript_MoveStairGuardRight::
 	setobjectxyperm LOCALID_STAIR_GRUNT, 14, 2
 	end
 
-MossdeepCity_SpaceCenter_1F_OnLoad: @ 8222FC2
+MossdeepCity_SpaceCenter_1F_OnLoad:
 	compare VAR_MOSSDEEP_CITY_STATE, 2
 	goto_if_le MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote:: @ 8222FCE
+MossdeepCity_SpaceCenter_1F_EventScript_SetMagmaNote::
 	setmetatile 2, 5, METATILE_Facility_DataPad, 1
 	return
 
-MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter:: @ 8222FD8
+MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter::
 	lock
 	faceplayer
 	compare VAR_MOSSDEEP_CITY_STATE, 2
@@ -73,15 +73,15 @@ MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounter:: @ 8222FD8
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet:: @ 8223012
+MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYet::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent, MSGBOX_DEFAULT
 	return
 
-MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber:: @ 822301B
+MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumber::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber, MSGBOX_DEFAULT
 	return
 
-MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma:: @ 8223024
+MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma::
 	dotimebasedevents
 	specialvar VAR_RESULT, GetWeekCount
 	buffernumberstring 0, VAR_RESULT
@@ -95,15 +95,15 @@ MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma:: @ 8223024
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma:: @ 8223051
+MossdeepCity_SpaceCenter_1F_EventScript_NoLaunchesYetMagma::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_HaywireButRocketLaunchImminent, MSGBOX_DEFAULT
 	return
 
-MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma:: @ 822305A
+MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_HaywireButSuccessfulLaunchNumber, MSGBOX_DEFAULT
 	return
 
-MossdeepCity_SpaceCenter_1F_EventScript_Scientist:: @ 8223063
+MossdeepCity_SpaceCenter_1F_EventScript_Scientist::
 	lock
 	faceplayer
 	compare VAR_MOSSDEEP_CITY_STATE, 2
@@ -112,14 +112,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_Scientist:: @ 8223063
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma:: @ 822307A
+MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan:: @ 822308E
+MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan::
 	lock
 	faceplayer
 	compare VAR_MOSSDEEP_CITY_STATE, 2
@@ -134,12 +134,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_SunStoneMan:: @ 822308E
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone:: @ 82230D0
+MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStone::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma:: @ 82230DA
+MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma::
 	goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma
 	msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_SUN_STONE
@@ -152,14 +152,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma:: @ 82230DA
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma:: @ 8223119
+MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Woman:: @ 822312D
+MossdeepCity_SpaceCenter_1F_EventScript_Woman::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal
@@ -170,17 +170,17 @@ MossdeepCity_SpaceCenter_1F_EventScript_Woman:: @ 822312D
 	goto MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal:: @ 8223154
+MossdeepCity_SpaceCenter_1F_EventScript_WomanNormal::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma:: @ 822315E
+MossdeepCity_SpaceCenter_1F_EventScript_WomanMagma::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_AquaShouldBeatMagma, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_OldMan:: @ 8223168
+MossdeepCity_SpaceCenter_1F_EventScript_OldMan::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal
@@ -191,7 +191,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_OldMan:: @ 8223168
 	goto MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal:: @ 822318F
+MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
@@ -199,7 +199,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_OldManNormal:: @ 822318F
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma:: @ 82231A4
+MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaWantsToSpoilMyDream, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
@@ -207,7 +207,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_OldManMagma:: @ 82231A4
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Steven:: @ 82231B9
+MossdeepCity_SpaceCenter_1F_EventScript_Steven::
 	lock
 	faceplayer
 	msgbox MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel, MSGBOX_DEFAULT
@@ -216,28 +216,28 @@ MossdeepCity_SpaceCenter_1F_EventScript_Steven:: @ 82231B9
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_MagmaNote:: @ 82231CF
+MossdeepCity_SpaceCenter_1F_EventScript_MagmaNote::
 	lockall
 	msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaIntentToStealNotice, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Grunt3:: @ 82231DA
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt3::
 	trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_3, MossdeepCity_SpaceCenter_1F_Text_Grunt3Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt3Defeat
 	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Grunt1:: @ 82231F1
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt1::
 	trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_1, MossdeepCity_SpaceCenter_1F_Text_Grunt1Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt1Defeat
 	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Grunt4:: @ 8223208
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt4::
 	trainerbattle_single TRAINER_GRUNT_SPACE_CENTER_4, MossdeepCity_SpaceCenter_1F_Text_Grunt4Intro, MossdeepCity_SpaceCenter_1F_Text_Grunt4Defeat
 	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Grunt2:: @ 822321F
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt2::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated
@@ -258,12 +258,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2:: @ 822321F
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated:: @ 822326E
+MossdeepCity_SpaceCenter_1F_EventScript_Grunt2Defeated::
 	msgbox MossdeepCity_SpaceCenter_1F_Text_Grunt2PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest:: @ 8223278
+MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest::
 	applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest
 	waitmovement 0
 	setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 1
@@ -272,53 +272,53 @@ MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest:: @ 8223278
 
 @ Functionally unused by mistake. The movement is handled anyway after the switch (see above)
 @ This also means VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE can never be 3
-MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast:: @ 8223289
+MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast::
 	applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast
 	waitmovement 0
 	setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 3
 	release
 	end
 
-MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest: @ 822329A
+MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsWest:
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
 @ Functionally unused. See above
-MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast: @ 822329E
+MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairsEast:
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
 @ This was meant to only handle the player facing North, but by mistake(?) it also handles the player facing East
-MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs: @ 82232A2
+MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs:
 	face_left
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent: @ 82232A7
+MossdeepCity_SpaceCenter_1F_Text_RocketLaunchImminent:
 	.string "The rocket's launch is imminent!$"
 
-MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber: @ 82232C8
+MossdeepCity_SpaceCenter_1F_Text_SuccessfulLaunchNumber:
 	.string "The rocket launched safely!\n"
 	.string "That's successful launch no. {STR_VAR_1}!$"
 
-MossdeepCity_SpaceCenter_1F_Text_HaywireButRocketLaunchImminent: @ 8223305
+MossdeepCity_SpaceCenter_1F_Text_HaywireButRocketLaunchImminent:
 	.string "I know that things are a little\n"
 	.string "haywire right now, but…\p"
 	.string "The rocket's launch is imminent!$"
 
-MossdeepCity_SpaceCenter_1F_Text_HaywireButSuccessfulLaunchNumber: @ 822335E
+MossdeepCity_SpaceCenter_1F_Text_HaywireButSuccessfulLaunchNumber:
 	.string "I know that things are a little\n"
 	.string "haywire right now, but…\p"
 	.string "The rocket launched safely!\n"
 	.string "That's successful launch no. {STR_VAR_1}!$"
 
-MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection: @ 82233D3
+MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection:
 	.string "A rocket launch demands perfection.\n"
 	.string "Not even a 1% margin of error is allowed.\p"
 	.string "Even if it's 99% okay, the whole thing\n"
@@ -326,55 +326,55 @@ MossdeepCity_SpaceCenter_1F_Text_RocketLaunchDemandsPerfection: @ 82233D3
 	.string "Despite that, we never stop trying.\n"
 	.string "Why? It's a dream that never ends.$"
 
-MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter: @ 82234B7
+MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter:
 	.string "Those MAGMA thugs have their sights\n"
 	.string "set on our SPACE CENTER.\p"
 	.string "But we can't allow anything that minor\n"
 	.string "to interfere with our rocket launch!$"
 
-MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt: @ 8223540
+MossdeepCity_SpaceCenter_1F_Text_FoundThisYouCanHaveIt:
 	.string "I was taking a stroll down the beach\n"
 	.string "when I found this.\p"
 	.string "It's not anything I need, so you can\n"
 	.string "have it.$"
 
-MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers: @ 82235A6
+MossdeepCity_SpaceCenter_1F_Text_HoennFamousForMeteorShowers:
 	.string "The HOENN region has been famous for \n"
 	.string "its meteor showers for a long time.$"
 
-MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis: @ 82235F0
+MossdeepCity_SpaceCenter_1F_Text_MagmaCantStealFuelTakeThis:
 	.string "TEAM MAGMA can't be allowed to steal\n"
 	.string "the rocket fuel.\p"
 	.string "Oh, by the way, you can have this stone\n"
 	.string "I found on the beach.$"
 
-MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma: @ 8223664
+MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma:
 	.string "With TEAM MAGMA around, I guess\n"
 	.string "strolls on the beach aren't safe.$"
 
-MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace: @ 82236A6
+MossdeepCity_SpaceCenter_1F_Text_DidPokemonComeFromSpace:
 	.string "Some people claim that POKéMON came\n"
 	.string "from space. Could it be true?$"
 
-MossdeepCity_SpaceCenter_1F_Text_AquaShouldBeatMagma: @ 82236E8
+MossdeepCity_SpaceCenter_1F_Text_AquaShouldBeatMagma:
 	.string "TEAM AQUA should take care of\n"
 	.string "TEAM MAGMA!\p"
 	.string "But if they did that, TEAM AQUA will\n"
 	.string "become bold and brazen, won't they?$"
 
-MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind: @ 822375B
+MossdeepCity_SpaceCenter_1F_Text_RocketsBoggleMyMind:
 	.string "A giant chunk of metal bursts through\n"
 	.string "the skies and flies into space…\p"
 	.string "It boggles my mind!$"
 
-MossdeepCity_SpaceCenter_1F_Text_MagmaWantsToSpoilMyDream: @ 82237B5
+MossdeepCity_SpaceCenter_1F_Text_MagmaWantsToSpoilMyDream:
 	.string "A giant chunk of metal bursts through\n"
 	.string "the skies and flies into space…\p"
 	.string "But TEAM MAGMA wants to spoil\n"
 	.string "that dream of mine!\p"
 	.string "I'm not having any of that!$"
 
-MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel: @ 8223849
+MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel:
 	.string "STEVEN: {PLAYER}{KUN}, have you read that\n"
 	.string "proclamation already?\p"
 	.string "TEAM MAGMA is coming after the rocket\n"
@@ -386,57 +386,57 @@ MossdeepCity_SpaceCenter_1F_Text_StevenMagmaCantBeAllowedToTakeFuel: @ 8223849
 	.string "In the meantime, why don't you go\n"
 	.string "check out the town?$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt3Intro: @ 822396C
+MossdeepCity_SpaceCenter_1F_Text_Grunt3Intro:
 	.string "As promised, we've come for\n"
 	.string "the rocket fuel!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt3Defeat: @ 8223999
+MossdeepCity_SpaceCenter_1F_Text_Grunt3Defeat:
 	.string "Ran out of fuel…$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt3PostBattle: @ 82239AA
+MossdeepCity_SpaceCenter_1F_Text_Grunt3PostBattle:
 	.string "Don't think you're on a roll just\n"
 	.string "because you've beaten me!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt1Intro: @ 82239E6
+MossdeepCity_SpaceCenter_1F_Text_Grunt1Intro:
 	.string "We gave you fair warning!\n"
 	.string "There's nothing sneaky about us!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt1Defeat: @ 8223A21
+MossdeepCity_SpaceCenter_1F_Text_Grunt1Defeat:
 	.string "Grrr…\n"
 	.string "We should've used sneaky treachery…$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt1PostBattle: @ 8223A4B
+MossdeepCity_SpaceCenter_1F_Text_Grunt1PostBattle:
 	.string "Okay, I get it already! The next time,\n"
 	.string "we'll come unannounced.$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt4Intro: @ 8223A8A
+MossdeepCity_SpaceCenter_1F_Text_Grunt4Intro:
 	.string "The rocket fuel the SPACE CENTER has\n"
 	.string "in storage--that's what we're after.\p"
 	.string "We mean to take every last bit of it!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt4Defeat: @ 8223AFA
+MossdeepCity_SpaceCenter_1F_Text_Grunt4Defeat:
 	.string "Please, can you spare some fuel?\n"
 	.string "Even a chintzy cup will do!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt4PostBattle: @ 8223B37
+MossdeepCity_SpaceCenter_1F_Text_Grunt4PostBattle:
 	.string "What are we going to do with\n"
 	.string "the rocket fuel?\p"
 	.string "How would I know?\n"
 	.string "Ask our leader upstairs!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt2Intro: @ 8223B90
+MossdeepCity_SpaceCenter_1F_Text_Grunt2Intro:
 	.string "Our leader said no one, but no one,\n"
 	.string "gets past me!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt2Defeat: @ 8223BC2
+MossdeepCity_SpaceCenter_1F_Text_Grunt2Defeat:
 	.string "Ack! Ack! Aaack!$"
 
-MossdeepCity_SpaceCenter_1F_Text_Grunt2PostBattle: @ 8223BD3
+MossdeepCity_SpaceCenter_1F_Text_Grunt2PostBattle:
 	.string "Please, tell our leader that\n"
 	.string "I never abandoned my post.\l"
 	.string "That I stayed to the bitter end…$"
 
-MossdeepCity_SpaceCenter_1F_Text_MagmaIntentToStealNotice: @ 8223C2C
+MossdeepCity_SpaceCenter_1F_Text_MagmaIntentToStealNotice:
 	.string "This is…\n"
 	.string "An intent-to-steal notice?\p"
 	.string "“To the staff of the SPACE CENTER:\n"
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 62550d7c6..839ab8f24 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
@@ -9,19 +9,19 @@
 .set LOCALID_TABITHA, 8
 .set LOCALID_MAXIE, 9
 
-MossdeepCity_SpaceCenter_2F_MapScripts:: @ 8223D58
+MossdeepCity_SpaceCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_SpaceCenter_2F_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_SpaceCenter_2F_OnFrame
 	.byte 0
 
-MossdeepCity_SpaceCenter_2F_OnTransition: @ 8223D63
+MossdeepCity_SpaceCenter_2F_OnTransition:
 	compare VAR_MOSSDEEP_CITY_STATE, 2
 	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MoveCivilians
 	compare VAR_MOSSDEEP_SPACE_CENTER_STATE, 2
 	call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_MoveDefeatedGrunts
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_MoveCivilians:: @ 8223D7A
+MossdeepCity_SpaceCenter_2F_EventScript_MoveCivilians::
 	clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER
 	setobjectxyperm LOCALID_SCIENTIST, 5, 3
 	setobjectmovementtype LOCALID_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT
@@ -31,17 +31,17 @@ MossdeepCity_SpaceCenter_2F_EventScript_MoveCivilians:: @ 8223D7A
 	setobjectmovementtype LOCALID_GENTLEMAN, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-MossdeepCity_SpaceCenter_2F_EventScript_MoveDefeatedGrunts:: @ 8223D9F
+MossdeepCity_SpaceCenter_2F_EventScript_MoveDefeatedGrunts::
 	setobjectxyperm LOCALID_GRUNT_6, 11, 2
 	setobjectxyperm LOCALID_GRUNT_7, 15, 2
 	setobjectxyperm LOCALID_GRUNT_5, 13, 4
 	return
 
-MossdeepCity_SpaceCenter_2F_OnFrame: @ 8223DB5
+MossdeepCity_SpaceCenter_2F_OnFrame:
 	map_script_2 VAR_MOSSDEEP_SPACE_CENTER_STATE, 1, MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts
 	.2byte 0
 
-MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts:: @ 8223DBF
+MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts::
 	playse SE_PIN
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -59,11 +59,11 @@ MossdeepCity_SpaceCenter_2F_EventScript_ThreeMagmaGrunts:: @ 8223DBF
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_Movement_PlayerExit: @ 8223E07
+MossdeepCity_SpaceCenter_2F_Movement_PlayerExit:
 	walk_up
 	step_end
 
-MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09
+MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt5Intro, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_5, MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat
 	applymovement LOCALID_GRUNT_5, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated
@@ -87,25 +87,25 @@ MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts:: @ 8223E09
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated: @ 8223E81
+MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated:
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated: @ 8223E85
+MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated:
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_2F_Movement_Grunt7Defeated: @ 8223E89
+MossdeepCity_SpaceCenter_2F_Movement_Grunt7Defeated:
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-MossdeepCity_SpaceCenter_2F_EventScript_Scientist:: @ 8223E8D
+MossdeepCity_SpaceCenter_2F_EventScript_Scientist::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal
@@ -116,17 +116,17 @@ MossdeepCity_SpaceCenter_2F_EventScript_Scientist:: @ 8223E8D
 	goto MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal:: @ 8223EB4
+MossdeepCity_SpaceCenter_2F_EventScript_ScientistNormal::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma:: @ 8223EBE
+MossdeepCity_SpaceCenter_2F_EventScript_ScientistMagma::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_WhyWouldMagmaStealRocketFuel, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_Gentleman:: @ 8223EC8
+MossdeepCity_SpaceCenter_2F_EventScript_Gentleman::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal
@@ -137,17 +137,17 @@ MossdeepCity_SpaceCenter_2F_EventScript_Gentleman:: @ 8223EC8
 	goto MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal:: @ 8223EEF
+MossdeepCity_SpaceCenter_2F_EventScript_GentlemanNormal::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma:: @ 8223EF9
+MossdeepCity_SpaceCenter_2F_EventScript_GentlemanMagma::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_MagmaCantGetAwayWithThis, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_RichBoy:: @ 8223F03
+MossdeepCity_SpaceCenter_2F_EventScript_RichBoy::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal
@@ -158,30 +158,30 @@ MossdeepCity_SpaceCenter_2F_EventScript_RichBoy:: @ 8223F03
 	goto MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal:: @ 8223F2A
+MossdeepCity_SpaceCenter_2F_EventScript_RichBoyNormal::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma:: @ 8223F34
+MossdeepCity_SpaceCenter_2F_EventScript_RichBoyMagma::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_DoesMagmaWantToGoToSpace, MSGBOX_DEFAULT
 	release
 	end
 
 @ Battle for the below 3 grunts is handled in MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts
-MossdeepCity_SpaceCenter_2F_EventScript_Grunt6:: @ 8223F3E
+MossdeepCity_SpaceCenter_2F_EventScript_Grunt6::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6PostBattle, MSGBOX_NPC
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_Grunt7:: @ 8223F47
+MossdeepCity_SpaceCenter_2F_EventScript_Grunt7::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7PostBattle, MSGBOX_NPC
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_Grunt5:: @ 8223F50
+MossdeepCity_SpaceCenter_2F_EventScript_Grunt5::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt5PostBattle, MSGBOX_NPC
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_Tabitha:: @ 8223F59
+MossdeepCity_SpaceCenter_2F_EventScript_Tabitha::
 	lock
 	faceplayer
 	msgbox MossdeepCity_SpaceCenter_2F_Text_WellTakeCareOfYou, MSGBOX_DEFAULT
@@ -190,13 +190,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_Tabitha:: @ 8223F59
 	release
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_Maxie:: @ 8223F6F
+MossdeepCity_SpaceCenter_2F_EventScript_Maxie::
 	lockall
 	msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieDontInterfere, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_Steven:: @ 8223F7A
+MossdeepCity_SpaceCenter_2F_EventScript_Steven::
 	lockall
 	goto_if_set FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER, MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt
 	setflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER
@@ -212,13 +212,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_Steven:: @ 8223F7A
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth:: @ 8223FBA
+MossdeepCity_SpaceCenter_2F_EventScript_StevenFightMovementSouth::
 	applymovement LOCALID_STEVEN, MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth
 	waitmovement 0
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_Movement_StevenFight: @ 8223FC6
+MossdeepCity_SpaceCenter_2F_Movement_StevenFight:
 	lock_facing_direction
 	walk_fast_up
 	walk_fast_up
@@ -229,7 +229,7 @@ MossdeepCity_SpaceCenter_2F_Movement_StevenFight: @ 8223FC6
 	walk_slow_down
 	step_end
 
-MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth: @ 8223FCF
+MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth:
 	face_left
 	lock_facing_direction
 	walk_fast_right
@@ -242,7 +242,7 @@ MossdeepCity_SpaceCenter_2F_Movement_StevenFightSouth: @ 8223FCF
 	face_down
 	step_end
 
-MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt:: @ 8223FDA
+MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt::
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox MossdeepCity_SpaceCenter_2F_Text_StevenAreYouReadyToBattle, MSGBOX_YESNO
@@ -255,7 +255,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt:: @ 8223FDA
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C
+MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle::
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	special SavePlayerParty
@@ -267,7 +267,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: @ 822400C
 	special LoadPlayerParty
 	goto MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt
 
-MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032
+MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle::
 	special ReducePlayerPartyToSelectedMons
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	setvar VAR_0x8004, SPECIAL_BATTLE_STEVEN
@@ -282,7 +282,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_DoStevenMultiBattle:: @ 8224032
 	special SetCB2WhiteOut
 	waitstate
 
-MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071
+MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha::
 	msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided, MSGBOX_DEFAULT
 	closemessage
 	delay 20
@@ -333,29 +333,29 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha:: @ 8224071
 	fadescreen FADE_FROM_BLACK
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer:: @ 8224131
+MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayer::
 	switch VAR_FACING
 	case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerSouth
 	case DIR_WEST, MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest
 	return
 
-MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerSouth:: @ 822414D
+MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerSouth::
 	turnobject LOCALID_STEVEN, DIR_NORTH
 	return
 
-MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest:: @ 8224152
+MossdeepCity_SpaceCenter_2F_EventScript_StevenFacePlayerWest::
 	turnobject LOCALID_STEVEN, DIR_EAST
 	return
 
-MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer:: @ 8224157
+MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer::
 	trainerbattle TRAINER_BATTLE_SET_TRAINER_A, TRAINER_MAXIE_MOSSDEEP, 0, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand, MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer:: @ 8224166
+MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer::
 	trainerbattle TRAINER_BATTLE_SET_TRAINER_B, TRAINER_TABITHA_MOSSDEEP, 0, MossdeepCity_SpaceCenter_Text_TabithaDefeat, MossdeepCity_SpaceCenter_Text_TabithaDefeat
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall:: @ 8224175
+MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall::
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -367,108 +367,108 @@ MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall:: @ 8224175
 	releaseall
 	end
 
-MossdeepCity_SpaceCenter_2F_EventScript_MayRayquazaCall:: @ 8224193
+MossdeepCity_SpaceCenter_2F_EventScript_MayRayquazaCall::
 	pokenavcall MatchCall_Text_MayRayquazaCall
 	waitmessage
 	return
 
-MossdeepCity_SpaceCenter_2F_EventScript_BrendanRayquazaCall:: @ 822419A
+MossdeepCity_SpaceCenter_2F_EventScript_BrendanRayquazaCall::
 	pokenavcall MatchCall_Text_BrendanRayquazaCall
 	waitmessage
 	return
 
-MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets: @ 82241A1
+MossdeepCity_SpaceCenter_2F_Text_MossdeepIdealForRockets:
 	.string "MOSSDEEP has mainly sunny weather,\n"
 	.string "and its winds are stable.\p"
 	.string "It's an ideal location for launching\n"
 	.string "rockets.$"
 
-MossdeepCity_SpaceCenter_2F_Text_WhyWouldMagmaStealRocketFuel: @ 822420C
+MossdeepCity_SpaceCenter_2F_Text_WhyWouldMagmaStealRocketFuel:
 	.string "Why would TEAM MAGMA want to steal\n"
 	.string "our rocket fuel in the first place?$"
 
-MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut: @ 8224253
+MossdeepCity_SpaceCenter_2F_Text_WouldveLikedToBeAstronaut:
 	.string "If only I was a little younger, I would\n"
 	.string "have liked being an astronaut…\p"
 	.string "No… It's not too late!\n"
 	.string "I can and will try!$"
 
-MossdeepCity_SpaceCenter_2F_Text_MagmaCantGetAwayWithThis: @ 82242C5
+MossdeepCity_SpaceCenter_2F_Text_MagmaCantGetAwayWithThis:
 	.string "If TEAM MAGMA takes the rocket fuel,\n"
 	.string "I won't be able to go to space!\p"
 	.string "They can't be allowed to get away\n"
 	.string "with such an outrage!$"
 
-MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace: @ 8224342
+MossdeepCity_SpaceCenter_2F_Text_WishOrdinaryPeopleCouldGoIntoSpace:
 	.string "I wish ordinary people could go into\n"
 	.string "space one day…$"
 
-MossdeepCity_SpaceCenter_2F_Text_DoesMagmaWantToGoToSpace: @ 8224376
+MossdeepCity_SpaceCenter_2F_Text_DoesMagmaWantToGoToSpace:
 	.string "TEAM MAGMA…\n"
 	.string "Do they want to go to space, too?$"
 
-MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn: @ 82243A4
+MossdeepCity_SpaceCenter_2F_Text_YoureOutnumberedTakeUsOn:
 	.string "What's wrong with you?\p"
 	.string "You're outnumbered three to one,\n"
 	.string "but you still want to take us on?$"
 
-MossdeepCity_SpaceCenter_2F_Text_GoodAnswer: @ 82243FE
+MossdeepCity_SpaceCenter_2F_Text_GoodAnswer:
 	.string "Good answer!\n"
 	.string "That's what a smart person'll do!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt5Intro: @ 822442D
+MossdeepCity_SpaceCenter_2F_Text_Grunt5Intro:
 	.string "A reckless go-getter, are you?\n"
 	.string "Okay, I'll go first!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat: @ 8224461
+MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat:
 	.string "I lost!\n"
 	.string "But!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro: @ 822446E
+MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro:
 	.string "It's too soon to be relieved!\n"
 	.string "I'm up next!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat: @ 8224499
+MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat:
 	.string "I lost, too!\n"
 	.string "But!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro: @ 82244AB
+MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro:
 	.string "I bet you want to take a break.\n"
 	.string "But I'm not about to let you do that!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat: @ 82244F1
+MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat:
 	.string "We should've taken a break…\n"
 	.string "That's what we should've done…$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt6PostBattle: @ 822452C
+MossdeepCity_SpaceCenter_2F_Text_Grunt6PostBattle:
 	.string "Three of us here, and look at the sorry\n"
 	.string "mess we got ourselves into.$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt7PostBattle: @ 8224570
+MossdeepCity_SpaceCenter_2F_Text_Grunt7PostBattle:
 	.string "We three losing like this…\n"
 	.string "We look worse than usual by triple!$"
 
-MossdeepCity_SpaceCenter_2F_Text_Grunt5PostBattle: @ 82245AF
+MossdeepCity_SpaceCenter_2F_Text_Grunt5PostBattle:
 	.string "Are we being useful to our leader\n"
 	.string "at all?$"
 
-MossdeepCity_SpaceCenter_2F_Text_WellTakeCareOfYou: @ 82245D9
+MossdeepCity_SpaceCenter_2F_Text_WellTakeCareOfYou:
 	.string "Hehehe!\p"
 	.string "We come all the way here to get some\n"
 	.string "fuel, and we're interfered with again!\p"
 	.string "If you're going to mess with us too,\n"
 	.string "we'll take care of you at the same time!$"
 
-MossdeepCity_SpaceCenter_2F_Text_MaxieDontInterfere: @ 822467B
+MossdeepCity_SpaceCenter_2F_Text_MaxieDontInterfere:
 	.string "MAXIE: Clear out of the way!\n"
 	.string "Don't you dare interfere!$"
 
-MossdeepCity_SpaceCenter_2F_Text_StevenWhyStealRocketFuel: @ 82246B2
+MossdeepCity_SpaceCenter_2F_Text_StevenWhyStealRocketFuel:
 	.string "STEVEN: TEAM MAGMA…\p"
 	.string "What's the point of stealing rocket\n"
 	.string "fuel?$"
 
-MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano: @ 82246F0
+MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano:
 	.string "MAXIE: Fufufu… Since you're so\n"
 	.string "curious, you deserve an explanation.\p"
 	.string "We're going to jettison the entire\n"
@@ -479,24 +479,24 @@ MossdeepCity_SpaceCenter_2F_Text_MaxieUseFuelToEruptVolcano: @ 82246F0
 	.string "the volcano erupt!\p"
 	.string "It will be savage!$"
 
-MossdeepCity_SpaceCenter_2F_Text_StevenAreYouReadyToBattle: @ 82247FF
+MossdeepCity_SpaceCenter_2F_Text_StevenAreYouReadyToBattle:
 	.string "STEVEN: {PLAYER}{KUN}!\n"
 	.string "You're going to help me?\p"
 	.string "Let's go into battle together!\n"
 	.string "Are you ready?$"
 
-MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly: @ 8224854
+MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly:
 	.string "STEVEN: Then, hurry!\n"
 	.string "Get ready quickly!$"
 
-MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand: @ 822487C
+MossdeepCity_SpaceCenter_2F_Text_JustWantToExpandLand:
 	.string "All I want…\n"
 	.string "I just want to expand the land mass…$"
 
-MossdeepCity_SpaceCenter_Text_TabithaDefeat: @ 82248AD
+MossdeepCity_SpaceCenter_Text_TabithaDefeat:
 	.string "I'm with our leader…$"
 
-MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided: @ 82248C2
+MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided:
 	.string "MAXIE: We failed to make the volcano\n"
 	.string "erupt…\p"
 	.string "We failed to control GROUDON after\n"
@@ -511,13 +511,13 @@ MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided: @ 82248C2
 	.string "Then might TEAM AQUA's goal to expand\n"
 	.string "the sea also be equally misguided?$"
 
-MossdeepCity_SpaceCenter_2F_Text_MaxieWeWillGiveUp: @ 82249DC
+MossdeepCity_SpaceCenter_2F_Text_MaxieWeWillGiveUp:
 	.string "MAXIE: All right…\n"
 	.string "We will give up on the fuel…\p"
 	.string "There appear to be more important\n"
 	.string "matters that I must examine…$"
 
-MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome: @ 8224A4A
+MossdeepCity_SpaceCenter_2F_Text_StevenThankYouComeSeeMeAtHome:
 	.string "STEVEN: Whew, that was too tense.\n"
 	.string "{PLAYER}{KUN}, thank you.\p"
 	.string "I have something to give you as\n"
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 1d384efe1..1f5a9e09a 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -1,35 +1,35 @@
 .set LOCALID_STEVEN, 1
 .set LOCALID_BELDUM_BALL, 2
 
-MossdeepCity_StevensHouse_MapScripts:: @ 8222784
+MossdeepCity_StevensHouse_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_OnFrame
 	.byte 0
 
-MossdeepCity_StevensHouse_OnLoad: @ 8222794
+MossdeepCity_StevensHouse_OnLoad:
 	call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_HideStevensNote
 	end
 
-MossdeepCity_StevensHouse_EventScript_HideStevensNote:: @ 822279E
+MossdeepCity_StevensHouse_EventScript_HideStevensNote::
 	setmetatile 6, 4, METATILE_GenericBuilding_TableEdge, 1
 	return
 
-MossdeepCity_StevensHouse_OnTransition: @ 82227A8
+MossdeepCity_StevensHouse_OnTransition:
 	compare VAR_STEVENS_HOUSE_STATE, 2
 	call_if_eq MossdeepCity_StevensHouse_EventScript_SetStevenPos
 	end
 
-MossdeepCity_StevensHouse_EventScript_SetStevenPos:: @ 82227B4
+MossdeepCity_StevensHouse_EventScript_SetStevenPos::
 	setobjectxyperm LOCALID_STEVEN, 6, 5
 	setobjectmovementtype LOCALID_STEVEN, MOVEMENT_TYPE_FACE_UP
 	return
 
-MossdeepCity_StevensHouse_OnFrame: @ 82227C0
+MossdeepCity_StevensHouse_OnFrame:
 	map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_StevenGivesDive
 	.2byte 0
 
-MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: @ 82227CA
+MossdeepCity_StevensHouse_EventScript_StevenGivesDive::
 	lockall
 	applymovement LOCALID_STEVEN, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
@@ -55,7 +55,7 @@ MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: @ 82227CA
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_Movement_StevenApproachPlayer: @ 8222833
+MossdeepCity_StevensHouse_Movement_StevenApproachPlayer:
 	walk_left
 	walk_left
 	walk_left
@@ -65,7 +65,7 @@ MossdeepCity_StevensHouse_Movement_StevenApproachPlayer: @ 8222833
 	walk_in_place_fastest_down
 	step_end
 
-MossdeepCity_StevensHouse_Movement_StevenReturn: @ 822283B
+MossdeepCity_StevensHouse_Movement_StevenReturn:
 	walk_up
 	walk_right
 	walk_right
@@ -73,7 +73,7 @@ MossdeepCity_StevensHouse_Movement_StevenReturn: @ 822283B
 	walk_in_place_fastest_up
 	step_end
 
-MossdeepCity_StevensHouse_EventScript_BeldumPokeball:: @ 8222841
+MossdeepCity_StevensHouse_EventScript_BeldumPokeball::
 	lockall
 	msgbox MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -81,12 +81,12 @@ MossdeepCity_StevensHouse_EventScript_BeldumPokeball:: @ 8222841
 	goto MossdeepCity_StevensHouse_EventScript_GiveBeldum
 	end
 
-MossdeepCity_StevensHouse_EventScript_LeaveBeldum:: @ 822285B
+MossdeepCity_StevensHouse_EventScript_LeaveBeldum::
 	msgbox MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_EventScript_GiveBeldum:: @ 8222865
+MossdeepCity_StevensHouse_EventScript_GiveBeldum::
 	setvar VAR_TEMP_1, SPECIES_BELDUM
 	givemon SPECIES_BELDUM, 5, ITEM_NONE
 	compare VAR_RESULT, 0
@@ -96,7 +96,7 @@ MossdeepCity_StevensHouse_EventScript_GiveBeldum:: @ 8222865
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-MossdeepCity_StevensHouse_EventScript_SendBeldumParty:: @ 8222895
+MossdeepCity_StevensHouse_EventScript_SendBeldumParty::
 	call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -106,7 +106,7 @@ MossdeepCity_StevensHouse_EventScript_SendBeldumParty:: @ 8222895
 	goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
 	end
 
-MossdeepCity_StevensHouse_EventScript_SendBeldumPC:: @ 82228BD
+MossdeepCity_StevensHouse_EventScript_SendBeldumPC::
 	call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -115,12 +115,12 @@ MossdeepCity_StevensHouse_EventScript_SendBeldumPC:: @ 82228BD
 	goto MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC
 	end
 
-MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC:: @ 82228E0
+MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC::
 	call Common_EventScript_TransferredToPC
 	goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
 	end
 
-MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare:: @ 82228EB
+MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare::
 	bufferspeciesname 1, SPECIES_BELDUM
 	removeobject LOCALID_BELDUM_BALL
 	playfanfare MUS_OBTAIN_ITEM
@@ -130,33 +130,33 @@ MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare:: @ 82228EB
 	bufferspeciesname 0, SPECIES_BELDUM
 	return
 
-MossdeepCity_StevensHouse_EventScript_ReceivedBeldum:: @ 8222901
+MossdeepCity_StevensHouse_EventScript_ReceivedBeldum::
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
 	setflag FLAG_RECEIVED_BELDUM
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_EventScript_RockDisplay:: @ 8222909
+MossdeepCity_StevensHouse_EventScript_RockDisplay::
 	msgbox MossdeepCity_StevensHouse_Text_CollectionOfRareRocks, MSGBOX_SIGN
 	end
 
-MossdeepCity_StevensHouse_EventScript_Steven:: @ 8222912
+MossdeepCity_StevensHouse_EventScript_Steven::
 	msgbox MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis, MSGBOX_NPC
 	end
 
-MossdeepCity_StevensHouse_EventScript_Letter:: @ 822291B
+MossdeepCity_StevensHouse_EventScript_Letter::
 	lockall
 	msgbox MossdeepCity_StevensHouse_Text_LetterFromSteven, MSGBOX_DEFAULT
 	releaseall
 	end
 
 @ Unused, leftover from RS
-MossdeepCity_StevensHouse_EventScript_DiveItemBall:: @ 8222926
+MossdeepCity_StevensHouse_EventScript_DiveItemBall::
 	finditem ITEM_HM08
 	setflag FLAG_RECEIVED_HM08
 	end
 
-MossdeepCity_StevensHouse_Text_YouveEarnedHMDive: @ 8222936
+MossdeepCity_StevensHouse_Text_YouveEarnedHMDive:
 	.string "STEVEN: {PLAYER}{KUN}…\p"
 	.string "As you can see, there's not much here,\n"
 	.string "but this is my home.\p"
@@ -166,7 +166,7 @@ MossdeepCity_StevensHouse_Text_YouveEarnedHMDive: @ 8222936
 	.string "No need to be shy--you've earned\n"
 	.string "this HM.$"
 
-MossdeepCity_StevensHouse_Text_ExplainDive: @ 8222A0E
+MossdeepCity_StevensHouse_Text_ExplainDive:
 	.string "STEVEN: While you're using SURF, you\n"
 	.string "should notice dark patches of water.\p"
 	.string "Use DIVE if you come to deep water\n"
@@ -176,31 +176,31 @@ MossdeepCity_StevensHouse_Text_ExplainDive: @ 8222A0E
 	.string "In some places, it won't be possible\n"
 	.string "for you to surface, though.$"
 
-MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis: @ 8222B11
+MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis:
 	.string "STEVEN: Apparently, there's an\n"
 	.string "underwater cavern between\l"
 	.string "MOSSDEEP and SOOTOPOLIS.\p"
 	.string "You know, the one that CAPT. STERN\n"
 	.string "found in his submarine.$"
 
-MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum: @ 8222B9E
+MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum:
 	.string "{PLAYER} checked the POKé BALL.\p"
 	.string "It contained the POKéMON\n"
 	.string "BELDUM.\p"
 	.string "Take the POKé BALL?$"
 
-MossdeepCity_StevensHouse_Text_ObtainedBeldum: @ 8222BED
+MossdeepCity_StevensHouse_Text_ObtainedBeldum:
 	.string "{PLAYER} obtained a BELDUM.$"
 
 @ Unused
-MossdeepCity_StevensHouse_Text_NoSpaceForAnotherMon: @ 8222C03
+MossdeepCity_StevensHouse_Text_NoSpaceForAnotherMon:
 	.string "There is no space for another POKéMON.$"
 
-MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas: @ 8222C2A
+MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas:
 	.string "{PLAYER} left the POKé BALL where\n"
 	.string "it was.$"
 
-MossdeepCity_StevensHouse_Text_LetterFromSteven: @ 8222C4E
+MossdeepCity_StevensHouse_Text_LetterFromSteven:
 	.string "It's a letter.\p"
 	.string "… … … … … …\p"
 	.string "To {PLAYER}{KUN}…\p"
@@ -217,7 +217,7 @@ MossdeepCity_StevensHouse_Text_LetterFromSteven: @ 8222C4E
 	.string "May our paths cross someday.\p"
 	.string "STEVEN STONE$"
 
-MossdeepCity_StevensHouse_Text_CollectionOfRareRocks: @ 8222D97
+MossdeepCity_StevensHouse_Text_CollectionOfRareRocks:
 	.string "It's a collection of rare rocks and\n"
 	.string "stones assembled by STEVEN.$"
 
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index 061590e1a..cd07667b5 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -5,20 +5,20 @@
 .set LOCALID_MAGMA_GRUNT_1, 29
 
 
-MtChimney_MapScripts:: @ 822EDC1
+MtChimney_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, MtChimney_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_OnTransition
 	.byte 0
 
-MtChimney_OnTransition: @ 822EDCC
+MtChimney_OnTransition:
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 1
 	end
 
-MtChimney_OnResume: @ 822EDD2
+MtChimney_OnResume:
 	setstepcallback STEP_CB_ASH
 	end
 
-MtChimney_EventScript_Archie:: @ 822EDD5
+MtChimney_EventScript_Archie::
 	lock
 	faceplayer
 	call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_ArchieGoStopTeamMagma
@@ -30,15 +30,15 @@ MtChimney_EventScript_Archie:: @ 822EDD5
 	release
 	end
 
-MtChimney_EventScript_ArchieGoStopTeamMagma:: @ 822EDF9
+MtChimney_EventScript_ArchieGoStopTeamMagma::
 	msgbox MtChimney_Text_ArchieGoStopTeamMagma, MSGBOX_DEFAULT
 	return
 
-MtChimney_EventScript_ArchieBusyFighting:: @ 822EE02
+MtChimney_EventScript_ArchieBusyFighting::
 	msgbox MtChimney_Text_ArchieIHaveMyHandsFull, MSGBOX_DEFAULT
 	return
 
-MtChimney_EventScript_Maxie:: @ 822EE0B
+MtChimney_EventScript_Maxie::
 	lockall
 	playbgm MUS_ENCOUNTER_MAGMA, FALSE
 	msgbox MtChimney_Text_MeteoriteWillActivateVolcano, MSGBOX_DEFAULT
@@ -84,27 +84,27 @@ MtChimney_EventScript_Maxie:: @ 822EE0B
 	releaseall
 	end
 
-MtChimney_EventScript_ArchieApproachPlayerEast:: @ 822EEC7
+MtChimney_EventScript_ArchieApproachPlayerEast::
 	applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieApproachPlayerEast
 	waitmovement 0
 	return
 
-MtChimney_EventScript_ArchieApproachPlayerNorth:: @ 822EED2
+MtChimney_EventScript_ArchieApproachPlayerNorth::
 	applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieApproachPlayerNorth
 	waitmovement 0
 	return
 
-MtChimney_EventScript_ArchieExitEast:: @ 822EEDD
+MtChimney_EventScript_ArchieExitEast::
 	applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieExitEast
 	waitmovement 0
 	return
 
-MtChimney_EventScript_ArchieExitNorth:: @ 822EEE8
+MtChimney_EventScript_ArchieExitNorth::
 	applymovement LOCALID_ARCHIE, MtChimney_Movement_ArchieExitNorth
 	waitmovement 0
 	return
 
-MtChimney_EventScript_LavaCookieLady:: @ 822EEF3
+MtChimney_EventScript_LavaCookieLady::
 	lock
 	faceplayer
 	showmoneybox 0, 0, 0
@@ -125,30 +125,30 @@ MtChimney_EventScript_LavaCookieLady:: @ 822EEF3
 	release
 	end
 
-MtChimney_EventScript_BagIsFull:: @ 822EF51
+MtChimney_EventScript_BagIsFull::
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	hidemoneybox
 	release
 	end
 
-MtChimney_EventScript_RemoveMoney:: @ 822EF5E
+MtChimney_EventScript_RemoveMoney::
 	removemoney 200, 0
 	updatemoneybox 0, 0
 	return
 
-MtChimney_EventScript_DeclineLavaCookie:: @ 822EF69
+MtChimney_EventScript_DeclineLavaCookie::
 	msgbox MtChimney_Text_OhFineThen, MSGBOX_DEFAULT
 	hidemoneybox
 	release
 	end
 
-MtChimney_EventScript_NotEnoughMoney:: @ 822EF76
+MtChimney_EventScript_NotEnoughMoney::
 	msgbox MtChimney_Text_YouveNotGotTheMoney, MSGBOX_DEFAULT
 	hidemoneybox
 	release
 	end
 
-MtChimney_Movement_ArchieApproachPlayerEast: @ 822EF83
+MtChimney_Movement_ArchieApproachPlayerEast:
 	walk_up
 	walk_up
 	walk_up
@@ -158,7 +158,7 @@ MtChimney_Movement_ArchieApproachPlayerEast: @ 822EF83
 	walk_right
 	step_end
 
-MtChimney_Movement_ArchieExitEast: @ 822EF8B
+MtChimney_Movement_ArchieExitEast:
 	walk_left
 	walk_down
 	walk_down
@@ -169,7 +169,7 @@ MtChimney_Movement_ArchieExitEast: @ 822EF8B
 	walk_down
 	step_end
 
-MtChimney_Movement_ArchieApproachPlayerNorth: @ 822EF94
+MtChimney_Movement_ArchieApproachPlayerNorth:
 	walk_up
 	walk_up
 	walk_up
@@ -179,7 +179,7 @@ MtChimney_Movement_ArchieApproachPlayerNorth: @ 822EF94
 	walk_right
 	step_end
 
-MtChimney_Movement_ArchieExitNorth: @ 822EF9C
+MtChimney_Movement_ArchieExitNorth:
 	walk_left
 	walk_left
 	walk_down
@@ -191,7 +191,7 @@ MtChimney_Movement_ArchieExitNorth: @ 822EF9C
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused1: @ 822EFA6
+MtChimney_Movement_Unused1:
 	walk_down
 	walk_down
 	walk_down
@@ -211,7 +211,7 @@ MtChimney_Movement_Unused1: @ 822EFA6
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused2: @ 822EFB8
+MtChimney_Movement_Unused2:
 	walk_down
 	walk_down
 	walk_down
@@ -222,7 +222,7 @@ MtChimney_Movement_Unused2: @ 822EFB8
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused3: @ 822EFC1
+MtChimney_Movement_Unused3:
 	walk_right
 	walk_down
 	walk_down
@@ -239,7 +239,7 @@ MtChimney_Movement_Unused3: @ 822EFC1
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused4: @ 822EFD0
+MtChimney_Movement_Unused4:
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
@@ -266,7 +266,7 @@ MtChimney_Movement_Unused4: @ 822EFD0
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused5: @ 822EFE9
+MtChimney_Movement_Unused5:
 	delay_16
 	delay_16
 	delay_16
@@ -279,7 +279,7 @@ MtChimney_Movement_Unused5: @ 822EFE9
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused6: @ 822EFF4
+MtChimney_Movement_Unused6:
 	delay_16
 	walk_left
 	walk_down
@@ -297,7 +297,7 @@ MtChimney_Movement_Unused6: @ 822EFF4
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused7: @ 822F004
+MtChimney_Movement_Unused7:
 	delay_16
 	walk_left
 	walk_left
@@ -316,7 +316,7 @@ MtChimney_Movement_Unused7: @ 822F004
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused8: @ 822F015
+MtChimney_Movement_Unused8:
 	delay_16
 	walk_down
 	walk_left
@@ -326,7 +326,7 @@ MtChimney_Movement_Unused8: @ 822F015
 	walk_in_place_fastest_down
 	step_end
 
-MtChimney_Movement_Unused9: @ 822F01D
+MtChimney_Movement_Unused9:
 	walk_down
 	walk_down
 	walk_down
@@ -342,11 +342,11 @@ MtChimney_Movement_Unused9: @ 822F01D
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused10: @ 822F02B
+MtChimney_Movement_Unused10:
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused11: @ 822F02D
+MtChimney_Movement_Unused11:
 	walk_down
 	walk_down
 	walk_down
@@ -356,7 +356,7 @@ MtChimney_Movement_Unused11: @ 822F02D
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused12: @ 822F035
+MtChimney_Movement_Unused12:
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
@@ -368,7 +368,7 @@ MtChimney_Movement_Unused12: @ 822F035
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused13: @ 822F03F
+MtChimney_Movement_Unused13:
 	delay_16
 	delay_16
 	delay_16
@@ -381,74 +381,74 @@ MtChimney_Movement_Unused13: @ 822F03F
 	walk_down
 	step_end
 
-MtChimney_Movement_Unused14: @ 822F04A
+MtChimney_Movement_Unused14:
 	lock_facing_direction
 	walk_fast_left
 	unlock_facing_direction
 	face_right
 	step_end
 
-MtChimney_Movement_Unused15: @ 822F04F
+MtChimney_Movement_Unused15:
 	walk_left
 	walk_in_place_fastest_right
 	delay_16
 	step_end
 
-MtChimney_EventScript_BusyAquaGrunt1:: @ 822F053
+MtChimney_EventScript_BusyAquaGrunt1::
 	msgbox MtChimney_Text_MagmaOutnumbersUs, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_BusyAquaGrunt2:: @ 822F05C
+MtChimney_EventScript_BusyAquaGrunt2::
 	msgbox MtChimney_Text_LessHabitatForWaterPokemon, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_BusyAquaGrunt3:: @ 822F065
+MtChimney_EventScript_BusyAquaGrunt3::
 	msgbox MtChimney_Text_MagmasNameSimilar, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_Tabitha:: @ 822F06E
+MtChimney_EventScript_Tabitha::
 	trainerbattle_single TRAINER_TABITHA_MT_CHIMNEY, MtChimney_Text_TabithaIntro, MtChimney_Text_TabithaDefeat
 	msgbox MtChimney_Text_TabithaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_Grunt2:: @ 822F085
+MtChimney_EventScript_Grunt2::
 	trainerbattle_single TRAINER_GRUNT_MT_CHIMNEY_2, MtChimney_Text_Grunt2Intro, MtChimney_Text_Grunt2Defeat
 	msgbox MtChimney_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_BusyMagmaGrunt1:: @ 822F09C
+MtChimney_EventScript_BusyMagmaGrunt1::
 	msgbox MtChimney_Text_TeamAquaAlwaysMessingWithPlans, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_BusyMagmaGrunt2:: @ 822F0A5
+MtChimney_EventScript_BusyMagmaGrunt2::
 	msgbox MtChimney_Text_MeteoritesPackAmazingPower, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_BusyMagmaGrunt3:: @ 822F0AE
+MtChimney_EventScript_BusyMagmaGrunt3::
 	msgbox MtChimney_Text_YouBetterNotMessWithUs, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_BusyMagmaGrunt4:: @ 822F0B7
+MtChimney_EventScript_BusyMagmaGrunt4::
 	msgbox MtChimney_Text_AquasNameSimilar, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_BusyMagmaGrunt5:: @ 822F0C0
+MtChimney_EventScript_BusyMagmaGrunt5::
 	msgbox MtChimney_Text_DouseThemInFire, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_BusyMagmaGrunt6:: @ 822F0C9
+MtChimney_EventScript_BusyMagmaGrunt6::
 	msgbox MtChimney_Text_KeepMakingMoreLand, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_MagmaPoochyena:: @ 822F0D2
+MtChimney_EventScript_MagmaPoochyena::
 	msgbox MtChimney_Text_Bufoh, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_AquaPoochyena:: @ 822F0DB
+MtChimney_EventScript_AquaPoochyena::
 	msgbox MtChimney_Text_Bushaa, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_MeteoriteMachine:: @ 822F0E4
+MtChimney_EventScript_MeteoriteMachine::
 	lockall
 	goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_MachineOn
 	goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_MachineOff
@@ -461,26 +461,26 @@ MtChimney_EventScript_MeteoriteMachine:: @ 822F0E4
 	releaseall
 	end
 
-MtChimney_EventScript_LeaveMeteoriteAlone:: @ 822F123
+MtChimney_EventScript_LeaveMeteoriteAlone::
 	msgbox MtChimney_Text_PlayerLeftMeteorite, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MtChimney_EventScript_MachineOff:: @ 822F12D
+MtChimney_EventScript_MachineOff::
 	msgbox MtChimney_Text_MachineMakesNoResponse, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MtChimney_EventScript_MachineOn:: @ 822F137
+MtChimney_EventScript_MachineOn::
 	msgbox MtChimney_Text_MetoriteFittedOnMachine, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MtChimney_EventScript_RouteSign:: @ 822F141
+MtChimney_EventScript_RouteSign::
 	msgbox MtChimney_Text_RouteSign, MSGBOX_SIGN
 	end
 
-MtChimney_EventScript_Shelby:: @ 822F14A
+MtChimney_EventScript_Shelby::
 	trainerbattle_single TRAINER_SHELBY_1, MtChimney_Text_ShelbyIntro, MtChimney_Text_ShelbyDefeat, MtChimney_EventScript_DefeatedShelby
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -489,7 +489,7 @@ MtChimney_EventScript_Shelby:: @ 822F14A
 	release
 	end
 
-MtChimney_EventScript_DefeatedShelby:: @ 822F176
+MtChimney_EventScript_DefeatedShelby::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox MtChimney_Text_ShelbyRegister, MSGBOX_DEFAULT
@@ -497,32 +497,32 @@ MtChimney_EventScript_DefeatedShelby:: @ 822F176
 	release
 	end
 
-MtChimney_EventScript_RematchShelby:: @ 822F195
+MtChimney_EventScript_RematchShelby::
 	trainerbattle_rematch TRAINER_SHELBY_1, MtChimney_Text_ShelbyRematchIntro, MtChimney_Text_ShelbyRematchDefeat
 	msgbox MtChimney_Text_ShelbyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_Melissa:: @ 822F1AC
+MtChimney_EventScript_Melissa::
 	trainerbattle_single TRAINER_MELISSA, MtChimney_Text_MelissaIntro, MtChimney_Text_MelissaDefeat
 	msgbox MtChimney_Text_MelissaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_Sheila:: @ 822F1C3
+MtChimney_EventScript_Sheila::
 	trainerbattle_single TRAINER_SHEILA, MtChimney_Text_SheilaIntro, MtChimney_Text_SheilaDefeat
 	msgbox MtChimney_Text_SheilaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_Shirley:: @ 822F1DA
+MtChimney_EventScript_Shirley::
 	trainerbattle_single TRAINER_SHIRLEY, MtChimney_Text_ShirleyIntro, MtChimney_Text_ShirleyDefeat
 	msgbox MtChimney_Text_ShirleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_Grunt1:: @ 822F1F1
+MtChimney_EventScript_Grunt1::
 	trainerbattle_single TRAINER_GRUNT_MT_CHIMNEY_1, MtChimney_Text_Grunt1Intro, MtChimney_Text_Grunt1Defeat
 	msgbox MtChimney_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_EventScript_Sawyer:: @ 822F208
+MtChimney_EventScript_Sawyer::
 	trainerbattle_single TRAINER_SAWYER_1, MtChimney_Text_SawyerIntro, MtChimney_Text_SawyerDefeat, MtChimney_EventScript_SawyerDefeated
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -531,7 +531,7 @@ MtChimney_EventScript_Sawyer:: @ 822F208
 	release
 	end
 
-MtChimney_EventScript_SawyerDefeated:: @ 822F234
+MtChimney_EventScript_SawyerDefeated::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox MtChimney_Text_SawyerRegister, MSGBOX_DEFAULT
@@ -539,12 +539,12 @@ MtChimney_EventScript_SawyerDefeated:: @ 822F234
 	release
 	end
 
-MtChimney_EventScript_SawyerRematch:: @ 822F253
+MtChimney_EventScript_SawyerRematch::
 	trainerbattle_rematch TRAINER_SAWYER_1, MtChimney_Text_SawyerRematchIntro, MtChimney_Text_SawyerRematchDefeat
 	msgbox MtChimney_Text_SawyerPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MtChimney_Text_MeteoriteWillActivateVolcano: @ 822F26A
+MtChimney_Text_MeteoriteWillActivateVolcano:
 	.string "The power contained in the METEORITE…\p"
 	.string "By amplifying its power with this\n"
 	.string "machine, MT. CHIMNEY's volcanic\l"
@@ -553,7 +553,7 @@ MtChimney_Text_MeteoriteWillActivateVolcano: @ 822F26A
 	.string "the crater and…\l"
 	.string "Fufufu…$"
 
-MtChimney_Text_MaxieIntro: @ 822F32E
+MtChimney_Text_MaxieIntro:
 	.string "MAXIE: Hm?\n"
 	.string "Who are you?\p"
 	.string "… … … … … …\n"
@@ -581,11 +581,11 @@ MtChimney_Text_MaxieIntro: @ 822F32E
 	.string "I'll teach you the consequences of\l"
 	.string "meddling in our grand design!$"
 
-MtChimney_Text_MaxieDefeat: @ 822F5CF
+MtChimney_Text_MaxieDefeat:
 	.string "What?!\p"
 	.string "I, MAXIE, was caught off guard?!$"
 
-MtChimney_Text_MaxieYouHaventSeenLastOfMagma: @ 822F5F7
+MtChimney_Text_MaxieYouHaventSeenLastOfMagma:
 	.string "MAXIE: But, enough.\n"
 	.string "I will back off this time.\p"
 	.string "But don't think that this is the last\n"
@@ -594,81 +594,81 @@ MtChimney_Text_MaxieYouHaventSeenLastOfMagma: @ 822F5F7
 	.string "Even without the METEORITE, if we\n"
 	.string "obtain that ORB… Fufufu…$"
 
-MtChimney_Text_TabithaIntro: @ 822F6AA
+MtChimney_Text_TabithaIntro:
 	.string "Hehehe!\p"
 	.string "So you've come all the way here!\p"
 	.string "But you're too late!\n"
 	.string "I've already delivered the METEORITE\l"
 	.string "from METEOR FALLS to the BOSS!$"
 
-MtChimney_Text_TabithaDefeat: @ 822F72C
+MtChimney_Text_TabithaDefeat:
 	.string "Hehehe…\p"
 	.string "Even though I've lost, if our leader\n"
 	.string "awakens that thing…$"
 
-MtChimney_Text_TabithaPostBattle: @ 822F76D
+MtChimney_Text_TabithaPostBattle:
 	.string "BOSS, hurry!\n"
 	.string "Give it the METEORITE's energy!\p"
 	.string "Hehehe…$"
 
-MtChimney_Text_Grunt2Intro: @ 822F7A2
+MtChimney_Text_Grunt2Intro:
 	.string "We of TEAM MAGMA are working hard for\n"
 	.string "everyone's sake.\p"
 	.string "Like, if that thing's power made more\n"
 	.string "land, there'd be more places to live.\p"
 	.string "Everyone'd be happy!$"
 
-MtChimney_Text_Grunt2Defeat: @ 822F83A
+MtChimney_Text_Grunt2Defeat:
 	.string "Hunh?\n"
 	.string "What do you mean I lost?$"
 
-MtChimney_Text_Grunt2PostBattle: @ 822F859
+MtChimney_Text_Grunt2PostBattle:
 	.string "Our BOSS says, “It will make everyone\n"
 	.string "happy.”\p"
 	.string "But why does everyone keep getting\n"
 	.string "in our way?$"
 
-MtChimney_Text_Grunt1Intro: @ 822F8B6
+MtChimney_Text_Grunt1Intro:
 	.string "If there were more land, I'd be able\n"
 	.string "to get a big house of my own!\p"
 	.string "I'm going to build it on hardened lava!$"
 
-MtChimney_Text_Grunt1Defeat: @ 822F921
+MtChimney_Text_Grunt1Defeat:
 	.string "My dream of a big house…$"
 
-MtChimney_Text_Grunt1PostBattle: @ 822F93A
+MtChimney_Text_Grunt1PostBattle:
 	.string "A kid like you, you ought to be\n"
 	.string "splashing about in the waves!$"
 
-MtChimney_Text_TeamAquaAlwaysMessingWithPlans: @ 822F978
+MtChimney_Text_TeamAquaAlwaysMessingWithPlans:
 	.string "That annoying TEAM AQUA…\n"
 	.string "They always mess with our plans!$"
 
-MtChimney_Text_MeteoritesPackAmazingPower: @ 822F9B2
+MtChimney_Text_MeteoritesPackAmazingPower:
 	.string "METEORITES pack amazing power!$"
 
-MtChimney_Text_YouBetterNotMessWithUs: @ 822F9D1
+MtChimney_Text_YouBetterNotMessWithUs:
 	.string "You'd better not mess with us!\p"
 	.string "We're trying to awaken that thing\n"
 	.string "for the benefit of everyone!$"
 
-MtChimney_Text_AquasNameSimilar: @ 822FA2F
+MtChimney_Text_AquasNameSimilar:
 	.string "We're TEAM MAGMA!\p"
 	.string "They're TEAM AQUA!\p"
 	.string "It totally annoys me that they'd\n"
 	.string "use a name like ours!$"
 
-MtChimney_Text_DouseThemInFire: @ 822FA8B
+MtChimney_Text_DouseThemInFire:
 	.string "Yeah!\n"
 	.string "Douse them in fire!$"
 
-MtChimney_Text_KeepMakingMoreLand: @ 822FAA5
+MtChimney_Text_KeepMakingMoreLand:
 	.string "We're going to keep making more land!$"
 
-MtChimney_Text_Bufoh: @ 822FACB
+MtChimney_Text_Bufoh:
 	.string "Bufoh!$"
 
-MtChimney_Text_ArchieGoStopTeamMagma: @ 822FAD2
+MtChimney_Text_ArchieGoStopTeamMagma:
 	.string "ARCHIE: Grr, {PLAYER}!\n"
 	.string "I should've guessed you'd show up!\p"
 	.string "See for yourself what the fanatics\n"
@@ -678,14 +678,14 @@ MtChimney_Text_ArchieGoStopTeamMagma: @ 822FAD2
 	.string "Doing something like that will cause\n"
 	.string "the volcano's eruption!$"
 
-MtChimney_Text_ArchieIHaveMyHandsFull: @ 822FBC7
+MtChimney_Text_ArchieIHaveMyHandsFull:
 	.string "ARCHIE: Grrr…\p"
 	.string "I want to stop that MAXIE,\n"
 	.string "but I can't!\p"
 	.string "Not when I have my hands full battling\n"
 	.string "three opponents at once!$"
 
-MtChimney_Text_ArchieThankYou: @ 822FC3D
+MtChimney_Text_ArchieThankYou:
 	.string "ARCHIE: {PLAYER}!\n"
 	.string "Thank you!\p"
 	.string "With your help, we thwarted TEAM\n"
@@ -697,161 +697,161 @@ MtChimney_Text_ArchieThankYou: @ 822FC3D
 	.string "our pursuit of TEAM MAGMA.\p"
 	.string "{PLAYER}, we shall meet again!$"
 
-MtChimney_Text_MagmaOutnumbersUs: @ 822FD1F
+MtChimney_Text_MagmaOutnumbersUs:
 	.string "Darn… TEAM MAGMA outnumbers us!\n"
 	.string "We can't keep up with them!$"
 
-MtChimney_Text_LessHabitatForWaterPokemon: @ 822FD5B
+MtChimney_Text_LessHabitatForWaterPokemon:
 	.string "If they expand the land, there'll be\n"
 	.string "less habitats for WATER POKéMON!$"
 
-MtChimney_Text_MagmasNameSimilar: @ 822FDA1
+MtChimney_Text_MagmasNameSimilar:
 	.string "We're TEAM AQUA!\p"
 	.string "They're TEAM MAGMA!\p"
 	.string "It burns me up that they'd use such\n"
 	.string "a confusing name!$"
 
-MtChimney_Text_Bushaa: @ 822FDFC
+MtChimney_Text_Bushaa:
 	.string "Bushaa!$"
 
-MtChimney_Text_LavaCookiesJust200: @ 822FE04
+MtChimney_Text_LavaCookiesJust200:
 	.string "LAVA COOKIES are MT. CHIMNEY's local\n"
 	.string "specialty.\p"
 	.string "Try one. It's just ¥200.$"
 
-MtChimney_Text_ThankYouDear: @ 822FE4D
+MtChimney_Text_ThankYouDear:
 	.string "Thank you, dear!$"
 
-MtChimney_Text_YouveNotGotTheMoney: @ 822FE5E
+MtChimney_Text_YouveNotGotTheMoney:
 	.string "Oh, dear. You can't buy a thing if\n"
 	.string "you've not got the money.$"
 
-MtChimney_Text_OhFineThen: @ 822FE9B
+MtChimney_Text_OhFineThen:
 	.string "Oh, fine then.$"
 
-MtChimney_Text_MetoriteFittedOnMachine: @ 822FEAA
+MtChimney_Text_MetoriteFittedOnMachine:
 	.string "A METEORITE is fitted on a mysterious\n"
 	.string "machine…\p"
 	.string "The machine seems to be storing\n"
 	.string "energy in the METEORITE.$"
 
-MtChimney_Text_RemoveTheMeteorite: @ 822FF12
+MtChimney_Text_RemoveTheMeteorite:
 	.string "A METEORITE is fitted on a mysterious\n"
 	.string "machine…\p"
 	.string "Do you want to remove the METEORITE?$"
 
-MtChimney_Text_PlayerRemovedMeteorite: @ 822FF66
+MtChimney_Text_PlayerRemovedMeteorite:
 	.string "{PLAYER} removed the METEORITE from\n"
 	.string "the mysterious machine.$"
 
-MtChimney_Text_PlayerLeftMeteorite: @ 822FF9C
+MtChimney_Text_PlayerLeftMeteorite:
 	.string "{PLAYER} left the METEORITE where\n"
 	.string "it was.$"
 
-MtChimney_Text_MachineMakesNoResponse: @ 822FFC0
+MtChimney_Text_MachineMakesNoResponse:
 	.string "This mysterious machine…\n"
 	.string "It makes no response whatsoever.$"
 
-MtChimney_Text_RouteSign: @ 822FFFA
+MtChimney_Text_RouteSign:
 	.string "{DOWN_ARROW} JAGGED PATH\n"
 	.string "LAVARIDGE TOWN AHEAD$"
 
-MtChimney_Text_ShelbyIntro: @ 823001D
+MtChimney_Text_ShelbyIntro:
 	.string "I've been to the hot springs and\n"
 	.string "refreshed my tired bones.\l"
 	.string "Right now I'm feeling strong!$"
 
-MtChimney_Text_ShelbyDefeat: @ 8230076
+MtChimney_Text_ShelbyDefeat:
 	.string "Oh, my goodness.\n"
 	.string "Now, aren't you something!$"
 
-MtChimney_Text_ShelbyPostBattle: @ 82300A2
+MtChimney_Text_ShelbyPostBattle:
 	.string "Well, well, I've lost. I can't call\n"
 	.string "myself an EXPERT now, can I?$"
 
-MtChimney_Text_ShelbyRegister: @ 82300E3
+MtChimney_Text_ShelbyRegister:
 	.string "Thank you, child. It was fun, as if\n"
 	.string "I were battling my own grandchild.\p"
 	.string "Please, come see me again for\n"
 	.string "a rematch.$"
 
-MtChimney_Text_ShelbyRematchIntro: @ 8230153
+MtChimney_Text_ShelbyRematchIntro:
 	.string "If you can mesh your heart with those\n"
 	.string "of your POKéMON, why, you should be\l"
 	.string "able to achieve great things.$"
 
-MtChimney_Text_ShelbyRematchDefeat: @ 82301BB
+MtChimney_Text_ShelbyRematchDefeat:
 	.string "Oh, my goodness.\n"
 	.string "Now, aren't you something!$"
 
-MtChimney_Text_ShelbyPostRematch: @ 82301E7
+MtChimney_Text_ShelbyPostRematch:
 	.string "Perhaps your heart has become one\n"
 	.string "with the hearts of your POKéMON.$"
 
-MtChimney_Text_MelissaIntro: @ 823022A
+MtChimney_Text_MelissaIntro:
 	.string "I've got the fire in me, baby.\n"
 	.string "I can't stand it! I have to battle!$"
 
-MtChimney_Text_MelissaDefeat: @ 823026D
+MtChimney_Text_MelissaDefeat:
 	.string "Ooh, that was a scorching-hot match!$"
 
-MtChimney_Text_MelissaPostBattle: @ 8230292
+MtChimney_Text_MelissaPostBattle:
 	.string "The heat of MT. CHIMNEY warms\n"
 	.string "me up, baby!$"
 
-MtChimney_Text_SheilaIntro: @ 82302BD
+MtChimney_Text_SheilaIntro:
 	.string "I've finally made it to MT. CHIMNEY.\n"
 	.string "I want to make my POKéMON battle!$"
 
-MtChimney_Text_SheilaDefeat: @ 8230304
+MtChimney_Text_SheilaDefeat:
 	.string "The way you battle…\n"
 	.string "It's like a MT. CHIMNEY eruption!$"
 
-MtChimney_Text_SheilaPostBattle: @ 823033A
+MtChimney_Text_SheilaPostBattle:
 	.string "Like I said, I've finally made it to\n"
 	.string "MT. CHIMNEY. It would be a shame if\l"
 	.string "I only do a little sightseeing…\p"
 	.string "I want to get in some battles and buy\n"
 	.string "COOKIES as souvenirs.$"
 
-MtChimney_Text_ShirleyIntro: @ 82303DF
+MtChimney_Text_ShirleyIntro:
 	.string "Since I bathed in the hot springs,\n"
 	.string "I've been feeling great!\l"
 	.string "I'm sure I'm going to win!$"
 
-MtChimney_Text_ShirleyDefeat: @ 8230436
+MtChimney_Text_ShirleyDefeat:
 	.string "Yowch!\n"
 	.string "I'm getting a chill out of the water.$"
 
-MtChimney_Text_ShirleyPostBattle: @ 8230463
+MtChimney_Text_ShirleyPostBattle:
 	.string "I'll have to take another dip in the\n"
 	.string "hot springs. Want to join me?\p"
 	.string "Just joking!$"
 
-MtChimney_Text_SawyerIntro: @ 82304B3
+MtChimney_Text_SawyerIntro:
 	.string "This is one fine mountain! Plenty of\n"
 	.string "hot people around for company!$"
 
-MtChimney_Text_SawyerDefeat: @ 82304F7
+MtChimney_Text_SawyerDefeat:
 	.string "Oh, you're a real firebrand, too!$"
 
-MtChimney_Text_SawyerPostBattle: @ 8230519
+MtChimney_Text_SawyerPostBattle:
 	.string "I think I need a dip in LAVARIDGE\n"
 	.string "HOT SPRING with the locals!$"
 
-MtChimney_Text_SawyerRegister: @ 8230557
+MtChimney_Text_SawyerRegister:
 	.string "I like little fireballs like you.\n"
 	.string "Let me register you in my POKéNAV.$"
 
-MtChimney_Text_SawyerRematchIntro: @ 823059C
+MtChimney_Text_SawyerRematchIntro:
 	.string "I'm happily surrounded by hot people\n"
 	.string "around these parts. I won't lose!$"
 
-MtChimney_Text_SawyerRematchDefeat: @ 82305E3
+MtChimney_Text_SawyerRematchDefeat:
 	.string "Gosh, you're still the same\n"
 	.string "firebrand as before!$"
 
-MtChimney_Text_SawyerPostRematch: @ 8230614
+MtChimney_Text_SawyerPostRematch:
 	.string "Actually, it really is hot here.\n"
 	.string "I'm overdressed for these parts.$"
 
diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
index 5eebdb767..c2e8da486 100644
--- a/data/maps/MtChimney_CableCarStation/scripts.inc
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
@@ -1,25 +1,25 @@
 .set LOCALID_ATTENDANT, 1
 
-MtChimney_CableCarStation_MapScripts:: @ 822ABFA
+MtChimney_CableCarStation_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MtChimney_CableCarStation_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, MtChimney_CableCarStation_OnFrame
 	.byte 0
 
-MtChimney_CableCarStation_OnTransition: @ 822AC05
+MtChimney_CableCarStation_OnTransition:
 	compare VAR_CABLE_CAR_STATION_STATE, 1
 	call_if_eq MtChimney_CableCarStation_EventScript_MoveAttendantAside
 	end
 
-MtChimney_CableCarStation_EventScript_MoveAttendantAside:: @ 822AC11
+MtChimney_CableCarStation_EventScript_MoveAttendantAside::
 	setobjectxyperm LOCALID_ATTENDANT, 5, 4
 	setobjectmovementtype LOCALID_ATTENDANT, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-MtChimney_CableCarStation_OnFrame: @ 822AC1D
+MtChimney_CableCarStation_OnFrame:
 	map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_ExitCableCar
 	.2byte 0
 
-MtChimney_CableCarStation_EventScript_ExitCableCar:: @ 822AC27
+MtChimney_CableCarStation_EventScript_ExitCableCar::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_ExitCableCar
 	applymovement LOCALID_ATTENDANT, MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar
@@ -30,7 +30,7 @@ MtChimney_CableCarStation_EventScript_ExitCableCar:: @ 822AC27
 	releaseall
 	end
 
-MtChimney_CableCarStation_EventScript_Attendant:: @ 822AC4B
+MtChimney_CableCarStation_EventScript_Attendant::
 	lock
 	faceplayer
 	msgbox MtChimney_CableCarStation_Text_CableCarReadyGetOn, MSGBOX_YESNO
@@ -40,7 +40,7 @@ MtChimney_CableCarStation_EventScript_Attendant:: @ 822AC4B
 	goto_if_eq MtChimney_CableCarStation_EventScript_DeclineRide
 	end
 
-MtChimney_CableCarStation_EventScript_RideCableCar:: @ 822AC6C
+MtChimney_CableCarStation_EventScript_RideCableCar::
 	msgbox MtChimney_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_ATTENDANT, MtChimney_CableCarStation_Movement_LeadPlayerToCableCar
@@ -55,46 +55,46 @@ MtChimney_CableCarStation_EventScript_RideCableCar:: @ 822AC6C
 	release
 	end
 
-MtChimney_CableCarStation_EventScript_DeclineRide:: @ 822AC9B
+MtChimney_CableCarStation_EventScript_DeclineRide::
 	msgbox MtChimney_CableCarStation_Text_RideAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-MtChimney_CableCarStation_Movement_LeadPlayerToCableCar: @ 822ACA5
+MtChimney_CableCarStation_Movement_LeadPlayerToCableCar:
 	walk_up
 	walk_up
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar: @ 822ACAA
+MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar:
 	delay_16
 	walk_right
 	walk_down
 	walk_down
 	step_end
 
-MtChimney_CableCarStation_Movement_BoardCableCar: @ 822ACAF
+MtChimney_CableCarStation_Movement_BoardCableCar:
 	walk_up
 	walk_up
 	walk_up
 	delay_16
 	step_end
 
-MtChimney_CableCarStation_Movement_ExitCableCar: @ 822ACB4
+MtChimney_CableCarStation_Movement_ExitCableCar:
 	walk_down
 	walk_down
 	walk_down
 	delay_16
 	step_end
 
-MtChimney_CableCarStation_Text_CableCarReadyGetOn: @ 822ACB9
+MtChimney_CableCarStation_Text_CableCarReadyGetOn:
 	.string "The CABLE CAR is ready to go down.\n"
 	.string "Would you like to be on it?$"
 
-MtChimney_CableCarStation_Text_StepThisWay: @ 822ACF8
+MtChimney_CableCarStation_Text_StepThisWay:
 	.string "Please step this way.$"
 
-MtChimney_CableCarStation_Text_RideAnotherTime: @ 822AD0E
+MtChimney_CableCarStation_Text_RideAnotherTime:
 	.string "Please ride with us another time.$"
 
diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc
index a303cb2c1..1354b2ac1 100644
--- a/data/maps/MtPyre_1F/scripts.inc
+++ b/data/maps/MtPyre_1F/scripts.inc
@@ -1,7 +1,7 @@
-MtPyre_1F_MapScripts:: @ 8230F3E
+MtPyre_1F_MapScripts::
 	.byte 0
 
-MtPyre_1F_EventScript_CleanseTagWoman:: @ 8230F3F
+MtPyre_1F_EventScript_CleanseTagWoman::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_ReceivedCleanseTag
@@ -13,36 +13,36 @@ MtPyre_1F_EventScript_CleanseTagWoman:: @ 8230F3F
 	release
 	end
 
-MtPyre_1F_EventScript_ReceivedCleanseTag:: @ 8230F6E
+MtPyre_1F_EventScript_ReceivedCleanseTag::
 	msgbox MtPyre_1F_Text_ExplainCleanseTag, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_1F_EventScript_PokefanF:: @ 8230F78
+MtPyre_1F_EventScript_PokefanF::
 	msgbox MtPyre_1F_Text_ComeToPayRespects, MSGBOX_NPC
 	end
 
-MtPyre_1F_EventScript_Man:: @ 8230F81
+MtPyre_1F_EventScript_Man::
 	msgbox MtPyre_1F_Text_RestingPlaceOfZigzagoon, MSGBOX_NPC
 	end
 
-MtPyre_1F_Text_TakeThisForYourOwnGood: @ 8230F8A
+MtPyre_1F_Text_TakeThisForYourOwnGood:
 	.string "All sorts of beings wander the slopes\n"
 	.string "of MT. PYRE…\p"
 	.string "There is no telling what may happen.\n"
 	.string "Take this. It's for your own good.$"
 
-MtPyre_1F_Text_ExplainCleanseTag: @ 8231005
+MtPyre_1F_Text_ExplainCleanseTag:
 	.string "Have a POKéMON hold that\n"
 	.string "CLEANSE TAG.\p"
 	.string "It will help ward off wild POKéMON.$"
 
-MtPyre_1F_Text_ComeToPayRespects: @ 823104F
+MtPyre_1F_Text_ComeToPayRespects:
 	.string "Did you come to pay your respect\n"
 	.string "to the spirits of departed POKéMON?\p"
 	.string "You must care for your POKéMON a lot.$"
 
-MtPyre_1F_Text_RestingPlaceOfZigzagoon: @ 82310BA
+MtPyre_1F_Text_RestingPlaceOfZigzagoon:
 	.string "This is the final resting place of my\n"
 	.string "ZIGZAGOON. I cherished it…$"
 
diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc
index 52c1a154c..9fe7bf9d2 100644
--- a/data/maps/MtPyre_2F/scripts.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
@@ -1,91 +1,91 @@
-MtPyre_2F_MapScripts:: @ 82310FB
+MtPyre_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
 	map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_SetHoleWarp
 	.byte 0
 
-MtPyre_2F_SetHoleWarp: @ 823110B
+MtPyre_2F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
 	setholewarp MAP_MT_PYRE_1F, 255, 0, 0
 	end
 
-MtPyre_2F_EventScript_Woman:: @ 8231116
+MtPyre_2F_EventScript_Woman::
 	msgbox MtPyre_2F_Text_MemoriesOfSkitty, MSGBOX_NPC
 	end
 
-MtPyre_2F_EventScript_PokefanM:: @ 823111F
+MtPyre_2F_EventScript_PokefanM::
 	msgbox MtPyre_2F_Text_TumbledFromFloorAbove, MSGBOX_NPC
 	end
 
-MtPyre_2F_EventScript_Mark:: @ 8231128
+MtPyre_2F_EventScript_Mark::
 	trainerbattle_single TRAINER_MARK, MtPyre_2F_Text_MarkIntro, MtPyre_2F_Text_MarkDefeat
 	msgbox MtPyre_2F_Text_MarkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_Luke:: @ 823113F
+MtPyre_2F_EventScript_Luke::
 	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_LukeIntro, MtPyre_2F_Text_LukeDefeat, MtPyre_2F_Text_LukeNotEnoughMons
 	msgbox MtPyre_2F_Text_LukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_Dez:: @ 823115A
+MtPyre_2F_EventScript_Dez::
 	trainerbattle_double TRAINER_DEZ_AND_LUKE, MtPyre_2F_Text_DezIntro, MtPyre_2F_Text_DezDefeat, MtPyre_2F_Text_DezNotEnoughMons
 	msgbox MtPyre_2F_Text_DezPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_Leah:: @ 8231175
+MtPyre_2F_EventScript_Leah::
 	trainerbattle_single TRAINER_LEAH, MtPyre_2F_Text_LeahIntro, MtPyre_2F_Text_LeahDefeat
 	msgbox MtPyre_2F_Text_LeahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_EventScript_Zander:: @ 823118C
+MtPyre_2F_EventScript_Zander::
 	trainerbattle_single TRAINER_ZANDER, MtPyre_2F_Text_ZanderIntro, MtPyre_2F_Text_ZanderDefeat
 	msgbox MtPyre_2F_Text_ZanderPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_2F_Text_MemoriesOfSkitty: @ 82311A3
+MtPyre_2F_Text_MemoriesOfSkitty:
 	.string "Memories of my darling SKITTY…\n"
 	.string "My eyes overflow thinking about it.$"
 
-MtPyre_2F_Text_TumbledFromFloorAbove: @ 82311E6
+MtPyre_2F_Text_TumbledFromFloorAbove:
 	.string "Ooch, ouch… There are holes in the\n"
 	.string "ground here and there.\p"
 	.string "I didn't notice and took a tumble from\n"
 	.string "the floor above.$"
 
-MtPyre_2F_Text_MarkIntro: @ 8231258
+MtPyre_2F_Text_MarkIntro:
 	.string "Hey! Are you searching for POKéMON?\n"
 	.string "You came along after me! You're rude!$"
 
-MtPyre_2F_Text_MarkDefeat: @ 82312A2
+MtPyre_2F_Text_MarkDefeat:
 	.string "Ayieeeeh!\n"
 	.string "I'm sorry, forgive me, please!$"
 
-MtPyre_2F_Text_MarkPostBattle: @ 82312CB
+MtPyre_2F_Text_MarkPostBattle:
 	.string "People don't come here often, so\n"
 	.string "I thought there'd be rare POKéMON.$"
 
-MtPyre_2F_Text_LukeIntro: @ 823130F
+MtPyre_2F_Text_LukeIntro:
 	.string "LUKE: We're here on a dare.\p"
 	.string "Heheh, if I show her how cool I am,\n"
 	.string "she'll fall for me. I know it!\p"
 	.string "I know! I'll cream you and show her\n"
 	.string "how cool I am!$"
 
-MtPyre_2F_Text_LukeDefeat: @ 82313A1
+MtPyre_2F_Text_LukeDefeat:
 	.string "LUKE: Whoopsie!$"
 
-MtPyre_2F_Text_LukePostBattle: @ 82313B1
+MtPyre_2F_Text_LukePostBattle:
 	.string "LUKE: Well, we lost but that's okay!\n"
 	.string "I'm right here by your side.\l"
 	.string "We'll make it through this dare!$"
 
-MtPyre_2F_Text_LukeNotEnoughMons: @ 8231414
+MtPyre_2F_Text_LukeNotEnoughMons:
 	.string "LUKE: If you want to take me on,\n"
 	.string "bring some more POKéMON.\p"
 	.string "If you don't, I won't be able to show\n"
 	.string "off to my girl how cool I am!$"
 
-MtPyre_2F_Text_DezIntro: @ 8231492
+MtPyre_2F_Text_DezIntro:
 	.string "DEZ: I came here on a dare with my\n"
 	.string "boyfriend.\p"
 	.string "It's really scary, but I'm with my\n"
@@ -93,42 +93,42 @@ MtPyre_2F_Text_DezIntro: @ 8231492
 	.string "I know! I'll get my boyfriend to look\n"
 	.string "cool by beating you!$"
 
-MtPyre_2F_Text_DezDefeat: @ 8231534
+MtPyre_2F_Text_DezDefeat:
 	.string "DEZ: Waaaah! I'm scared!$"
 
-MtPyre_2F_Text_DezPostBattle: @ 823154D
+MtPyre_2F_Text_DezPostBattle:
 	.string "DEZ: We're lovey-dovey, so we don't\n"
 	.string "care if we lose!$"
 
-MtPyre_2F_Text_DezNotEnoughMons: @ 8231582
+MtPyre_2F_Text_DezNotEnoughMons:
 	.string "DEZ: If you want to challenge us, you\n"
 	.string "should bring at least two POKéMON.\p"
 	.string "My boyfriend's strong.\n"
 	.string "Just one POKéMON won't do at all.$"
 
-MtPyre_2F_Text_LeahIntro: @ 8231604
+MtPyre_2F_Text_LeahIntro:
 	.string "You are an unfamiliar sight…\n"
 	.string "Depart before anything befalls you!$"
 
-MtPyre_2F_Text_LeahDefeat: @ 8231645
+MtPyre_2F_Text_LeahDefeat:
 	.string "Hmm…\n"
 	.string "You're durable.$"
 
-MtPyre_2F_Text_LeahPostBattle: @ 823165A
+MtPyre_2F_Text_LeahPostBattle:
 	.string "Our family has been TRAINERS here\n"
 	.string "since my great-grandmother's time…\p"
 	.string "It is my duty to protect this\n"
 	.string "mountain…$"
 
-MtPyre_2F_Text_ZanderIntro: @ 82316C7
+MtPyre_2F_Text_ZanderIntro:
 	.string "Kiyaaaaah!\n"
 	.string "I'm terrified!$"
 
-MtPyre_2F_Text_ZanderDefeat: @ 82316E1
+MtPyre_2F_Text_ZanderDefeat:
 	.string "Nooooooo!\n"
 	.string "I lost my wits!$"
 
-MtPyre_2F_Text_ZanderPostBattle: @ 82316FB
+MtPyre_2F_Text_ZanderPostBattle:
 	.string "I get freaked out every time I see\n"
 	.string "anything move…\p"
 	.string "I shouldn't have come here to train…$"
diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc
index 02cea0c22..b91a589bc 100644
--- a/data/maps/MtPyre_3F/scripts.inc
+++ b/data/maps/MtPyre_3F/scripts.inc
@@ -1,17 +1,17 @@
-MtPyre_3F_MapScripts:: @ 8231752
+MtPyre_3F_MapScripts::
 	.byte 0
 
-MtPyre_3F_EventScript_William:: @ 8231753
+MtPyre_3F_EventScript_William::
 	trainerbattle_single TRAINER_WILLIAM, MtPyre_3F_Text_WilliamIntro, MtPyre_3F_Text_WilliamDefeat
 	msgbox MtPyre_3F_Text_WilliamPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_3F_EventScript_Kayla:: @ 823176A
+MtPyre_3F_EventScript_Kayla::
 	trainerbattle_single TRAINER_KAYLA, MtPyre_3F_Text_KaylaIntro MtPyre_3F_Text_KaylaDefeat
 	msgbox MtPyre_3F_Text_KaylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_3F_EventScript_Gabrielle:: @ 8231781
+MtPyre_3F_EventScript_Gabrielle::
 	trainerbattle_single TRAINER_GABRIELLE_1, MtPyre_3F_Text_GabrielleIntro, MtPyre_3F_Text_GabrielleDefeat, MtPyre_3F_EventScript_RegisterGabrielle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -20,7 +20,7 @@ MtPyre_3F_EventScript_Gabrielle:: @ 8231781
 	release
 	end
 
-MtPyre_3F_EventScript_RegisterGabrielle:: @ 82317AD
+MtPyre_3F_EventScript_RegisterGabrielle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox MtPyre_3F_Text_GabrielleRegister, MSGBOX_DEFAULT
@@ -28,47 +28,47 @@ MtPyre_3F_EventScript_RegisterGabrielle:: @ 82317AD
 	release
 	end
 
-MtPyre_3F_EventScript_RematchGabrielle:: @ 82317CC
+MtPyre_3F_EventScript_RematchGabrielle::
 	trainerbattle_rematch TRAINER_GABRIELLE_1, MtPyre_3F_Text_GabrielleRematchIntro, MtPyre_3F_Text_GabrielleRematchDefeat
 	msgbox MtPyre_3F_Text_GabriellePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_3F_Text_WilliamIntro: @ 82317E3
+MtPyre_3F_Text_WilliamIntro:
 	.string "The rich atmosphere of the mountain\n"
 	.string "has elevated my psychic power!\p"
 	.string "A mere child like you…\n"
 	.string "You dream of winning?$"
 
-MtPyre_3F_Text_WilliamDefeat: @ 8231853
+MtPyre_3F_Text_WilliamDefeat:
 	.string "I drown in self-pity…$"
 
-MtPyre_3F_Text_WilliamPostBattle: @ 8231869
+MtPyre_3F_Text_WilliamPostBattle:
 	.string "My psychic powers have surely\n"
 	.string "grown several times, but…$"
 
-MtPyre_3F_Text_KaylaIntro: @ 82318A1
+MtPyre_3F_Text_KaylaIntro:
 	.string "Ahahahaha!\p"
 	.string "This is no place for children, least\n"
 	.string "of all you!$"
 
-MtPyre_3F_Text_KaylaDefeat: @ 82318DD
+MtPyre_3F_Text_KaylaDefeat:
 	.string "I lost that cleanly…$"
 
-MtPyre_3F_Text_KaylaPostBattle: @ 82318F2
+MtPyre_3F_Text_KaylaPostBattle:
 	.string "This means my training is still not\n"
 	.string "enough…\p"
 	.string "I've got to keep working toward the\n"
 	.string "summit…\p"
 	.string "Go, me!$"
 
-MtPyre_3F_Text_GabrielleIntro: @ 8231952
+MtPyre_3F_Text_GabrielleIntro:
 	.string "Why have you come here?$"
 
-MtPyre_3F_Text_GabrielleDefeat: @ 823196A
+MtPyre_3F_Text_GabrielleDefeat:
 	.string "That was amazing!\n"
 	.string "You're a very special TRAINER.$"
 
-MtPyre_3F_Text_GabriellePostBattle: @ 823199B
+MtPyre_3F_Text_GabriellePostBattle:
 	.string "POKéMON no longer of this world.\n"
 	.string "POKéMON that are with you now.\p"
 	.string "And the POKéMON that you will meet\n"
@@ -76,21 +76,21 @@ MtPyre_3F_Text_GabriellePostBattle: @ 823199B
 	.string "They are all to be equally cherished.\n"
 	.string "Please remember that.$"
 
-MtPyre_3F_Text_GabrielleRegister: @ 8231A49
+MtPyre_3F_Text_GabrielleRegister:
 	.string "I would like to see your POKéMON\n"
 	.string "when they grow up some more…\p"
 	.string "Please, I need to see your POKéNAV.$"
 
-MtPyre_3F_Text_GabrielleRematchIntro: @ 8231AAB
+MtPyre_3F_Text_GabrielleRematchIntro:
 	.string "Oh, it's you…\p"
 	.string "Have you come to show me your grown\n"
 	.string "POKéMON?$"
 
-MtPyre_3F_Text_GabrielleRematchDefeat: @ 8231AE6
+MtPyre_3F_Text_GabrielleRematchDefeat:
 	.string "How amazing!\n"
 	.string "You are a special person.$"
 
-MtPyre_3F_Text_GabriellePostRematch: @ 8231B0D
+MtPyre_3F_Text_GabriellePostRematch:
 	.string "POKéMON no longer of this world.\n"
 	.string "POKéMON that are with you now.\p"
 	.string "And the POKéMON that you will meet\n"
diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc
index 683b38607..0127e6856 100644
--- a/data/maps/MtPyre_4F/scripts.inc
+++ b/data/maps/MtPyre_4F/scripts.inc
@@ -1,22 +1,22 @@
-MtPyre_4F_MapScripts:: @ 8231BC8
+MtPyre_4F_MapScripts::
 	.byte 0
 
 @ Seems like the scripts for the 4F and 5F were swapped
 
-MtPyre_5F_EventScript_Atsushi:: @ 8231BC9
+MtPyre_5F_EventScript_Atsushi::
 	trainerbattle_single TRAINER_ATSUSHI, MtPyre_5F_Text_AtsushiIntro, MtPyre_5F_Text_AtsushiDefeat
 	msgbox MtPyre_5F_Text_AtsushiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_5F_Text_AtsushiIntro: @ 8231BE0
+MtPyre_5F_Text_AtsushiIntro:
 	.string "Teacher…\n"
 	.string "Please watch over my progress!$"
 
-MtPyre_5F_Text_AtsushiDefeat: @ 8231C08
+MtPyre_5F_Text_AtsushiDefeat:
 	.string "Teacher…\n"
 	.string "Please forgive me!$"
 
-MtPyre_5F_Text_AtsushiPostBattle: @ 8231C24
+MtPyre_5F_Text_AtsushiPostBattle:
 	.string "Until I improve, my teacher, who rests\n"
 	.string "here, will never find true peace…$"
 
diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc
index f27370d7c..1c8a3fc7d 100644
--- a/data/maps/MtPyre_5F/scripts.inc
+++ b/data/maps/MtPyre_5F/scripts.inc
@@ -1,23 +1,23 @@
-MtPyre_5F_MapScripts:: @ 8231C6D
+MtPyre_5F_MapScripts::
 	.byte 0
 
 @ Seems like the scripts for the 4F and 5F were swapped
 
-MtPyre_4F_EventScript_Tasha:: @ 8231C6E
+MtPyre_4F_EventScript_Tasha::
 	trainerbattle_single TRAINER_TASHA, MtPyre_4F_Text_TashaIntro, MtPyre_4F_Text_TashaDefeat
 	msgbox MtPyre_4F_Text_TashaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_4F_Text_TashaIntro: @ 8231C85
+MtPyre_4F_Text_TashaIntro:
 	.string "I love all things horrifying…\n"
 	.string "It's like a disease…\p"
 	.string "When I'm here…\n"
 	.string "I shiver with fear…$"
 
-MtPyre_4F_Text_TashaDefeat: @ 8231CDB
+MtPyre_4F_Text_TashaDefeat:
 	.string "Losing, I dislike…$"
 
-MtPyre_4F_Text_TashaPostBattle: @ 8231CEE
+MtPyre_4F_Text_TashaPostBattle:
 	.string "I want to see dreadful things…\n"
 	.string "I can't leave…\p"
 	.string "Stay…\n"
diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc
index e3bdd928e..4b7df8e7c 100644
--- a/data/maps/MtPyre_6F/scripts.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
@@ -1,7 +1,7 @@
-MtPyre_6F_MapScripts:: @ 8231D3A
+MtPyre_6F_MapScripts::
 	.byte 0
 
-MtPyre_6F_EventScript_Valerie:: @ 8231D3B
+MtPyre_6F_EventScript_Valerie::
 	trainerbattle_single TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieIntro, MtPyre_6F_Text_ValerieDefeat, MtPyre_6F_EventScript_RegisterValerie
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -10,7 +10,7 @@ MtPyre_6F_EventScript_Valerie:: @ 8231D3B
 	release
 	end
 
-MtPyre_6F_EventScript_RegisterValerie:: @ 8231D67
+MtPyre_6F_EventScript_RegisterValerie::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox MtPyre_6F_Text_ValerieRegister, MSGBOX_DEFAULT
@@ -18,52 +18,52 @@ MtPyre_6F_EventScript_RegisterValerie:: @ 8231D67
 	release
 	end
 
-MtPyre_6F_EventScript_RematchValerie:: @ 8231D86
+MtPyre_6F_EventScript_RematchValerie::
 	trainerbattle_rematch TRAINER_VALERIE_1, MtPyre_6F_Text_ValerieRematchIntro, MtPyre_6F_Text_ValerieRematchDefeat
 	msgbox MtPyre_6F_Text_ValeriePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_6F_EventScript_Cedric:: @ 8231D9D
+MtPyre_6F_EventScript_Cedric::
 	trainerbattle_single TRAINER_CEDRIC, MtPyre_6F_Text_CedricIntro, MtPyre_6F_Text_CedricDefeat
 	msgbox MtPyre_6F_Text_CedricPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_6F_Text_ValerieIntro: @ 8231DB4
+MtPyre_6F_Text_ValerieIntro:
 	.string "When I'm here…\n"
 	.string "A curious power flows into me…$"
 
-MtPyre_6F_Text_ValerieDefeat: @ 8231DE2
+MtPyre_6F_Text_ValerieDefeat:
 	.string "The power is ebbing away…$"
 
-MtPyre_6F_Text_ValeriePostBattle: @ 8231DFC
+MtPyre_6F_Text_ValeriePostBattle:
 	.string "Perhaps the power is from the spirits\n"
 	.string "of POKéMON in fitful sleep here…$"
 
-MtPyre_6F_Text_ValerieRegister: @ 8231E43
+MtPyre_6F_Text_ValerieRegister:
 	.string "Fufufu… I lost the match, but…\n"
 	.string "I have this little ability…\p"
 	.string "Without ever laying my hands on\n"
 	.string "your POKéNAV… Hiyah!$"
 
-MtPyre_6F_Text_ValerieRematchIntro: @ 8231EB3
+MtPyre_6F_Text_ValerieRematchIntro:
 	.string "Behind you…\n"
 	.string "What is it…$"
 
-MtPyre_6F_Text_ValerieRematchDefeat: @ 8231ECB
+MtPyre_6F_Text_ValerieRematchDefeat:
 	.string "Something faded away…$"
 
-MtPyre_6F_Text_ValeriePostRematch: @ 8231EE1
+MtPyre_6F_Text_ValeriePostRematch:
 	.string "The POKéMON at rest here…\n"
 	.string "Sometimes, they play…$"
 
-MtPyre_6F_Text_CedricIntro: @ 8231F11
+MtPyre_6F_Text_CedricIntro:
 	.string "Have you lost your bearings?\n"
 	.string "Have no fear for I am here!$"
 
-MtPyre_6F_Text_CedricDefeat: @ 8231F4A
+MtPyre_6F_Text_CedricDefeat:
 	.string "Weren't you lost?$"
 
-MtPyre_6F_Text_CedricPostBattle: @ 8231F5C
+MtPyre_6F_Text_CedricPostBattle:
 	.string "I had this feeling that a lost TRAINER\n"
 	.string "would be panicked and easy to beat.\p"
 	.string "It's dirty and I won't try it again…$"
diff --git a/data/maps/MtPyre_Exterior/scripts.inc b/data/maps/MtPyre_Exterior/scripts.inc
index 56a990266..01279d645 100644
--- a/data/maps/MtPyre_Exterior/scripts.inc
+++ b/data/maps/MtPyre_Exterior/scripts.inc
@@ -1,27 +1,27 @@
-MtPyre_Exterior_MapScripts:: @ 8231FCC
+MtPyre_Exterior_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Exterior_OnTransition
 	.byte 0
 
-MtPyre_Exterior_OnTransition: @ 8231FD2
+MtPyre_Exterior_OnTransition:
 	call MtPyre_Exterior_EventScript_CheckEnterFromSummit
 	end
 
-MtPyre_Exterior_EventScript_CheckEnterFromSummit:: @ 8231FD8
+MtPyre_Exterior_EventScript_CheckEnterFromSummit::
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 12
 	goto_if_lt MtPyre_Exterior_EventScript_EnterFromSummit
 	return
 
-MtPyre_Exterior_EventScript_EnterFromSummit:: @ 8231FE9
+MtPyre_Exterior_EventScript_EnterFromSummit::
 	setweather WEATHER_FOG_HORIZONTAL
 	return
 
-MtPyre_Exterior_EventScript_FogTrigger:: @ 8231FED
+MtPyre_Exterior_EventScript_FogTrigger::
 	setweather WEATHER_FOG_HORIZONTAL
 	doweather
 	end
 
-MtPyre_Exterior_EventScript_SunTrigger:: @ 8231FF2
+MtPyre_Exterior_EventScript_SunTrigger::
 	setweather WEATHER_SUNNY
 	doweather
 	end
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
index e899c3471..d55872792 100644
--- a/data/maps/MtPyre_Summit/scripts.inc
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -6,39 +6,39 @@
 .set LOCALID_GRUNT_4, 7
 .set LOCALID_MAXIE, 8
 
-MtPyre_Summit_MapScripts:: @ 8231FF7
+MtPyre_Summit_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_Summit_OnTransition
 	.byte 0
 
-MtPyre_Summit_OnTransition: @ 8231FFD
+MtPyre_Summit_OnTransition:
 	compare VAR_MT_PYRE_STATE, 2
 	call_if_eq MtPyre_Summit_EventScript_SetArchieMaxiePositions
 	end
 
-MtPyre_Summit_EventScript_SetArchieMaxiePositions:: @ 8232009
+MtPyre_Summit_EventScript_SetArchieMaxiePositions::
 	setobjectxyperm LOCALID_MAXIE, 23, 6
 	setobjectxyperm LOCALID_ARCHIE, 22, 6
 	end
 
-MtPyre_Summit_EventScript_TeamAquaTrigger0:: @ 8232018
+MtPyre_Summit_EventScript_TeamAquaTrigger0::
 	lockall
 	setvar VAR_0x8008, 0
 	goto MtPyre_Summit_EventScript_TeamAquaExits
 	end
 
-MtPyre_Summit_EventScript_TeamAquaTrigger1:: @ 8232024
+MtPyre_Summit_EventScript_TeamAquaTrigger1::
 	lockall
 	setvar VAR_0x8008, 1
 	goto MtPyre_Summit_EventScript_TeamAquaExits
 	end
 
-MtPyre_Summit_EventScript_TeamAquaTrigger2:: @ 8232030
+MtPyre_Summit_EventScript_TeamAquaTrigger2::
 	lockall
 	setvar VAR_0x8008, 2
 	goto MtPyre_Summit_EventScript_TeamAquaExits
 	end
 
-MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C
+MtPyre_Summit_EventScript_TeamAquaExits::
 	playbgm MUS_ENCOUNTER_AQUA, FALSE
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
@@ -78,66 +78,66 @@ MtPyre_Summit_EventScript_TeamAquaExits:: @ 823203C
 	releaseall
 	end
 
-MtPyre_Summit_EventScript_ArchieFacePlayer0:: @ 82320E0
+MtPyre_Summit_EventScript_ArchieFacePlayer0::
 	applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieFacePlayer0
 	waitmovement 0
 	return
 
 @ Archie is already facing player
-MtPyre_Summit_EventScript_ArchieFacePlayer1:: @ 82320EB
+MtPyre_Summit_EventScript_ArchieFacePlayer1::
 	return
 
-MtPyre_Summit_EventScript_ArchieFacePlayer2:: @ 82320EC
+MtPyre_Summit_EventScript_ArchieFacePlayer2::
 	applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieFacePlayer2
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_OldLadyApproachPlayer0:: @ 82320F7
+MtPyre_Summit_EventScript_OldLadyApproachPlayer0::
 	applymovement LOCALID_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer0
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_OldLadyApproachPlayer1:: @ 823210C
+MtPyre_Summit_EventScript_OldLadyApproachPlayer1::
 	applymovement LOCALID_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer1
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_OldLadyApproachPlayer2:: @ 8232117
+MtPyre_Summit_EventScript_OldLadyApproachPlayer2::
 	applymovement LOCALID_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer2
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-MtPyre_Summit_Movement_OldLadyApproachPlayer0: @ 823212C
+MtPyre_Summit_Movement_OldLadyApproachPlayer0:
 	walk_down
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_Movement_OldLadyApproachPlayer1: @ 8232130
+MtPyre_Summit_Movement_OldLadyApproachPlayer1:
 	walk_down
 	step_end
 
-MtPyre_Summit_Movement_OldLadyApproachPlayer2: @ 8232132
+MtPyre_Summit_Movement_OldLadyApproachPlayer2:
 	walk_down
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-MtPyre_Summit_Movement_ArchieFacePlayer0: @ 8232136
+MtPyre_Summit_Movement_ArchieFacePlayer0:
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_Movement_ArchieFacePlayer2: @ 8232139
+MtPyre_Summit_Movement_ArchieFacePlayer2:
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_EventScript_OldMan:: @ 823213C
+MtPyre_Summit_EventScript_OldMan::
 	lock
 	faceplayer
 	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, MtPyre_Summit_EventScript_OldManAfterRayquaza
@@ -149,7 +149,7 @@ MtPyre_Summit_EventScript_OldMan:: @ 823213C
 	release
 	end
 
-MtPyre_Summit_EventScript_OldManAfterRayquaza:: @ 8232167
+MtPyre_Summit_EventScript_OldManAfterRayquaza::
 	msgbox MtPyre_Summit_Text_HearTheNewLegendOfHoenn, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	call_if_eq MtPyre_Summit_EventScript_OldManNewTale
@@ -158,19 +158,19 @@ MtPyre_Summit_EventScript_OldManAfterRayquaza:: @ 8232167
 	release
 	end
 
-MtPyre_Summit_EventScript_OldManTale:: @ 8232187
+MtPyre_Summit_EventScript_OldManTale::
 	msgbox MtPyre_Summit_Text_GroudonKyogreTale, MSGBOX_DEFAULT
 	return
 
-MtPyre_Summit_EventScript_DeclineOldManTale:: @ 8232190
+MtPyre_Summit_EventScript_DeclineOldManTale::
 	msgbox MtPyre_Summit_Text_WellThatTooIsFine, MSGBOX_DEFAULT
 	return
 
-MtPyre_Summit_EventScript_OldManNewTale:: @ 8232199
+MtPyre_Summit_EventScript_OldManNewTale::
 	msgbox MtPyre_Summit_Text_HoennTrioTale, MSGBOX_DEFAULT
 	return
 
-MtPyre_Summit_EventScript_OldLady:: @ 82321A2
+MtPyre_Summit_EventScript_OldLady::
 	lock
 	faceplayer
 	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_OldLadyAfterOrbsReturned
@@ -181,41 +181,41 @@ MtPyre_Summit_EventScript_OldLady:: @ 82321A2
 	release
 	end
 
-MtPyre_Summit_EventScript_OldLadyOrbsReturned:: @ 82321CB
+MtPyre_Summit_EventScript_OldLadyOrbsReturned::
 	msgbox MtPyre_Summit_Text_ThoseTwoMenReturnedOrbs, MSGBOX_DEFAULT
 	setflag FLAG_RETURNED_RED_OR_BLUE_ORB
 	release
 	end
 
-MtPyre_Summit_EventScript_OldLadyLegendariesAwake:: @ 82321D8
+MtPyre_Summit_EventScript_OldLadyLegendariesAwake::
 	msgbox MtPyre_Summit_Text_GroudonKyogreAwakened, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_Summit_EventScript_OldLadyAfterOrbsReturned:: @ 82321E2
+MtPyre_Summit_EventScript_OldLadyAfterOrbsReturned::
 	msgbox MtPyre_Summit_Text_SuperAncientPokemonTaughtUs, MSGBOX_DEFAULT
 	release
 	end
 
-MtPyre_Summit_EventScript_ArchieMaxieTrigger0:: @ 82321EC
+MtPyre_Summit_EventScript_ArchieMaxieTrigger0::
 	lockall
 	setvar VAR_0x8008, 0
 	goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs
 	end
 
-MtPyre_Summit_EventScript_ArchieMaxieTrigger1:: @ 82321F8
+MtPyre_Summit_EventScript_ArchieMaxieTrigger1::
 	lockall
 	setvar VAR_0x8008, 1
 	goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs
 	end
 
-MtPyre_Summit_EventScript_ArchieMaxieTrigger2:: @ 8232204
+MtPyre_Summit_EventScript_ArchieMaxieTrigger2::
 	lockall
 	setvar VAR_0x8008, 2
 	goto MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs
 	end
 
-MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: @ 8232210
+MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 60
@@ -255,49 +255,49 @@ MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: @ 8232210
 	releaseall
 	end
 
-MtPyre_Summit_EventScript_ArchieMaxieBeginExit0:: @ 82322C4
+MtPyre_Summit_EventScript_ArchieMaxieBeginExit0::
 	applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0
 	applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieExit
 	applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieExit
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_ArchieMaxieBeginExit1:: @ 82322DD
+MtPyre_Summit_EventScript_ArchieMaxieBeginExit1::
 	applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1
 	applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieExit
 	applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieExit
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_ArchieMaxieBeginExit2:: @ 82322F6
+MtPyre_Summit_EventScript_ArchieMaxieBeginExit2::
 	applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2
 	applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieExit
 	applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieExit
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_MaxieApproachPlayer0:: @ 823230F
+MtPyre_Summit_EventScript_MaxieApproachPlayer0::
 	applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie0
 	applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieWatchMaxie
 	applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachPlayer0
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_MaxieApproachPlayer1:: @ 8232328
+MtPyre_Summit_EventScript_MaxieApproachPlayer1::
 	applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie
 	applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieWatchMaxie
 	applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachPlayer1
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_MaxieApproachPlayer2:: @ 8232341
+MtPyre_Summit_EventScript_MaxieApproachPlayer2::
 	applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerFaceMaxie
 	applymovement LOCALID_ARCHIE, MtPyre_Summit_Movement_ArchieWatchMaxie
 	applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachPlayer2
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_MaxieApproachArchie0:: @ 823235A
+MtPyre_Summit_EventScript_MaxieApproachArchie0::
 	applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie
 	applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie0
 	waitmovement 0
@@ -305,7 +305,7 @@ MtPyre_Summit_EventScript_MaxieApproachArchie0:: @ 823235A
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_MaxieApproachArchie1:: @ 8232376
+MtPyre_Summit_EventScript_MaxieApproachArchie1::
 	applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie
 	applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie1
 	waitmovement 0
@@ -313,7 +313,7 @@ MtPyre_Summit_EventScript_MaxieApproachArchie1:: @ 8232376
 	waitmovement 0
 	return
 
-MtPyre_Summit_EventScript_MaxieApproachArchie2:: @ 8232392
+MtPyre_Summit_EventScript_MaxieApproachArchie2::
 	applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie
 	applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie2
 	waitmovement 0
@@ -321,19 +321,19 @@ MtPyre_Summit_EventScript_MaxieApproachArchie2:: @ 8232392
 	waitmovement 0
 	return
 
-MtPyre_Summit_Movement_PlayerFaceMaxie0: @ 82323AE
+MtPyre_Summit_Movement_PlayerFaceMaxie0:
 	delay_16
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-MtPyre_Summit_Movement_PlayerFaceMaxie: @ 82323B2
+MtPyre_Summit_Movement_PlayerFaceMaxie:
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_Movement_ArchieExit: @ 82323B6
+MtPyre_Summit_Movement_ArchieExit:
 	walk_down
 	walk_down
 	walk_down
@@ -342,7 +342,7 @@ MtPyre_Summit_Movement_ArchieExit: @ 82323B6
 	walk_down
 	step_end
 
-MtPyre_Summit_Movement_MaxieExit: @ 82323BD
+MtPyre_Summit_Movement_MaxieExit:
 	walk_down
 	walk_down
 	walk_down
@@ -351,7 +351,7 @@ MtPyre_Summit_Movement_MaxieExit: @ 82323BD
 	walk_down
 	step_end
 
-MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0: @ 82323C4
+MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0:
 	delay_16
 	delay_8
 	walk_left
@@ -360,7 +360,7 @@ MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0: @ 82323C4
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1: @ 82323CB
+MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1:
 	delay_16
 	delay_8
 	walk_right
@@ -369,7 +369,7 @@ MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1: @ 82323CB
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2: @ 82323D2
+MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2:
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
@@ -377,38 +377,38 @@ MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2: @ 82323D2
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_Movement_MaxieApproachPlayer0: @ 82323D8
+MtPyre_Summit_Movement_MaxieApproachPlayer0:
 	walk_up
 	walk_up
 	walk_up
 	walk_left
 	step_end
 
-MtPyre_Summit_Movement_MaxieApproachPlayer1: @ 82323DD
+MtPyre_Summit_Movement_MaxieApproachPlayer1:
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-MtPyre_Summit_Movement_MaxieApproachPlayer2: @ 82323E2
+MtPyre_Summit_Movement_MaxieApproachPlayer2:
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-MtPyre_Summit_Movement_ArchieWatchMaxie: @ 82323E7
+MtPyre_Summit_Movement_ArchieWatchMaxie:
 	delay_16
 	walk_in_place_fastest_up
 	step_end
 
-MtPyre_Summit_Movement_PlayerWatchMaxie: @ 82323EA
+MtPyre_Summit_Movement_PlayerWatchMaxie:
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-MtPyre_Summit_Movement_MaxieApproachArchie0: @ 82323ED
+MtPyre_Summit_Movement_MaxieApproachArchie0:
 	walk_down
 	walk_right
 	walk_down
@@ -416,54 +416,54 @@ MtPyre_Summit_Movement_MaxieApproachArchie0: @ 82323ED
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_Movement_MaxieApproachArchie1: @ 82323F3
+MtPyre_Summit_Movement_MaxieApproachArchie1:
 	walk_down
 	walk_down
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_Movement_MaxieApproachArchie2: @ 82323F8
+MtPyre_Summit_Movement_MaxieApproachArchie2:
 	walk_down
 	walk_down
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-MtPyre_Summit_EventScript_Grunt1:: @ 82323FD
+MtPyre_Summit_EventScript_Grunt1::
 	trainerbattle_single TRAINER_GRUNT_MT_PYRE_1, MtPyre_Summit_Text_Grunt1Intro, MtPyre_Summit_Text_Grunt1Defeat
 	msgbox MtPyre_Summit_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_EventScript_Grunt2:: @ 8232414
+MtPyre_Summit_EventScript_Grunt2::
 	trainerbattle_single TRAINER_GRUNT_MT_PYRE_2, MtPyre_Summit_Text_Grunt2Intro, MtPyre_Summit_Text_Grunt2Defeat
 	msgbox MtPyre_Summit_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_EventScript_Grunt3:: @ 823242B
+MtPyre_Summit_EventScript_Grunt3::
 	trainerbattle_single TRAINER_GRUNT_MT_PYRE_3, MtPyre_Summit_Text_Grunt3Intro, MtPyre_Summit_Text_Grunt3Defeat
 	msgbox MtPyre_Summit_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_EventScript_Grunt4:: @ 8232442
+MtPyre_Summit_EventScript_Grunt4::
 	trainerbattle_single TRAINER_GRUNT_MT_PYRE_4, MtPyre_Summit_Text_Grunt4Intro, MtPyre_Summit_Text_Grunt4Defeat
 	msgbox MtPyre_Summit_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-MtPyre_Summit_Text_Grunt1Intro: @ 8232459
+MtPyre_Summit_Text_Grunt1Intro:
 	.string "No! Those TEAM MAGMA goons got\n"
 	.string "here ahead of us!\p"
 	.string "We can't fall behind!$"
 
-MtPyre_Summit_Text_Grunt1Defeat: @ 82324A0
+MtPyre_Summit_Text_Grunt1Defeat:
 	.string "I thought you were one of the MAGMAS\n"
 	.string "who happened to come back…$"
 
-MtPyre_Summit_Text_Grunt1PostBattle: @ 82324E0
+MtPyre_Summit_Text_Grunt1PostBattle:
 	.string "Yeah, so you are strong…\n"
 	.string "But there're a lot of us!$"
 
-MtPyre_Summit_Text_Grunt2Intro: @ 8232513
+MtPyre_Summit_Text_Grunt2Intro:
 	.string "Hah!\n"
 	.string "Too bad for you!\p"
 	.string "If you came earlier, you only would've\n"
@@ -471,46 +471,46 @@ MtPyre_Summit_Text_Grunt2Intro: @ 8232513
 	.string "But since you arrived now, you have\n"
 	.string "to take on us toughies!$"
 
-MtPyre_Summit_Text_Grunt2Defeat: @ 82325B0
+MtPyre_Summit_Text_Grunt2Defeat:
 	.string "Urgh… I should've let you take on\n"
 	.string "TEAM MAGMA first…$"
 
-MtPyre_Summit_Text_Grunt2PostBattle: @ 82325E4
+MtPyre_Summit_Text_Grunt2PostBattle:
 	.string "You don't know anything!\n"
 	.string "So why are you messing with us?$"
 
-MtPyre_Summit_Text_Grunt3Intro: @ 823261D
+MtPyre_Summit_Text_Grunt3Intro:
 	.string "You…\n"
 	.string "We saw you at MT. CHIMNEY.\p"
 	.string "You don't belong to either TEAM,\n"
 	.string "so why would you be here?$"
 
-MtPyre_Summit_Text_Grunt3Defeat: @ 8232678
+MtPyre_Summit_Text_Grunt3Defeat:
 	.string "If you're going to mess with anyone,\n"
 	.string "let it be TEAM MAGMA…$"
 
-MtPyre_Summit_Text_Grunt3PostBattle: @ 82326B3
+MtPyre_Summit_Text_Grunt3PostBattle:
 	.string "Heh, it doesn't matter!\n"
 	.string "We bought ourselves some time!\p"
 	.string "The BOSS should have snatched what\n"
 	.string "he was after!$"
 
-MtPyre_Summit_Text_Grunt4Intro: @ 823271B
+MtPyre_Summit_Text_Grunt4Intro:
 	.string "Oh, I know!\n"
 	.string "You tried to join TEAM MAGMA,\l"
 	.string "but they wouldn't have you!\p"
 	.string "Well, don't think that we'll let you\n"
 	.string "join our TEAM AQUA!$"
 
-MtPyre_Summit_Text_Grunt4Defeat: @ 823279A
+MtPyre_Summit_Text_Grunt4Defeat:
 	.string "If you want to join TEAM AQUA that\n"
 	.string "badly, we can consider it…$"
 
-MtPyre_Summit_Text_Grunt4PostBattle: @ 82327D8
+MtPyre_Summit_Text_Grunt4PostBattle:
 	.string "We have a great combination going\n"
 	.string "with us members and our leader.$"
 
-MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo: @ 823281A
+MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo:
 	.string "ARCHIE: TEAM MAGMA's MAXIE got ahead\n"
 	.string "of us, but we also got what we wanted.\p"
 	.string "The RED ORB preserved at MT. PYRE…\n"
@@ -520,7 +520,7 @@ MtPyre_Summit_Text_ArchieWeGotTheOrbLetsGo: @ 823281A
 	.string "Okay, TEAM!\n"
 	.string "We're pulling out!$"
 
-MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis: @ 823290E
+MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis:
 	.string "Oh, no…\n"
 	.string "This cannot happen…\p"
 	.string "Not only the BLUE ORB, but even\n"
@@ -540,13 +540,13 @@ MtPyre_Summit_Text_BothOrbsTakenMagmaLeftThis: @ 823290E
 	.string "I would like you to have it.\n"
 	.string "Perhaps it will be useful in some way.$"
 
-MtPyre_Summit_Text_OrbsHaveBeenTaken: @ 8232AD8
+MtPyre_Summit_Text_OrbsHaveBeenTaken:
 	.string "The BLUE ORB and RED ORB taken by\n"
 	.string "those sinister men…\p"
 	.string "They must never be apart…\n"
 	.string "I fear something terrible will happen…$"
 
-MtPyre_Summit_Text_GroudonKyogreAwakened: @ 8232B4F
+MtPyre_Summit_Text_GroudonKyogreAwakened:
 	.string "Oh, my goodness…\p"
 	.string "You say that both GROUDON and KYOGRE\n"
 	.string "have been awakened?\p"
@@ -560,13 +560,13 @@ MtPyre_Summit_Text_GroudonKyogreAwakened: @ 8232B4F
 	.string "It could be a human, or perhaps\n"
 	.string "a POKéMON, but no one knows.$"
 
-MtPyre_Summit_Text_ThoseTwoMenReturnedOrbs: @ 8232CA6
+MtPyre_Summit_Text_ThoseTwoMenReturnedOrbs:
 	.string "The two men who took the ORBS came\n"
 	.string "back to return them on their own.\p"
 	.string "Those men…\n"
 	.string "Perhaps they are not so evil after all…$"
 
-MtPyre_Summit_Text_SuperAncientPokemonTaughtUs: @ 8232D1E
+MtPyre_Summit_Text_SuperAncientPokemonTaughtUs:
 	.string "The embodiments of the land, sea,\n"
 	.string "and the sky…\p"
 	.string "That is said to be the identities of\n"
@@ -577,7 +577,7 @@ MtPyre_Summit_Text_SuperAncientPokemonTaughtUs: @ 8232D1E
 	.string "The super-ancient POKéMON have\n"
 	.string "taught us that…$"
 
-MtPyre_Summit_Text_WillYouHearOutMyTale: @ 8232E0C
+MtPyre_Summit_Text_WillYouHearOutMyTale:
 	.string "MT. PYRE is where we calm the spirits\n"
 	.string "of POKéMON that have passed on…\p"
 	.string "This is a high place where one can\n"
@@ -588,7 +588,7 @@ MtPyre_Summit_Text_WillYouHearOutMyTale: @ 8232E0C
 	.string "Will you hear out my tale? A tale long\n"
 	.string "told in the HOENN region?$"
 
-MtPyre_Summit_Text_GroudonKyogreTale: @ 8232F27
+MtPyre_Summit_Text_GroudonKyogreTale:
 	.string "It happened long, long ago…\p"
 	.string "The world was wracked by a ferocious\n"
 	.string "clash between the POKéMON of the land\l"
@@ -608,16 +608,16 @@ MtPyre_Summit_Text_GroudonKyogreTale: @ 8232F27
 	.string "the sea where eventually they\l"
 	.string "disappeared…$"
 
-MtPyre_Summit_Text_WellThatTooIsFine: @ 8233162
+MtPyre_Summit_Text_WellThatTooIsFine:
 	.string "I see…\n"
 	.string "Well, that, too, is fine…$"
 
-MtPyre_Summit_Text_MaxieSilence: @ 8233183
+MtPyre_Summit_Text_MaxieSilence:
 	.string "MAXIE: {PLAYER}…\p"
 	.string "… … … … … …\n"
 	.string "… … … … … …$"
 
-MtPyre_Summit_Text_HearTheNewLegendOfHoenn: @ 82331A6
+MtPyre_Summit_Text_HearTheNewLegendOfHoenn:
 	.string "It is my role to pass on the legends\n"
 	.string "of HOENN to future generations.\p"
 	.string "And the crisis that just ended in\n"
@@ -625,7 +625,7 @@ MtPyre_Summit_Text_HearTheNewLegendOfHoenn: @ 82331A6
 	.string "Have you the time to hear the new\n"
 	.string "legend of HOENN?$"
 
-MtPyre_Summit_Text_HoennTrioTale: @ 823325D
+MtPyre_Summit_Text_HoennTrioTale:
 	.string "It happened long, long ago…\p"
 	.string "The world was wracked by a ferocious\n"
 	.string "clash between the POKéMON of the land\l"
diff --git a/data/maps/NavelRock_B1F/scripts.inc b/data/maps/NavelRock_B1F/scripts.inc
index a8906f24d..17e9c442e 100644
--- a/data/maps/NavelRock_B1F/scripts.inc
+++ b/data/maps/NavelRock_B1F/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_B1F_MapScripts:: @ 826910D
+NavelRock_B1F_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc
index 766c818d2..da9e06cff 100644
--- a/data/maps/NavelRock_Bottom/scripts.inc
+++ b/data/maps/NavelRock_Bottom/scripts.inc
@@ -1,36 +1,36 @@
 .set LOCALID_LUGIA, 1
 
-NavelRock_Bottom_MapScripts:: @ 8269255
+NavelRock_Bottom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Bottom_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, NavelRock_Bottom_OnResume
 	.byte 0
 
-NavelRock_Bottom_OnTransition: @ 8269260
+NavelRock_Bottom_OnTransition:
 	call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_HideLugia
 	call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_TryShowLugia
 	end
 
-NavelRock_Bottom_EventScript_HideLugia:: @ 8269273
+NavelRock_Bottom_EventScript_HideLugia::
 	setflag FLAG_HIDE_LUGIA
 	return
 
-NavelRock_Bottom_EventScript_TryShowLugia:: @ 8269277
+NavelRock_Bottom_EventScript_TryShowLugia::
 	goto_if_set FLAG_DEFEATED_LUGIA, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_LUGIA
 	return
 
-NavelRock_Bottom_OnResume: @ 8269284
+NavelRock_Bottom_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Bottom_EventScript_TryRemoveLugia
 	end
 
-NavelRock_Bottom_EventScript_TryRemoveLugia:: @ 826928E
+NavelRock_Bottom_EventScript_TryRemoveLugia::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject LOCALID_LUGIA
 	return
 
-NavelRock_Bottom_EventScript_Lugia:: @ 82692A2
+NavelRock_Bottom_EventScript_Lugia::
 	lock
 	faceplayer
 	waitse
@@ -73,13 +73,13 @@ NavelRock_Bottom_EventScript_Lugia:: @ 82692A2
 	release
 	end
 
-NavelRock_Bottom_EventScript_DefeatedLugia:: @ 8269336
+NavelRock_Bottom_EventScript_DefeatedLugia::
 	setflag FLAG_DEFEATED_LUGIA
 	setvar VAR_0x8004, SPECIES_LUGIA
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-NavelRock_Bottom_EventScript_RanFromLugia:: @ 8269344
+NavelRock_Bottom_EventScript_RanFromLugia::
 	setvar VAR_0x8004, SPECIES_LUGIA
 	goto Common_EventScript_LegendaryFlewAway
 	end
diff --git a/data/maps/NavelRock_Down01/scripts.inc b/data/maps/NavelRock_Down01/scripts.inc
index 9677167eb..b3dd63931 100644
--- a/data/maps/NavelRock_Down01/scripts.inc
+++ b/data/maps/NavelRock_Down01/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down01_MapScripts:: @ 826924A
+NavelRock_Down01_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Down02/scripts.inc b/data/maps/NavelRock_Down02/scripts.inc
index 946530a4a..2cca3e3eb 100644
--- a/data/maps/NavelRock_Down02/scripts.inc
+++ b/data/maps/NavelRock_Down02/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down02_MapScripts:: @ 826924B
+NavelRock_Down02_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Down03/scripts.inc b/data/maps/NavelRock_Down03/scripts.inc
index 2a2a702c1..0d0feaf4f 100644
--- a/data/maps/NavelRock_Down03/scripts.inc
+++ b/data/maps/NavelRock_Down03/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down03_MapScripts:: @ 826924C
+NavelRock_Down03_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Down04/scripts.inc b/data/maps/NavelRock_Down04/scripts.inc
index acf5aa456..6ac0cfd01 100644
--- a/data/maps/NavelRock_Down04/scripts.inc
+++ b/data/maps/NavelRock_Down04/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down04_MapScripts:: @ 826924D
+NavelRock_Down04_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Down05/scripts.inc b/data/maps/NavelRock_Down05/scripts.inc
index 22a0c2059..0fcc279b8 100644
--- a/data/maps/NavelRock_Down05/scripts.inc
+++ b/data/maps/NavelRock_Down05/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down05_MapScripts:: @ 826924E
+NavelRock_Down05_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Down06/scripts.inc b/data/maps/NavelRock_Down06/scripts.inc
index 9acfe1e6a..7669b7714 100644
--- a/data/maps/NavelRock_Down06/scripts.inc
+++ b/data/maps/NavelRock_Down06/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down06_MapScripts:: @ 826924F
+NavelRock_Down06_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Down07/scripts.inc b/data/maps/NavelRock_Down07/scripts.inc
index 6c08fcc85..0a4dc3f35 100644
--- a/data/maps/NavelRock_Down07/scripts.inc
+++ b/data/maps/NavelRock_Down07/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down07_MapScripts:: @ 8269250
+NavelRock_Down07_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Down08/scripts.inc b/data/maps/NavelRock_Down08/scripts.inc
index 5a40a72a5..329c73d91 100644
--- a/data/maps/NavelRock_Down08/scripts.inc
+++ b/data/maps/NavelRock_Down08/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down08_MapScripts:: @ 8269251
+NavelRock_Down08_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Down09/scripts.inc b/data/maps/NavelRock_Down09/scripts.inc
index 80bbbc0e5..172d6c975 100644
--- a/data/maps/NavelRock_Down09/scripts.inc
+++ b/data/maps/NavelRock_Down09/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down09_MapScripts:: @ 8269252
+NavelRock_Down09_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Down10/scripts.inc b/data/maps/NavelRock_Down10/scripts.inc
index 2b27edeb5..849ad2cfd 100644
--- a/data/maps/NavelRock_Down10/scripts.inc
+++ b/data/maps/NavelRock_Down10/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down10_MapScripts:: @ 8269253
+NavelRock_Down10_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Down11/scripts.inc b/data/maps/NavelRock_Down11/scripts.inc
index 91c6fa36a..a45962fc1 100644
--- a/data/maps/NavelRock_Down11/scripts.inc
+++ b/data/maps/NavelRock_Down11/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Down11_MapScripts:: @ 8269254
+NavelRock_Down11_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Entrance/scripts.inc b/data/maps/NavelRock_Entrance/scripts.inc
index 9c25f5054..419ec493c 100644
--- a/data/maps/NavelRock_Entrance/scripts.inc
+++ b/data/maps/NavelRock_Entrance/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Entrance_MapScripts:: @ 826910C
+NavelRock_Entrance_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc
index 827408068..37b69616c 100644
--- a/data/maps/NavelRock_Exterior/scripts.inc
+++ b/data/maps/NavelRock_Exterior/scripts.inc
@@ -1,8 +1,8 @@
-NavelRock_Exterior_MapScripts:: @ 82690B2
+NavelRock_Exterior_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Exterior_OnTransition
 	.byte 0
 
-NavelRock_Exterior_OnTransition: @ 82690B8
+NavelRock_Exterior_OnTransition:
 	setflag FLAG_ARRIVED_AT_NAVEL_ROCK
 	end
 
diff --git a/data/maps/NavelRock_Fork/scripts.inc b/data/maps/NavelRock_Fork/scripts.inc
index 4269feeac..d83cba849 100644
--- a/data/maps/NavelRock_Fork/scripts.inc
+++ b/data/maps/NavelRock_Fork/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Fork_MapScripts:: @ 826910E
+NavelRock_Fork_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Harbor/scripts.inc b/data/maps/NavelRock_Harbor/scripts.inc
index 7c0cbed6a..586085cbf 100644
--- a/data/maps/NavelRock_Harbor/scripts.inc
+++ b/data/maps/NavelRock_Harbor/scripts.inc
@@ -1,10 +1,10 @@
 .set LOCALID_SAILOR, 1
 .set LOCALID_SS_TIDAL, 2
 
-NavelRock_Harbor_MapScripts:: @ 82690BC
+NavelRock_Harbor_MapScripts::
 	.byte 0
 
-NavelRock_Harbor_EventScript_Sailor:: @ 82690BD
+NavelRock_Harbor_EventScript_Sailor::
 	lock
 	faceplayer
 	msgbox NavelRock_Harbor_Text_SailorReturn, MSGBOX_YESNO
@@ -23,7 +23,7 @@ NavelRock_Harbor_EventScript_Sailor:: @ 82690BD
 	release
 	end
 
-NavelRock_Harbor_EventScript_AsYouLike:: @ 8269102
+NavelRock_Harbor_EventScript_AsYouLike::
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc
index b24aed23b..4355699ee 100644
--- a/data/maps/NavelRock_Top/scripts.inc
+++ b/data/maps/NavelRock_Top/scripts.inc
@@ -1,39 +1,39 @@
 .set LOCALID_HO_OH, 1
 
-NavelRock_Top_MapScripts:: @ 8269113
+NavelRock_Top_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, NavelRock_Top_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, NavelRock_Top_OnResume
 	.byte 0
 
-NavelRock_Top_OnTransition: @ 826911E
+NavelRock_Top_OnTransition:
 	call_if_set FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_HideHoOh
 	call_if_unset FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_TryShowHoOh
 	end
 
-NavelRock_Top_EventScript_HideHoOh:: @ 8269131
+NavelRock_Top_EventScript_HideHoOh::
 	setvar VAR_TEMP_1, 1
 	setflag FLAG_HIDE_HO_OH
 	return
 
-NavelRock_Top_EventScript_TryShowHoOh:: @ 826913A
+NavelRock_Top_EventScript_TryShowHoOh::
 	setvar VAR_TEMP_1, 1
 	goto_if_set FLAG_DEFEATED_HO_OH, Common_EventScript_NopReturn
 	setvar VAR_TEMP_1, 0
 	clearflag FLAG_HIDE_HO_OH
 	return
 
-NavelRock_Top_OnResume: @ 8269151
+NavelRock_Top_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NavelRock_Top_EventScript_TryRemoveHoOh
 	end
 
-NavelRock_Top_EventScript_TryRemoveHoOh:: @ 826915B
+NavelRock_Top_EventScript_TryRemoveHoOh::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject LOCALID_HO_OH
 	return
 
-NavelRock_Top_EventScript_HoOh:: @ 826916F
+NavelRock_Top_EventScript_HoOh::
 	lockall
 	setvar VAR_TEMP_1, 1
 	special SpawnCameraObject
@@ -78,24 +78,24 @@ NavelRock_Top_EventScript_HoOh:: @ 826916F
 	releaseall
 	end
 
-NavelRock_Top_EventScript_DefeatedHoOh:: @ 8269217
+NavelRock_Top_EventScript_DefeatedHoOh::
 	setflag FLAG_DEFEATED_HO_OH
 	setvar VAR_0x8004, SPECIES_HO_OH
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-NavelRock_Top_EventScript_RanFromHoOh:: @ 8269225
+NavelRock_Top_EventScript_RanFromHoOh::
 	setvar VAR_0x8004, SPECIES_HO_OH
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-NavelRock_Top_Movement_CameraPanUp: @ 8269230
+NavelRock_Top_Movement_CameraPanUp:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-NavelRock_Top_Movement_CameraPanDown: @ 8269234
+NavelRock_Top_Movement_CameraPanDown:
 	delay_16
 	delay_16
 	walk_down
@@ -103,7 +103,7 @@ NavelRock_Top_Movement_CameraPanDown: @ 8269234
 	walk_down
 	step_end
 
-NavelRock_Top_Movement_HoOhApproach: @ 826923A
+NavelRock_Top_Movement_HoOhApproach:
 	walk_down
 	walk_down
 	walk_down
@@ -114,7 +114,7 @@ NavelRock_Top_Movement_HoOhApproach: @ 826923A
 	delay_16
 	step_end
 
-NavelRock_Top_Movement_HoOhAppear: @ 8269243
+NavelRock_Top_Movement_HoOhAppear:
 	delay_16
 	delay_16
 	walk_in_place_down
diff --git a/data/maps/NavelRock_Up1/scripts.inc b/data/maps/NavelRock_Up1/scripts.inc
index c85af5f0c..5c73a3eb8 100644
--- a/data/maps/NavelRock_Up1/scripts.inc
+++ b/data/maps/NavelRock_Up1/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Up1_MapScripts:: @ 826910F
+NavelRock_Up1_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Up2/scripts.inc b/data/maps/NavelRock_Up2/scripts.inc
index 27ae52190..69147ed1a 100644
--- a/data/maps/NavelRock_Up2/scripts.inc
+++ b/data/maps/NavelRock_Up2/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Up2_MapScripts:: @ 8269110
+NavelRock_Up2_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Up3/scripts.inc b/data/maps/NavelRock_Up3/scripts.inc
index a9c3e2a3c..c2cd971de 100644
--- a/data/maps/NavelRock_Up3/scripts.inc
+++ b/data/maps/NavelRock_Up3/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Up3_MapScripts:: @ 8269111
+NavelRock_Up3_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NavelRock_Up4/scripts.inc b/data/maps/NavelRock_Up4/scripts.inc
index c6beead6d..a3c1fa72d 100644
--- a/data/maps/NavelRock_Up4/scripts.inc
+++ b/data/maps/NavelRock_Up4/scripts.inc
@@ -1,3 +1,3 @@
-NavelRock_Up4_MapScripts:: @ 8269112
+NavelRock_Up4_MapScripts::
 	.byte 0
 
diff --git a/data/maps/NewMauville_Entrance/scripts.inc b/data/maps/NewMauville_Entrance/scripts.inc
index d398a03ea..7bc134d50 100644
--- a/data/maps/NewMauville_Entrance/scripts.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
@@ -1,14 +1,14 @@
-NewMauville_Entrance_MapScripts:: @ 82372AD
+NewMauville_Entrance_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, NewMauville_Entrance_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Entrance_OnTransition
 	.byte 0
 
-NewMauville_Entrance_OnLoad: @ 82372B8
+NewMauville_Entrance_OnLoad:
 	compare VAR_NEW_MAUVILLE_STATE, 0
 	call_if_eq NewMauville_Entrance_EventScript_CloseDoor
 	end
 
-NewMauville_Entrance_EventScript_CloseDoor:: @ 82372C4
+NewMauville_Entrance_EventScript_CloseDoor::
 	setmetatile 3, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile0, 1
 	setmetatile 4, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile1, 1
 	setmetatile 5, 0, METATILE_Facility_NewMauvilleDoor_Closed_Tile2, 1
@@ -17,11 +17,11 @@ NewMauville_Entrance_EventScript_CloseDoor:: @ 82372C4
 	setmetatile 5, 1, METATILE_Facility_NewMauvilleDoor_Closed_Tile5, 1
 	return
 
-NewMauville_Entrance_OnTransition: @ 82372FB
+NewMauville_Entrance_OnTransition:
 	setflag FLAG_LANDMARK_NEW_MAUVILLE
 	end
 
-NewMauville_Entrance_EventScript_Door:: @ 82372FF
+NewMauville_Entrance_EventScript_Door::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
@@ -45,17 +45,17 @@ NewMauville_Entrance_EventScript_Door:: @ 82372FF
 	releaseall
 	end
 
-NewMauville_Entrance_EventScript_DontOpenDoor:: @ 8237380
+NewMauville_Entrance_EventScript_DontOpenDoor::
 	releaseall
 	end
 
-NewMauville_Entrance_Text_DoorIsLocked: @ 8237382
+NewMauville_Entrance_Text_DoorIsLocked:
 	.string "The door is locked.$"
 
-NewMauville_Entrance_Text_UseBasementKey: @ 8237396
+NewMauville_Entrance_Text_UseBasementKey:
 	.string "Use the BASEMENT KEY?$"
 
-NewMauville_Entrance_Text_UsedBasementKey: @ 82373AC
+NewMauville_Entrance_Text_UsedBasementKey:
 	.string "{PLAYER} used the BASEMENT KEY.\p"
 	.string "The door opened!$"
 
diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc
index 7675799eb..ac9572ea8 100644
--- a/data/maps/NewMauville_Inside/scripts.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
@@ -1,10 +1,10 @@
-NewMauville_Inside_MapScripts:: @ 82373D7
+NewMauville_Inside_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, NewMauville_Inside_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, NewMauville_Inside_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, NewMauville_Inside_OnLoad
 	.byte 0
 
-NewMauville_Inside_OnResume: @ 82373E7
+NewMauville_Inside_OnResume:
 	compare VAR_TEMP_1, 1
 	call_if_eq NewMauville_Inside_EventScript_SetBarrierStateBlueButton
 	compare VAR_TEMP_2, 1
@@ -12,14 +12,14 @@ NewMauville_Inside_OnResume: @ 82373E7
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_TryRemoveVoltorb
 	end
 
-NewMauville_Inside_EventScript_TryRemoveVoltorb:: @ 8237407
+NewMauville_Inside_EventScript_TryRemoveVoltorb::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-NewMauville_Inside_OnTransition: @ 823741B
+NewMauville_Inside_OnTransition:
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb1
@@ -27,24 +27,24 @@ NewMauville_Inside_OnTransition: @ 823741B
 	call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_ShowVoltorb3
 	end
 
-NewMauville_Inside_EventScript_ShowVoltorb1:: @ 8237441
+NewMauville_Inside_EventScript_ShowVoltorb1::
 	clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_1
 	return
 
-NewMauville_Inside_EventScript_ShowVoltorb2:: @ 8237445
+NewMauville_Inside_EventScript_ShowVoltorb2::
 	clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2
 	return
 
-NewMauville_Inside_EventScript_ShowVoltorb3:: @ 8237449
+NewMauville_Inside_EventScript_ShowVoltorb3::
 	clearflag FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3
 	return
 
-NewMauville_Inside_OnLoad: @ 823744D
+NewMauville_Inside_OnLoad:
 	compare VAR_NEW_MAUVILLE_STATE, 2
 	call_if_eq NewMauville_Inside_EventScript_SetGeneratorOffMetatiles
 	end
 
-NewMauville_Inside_EventScript_BlueButton:: @ 8237459
+NewMauville_Inside_EventScript_BlueButton::
 	lockall
 	setvar VAR_TEMP_1, 1
 	setvar VAR_TEMP_2, 0
@@ -54,7 +54,7 @@ NewMauville_Inside_EventScript_BlueButton:: @ 8237459
 	releaseall
 	end
 
-NewMauville_Inside_EventScript_GreenButton:: @ 8237471
+NewMauville_Inside_EventScript_GreenButton::
 	lockall
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 1
@@ -64,7 +64,7 @@ NewMauville_Inside_EventScript_GreenButton:: @ 8237471
 	releaseall
 	end
 
-NewMauville_Inside_EventScript_SetBarrierStateBlueButton:: @ 8237489
+NewMauville_Inside_EventScript_SetBarrierStateBlueButton::
 	setmetatile 23, 34, METATILE_BikeShop_Barrier_Hidden_Top, 1
 	setmetatile 23, 35, METATILE_BikeShop_Barrier_Hidden_Bottom, 1
 	setmetatile 23, 36, METATILE_BikeShop_Floor_Shadow_Top, 0
@@ -104,7 +104,7 @@ NewMauville_Inside_EventScript_SetBarrierStateBlueButton:: @ 8237489
 	setmetatile 18, 36, METATILE_BikeShop_Button_Green, 0
 	return
 
-NewMauville_Inside_EventScript_SetBarrierStateGreenButton:: @ 82375D7
+NewMauville_Inside_EventScript_SetBarrierStateGreenButton::
 	setmetatile 23, 34, METATILE_BikeShop_Barrier_Blue_Top, 1
 	setmetatile 23, 35, METATILE_BikeShop_Barrier_Blue_TopMid, 1
 	setmetatile 23, 36, METATILE_BikeShop_Barrier_Blue_BottomMid, 1
@@ -144,7 +144,7 @@ NewMauville_Inside_EventScript_SetBarrierStateGreenButton:: @ 82375D7
 	setmetatile 30, 38, METATILE_BikeShop_Button_Blue, 0
 	return
 
-NewMauville_Inside_EventScript_RedButton:: @ 8237725
+NewMauville_Inside_EventScript_RedButton::
 	lockall
 	msgbox NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped, MSGBOX_DEFAULT
 	call NewMauville_Inside_EventScript_SetGeneratorOffMetatiles
@@ -152,7 +152,7 @@ NewMauville_Inside_EventScript_RedButton:: @ 8237725
 	releaseall
 	end
 
-NewMauville_Inside_EventScript_SetGeneratorOffMetatiles:: @ 823773A
+NewMauville_Inside_EventScript_SetGeneratorOffMetatiles::
 	setmetatile 33, 6, METATILE_BikeShop_Button_Pressed, 0
 	setmetatile 32, 2, METATILE_BikeShop_Generator_Off_Tile0, 1
 	setmetatile 33, 2, METATILE_BikeShop_Generator_Off_Tile1, 1
@@ -165,7 +165,7 @@ NewMauville_Inside_EventScript_SetGeneratorOffMetatiles:: @ 823773A
 	special DrawWholeMapView
 	return
 
-NewMauville_Inside_EventScript_Generator:: @ 823778F
+NewMauville_Inside_EventScript_Generator::
 	lockall
 	compare VAR_NEW_MAUVILLE_STATE, 2
 	goto_if_eq NewMauville_Inside_EventScript_GeneratorOff
@@ -173,12 +173,12 @@ NewMauville_Inside_EventScript_Generator:: @ 823778F
 	releaseall
 	end
 
-NewMauville_Inside_EventScript_GeneratorOff:: @ 82377A5
+NewMauville_Inside_EventScript_GeneratorOff::
 	msgbox NewMauville_Inside_Text_GeneratorQuietedDown, MSGBOX_DEFAULT
 	releaseall
 	end
 
-NewMauville_Inside_EventScript_Voltorb1:: @ 82377AF
+NewMauville_Inside_EventScript_Voltorb1::
 	lock
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -200,12 +200,12 @@ NewMauville_Inside_EventScript_Voltorb1:: @ 82377AF
 	release
 	end
 
-NewMauville_Inside_EventScript_DefeatedVoltorb1:: @ 82377F3
+NewMauville_Inside_EventScript_DefeatedVoltorb1::
 	setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-NewMauville_Inside_EventScript_Voltorb2:: @ 82377FC
+NewMauville_Inside_EventScript_Voltorb2::
 	lock
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -227,12 +227,12 @@ NewMauville_Inside_EventScript_Voltorb2:: @ 82377FC
 	release
 	end
 
-NewMauville_Inside_EventScript_DefeatedVoltorb2:: @ 8237840
+NewMauville_Inside_EventScript_DefeatedVoltorb2::
 	setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-NewMauville_Inside_EventScript_Voltorb3:: @ 8237849
+NewMauville_Inside_EventScript_Voltorb3::
 	lock
 	faceplayer
 	setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE
@@ -254,21 +254,21 @@ NewMauville_Inside_EventScript_Voltorb3:: @ 8237849
 	release
 	end
 
-NewMauville_Inside_EventScript_DefeatedVoltorb3:: @ 823788D
+NewMauville_Inside_EventScript_DefeatedVoltorb3::
 	setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-NewMauville_Inside_Text_GeneratorRadiatingHeat: @ 8237896
+NewMauville_Inside_Text_GeneratorRadiatingHeat:
 	.string "The generator is radiating heat that\n"
 	.string "can be felt even at a distance.\p"
 	.string "It looks like it should be turned off\n"
 	.string "as soon as possible.$"
 
-NewMauville_Inside_Text_GeneratorQuietedDown: @ 8237916
+NewMauville_Inside_Text_GeneratorQuietedDown:
 	.string "The generator quieted down.$"
 
-NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped: @ 8237932
+NewMauville_Inside_Text_SteppedOnSwitchGeneratorStopped:
 	.string "{PLAYER} stepped on the switch.\p"
 	.string "Click…\p"
 	.string "… … … … … … … …\n"
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
index 593215357..8ba0e4d25 100644
--- a/data/maps/OldaleTown/scripts.inc
+++ b/data/maps/OldaleTown/scripts.inc
@@ -2,11 +2,11 @@
 .set LOCALID_FOOTPRINTS_MAN, 3
 .set LOCALID_RIVAL, 4
 
-OldaleTown_MapScripts:: @ 81E8EA2
+OldaleTown_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_OnTransition
 	.byte 0
 
-OldaleTown_OnTransition: @ 81E8EA8
+OldaleTown_OnTransition:
 	call Common_EventScript_SetupRivalGfxId
 	setflag FLAG_VISITED_OLDALE_TOWN
 	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_BlockWestEntrance
@@ -15,29 +15,29 @@ OldaleTown_OnTransition: @ 81E8EA8
 	end
 
 @ This script seems pointless because nothing uses VAR_OLDALE_TOWN_STATE
-OldaleTown_EventScript_SetOldaleState:: @ 81E8ECC
+OldaleTown_EventScript_SetOldaleState::
 	setvar VAR_OLDALE_TOWN_STATE, 1
 	return
 
-OldaleTown_EventScript_BlockWestEntrance:: @ 81E8ED2
+OldaleTown_EventScript_BlockWestEntrance::
 	setobjectxyperm LOCALID_FOOTPRINTS_MAN, 1, 11
 	setobjectmovementtype LOCALID_FOOTPRINTS_MAN, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-OldaleTown_EventScript_MoveMartEmployee:: @ 81E8EDE
+OldaleTown_EventScript_MoveMartEmployee::
 	setobjectxyperm LOCALID_MART_EMPLOYEE, 13, 14
 	setobjectmovementtype LOCALID_MART_EMPLOYEE, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-OldaleTown_EventScript_CitySign:: @ 81E8EEA
+OldaleTown_EventScript_CitySign::
 	msgbox OldaleTown_Text_CitySign, MSGBOX_SIGN
 	end
 
-OldaleTown_EventScript_Girl:: @ 81E8EF3
+OldaleTown_EventScript_Girl::
 	msgbox OldaleTown_Text_SavingMyProgress, MSGBOX_NPC
 	end
 
-OldaleTown_EventScript_MartEmployee:: @ 81E8EFC
+OldaleTown_EventScript_MartEmployee::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_ExplainPotion
@@ -52,28 +52,28 @@ OldaleTown_EventScript_MartEmployee:: @ 81E8EFC
 	case DIR_EAST, OldaleTown_EventScript_GoToMartEast
 	end
 
-OldaleTown_EventScript_GoToMartSouth:: @ 81E8F47
+OldaleTown_EventScript_GoToMartSouth::
 	applymovement LOCALID_MART_EMPLOYEE, OldaleTown_Movement_EmployeeSouth
 	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerSouth
 	waitmovement 0
 	goto OldaleTown_EventScript_ExplainPokemonMart
 	end
 
-OldaleTown_EventScript_GoToMartNorth:: @ 81E8F5E
+OldaleTown_EventScript_GoToMartNorth::
 	applymovement LOCALID_MART_EMPLOYEE, OldaleTown_Movement_EmployeeNorth
 	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerNorth
 	waitmovement 0
 	goto OldaleTown_EventScript_ExplainPokemonMart
 	end
 
-OldaleTown_EventScript_GoToMartEast:: @ 81E8F75
+OldaleTown_EventScript_GoToMartEast::
 	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerEast
 	applymovement LOCALID_MART_EMPLOYEE, OldaleTown_Movement_EmployeeEast
 	waitmovement 0
 	goto OldaleTown_EventScript_ExplainPokemonMart
 	end
 
-OldaleTown_EventScript_ExplainPokemonMart:: @ 81E8F8C
+OldaleTown_EventScript_ExplainPokemonMart::
 	msgbox OldaleTown_Text_ThisIsAPokemonMart, MSGBOX_DEFAULT
 	giveitem ITEM_POTION
 	compare VAR_RESULT, FALSE
@@ -84,18 +84,18 @@ OldaleTown_EventScript_ExplainPokemonMart:: @ 81E8F8C
 	release
 	end
 
-OldaleTown_EventScript_ExplainPotion:: @ 81E8FB9
+OldaleTown_EventScript_ExplainPotion::
 	msgbox OldaleTown_Text_PotionExplanation, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_EventScript_BagIsFull:: @ 81E8FC3
+OldaleTown_EventScript_BagIsFull::
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	fadedefaultbgm
 	release
 	end
 
-OldaleTown_Movement_EmployeeEast: @ 81E8FCE
+OldaleTown_Movement_EmployeeEast:
 	walk_up
 	walk_up
 	walk_up
@@ -106,7 +106,7 @@ OldaleTown_Movement_EmployeeEast: @ 81E8FCE
 	walk_in_place_fastest_down
 	step_end
 
-OldaleTown_Movement_EmployeeSouth: @ 81E8FD7
+OldaleTown_Movement_EmployeeSouth:
 	walk_left
 	walk_up
 	walk_up
@@ -119,7 +119,7 @@ OldaleTown_Movement_EmployeeSouth: @ 81E8FD7
 	walk_in_place_fastest_down
 	step_end
 
-OldaleTown_Movement_EmployeeNorth: @ 81E8FE2
+OldaleTown_Movement_EmployeeNorth:
 	walk_up
 	walk_up
 	walk_up
@@ -130,7 +130,7 @@ OldaleTown_Movement_EmployeeNorth: @ 81E8FE2
 	walk_in_place_fastest_down
 	step_end
 
-OldaleTown_Movement_Unknown1: @ 81E8FEB
+OldaleTown_Movement_Unknown1:
 	walk_up
 	walk_up
 	walk_right
@@ -146,7 +146,7 @@ OldaleTown_Movement_Unknown1: @ 81E8FEB
 	walk_in_place_fastest_down
 	step_end
 
-OldaleTown_Movement_PlayerEast: @ 81E8FF9
+OldaleTown_Movement_PlayerEast:
 	walk_right
 	walk_up
 	walk_up
@@ -156,7 +156,7 @@ OldaleTown_Movement_PlayerEast: @ 81E8FF9
 	walk_up
 	step_end
 
-OldaleTown_Movement_PlayerSouth: @ 81E9001
+OldaleTown_Movement_PlayerSouth:
 	delay_16
 	delay_16
 	delay_16
@@ -168,7 +168,7 @@ OldaleTown_Movement_PlayerSouth: @ 81E9001
 	walk_up
 	step_end
 
-OldaleTown_Movement_PlayerNorth: @ 81E900B
+OldaleTown_Movement_PlayerNorth:
 	walk_up
 	walk_up
 	walk_up
@@ -178,7 +178,7 @@ OldaleTown_Movement_PlayerNorth: @ 81E900B
 	walk_up
 	step_end
 
-OldaleTown_Movement_Unknown2: @ 81E9013
+OldaleTown_Movement_Unknown2:
 	walk_left
 	walk_up
 	walk_up
@@ -192,7 +192,7 @@ OldaleTown_Movement_Unknown2: @ 81E9013
 	walk_up
 	step_end
 
-OldaleTown_EventScript_FootprintsMan:: @ 81E901F
+OldaleTown_EventScript_FootprintsMan::
 	lock
 	faceplayer
 	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_NotBlockingPath
@@ -203,7 +203,7 @@ OldaleTown_EventScript_FootprintsMan:: @ 81E901F
 	release
 	end
 
-OldaleTown_EventScript_BlockedPath:: @ 81E903F
+OldaleTown_EventScript_BlockedPath::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_PlayerStepBack
 	applymovement LOCALID_FOOTPRINTS_MAN, OldaleTown_Movement_BackUp
@@ -215,12 +215,12 @@ OldaleTown_EventScript_BlockedPath:: @ 81E903F
 	releaseall
 	end
 
-OldaleTown_EventScript_NotBlockingPath:: @ 81E9066
+OldaleTown_EventScript_NotBlockingPath::
 	msgbox OldaleTown_Text_FinishedSketchingFootprints, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_EventScript_Rival:: @ 81E9070
+OldaleTown_EventScript_Rival::
 	lockall
 	applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
 	waitmovement 0
@@ -228,7 +228,7 @@ OldaleTown_EventScript_Rival:: @ 81E9070
 	goto OldaleTown_EventScript_ShowRivalMessage
 	end
 
-OldaleTown_EventScript_RivalTrigger1:: @ 81E9086
+OldaleTown_EventScript_RivalTrigger1::
 	lockall
 	applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer1
 	waitmovement 0
@@ -238,7 +238,7 @@ OldaleTown_EventScript_RivalTrigger1:: @ 81E9086
 	goto OldaleTown_EventScript_ShowRivalMessage
 	end
 
-OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6
+OldaleTown_EventScript_RivalTrigger2::
 	lockall
 	applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer2
 	waitmovement 0
@@ -248,7 +248,7 @@ OldaleTown_EventScript_RivalTrigger2:: @ 81E90A6
 	goto OldaleTown_EventScript_ShowRivalMessage
 	end
 
-OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6
+OldaleTown_EventScript_RivalTrigger3::
 	lockall
 	applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer3
 	waitmovement 0
@@ -258,7 +258,7 @@ OldaleTown_EventScript_RivalTrigger3:: @ 81E90C6
 	goto OldaleTown_EventScript_ShowRivalMessage
 	end
 
-OldaleTown_EventScript_ShowRivalMessage:: @ 81E90E6
+OldaleTown_EventScript_ShowRivalMessage::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq OldaleTown_EventScript_ShowMayMessage
@@ -266,17 +266,17 @@ OldaleTown_EventScript_ShowRivalMessage:: @ 81E90E6
 	goto_if_eq OldaleTown_EventScript_ShowBrendanMessage
 	end
 
-OldaleTown_EventScript_ShowMayMessage:: @ 81E90FE
+OldaleTown_EventScript_ShowMayMessage::
 	msgbox OldaleTown_Text_MayLetsGoBack, MSGBOX_DEFAULT
 	goto OldaleTown_EventScript_RivalFinish
 	end
 
-OldaleTown_EventScript_ShowBrendanMessage:: @ 81E910C
+OldaleTown_EventScript_ShowBrendanMessage::
 	msgbox OldaleTown_Text_BrendanLetsGoBack, MSGBOX_DEFAULT
 	goto OldaleTown_EventScript_RivalFinish
 	end
 
-OldaleTown_EventScript_RivalFinish:: @ 81E911A
+OldaleTown_EventScript_RivalFinish::
 	closemessage
 	compare VAR_0x8009, 0
 	call_if_eq OldaleTown_EventScript_DoExitMovement1
@@ -290,33 +290,33 @@ OldaleTown_EventScript_RivalFinish:: @ 81E911A
 	releaseall
 	end
 
-OldaleTown_EventScript_DoExitMovement1:: @ 81E9148
+OldaleTown_EventScript_DoExitMovement1::
 	compare VAR_FACING, DIR_SOUTH
 	goto_if_ne OldaleTown_EventScript_DoExitMovement2
 	applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalExit
 	waitmovement 0
 	return
 
-OldaleTown_EventScript_DoExitMovement2:: @ 81E915E
+OldaleTown_EventScript_DoExitMovement2::
 	applymovement OBJ_EVENT_ID_PLAYER, OldaleTown_Movement_WatchRivalExit
 	applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalExit
 	waitmovement 0
 	return
 
-OldaleTown_Movement_RivalApproachPlayer1: @ 81E9170
+OldaleTown_Movement_RivalApproachPlayer1:
 	walk_left
 	walk_left
 	step_end
 
-OldaleTown_Movement_RivalApproachPlayer2: @ 81E9173
+OldaleTown_Movement_RivalApproachPlayer2:
 	walk_left
 	step_end
 
-OldaleTown_Movement_RivalApproachPlayer3: @ 81E9175
+OldaleTown_Movement_RivalApproachPlayer3:
 	face_left
 	step_end
 
-OldaleTown_Movement_RivalExit: @ 81E9177
+OldaleTown_Movement_RivalExit:
 	walk_down
 	walk_down
 	walk_down
@@ -325,18 +325,18 @@ OldaleTown_Movement_RivalExit: @ 81E9177
 	walk_down
 	step_end
 
-OldaleTown_Movement_WatchRivalExit: @ 81E917E
+OldaleTown_Movement_WatchRivalExit:
 	delay_8
 	delay_4
 	walk_in_place_fastest_down
 	step_end
 
-OldaleTown_Movement_PlayerStepBack: @ 81E9182
+OldaleTown_Movement_PlayerStepBack:
 	delay_8
 	walk_right
 	step_end
 
-OldaleTown_Movement_BackUp: @ 81E9185
+OldaleTown_Movement_BackUp:
 	walk_fast_up
 	walk_in_place_fastest_left
 	lock_facing_direction
@@ -344,21 +344,21 @@ OldaleTown_Movement_BackUp: @ 81E9185
 	unlock_facing_direction
 	step_end
 
-OldaleTown_Movement_ReturnToOriginalPosition: @ 81E918B
+OldaleTown_Movement_ReturnToOriginalPosition:
 	walk_down
 	walk_left
 	step_end
 
-OldaleTown_Text_SavingMyProgress: @ 81E918E
+OldaleTown_Text_SavingMyProgress:
 	.string "I want to take a rest, so I'm saving my\n"
 	.string "progress.$"
 
-OldaleTown_Text_IWorkAtPokemonMart: @ 81E91C0
+OldaleTown_Text_IWorkAtPokemonMart:
 	.string "Hi!\n"
 	.string "I work at a POKéMON MART.\p"
 	.string "Can I get you to come with me?$"
 
-OldaleTown_Text_ThisIsAPokemonMart: @ 81E91FD
+OldaleTown_Text_ThisIsAPokemonMart:
 	.string "This is a POKéMON MART.\n"
 	.string "Just look for our blue roof.\p"
 	.string "We sell a variety of goods including\n"
@@ -366,12 +366,12 @@ OldaleTown_Text_ThisIsAPokemonMart: @ 81E91FD
 	.string "Here, I'd like you to have this as\n"
 	.string "a promotional item.$"
 
-OldaleTown_Text_PotionExplanation: @ 81E92AF
+OldaleTown_Text_PotionExplanation:
 	.string "A POTION can be used anytime, so it's\n"
 	.string "even more useful than a POKéMON CENTER\l"
 	.string "in certain situations.$"
 
-OldaleTown_Text_WaitDontComeInHere: @ 81E9313
+OldaleTown_Text_WaitDontComeInHere:
 	.string "Aaaaah! Wait!\n"
 	.string "Please don't come in here.\p"
 	.string "I just discovered the footprints of\n"
@@ -379,29 +379,29 @@ OldaleTown_Text_WaitDontComeInHere: @ 81E9313
 	.string "Wait until I finish sketching\n"
 	.string "them, okay?$"
 
-OldaleTown_Text_DiscoveredFootprints: @ 81E939A
+OldaleTown_Text_DiscoveredFootprints:
 	.string "I just discovered the footprints of\n"
 	.string "a rare POKéMON!\p"
 	.string "Wait until I finish sketching\n"
 	.string "them, okay?$"
 
-OldaleTown_Text_FinishedSketchingFootprints: @ 81E93F8
+OldaleTown_Text_FinishedSketchingFootprints:
 	.string "I finished sketching the footprints of\n"
 	.string "a rare POKéMON.\p"
 	.string "But it turns out they were only my\n"
 	.string "own footprints…$"
 
-OldaleTown_Text_MayLetsGoBack: @ 81E9462
+OldaleTown_Text_MayLetsGoBack:
 	.string "MAY: {PLAYER}{KUN}!\n"
 	.string "Over here!\l"
 	.string "Let's hurry home!$"
 
-OldaleTown_Text_BrendanLetsGoBack: @ 81E948A
+OldaleTown_Text_BrendanLetsGoBack:
 	.string "BRENDAN: I'm heading back to my dad's\n"
 	.string "LAB now.\l"
 	.string "{PLAYER}, you should hustle back, too.$"
 
-OldaleTown_Text_CitySign: @ 81E94DA
+OldaleTown_Text_CitySign:
 	.string "OLDALE TOWN\n"
 	.string "“Where things start off scarce.”$"
 
diff --git a/data/maps/OldaleTown_House1/scripts.inc b/data/maps/OldaleTown_House1/scripts.inc
index 1cb5622ef..5211f583e 100644
--- a/data/maps/OldaleTown_House1/scripts.inc
+++ b/data/maps/OldaleTown_House1/scripts.inc
@@ -1,11 +1,11 @@
-OldaleTown_House1_MapScripts:: @ 81FBE85
+OldaleTown_House1_MapScripts::
 	.byte 0
 
-OldaleTown_House1_EventScript_Woman:: @ 81FBE86
+OldaleTown_House1_EventScript_Woman::
 	msgbox OldaleTown_House1_Text_LeftPokemonGoesOutFirst, MSGBOX_NPC
 	end
 
-OldaleTown_House1_Text_LeftPokemonGoesOutFirst: @ 81FBE8F
+OldaleTown_House1_Text_LeftPokemonGoesOutFirst:
 	.string "When a POKéMON battle starts, the one\n"
 	.string "at the left of the list goes out first.\p"
 	.string "So, when you get more POKéMON in your\n"
diff --git a/data/maps/OldaleTown_House2/scripts.inc b/data/maps/OldaleTown_House2/scripts.inc
index 3259e319c..49e317bac 100644
--- a/data/maps/OldaleTown_House2/scripts.inc
+++ b/data/maps/OldaleTown_House2/scripts.inc
@@ -1,19 +1,19 @@
-OldaleTown_House2_MapScripts:: @ 81FBF5A
+OldaleTown_House2_MapScripts::
 	.byte 0
 
-OldaleTown_House2_EventScript_Woman:: @ 81FBF5B
+OldaleTown_House2_EventScript_Woman::
 	msgbox OldaleTown_House2_Text_PokemonLevelUp, MSGBOX_NPC
 	end
 
-OldaleTown_House2_EventScript_Man:: @ 81FBF64
+OldaleTown_House2_EventScript_Man::
 	msgbox OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon, MSGBOX_NPC
 	end
 
-OldaleTown_House2_Text_PokemonLevelUp: @ 81FBF6D
+OldaleTown_House2_Text_PokemonLevelUp:
 	.string "When POKéMON battle, they eventually\n"
 	.string "level up and become stronger.$"
 
-OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon: @ 81FBFB0
+OldaleTown_House2_Text_YoullGoFurtherWithStrongPokemon:
 	.string "If the POKéMON with you become\n"
 	.string "stronger, you'll be able to go farther\l"
 	.string "away from here.$"
diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc
index 33d26cbfb..0b3c7b1a3 100644
--- a/data/maps/OldaleTown_Mart/scripts.inc
+++ b/data/maps/OldaleTown_Mart/scripts.inc
@@ -1,7 +1,7 @@
-OldaleTown_Mart_MapScripts:: @ 81FC23F
+OldaleTown_Mart_MapScripts::
 	.byte 0
 
-OldaleTown_Mart_EventScript_Clerk:: @ 81FC240
+OldaleTown_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -12,7 +12,8 @@ OldaleTown_Mart_EventScript_Clerk:: @ 81FC240
 	release
 	end
 
-OldaleTown_Mart_Pokemart_Basic: @ 81FC260
+	.align 2
+OldaleTown_Mart_Pokemart_Basic:
 	.2byte ITEM_POTION
 	.2byte ITEM_ANTIDOTE
 	.2byte ITEM_PARALYZE_HEAL
@@ -21,14 +22,14 @@ OldaleTown_Mart_Pokemart_Basic: @ 81FC260
 	release
 	end
 
-OldaleTown_Mart_ExpandedItems:: @ 81FC26C
+OldaleTown_Mart_ExpandedItems::
 	pokemart OldaleTown_Mart_Pokemart_Expanded
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-OldaleTown_Mart_Pokemart_Expanded: @ 81FC27C
+OldaleTown_Mart_Pokemart_Expanded:
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
 	.2byte ITEM_ANTIDOTE
@@ -38,7 +39,7 @@ OldaleTown_Mart_Pokemart_Expanded: @ 81FC27C
 	release
 	end
 
-OldaleTown_Mart_EventScript_Woman:: @ 81FC28A
+OldaleTown_Mart_EventScript_Woman::
 	lock
 	faceplayer
 	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_PokeBallsInStock
@@ -46,24 +47,24 @@ OldaleTown_Mart_EventScript_Woman:: @ 81FC28A
 	release
 	end
 
-OldaleTown_Mart_EventScript_PokeBallsInStock:: @ 81FC29F
+OldaleTown_Mart_EventScript_PokeBallsInStock::
 	msgbox OldaleTown_Mart_Text_ImGoingToBuyPokeBalls, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_Mart_EventScript_Boy:: @ 81FC2A9
+OldaleTown_Mart_EventScript_Boy::
 	msgbox OldaleTown_Mart_Text_RestoreHPWithPotion, MSGBOX_NPC
 	end
 
-OldaleTown_Mart_Text_PokeBallsAreSoldOut: @ 81FC2B2
+OldaleTown_Mart_Text_PokeBallsAreSoldOut:
 	.string "The clerk says they're all sold out.\n"
 	.string "I can't buy any POKé BALLS.$"
 
-OldaleTown_Mart_Text_ImGoingToBuyPokeBalls: @ 81FC2F3
+OldaleTown_Mart_Text_ImGoingToBuyPokeBalls:
 	.string "I'm going to buy a bunch of POKé BALLS\n"
 	.string "and catch a bunch of POKéMON!$"
 
-OldaleTown_Mart_Text_RestoreHPWithPotion: @ 81FC338
+OldaleTown_Mart_Text_RestoreHPWithPotion:
 	.string "If a POKéMON gets hurt and loses its HP\n"
 	.string "and faints, it won't be able to battle.\p"
 	.string "To prevent your POKéMON from fainting,\n"
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index 0918f3c39..07549592f 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
@@ -1,16 +1,16 @@
 .set LOCALID_NURSE, 1
 
-OldaleTown_PokemonCenter_1F_MapScripts:: @ 81FC006
+OldaleTown_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, OldaleTown_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-OldaleTown_PokemonCenter_1F_OnTransition: @ 81FC011
+OldaleTown_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_OLDALE_TOWN
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC01A
+OldaleTown_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -18,15 +18,15 @@ OldaleTown_PokemonCenter_1F_EventScript_Nurse:: @ 81FC01A
 	release
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_Gentleman:: @ 81FC028
+OldaleTown_PokemonCenter_1F_EventScript_Gentleman::
 	msgbox OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC, MSGBOX_NPC
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_Boy:: @ 81FC031
+OldaleTown_PokemonCenter_1F_EventScript_Boy::
 	msgbox OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat, MSGBOX_NPC
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_Girl:: @ 81FC03A
+OldaleTown_PokemonCenter_1F_EventScript_Girl::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable
@@ -34,30 +34,30 @@ OldaleTown_PokemonCenter_1F_EventScript_Girl:: @ 81FC03A
 	release
 	end
 
-OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable:: @ 81FC04F
+OldaleTown_PokemonCenter_1F_EventScript_WirelessClubAvailable::
 	msgbox OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub, MSGBOX_DEFAULT
 	release
 	end
 
-OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC: @ 81FC059
+OldaleTown_PokemonCenter_1F_Text_TrainersCanUsePC:
 	.string "That PC in the corner there is\n"
 	.string "for any POKéMON TRAINER to use.\p"
 	.string "Naturally, that means you're welcome\n"
 	.string "to use it, too.$"
 
-OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat: @ 81FC0CD
+OldaleTown_PokemonCenter_1F_Text_PokemonCentersAreGreat:
 	.string "POKéMON CENTERS are great!\p"
 	.string "You can use their services as much\n"
 	.string "as you like, and it's all for free.\l"
 	.string "You never have to worry!$"
 
-OldaleTown_PokemonCenter_1F_Text_WirelessClubNotAvailable: @ 81FC148
+OldaleTown_PokemonCenter_1F_Text_WirelessClubNotAvailable:
 	.string "The POKéMON WIRELESS CLUB on\n"
 	.string "the second floor was built recently.\p"
 	.string "But they say they're still making\n"
 	.string "adjustments.$"
 
-OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub: @ 81FC1B9
+OldaleTown_PokemonCenter_1F_Text_TradedInWirelessClub:
 	.string "The POKéMON WIRELESS CLUB on\n"
 	.string "the second floor was built recently.\p"
 	.string "I traded POKéMON right away.$"
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
index 125805f50..4dbe7cdd1 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218
+OldaleTown_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ OldaleTown_PokemonCenter_2F_MapScripts:: @ 81FC218
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-OldaleTown_PokemonCenter_2F_EventScript_Colosseum:: @ 81FC22D
+OldaleTown_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-OldaleTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 81FC233
+OldaleTown_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-OldaleTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 81FC239
+OldaleTown_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/PacifidlogTown/scripts.inc b/data/maps/PacifidlogTown/scripts.inc
index fc491cfe3..384fa0753 100644
--- a/data/maps/PacifidlogTown/scripts.inc
+++ b/data/maps/PacifidlogTown/scripts.inc
@@ -1,44 +1,44 @@
-PacifidlogTown_MapScripts:: @ 81EBAB1
+PacifidlogTown_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, PacifidlogTown_OnResume
 	.byte 0
 
-PacifidlogTown_OnTransition: @ 81EBABC
+PacifidlogTown_OnTransition:
 	setflag FLAG_VISITED_PACIFIDLOG_TOWN
 	end
 
-PacifidlogTown_OnResume: @ 81EBAC0
+PacifidlogTown_OnResume:
 	setstepcallback STEP_CB_PACIFIDLOG_BRIDGE
 	end
 
-PacifidlogTown_EventScript_NinjaBoy:: @ 81EBAC3
+PacifidlogTown_EventScript_NinjaBoy::
 	msgbox PacifidlogTown_Text_NeatHousesOnWater, MSGBOX_NPC
 	end
 
-PacifidlogTown_EventScript_Girl:: @ 81EBACC
+PacifidlogTown_EventScript_Girl::
 	msgbox PacifidlogTown_Text_FastRunningCurrent, MSGBOX_NPC
 	end
 
-PacifidlogTown_EventScript_Fisherman:: @ 81EBAD5
+PacifidlogTown_EventScript_Fisherman::
 	msgbox PacifidlogTown_Text_SkyPillarTooScary, MSGBOX_NPC
 	end
 
-PacifidlogTown_EventScript_TownSign:: @ 81EBADE
+PacifidlogTown_EventScript_TownSign::
 	msgbox PacifidlogTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-PacifidlogTown_Text_FastRunningCurrent: @ 81EBAE7
+PacifidlogTown_Text_FastRunningCurrent:
 	.string "The sea between PACIFIDLOG and\n"
 	.string "SLATEPORT has a fast-running tide.\p"
 	.string "If you decide to SURF, you could end\n"
 	.string "up swept away somewhere else.$"
 
-PacifidlogTown_Text_NeatHousesOnWater: @ 81EBB6C
+PacifidlogTown_Text_NeatHousesOnWater:
 	.string "See, isn't it neat?\n"
 	.string "These houses are on water!\p"
 	.string "I was born here!$"
 
-PacifidlogTown_Text_SkyPillarTooScary: @ 81EBBAC
+PacifidlogTown_Text_SkyPillarTooScary:
 	.string "The SKY PILLAR?\p"
 	.string "…Oh, you must mean that tall, tall\n"
 	.string "tower a little further out.\p"
@@ -47,7 +47,7 @@ PacifidlogTown_Text_SkyPillarTooScary: @ 81EBBAC
 	.string "Life at sea level in PACIFIDLOG,\n"
 	.string "that suits me fine.$"
 
-PacifidlogTown_Text_TownSign: @ 81EBC7A
+PacifidlogTown_Text_TownSign:
 	.string "PACIFIDLOG TOWN\p"
 	.string "“Where the morning sun smiles upon\n"
 	.string "the waters.”$"
diff --git a/data/maps/PacifidlogTown_House1/scripts.inc b/data/maps/PacifidlogTown_House1/scripts.inc
index 7759cb29a..b3a39a59d 100644
--- a/data/maps/PacifidlogTown_House1/scripts.inc
+++ b/data/maps/PacifidlogTown_House1/scripts.inc
@@ -1,15 +1,15 @@
-PacifidlogTown_House1_MapScripts:: @ 820365C
+PacifidlogTown_House1_MapScripts::
 	.byte 0
 
-PacifidlogTown_House1_EventScript_Man:: @ 820365D
+PacifidlogTown_House1_EventScript_Man::
 	msgbox PacifidlogTown_House1_Text_RegiStory, MSGBOX_NPC
 	end
 
-PacifidlogTown_House1_EventScript_Woman:: @ 8203666
+PacifidlogTown_House1_EventScript_Woman::
 	msgbox PacifidlogTown_House1_Text_SixDotsOpenThreeDoors, MSGBOX_NPC
 	end
 
-PacifidlogTown_House1_Text_RegiStory: @ 820366F
+PacifidlogTown_House1_Text_RegiStory:
 	.string "In the HOENN region, there are three\n"
 	.string "POKéMON that represent the power of\l"
 	.string "rock, ice, and steel.\p"
@@ -18,7 +18,7 @@ PacifidlogTown_House1_Text_RegiStory: @ 820366F
 	.string "That's the story I heard when I was\n"
 	.string "just a little kid.$"
 
-PacifidlogTown_House1_Text_SixDotsOpenThreeDoors: @ 820373A
+PacifidlogTown_House1_Text_SixDotsOpenThreeDoors:
 	.string "“Six dots open three doors.”\p"
 	.string "Grandpa used to say that, but I don't\n"
 	.string "know what he meant.$"
diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc
index 60b6c9961..3c0be269e 100644
--- a/data/maps/PacifidlogTown_House2/scripts.inc
+++ b/data/maps/PacifidlogTown_House2/scripts.inc
@@ -1,7 +1,7 @@
-PacifidlogTown_House2_MapScripts:: @ 8203791
+PacifidlogTown_House2_MapScripts::
 	.byte 0
 
-PacifidlogTown_House2_EventScript_FanClubYoungerBrother:: @ 8203792
+PacifidlogTown_House2_EventScript_FanClubYoungerBrother::
 	lock
 	faceplayer
 	dotimebasedevents
@@ -19,27 +19,27 @@ PacifidlogTown_House2_EventScript_FanClubYoungerBrother:: @ 8203792
 	goto PacifidlogTown_House2_EventScript_GiveFrustration
 	end
 
-PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag:: @ 82037DE
+PacifidlogTown_House2_EventScript_UpdateFanClubTMFlag::
 	goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, Common_EventScript_NopReturn
 	specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
 	compare VAR_RESULT, 0
 	call_if_eq PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM
 	return
 
-PacifidlogTown_House2_EventScript_MonAssessment:: @ 82037F8
+PacifidlogTown_House2_EventScript_MonAssessment::
 	msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT
 	return
 
-PacifidlogTown_House2_EventScript_FirstMonAssessment:: @ 8203801
+PacifidlogTown_House2_EventScript_FirstMonAssessment::
 	msgbox PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation, MSGBOX_DEFAULT
 	msgbox PacifidlogTown_House2_Text_AhYourPokemon, MSGBOX_DEFAULT
 	return
 
-PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM:: @ 8203812
+PacifidlogTown_House2_EventScript_ClearReceivedFanClubTM::
 	clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK
 	return
 
-PacifidlogTown_House2_EventScript_GiveReturn:: @ 8203816
+PacifidlogTown_House2_EventScript_GiveReturn::
 	msgbox PacifidlogTown_House2_Text_AdoringPokemonTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_TM27
 	compare VAR_RESULT, FALSE
@@ -50,12 +50,12 @@ PacifidlogTown_House2_EventScript_GiveReturn:: @ 8203816
 	release
 	end
 
-PacifidlogTown_House2_EventScript_PutInEffort:: @ 8203845
+PacifidlogTown_House2_EventScript_PutInEffort::
 	msgbox PacifidlogTown_House2_Text_PutInSomeMoreEffort, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House2_EventScript_GiveFrustration:: @ 820384F
+PacifidlogTown_House2_EventScript_GiveFrustration::
 	msgbox PacifidlogTown_House2_Text_ViciousPokemonTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_TM21
 	compare VAR_RESULT, FALSE
@@ -66,14 +66,14 @@ PacifidlogTown_House2_EventScript_GiveFrustration:: @ 820384F
 	release
 	end
 
-PacifidlogTown_House2_EventScript_ComeBackInXDays:: @ 820387E
+PacifidlogTown_House2_EventScript_ComeBackInXDays::
 	specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable
 	buffernumberstring 0, VAR_RESULT
 	msgbox PacifidlogTown_House2_Text_GetGoodTMInXDays, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House2_EventScript_HappyAzurill:: @ 8203891
+PacifidlogTown_House2_EventScript_HappyAzurill::
 	lock
 	faceplayer
 	waitse
@@ -84,7 +84,7 @@ PacifidlogTown_House2_EventScript_HappyAzurill:: @ 8203891
 	release
 	end
 
-PacifidlogTown_House2_EventScript_UnhappyAzurill:: @ 82038AC
+PacifidlogTown_House2_EventScript_UnhappyAzurill::
 	lock
 	faceplayer
 	waitse
@@ -95,7 +95,7 @@ PacifidlogTown_House2_EventScript_UnhappyAzurill:: @ 82038AC
 	release
 	end
 
-PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation: @ 82038C7
+PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation:
 	.string "Er-hem!\p"
 	.string "I am the POKéMON FAN CLUB's most\n"
 	.string "important person, the CHAIRMAN's\l"
@@ -103,50 +103,50 @@ PacifidlogTown_House2_Text_ChairmansYoungerBrotherOnVacation: @ 82038C7
 	.string "I'm here enjoying my vacation with\n"
 	.string "POKéMON, yes, indeed.$"
 
-PacifidlogTown_House2_Text_AhYourPokemon: @ 820395B
+PacifidlogTown_House2_Text_AhYourPokemon:
 	.string "Ah!\n"
 	.string "Your POKéMON…$"
 
-PacifidlogTown_House2_Text_AdoringPokemonTakeThis: @ 820396D
+PacifidlogTown_House2_Text_AdoringPokemonTakeThis:
 	.string "It clearly likes you very much.\p"
 	.string "A POKéMON that adoring and adorable\n"
 	.string "deserves a TM like this, no?$"
 
-PacifidlogTown_House2_Text_PutInSomeMoreEffort: @ 82039CE
+PacifidlogTown_House2_Text_PutInSomeMoreEffort:
 	.string "Hmm…\n"
 	.string "It's not bad, but it's also not good.\p"
 	.string "You, as the TRAINER, need to put in\n"
 	.string "some more effort.$"
 
-PacifidlogTown_House2_Text_ViciousPokemonTakeThis: @ 8203A2F
+PacifidlogTown_House2_Text_ViciousPokemonTakeThis:
 	.string "It has a vicious look to it.\p"
 	.string "A frightening POKéMON like that\n"
 	.string "deserves a TM like this.$"
 
-PacifidlogTown_House2_Text_ExplainReturnFrustration: @ 8203A85
+PacifidlogTown_House2_Text_ExplainReturnFrustration:
 	.string "If a POKéMON likes you a lot, RETURN's\n"
 	.string "power is enhanced.\p"
 	.string "If it doesn't like you, FRUSTRATION's\n"
 	.string "power goes up.$"
 
-PacifidlogTown_House2_Text_GetGoodTMInXDays: @ 8203AF4
+PacifidlogTown_House2_Text_GetGoodTMInXDays:
 	.string "Oh, yes. In about {STR_VAR_1} or so days,\n"
 	.string "I should be getting a good TM or two.\p"
 	.string "You should come see me then.\n"
 	.string "I'll give you a TM that's suitable for\l"
 	.string "your POKéMON.$"
 
-PacifidlogTown_House2_Text_Rurii: @ 8203B8D
+PacifidlogTown_House2_Text_Rurii:
 	.string "AZURILL: Rurii.$"
 
-PacifidlogTown_House2_Text_VeryFriendlyWithTrainer: @ 8203B9D
+PacifidlogTown_House2_Text_VeryFriendlyWithTrainer:
 	.string "It appears to be very friendly with the\n"
 	.string "TRAINER.$"
 
-PacifidlogTown_House2_Text_Rururi: @ 8203BCE
+PacifidlogTown_House2_Text_Rururi:
 	.string "AZURILL: Rururi!$"
 
-PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch: @ 8203BDF
+PacifidlogTown_House2_Text_DoesntLikeTrainerVeryMuch:
 	.string "It doesn't appear to like the TRAINER\n"
 	.string "very much.$"
 
diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc
index ea33c8d01..c53ef0519 100644
--- a/data/maps/PacifidlogTown_House3/scripts.inc
+++ b/data/maps/PacifidlogTown_House3/scripts.inc
@@ -1,7 +1,7 @@
-PacifidlogTown_House3_MapScripts:: @ 8203C10
+PacifidlogTown_House3_MapScripts::
 	.byte 0
 
-PacifidlogTown_House3_EventScript_Trader:: @ 8203C11
+PacifidlogTown_House3_EventScript_Trader::
 	lock
 	faceplayer
 	goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_TradeCompleted
@@ -33,27 +33,27 @@ PacifidlogTown_House3_EventScript_Trader:: @ 8203C11
 	release
 	end
 
-PacifidlogTown_House3_EventScript_DeclineTrade:: @ 8203C93
+PacifidlogTown_House3_EventScript_DeclineTrade::
 	msgbox PacifidlogTown_House3_Text_NotDesperateOrAnything, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House3_EventScript_NotRequestedMon:: @ 8203C9D
+PacifidlogTown_House3_EventScript_NotRequestedMon::
 	bufferspeciesname 0, VAR_0x8009
 	msgbox PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House3_EventScript_TradeCompleted:: @ 8203CAB
+PacifidlogTown_House3_EventScript_TradeCompleted::
 	msgbox PacifidlogTown_House3_Text_ReallyWantedToGetBagon, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House3_EventScript_Girl:: @ 8203CB5
+PacifidlogTown_House3_EventScript_Girl::
 	msgbox PacifidlogTown_House3_Text_IsThatAPokedex, MSGBOX_NPC
 	end
 
-PacifidlogTown_House3_Text_WillingToTradeIt: @ 8203CBE
+PacifidlogTown_House3_Text_WillingToTradeIt:
 	.string "Check out this {STR_VAR_2}!\p"
 	.string "It's the {STR_VAR_2} that I caught\n"
 	.string "yesterday to celebrate my birthday!\p"
@@ -62,29 +62,29 @@ PacifidlogTown_House3_Text_WillingToTradeIt: @ 8203CBE
 	.string "I'll tell you what. I might be willing\n"
 	.string "to trade it for a {STR_VAR_1}.$"
 
-PacifidlogTown_House3_Text_ItsSubtlyDifferentThankYou: @ 8203D87
+PacifidlogTown_House3_Text_ItsSubtlyDifferentThankYou:
 	.string "Oh, so this is a {STR_VAR_1}?\p"
 	.string "It's sort of like a {STR_VAR_2},\n"
 	.string "and yet it's subtly different.\p"
 	.string "Thank you!$"
 
-PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon: @ 8203DDE
+PacifidlogTown_House3_Text_WontAcceptAnyLessThanRealMon:
 	.string "No, no, no! I won't accept any\n"
 	.string "less than a real {STR_VAR_1}!$"
 
-PacifidlogTown_House3_Text_NotDesperateOrAnything: @ 8203E12
+PacifidlogTown_House3_Text_NotDesperateOrAnything:
 	.string "Oh, so you're not going to go through\n"
 	.string "with this?\p"
 	.string "That's cool. I'm not desperate to make\n"
 	.string "a trade or anything.$"
 
-PacifidlogTown_House3_Text_ReallyWantedToGetBagon: @ 8203E7F
+PacifidlogTown_House3_Text_ReallyWantedToGetBagon:
 	.string "I know I could go looking for one\n"
 	.string "on my own, but…\p"
 	.string "But I really wanted to get a BAGON\n"
 	.string "that another TRAINER caught…$"
 
-PacifidlogTown_House3_Text_IsThatAPokedex: @ 8203EF1
+PacifidlogTown_House3_Text_IsThatAPokedex:
 	.string "Is that a POKéDEX?\p"
 	.string "Did you get to meet a lot of different\n"
 	.string "POKéMON?\p"
diff --git a/data/maps/PacifidlogTown_House4/scripts.inc b/data/maps/PacifidlogTown_House4/scripts.inc
index 42a988bc2..12d7197bd 100644
--- a/data/maps/PacifidlogTown_House4/scripts.inc
+++ b/data/maps/PacifidlogTown_House4/scripts.inc
@@ -1,15 +1,15 @@
-PacifidlogTown_House4_MapScripts:: @ 8203F4B
+PacifidlogTown_House4_MapScripts::
 	.byte 0
 
-PacifidlogTown_House4_EventScript_LittleGirl:: @ 8203F4C
+PacifidlogTown_House4_EventScript_LittleGirl::
 	msgbox PacifidlogTown_House4_Text_SkyPokemon, MSGBOX_NPC
 	end
 
-PacifidlogTown_House4_EventScript_Woman:: @ 8203F55
+PacifidlogTown_House4_EventScript_Woman::
 	msgbox PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon, MSGBOX_NPC
 	end
 
-PacifidlogTown_House4_EventScript_Boy:: @ 8203F5E
+PacifidlogTown_House4_EventScript_Boy::
 	lock
 	faceplayer
 	msgbox PacifidlogTown_House4_Text_WhereDidYouComeFrom, MSGBOX_YESNO
@@ -19,35 +19,35 @@ PacifidlogTown_House4_EventScript_Boy:: @ 8203F5E
 	goto_if_eq PacifidlogTown_House4_EventScript_No
 	end
 
-PacifidlogTown_House4_EventScript_Yes:: @ 8203F7F
+PacifidlogTown_House4_EventScript_Yes::
 	msgbox PacifidlogTown_House4_Text_YesTown, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House4_EventScript_No:: @ 8203F89
+PacifidlogTown_House4_EventScript_No::
 	msgbox PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon: @ 8203F93
+PacifidlogTown_House4_Text_PeopleSawHighFlyingPokemon:
 	.string "People were saying they saw a POKéMON\n"
 	.string "flying high above HOENN.\p"
 	.string "Is it flying around all the time?\n"
 	.string "Doesn't it need to rest somewhere?$"
 
-PacifidlogTown_House4_Text_SkyPokemon: @ 8204017
+PacifidlogTown_House4_Text_SkyPokemon:
 	.string "A sky POKéMON!\n"
 	.string "A sky POKéMON!$"
 
-PacifidlogTown_House4_Text_WhereDidYouComeFrom: @ 8204035
+PacifidlogTown_House4_Text_WhereDidYouComeFrom:
 	.string "Where did you come from?$"
 
-PacifidlogTown_House4_Text_YesTown: @ 820404E
+PacifidlogTown_House4_Text_YesTown:
 	.string "Yes?\n"
 	.string "YES TOWN?\p"
 	.string "I've never heard of a place like that.$"
 
-PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere: @ 8204084
+PacifidlogTown_House4_Text_YouHaveToComeFromSomewhere:
 	.string "No? That doesn't make any sense.\n"
 	.string "You have to come from somewhere.\p"
 	.string "Oh! Wait! You're not going to say you\n"
diff --git a/data/maps/PacifidlogTown_House5/scripts.inc b/data/maps/PacifidlogTown_House5/scripts.inc
index f8be20f47..5da4fb902 100644
--- a/data/maps/PacifidlogTown_House5/scripts.inc
+++ b/data/maps/PacifidlogTown_House5/scripts.inc
@@ -1,7 +1,7 @@
-PacifidlogTown_House5_MapScripts:: @ 8204110
+PacifidlogTown_House5_MapScripts::
 	.byte 0
 
-PacifidlogTown_House5_EventScript_MirageIslandWatcher:: @ 8204111
+PacifidlogTown_House5_EventScript_MirageIslandWatcher::
 	lock
 	faceplayer
 	specialvar VAR_RESULT, IsMirageIslandPresent
@@ -11,23 +11,23 @@ PacifidlogTown_House5_EventScript_MirageIslandWatcher:: @ 8204111
 	release
 	end
 
-PacifidlogTown_House5_EventScript_MirageIslandPresent:: @ 820412D
+PacifidlogTown_House5_EventScript_MirageIslandPresent::
 	msgbox PacifidlogTown_House5_Text_CanSeeMirageIslandToday, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_House5_EventScript_Gentleman:: @ 8204137
+PacifidlogTown_House5_EventScript_Gentleman::
 	msgbox PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather, MSGBOX_NPC
 	end
 
-PacifidlogTown_House5_Text_CantSeeMirageIslandToday: @ 8204140
+PacifidlogTown_House5_Text_CantSeeMirageIslandToday:
 	.string "I can't see MIRAGE ISLAND today…$"
 
-PacifidlogTown_House5_Text_CanSeeMirageIslandToday: @ 8204161
+PacifidlogTown_House5_Text_CanSeeMirageIslandToday:
 	.string "Oh! Oh my!\n"
 	.string "I can see MIRAGE ISLAND today!$"
 
-PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather: @ 820418B
+PacifidlogTown_House5_Text_MirageIslandAppearDependingOnWeather:
 	.string "MIRAGE ISLAND…\p"
 	.string "It must become visible and invisible\n"
 	.string "depending on the weather conditions\l"
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index fbe42ce99..32db89f8d 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_NURSE, 1
 
-PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 82034A7
+PacifidlogTown_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, PacifidlogTown_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-PacifidlogTown_PokemonCenter_1F_OnTransition: @ 82034B2
+PacifidlogTown_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_Nurse:: @ 82034B6
+PacifidlogTown_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -17,29 +17,29 @@ PacifidlogTown_PokemonCenter_1F_EventScript_Nurse:: @ 82034B6
 	release
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_Girl:: @ 82034C4
+PacifidlogTown_PokemonCenter_1F_EventScript_Girl::
 	msgbox PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard, MSGBOX_NPC
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_Woman:: @ 82034CD
+PacifidlogTown_PokemonCenter_1F_EventScript_Woman::
 	msgbox PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola, MSGBOX_NPC
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_OldMan:: @ 82034D6
+PacifidlogTown_PokemonCenter_1F_EventScript_OldMan::
 	msgbox PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats, MSGBOX_NPC
 	end
 
-PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard: @ 82034DF
+PacifidlogTown_PokemonCenter_1F_Text_WhatColorTrainerCard:
 	.string "What color is your TRAINER CARD?\n"
 	.string "Mine's copper!$"
 
-PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola: @ 820350F
+PacifidlogTown_PokemonCenter_1F_Text_OnColonyOfCorsola:
 	.string "PACIFIDLOG TOWN floats on top of\n"
 	.string "a colony of CORSOLA.\p"
 	.string "If I told you that, would you believe\n"
 	.string "me?$"
 
-PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats: @ 820356F
+PacifidlogTown_PokemonCenter_1F_Text_AncestorsLivedOnBoats:
 	.string "The ancestors of the people in\n"
 	.string "PACIFIDLOG were said to have been\l"
 	.string "born on boats and then lived and died \l"
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
index 576c1679c..61a301175 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635
+PacifidlogTown_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ PacifidlogTown_PokemonCenter_2F_MapScripts:: @ 8203635
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-PacifidlogTown_PokemonCenter_2F_EventScript_Colosseum:: @ 820364A
+PacifidlogTown_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-PacifidlogTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 8203650
+PacifidlogTown_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-PacifidlogTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 8203656
+PacifidlogTown_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
index 5114ea639..49f1efadb 100644
--- a/data/maps/PetalburgCity/scripts.inc
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -9,7 +9,7 @@ PetalburgCity_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_OnFrame
 	.byte 0
 
-PetalburgCity_OnTransition: @ 81DC2D7
+PetalburgCity_OnTransition:
 	setflag FLAG_VISITED_PETALBURG_CITY
 	compare VAR_PETALBURG_CITY_STATE, 0
 	call_if_eq PetalburgCity_EventScript_MoveGymBoyToWestEntrance
@@ -21,25 +21,25 @@ PetalburgCity_OnTransition: @ 81DC2D7
 	call_if_eq PetalburgCity_EventScript_SetGymDoorsUnlocked
 	end
 
-PetalburgCity_EventScript_MoveGymBoyToWestEntrance:: @ 81DC307
+PetalburgCity_EventScript_MoveGymBoyToWestEntrance::
 	setobjectxyperm LOCALID_GYM_BOY, 5, 11
 	return
 
-PetalburgCity_EventScript_DisableMapNameAndMusic:: @ 81DC30F
+PetalburgCity_EventScript_DisableMapNameAndMusic::
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	savebgm MUS_FOLLOW_ME
 	return
 
-PetalburgCity_EventScript_SetGymDoorsUnlocked:: @ 81DC316
+PetalburgCity_EventScript_SetGymDoorsUnlocked::
 	setvar VAR_PETALBURG_GYM_STATE, 7
 	return
 
-PetalburgCity_OnFrame: @ 81DC31C
+PetalburgCity_OnFrame:
 	map_script_2 VAR_PETALBURG_CITY_STATE, 2, PetalburgCity_EventScript_WallyTutorial
 	map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_EventScript_WalkToWallyHouse
 	.2byte 0
 
-PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E
+PetalburgCity_EventScript_WallyTutorial::
 	lockall
 	special SavePlayerParty
 	special PutZigzagoonInPlayerParty
@@ -65,7 +65,7 @@ PetalburgCity_EventScript_WallyTutorial:: @ 81DC32E
 	releaseall
 	end
 
-PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390
+PetalburgCity_EventScript_WalkToWallyHouse::
 	lockall
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	applymovement LOCALID_WALLYS_DAD, PetalburgCity_Movement_WalkToWallyHouseWallysDad
@@ -90,7 +90,7 @@ PetalburgCity_EventScript_WalkToWallyHouse:: @ 81DC390
 	releaseall
 	end
 
-PetalburgCity_EventScript_Boy:: @ 81DC3E6
+PetalburgCity_EventScript_Boy::
 	lock
 	faceplayer
 	msgbox PetalburgCity_Text_WaterReflection, MSGBOX_DEFAULT
@@ -100,11 +100,11 @@ PetalburgCity_EventScript_Boy:: @ 81DC3E6
 	release
 	end
 
-PetalburgCity_EventScript_WallysMom:: @ 81DC3FD
+PetalburgCity_EventScript_WallysMom::
 	msgbox PetalburgCity_Text_WhereIsWally, MSGBOX_NPC
 	end
 
-PetalburgCity_Movement_WalkToWallyHousePlayer: @ 81DC406
+PetalburgCity_Movement_WalkToWallyHousePlayer:
 	delay_8
 	walk_down
 	walk_down
@@ -124,12 +124,12 @@ PetalburgCity_Movement_WalkToWallyHousePlayer: @ 81DC406
 	walk_up
 	step_end
 
-PetalburgCity_Movement_WalkInsideHousePlayer: @ 81DC418
+PetalburgCity_Movement_WalkInsideHousePlayer:
 	walk_up
 	walk_up
 	step_end
 
-PetalburgCity_Movement_WalkToWallyHouseWallysDad: @ 81DC41B
+PetalburgCity_Movement_WalkToWallyHouseWallysDad:
 	delay_8
 	walk_down
 	walk_down
@@ -149,12 +149,12 @@ PetalburgCity_Movement_WalkToWallyHouseWallysDad: @ 81DC41B
 	walk_up
 	step_end
 
-PetalburgCity_Movement_WalkInsideHouseWallysDad: @ 81DC42D
+PetalburgCity_Movement_WalkInsideHouseWallysDad:
 	walk_up
 	set_invisible
 	step_end
 
-PetalburgCity_Movement_WallyTutorialPlayer: @ 81DC430
+PetalburgCity_Movement_WallyTutorialPlayer:
 	delay_8
 	walk_down
 	walk_down
@@ -189,7 +189,7 @@ PetalburgCity_Movement_WallyTutorialPlayer: @ 81DC430
 	walk_in_place_fastest_right
 	step_end
 
-PetalburgCity_Movement_WallyTutorialWally: @ 81DC451
+PetalburgCity_Movement_WallyTutorialWally:
 	delay_8
 	walk_down
 	walk_down
@@ -228,47 +228,47 @@ PetalburgCity_Movement_WallyTutorialWally: @ 81DC451
 	walk_in_place_fastest_right
 	step_end
 
-PetalburgCity_EventScript_GymSign:: @ 81DC476
+PetalburgCity_EventScript_GymSign::
 	msgbox PetalburgCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-PetalburgCity_EventScript_CitySign:: @ 81DC47F
+PetalburgCity_EventScript_CitySign::
 	msgbox PetalburgCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-PetalburgCity_EventScript_Gentleman:: @ 81DC488
+PetalburgCity_EventScript_Gentleman::
 	msgbox PetalburgCity_Text_FullPartyExplanation, MSGBOX_NPC
 	end
 
-PetalburgCity_EventScript_WallyHouseSign:: @ 81DC491
+PetalburgCity_EventScript_WallyHouseSign::
 	msgbox PetalburgCity_Text_WallyHouseSign, MSGBOX_SIGN
 	end
 
-PetalburgCity_EventScript_ShowGymToPlayer0:: @ 81DC49A
+PetalburgCity_EventScript_ShowGymToPlayer0::
 	lockall
 	setvar VAR_0x8008, 0
 	goto PetalburgCity_EventScript_ShowGymToPlayer
 	end
 
-PetalburgCity_EventScript_ShowGymToPlayer1:: @ 81DC4A6
+PetalburgCity_EventScript_ShowGymToPlayer1::
 	lockall
 	setvar VAR_0x8008, 1
 	goto PetalburgCity_EventScript_ShowGymToPlayer
 	end
 
-PetalburgCity_EventScript_ShowGymToPlayer2:: @ 81DC4B2
+PetalburgCity_EventScript_ShowGymToPlayer2::
 	lockall
 	setvar VAR_0x8008, 2
 	goto PetalburgCity_EventScript_ShowGymToPlayer
 	end
 
-PetalburgCity_EventScript_ShowGymToPlayer3:: @ 81DC4BE
+PetalburgCity_EventScript_ShowGymToPlayer3::
 	lockall
 	setvar VAR_0x8008, 3
 	goto PetalburgCity_EventScript_ShowGymToPlayer
 	end
 
-PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA
+PetalburgCity_EventScript_ShowGymToPlayer::
 	applymovement LOCALID_GYM_BOY, Common_Movement_FacePlayer
 	waitmovement 0
 	playbgm MUS_FOLLOW_ME, FALSE
@@ -307,83 +307,83 @@ PetalburgCity_EventScript_ShowGymToPlayer:: @ 81DC4CA
 	releaseall
 	end
 
-PetalburgCity_EventScript_BoyApproachPlayer0:: @ 81DC57F
+PetalburgCity_EventScript_BoyApproachPlayer0::
 	applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer0
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_BoyApproachPlayer1:: @ 81DC594
+PetalburgCity_EventScript_BoyApproachPlayer1::
 	applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer1
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_BoyApproachPlayer2:: @ 81DC59F
+PetalburgCity_EventScript_BoyApproachPlayer2::
 	applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer2
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_BoyApproachPlayer3:: @ 81DC5B4
+PetalburgCity_EventScript_BoyApproachPlayer3::
 	applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer3
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_LeadPlayerToGym0:: @ 81DC5C9
+PetalburgCity_EventScript_LeadPlayerToGym0::
 	applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym0
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym0
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_LeadPlayerToGym1:: @ 81DC5DB
+PetalburgCity_EventScript_LeadPlayerToGym1::
 	applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym1
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym1
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_LeadPlayerToGym2:: @ 81DC5ED
+PetalburgCity_EventScript_LeadPlayerToGym2::
 	applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym2
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym2
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_LeadPlayerToGym3:: @ 81DC5FF
+PetalburgCity_EventScript_LeadPlayerToGym3::
 	applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyWalkToGym3
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWalkToGym3
 	waitmovement 0
 	return
 
 @ Unused
-PetalburgCity_Movement_Delay48:: @ 81DC611
+PetalburgCity_Movement_Delay48::
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-PetalburgCity_Movement_BoyApproachPlayer0: @ 81DC615
+PetalburgCity_Movement_BoyApproachPlayer0:
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Movement_BoyApproachPlayer1: @ 81DC61A
+PetalburgCity_Movement_BoyApproachPlayer1:
 	walk_right
 	walk_right
 	step_end
 
-PetalburgCity_Movement_BoyApproachPlayer2: @ 81DC61D
+PetalburgCity_Movement_BoyApproachPlayer2:
 	walk_right
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-PetalburgCity_Movement_BoyApproachPlayer3: @ 81DC622
+PetalburgCity_Movement_BoyApproachPlayer3:
 	walk_down
 	walk_right
 	walk_right
@@ -391,7 +391,7 @@ PetalburgCity_Movement_BoyApproachPlayer3: @ 81DC622
 	walk_in_place_fastest_down
 	step_end
 
-PetalburgCity_Movement_BoyWalkToGym0: @ 81DC628
+PetalburgCity_Movement_BoyWalkToGym0:
 	walk_right
 	walk_right
 	walk_right
@@ -404,7 +404,7 @@ PetalburgCity_Movement_BoyWalkToGym0: @ 81DC628
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Movement_BoyWalkToGym1: @ 81DC633
+PetalburgCity_Movement_BoyWalkToGym1:
 	walk_down
 	walk_right
 	walk_right
@@ -420,7 +420,7 @@ PetalburgCity_Movement_BoyWalkToGym1: @ 81DC633
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Movement_BoyWalkToGym2: @ 81DC641
+PetalburgCity_Movement_BoyWalkToGym2:
 	walk_right
 	walk_right
 	walk_right
@@ -433,7 +433,7 @@ PetalburgCity_Movement_BoyWalkToGym2: @ 81DC641
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Movement_BoyWalkToGym3: @ 81DC64C
+PetalburgCity_Movement_BoyWalkToGym3:
 	walk_right
 	walk_right
 	walk_right
@@ -447,7 +447,7 @@ PetalburgCity_Movement_BoyWalkToGym3: @ 81DC64C
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Movement_BoyWalkAway: @ 81DC658
+PetalburgCity_Movement_BoyWalkAway:
 	walk_down
 	walk_left
 	walk_left
@@ -462,7 +462,7 @@ PetalburgCity_Movement_BoyWalkAway: @ 81DC658
 	walk_left
 	step_end
 
-PetalburgCity_Movement_PlayerWalkToGym0: @ 81DC665
+PetalburgCity_Movement_PlayerWalkToGym0:
 	walk_down
 	walk_right
 	walk_right
@@ -474,7 +474,7 @@ PetalburgCity_Movement_PlayerWalkToGym0: @ 81DC665
 	walk_up
 	step_end
 
-PetalburgCity_Movement_PlayerWalkToGym1: @ 81DC66F
+PetalburgCity_Movement_PlayerWalkToGym1:
 	delay_16
 	delay_16
 	walk_down
@@ -489,7 +489,7 @@ PetalburgCity_Movement_PlayerWalkToGym1: @ 81DC66F
 	walk_up
 	step_end
 
-PetalburgCity_Movement_PlayerWalkToGym2: @ 81DC67C
+PetalburgCity_Movement_PlayerWalkToGym2:
 	walk_up
 	walk_right
 	walk_right
@@ -501,7 +501,7 @@ PetalburgCity_Movement_PlayerWalkToGym2: @ 81DC67C
 	walk_up
 	step_end
 
-PetalburgCity_Movement_PlayerWalkToGym3: @ 81DC686
+PetalburgCity_Movement_PlayerWalkToGym3:
 	walk_up
 	walk_right
 	walk_right
@@ -514,7 +514,7 @@ PetalburgCity_Movement_PlayerWalkToGym3: @ 81DC686
 	walk_up
 	step_end
 
-PetalburgCity_EventScript_Scott0:: @ 81DC691
+PetalburgCity_EventScript_Scott0::
 	lockall
 	addobject LOCALID_SCOTT
 	setvar VAR_0x8008, 0
@@ -522,7 +522,7 @@ PetalburgCity_EventScript_Scott0:: @ 81DC691
 	goto PetalburgCity_EventScript_Scott
 	end
 
-PetalburgCity_EventScript_Scott1:: @ 81DC6A7
+PetalburgCity_EventScript_Scott1::
 	lockall
 	addobject LOCALID_SCOTT
 	setvar VAR_0x8008, 1
@@ -530,7 +530,7 @@ PetalburgCity_EventScript_Scott1:: @ 81DC6A7
 	goto PetalburgCity_EventScript_Scott
 	end
 
-PetalburgCity_EventScript_Scott2:: @ 81DC6BD
+PetalburgCity_EventScript_Scott2::
 	lockall
 	addobject LOCALID_SCOTT
 	setvar VAR_0x8008, 2
@@ -538,7 +538,7 @@ PetalburgCity_EventScript_Scott2:: @ 81DC6BD
 	goto PetalburgCity_EventScript_Scott
 	end
 
-PetalburgCity_EventScript_Scott3:: @ 81DC6D3
+PetalburgCity_EventScript_Scott3::
 	lockall
 	addobject LOCALID_SCOTT
 	setvar VAR_0x8008, 3
@@ -546,7 +546,7 @@ PetalburgCity_EventScript_Scott3:: @ 81DC6D3
 	goto PetalburgCity_EventScript_Scott
 	end
 
-PetalburgCity_EventScript_Scott:: @ 81DC6E9
+PetalburgCity_EventScript_Scott::
 	applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottStartWalkLeft
 	waitmovement 0
 	playse SE_PIN
@@ -584,45 +584,45 @@ PetalburgCity_EventScript_Scott:: @ 81DC6E9
 	releaseall
 	end
 
-PetalburgCity_EventScript_ScottExit0:: @ 81DC78E
+PetalburgCity_EventScript_ScottExit0::
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit0
 	applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit0
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_ScottExit1:: @ 81DC7A0
+PetalburgCity_EventScript_ScottExit1::
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit1
 	applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit1
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_ScottExit2:: @ 81DC7B2
+PetalburgCity_EventScript_ScottExit2::
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit2
 	applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit2
 	waitmovement 0
 	return
 
-PetalburgCity_EventScript_ScottExit3:: @ 81DC7C4
+PetalburgCity_EventScript_ScottExit3::
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Movement_PlayerWatchScottExit3
 	applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottExit3
 	waitmovement 0
 	return
 
-PetalburgCity_Movement_ScottStartWalkLeft: @ 81DC7D6
+PetalburgCity_Movement_ScottStartWalkLeft:
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-PetalburgCity_Movement_ScottApproachPlayer: @ 81DC7DB
+PetalburgCity_Movement_ScottApproachPlayer:
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-PetalburgCity_Movement_ScottExit0: @ 81DC7E0
+PetalburgCity_Movement_ScottExit0:
 	walk_down
 	walk_down
 	walk_left
@@ -638,7 +638,7 @@ PetalburgCity_Movement_ScottExit0: @ 81DC7E0
 	walk_left
 	step_end
 
-PetalburgCity_Movement_PlayerWatchScottExit0: @ 81DC7EE
+PetalburgCity_Movement_PlayerWatchScottExit0:
 	delay_16
 	walk_in_place_fastest_down
 	delay_16
@@ -647,7 +647,7 @@ PetalburgCity_Movement_PlayerWatchScottExit0: @ 81DC7EE
 	walk_in_place_fastest_left
 	step_end
 
-PetalburgCity_Movement_ScottExit1: @ 81DC7F5
+PetalburgCity_Movement_ScottExit1:
 	walk_down
 	walk_left
 	walk_left
@@ -662,7 +662,7 @@ PetalburgCity_Movement_ScottExit1: @ 81DC7F5
 	walk_left
 	step_end
 
-PetalburgCity_Movement_PlayerWatchScottExit1: @ 81DC802
+PetalburgCity_Movement_PlayerWatchScottExit1:
 	delay_16
 	walk_in_place_fastest_down
 	delay_16
@@ -670,7 +670,7 @@ PetalburgCity_Movement_PlayerWatchScottExit1: @ 81DC802
 	walk_in_place_fastest_left
 	step_end
 
-PetalburgCity_Movement_ScottExit2: @ 81DC808
+PetalburgCity_Movement_ScottExit2:
 	walk_down
 	walk_left
 	walk_left
@@ -685,7 +685,7 @@ PetalburgCity_Movement_ScottExit2: @ 81DC808
 	walk_left
 	step_end
 
-PetalburgCity_Movement_PlayerWatchScottExit2: @ 81DC815
+PetalburgCity_Movement_PlayerWatchScottExit2:
 	delay_16
 	walk_in_place_fastest_down
 	delay_16
@@ -693,7 +693,7 @@ PetalburgCity_Movement_PlayerWatchScottExit2: @ 81DC815
 	walk_in_place_fastest_left
 	step_end
 
-PetalburgCity_Movement_ScottExit3: @ 81DC81B
+PetalburgCity_Movement_ScottExit3:
 	walk_up
 	walk_left
 	walk_left
@@ -708,7 +708,7 @@ PetalburgCity_Movement_ScottExit3: @ 81DC81B
 	walk_left
 	step_end
 
-PetalburgCity_Movement_PlayerWatchScottExit3: @ 81DC828
+PetalburgCity_Movement_PlayerWatchScottExit3:
 	delay_16
 	walk_in_place_fastest_up
 	delay_16
@@ -716,16 +716,16 @@ PetalburgCity_Movement_PlayerWatchScottExit3: @ 81DC828
 	walk_in_place_fastest_left
 	step_end
 
-PetalburgCity_EventScript_GymBoy:: @ 81DC82E
+PetalburgCity_EventScript_GymBoy::
 	msgbox PetalburgCity_Text_AreYouRookieTrainer, MSGBOX_NPC
 	end
 
-PetalburgCity_Text_WhereIsWally: @ 81DC837
+PetalburgCity_Text_WhereIsWally:
 	.string "Where has our WALLY gone?\p"
 	.string "We have to leave for VERDANTURF TOWN\n"
 	.string "very soon…$"
 
-PetalburgCity_Text_AreYouRookieTrainer: @ 81DC881
+PetalburgCity_Text_AreYouRookieTrainer:
 	.string "Hiya! Are you maybe…\n"
 	.string "A rookie TRAINER?\p"
 	.string "Do you know what POKéMON TRAINERS\n"
@@ -733,51 +733,51 @@ PetalburgCity_Text_AreYouRookieTrainer: @ 81DC881
 	.string "They first check what kind of GYM\n"
 	.string "is in the town.$"
 
-PetalburgCity_Text_ThisIsPetalburgGym: @ 81DC91B
+PetalburgCity_Text_ThisIsPetalburgGym:
 	.string "See? This is PETALBURG CITY's GYM.$"
 
-PetalburgCity_Text_ThisIsGymSign: @ 81DC93E
+PetalburgCity_Text_ThisIsGymSign:
 	.string "This is the GYM's sign. Look for it\n"
 	.string "whenever you're looking for a GYM.$"
 
-PetalburgCity_Text_WaterReflection: @ 81DC985
+PetalburgCity_Text_WaterReflection:
 	.string "My face is reflected in the water.\p"
 	.string "It's a shining grin full of hope…\p"
 	.string "Or it could be a look of somber silence\n"
 	.string "struggling with fear…\p"
 	.string "What do you see reflected in your face?$"
 
-PetalburgCity_Text_FullPartyExplanation: @ 81DCA30
+PetalburgCity_Text_FullPartyExplanation:
 	.string "Let's say you have six POKéMON.\n"
 	.string "If you catch another one…\p"
 	.string "It is automatically sent to a STORAGE\n"
 	.string "BOX over a PC connection.$"
 
-PetalburgCity_Text_GymSign: @ 81DCAAA
+PetalburgCity_Text_GymSign:
 	.string "PETALBURG CITY POKéMON GYM\n"
 	.string "LEADER: NORMAN\l"
 	.string "“A man in pursuit of power!”$"
 
-PetalburgCity_Text_CitySign: @ 81DCAF1
+PetalburgCity_Text_CitySign:
 	.string "PETALBURG CITY\n"
 	.string "“Where people mingle with nature.”$"
 
-PetalburgCity_Text_WallyHouseSign: @ 81DCB23
+PetalburgCity_Text_WallyHouseSign:
 	.string "WALLY'S HOUSE$"
 
-PetalburgCity_Text_AreYouATrainer: @ 81DCB31
+PetalburgCity_Text_AreYouATrainer:
 	.string "Excuse me!\p"
 	.string "Let me guess, from the way you're\n"
 	.string "dressed, are you a POKéMON TRAINER?$"
 
-PetalburgCity_Text_WellMaybeNot: @ 81DCB82
+PetalburgCity_Text_WellMaybeNot:
 	.string "… … … … … …\p"
 	.string "Well, maybe not.\n"
 	.string "Your clothes aren't all that dirty.\p"
 	.string "You're either a rookie TRAINER,\n"
 	.string "or maybe you're just an ordinary kid.$"
 
-PetalburgCity_Text_ImLookingForTalentedTrainers: @ 81DCC09
+PetalburgCity_Text_ImLookingForTalentedTrainers:
 	.string "I'm roaming the land in search of\n"
 	.string "talented TRAINERS.\p"
 	.string "I'm sorry to have taken your time.$"
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
index b2f6b1061..43e8c4108 100644
--- a/data/maps/PetalburgCity_Gym/scripts.inc
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -2,14 +2,14 @@
 .set LOCALID_WALLY, 10
 .set LOCALID_WALLYS_DAD, 11
 
-PetalburgCity_Gym_MapScripts:: @ 8204889
+PetalburgCity_Gym_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, PetalburgCity_Gym_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_Gym_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_Gym_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_Gym_OnFrame
 	.byte 0
 
-PetalburgCity_Gym_OnLoad: @ 820489E
+PetalburgCity_Gym_OnLoad:
 	compare VAR_PETALBURG_GYM_STATE, 6
 	goto_if_eq PetalburgCity_Gym_EventScript_OpenUnlockedDoors
 	compare VAR_PETALBURG_GYM_STATE, 7
@@ -17,7 +17,7 @@ PetalburgCity_Gym_OnLoad: @ 820489E
 	end
 
 @ NOTE: Strength and OHKO rooms are misleading. Both are more accurately Critical-Hit
-PetalburgCity_Gym_EventScript_OpenUnlockedDoors:: @ 82048B5
+PetalburgCity_Gym_EventScript_OpenUnlockedDoors::
 	setvar VAR_0x8005, 1
 	call PetalburgCity_Gym_EventScript_OpenGymEntranceDoors
 	call_if_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors
@@ -29,7 +29,7 @@ PetalburgCity_Gym_EventScript_OpenUnlockedDoors:: @ 82048B5
 	call_if_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_OpenOHKORoomDoors
 	end
 
-PetalburgCity_Gym_EventScript_UnlockAllDoors:: @ 82048FF
+PetalburgCity_Gym_EventScript_UnlockAllDoors::
 	setvar VAR_0x8005, 1
 	call PetalburgCity_Gym_EventScript_OpenGymEntranceDoors
 	call PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors
@@ -41,7 +41,7 @@ PetalburgCity_Gym_EventScript_UnlockAllDoors:: @ 82048FF
 	call PetalburgCity_Gym_EventScript_OpenOHKORoomDoors
 	return
 
-PetalburgCity_Gym_OnTransition: @ 820492D
+PetalburgCity_Gym_OnTransition:
 	compare VAR_PETALBURG_GYM_STATE, 1
 	call_if_eq PetalburgCity_Gym_EventScript_MoveWallyToEntrance
 	compare VAR_PETALBURG_GYM_STATE, 6
@@ -49,15 +49,15 @@ PetalburgCity_Gym_OnTransition: @ 820492D
 	call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_CheckNormanForRematch
 	end
 
-PetalburgCity_Gym_EventScript_MoveWallyToEntrance:: @ 820494D
+PetalburgCity_Gym_EventScript_MoveWallyToEntrance::
 	setobjectxyperm LOCALID_WALLY, 5, 108
 	return
 
-PetalburgCity_Gym_EventScript_MoveNormanToEntrance:: @ 8204955
+PetalburgCity_Gym_EventScript_MoveNormanToEntrance::
 	setobjectxyperm LOCALID_NORMAN, 4, 107
 	return
 
-PetalburgCity_Gym_EventScript_CheckNormanForRematch:: @ 820495D
+PetalburgCity_Gym_EventScript_CheckNormanForRematch::
 	setorcopyvar VAR_TRAINER_BATTLE_OPPONENT_A, TRAINER_NORMAN_1
 	specialvar VAR_RESULT, IsTrainerReadyForRematch
 	compare VAR_RESULT, TRUE
@@ -67,23 +67,23 @@ PetalburgCity_Gym_EventScript_CheckNormanForRematch:: @ 820495D
 	setobjectxyperm LOCALID_NORMAN, 4, 107
 	return
 
-PetalburgCity_Gym_EventScript_DontMoveNormanToFront:: @ 8204985
+PetalburgCity_Gym_EventScript_DontMoveNormanToFront::
 	setvar VAR_PETALBURG_GYM_STATE, 8
 	end
 
-PetalburgCity_Gym_OnWarp: @ 820498B
+PetalburgCity_Gym_OnWarp:
 	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_TurnPlayerNorth
 	.2byte 0
 
-PetalburgCity_Gym_EventScript_TurnPlayerNorth:: @ 8204995
+PetalburgCity_Gym_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-PetalburgCity_Gym_OnFrame: @ 820499A
+PetalburgCity_Gym_OnFrame:
 	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial
 	.2byte 0
 
-PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4
+PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial::
 	lockall
 	msgbox PetalburgCity_Gym_Text_DadSoDidItWorkOut, MSGBOX_DEFAULT
 	msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT
@@ -102,14 +102,14 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial:: @ 82049A4
 	releaseall
 	end
 
-PetalburgCity_Gym_Movement_WallyExitGym: @ 82049EC
+PetalburgCity_Gym_Movement_WallyExitGym:
 	walk_down
 	walk_down
 	walk_down
 	delay_16
 	step_end
 
-PetalburgCity_Gym_EventScript_Norman:: @ 82049F1
+PetalburgCity_Gym_EventScript_Norman::
 	lock
 	faceplayer
 	switch VAR_PETALBURG_GYM_STATE
@@ -129,27 +129,27 @@ PetalburgCity_Gym_EventScript_Norman:: @ 82049F1
 	case DIR_EAST, PetalburgCity_Gym_EventScript_BeginWallyTutorialEast
 	end
 
-PetalburgCity_Gym_EventScript_BeginWallyTutorialSouth:: @ 8204A80
+PetalburgCity_Gym_EventScript_BeginWallyTutorialSouth::
 	setvar VAR_0x8008, 0
 	goto PetalburgCity_Gym_EventScript_BeginWallyTutorial
 	end
 
-PetalburgCity_Gym_EventScript_BeginWallyTutorialNorth:: @ 8204A8B
+PetalburgCity_Gym_EventScript_BeginWallyTutorialNorth::
 	setvar VAR_0x8008, 1
 	goto PetalburgCity_Gym_EventScript_BeginWallyTutorial
 	end
 
-PetalburgCity_Gym_EventScript_BeginWallyTutorialWest:: @ 8204A96
+PetalburgCity_Gym_EventScript_BeginWallyTutorialWest::
 	setvar VAR_0x8008, 2
 	goto PetalburgCity_Gym_EventScript_BeginWallyTutorial
 	end
 
-PetalburgCity_Gym_EventScript_BeginWallyTutorialEast:: @ 8204AA1
+PetalburgCity_Gym_EventScript_BeginWallyTutorialEast::
 	setvar VAR_0x8008, 3
 	goto PetalburgCity_Gym_EventScript_BeginWallyTutorial
 	end
 
-PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC
+PetalburgCity_Gym_EventScript_BeginWallyTutorial::
 	addobject LOCALID_WALLY
 	playse SE_DOOR
 	compare VAR_0x8008, 0
@@ -225,13 +225,13 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial:: @ 8204AAC
 	release
 	end
 
-PetalburgCity_Gym_EventScript_WallyArriveSouth:: @ 8204C31
+PetalburgCity_Gym_EventScript_WallyArriveSouth::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
 	applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_WallyArriveNorth:: @ 8204C43
+PetalburgCity_Gym_EventScript_WallyArriveNorth::
 	applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArriveNorth
 	waitmovement 0
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestRight
@@ -239,127 +239,127 @@ PetalburgCity_Gym_EventScript_WallyArriveNorth:: @ 8204C43
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_WallyArriveWestEast:: @ 8204C5F
+PetalburgCity_Gym_EventScript_WallyArriveWestEast::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: @ 8204C78
+PetalburgCity_Gym_EventScript_ExitGymWithWallySouth::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
 	applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth:: @ 8204C91
+PetalburgCity_Gym_EventScript_ExitGymWithWallyNorth::
 	applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitNorth
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_ExitGymWithWallyWest:: @ 8204CA3
+PetalburgCity_Gym_EventScript_ExitGymWithWallyWest::
 	applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyWest
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_ExitGymWithWallyEast:: @ 8204CB5
+PetalburgCity_Gym_EventScript_ExitGymWithWallyEast::
 	applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitEast
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallyEast
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: @ 8204CC7
+PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: @ 8204CD2
+PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: @ 8204CE4
+PetalburgCity_Gym_EventScript_NormanAddressPlayerWest::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestRight
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: @ 8204CF6
+PetalburgCity_Gym_EventScript_NormanAddressPlayerEast::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestLeft
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_NormanAddressWallySouth:: @ 8204D08
+PetalburgCity_Gym_EventScript_NormanAddressWallySouth::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_NormanAddressWallyNorth:: @ 8204D13
+PetalburgCity_Gym_EventScript_NormanAddressWallyNorth::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_NormanAddressWallyWest:: @ 8204D1E
+PetalburgCity_Gym_EventScript_NormanAddressWallyWest::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_NormanAddressWallyEast:: @ 8204D29
+PetalburgCity_Gym_EventScript_NormanAddressWallyEast::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_WallyFacePlayer:: @ 8204D34
+PetalburgCity_Gym_EventScript_WallyFacePlayer::
 	applymovement LOCALID_WALLY, Common_Movement_FacePlayer
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_WallyFaceDown:: @ 8204D3F
+PetalburgCity_Gym_EventScript_WallyFaceDown::
 	applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_NormanNoBadges:: @ 8204D4A
+PetalburgCity_Gym_EventScript_NormanNoBadges::
 	msgbox PetalburgCity_Gym_Text_NormanGoToRustboro, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_Gym_EventScript_NormanOneBadge:: @ 8204D54
+PetalburgCity_Gym_EventScript_NormanOneBadge::
 	msgbox PetalburgCity_Gym_Text_NormanGoToDewford, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_Gym_EventScript_NormanTwoBadges:: @ 8204D5E
+PetalburgCity_Gym_EventScript_NormanTwoBadges::
 	msgbox PetalburgCity_Gym_Text_YouHaveGottenStronger, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_Gym_EventScript_NormanThreeBadges:: @ 8204D68
+PetalburgCity_Gym_EventScript_NormanThreeBadges::
 	msgbox PetalburgCity_Gym_Text_YouHaveGottenStronger, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_Gym_EventScript_NormanFaceDoorSouth:: @ 8204D72
+PetalburgCity_Gym_EventScript_NormanFaceDoorSouth::
 	return
 
 @ For all other NormanFaceDoorX, Norman is already facing the door from NormanAddressWallyX
-PetalburgCity_Gym_EventScript_NormanFaceDoorNorth:: @ 8204D73
+PetalburgCity_Gym_EventScript_NormanFaceDoorNorth::
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_NormanFaceDoorWest:: @ 8204D7E
+PetalburgCity_Gym_EventScript_NormanFaceDoorWest::
 	return
 
-PetalburgCity_Gym_EventScript_NormanFaceDoorEast:: @ 8204D7F
+PetalburgCity_Gym_EventScript_NormanFaceDoorEast::
 	return
 
-PetalburgCity_Gym_EventScript_NormanPostBattle:: @ 8204D80
+PetalburgCity_Gym_EventScript_NormanPostBattle::
 	call PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry
 	compare VAR_RESULT, TRUE
 	goto_if_eq PetalburgCity_Gym_EventScript_GiveEnigmaBerry
@@ -369,17 +369,17 @@ PetalburgCity_Gym_EventScript_NormanPostBattle:: @ 8204D80
 	release
 	end
 
-PetalburgCity_Gym_EventScript_GiveFacade2:: @ 8204DAC
+PetalburgCity_Gym_EventScript_GiveFacade2::
 	call PetalburgCity_Gym_EventScript_GiveFacade
 	release
 	end
 
-PetalburgCity_Gym_EventScript_NormanRematch:: @ 8204DB3
+PetalburgCity_Gym_EventScript_NormanRematch::
 	trainerbattle_rematch_double TRAINER_NORMAN_1, PetalburgCity_Gym_Text_NormanPreRematch, PetalburgCity_Gym_Text_NormanRematchDefeat, PetalburgCity_Gym_Text_NormanRematchNeedTwoMons
 	msgbox PetalburgCity_Gym_Text_NormanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry:: @ 8204DCE
+PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry::
 	specialvar VAR_RESULT, IsEnigmaBerryValid
 	compare VAR_RESULT, FALSE
 	goto_if_eq PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry
@@ -395,11 +395,11 @@ PetalburgCity_Gym_EventScript_ShouldGiveEnigmaBerry:: @ 8204DCE
 	setvar VAR_RESULT, TRUE
 	return
 
-PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry:: @ 8204E17
+PetalburgCity_Gym_EventScript_DontGiveEnigmaBerry::
 	setvar VAR_RESULT, FALSE
 	return
 
-PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 8204E1D
+PetalburgCity_Gym_EventScript_GiveEnigmaBerry::
 	giveitem ITEM_ENIGMA_BERRY
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -407,7 +407,7 @@ PetalburgCity_Gym_EventScript_GiveEnigmaBerry:: @ 8204E1D
 	release
 	end
 
-PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
+PetalburgCity_Gym_EventScript_NormanBattle::
 	msgbox PetalburgCity_Gym_Text_NormanIntro, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_NORMAN_1, PetalburgCity_Gym_Text_NormanDefeat
 	message PetalburgCity_Gym_Text_ReceivedBalanceBadge
@@ -440,7 +440,7 @@ PetalburgCity_Gym_EventScript_NormanBattle:: @ 8204E3B
 	case DIR_EAST, PetalburgCity_Gym_EventScript_WallysDadArrivesEast
 	end
 
-PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2
+PetalburgCity_Gym_EventScript_GiveFacade::
 	giveitem ITEM_TM42
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_BagIsFull
@@ -448,19 +448,19 @@ PetalburgCity_Gym_EventScript_GiveFacade:: @ 8204ED2
 	msgbox PetalburgCity_Gym_Text_ExplainFacade, MSGBOX_DEFAULT
 	return
 
-PetalburgCity_Gym_EventScript_WallysDadArrivesNorth:: @ 8204EF5
+PetalburgCity_Gym_EventScript_WallysDadArrivesNorth::
 	setvar VAR_0x8008, 1
 	goto PetalburgCity_Gym_EventScript_WallysDadArrives
 
-PetalburgCity_Gym_EventScript_WallysDadArrivesEast:: @ 8204EFF
+PetalburgCity_Gym_EventScript_WallysDadArrivesEast::
 	setvar VAR_0x8008, 2
 	goto PetalburgCity_Gym_EventScript_WallysDadArrives
 
-PetalburgCity_Gym_EventScript_WallysDadArrivesWest:: @ 8204F09
+PetalburgCity_Gym_EventScript_WallysDadArrivesWest::
 	setvar VAR_0x8008, 3
 	goto PetalburgCity_Gym_EventScript_WallysDadArrives
 
-PetalburgCity_Gym_EventScript_WallysDadArrives:: @ 8204F13
+PetalburgCity_Gym_EventScript_WallysDadArrives::
 	applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadEnterGym
 	waitmovement 0
 	playse SE_PIN
@@ -502,22 +502,22 @@ PetalburgCity_Gym_EventScript_WallysDadArrives:: @ 8204F13
 	release
 	end
 
-PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth:: @ 8204FCC
+PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth::
 	applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast:: @ 8204FD7
+PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast::
 	applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest:: @ 8204FE2
+PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest::
 	applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth:: @ 8204FED
+PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth::
 	applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -525,7 +525,7 @@ PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth:: @ 8204FED
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast:: @ 8205009
+PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast::
 	applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
@@ -533,7 +533,7 @@ PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast:: @ 8205009
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest:: @ 8205025
+PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest::
 	applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
@@ -541,26 +541,26 @@ PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest:: @ 8205025
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth:: @ 8205041
+PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth::
 	applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth
 	applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast:: @ 820505A
+PetalburgCity_Gym_EventScript_ExitGymWithWallysDadEast::
 	applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitEast
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest:: @ 820506C
+PetalburgCity_Gym_EventScript_ExitGymWithWallysDadWest::
 	applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitWest
 	applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest
 	waitmovement 0
 	return
 
-PetalburgCity_Gym_Movement_WallysDadExitNorth: @ 820507E
+PetalburgCity_Gym_Movement_WallysDadExitNorth:
 	walk_down
 	walk_down
 	walk_left
@@ -573,7 +573,7 @@ PetalburgCity_Gym_Movement_WallysDadExitNorth: @ 820507E
 	set_invisible
 	step_end
 
-PetalburgCity_Gym_Movement_WallysDadExitEast: @ 8205089
+PetalburgCity_Gym_Movement_WallysDadExitEast:
 	walk_down
 	walk_down
 	walk_left
@@ -586,7 +586,7 @@ PetalburgCity_Gym_Movement_WallysDadExitEast: @ 8205089
 	set_invisible
 	step_end
 
-PetalburgCity_Gym_Movement_WallysDadExitWest: @ 8205094
+PetalburgCity_Gym_Movement_WallysDadExitWest:
 	walk_down
 	walk_down
 	walk_left
@@ -601,7 +601,7 @@ PetalburgCity_Gym_Movement_WallysDadExitWest: @ 8205094
 	set_invisible
 	step_end
 
-PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth: @ 82050A1
+PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth:
 	delay_16
 	walk_down
 	walk_down
@@ -611,7 +611,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth: @ 82050A1
 	walk_down
 	step_end
 
-PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast: @ 82050A9
+PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast:
 	delay_16
 	walk_down
 	walk_down
@@ -621,7 +621,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysDadEast: @ 82050A9
 	walk_down
 	step_end
 
-PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest: @ 82050B1
+PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest:
 	delay_16
 	walk_down
 	walk_down
@@ -633,7 +633,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest: @ 82050B1
 	walk_down
 	step_end
 
-PetalburgCity_Gym_Movement_WallysDadEnterGym: @ 82050BB
+PetalburgCity_Gym_Movement_WallysDadEnterGym:
 	walk_up
 	delay_8
 	walk_in_place_fastest_right
@@ -643,7 +643,7 @@ PetalburgCity_Gym_Movement_WallysDadEnterGym: @ 82050BB
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth: @ 82050C3
+PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth:
 	walk_right
 	walk_right
 	walk_up
@@ -652,7 +652,7 @@ PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth: @ 82050C3
 	walk_in_place_fastest_right
 	step_end
 
-PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast: @ 82050CA
+PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast:
 	walk_right
 	walk_right
 	walk_up
@@ -660,7 +660,7 @@ PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast: @ 82050CA
 	walk_up
 	step_end
 
-PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest: @ 82050D0
+PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest:
 	walk_right
 	walk_right
 	walk_up
@@ -670,7 +670,7 @@ PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest: @ 82050D0
 	walk_up
 	step_end
 
-PetalburgCity_Gym_Movement_Unused: @ 82050D8
+PetalburgCity_Gym_Movement_Unused:
 	walk_in_place_fastest_up
 	delay_16
 	delay_16
@@ -681,7 +681,7 @@ PetalburgCity_Gym_Movement_Unused: @ 82050D8
 	walk_in_place_fastest_down
 	step_end
 
-PetalburgCity_Gym_Movement_WallyArriveNorth: @ 82050E1
+PetalburgCity_Gym_Movement_WallyArriveNorth:
 	delay_16
 	walk_up
 	delay_16
@@ -693,7 +693,7 @@ PetalburgCity_Gym_Movement_WallyArriveNorth: @ 82050E1
 	walk_in_place_fastest_left
 	step_end
 
-PetalburgCity_Gym_Movement_WallyArrive: @ 82050EB
+PetalburgCity_Gym_Movement_WallyArrive:
 	delay_16
 	walk_up
 	delay_16
@@ -702,7 +702,7 @@ PetalburgCity_Gym_Movement_WallyArrive: @ 82050EB
 	walk_up
 	step_end
 
-PetalburgCity_Gym_Movement_WallyExitNorth: @ 82050F2
+PetalburgCity_Gym_Movement_WallyExitNorth:
 	walk_down
 	walk_down
 	walk_down
@@ -712,7 +712,7 @@ PetalburgCity_Gym_Movement_WallyExitNorth: @ 82050F2
 	walk_in_place_down
 	step_end
 
-PetalburgCity_Gym_Movement_WallyExitEast: @ 82050FA
+PetalburgCity_Gym_Movement_WallyExitEast:
 	walk_down
 	walk_down
 	walk_right
@@ -722,7 +722,7 @@ PetalburgCity_Gym_Movement_WallyExitEast: @ 82050FA
 	walk_in_place_down
 	step_end
 
-PetalburgCity_Gym_Movement_WallyExitSouthWest: @ 8205102
+PetalburgCity_Gym_Movement_WallyExitSouthWest:
 	walk_down
 	walk_down
 	walk_down
@@ -731,7 +731,7 @@ PetalburgCity_Gym_Movement_WallyExitSouthWest: @ 8205102
 	walk_in_place_down
 	step_end
 
-PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth: @ 8205109
+PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth:
 	delay_16
 	delay_16
 	delay_16
@@ -741,7 +741,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallyNorth: @ 8205109
 	delay_8
 	step_end
 
-PetalburgCity_Gym_Movement_PlayerExitWithWallySouth: @ 8205111
+PetalburgCity_Gym_Movement_PlayerExitWithWallySouth:
 	delay_16
 	delay_16
 	walk_right
@@ -753,7 +753,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallySouth: @ 8205111
 	delay_8
 	step_end
 
-PetalburgCity_Gym_Movement_PlayerExitWithWallyWest: @ 820511B
+PetalburgCity_Gym_Movement_PlayerExitWithWallyWest:
 	delay_16
 	delay_16
 	walk_down
@@ -763,7 +763,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallyWest: @ 820511B
 	delay_8
 	step_end
 
-PetalburgCity_Gym_Movement_PlayerExitWithWallyEast: @ 8205123
+PetalburgCity_Gym_Movement_PlayerExitWithWallyEast:
 	walk_in_place_fastest_down
 	delay_16
 	delay_16
@@ -775,12 +775,12 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallyEast: @ 8205123
 	delay_8
 	step_end
 
-PetalburgCity_Gym_EventScript_NoAmountOfTrainingIsEnough:: @ 820512D
+PetalburgCity_Gym_EventScript_NoAmountOfTrainingIsEnough::
 	msgbox PetalburgCity_Gym_Text_DadNoAmountOfTrainingIsEnough, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_Gym_EventScript_SpeedRoomDoor:: @ 8205137
+PetalburgCity_Gym_EventScript_SpeedRoomDoor::
 	lockall
 	compare VAR_PETALBURG_GYM_STATE, 6
 	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
@@ -793,7 +793,7 @@ PetalburgCity_Gym_EventScript_SpeedRoomDoor:: @ 8205137
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_EnterRoom:: @ 820516C
+PetalburgCity_Gym_EventScript_EnterRoom::
 	closemessage
 	delay 30
 	warpdoor MAP_PETALBURG_CITY_GYM, 255, VAR_0x8008, VAR_0x8009
@@ -801,17 +801,17 @@ PetalburgCity_Gym_EventScript_EnterRoom:: @ 820516C
 	releaseall
 	end
 
-PetalburgCity_Gym_EventScript_DontEnterRoom:: @ 820517B
+PetalburgCity_Gym_EventScript_DontEnterRoom::
 	releaseall
 	end
 
-PetalburgCity_Gym_EventScript_DoorLocked:: @ 820517D
+PetalburgCity_Gym_EventScript_DoorLocked::
 	msgbox PetalburgCity_Gym_Text_DoorAppearsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
 @ VAR_0x8008 and VAR_0x8009 below are the x and y coordinates of the warp
-PetalburgCity_Gym_EventScript_AccuracyRoomDoor:: @ 8205187
+PetalburgCity_Gym_EventScript_AccuracyRoomDoor::
 	lockall
 	compare VAR_PETALBURG_GYM_STATE, 6
 	goto_if_lt PetalburgCity_Gym_EventScript_DoorLocked
@@ -824,7 +824,7 @@ PetalburgCity_Gym_EventScript_AccuracyRoomDoor:: @ 8205187
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_ConfusionRoomDoor:: @ 82051BC
+PetalburgCity_Gym_EventScript_ConfusionRoomDoor::
 	lockall
 	goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 7
@@ -836,7 +836,7 @@ PetalburgCity_Gym_EventScript_ConfusionRoomDoor:: @ 82051BC
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor:: @ 82051EF
+PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor::
 	lockall
 	goto_if_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 1
@@ -848,7 +848,7 @@ PetalburgCity_Gym_EventScript_LeftDefenseRoomDoor:: @ 82051EF
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_RightDefenseRoomDoor:: @ 8205222
+PetalburgCity_Gym_EventScript_RightDefenseRoomDoor::
 	lockall
 	goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 7
@@ -860,7 +860,7 @@ PetalburgCity_Gym_EventScript_RightDefenseRoomDoor:: @ 8205222
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_RecoveryRoomDoor:: @ 8205255
+PetalburgCity_Gym_EventScript_RecoveryRoomDoor::
 	lockall
 	goto_if_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 1
@@ -872,7 +872,7 @@ PetalburgCity_Gym_EventScript_RecoveryRoomDoor:: @ 8205255
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor:: @ 8205288
+PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor::
 	lockall
 	goto_if_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 1
@@ -884,7 +884,7 @@ PetalburgCity_Gym_EventScript_LeftStrengthRoomDoor:: @ 8205288
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_RightStrengthRoomDoor:: @ 82052BB
+PetalburgCity_Gym_EventScript_RightStrengthRoomDoor::
 	lockall
 	goto_if_not_defeated TRAINER_ALEXIA, PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 7
@@ -896,7 +896,7 @@ PetalburgCity_Gym_EventScript_RightStrengthRoomDoor:: @ 82052BB
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_LeftOHKORoomDoor:: @ 82052EE
+PetalburgCity_Gym_EventScript_LeftOHKORoomDoor::
 	lockall
 	goto_if_not_defeated TRAINER_ALEXIA, PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 1
@@ -908,7 +908,7 @@ PetalburgCity_Gym_EventScript_LeftOHKORoomDoor:: @ 82052EE
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_RightOHKORoomDoor:: @ 8205321
+PetalburgCity_Gym_EventScript_RightOHKORoomDoor::
 	lockall
 	goto_if_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 7
@@ -920,7 +920,7 @@ PetalburgCity_Gym_EventScript_RightOHKORoomDoor:: @ 8205321
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor:: @ 8205354
+PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor::
 	lockall
 	goto_if_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 1
@@ -932,7 +932,7 @@ PetalburgCity_Gym_EventScript_LeftGymLeadersRoomDoor:: @ 8205354
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8205387
+PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor::
 	lockall
 	goto_if_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_DoorLocked
 	setvar VAR_0x8008, 7
@@ -944,128 +944,128 @@ PetalburgCity_Gym_EventScript_RightGymLeadersRoomDoor:: @ 8205387
 	goto_if_eq PetalburgCity_Gym_EventScript_DontEnterRoom
 	end
 
-PetalburgCity_Gym_EventScript_Randall:: @ 82053BA
+PetalburgCity_Gym_EventScript_Randall::
 	trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_RandallIntro, PetalburgCity_Gym_Text_RandallDefeat, PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_RandallPostBadge
 	msgbox PetalburgCity_Gym_Text_RandallPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors:: @ 82053DE
+PetalburgCity_Gym_EventScript_SlideOpenSpeedRoomDoors::
 	setvar VAR_0x8005, 0
 	call PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors
 	special DrawWholeMapView
 	release
 	end
 
-PetalburgCity_Gym_EventScript_RandallPostBadge:: @ 82053ED
+PetalburgCity_Gym_EventScript_RandallPostBadge::
 	msgbox PetalburgCity_Gym_Text_RandallPostBadge, MSGBOX_NPC
 	end
 
-PetalburgCity_Gym_EventScript_Parker:: @ 82053F6
+PetalburgCity_Gym_EventScript_Parker::
 	trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_ParkerIntro, PetalburgCity_Gym_Text_ParkerDefeat, PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_ParkerPostBadge
 	msgbox PetalburgCity_Gym_Text_ParkerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors:: @ 820541A
+PetalburgCity_Gym_EventScript_SlideOpenConfusionRoomDoors::
 	setvar VAR_0x8005, 0
 	call PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors
 	special DrawWholeMapView
 	release
 	end
 
-PetalburgCity_Gym_EventScript_ParkerPostBadge:: @ 8205429
+PetalburgCity_Gym_EventScript_ParkerPostBadge::
 	msgbox PetalburgCity_Gym_Text_ParkerPostBadge, MSGBOX_NPC
 	end
 
-PetalburgCity_Gym_EventScript_George:: @ 8205432
+PetalburgCity_Gym_EventScript_George::
 	trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_GeorgeIntro, PetalburgCity_Gym_Text_GeorgeDefeat, PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GeorgePostBadge
 	msgbox PetalburgCity_Gym_Text_GeorgePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors:: @ 8205456
+PetalburgCity_Gym_EventScript_SlideOpenRecoveryRoomDoors::
 	setvar VAR_0x8005, 0
 	call PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors
 	special DrawWholeMapView
 	release
 	end
 
-PetalburgCity_Gym_EventScript_GeorgePostBadge:: @ 8205465
+PetalburgCity_Gym_EventScript_GeorgePostBadge::
 	msgbox PetalburgCity_Gym_Text_GeorgePostBadge, MSGBOX_NPC
 	end
 
-PetalburgCity_Gym_EventScript_Berke:: @ 820546E
+PetalburgCity_Gym_EventScript_Berke::
 	trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_BerkeIntro, PetalburgCity_Gym_Text_BerkeDefeat, PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_BerkePostBadge
 	msgbox PetalburgCity_Gym_Text_BerkePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors:: @ 8205492
+PetalburgCity_Gym_EventScript_SlideOpenOHKORoomDoors::
 	setvar VAR_0x8005, 0
 	call PetalburgCity_Gym_EventScript_OpenOHKORoomDoors
 	special DrawWholeMapView
 	release
 	end
 
-PetalburgCity_Gym_EventScript_BerkePostBadge:: @ 82054A1
+PetalburgCity_Gym_EventScript_BerkePostBadge::
 	msgbox PetalburgCity_Gym_Text_BerkePostBadge, MSGBOX_NPC
 	end
 
-PetalburgCity_Gym_EventScript_Mary:: @ 82054AA
+PetalburgCity_Gym_EventScript_Mary::
 	trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_MaryIntro, PetalburgCity_Gym_Text_MaryDefeat, PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_MaryPostBadge
 	msgbox PetalburgCity_Gym_Text_MaryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors:: @ 82054CE
+PetalburgCity_Gym_EventScript_SlideOpenAccuracyRoomDoors::
 	setvar VAR_0x8005, 0
 	call PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors
 	special DrawWholeMapView
 	release
 	end
 
-PetalburgCity_Gym_EventScript_MaryPostBadge:: @ 82054DD
+PetalburgCity_Gym_EventScript_MaryPostBadge::
 	msgbox PetalburgCity_Gym_Text_MaryPostBadge, MSGBOX_NPC
 	end
 
-PetalburgCity_Gym_EventScript_Alexia:: @ 82054E6
+PetalburgCity_Gym_EventScript_Alexia::
 	trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_AlexiaIntro, PetalburgCity_Gym_Text_AlexiaDefeat, PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_AlexiaPostBadge
 	msgbox PetalburgCity_Gym_Text_AlexiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors:: @ 820550A
+PetalburgCity_Gym_EventScript_SlideOpenDefenseRoomDoors::
 	setvar VAR_0x8005, 0
 	call PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors
 	special DrawWholeMapView
 	release
 	end
 
-PetalburgCity_Gym_EventScript_AlexiaPostBadge:: @ 8205519
+PetalburgCity_Gym_EventScript_AlexiaPostBadge::
 	msgbox PetalburgCity_Gym_Text_AlexiaPostBadge, MSGBOX_NPC
 	end
 
-PetalburgCity_Gym_EventScript_Jody:: @ 8205522
+PetalburgCity_Gym_EventScript_Jody::
 	trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_JodyIntro, PetalburgCity_Gym_Text_JodyDefeat, PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_JodyPostBadge
 	msgbox PetalburgCity_Gym_Text_JodyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors:: @ 8205546
+PetalburgCity_Gym_EventScript_SlideOpenStrengthRoomDoors::
 	setvar VAR_0x8005, 0
 	call PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors
 	special DrawWholeMapView
 	release
 	end
 
-PetalburgCity_Gym_EventScript_JodyPostBadge:: @ 8205555
+PetalburgCity_Gym_EventScript_JodyPostBadge::
 	msgbox PetalburgCity_Gym_Text_JodyPostBadge, MSGBOX_NPC
 	end
 
 @ VAR_0x8004 below is the room number
 @ VAR_0x8005 below is 0 when the door should be slid open and 1 when it should be unlocked immediately
-PetalburgCity_Gym_EventScript_OpenGymEntranceDoors:: @ 820555E
+PetalburgCity_Gym_EventScript_OpenGymEntranceDoors::
 	setvar VAR_0x8004, 1
 	compare VAR_0x8005, 0
 	call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors
@@ -1074,7 +1074,7 @@ PetalburgCity_Gym_EventScript_OpenGymEntranceDoors:: @ 820555E
 	call PetalburgCity_Gym_EventScript_SetEntranceRoomDoorMetatiles
 	return
 
-PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors:: @ 820557F
+PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors::
 	setvar VAR_0x8004, 2
 	compare VAR_0x8005, 0
 	call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors
@@ -1083,7 +1083,7 @@ PetalburgCity_Gym_EventScript_OpenSpeedRoomDoors:: @ 820557F
 	call PetalburgCity_Gym_EventScript_SetSpeedRoomDoorMetatiles
 	return
 
-PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors:: @ 82055A0
+PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors::
 	setvar VAR_0x8004, 3
 	compare VAR_0x8005, 0
 	call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors
@@ -1092,7 +1092,7 @@ PetalburgCity_Gym_EventScript_OpenAccuracyRoomDoors:: @ 82055A0
 	call PetalburgCity_Gym_EventScript_SetAccuracyRoomDoorMetatiles
 	return
 
-PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors:: @ 82055C1
+PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors::
 	setvar VAR_0x8004, 4
 	compare VAR_0x8005, 0
 	call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors
@@ -1101,7 +1101,7 @@ PetalburgCity_Gym_EventScript_OpenConfusionRoomDoors:: @ 82055C1
 	call PetalburgCity_Gym_EventScript_SetConfusionRoomDoorMetatiles
 	return
 
-PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors:: @ 82055E2
+PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors::
 	setvar VAR_0x8004, 5
 	compare VAR_0x8005, 0
 	call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors
@@ -1110,7 +1110,7 @@ PetalburgCity_Gym_EventScript_OpenDefenseRoomDoors:: @ 82055E2
 	call PetalburgCity_Gym_EventScript_SetDefenseRoomDoorMetatiles
 	return
 
-PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors:: @ 8205603
+PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors::
 	setvar VAR_0x8004, 6
 	compare VAR_0x8005, 0
 	call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors
@@ -1119,7 +1119,7 @@ PetalburgCity_Gym_EventScript_OpenRecoveryRoomDoors:: @ 8205603
 	call PetalburgCity_Gym_EventScript_SetRecoveryRoomDoorMetatiles
 	return
 
-PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors:: @ 8205624
+PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors::
 	setvar VAR_0x8004, 7
 	compare VAR_0x8005, 0
 	call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors
@@ -1128,7 +1128,7 @@ PetalburgCity_Gym_EventScript_OpenStrengthRoomDoors:: @ 8205624
 	call PetalburgCity_Gym_EventScript_SetStrengthRoomDoorMetatiles
 	return
 
-PetalburgCity_Gym_EventScript_OpenOHKORoomDoors:: @ 8205645
+PetalburgCity_Gym_EventScript_OpenOHKORoomDoors::
 	setvar VAR_0x8004, 8
 	compare VAR_0x8005, 0
 	call_if_eq PetalburgCity_Gym_EventScript_SlideOpenRoomDoors
@@ -1137,64 +1137,64 @@ PetalburgCity_Gym_EventScript_OpenOHKORoomDoors:: @ 8205645
 	call PetalburgCity_Gym_EventScript_SetOHKORoomDoorMetatiles
 	return
 
-PetalburgCity_Gym_EventScript_SetEntranceRoomDoorMetatiles:: @ 8205666
+PetalburgCity_Gym_EventScript_SetEntranceRoomDoorMetatiles::
 	setmetatile 6, 85, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 7, 85, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	setmetatile 1, 98, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 2, 98, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
-PetalburgCity_Gym_EventScript_SetSpeedRoomDoorMetatiles:: @ 820568B
+PetalburgCity_Gym_EventScript_SetSpeedRoomDoorMetatiles::
 	setmetatile 6, 46, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 7, 46, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	setmetatile 1, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 2, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
-PetalburgCity_Gym_EventScript_SetAccuracyRoomDoorMetatiles:: @ 82056B0
+PetalburgCity_Gym_EventScript_SetAccuracyRoomDoorMetatiles::
 	setmetatile 6, 59, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 7, 59, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	setmetatile 1, 72, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 2, 72, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
-PetalburgCity_Gym_EventScript_SetConfusionRoomDoorMetatiles:: @ 82056D5
+PetalburgCity_Gym_EventScript_SetConfusionRoomDoorMetatiles::
 	setmetatile 1, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 2, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
-PetalburgCity_Gym_EventScript_SetDefenseRoomDoorMetatiles:: @ 82056E8
+PetalburgCity_Gym_EventScript_SetDefenseRoomDoorMetatiles::
 	setmetatile 6, 20, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 7, 20, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	setmetatile 1, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 2, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
-PetalburgCity_Gym_EventScript_SetRecoveryRoomDoorMetatiles:: @ 820570D
+PetalburgCity_Gym_EventScript_SetRecoveryRoomDoorMetatiles::
 	setmetatile 6, 33, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 7, 33, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
-PetalburgCity_Gym_EventScript_SetStrengthRoomDoorMetatiles:: @ 8205720
+PetalburgCity_Gym_EventScript_SetStrengthRoomDoorMetatiles::
 	setmetatile 1, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 2, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
-PetalburgCity_Gym_EventScript_SetOHKORoomDoorMetatiles:: @ 8205733
+PetalburgCity_Gym_EventScript_SetOHKORoomDoorMetatiles::
 	setmetatile 6, 7, METATILE_PetalburgGym_RoomEntrance_Left, 0
 	setmetatile 7, 7, METATILE_PetalburgGym_RoomEntrance_Right, 0
 	return
 
-PetalburgCity_Gym_EventScript_SlideOpenRoomDoors:: @ 8205746
+PetalburgCity_Gym_EventScript_SlideOpenRoomDoors::
 	special PetalburgGymSlideOpenRoomDoors
 	waitstate
 	return
 
-PetalburgCity_Gym_EventScript_UnlockRoomDoors:: @ 820574B
+PetalburgCity_Gym_EventScript_UnlockRoomDoors::
 	special PetalburgGymUnlockRoomDoors
 	return
 
-PetalburgCity_Gym_EventScript_GymGuide:: @ 820574F
+PetalburgCity_Gym_EventScript_GymGuide::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_GymGuidePostVictory
@@ -1202,34 +1202,34 @@ PetalburgCity_Gym_EventScript_GymGuide:: @ 820574F
 	release
 	end
 
-PetalburgCity_Gym_EventScript_GymGuidePostVictory:: @ 8205764
+PetalburgCity_Gym_EventScript_GymGuidePostVictory::
 	msgbox PetalburgCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_Gym_EventScript_LeftGymStatue:: @ 820576E
+PetalburgCity_Gym_EventScript_LeftGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_GymStatueCertified
 	goto PetalburgCity_Gym_EventScript_GymStatue
 	end
 
-PetalburgCity_Gym_EventScript_RightGymStatue:: @ 820577E
+PetalburgCity_Gym_EventScript_RightGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_GymStatueCertified
 	goto PetalburgCity_Gym_EventScript_GymStatue
 	end
 
-PetalburgCity_Gym_EventScript_GymStatueCertified:: @ 820578E
+PetalburgCity_Gym_EventScript_GymStatueCertified::
 	msgbox PetalburgCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-PetalburgCity_Gym_EventScript_GymStatue:: @ 8205798
+PetalburgCity_Gym_EventScript_GymStatue::
 	msgbox PetalburgCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-PetalburgCity_Gym_Text_DadYoureHereWithYourPokemon: @ 82057A2
+PetalburgCity_Gym_Text_DadYoureHereWithYourPokemon:
 	.string "DAD: Hm?\p"
 	.string "Well, if it isn't {PLAYER}!\n"
 	.string "So you're all finished moving in?\p"
@@ -1242,15 +1242,15 @@ PetalburgCity_Gym_Text_DadYoureHereWithYourPokemon: @ 82057A2
 	.string "That's great news!\n"
 	.string "I'll be looking forward to it!$"
 
-PetalburgCity_Gym_Text_WallyIdLikeAPokemon: @ 82058B1
+PetalburgCity_Gym_Text_WallyIdLikeAPokemon:
 	.string "Um… I…\n"
 	.string "I'd like to get a POKéMON, please…$"
 
-PetalburgCity_Gym_Text_DadOhYoureWallyRight: @ 82058DB
+PetalburgCity_Gym_Text_DadOhYoureWallyRight:
 	.string "DAD: Hm? You're… Uh… Oh, right.\n"
 	.string "You're WALLY, right?$"
 
-PetalburgCity_Gym_Text_WallyIveNeverCaughtAPokemon: @ 8205910
+PetalburgCity_Gym_Text_WallyIveNeverCaughtAPokemon:
 	.string "WALLY: I'm going to go stay with my\n"
 	.string "relatives in VERDANTURF TOWN.\p"
 	.string "I thought I would be lonely by myself,\n"
@@ -1258,38 +1258,38 @@ PetalburgCity_Gym_Text_WallyIveNeverCaughtAPokemon: @ 8205910
 	.string "But I've never caught a POKéMON before.\n"
 	.string "I don't know how…$"
 
-PetalburgCity_Gym_Text_DadHmISee: @ 82059D8
+PetalburgCity_Gym_Text_DadHmISee:
 	.string "DAD: Hm. I see.$"
 
-PetalburgCity_Gym_Text_DadPlayerGoWithWally: @ 82059E8
+PetalburgCity_Gym_Text_DadPlayerGoWithWally:
 	.string "DAD: {PLAYER}, you heard that,\n"
 	.string "right?\p"
 	.string "Go with WALLY and make sure that he\n"
 	.string "safely catches a POKéMON.$"
 
-PetalburgCity_Gym_Text_IllLoanYouMyZigzagoon: @ 8205A46
+PetalburgCity_Gym_Text_IllLoanYouMyZigzagoon:
 	.string "WALLY, here, I'll loan you my POKéMON.\p"
 	.string "WALLY received a ZIGZAGOON!$"
 
-PetalburgCity_Gym_Text_WallyThankYouAndDadGivesPokeBall: @ 8205A89
+PetalburgCity_Gym_Text_WallyThankYouAndDadGivesPokeBall:
 	.string "WALLY: Oh, wow!\n"
 	.string "A POKéMON!\p"
 	.string "DAD: Hm. I'll give you a POKé BALL, too.\n"
 	.string "Go for it!\p"
 	.string "WALLY received a POKé BALL!$"
 
-PetalburgCity_Gym_Text_WallyOhWowThankYou: @ 8205AF4
+PetalburgCity_Gym_Text_WallyOhWowThankYou:
 	.string "WALLY: Oh, wow!\n"
 	.string "Thank you!$"
 
-PetalburgCity_Gym_Text_WouldYouReallyComeWithMe: @ 8205B0F
+PetalburgCity_Gym_Text_WouldYouReallyComeWithMe:
 	.string "{PLAYER}… Would you really come\n"
 	.string "with me?$"
 
-PetalburgCity_Gym_Text_DadSoDidItWorkOut: @ 8205B32
+PetalburgCity_Gym_Text_DadSoDidItWorkOut:
 	.string "DAD: So, did it work out?$"
 
-PetalburgCity_Gym_Text_WallyThankYouBye: @ 8205B4C
+PetalburgCity_Gym_Text_WallyThankYouBye:
 	.string "WALLY: Thank you, yes, it did.\n"
 	.string "Here's your POKéMON back.\p"
 	.string "{PLAYER}, thank you for coming along\n"
@@ -1302,7 +1302,7 @@ PetalburgCity_Gym_Text_WallyThankYouBye: @ 8205B4C
 	.string "so I have to go!\p"
 	.string "Bye, {PLAYER}!$"
 
-PetalburgCity_Gym_Text_DadGoCollectBadges: @ 8205C40
+PetalburgCity_Gym_Text_DadGoCollectBadges:
 	.string "DAD: Now…\p"
 	.string "{PLAYER}, if you want to become a\n"
 	.string "strong TRAINER, here's my advice.\p"
@@ -1319,7 +1319,7 @@ PetalburgCity_Gym_Text_DadGoCollectBadges: @ 8205C40
 	.string "But that's only after you become\n"
 	.string "stronger.$"
 
-PetalburgCity_Gym_Text_NormanGoToRustboro: @ 8205DB4
+PetalburgCity_Gym_Text_NormanGoToRustboro:
 	.string "DAD: Hm? Aren't you going to the\n"
 	.string "POKéMON GYM in RUSTBORO CITY?\p"
 	.string "There's no challenge for me to\n"
@@ -1329,7 +1329,7 @@ PetalburgCity_Gym_Text_NormanGoToRustboro: @ 8205DB4
 	.string "I'll battle you, {PLAYER}, when you\n"
 	.string "can show me four GYM BADGES, okay?$"
 
-PetalburgCity_Gym_Text_NormanGoToDewford: @ 8205EAE
+PetalburgCity_Gym_Text_NormanGoToDewford:
 	.string "DAD: I see… So, you've beaten\n"
 	.string "the GYM LEADER in RUSTBORO CITY.\p"
 	.string "But there are many more TRAINERS\n"
@@ -1338,13 +1338,13 @@ PetalburgCity_Gym_Text_NormanGoToDewford: @ 8205EAE
 	.string "GYM LEADER named BRAWLY.\p"
 	.string "You should go challenge him.$"
 
-PetalburgCity_Gym_Text_YouHaveGottenStronger: @ 8205F87
+PetalburgCity_Gym_Text_YouHaveGottenStronger:
 	.string "DAD: Hm… {PLAYER}, you have gotten\n"
 	.string "stronger.\p"
 	.string "I can tell by the number of BADGES\n"
 	.string "that you've earned.$"
 
-PetalburgCity_Gym_Text_NormanIntro: @ 8205FE5
+PetalburgCity_Gym_Text_NormanIntro:
 	.string "DAD: Hm…\n"
 	.string "So, you did get four GYM BADGES.\p"
 	.string "Fine, as I promised, we will have\n"
@@ -1358,7 +1358,7 @@ PetalburgCity_Gym_Text_NormanIntro: @ 8205FE5
 	.string "{PLAYER}, you'd better give it your\n"
 	.string "best shot, too!$"
 
-PetalburgCity_Gym_Text_NormanDefeat: @ 8206107
+PetalburgCity_Gym_Text_NormanDefeat:
 	.string "…\p"
 	.string "I… I can't…\p"
 	.string "I can't believe it. {PLAYER}…\p"
@@ -1366,11 +1366,11 @@ PetalburgCity_Gym_Text_NormanDefeat: @ 8206107
 	.string "But, rules are rules!\n"
 	.string "Here, take this.$"
 
-PetalburgCity_Gym_Text_ReceivedBalanceBadge: @ 8206162
+PetalburgCity_Gym_Text_ReceivedBalanceBadge:
 	.string "{PLAYER} received the BALANCE BADGE\n"
 	.string "from DAD!$"
 
-PetalburgCity_Gym_Text_ExplainBalanceBadgeTakeThis: @ 820618A
+PetalburgCity_Gym_Text_ExplainBalanceBadgeTakeThis:
 	.string "DAD: With that BADGE, the DEFENSE\n"
 	.string "of all your POKéMON will increase.\p"
 	.string "POKéMON that know the HM move SURF\n"
@@ -1378,7 +1378,7 @@ PetalburgCity_Gym_Text_ExplainBalanceBadgeTakeThis: @ 820618A
 	.string "This is my gift to you. {PLAYER}, I'm\n"
 	.string "sure you can use it correctly.$"
 
-PetalburgCity_Gym_Text_ExplainFacade: @ 8206254
+PetalburgCity_Gym_Text_ExplainFacade:
 	.string "DAD: TM42 contains FACADE.\p"
 	.string "It doubles the power of moves if\n"
 	.string "the POKéMON is poisoned, paralyzed,\l"
@@ -1386,23 +1386,23 @@ PetalburgCity_Gym_Text_ExplainFacade: @ 8206254
 	.string "It might be able to turn a bad\n"
 	.string "situation into an advantage.$"
 
-PetalburgCity_Gym_Text_DadHappyAndSad: @ 82062FB
+PetalburgCity_Gym_Text_DadHappyAndSad:
 	.string "DAD: As the GYM LEADER, I can't\n"
 	.string "express how upset I am…\p"
 	.string "But as a father, it makes me both\n"
 	.string "happy and a little sad. It's odd…$"
 
-PetalburgCity_Gym_Text_PleaseComeWithMe: @ 8206377
+PetalburgCity_Gym_Text_PleaseComeWithMe:
 	.string "Ah, there you are, {PLAYER}{KUN}!\p"
 	.string "Please come with me.\n"
 	.string "I have something I want you to have.$"
 
-PetalburgCity_Gym_Text_LetMeBorrowPlayer: @ 82063CA
+PetalburgCity_Gym_Text_LetMeBorrowPlayer:
 	.string "NORMAN, you don't mind, do you?\p"
 	.string "Let me borrow your {PLAYER}{KUN} for\n"
 	.string "a minute or two.$"
 
-PetalburgCity_Gym_Text_DadGoingToKeepTraining: @ 8206417
+PetalburgCity_Gym_Text_DadGoingToKeepTraining:
 	.string "DAD: {PLAYER}, you should go visit\n"
 	.string "your mother every so often.\p"
 	.string "I'm going to stay here and redouble\n"
@@ -1410,13 +1410,13 @@ PetalburgCity_Gym_Text_DadGoingToKeepTraining: @ 8206417
 	.string "It would bother me as a TRAINER to\n"
 	.string "not avenge my loss to you, {PLAYER}!$"
 
-PetalburgCity_Gym_Text_DadNoAmountOfTrainingIsEnough: @ 82064C3
+PetalburgCity_Gym_Text_DadNoAmountOfTrainingIsEnough:
 	.string "DAD: {PLAYER}, how are things going?\p"
 	.string "The world of POKéMON is deep.\p"
 	.string "I honestly think that no amount of\n"
 	.string "training would ever be enough.$"
 
-PetalburgCity_Gym_Text_GymGuideAdvice: @ 8206542
+PetalburgCity_Gym_Text_GymGuideAdvice:
 	.string "Hey, how's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "The doors in this GYM open when you\n"
@@ -1434,53 +1434,53 @@ PetalburgCity_Gym_Text_GymGuideAdvice: @ 8206542
 	.string "Once you've chosen the door…\n"
 	.string "Well, hey, go for it!$"
 
-PetalburgCity_Gym_Text_GymGuidePostVictory: @ 82066F3
+PetalburgCity_Gym_Text_GymGuidePostVictory:
 	.string "{PLAYER}! Whoa! You've overcome even\n"
 	.string "your own father!\p"
 	.string "Like, whoa!\n"
 	.string "What a stunning turn of events!$"
 
-PetalburgCity_Gym_Text_RandallIntro: @ 820674F
+PetalburgCity_Gym_Text_RandallIntro:
 	.string "The ability to attack before the\n"
 	.string "opponent…\p"
 	.string "Just that alone puts me at a great\n"
 	.string "advantage, don't you agree?$"
 
-PetalburgCity_Gym_Text_RandallDefeat: @ 82067B9
+PetalburgCity_Gym_Text_RandallDefeat:
 	.string "That was a magnificent battle!$"
 
-PetalburgCity_Gym_Text_RandallPostBattle: @ 82067D8
+PetalburgCity_Gym_Text_RandallPostBattle:
 	.string "Go on to the next room where a new\n"
 	.string "challenge awaits you.\p"
 	.string "At the left is the CONFUSION ROOM.\p"
 	.string "The right door leads to the DEFENSE\n"
 	.string "ROOM.$"
 
-PetalburgCity_Gym_Text_RandallPostBadge: @ 820685E
+PetalburgCity_Gym_Text_RandallPostBadge:
 	.string "Whomever you beat, and whomever you\n"
 	.string "may lose to, you never shirk from\l"
 	.string "training yourself and your POKéMON.\p"
 	.string "That's what I think being a\n"
 	.string "GYM LEADER is all about.$"
 
-PetalburgCity_Gym_Text_ParkerIntro: @ 82068FD
+PetalburgCity_Gym_Text_ParkerIntro:
 	.string "This is the CONFUSION ROOM.\p"
 	.string "Let me see how well bonded you are\n"
 	.string "with your POKéMON!$"
 
-PetalburgCity_Gym_Text_ParkerDefeat: @ 820694F
+PetalburgCity_Gym_Text_ParkerDefeat:
 	.string "I couldn't confuse your team enough…\n"
 	.string "You share a strong bond together.$"
 
-PetalburgCity_Gym_Text_ParkerPostBattle: @ 8206996
+PetalburgCity_Gym_Text_ParkerPostBattle:
 	.string "The next room is the STRENGTH ROOM.\n"
 	.string "Can you withstand brute force?$"
 
-PetalburgCity_Gym_Text_ParkerPostBadge: @ 82069D9
+PetalburgCity_Gym_Text_ParkerPostBadge:
 	.string "After you beat our LEADER, the\n"
 	.string "training has become a lot tougher.$"
 
-PetalburgCity_Gym_Text_GeorgeIntro: @ 8206A1B
+PetalburgCity_Gym_Text_GeorgeIntro:
 	.string "Just when you think you're going to\n"
 	.string "win, your opponent restores HP…\p"
 	.string "Can you just imagine how awful that\n"
@@ -1488,11 +1488,11 @@ PetalburgCity_Gym_Text_GeorgeIntro: @ 8206A1B
 	.string "I'll show you exactly how awful it\n"
 	.string "feels!$"
 
-PetalburgCity_Gym_Text_GeorgeDefeat: @ 8206AB8
+PetalburgCity_Gym_Text_GeorgeDefeat:
 	.string "I couldn't restore HP enough…\n"
 	.string "What ATTACK power…$"
 
-PetalburgCity_Gym_Text_GeorgePostBattle: @ 8206AE9
+PetalburgCity_Gym_Text_GeorgePostBattle:
 	.string "I should have expected no less from\n"
 	.string "our LEADER's kid.\p"
 	.string "No, wait! A TRAINER's abilities are\n"
@@ -1501,21 +1501,21 @@ PetalburgCity_Gym_Text_GeorgePostBattle: @ 8206AE9
 	.string "weren't enough.\p"
 	.string "Go on! The ONE-HIT KO ROOM is next.$"
 
-PetalburgCity_Gym_Text_GeorgePostBadge: @ 8206BB1
+PetalburgCity_Gym_Text_GeorgePostBadge:
 	.string "I'm going to keep training at GYMS.\n"
 	.string "One day, I'll become a LEADER.$"
 
-PetalburgCity_Gym_Text_BerkeIntro: @ 8206BF4
+PetalburgCity_Gym_Text_BerkeIntro:
 	.string "I'm not going to take it easy just\n"
 	.string "because you're our LEADER's kid.\p"
 	.string "I'll show you how horrid it is for\n"
 	.string "a POKéMON to take a critical hit!$"
 
-PetalburgCity_Gym_Text_BerkeDefeat: @ 8206C7D
+PetalburgCity_Gym_Text_BerkeDefeat:
 	.string "Your power…\n"
 	.string "You're the real deal.$"
 
-PetalburgCity_Gym_Text_BerkePostBattle: @ 8206C9F
+PetalburgCity_Gym_Text_BerkePostBattle:
 	.string "Your father really is strong.\n"
 	.string "He's a TRAINER worth my respect.\p"
 	.string "And, I sense the same glow coming\n"
@@ -1523,21 +1523,21 @@ PetalburgCity_Gym_Text_BerkePostBattle: @ 8206C9F
 	.string "I hope that you'll stage a terrific\n"
 	.string "battle with your father!$"
 
-PetalburgCity_Gym_Text_BerkePostBadge: @ 8206D56
+PetalburgCity_Gym_Text_BerkePostBadge:
 	.string "Since your dad became the LEADER,\n"
 	.string "the TRAINERS of PETALBURG CITY have\l"
 	.string "become a lot tougher.$"
 
-PetalburgCity_Gym_Text_MaryIntro: @ 8206DB2
+PetalburgCity_Gym_Text_MaryIntro:
 	.string "Giggle…\n"
 	.string "This is the ACCURACY ROOM.\p"
 	.string "It's pretty nasty when every attack\n"
 	.string "lands without fail.$"
 
-PetalburgCity_Gym_Text_MaryDefeat: @ 8206E0D
+PetalburgCity_Gym_Text_MaryDefeat:
 	.string "You were a cut above me…$"
 
-PetalburgCity_Gym_Text_MaryPostBattle: @ 8206E26
+PetalburgCity_Gym_Text_MaryPostBattle:
 	.string "There are some even stronger\n"
 	.string "TRAINERS waiting for you.\p"
 	.string "The left is the DEFENSE ROOM, and\n"
@@ -1545,20 +1545,20 @@ PetalburgCity_Gym_Text_MaryPostBattle: @ 8206E26
 	.string "Your POKéMON's ATTACK power will be\n"
 	.string "on trial either way.$"
 
-PetalburgCity_Gym_Text_MaryPostBadge: @ 8206ED8
+PetalburgCity_Gym_Text_MaryPostBadge:
 	.string "Do you know what we're trying to\n"
 	.string "achieve as TRAINERS?\p"
 	.string "We're striving to become soul mates\n"
 	.string "with our POKéMON.$"
 
-PetalburgCity_Gym_Text_AlexiaIntro: @ 8206F44
+PetalburgCity_Gym_Text_AlexiaIntro:
 	.string "The higher the DEFENSE, the more\n"
 	.string "reckless I can be in attack.$"
 
-PetalburgCity_Gym_Text_AlexiaDefeat: @ 8206F82
+PetalburgCity_Gym_Text_AlexiaDefeat:
 	.string "Our defenses weren't enough…$"
 
-PetalburgCity_Gym_Text_AlexiaPostBattle: @ 8206F9F
+PetalburgCity_Gym_Text_AlexiaPostBattle:
 	.string "I think you've taught me a valuable\n"
 	.string "lesson here.\p"
 	.string "Now, go on! The left door goes to\n"
@@ -1568,83 +1568,83 @@ PetalburgCity_Gym_Text_AlexiaPostBattle: @ 8206F9F
 	.string "Both of them have TRAINERS who are\n"
 	.string "skilled at offense.$"
 
-PetalburgCity_Gym_Text_AlexiaPostBadge: @ 8207069
+PetalburgCity_Gym_Text_AlexiaPostBadge:
 	.string "Hi! Have you tried using SURF?$"
 
-PetalburgCity_Gym_Text_JodyIntro: @ 8207088
+PetalburgCity_Gym_Text_JodyIntro:
 	.string "Our GYM LEADER told us to go all out\n"
 	.string "and beat you.\p"
 	.string "Even if you happen to be the\n"
 	.string "LEADER's kid!$"
 
-PetalburgCity_Gym_Text_JodyDefeat: @ 82070E6
+PetalburgCity_Gym_Text_JodyDefeat:
 	.string "But… I went all out!$"
 
-PetalburgCity_Gym_Text_JodyPostBattle: @ 82070FB
+PetalburgCity_Gym_Text_JodyPostBattle:
 	.string "The way you use your POKéMON…\n"
 	.string "It's like your father's style.\p"
 	.string "Go on through! The GYM LEADER, your\n"
 	.string "father, is waiting!$"
 
-PetalburgCity_Gym_Text_JodyPostBadge: @ 8207170
+PetalburgCity_Gym_Text_JodyPostBadge:
 	.string "Sure, it's fine to make your POKéMON\n"
 	.string "stronger.\p"
 	.string "But what decides the winner?\p"
 	.string "Why, it's the feelings TRAINERS have\n"
 	.string "for their POKéMON.$"
 
-PetalburgCity_Gym_Text_DoorAppearsLocked: @ 82071F4
+PetalburgCity_Gym_Text_DoorAppearsLocked:
 	.string "This door appears to be locked\n"
 	.string "right now…$"
 
-PetalburgCity_Gym_Text_EnterSpeedRoom: @ 820721E
+PetalburgCity_Gym_Text_EnterSpeedRoom:
 	.string "“SPEED ROOM,” the sign says.\p"
 	.string "Do you want to go through?$"
 
 @ Unused
-PetalburgCity_Gym_Text_DoorAppearsLocked2: @ 8207256
+PetalburgCity_Gym_Text_DoorAppearsLocked2:
 	.string "This door appears to be locked\n"
 	.string "right now…$"
 
-PetalburgCity_Gym_Text_EnterAccuracyRoom: @ 8207280
+PetalburgCity_Gym_Text_EnterAccuracyRoom:
 	.string "“ACCURACY ROOM,” the sign says.\p"
 	.string "Do you want to go through?$"
 
-PetalburgCity_Gym_Text_EnterConfusionRoom: @ 82072BB
+PetalburgCity_Gym_Text_EnterConfusionRoom:
 	.string "“CONFUSION ROOM,” the sign says.\p"
 	.string "Do you want to go through?$"
 
-PetalburgCity_Gym_Text_EnterDefenseRoom: @ 82072F7
+PetalburgCity_Gym_Text_EnterDefenseRoom:
 	.string "“DEFENSE ROOM,” the sign says.\p"
 	.string "Do you want to go through?$"
 
-PetalburgCity_Gym_Text_EnterRecoveryRoom: @ 8207331
+PetalburgCity_Gym_Text_EnterRecoveryRoom:
 	.string "“RECOVERY ROOM,” the sign says.\p"
 	.string "Do you want to go through?$"
 
-PetalburgCity_Gym_Text_EnterStrengthRoom: @ 820736C
+PetalburgCity_Gym_Text_EnterStrengthRoom:
 	.string "“STRENGTH ROOM,” the sign says.\p"
 	.string "Do you want to go through?$"
 
-PetalburgCity_Gym_Text_EnterOHKORoom: @ 82073A7
+PetalburgCity_Gym_Text_EnterOHKORoom:
 	.string "“ONE-HIT KO ROOM,” the sign says.\p"
 	.string "Do you want to go through?$"
 
-PetalburgCity_Gym_Text_EnterGymLeadersRoom: @ 82073E4
+PetalburgCity_Gym_Text_EnterGymLeadersRoom:
 	.string "“GYM LEADER'S ROOM\p"
 	.string "“See for yourself what POKéMON await\n"
 	.string "you!” the sign says.\p"
 	.string "Do you want to go through?$"
 
-PetalburgCity_Gym_Text_GymStatue: @ 820744C
+PetalburgCity_Gym_Text_GymStatue:
 	.string "PETALBURG CITY POKéMON GYM$"
 
-PetalburgCity_Gym_Text_GymStatueCertified: @ 8207467
+PetalburgCity_Gym_Text_GymStatueCertified:
 	.string "PETALBURG CITY POKéMON GYM\p"
 	.string "NORMAN'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-PetalburgCity_Gym_Text_NormanPreRematch: @ 82074A2
+PetalburgCity_Gym_Text_NormanPreRematch:
 	.string "DAD: {PLAYER}…\n"
 	.string "I had a feeling that you would come.\p"
 	.string "I would never refuse to accept\n"
@@ -1656,18 +1656,18 @@ PetalburgCity_Gym_Text_NormanPreRematch: @ 82074A2
 	.string "we owe it to each other to do the best\l"
 	.string "we can. Isn't that right, {PLAYER}?$"
 
-PetalburgCity_Gym_Text_NormanRematchDefeat: @ 82075CE
+PetalburgCity_Gym_Text_NormanRematchDefeat:
 	.string "Uh… Haha…\n"
 	.string "Maybe that was going too hard…$"
 
-PetalburgCity_Gym_Text_NormanPostRematch: @ 82075F7
+PetalburgCity_Gym_Text_NormanPostRematch:
 	.string "DAD: {PLAYER}…\n"
 	.string "What is your dream?\p"
 	.string "My dream…\n"
 	.string "Hahaha…\l"
 	.string "It has already come true, actually.$"
 
-PetalburgCity_Gym_Text_NormanRematchNeedTwoMons: @ 820764A
+PetalburgCity_Gym_Text_NormanRematchNeedTwoMons:
 	.string "DAD: {PLAYER}…\n"
 	.string "I had a feeling that you would come.\p"
 	.string "I would never refuse to accept\n"
diff --git a/data/maps/PetalburgCity_House1/scripts.inc b/data/maps/PetalburgCity_House1/scripts.inc
index 2fe46437e..ac803259c 100644
--- a/data/maps/PetalburgCity_House1/scripts.inc
+++ b/data/maps/PetalburgCity_House1/scripts.inc
@@ -1,20 +1,20 @@
-PetalburgCity_House1_MapScripts:: @ 8207799
+PetalburgCity_House1_MapScripts::
 	.byte 0
 
-PetalburgCity_House1_EventScript_Man:: @ 820779A
+PetalburgCity_House1_EventScript_Man::
 	msgbox PetalburgCity_House1_Text_TravelingIsWonderful, MSGBOX_NPC
 	end
 
-PetalburgCity_House1_EventScript_Woman:: @ 82077A3
+PetalburgCity_House1_EventScript_Woman::
 	msgbox PetalburgCity_House1_Text_GoOnAdventure, MSGBOX_NPC
 	end
 
-PetalburgCity_House1_Text_TravelingIsWonderful: @ 82077AC
+PetalburgCity_House1_Text_TravelingIsWonderful:
 	.string "Traveling is wonderful!\p"
 	.string "When I was young, I roamed the seas\n"
 	.string "and the mountains!$"
 
-PetalburgCity_House1_Text_GoOnAdventure: @ 82077FB
+PetalburgCity_House1_Text_GoOnAdventure:
 	.string "Sigh…\p"
 	.string "I wish I could go on an adventure\n"
 	.string "with some POKéMON…\p"
diff --git a/data/maps/PetalburgCity_House2/scripts.inc b/data/maps/PetalburgCity_House2/scripts.inc
index 3be93cbd0..1770627ed 100644
--- a/data/maps/PetalburgCity_House2/scripts.inc
+++ b/data/maps/PetalburgCity_House2/scripts.inc
@@ -1,21 +1,21 @@
-PetalburgCity_House2_MapScripts:: @ 82078F2
+PetalburgCity_House2_MapScripts::
 	.byte 0
 
-PetalburgCity_House2_EventScript_Woman:: @ 82078F3
+PetalburgCity_House2_EventScript_Woman::
 	msgbox PetalburgCity_House2_Text_NormanBecameGymLeader, MSGBOX_NPC
 	end
 
-PetalburgCity_House2_EventScript_SchoolKid:: @ 82078FC
+PetalburgCity_House2_EventScript_SchoolKid::
 	msgbox PetalburgCity_House2_Text_BattledNormanOnce, MSGBOX_NPC
 	end
 
-PetalburgCity_House2_Text_NormanBecameGymLeader: @ 8207905
+PetalburgCity_House2_Text_NormanBecameGymLeader:
 	.string "NORMAN became our town's new\n"
 	.string "GYM LEADER.\p"
 	.string "I think he called his family over from\n"
 	.string "somewhere far away.$"
 
-PetalburgCity_House2_Text_BattledNormanOnce: @ 8207969
+PetalburgCity_House2_Text_BattledNormanOnce:
 	.string "I battled NORMAN once, but, whew,\n"
 	.string "he was way too strong.\p"
 	.string "How would I put it?\p"
diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc
index f27f0aeb5..abaa7b5b0 100644
--- a/data/maps/PetalburgCity_Mart/scripts.inc
+++ b/data/maps/PetalburgCity_Mart/scripts.inc
@@ -1,7 +1,7 @@
-PetalburgCity_Mart_MapScripts:: @ 8207D68
+PetalburgCity_Mart_MapScripts::
 	.byte 0
 
-PetalburgCity_Mart_EventScript_Clerk:: @ 8207D69
+PetalburgCity_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -13,7 +13,7 @@ PetalburgCity_Mart_EventScript_Clerk:: @ 8207D69
 	end
 
 	.align 2
-PetalburgCity_Mart_Pokemart_Basic: @ 8207D8C
+PetalburgCity_Mart_Pokemart_Basic:
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
 	.2byte ITEM_ANTIDOTE
@@ -29,14 +29,14 @@ PetalburgCity_Mart_Pokemart_Basic: @ 8207D8C
 	release
 	end
 
-PetalburgCity_Mart_EventScript_ExpandedItems:: @ 8207DA6
+PetalburgCity_Mart_EventScript_ExpandedItems::
 	pokemart PetalburgCity_Mart_Pokemart_Expanded
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-PetalburgCity_Mart_Pokemart_Expanded: @ 8207DB8
+PetalburgCity_Mart_Pokemart_Expanded:
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_POTION
@@ -54,30 +54,30 @@ PetalburgCity_Mart_Pokemart_Expanded: @ 8207DB8
 	release
 	end
 
-PetalburgCity_Mart_EventScript_Woman:: @ 8207DD6
+PetalburgCity_Mart_EventScript_Woman::
 	msgbox PetalburgCity_Mart_Text_WeakWillGrowStronger, MSGBOX_NPC
 	end
 
-PetalburgCity_Mart_EventScript_Boy:: @ 8207DDF
+PetalburgCity_Mart_EventScript_Boy::
 	msgbox PetalburgCity_Mart_Text_RepelIsUseful, MSGBOX_NPC
 	end
 
-PetalburgCity_Mart_EventScript_Man:: @ 8207DE8
+PetalburgCity_Mart_EventScript_Man::
 	msgbox PetalburgCity_Mart_Text_TakeSomeAntidotesWithYou, MSGBOX_NPC
 	end
 
-PetalburgCity_Mart_Text_WeakWillGrowStronger: @ 8207DF1
+PetalburgCity_Mart_Text_WeakWillGrowStronger:
 	.string "Even if a POKéMON is weak now,\n"
 	.string "it will grow stronger.\p"
 	.string "The most important thing is love!\n"
 	.string "Love for your POKéMON!$"
 
-PetalburgCity_Mart_Text_RepelIsUseful: @ 8207E60
+PetalburgCity_Mart_Text_RepelIsUseful:
 	.string "Do you use REPEL?\n"
 	.string "It keeps POKéMON away, so it's\l"
 	.string "useful when you're in a hurry.$"
 
-PetalburgCity_Mart_Text_TakeSomeAntidotesWithYou: @ 8207EB0
+PetalburgCity_Mart_Text_TakeSomeAntidotesWithYou:
 	.string "Do you have any ANTIDOTES with\n"
 	.string "you?\p"
 	.string "If you walk around with a poisoned\n"
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index 591014164..58b58054f 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
@@ -1,16 +1,16 @@
 .set LOCALID_NURSE, 1
 
-PetalburgCity_PokemonCenter_1F_MapScripts:: @ 82079E8
+PetalburgCity_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, PetalburgCity_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-PetalburgCity_PokemonCenter_1F_OnTransition: @ 82079F3
+PetalburgCity_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_PETALBURG_CITY
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_Nurse:: @ 82079FC
+PetalburgCity_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -18,15 +18,15 @@ PetalburgCity_PokemonCenter_1F_EventScript_Nurse:: @ 82079FC
 	release
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_FatMan:: @ 8207A0A
+PetalburgCity_PokemonCenter_1F_EventScript_FatMan::
 	msgbox PetalburgCity_PokemonCenter_1F_Text_PCStorageSystem, MSGBOX_NPC
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_Youngster:: @ 8207A13
+PetalburgCity_PokemonCenter_1F_EventScript_Youngster::
 	msgbox PetalburgCity_PokemonCenter_1F_Text_OranBerryRegainedHP, MSGBOX_NPC
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_Woman:: @ 8207A1C
+PetalburgCity_PokemonCenter_1F_EventScript_Woman::
 	lock
 	faceplayer
 	msgbox PetalburgCity_PokemonCenter_1F_Text_ManyTypesOfPokemon, MSGBOX_DEFAULT
@@ -36,7 +36,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_Woman:: @ 8207A1C
 	release
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_SayStarterTypeInfo:: @ 8207A38
+PetalburgCity_PokemonCenter_1F_EventScript_SayStarterTypeInfo::
 	compare VAR_STARTER_MON, 0
 	call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_SayTreeckoType
 	compare VAR_STARTER_MON, 1
@@ -46,36 +46,36 @@ PetalburgCity_PokemonCenter_1F_EventScript_SayStarterTypeInfo:: @ 8207A38
 	release
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_SayTreeckoType:: @ 8207A5B
+PetalburgCity_PokemonCenter_1F_EventScript_SayTreeckoType::
 	msgbox PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType, MSGBOX_DEFAULT
 	return
 
-PetalburgCity_PokemonCenter_1F_EventScript_SayTorchicType:: @ 8207A64
+PetalburgCity_PokemonCenter_1F_EventScript_SayTorchicType::
 	msgbox PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType, MSGBOX_DEFAULT
 	return
 
-PetalburgCity_PokemonCenter_1F_EventScript_SayMudkipType:: @ 8207A6D
+PetalburgCity_PokemonCenter_1F_EventScript_SayMudkipType::
 	msgbox PetalburgCity_PokemonCenter_1F_Text_MudkipIsWaterType, MSGBOX_DEFAULT
 	return
 
-PetalburgCity_PokemonCenter_1F_Text_PCStorageSystem: @ 8207A76
+PetalburgCity_PokemonCenter_1F_Text_PCStorageSystem:
 	.string "That PC-based POKéMON Storage\n"
 	.string "System…\p"
 	.string "Whoever made it must be some kind\n"
 	.string "of a scientific wizard!$"
 
-PetalburgCity_PokemonCenter_1F_Text_OranBerryRegainedHP: @ 8207AD6
+PetalburgCity_PokemonCenter_1F_Text_OranBerryRegainedHP:
 	.string "When my POKéMON ate an\n"
 	.string "ORAN BERRY, it regained HP!$"
 
-PetalburgCity_PokemonCenter_1F_Text_ManyTypesOfPokemon: @ 8207B09
+PetalburgCity_PokemonCenter_1F_Text_ManyTypesOfPokemon:
 	.string "There are many types of POKéMON.\p"
 	.string "All types have their strengths and\n"
 	.string "weaknesses against other types.\p"
 	.string "Depending on the types of POKéMON,\n"
 	.string "a battle could be easy or hard.$"
 
-PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType: @ 8207BB0
+PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType:
 	.string "For example, your TREECKO\n"
 	.string "is a GRASS type.\p"
 	.string "It's strong against the WATER and\n"
@@ -83,7 +83,7 @@ PetalburgCity_PokemonCenter_1F_Text_TreeckoIsGrassType: @ 8207BB0
 	.string "But, it's weak against FIRE-type\n"
 	.string "POKéMON.$"
 
-PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType: @ 8207C35
+PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType:
 	.string "For example, your TORCHIC\n"
 	.string "is a FIRE type.\p"
 	.string "It's strong against the GRASS and\n"
@@ -91,7 +91,7 @@ PetalburgCity_PokemonCenter_1F_Text_TorchicIsFireType: @ 8207C35
 	.string "But, it's weak against WATER-type\n"
 	.string "POKéMON.$"
 
-PetalburgCity_PokemonCenter_1F_Text_MudkipIsWaterType: @ 8207CB7
+PetalburgCity_PokemonCenter_1F_Text_MudkipIsWaterType:
 	.string "For example, your MUDKIP\n"
 	.string "is a WATER type.\p"
 	.string "It's strong against the FIRE type.\p"
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
index 8485ae2c6..bd3e30f9a 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41
+PetalburgCity_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ PetalburgCity_PokemonCenter_2F_MapScripts:: @ 8207D41
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-PetalburgCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8207D56
+PetalburgCity_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-PetalburgCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8207D5C
+PetalburgCity_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-PetalburgCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8207D62
+PetalburgCity_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc
index 1e4e75987..3a06208a7 100644
--- a/data/maps/PetalburgCity_WallysHouse/scripts.inc
+++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc
@@ -1,24 +1,24 @@
 .set LOCALID_WALLYS_DAD, 1
 
-PetalburgCity_WallysHouse_MapScripts:: @ 8204229
+PetalburgCity_WallysHouse_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, PetalburgCity_WallysHouse_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, PetalburgCity_WallysHouse_OnWarp
 	.byte 0
 
-PetalburgCity_WallysHouse_OnWarp: @ 8204234
+PetalburgCity_WallysHouse_OnWarp:
 	map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther
 	.2byte 0
 
-PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther:: @ 820423E
+PetalburgCity_WallysHouse_EventScript_PlayerWallysDadFaceEachOther::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST
 	turnobject LOCALID_WALLYS_DAD, DIR_WEST
 	end
 
-PetalburgCity_WallysHouse_OnFrame: @ 8204247
+PetalburgCity_WallysHouse_OnFrame:
 	map_script_2 VAR_PETALBURG_CITY_STATE, 4, PetalburgCity_WallysHouse_EventScript_GiveHM03Surf
 	.2byte 0
 
-PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251
+PetalburgCity_WallysHouse_EventScript_GiveHM03Surf::
 	lockall
 	msgbox PetalburgCity_WallysHouse_Text_PleaseExcuseUs, MSGBOX_DEFAULT
 	giveitem ITEM_HM03
@@ -28,7 +28,7 @@ PetalburgCity_WallysHouse_EventScript_GiveHM03Surf:: @ 8204251
 	releaseall
 	end
 
-PetalburgCity_WallysHouse_EventScript_WallysDad:: @ 8204278
+PetalburgCity_WallysHouse_EventScript_WallysDad::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad
@@ -39,22 +39,22 @@ PetalburgCity_WallysHouse_EventScript_WallysDad:: @ 8204278
 	release
 	end
 
-PetalburgCity_WallysHouse_EventScript_ReceievedHM03Surf:: @ 82042A2
+PetalburgCity_WallysHouse_EventScript_ReceievedHM03Surf::
 	msgbox PetalburgCity_WallysHouse_Text_WallyIsComingHomeSoon, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad:: @ 82042AC
+PetalburgCity_WallysHouse_EventScript_DefeatedWallyInVictoryRoad::
 	msgbox PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_WallysHouse_EventScript_PlayedWithWally:: @ 82042B6
+PetalburgCity_WallysHouse_EventScript_PlayedWithWally::
 	msgbox PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_WallysHouse_EventScript_WallysMom:: @ 82042C0
+PetalburgCity_WallysHouse_EventScript_WallysMom::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf
@@ -62,12 +62,12 @@ PetalburgCity_WallysHouse_EventScript_WallysMom:: @ 82042C0
 	release
 	end
 
-PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf:: @ 82042D5
+PetalburgCity_WallysHouse_EventScript_ReceivedHM03Surf::
 	msgbox PetalburgCity_WallysHouse_Text_WallyLeftWithoutTelling, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally: @ 82042DF
+PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally:
 	.string "You're…\n"
 	.string "Ah, you must be {PLAYER}{KUN}, right?\p"
 	.string "Thank you for playing with WALLY a\n"
@@ -83,10 +83,10 @@ PetalburgCity_WallysHouse_Text_ThanksForPlayingWithWally: @ 82042DF
 	.string "I wonder where he could have\n"
 	.string "gotten by now?$"
 
-PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing: @ 820444D
+PetalburgCity_WallysHouse_Text_WonderHowWallyIsDoing:
 	.string "I wonder how our WALLY is doing?$"
 
-PetalburgCity_WallysHouse_Text_PleaseExcuseUs: @ 820446E
+PetalburgCity_WallysHouse_Text_PleaseExcuseUs:
 	.string "{PLAYER}{KUN}! Please excuse us for\n"
 	.string "dragging you here this way.\p"
 	.string "But our WALLY's become very healthy\n"
@@ -103,15 +103,15 @@ PetalburgCity_WallysHouse_Text_PleaseExcuseUs: @ 820446E
 	.string "This isn't a bribe or anything, but\n"
 	.string "I'd really like you to have this.$"
 
-PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces: @ 820461A
+PetalburgCity_WallysHouse_Text_SurfGoAllSortsOfPlaces:
 	.string "If your POKéMON can SURF, you'll be\n"
 	.string "able to go to all sorts of places.$"
 
-PetalburgCity_WallysHouse_Text_WallyIsComingHomeSoon: @ 8204661
+PetalburgCity_WallysHouse_Text_WallyIsComingHomeSoon:
 	.string "WALLY's coming home soon.\n"
 	.string "I'm looking forward to that.$"
 
-PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity: @ 8204698
+PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity:
 	.string "Oh? You met WALLY in\n"
 	.string "EVER GRANDE CITY?\p"
 	.string "Oh, {PLAYER}{KUN}, don't be silly.\p"
@@ -119,13 +119,13 @@ PetalburgCity_WallysHouse_Text_YouMetWallyInEverGrandeCity: @ 8204698
 	.string "can't go somewhere far away like\l"
 	.string "that all by himself.$"
 
-PetalburgCity_WallysHouse_Text_WallyWasReallyHappy: @ 8204732
+PetalburgCity_WallysHouse_Text_WallyWasReallyHappy:
 	.string "WALLY was really happy when he told\n"
 	.string "us that he caught a POKéMON.\p"
 	.string "It's been ages since I've seen him\n"
 	.string "smile like that.$"
 
-PetalburgCity_WallysHouse_Text_WallyLeftWithoutTelling: @ 82047A7
+PetalburgCity_WallysHouse_Text_WallyLeftWithoutTelling:
 	.string "I want you to keep this a secret\n"
 	.string "from my husband…\p"
 	.string "But our WALLY left VERDANTURF TOWN\n"
diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc
index 1f1b2edcb..2ade89642 100644
--- a/data/maps/PetalburgWoods/scripts.inc
+++ b/data/maps/PetalburgWoods/scripts.inc
@@ -1,10 +1,10 @@
 .set LOCALID_GRUNT, 3
 .set LOCALID_DEVON_EMPLOYEE, 4
 
-PetalburgWoods_MapScripts:: @ 822DFD6
+PetalburgWoods_MapScripts::
 	.byte 0
 
-PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7
+PetalburgWoods_EventScript_DevonResearcherLeft::
 	lockall
 	call PetalburgWoods_EventScript_DevonResearcherIntro
 	applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft
@@ -39,7 +39,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft:: @ 822DFD7
 	goto PetalburgWoods_EventScript_RemoveDevonResearcher
 	end
 
-PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079
+PetalburgWoods_EventScript_DevonResearcherRight::
 	lockall
 	call PetalburgWoods_EventScript_DevonResearcherIntro
 	applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight
@@ -75,14 +75,14 @@ PetalburgWoods_EventScript_DevonResearcherRight:: @ 822E079
 	goto PetalburgWoods_EventScript_RemoveDevonResearcher
 	end
 
-PetalburgWoods_EventScript_DevonResearcherIntro:: @ 822E124
+PetalburgWoods_EventScript_DevonResearcherIntro::
 	applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherLookAround
 	waitmovement 0
 	msgbox PetalburgWoods_Text_NotAOneToBeFound, MSGBOX_DEFAULT
 	closemessage
 	return
 
-PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138
+PetalburgWoods_EventScript_DevonResearcherPostBattle::
 	msgbox PetalburgWoods_Text_YouveGotSomeNerve, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaRunAway
@@ -97,12 +97,12 @@ PetalburgWoods_EventScript_DevonResearcherPostBattle:: @ 822E138
 	goto PetalburgWoods_EventScript_DevonResearcherFinish
 	end
 
-PetalburgWoods_EventScript_BagFull:: @ 822E17D
+PetalburgWoods_EventScript_BagFull::
 	msgbox PetalburgWoods_Text_YoureLoadedWithItems, MSGBOX_DEFAULT
 	goto PetalburgWoods_EventScript_DevonResearcherFinish
 	end
 
-PetalburgWoods_EventScript_DevonResearcherFinish:: @ 822E18B
+PetalburgWoods_EventScript_DevonResearcherFinish::
 	msgbox PetalburgWoods_Text_TeamAquaAfterSomethingInRustboro, MSGBOX_DEFAULT
 	applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherStartExit
 	waitmovement 0
@@ -110,13 +110,13 @@ PetalburgWoods_EventScript_DevonResearcherFinish:: @ 822E18B
 	closemessage
 	return
 
-PetalburgWoods_EventScript_RemoveDevonResearcher:: @ 822E1A7
+PetalburgWoods_EventScript_RemoveDevonResearcher::
 	removeobject LOCALID_DEVON_EMPLOYEE
 	setvar VAR_PETALBURG_WOODS_STATE, 1
 	releaseall
 	end
 
-PetalburgWoods_Movement_DevonResearcherLookAround: @ 822E1B1
+PetalburgWoods_Movement_DevonResearcherLookAround:
 	face_up
 	delay_16
 	delay_4
@@ -135,7 +135,7 @@ PetalburgWoods_Movement_DevonResearcherLookAround: @ 822E1B1
 	delay_16
 	step_end
 
-PetalburgWoods_Movement_DevonResearcherExitLeft: @ 822E1C2
+PetalburgWoods_Movement_DevonResearcherExitLeft:
 	walk_fast_right
 	walk_fast_up
 	walk_fast_up
@@ -146,14 +146,14 @@ PetalburgWoods_Movement_DevonResearcherExitLeft: @ 822E1C2
 	walk_fast_up
 	step_end
 
-PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft: @ 822E1CB
+PetalburgWoods_Movement_DevonResearcherApproachPlayerLeft:
 	delay_16
 	face_player
 	walk_down
 	walk_down
 	step_end
 
-PetalburgWoods_Movement_DevonResearcherApproachPlayerRight: @ 822E1D0
+PetalburgWoods_Movement_DevonResearcherApproachPlayerRight:
 	delay_16
 	face_player
 	walk_down
@@ -162,7 +162,7 @@ PetalburgWoods_Movement_DevonResearcherApproachPlayerRight: @ 822E1D0
 	walk_in_place_fastest_right
 	step_end
 
-PetalburgWoods_Movement_DevonResearcherExitRight: @ 822E1D7
+PetalburgWoods_Movement_DevonResearcherExitRight:
 	walk_fast_left
 	walk_fast_up
 	walk_fast_up
@@ -173,13 +173,13 @@ PetalburgWoods_Movement_DevonResearcherExitRight: @ 822E1D7
 	walk_fast_up
 	step_end
 
-PetalburgWoods_Movement_WatchResearcherLeave: @ 822E1E0
+PetalburgWoods_Movement_WatchResearcherLeave:
 	delay_16
 	delay_16
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft: @ 822E1E4
+PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft:
 	walk_fast_right
 	walk_fast_down
 	walk_fast_down
@@ -187,13 +187,13 @@ PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft: @ 822E1E4
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight: @ 822E1EA
+PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight:
 	walk_fast_down
 	walk_fast_right
 	walk_in_place_fastest_up
 	step_end
 
-PetalburgWoods_Movement_DevonResearcherStartExit: @ 822E1EE
+PetalburgWoods_Movement_DevonResearcherStartExit:
 	walk_in_place_fastest_down
 	delay_16
 	delay_16
@@ -203,18 +203,18 @@ PetalburgWoods_Movement_DevonResearcherStartExit: @ 822E1EE
 	face_up
 	step_end
 
-PetalburgWoods_Movement_AquaApproachResearcherLeft: @ 822E1F6
+PetalburgWoods_Movement_AquaApproachResearcherLeft:
 	walk_fast_down
 	walk_fast_down
 	step_end
 
-PetalburgWoods_Movement_AquaBackOff: @ 822E1F9
+PetalburgWoods_Movement_AquaBackOff:
 	lock_facing_direction
 	walk_up
 	unlock_facing_direction
 	step_end
 
-PetalburgWoods_Movement_AquaRunAway: @ 822E1FD
+PetalburgWoods_Movement_AquaRunAway:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -224,32 +224,32 @@ PetalburgWoods_Movement_AquaRunAway: @ 822E1FD
 	delay_16
 	step_end
 
-PetalburgWoods_Movement_AquaApproachResearcherRight: @ 822E205
+PetalburgWoods_Movement_AquaApproachResearcherRight:
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
 	step_end
 
-PetalburgWoods_Movement_AquaEntrance: @ 822E209
+PetalburgWoods_Movement_AquaEntrance:
 	walk_down
 	walk_down
 	delay_16
 	delay_16
 	step_end
 
-PetalburgWoods_Movement_AquaApproachPlayer: @ 822E20E
+PetalburgWoods_Movement_AquaApproachPlayer:
 	walk_down
 	step_end
 
-PetalburgWoods_EventScript_Boy1:: @ 822E210
+PetalburgWoods_EventScript_Boy1::
 	msgbox PetalburgWoods_Text_StayOutOfTallGrass, MSGBOX_NPC
 	end
 
-PetalburgWoods_EventScript_Boy2:: @ 822E219
+PetalburgWoods_EventScript_Boy2::
 	msgbox PetalburgWoods_Text_HiddenItemsExplanation, MSGBOX_NPC
 	end
 
-PetalburgWoods_EventScript_Girl:: @ 822E222
+PetalburgWoods_EventScript_Girl::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_ExplainMiracleSeed
@@ -261,25 +261,25 @@ PetalburgWoods_EventScript_Girl:: @ 822E222
 	release
 	end
 
-PetalburgWoods_EventScript_ExplainMiracleSeed:: @ 822E251
+PetalburgWoods_EventScript_ExplainMiracleSeed::
 	msgbox PetalburgWoods_Text_MiracleSeedExplanation, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgWoods_EventScript_Sign1:: @ 822E25B
+PetalburgWoods_EventScript_Sign1::
 	msgbox PetalburgWoods_Text_TrainerTipsExperience, MSGBOX_SIGN
 	end
 
-PetalburgWoods_EventScript_Sign2:: @ 822E264
+PetalburgWoods_EventScript_Sign2::
 	msgbox PetalburgWoods_Text_TrainerTipsPP, MSGBOX_SIGN
 	end
 
-PetalburgWoods_EventScript_Lyle:: @ 822E26D
+PetalburgWoods_EventScript_Lyle::
 	trainerbattle_single TRAINER_LYLE, PetalburgWoods_Text_GoBugPokemonTeam, PetalburgWoods_Text_ICouldntWin
 	msgbox PetalburgWoods_Text_ImOutOfPokeBalls, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgWoods_EventScript_James:: @ 822E284
+PetalburgWoods_EventScript_James::
 	trainerbattle_single TRAINER_JAMES_1, PetalburgWoods_Text_InstantlyPopularWithBugPokemon, PetalburgWoods_Text_CantBePopularIfILose, PetalburgWoods_EventScript_TryRegisterJames
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -292,71 +292,71 @@ PetalburgWoods_EventScript_James:: @ 822E284
 	release
 	end
 
-PetalburgWoods_EventScript_TryRegisterJames:: @ 822E2C5
+PetalburgWoods_EventScript_TryRegisterJames::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_RegisterJames
 	release
 	end
 
-PetalburgWoods_EventScript_RegisterJames:: @ 822E2D6
+PetalburgWoods_EventScript_RegisterJames::
 	msgbox PetalburgWoods_Text_IWantRematch1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JAMES_1
 	release
 	end
 
-PetalburgWoods_EventScript_TryRegisterJames2:: @ 822E2EF
+PetalburgWoods_EventScript_TryRegisterJames2::
 	goto_if_set FLAG_HAS_MATCH_CALL, PetalburgWoods_EventScript_RegisterJames2
 	msgbox PetalburgWoods_Text_PeopleRespectYou, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgWoods_EventScript_RegisterJames2:: @ 822E302
+PetalburgWoods_EventScript_RegisterJames2::
 	msgbox PetalburgWoods_Text_IWantRematch2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JAMES_1
 	release
 	end
 
-PetalburgWoods_EventScript_JamesRematch:: @ 822E31B
+PetalburgWoods_EventScript_JamesRematch::
 	trainerbattle_rematch TRAINER_JAMES_1, PetalburgWoods_Text_MyPokemonHaveGrown, PetalburgWoods_Text_CantBePopularIfLose
 	msgbox PetalburgWoods_Text_IveBeenTrainingHard, MSGBOX_AUTOCLOSE
 	end
 
-PetalburgWoods_Text_NotAOneToBeFound: @ 822E332
+PetalburgWoods_Text_NotAOneToBeFound:
 	.string "Hmmm…\n"
 	.string "Not a one to be found…$"
 
-PetalburgWoods_Text_HaveYouSeenShroomish: @ 822E34F
+PetalburgWoods_Text_HaveYouSeenShroomish:
 	.string "Hello, have you seen any POKéMON\n"
 	.string "called SHROOMISH around here?\p"
 	.string "I really love that POKéMON.$"
 
-PetalburgWoods_Text_IWasGoingToAmbushYou: @ 822E3AA
+PetalburgWoods_Text_IWasGoingToAmbushYou:
 	.string "I was going to ambush you, but you\n"
 	.string "had to dawdle in PETALBURG WOODS\l"
 	.string "forever, didn't you?\p"
 	.string "I got sick of waiting, so here I am!$"
 
-PetalburgWoods_Text_HandOverThosePapers: @ 822E428
+PetalburgWoods_Text_HandOverThosePapers:
 	.string "You! DEVON RESEARCHER!\p"
 	.string "Hand over those papers!$"
 
-PetalburgWoods_Text_YouHaveToHelpMe: @ 822E457
+PetalburgWoods_Text_YouHaveToHelpMe:
 	.string "Aiyeeeh!\p"
 	.string "You're a POKéMON TRAINER, aren't you?\n"
 	.string "You've got to help me, please!$"
 
-PetalburgWoods_Text_NoOneCrossesTeamAqua: @ 822E4A5
+PetalburgWoods_Text_NoOneCrossesTeamAqua:
 	.string "Hunh? What do you think you're doing?\n"
 	.string "What, you're going to protect him?\p"
 	.string "No one who crosses TEAM AQUA\n"
 	.string "gets any mercy, not even a kid!\p"
 	.string "Come on and battle me!$"
 
-PetalburgWoods_Text_YoureKiddingMe: @ 822E542
+PetalburgWoods_Text_YoureKiddingMe:
 	.string "You're kidding me! You're tough!$"
 
-PetalburgWoods_Text_YouveGotSomeNerve: @ 822E563
+PetalburgWoods_Text_YouveGotSomeNerve:
 	.string "Grrr… You've got some nerve\n"
 	.string "meddling with TEAM AQUA!\l"
 	.string "Come on and battle me again!\p"
@@ -366,7 +366,7 @@ PetalburgWoods_Text_YouveGotSomeNerve: @ 822E563
 	.string "after something in RUSTBORO.\p"
 	.string "I'll let you go today!$"
 
-PetalburgWoods_Text_ThatWasAwfullyClose: @ 822E63D
+PetalburgWoods_Text_ThatWasAwfullyClose:
 	.string "Whew…\n"
 	.string "That was awfully close!\p"
 	.string "Thanks to you, he didn't rob me of\n"
@@ -374,85 +374,85 @@ PetalburgWoods_Text_ThatWasAwfullyClose: @ 822E63D
 	.string "I know, I'll give you a GREAT BALL as\n"
 	.string "my thanks!$"
 
-PetalburgWoods_Text_TeamAquaAfterSomethingInRustboro: @ 822E6C7
+PetalburgWoods_Text_TeamAquaAfterSomethingInRustboro:
 	.string "Didn't that TEAM AQUA thug say\n"
 	.string "they were after something in\l"
 	.string "RUSTBORO, too?$"
 
-PetalburgWoods_Text_ICantBeWastingTime: @ 822E712
+PetalburgWoods_Text_ICantBeWastingTime:
 	.string "Uh-oh! It's a crisis!\n"
 	.string "I can't be wasting time!$"
 
-PetalburgWoods_Text_YoureLoadedWithItems: @ 822E741
+PetalburgWoods_Text_YoureLoadedWithItems:
 	.string "You're loaded with items.\n"
 	.string "I can't give you this GREAT BALL.$"
 
-PetalburgWoods_Text_GoBugPokemonTeam: @ 822E77D
+PetalburgWoods_Text_GoBugPokemonTeam:
 	.string "I caught a whole bunch of POKéMON!\p"
 	.string "Go, go, go!\n"
 	.string "My BUG POKéMON team!$"
 
-PetalburgWoods_Text_ICouldntWin: @ 822E7C1
+PetalburgWoods_Text_ICouldntWin:
 	.string "I have all these POKéMON,\n"
 	.string "but I couldn't win…$"
 
-PetalburgWoods_Text_ImOutOfPokeBalls: @ 822E7EF
+PetalburgWoods_Text_ImOutOfPokeBalls:
 	.string "I caught a bunch of POKéMON.\n"
 	.string "Now I'm out of POKé BALLS.$"
 
-PetalburgWoods_Text_InstantlyPopularWithBugPokemon: @ 822E827
+PetalburgWoods_Text_InstantlyPopularWithBugPokemon:
 	.string "If you take BUG POKéMON to school,\n"
 	.string "you get to be instantly popular!$"
 
-PetalburgWoods_Text_CantBePopularIfILose: @ 822E86B
+PetalburgWoods_Text_CantBePopularIfILose:
 	.string "I can't be popular if I lose.$"
 
-PetalburgWoods_Text_PeopleRespectYou: @ 822E889
+PetalburgWoods_Text_PeopleRespectYou:
 	.string "If you have a big BUG POKéMON,\n"
 	.string "people respect you for it.$"
 
-PetalburgWoods_Text_IWantRematch1: @ 822E8C3
+PetalburgWoods_Text_IWantRematch1:
 	.string "I want a rematch when my BUG\n"
 	.string "POKéMON grow up!\p"
 	.string "I'm registering you in my POKéNAV!$"
 
-PetalburgWoods_Text_IWantRematch2: @ 822E914
+PetalburgWoods_Text_IWantRematch2:
 	.string "I want a rematch when my BUG \n"
 	.string "POKéMON grow up!\p"
 	.string "I'm registering you in my POKéNAV!$"
 
-PetalburgWoods_Text_MyPokemonHaveGrown: @ 822E966
+PetalburgWoods_Text_MyPokemonHaveGrown:
 	.string "My BUG POKéMON have grown.\n"
 	.string "I'll be popular again.$"
 
-PetalburgWoods_Text_CantBePopularIfLose: @ 822E998
+PetalburgWoods_Text_CantBePopularIfLose:
 	.string "I can't be popular if I lose.$"
 
-PetalburgWoods_Text_IveBeenTrainingHard: @ 822E9B6
+PetalburgWoods_Text_IveBeenTrainingHard:
 	.string "You get to be popular if you have\n"
 	.string "strong POKéMON, right?\l"
 	.string "So, I've been training hard.$"
 
-PetalburgWoods_Text_StayOutOfTallGrass: @ 822EA0C
+PetalburgWoods_Text_StayOutOfTallGrass:
 	.string "Yo, there!\n"
 	.string "Your POKéMON doing okay?\p"
 	.string "If your POKéMON are weak and you want\n"
 	.string "to avoid battles, you should stay out\l"
 	.string "of tall grass.$"
 
-PetalburgWoods_Text_HiddenItemsExplanation: @ 822EA8B
+PetalburgWoods_Text_HiddenItemsExplanation:
 	.string "Sometimes, there are things on the\n"
 	.string "ground even if you can't see them.\p"
 	.string "That's why I always check where I'm\n"
 	.string "walking.$"
 
-PetalburgWoods_Text_TryUsingThisItem: @ 822EAFE
+PetalburgWoods_Text_TryUsingThisItem:
 	.string "Oh, neat!\n"
 	.string "That's the BADGE from RUSTBORO GYM!\p"
 	.string "You must be a TRAINER.\n"
 	.string "You should try using this item.$"
 
-PetalburgWoods_Text_MiracleSeedExplanation: @ 822EB63
+PetalburgWoods_Text_MiracleSeedExplanation:
 	.string "It's a MIRACLE SEED.\n"
 	.string "If a POKéMON holds that item, its\l"
 	.string "GRASS-type moves become stronger.\p"
@@ -460,7 +460,7 @@ PetalburgWoods_Text_MiracleSeedExplanation: @ 822EB63
 	.string "other convenient items for POKéMON\l"
 	.string "to hold.$"
 
-PetalburgWoods_Text_TrainerTipsExperience: @ 822EC10
+PetalburgWoods_Text_TrainerTipsExperience:
 	.string "TRAINER TIPS\p"
 	.string "Any POKéMON that appears even once\n"
 	.string "in a battle is awarded EXP Points.\p"
@@ -470,7 +470,7 @@ PetalburgWoods_Text_TrainerTipsExperience: @ 822EC10
 	.string "out. It will earn EXP Points without\l"
 	.string "being exposed to any harm.$"
 
-PetalburgWoods_Text_TrainerTipsPP: @ 822ED07
+PetalburgWoods_Text_TrainerTipsPP:
 	.string "TRAINER TIPS\p"
 	.string "In addition to Hit Points (HP), POKéMON\n"
 	.string "have Power Points (PP) that are used to\l"
diff --git a/data/maps/RecordCorner/scripts.inc b/data/maps/RecordCorner/scripts.inc
index 4f342b860..b317920de 100644
--- a/data/maps/RecordCorner/scripts.inc
+++ b/data/maps/RecordCorner/scripts.inc
@@ -1,3 +1,3 @@
-RecordCorner_MapScripts:: @ 823B77F
+RecordCorner_MapScripts::
 	.byte 0
 
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
index b93226147..d83c8213b 100644
--- a/data/maps/Route101/scripts.inc
+++ b/data/maps/Route101/scripts.inc
@@ -1,25 +1,25 @@
 .set LOCALID_BIRCH, 2
 .set LOCALID_ZIGZAGOON, 4
 
-Route101_MapScripts:: @ 81EBCBA
+Route101_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route101_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_OnFrame
 	.byte 0
 
-Route101_OnTransition: @ 81EBCC5
+Route101_OnTransition:
 	call ProfBirch_EventScript_UpdateLocation
 	end
 
-Route101_OnFrame: @ 81EBCCB
+Route101_OnFrame:
 	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_HideMapNamePopup
 	.2byte 0
 
-Route101_EventScript_HideMapNamePopup:: @ 81EBCD5
+Route101_EventScript_HideMapNamePopup::
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_ROUTE101_STATE, 1
 	end
 
-Route101_EventScript_StartBirchRescue:: @ 81EBCDE
+Route101_EventScript_StartBirchRescue::
 	lockall
 	playbgm MUS_HELP, TRUE
 	msgbox Route101_Text_HelpMe, MSGBOX_DEFAULT
@@ -44,7 +44,7 @@ Route101_EventScript_StartBirchRescue:: @ 81EBCDE
 	releaseall
 	end
 
-Route101_EventScript_PreventExitSouth:: @ 81EBD4E
+Route101_EventScript_PreventExitSouth::
 	lockall
 	msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT
 	closemessage
@@ -53,7 +53,7 @@ Route101_EventScript_PreventExitSouth:: @ 81EBD4E
 	releaseall
 	end
 
-Route101_EventScript_PreventExitWest:: @ 81EBD64
+Route101_EventScript_PreventExitWest::
 	lockall
 	msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT
 	closemessage
@@ -62,7 +62,7 @@ Route101_EventScript_PreventExitWest:: @ 81EBD64
 	releaseall
 	end
 
-Route101_EventScript_PreventExitNorth:: @ 81EBD7A
+Route101_EventScript_PreventExitNorth::
 	lockall
 	msgbox Route101_Text_DontLeaveMe, MSGBOX_DEFAULT
 	closemessage
@@ -71,19 +71,19 @@ Route101_EventScript_PreventExitNorth:: @ 81EBD7A
 	releaseall
 	end
 
-Route101_Movement_PreventExitSouth: @ 81EBD90
+Route101_Movement_PreventExitSouth:
 	walk_up
 	step_end
 
-Route101_Movement_PreventExitWest: @ 81EBD92
+Route101_Movement_PreventExitWest:
 	walk_right
 	step_end
 
-Route101_Movement_PreventExitNorth: @ 81EBD94
+Route101_Movement_PreventExitNorth:
 	walk_down
 	step_end
 
-Route101_Movement_ZigzagoonChaseInCircles: @ 81EBD96
+Route101_Movement_ZigzagoonChaseInCircles:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -116,7 +116,7 @@ Route101_Movement_ZigzagoonChaseInCircles: @ 81EBD96
 	walk_fast_left
 	step_end
 
-Route101_Movement_ZigzagoonChase1: @ 81EBDB5
+Route101_Movement_ZigzagoonChase1:
 	walk_fast_up
 	walk_fast_right
 	walk_fast_right
@@ -128,14 +128,14 @@ Route101_Movement_ZigzagoonChase1: @ 81EBDB5
 @ Leftover data? This command is unused.
 	step_end
 
-Route101_Movement_ZigzagoonFaceBirch: @ 81EBDBD
+Route101_Movement_ZigzagoonFaceBirch:
 	walk_in_place_fast_left
 	walk_in_place_fast_left
 	walk_in_place_fast_left
 	walk_in_place_fast_left
 	step_end
 
-Route101_Movement_EnterScene: @ 81EBDC2
+Route101_Movement_EnterScene:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -143,7 +143,7 @@ Route101_Movement_EnterScene: @ 81EBDC2
 	walk_in_place_fastest_left
 	step_end
 
-Route101_Movement_BirchRunInCircles: @ 81EBDC8
+Route101_Movement_BirchRunInCircles:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_right
@@ -176,7 +176,7 @@ Route101_Movement_BirchRunInCircles: @ 81EBDC8
 	walk_fast_left
 	step_end
 
-Route101_Movement_BirchRunAway1: @ 81EBDE7
+Route101_Movement_BirchRunAway1:
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -188,37 +188,37 @@ Route101_Movement_BirchRunAway1: @ 81EBDE7
 @ Leftover data? This command is unused.
 	step_end
 
-Route101_Movement_BirchFaceZigzagoon: @ 81EBDEF
+Route101_Movement_BirchFaceZigzagoon:
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	step_end
 
-Route101_Movement_Unused1: @ 81EBDF4
+Route101_Movement_Unused1:
 	walk_up
 	walk_up
 	step_end
 
-Route101_Movement_Unused2: @ 81EBDF7
+Route101_Movement_Unused2:
 	walk_up
 	walk_left
 	walk_up
 	step_end
 
-Route101_EventScript_Youngster:: @ 81EBDFB
+Route101_EventScript_Youngster::
 	msgbox Route101_Text_TakeTiredPokemonToPokeCenter, MSGBOX_NPC
 	end
 
-Route101_EventScript_Boy:: @ 81EBE04
+Route101_EventScript_Boy::
 	msgbox Route101_Text_WildPokemonInTallGrass, MSGBOX_NPC
 	end
 
-Route101_EventScript_RouteSign:: @ 81EBE0D
+Route101_EventScript_RouteSign::
 	msgbox Route101_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route101_EventScript_BirchsBag:: @ 81EBE16
+Route101_EventScript_BirchsBag::
 	lock
 	faceplayer
 	setflag FLAG_SYS_POKEMON_GET
@@ -250,32 +250,32 @@ Route101_EventScript_BirchsBag:: @ 81EBE16
 	release
 	end
 
-Route101_EventScript_HideMayInBedroom:: @ 81EBE85
+Route101_EventScript_HideMayInBedroom::
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	return
 
-Route101_EventScript_HideBrendanInBedroom:: @ 81EBE89
+Route101_EventScript_HideBrendanInBedroom::
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	return
 
-Route101_Movement_BirchApproachPlayer: @ 81EBE8D
+Route101_Movement_BirchApproachPlayer:
 	walk_right
 	step_end
 
-Route101_Text_HelpMe: @ 81EBE8F
+Route101_Text_HelpMe:
 	.string "H-help me!$"
 
-Route101_Text_PleaseHelp: @ 81EBE9A
+Route101_Text_PleaseHelp:
 	.string "Hello! You over there!\n"
 	.string "Please! Help!\p"
 	.string "In my BAG!\n"
 	.string "There's a POKé BALL!$"
 
-Route101_Text_DontLeaveMe: @ 81EBEDF
+Route101_Text_DontLeaveMe:
 	.string "Wh-Where are you going?!\n"
 	.string "Don't leave me like this!$"
 
-Route101_Text_YouSavedMe: @ 81EBF12
+Route101_Text_YouSavedMe:
 	.string "PROF. BIRCH: Whew…\p"
 	.string "I was in the tall grass studying wild\n"
 	.string "POKéMON when I was jumped.\p"
@@ -286,19 +286,19 @@ Route101_Text_YouSavedMe: @ 81EBF12
 	.string "This is not the place to chat, so come\n"
 	.string "by my POKéMON LAB later, okay?$"
 
-Route101_Text_TakeTiredPokemonToPokeCenter: @ 81EBFDD
+Route101_Text_TakeTiredPokemonToPokeCenter:
 	.string "If POKéMON get tired, take them to\n"
 	.string "a POKéMON CENTER.\p"
 	.string "There's a POKéMON CENTER in OLDALE\n"
 	.string "TOWN right close by.$"
 
-Route101_Text_WildPokemonInTallGrass: @ 81EC04A
+Route101_Text_WildPokemonInTallGrass:
 	.string "Wild POKéMON will jump out at you in\n"
 	.string "tall grass.\p"
 	.string "If you want to catch POKéMON, you have\n"
 	.string "to go into the tall grass and search.$"
 
-Route101_Text_RouteSign: @ 81EC0C8
+Route101_Text_RouteSign:
 	.string "ROUTE 101\n"
 	.string "{UP_ARROW} OLDALE TOWN$"
 
diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc
index b14f204e5..cc1eaa4bb 100644
--- a/data/maps/Route102/scripts.inc
+++ b/data/maps/Route102/scripts.inc
@@ -1,23 +1,23 @@
-Route102_MapScripts:: @ 81EC0E0
+Route102_MapScripts::
 	.byte 0
 
-Route102_EventScript_LittleBoy:: @ 81EC0E1
+Route102_EventScript_LittleBoy::
 	msgbox Route102_Text_ImNotVeryTall, MSGBOX_NPC
 	end
 
-Route102_EventScript_RouteSignOldale:: @ 81EC0EA
+Route102_EventScript_RouteSignOldale::
 	msgbox Route102_Text_RouteSignOldale, MSGBOX_SIGN
 	end
 
-Route102_EventScript_RouteSignPetalburg:: @ 81EC0F3
+Route102_EventScript_RouteSignPetalburg::
 	msgbox Route102_Text_RouteSignPetalburg, MSGBOX_SIGN
 	end
 
-Route102_EventScript_Boy:: @ 81EC0FC
+Route102_EventScript_Boy::
 	msgbox Route102_Text_CatchWholeBunchOfPokemon, MSGBOX_NPC
 	end
 
-Route102_EventScript_Calvin:: @ 81EC105
+Route102_EventScript_Calvin::
 	trainerbattle_single TRAINER_CALVIN_1, Route102_Text_CalvinIntro, Route102_Text_CalvinDefeated, Route102_EventScript_CalvinRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -30,52 +30,52 @@ Route102_EventScript_Calvin:: @ 81EC105
 	release
 	end
 
-Route102_EventScript_CalvinRegisterMatchCallAfterBattle:: @ 81EC146
+Route102_EventScript_CalvinRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_CalvinRegisterMatchCall
 	release
 	end
 
-Route102_EventScript_CalvinRegisterMatchCall:: @ 81EC157
+Route102_EventScript_CalvinRegisterMatchCall::
 	msgbox Route102_Text_CalvinRegisterShort, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CALVIN_1
 	release
 	end
 
-Route102_EventScript_CalvinTryRegister:: @ 81EC170
+Route102_EventScript_CalvinTryRegister::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route102_EventScript_CalvinRegister
 	msgbox Route102_Text_CalvinPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route102_EventScript_CalvinRegister:: @ 81EC183
+Route102_EventScript_CalvinRegister::
 	msgbox Route102_Text_CalvinRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CALVIN_1
 	release
 	end
 
-Route102_EventScript_CalvinRematch:: @ 81EC19C
+Route102_EventScript_CalvinRematch::
 	trainerbattle_rematch TRAINER_CALVIN_1, Route102_Text_CalvinRematchIntro, Route102_Text_CalvinRematchDefeated
 	msgbox Route102_Text_CalvinRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route102_EventScript_Rick:: @ 81EC1B3
+Route102_EventScript_Rick::
 	trainerbattle_single TRAINER_RICK, Route102_Text_RickIntro, Route102_Text_RickDefeated
 	msgbox Route102_Text_RickPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route102_EventScript_Tiana:: @ 81EC1CA
+Route102_EventScript_Tiana::
 	trainerbattle_single TRAINER_TIANA, Route102_Text_TianaIntro, Route102_Text_TianaDefeated
 	msgbox Route102_Text_TianaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route102_EventScript_Allen:: @ 81EC1E1
+Route102_EventScript_Allen::
 	trainerbattle_single TRAINER_ALLEN, Route102_Text_AllenIntro, Route102_Text_AllenDefeated
 	msgbox Route102_Text_AllenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route102_Text_WatchMeCatchPokemon: @ 81EC1F8
+Route102_Text_WatchMeCatchPokemon:
 	.string "WALLY: {PLAYER}…\n"
 	.string "POKéMON hide in tall grass like this,\l"
 	.string "don't they?\p"
@@ -83,29 +83,29 @@ Route102_Text_WatchMeCatchPokemon: @ 81EC1F8
 	.string "catch one properly.\p"
 	.string "…Whoa!$"
 
-Route102_Text_WallyIDidIt: @ 81EC271
+Route102_Text_WallyIDidIt:
 	.string "WALLY: I did it… It's my…\n"
 	.string "My POKéMON!$"
 
-Route102_Text_LetsGoBack: @ 81EC297
+Route102_Text_LetsGoBack:
 	.string "{PLAYER}, thank you!\n"
 	.string "Let's go back to the GYM!$"
 
-Route102_Text_ImNotVeryTall: @ 81EC2C0
+Route102_Text_ImNotVeryTall:
 	.string "I'm…not very tall, so I sink right\n"
 	.string "into tall grass.\p"
 	.string "The grass goes up my nose and…\n"
 	.string "Fwafwafwafwafwa…\p"
 	.string "Fwatchoo!$"
 
-Route102_Text_CatchWholeBunchOfPokemon: @ 81EC32E
+Route102_Text_CatchWholeBunchOfPokemon:
 	.string "I'm going to catch a whole bunch of\n"
 	.string "POKéMON!$"
 
-Route102_Text_RouteSignOldale: @ 81EC35B
+Route102_Text_RouteSignOldale:
 	.string "ROUTE 102\n"
 	.string "{RIGHT_ARROW} OLDALE TOWN$"
 
-Route102_Text_RouteSignPetalburg: @ 81EC373
+Route102_Text_RouteSignPetalburg:
 	.string "ROUTE 102\n"
 	.string "{LEFT_ARROW} PETALBURG CITY$"
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index b096069e7..f0ac53949 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -1,25 +1,25 @@
 .set LOCALID_RIVAL, 2
 
-Route103_MapScripts:: @ 81EC38E
+Route103_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route103_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route103_OnLoad
 	.byte 0
 
-Route103_OnTransition: @ 81EC399
+Route103_OnTransition:
 	call Common_EventScript_SetupRivalGfxId
 	call ProfBirch_EventScript_UpdateLocation
 	end
 
-Route103_OnLoad: @ 81EC3A4
+Route103_OnLoad:
 	call_if_set FLAG_SYS_GAME_CLEAR, Route103_EventScript_OpenAlteringCave
 	end
 
-Route103_EventScript_OpenAlteringCave:: @ 81EC3AE
+Route103_EventScript_OpenAlteringCave::
 	setmetatile 45, 5, METATILE_General_CaveEntrance_Top, 1
 	setmetatile 45, 6, METATILE_General_CaveEntrance_Bottom, 0
 	return
 
-Route103_EventScript_Rival:: @ 81EC3C1
+Route103_EventScript_Rival::
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -28,7 +28,7 @@ Route103_EventScript_Rival:: @ 81EC3C1
 	goto_if_eq Route103_EventScript_RivalBrendan
 	end
 
-Route103_EventScript_RivalMay:: @ 81EC3DA
+Route103_EventScript_RivalMay::
 	msgbox Route103_Text_MayRoute103Pokemon, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_ENCOUNTER_MAY, TRUE
@@ -45,7 +45,7 @@ Route103_EventScript_RivalMay:: @ 81EC3DA
 	case 2, Route103_EventScript_StartMayBattleMudkip
 	end
 
-Route103_EventScript_RivalBrendan:: @ 81EC434
+Route103_EventScript_RivalBrendan::
 	msgbox Route103_Text_BrendanRoute103Pokemon, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_ENCOUNTER_BRENDAN, TRUE
@@ -62,47 +62,47 @@ Route103_EventScript_RivalBrendan:: @ 81EC434
 	case 2, Route103_EventScript_StartBrendanBattleMudkip
 	end
 
-Route103_EventScript_StartMayBattleTreecko:: @ 81EC48E
+Route103_EventScript_StartMayBattleTreecko::
 	trainerbattle_no_intro TRAINER_MAY_ROUTE_103_TREECKO, Route103_Text_MayDefeated
 	goto Route103_EventScript_AfterMayBattle
 	end
 
-Route103_EventScript_StartMayBattleTorchic:: @ 81EC49E
+Route103_EventScript_StartMayBattleTorchic::
 	trainerbattle_no_intro TRAINER_MAY_ROUTE_103_TORCHIC, Route103_Text_MayDefeated
 	goto Route103_EventScript_AfterMayBattle
 	end
 
-Route103_EventScript_StartMayBattleMudkip:: @ 81EC4AE
+Route103_EventScript_StartMayBattleMudkip::
 	trainerbattle_no_intro TRAINER_MAY_ROUTE_103_MUDKIP, Route103_Text_MayDefeated
 	goto Route103_EventScript_AfterMayBattle
 	end
 
-Route103_EventScript_StartBrendanBattleTreecko:: @ 81EC4BE
+Route103_EventScript_StartBrendanBattleTreecko::
 	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_TREECKO, Route103_Text_BrendanDefeated
 	goto Route103_EventScript_AfterBrendanBattle
 	end
 
-Route103_EventScript_StartBrendanBattleTorchic:: @ 81EC4CE
+Route103_EventScript_StartBrendanBattleTorchic::
 	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_TORCHIC, Route103_Text_BrendanDefeated
 	goto Route103_EventScript_AfterBrendanBattle
 	end
 
-Route103_EventScript_StartBrendanBattleMudkip:: @ 81EC4DE
+Route103_EventScript_StartBrendanBattleMudkip::
 	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_103_MUDKIP, Route103_Text_BrendanDefeated
 	goto Route103_EventScript_AfterBrendanBattle
 	end
 
-Route103_EventScript_AfterMayBattle:: @ 81EC4EE
+Route103_EventScript_AfterMayBattle::
 	msgbox Route103_Text_MayTimeToHeadBack, MSGBOX_DEFAULT
 	goto Route103_EventScript_RivalExit
 	end
 
-Route103_EventScript_AfterBrendanBattle:: @ 81EC4FC
+Route103_EventScript_AfterBrendanBattle::
 	msgbox Route103_Text_BrendanTimeToHeadBack, MSGBOX_DEFAULT
 	goto Route103_EventScript_RivalExit
 	end
 
-Route103_EventScript_RivalExit:: @ 81EC50A
+Route103_EventScript_RivalExit::
 	closemessage
 	switch VAR_FACING
 	case DIR_SOUTH, Route103_EventScript_RivalExitFacingSouth
@@ -111,7 +111,7 @@ Route103_EventScript_RivalExit:: @ 81EC50A
 	case DIR_EAST, Route103_EventScript_RivalExitFacingEastOrWest
 	end
 
-Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D
+Route103_EventScript_RivalExitFacingNorth::
 	applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingNorth
 	applymovement LOCALID_RIVAL, Route103_Movement_RivalExitFacingNorth1
 	waitmovement 0
@@ -121,7 +121,7 @@ Route103_EventScript_RivalExitFacingNorth:: @ 81EC53D
 	goto Route103_EventScript_RivalEnd
 	end
 
-Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561
+Route103_EventScript_RivalExitFacingEastOrWest::
 	applymovement OBJ_EVENT_ID_PLAYER, Route103_Movement_WatchRivalExitFacingEastOrWest
 	applymovement LOCALID_RIVAL, Route103_Movement_RivalExit1
 	waitmovement 0
@@ -131,7 +131,7 @@ Route103_EventScript_RivalExitFacingEastOrWest:: @ 81EC561
 	goto Route103_EventScript_RivalEnd
 	end
 
-Route103_EventScript_RivalExitFacingSouth:: @ 81EC585
+Route103_EventScript_RivalExitFacingSouth::
 	applymovement LOCALID_RIVAL, Route103_Movement_RivalExit1
 	waitmovement 0
 	playse SE_LEDGE
@@ -140,7 +140,7 @@ Route103_EventScript_RivalExitFacingSouth:: @ 81EC585
 	goto Route103_EventScript_RivalEnd
 	end
 
-Route103_EventScript_RivalEnd:: @ 81EC5A2
+Route103_EventScript_RivalEnd::
 	removeobject LOCALID_RIVAL
 	setvar VAR_BIRCH_LAB_STATE, 4
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL
@@ -152,12 +152,12 @@ Route103_EventScript_RivalEnd:: @ 81EC5A2
 	releaseall
 	end
 
-Route103_Movement_RivalExitFacingNorth1: @ 81EC5BE
+Route103_Movement_RivalExitFacingNorth1:
 	walk_left
 	walk_down
 	step_end
 
-Route103_EventScript_RivalExitFacingNorth2: @ 81EC5C1
+Route103_EventScript_RivalExitFacingNorth2:
 	jump_2_down
 	delay_16
 	walk_down
@@ -166,7 +166,7 @@ Route103_EventScript_RivalExitFacingNorth2: @ 81EC5C1
 	walk_down
 	step_end
 
-Route103_Movement_WatchRivalExitFacingNorth: @ 81EC5C8
+Route103_Movement_WatchRivalExitFacingNorth:
 	delay_16
 	delay_4
 	walk_in_place_fastest_left
@@ -174,11 +174,11 @@ Route103_Movement_WatchRivalExitFacingNorth: @ 81EC5C8
 	walk_in_place_fastest_down
 	step_end
 
-Route103_Movement_RivalExit1: @ 81EC5CE
+Route103_Movement_RivalExit1:
 	walk_down
 	step_end
 
-Route103_Movement_RivalExit2: @ 81EC5D0
+Route103_Movement_RivalExit2:
 	jump_2_down
 	delay_16
 	walk_down
@@ -186,29 +186,29 @@ Route103_Movement_RivalExit2: @ 81EC5D0
 	walk_down
 	step_end
 
-Route103_Movement_WatchRivalExitFacingEastOrWest: @ 81EC5D6
+Route103_Movement_WatchRivalExitFacingEastOrWest:
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-Route103_EventScript_Boy:: @ 81EC5D9
+Route103_EventScript_Boy::
 	msgbox Route103_Text_ShouldHaveBroughtPotion, MSGBOX_NPC
 	end
 
-Route103_EventScript_Man:: @ 81EC5E2
+Route103_EventScript_Man::
 	msgbox Route103_Text_ShortcutToOldale, MSGBOX_NPC
 	end
 
-Route103_EventScript_RouteSign:: @ 81EC5EB
+Route103_EventScript_RouteSign::
 	msgbox Route103_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route103_EventScript_Daisy:: @ 81EC5F4
+Route103_EventScript_Daisy::
 	trainerbattle_single TRAINER_DAISY, Route103_Text_DaisyIntro, Route103_Text_DaisyDefeated
 	msgbox Route103_Text_DaisyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_Amy:: @ 81EC60B
+Route103_EventScript_Amy::
 	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_AmyIntro, Route103_Text_AmyDefeated, Route103_Text_AmyNotEnoughPokemon, Route102_EventScript_AmyRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -216,18 +216,18 @@ Route103_EventScript_Amy:: @ 81EC60B
 	msgbox Route103_Text_AmyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route102_EventScript_AmyRegisterMatchCallAfterBattle:: @ 81EC63A
+Route102_EventScript_AmyRegisterMatchCallAfterBattle::
 	msgbox Route103_Text_AmyLivRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_AMY_AND_LIV_1
 	release
 	end
 
-Route102_EventScript_AmyRematch:: @ 81EC653
+Route102_EventScript_AmyRematch::
 	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_AmyRematchIntro, Route103_Text_AmyRematchDefeated, Route103_Text_AmyRematchNotEnoughPokemon
 	msgbox Route103_Text_AmyRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_Liv:: @ 81EC66E
+Route103_EventScript_Liv::
 	trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_LivIntro, Route103_Text_LivDefeated, Route103_Text_LivNotEnoughPokemon, Route102_EventScript_LivRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -235,23 +235,23 @@ Route103_EventScript_Liv:: @ 81EC66E
 	msgbox Route103_Text_LivPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route102_EventScript_LivRegisterMatchCallAfterBattle:: @ 81EC69D
+Route102_EventScript_LivRegisterMatchCallAfterBattle::
 	msgbox Route103_Text_AmyLivRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_AMY_AND_LIV_1
 	release
 	end
 
-Route102_EventScript_LivRematch:: @ 81EC6B6
+Route102_EventScript_LivRematch::
 	trainerbattle_rematch_double TRAINER_AMY_AND_LIV_1, Route103_Text_LivRematchIntro, Route103_Text_LivRematchDefeated, Route103_Text_LivRematchNotEnoughPokemon
 	msgbox Route103_Text_LivRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_Andrew:: @ 81EC6D1
+Route103_EventScript_Andrew::
 	trainerbattle_single TRAINER_ANDREW, Route103_Text_AndrewIntro, Route103_Text_AndrewDefeated
 	msgbox Route103_Text_AndrewPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_Miguel:: @ 81EC6E8
+Route103_EventScript_Miguel::
 	trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_MiguelIntro, Route103_Text_MiguelDefeated, Route102_EventScript_MiguelRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -260,7 +260,7 @@ Route103_EventScript_Miguel:: @ 81EC6E8
 	release
 	end
 
-Route102_EventScript_MiguelRegisterMatchCallAfterBattle:: @ 81EC714
+Route102_EventScript_MiguelRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route103_Text_MiguelRegister, MSGBOX_DEFAULT
@@ -268,36 +268,36 @@ Route102_EventScript_MiguelRegisterMatchCallAfterBattle:: @ 81EC714
 	release
 	end
 
-Route103_EventScript_MiguelRematch:: @ 81EC733
+Route103_EventScript_MiguelRematch::
 	trainerbattle_rematch TRAINER_MIGUEL_1, Route103_Text_MiguelRematchIntro, Route103_Text_MiguelRematchDefeated
 	msgbox Route103_Text_MiguelRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_Marcos:: @ 81EC74A
+Route103_EventScript_Marcos::
 	trainerbattle_single TRAINER_MARCOS, Route103_Text_MarcosIntro, Route103_Text_MarcosDefeated
 	msgbox Route103_Text_MarcosPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_Rhett:: @ 81EC761
+Route103_EventScript_Rhett::
 	trainerbattle_single TRAINER_RHETT, Route103_Text_RhettIntro, Route103_Text_RhettDefeated
 	msgbox Route103_Text_RhettPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_Pete:: @ 81EC778
+Route103_EventScript_Pete::
 	trainerbattle_single TRAINER_PETE, Route103_Text_PeteIntro, Route103_Text_PeteDefeated
 	msgbox Route103_Text_PetePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_EventScript_Isabelle:: @ 81EC78F
+Route103_EventScript_Isabelle::
 	trainerbattle_single TRAINER_ISABELLE, Route103_Text_IsabelleIntro, Route103_Text_IsabelleDefeated
 	msgbox Route103_Text_IsabellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route103_Text_MayRoute103Pokemon: @ 81EC7A6
+Route103_Text_MayRoute103Pokemon:
 	.string "MAY: Let's see… The POKéMON found\n"
 	.string "on ROUTE 103 include…$"
 
-Route103_Text_MayLetsBattle: @ 81EC7DE
+Route103_Text_MayLetsBattle:
 	.string "Oh, hi, {PLAYER}{KUN}!\p"
 	.string "…Oh, I see, my dad gave you\n"
 	.string "a POKéMON as a gift.\p"
@@ -306,11 +306,11 @@ Route103_Text_MayLetsBattle: @ 81EC7DE
 	.string "I'll give you a taste of what being\n"
 	.string "a TRAINER is like.$"
 
-Route103_Text_MayDefeated: @ 81EC881
+Route103_Text_MayDefeated:
 	.string "Wow! That's great!\n"
 	.string "{PLAYER}{KUN}, you're pretty good!$"
 
-Route103_Text_MayTimeToHeadBack: @ 81EC8AE
+Route103_Text_MayTimeToHeadBack:
 	.string "MAY: I think I know why my dad has\n"
 	.string "an eye out for you now.\p"
 	.string "I mean, you just got that POKéMON,\n"
@@ -320,11 +320,11 @@ Route103_Text_MayTimeToHeadBack: @ 81EC8AE
 	.string "Well, it's time to head back to\n"
 	.string "the LAB.$"
 
-Route103_Text_BrendanRoute103Pokemon: @ 81EC989
+Route103_Text_BrendanRoute103Pokemon:
 	.string "BRENDAN: Okay, so it's this one and\n"
 	.string "that one that live on ROUTE 103…$"
 
-Route103_Text_BrendanLetsBattle: @ 81EC9CE
+Route103_Text_BrendanLetsBattle:
 	.string "Hey, it's {PLAYER}!\p"
 	.string "…Oh, yeah, Dad gave you a POKéMON.\p"
 	.string "Since we're here, how about a little\n"
@@ -332,10 +332,10 @@ Route103_Text_BrendanLetsBattle: @ 81EC9CE
 	.string "I'll teach you what being a TRAINER's\n"
 	.string "about!$"
 
-Route103_Text_BrendanDefeated: @ 81ECA59
+Route103_Text_BrendanDefeated:
 	.string "Huh, {PLAYER}, you're not too shabby.$"
 
-Route103_Text_BrendanTimeToHeadBack: @ 81ECA79
+Route103_Text_BrendanTimeToHeadBack:
 	.string "BRENDAN: I think I get it.\n"
 	.string "I think I know why my dad has his eye\l"
 	.string "out for you now.\p"
@@ -345,16 +345,16 @@ Route103_Text_BrendanTimeToHeadBack: @ 81ECA79
 	.string "could befriend any POKéMON with ease.\p"
 	.string "We should head back to the LAB.$"
 
-Route103_Text_ShouldHaveBroughtPotion: @ 81ECB73
+Route103_Text_ShouldHaveBroughtPotion:
 	.string "My POKéMON is staggeringly tired…\n"
 	.string "I should have brought a POTION…$"
 
-Route103_Text_ShortcutToOldale: @ 81ECBB5
+Route103_Text_ShortcutToOldale:
 	.string "If you cross the sea from here,\n"
 	.string "it'll be a shortcut to OLDALE TOWN.\p"
 	.string "Fufufu, that's useful, isn't it?$"
 
-Route103_Text_RouteSign: @ 81ECC1A
+Route103_Text_RouteSign:
 	.string "ROUTE 103\n"
 	.string "{DOWN_ARROW} OLDALE TOWN$"
 
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
index cb840d9b3..e527c055e 100644
--- a/data/maps/Route104/scripts.inc
+++ b/data/maps/Route104/scripts.inc
@@ -1,38 +1,38 @@
-@ NOTE: Route 104's sail to Dewford script references local IDs from Dewford's map. 
+@ NOTE: Route 104's sail to Dewford script references local IDs from Dewford's map.
 @  These are labeled in DewfordTown/scripts.inc
 .set LOCALID_RIVAL, 34
 
-Route104_MapScripts:: @ 81ECC32
+Route104_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route104_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, Route104_OnTransition
 	.byte 0
 
-Route104_OnFrame: @ 81ECC3D
+Route104_OnFrame:
 	map_script_2 VAR_BOARD_BRINEY_BOAT_STATE, 1, Route104_EventScript_StartSailToDewford
 	.2byte 0
 
-Route104_EventScript_StartSailToDewford:: @ 81ECC47
+Route104_EventScript_StartSailToDewford::
 	lockall
 	goto Route104_EventScript_SailToDewford
 	end
 
-Route104_OnTransition: @ 81ECC4E
+Route104_OnTransition:
 	call Common_EventScript_SetupRivalGfxId
 	call Route104_EventScript_TrySetRivalPos
 	call Route104_EventScript_ShowOrHideWhiteHerbFlorist
 	end
 
-Route104_EventScript_ShowOrHideWhiteHerbFlorist:: @ 81ECC5E
+Route104_EventScript_ShowOrHideWhiteHerbFlorist::
 	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_HideWhiteHerbFlorist
 	goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_HideWhiteHerbFlorist
 	clearflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
 	return
 
-Route104_EventScript_HideWhiteHerbFlorist:: @ 81ECC74
+Route104_EventScript_HideWhiteHerbFlorist::
 	setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
 	return
 
-Route104_EventScript_TrySetRivalPos:: @ 81ECC78
+Route104_EventScript_TrySetRivalPos::
 	compare VAR_BOARD_BRINEY_BOAT_STATE, 1
 	goto_if_ge Route104_EventScript_DontSetRivalPos
 	goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_DontSetRivalPos
@@ -40,17 +40,17 @@ Route104_EventScript_TrySetRivalPos:: @ 81ECC78
 	setobjectxyperm LOCALID_RIVAL, 17, 52
 	return
 
-Route104_EventScript_DontSetRivalPos:: @ 81ECC9D
+Route104_EventScript_DontSetRivalPos::
 	return
 
-Route104_EventScript_Rival:: @ 81ECC9E
+Route104_EventScript_Rival::
 	lockall
 	setvar VAR_0x8008, 1
 	applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
 	waitmovement 0
 	goto Route104_EventScript_RivalEncounter
 
-Route104_EventScript_RivalTrigger:: @ 81ECCB3
+Route104_EventScript_RivalTrigger::
 	lockall
 	setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
 	setvar VAR_RUSTBORO_CITY_STATE, 8
@@ -75,7 +75,7 @@ Route104_EventScript_RivalTrigger:: @ 81ECCB3
 	goto Route104_EventScript_RivalEncounter
 
 @ Unused, shares script with Rustboro encounter instead
-Route104_EventScript_PlayRivalMusic:: @ 81ECD11
+Route104_EventScript_PlayRivalMusic::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq Route104_EventScript_PlayMayMusic
@@ -83,15 +83,15 @@ Route104_EventScript_PlayRivalMusic:: @ 81ECD11
 	goto_if_eq Route104_EventScript_PlayBrendanMusic
 	return
 
-Route104_EventScript_PlayMayMusic:: @ 81ECD29
+Route104_EventScript_PlayMayMusic::
 	playbgm MUS_ENCOUNTER_MAY, TRUE
 	return
 
-Route104_EventScript_PlayBrendanMusic:: @ 81ECD2E
+Route104_EventScript_PlayBrendanMusic::
 	playbgm MUS_ENCOUNTER_BRENDAN, TRUE
 	return
 
-Route104_EventScript_RivalEncounter:: @ 81ECD33
+Route104_EventScript_RivalEncounter::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq Route104_EventScript_MayEncounter
@@ -99,7 +99,7 @@ Route104_EventScript_RivalEncounter:: @ 81ECD33
 	goto_if_eq Route104_EventScript_BrendanEncounter
 	end
 
-Route104_EventScript_MayEncounter:: @ 81ECD4B
+Route104_EventScript_MayEncounter::
 	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_MayDefeated
 	goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_MayAskToBattle
 	setflag FLAG_REGISTER_RIVAL_POKENAV
@@ -128,21 +128,21 @@ Route104_EventScript_MayEncounter:: @ 81ECD4B
 	releaseall
 	end
 
-Route104_Movement_RivalWalkSlowLeft: @ 81ECDC8
+Route104_Movement_RivalWalkSlowLeft:
 	walk_slow_left
 	step_end
 
-Route104_Movement_RivalApproachPlayer: @ 81ECDCA
+Route104_Movement_RivalApproachPlayer:
 	walk_down
 	face_right
 	step_end
 
-Route104_Movement_PlayerFaceRival: @ 81ECDCD
+Route104_Movement_PlayerFaceRival:
 	delay_4
 	walk_in_place_fastest_left
 	step_end
 
-Route104_EventScript_MayAskToBattle:: @ 81ECDD0
+Route104_EventScript_MayAskToBattle::
 	msgbox Route104_Text_MayLetsBattle, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route104_EventScript_BattleMay
@@ -150,7 +150,7 @@ Route104_EventScript_MayAskToBattle:: @ 81ECDD0
 	releaseall
 	end
 
-Route104_EventScript_BattleMay:: @ 81ECDED
+Route104_EventScript_BattleMay::
 	msgbox Route104_Text_MayIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route104_EventScript_BattleMayTreecko
@@ -158,37 +158,37 @@ Route104_EventScript_BattleMay:: @ 81ECDED
 	case 2, Route104_EventScript_BattleMayMudkip
 	end
 
-Route104_EventScript_MayDefeated:: @ 81ECE1C
+Route104_EventScript_MayDefeated::
 	msgbox Route104_Text_MayPostBattle, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
 	call_if_eq Route104_EventScript_RestoreMusic
 	releaseall
 	end
 
-Route104_EventScript_RestoreMusic:: @ 81ECE31
+Route104_EventScript_RestoreMusic::
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	return
 
-Route104_EventScript_BattleMayTreecko:: @ 81ECE36
+Route104_EventScript_BattleMayTreecko::
 	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TREECKO, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_MayDefeated
 	end
 
-Route104_EventScript_BattleMayTorchic:: @ 81ECE49
+Route104_EventScript_BattleMayTorchic::
 	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TORCHIC, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_MayDefeated
 	end
 
-Route104_EventScript_BattleMayMudkip:: @ 81ECE5C
+Route104_EventScript_BattleMayMudkip::
 	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_MUDKIP, Route104_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_MayDefeated
 	end
 
-Route104_EventScript_BrendanEncounter:: @ 81ECE6F
+Route104_EventScript_BrendanEncounter::
 	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_BrendanDefeated
 	goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_BrendanAskToBattle
 	setflag FLAG_REGISTER_RIVAL_POKENAV
@@ -217,7 +217,7 @@ Route104_EventScript_BrendanEncounter:: @ 81ECE6F
 	releaseall
 	end
 
-Route104_EventScript_BrendanAskToBattle:: @ 81ECEEC
+Route104_EventScript_BrendanAskToBattle::
 	msgbox Route104_Text_BrendanLetsBattle, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route104_EventScript_BattleBrendan
@@ -225,7 +225,7 @@ Route104_EventScript_BrendanAskToBattle:: @ 81ECEEC
 	releaseall
 	end
 
-Route104_EventScript_BattleBrendan:: @ 81ECF09
+Route104_EventScript_BattleBrendan::
 	msgbox Route104_Text_BrendanIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route104_EventScript_BattleBrendanTreecko
@@ -233,42 +233,42 @@ Route104_EventScript_BattleBrendan:: @ 81ECF09
 	case 2, Route104_EventScript_BattleBrendanMudkip
 	end
 
-Route104_EventScript_BrendanDefeated:: @ 81ECF38
+Route104_EventScript_BrendanDefeated::
 	msgbox Route104_Text_BrendanPostBattle, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
 	call_if_eq Route104_EventScript_RestoreMusic
 	releaseall
 	end
 
-Route104_EventScript_BattleBrendanTreecko:: @ 81ECF4D
+Route104_EventScript_BattleBrendanTreecko::
 	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TREECKO, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_BrendanDefeated
 	end
 
-Route104_EventScript_BattleBrendanTorchic:: @ 81ECF60
+Route104_EventScript_BattleBrendanTorchic::
 	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TORCHIC, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_BrendanDefeated
 	end
 
-Route104_EventScript_BattleBrendanMudkip:: @ 81ECF73
+Route104_EventScript_BattleBrendanMudkip::
 	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_MUDKIP, Route104_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_ROUTE_104
 	goto Route104_EventScript_BrendanDefeated
 	end
 
-Route104_Movement_PlayerBackUp: @ 81ECF86
+Route104_Movement_PlayerBackUp:
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-Route104_Movement_RivalExitBrineysCottage: @ 81ECF8A
+Route104_Movement_RivalExitBrineysCottage:
 	walk_down
 	step_end
 
-Route104_EventScript_ExpertF:: @ 81ECF8C
+Route104_EventScript_ExpertF::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_ReceivedBerry
@@ -281,12 +281,12 @@ Route104_EventScript_ExpertF:: @ 81ECF8C
 	release
 	end
 
-Route104_EventScript_ReceivedBerry:: @ 81ECFC3
+Route104_EventScript_ReceivedBerry::
 	msgbox Route104_Text_TrainersOftenMakeMonHoldBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_WhiteHerbFlorist:: @ 81ECFCD
+Route104_EventScript_WhiteHerbFlorist::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_ReceivedWhiteHerb
@@ -298,48 +298,48 @@ Route104_EventScript_WhiteHerbFlorist:: @ 81ECFCD
 	release
 	end
 
-Route104_EventScript_ReceivedWhiteHerb:: @ 81ECFFC
+Route104_EventScript_ReceivedWhiteHerb::
 	msgbox Route104_Text_FlowerShopSellingSaplings, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_Girl1:: @ 81ED006
+Route104_EventScript_Girl1::
 	msgbox Route104_Text_BrineyLivesInSeasideCottage, MSGBOX_NPC
 	end
 
-Route104_EventScript_BugCatcher:: @ 81ED00F
+Route104_EventScript_BugCatcher::
 	msgbox Route104_Text_WhatsItLikeAtBottomOfSea, MSGBOX_SIGN
 	end
 
-Route104_EventScript_BrineysCottageSign:: @ 81ED018
+Route104_EventScript_BrineysCottageSign::
 	msgbox Route104_Text_MrBrineysCottage, MSGBOX_SIGN
 	end
 
-Route104_EventScript_RouteSignPetalburg:: @ 81ED021
+Route104_EventScript_RouteSignPetalburg::
 	msgbox Route104_Text_RouteSignPetalburg, MSGBOX_SIGN
 	end
 
-Route104_EventScript_RouteSignRustboro:: @ 81ED02A
+Route104_EventScript_RouteSignRustboro::
 	msgbox Route104_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route104_EventScript_FlowerShopSign:: @ 81ED033
+Route104_EventScript_FlowerShopSign::
 	msgbox Route104_Text_PrettyPetalFlowShop, MSGBOX_SIGN
 	end
 
-Route104_EventScript_TrainerTipsDoubleBattles:: @ 81ED03C
+Route104_EventScript_TrainerTipsDoubleBattles::
 	msgbox Route104_Text_TrainerTipsDoubleBattles, MSGBOX_SIGN
 	end
 
-Route104_EventScript_Boy1:: @ 81ED045
+Route104_EventScript_Boy1::
 	msgbox Route104_Text_ThrowBallAtWeakenedPokemon, MSGBOX_NPC
 	end
 
-Route104_EventScript_Woman:: @ 81ED04E
+Route104_EventScript_Woman::
 	msgbox Route104_Text_OnlyThrowBallAtWildPokemon, MSGBOX_NPC
 	end
 
-Route104_EventScript_Boy2:: @ 81ED057
+Route104_EventScript_Boy2::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_ReceivedBulletSeed
@@ -351,16 +351,16 @@ Route104_EventScript_Boy2:: @ 81ED057
 	release
 	end
 
-Route104_EventScript_ReceivedBulletSeed:: @ 81ED086
+Route104_EventScript_ReceivedBulletSeed::
 	msgbox Route104_Text_TMsAreOneTimeUse, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_Girl2:: @ 81ED090
+Route104_EventScript_Girl2::
 	msgbox Route104_Text_ImNotATrainer, MSGBOX_NPC
 	end
 
-Route104_EventScript_SailToDewford:: @ 81ED099
+Route104_EventScript_SailToDewford::
 	setobjectpriority LOCALID_BRINEY_R104, MAP_ROUTE104, 0
 	setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE104, 0
 	applymovement LOCALID_BRINEY_R104, Route104_Movement_BrineyBoardBoat
@@ -374,13 +374,13 @@ Route104_EventScript_SailToDewford:: @ 81ED099
 	goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_SailToDewfordDadCalls
 	end
 
-Route104_EventScript_SailToDewfordNoCall:: @ 81ED0D9
+Route104_EventScript_SailToDewfordNoCall::
 	applymovement LOCALID_BOAT_R104, Route104_Movement_SailToDewford
 	applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewford
 	waitmovement 0
 	goto Route104_EventScript_ArriveInDewford
 
-Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF
+Route104_EventScript_SailToDewfordDadCalls::
 	applymovement LOCALID_BOAT_R104, Route104_Movement_SailToDewfordBeforeDadCalls
 	applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_SailToDewfordBeforeDadCalls
 	waitmovement 0
@@ -399,7 +399,7 @@ Route104_EventScript_SailToDewfordDadCalls:: @ 81ED0EF
 	waitmovement 0
 	goto Route104_EventScript_ArriveInDewford
 
-Route104_EventScript_ArriveInDewford:: @ 81ED139
+Route104_EventScript_ArriveInDewford::
 	delay 50
 	applymovement OBJ_EVENT_ID_PLAYER, Route104_Movement_PlayerExitBoat
 	waitmovement 0
@@ -427,17 +427,17 @@ Route104_EventScript_ArriveInDewford:: @ 81ED139
 	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_LandedInDewford
 	end
 
-Route104_EventScript_DeliverLetterReminder:: @ 81ED1B4
+Route104_EventScript_DeliverLetterReminder::
 	msgbox Route104_Text_LandedInDewfordDeliverLetter, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route104_EventScript_LandedInDewford:: @ 81ED1BE
+Route104_EventScript_LandedInDewford::
 	msgbox DewfordTown_Text_BrineyLandedInDewford, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route104_Movement_SailToDewfordBeforeDadCalls: @ 81ED1C8
+Route104_Movement_SailToDewfordBeforeDadCalls:
 	walk_down
 	walk_down
 	walk_down
@@ -537,7 +537,7 @@ Route104_Movement_SailToDewfordBeforeDadCalls: @ 81ED1C8
 	walk_fastest_down
 	step_end
 
-Route104_Movement_SailToDewfordAfterDadCalls: @ 81ED22A
+Route104_Movement_SailToDewfordAfterDadCalls:
 	walk_fastest_down
 	walk_fastest_down
 	walk_fastest_down
@@ -637,7 +637,7 @@ Route104_Movement_SailToDewfordAfterDadCalls: @ 81ED22A
 	walk_down
 	step_end
 
-Route104_Movement_SailToDewford: @ 81ED28C
+Route104_Movement_SailToDewford:
 	walk_down
 	walk_down
 	walk_down
@@ -834,43 +834,43 @@ Route104_Movement_SailToDewford: @ 81ED28C
 	walk_down
 	step_end
 
-Route104_Movement_PlayerBoardBoat: @ 81ED34F
+Route104_Movement_PlayerBoardBoat:
 	walk_left
 	walk_down
 	walk_down
 	step_end
 
-Route104_Movement_PlayerExitBoat: @ 81ED353
+Route104_Movement_PlayerExitBoat:
 	walk_down
 	step_end
 
-Route104_Movement_PlayerMoveForBriney: @ 81ED355
+Route104_Movement_PlayerMoveForBriney:
 	walk_down
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-Route104_Movement_BrineyBoardBoat: @ 81ED359
+Route104_Movement_BrineyBoardBoat:
 	walk_down
 	walk_down
 	step_end
 
-Route104_Movement_BrineyExitBoat: @ 81ED35C
+Route104_Movement_BrineyExitBoat:
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-Route104_EventScript_Ivan:: @ 81ED35F
+Route104_EventScript_Ivan::
 	trainerbattle_single TRAINER_IVAN, Route104_Text_IvanIntro, Route104_Text_IvanDefeat
 	msgbox Route104_Text_IvanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_Billy:: @ 81ED376
+Route104_EventScript_Billy::
 	trainerbattle_single TRAINER_BILLY, Route104_Text_BillyIntro, Route104_Text_BillyDefeat
 	msgbox Route104_Text_BillyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_Haley:: @ 81ED38D
+Route104_EventScript_Haley::
 	trainerbattle_single TRAINER_HALEY_1, Route104_Text_HaleyIntro, Route104_Text_HaleyDefeat, Route104_EventScript_TryRegisterHaleyAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -883,37 +883,37 @@ Route104_EventScript_Haley:: @ 81ED38D
 	release
 	end
 
-Route104_EventScript_TryRegisterHaleyAfterBattle:: @ 81ED3CE
+Route104_EventScript_TryRegisterHaleyAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterHaleyAfterBattle
 	release
 	end
 
-Route104_EventScript_RegisterHaleyAfterBattle:: @ 81ED3DF
+Route104_EventScript_RegisterHaleyAfterBattle::
 	msgbox Route104_Text_HaleyRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_HALEY_1
 	release
 	end
 
-Route104_EventScript_TryRegisterHaley:: @ 81ED3F8
+Route104_EventScript_TryRegisterHaley::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterHaley
 	msgbox Route104_Text_HaleyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_RegisterHaley:: @ 81ED40B
+Route104_EventScript_RegisterHaley::
 	msgbox Route104_Text_HaleyRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_HALEY_1
 	release
 	end
 
-Route104_EventScript_RematchHaley:: @ 81ED424
+Route104_EventScript_RematchHaley::
 	trainerbattle_rematch TRAINER_HALEY_1, Route104_Text_HaleyRematchIntro, Route104_Text_HaleyRematchDefeat
 	msgbox Route104_Text_HaleyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_Winston:: @ 81ED43B
+Route104_EventScript_Winston::
 	trainerbattle_single TRAINER_WINSTON_1, Route104_Text_WinstonIntro, Route104_Text_WinstonDefeat, Route104_EventScript_TryRegisterWinstonAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -926,37 +926,37 @@ Route104_EventScript_Winston:: @ 81ED43B
 	release
 	end
 
-Route104_EventScript_TryRegisterWinstonAfterBattle:: @ 81ED47C
+Route104_EventScript_TryRegisterWinstonAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterWinstonAfterBattle
 	release
 	end
 
-Route104_EventScript_RegisterWinstonAfterBattle:: @ 81ED48D
+Route104_EventScript_RegisterWinstonAfterBattle::
 	msgbox Route104_Text_WinstonRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WINSTON_1
 	release
 	end
 
-Route104_EventScript_TryRegisterWinston:: @ 81ED4A6
+Route104_EventScript_TryRegisterWinston::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterWinston
 	msgbox Route104_Text_WinstonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_RegisterWinston:: @ 81ED4B9
+Route104_EventScript_RegisterWinston::
 	msgbox Route104_Text_WinstonRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WINSTON_1
 	release
 	end
 
-Route104_EventScript_RematchWinston:: @ 81ED4D2
+Route104_EventScript_RematchWinston::
 	trainerbattle_rematch TRAINER_WINSTON_1, Route104_Text_WinstonRematchIntro, Route104_Text_WinstonRematchDefeat
 	msgbox Route104_Text_WinstonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_Cindy:: @ 81ED4E9
+Route104_EventScript_Cindy::
 	trainerbattle_single TRAINER_CINDY_1, Route104_Text_CindyIntro, Route104_Text_CindyDefeat, Route104_EventScript_TryRegisterCindyAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -969,100 +969,100 @@ Route104_EventScript_Cindy:: @ 81ED4E9
 	release
 	end
 
-Route104_EventScript_TryRegisterCindyAfterBattle:: @ 81ED52A
+Route104_EventScript_TryRegisterCindyAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterCindyAfterBattle
 	release
 	end
 
-Route104_EventScript_RegisterCindyAfterBattle:: @ 81ED53B
+Route104_EventScript_RegisterCindyAfterBattle::
 	msgbox Route104_Text_CindyRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CINDY_1
 	release
 	end
 
-Route104_EventScript_TryRegisterCindy:: @ 81ED554
+Route104_EventScript_TryRegisterCindy::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route104_EventScript_RegisterCindy
 	msgbox Route104_Text_CindyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_RegisterCindy:: @ 81ED567
+Route104_EventScript_RegisterCindy::
 	msgbox Route104_Text_CindyRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CINDY_1
 	release
 	end
 
-Route104_EventScript_RematchCindy:: @ 81ED580
+Route104_EventScript_RematchCindy::
 	trainerbattle_rematch TRAINER_CINDY_1, Route104_Text_CindyRematchIntro, Route104_Text_CindyRematchDefeat
 	msgbox Route104_Text_CindyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route104_EventScript_Gina:: @ 81ED597
+Route104_EventScript_Gina::
 	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_GinaIntro, Route104_Text_GinaDefeat, Route104_Text_GinaNotEnoughMons
 	special GetPlayerBigGuyGirlString
 	msgbox Route104_Text_GinaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_Mia:: @ 81ED5B6
+Route104_EventScript_Mia::
 	trainerbattle_double TRAINER_GINA_AND_MIA_1, Route104_Text_MiaIntro, Route104_Text_MiaDefeat, Route104_Text_MiaNotEnoughMons
 	special GetPlayerBigGuyGirlString
 	msgbox Route104_Text_MiaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_EventScript_Darian:: @ 81ED5D5
+Route104_EventScript_Darian::
 	trainerbattle_single TRAINER_DARIAN, Route104_Text_DarianIntro, Route104_Text_DarianDefeat
 	msgbox Route104_Text_DarianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_Text_BrineyLivesInSeasideCottage: @ 81ED5EC
+Route104_Text_BrineyLivesInSeasideCottage:
 	.string "That seaside cottage is where\n"
 	.string "MR. BRINEY lives.\p"
 	.string "He was once a mighty sailor who never\n"
 	.string "feared the sea, however stormy.$"
 
-Route104_Text_WhatsItLikeAtBottomOfSea: @ 81ED662
+Route104_Text_WhatsItLikeAtBottomOfSea:
 	.string "The sea, huh?\p"
 	.string "I wonder what it's like at the bottom\n"
 	.string "of the sea?$"
 
-Route104_Text_ThrowBallAtWeakenedPokemon: @ 81ED6A2
+Route104_Text_ThrowBallAtWeakenedPokemon:
 	.string "If you're going to throw a POKé BALL,\n"
 	.string "weaken the wild POKéMON first.\p"
 	.string "It will be easier to catch if it's been\n"
 	.string "poisoned, burned, or lulled to sleep.$"
 
-Route104_Text_OnlyThrowBallAtWildPokemon: @ 81ED735
+Route104_Text_OnlyThrowBallAtWildPokemon:
 	.string "You're a thief if you try to steal\n"
 	.string "someone else's POKéMON.\p"
 	.string "You should throw POKé BALLS only at\n"
 	.string "wild POKéMON.$"
 
-Route104_Text_ImNotATrainer: @ 81ED7A2
+Route104_Text_ImNotATrainer:
 	.string "Oh, no, I'm not a TRAINER.\p"
 	.string "But that's right, if TRAINERS lock eyes,\n"
 	.string "it's a challenge to battle.\p"
 	.string "If you don't want to battle, stay out\n"
 	.string "of their sight.$"
 
-Route104_Text_LikeFillingMouthWithSeedsTakeThis: @ 81ED838
+Route104_Text_LikeFillingMouthWithSeedsTakeThis:
 	.string "I like filling my mouth with seeds,\n"
 	.string "then spitting them out fast!\p"
 	.string "You can have this, so you try it out!\p"
 	.string "Use it on a POKéMON, and it will learn\n"
 	.string "a move for firing seeds rapidly.$"
 
-Route104_Text_TMsAreOneTimeUse: @ 81ED8E7
+Route104_Text_TMsAreOneTimeUse:
 	.string "A word of advice!\p"
 	.string "A TM, TECHNICAL MACHINE, is good only\n"
 	.string "for one-time use.\p"
 	.string "Once you use it, it's gone.\n"
 	.string "Think twice before using it!$"
 
-Route104_Text_DontNeedThisTakeIt: @ 81ED96A
+Route104_Text_DontNeedThisTakeIt:
 	.string "This FLOWER SHOP started selling\n"
 	.string "saplings recently.\p"
 	.string "It made me so happy, I went overboard\n"
@@ -1070,27 +1070,27 @@ Route104_Text_DontNeedThisTakeIt: @ 81ED96A
 	.string "I don't need this WHITE HERB anymore.\n"
 	.string "Would you take it, please?$"
 
-Route104_Text_FlowerShopSellingSaplings: @ 81EDA0F
+Route104_Text_FlowerShopSellingSaplings:
 	.string "This FLOWER SHOP started selling\n"
 	.string "saplings recently.\p"
 	.string "It made me so happy, I went overboard\n"
 	.string "shopping. Where should I put them?$"
 
-Route104_Text_MrBrineysCottage: @ 81EDA8C
+Route104_Text_MrBrineysCottage:
 	.string "MR. BRINEY'S COTTAGE$"
 
-Route104_Text_RouteSignPetalburg: @ 81EDAA1
+Route104_Text_RouteSignPetalburg:
 	.string "ROUTE 1O4\n"
 	.string "{RIGHT_ARROW} PETALBURG CITY$"
 
-Route104_Text_RouteSignRustboro: @ 81EDABC
+Route104_Text_RouteSignRustboro:
 	.string "ROUTE 1O4\n"
 	.string "{UP_ARROW} RUSTBORO CITY$"
 
-Route104_Text_PrettyPetalFlowShop: @ 81EDAD6
+Route104_Text_PrettyPetalFlowShop:
 	.string "PRETTY PETAL FLOWER SHOP$"
 
-Route104_Text_TrainerTipsDoubleBattles: @ 81EDAEF
+Route104_Text_TrainerTipsDoubleBattles:
 	.string "TRAINER TIPS\p"
 	.string "In the HOENN region there are pairs\n"
 	.string "of TRAINERS who challenge others\l"
@@ -1101,45 +1101,45 @@ Route104_Text_TrainerTipsDoubleBattles: @ 81EDAEF
 	.string "left of the list and the top one.\l"
 	.string "Watch how POKéMON are lined up.$"
 
-Route104_Text_MayWeShouldRegister: @ 81EDBFF
+Route104_Text_MayWeShouldRegister:
 	.string "MAY: Oh, hi, {PLAYER}{KUN}!\p"
 	.string "DEVON upgraded your POKéNAV with\n"
 	.string "the MATCH CALL system, huh?\p"
 	.string "We should register each other so we\n"
 	.string "can get in contact anytime.$"
 
-Route104_Text_RegisteredMay: @ 81EDC8F
+Route104_Text_RegisteredMay:
 	.string "{PLAYER} registered MAY\n"
 	.string "in the POKéNAV.$"
 
-Route104_Text_MayHowsYourPokedex: @ 81EDCB1
+Route104_Text_MayHowsYourPokedex:
 	.string "MAY: Oh, by the way, {PLAYER}{KUN},\n"
 	.string "how's your POKéDEX coming along?$"
 
-Route104_Text_MayMinesDecentLetsBattle: @ 81EDCED
+Route104_Text_MayMinesDecentLetsBattle:
 	.string "Mine's looking pretty decent.\n"
 	.string "So…\l"
 	.string "How about a little battle?$"
 
-Route104_Text_MayHaventRaisedPokemon: @ 81EDD2A
+Route104_Text_MayHaventRaisedPokemon:
 	.string "MAY: Oh, what's the matter?\p"
 	.string "Haven't you caught or raised your\n"
 	.string "POKéMON very much?\p"
 	.string "That's not very good for a TRAINER!$"
 
-Route104_Text_MayLetsBattle: @ 81EDD9F
+Route104_Text_MayLetsBattle:
 	.string "MAY: So, what do you think?\n"
 	.string "How about a little battle here?$"
 
-Route104_Text_MayIntro: @ 81EDDDB
+Route104_Text_MayIntro:
 	.string "MAY: You just became a TRAINER,\n"
 	.string "{PLAYER}{KUN}. I'm not going to lose!$"
 
-Route104_Text_MayDefeat: @ 81EDE18
+Route104_Text_MayDefeat:
 	.string "Yikes!\n"
 	.string "You're better than I expected!$"
 
-Route104_Text_MayPostBattle: @ 81EDE3E
+Route104_Text_MayPostBattle:
 	.string "MAY: I can tell you've gotten pretty\n"
 	.string "good with the way you handle POKéMON.\p"
 	.string "But instead of only making them\n"
@@ -1147,43 +1147,43 @@ Route104_Text_MayPostBattle: @ 81EDE3E
 	.string "It's important to become friends with\n"
 	.string "POKéMON, too.$"
 
-Route104_Text_BrendanWeShouldRegister: @ 81EDF04
+Route104_Text_BrendanWeShouldRegister:
 	.string "BRENDAN: Oh, hey, {PLAYER}!\p"
 	.string "Cool, you had DEVON install the MATCH\n"
 	.string "CALL system on your POKéNAV!\p"
 	.string "Let's register each other in our\n"
 	.string "POKéNAVS so we can keep in touch.$"
 
-Route104_Text_RegisteredBrendan: @ 81EDFA0
+Route104_Text_RegisteredBrendan:
 	.string "{PLAYER} registered BRENDAN\n"
 	.string "in the POKéNAV.$"
 
-Route104_Text_BrendanHowsYourPokedex: @ 81EDFC6
+Route104_Text_BrendanHowsYourPokedex:
 	.string "BRENDAN: {PLAYER}, how's your POKéDEX?\n"
 	.string "Have you filled in any pages yet?$"
 
-Route104_Text_BrendanDoingGreatLetsBattle: @ 81EE009
+Route104_Text_BrendanDoingGreatLetsBattle:
 	.string "Me, I'm doing great!\p"
 	.string "Want to check out how good I am with\n"
 	.string "a battle?$"
 
-Route104_Text_BrendanNoConfidence: @ 81EE04D
+Route104_Text_BrendanNoConfidence:
 	.string "BRENDAN: What's the matter? Don't have\n"
 	.string "any confidence in your POKéMON?$"
 
-Route104_Text_BrendanLetsBattle: @ 81EE094
+Route104_Text_BrendanLetsBattle:
 	.string "BRENDAN: What's up?\n"
 	.string "Want to have a battle with me?$"
 
-Route104_Text_BrendanIntro: @ 81EE0C7
+Route104_Text_BrendanIntro:
 	.string "BRENDAN: I know you just became\n"
 	.string "a TRAINER, but I won't go easy!$"
 
-Route104_Text_BrendanDefeat: @ 81EE107
+Route104_Text_BrendanDefeat:
 	.string "Hmm…\n"
 	.string "You're pretty good.$"
 
-Route104_Text_BrendanPostBattle: @ 81EE120
+Route104_Text_BrendanPostBattle:
 	.string "BRENDAN: You've gotten pretty decent\n"
 	.string "at handling POKéMON.\p"
 	.string "But, you know, you shouldn't just be\n"
diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index 186254d92..60e08c7b8 100644
--- a/data/maps/Route104_MrBrineysHouse/scripts.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
@@ -1,29 +1,29 @@
 .set LOCALID_BRINEY, 1
 .set LOCALID_PEEKO, 2
 
-Route104_MrBrineysHouse_MapScripts:: @ 8229D2E
+Route104_MrBrineysHouse_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route104_MrBrineysHouse_OnTransition
 	.byte 0
 
-Route104_MrBrineysHouse_OnTransition: @ 8229D34
+Route104_MrBrineysHouse_OnTransition:
 	setflag FLAG_LANDMARK_MR_BRINEY_HOUSE
 	compare VAR_BRINEY_HOUSE_STATE, 1
 	call_if_eq Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos
 	call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_HideRustboroRival
 	end
 
-Route104_MrBrineysHouse_EventScript_HideRustboroRival:: @ 8229D4C
+Route104_MrBrineysHouse_EventScript_HideRustboroRival::
 	setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
 	return
 
-Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos:: @ 8229D50
+Route104_MrBrineysHouse_EventScript_SetBrineyPeekoPos::
 	setobjectxyperm LOCALID_BRINEY, 9, 3
 	setobjectmovementtype LOCALID_BRINEY, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
 	setobjectxyperm LOCALID_PEEKO, 9, 6
 	setobjectmovementtype LOCALID_PEEKO, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
 	return
 
-Route104_MrBrineysHouse_EventScript_Briney:: @ 8229D67
+Route104_MrBrineysHouse_EventScript_Briney::
 	lock
 	faceplayer
 	call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_SailingIntro
@@ -32,7 +32,7 @@ Route104_MrBrineysHouse_EventScript_Briney:: @ 8229D67
 	goto Route104_MrBrineysHouse_EventScript_WhereAreWeBound
 	end
 
-Route104_MrBrineysHouse_EventScript_SailingIntro:: @ 8229D8A
+Route104_MrBrineysHouse_EventScript_SailingIntro::
 	setflag FLAG_MR_BRINEY_SAILING_INTRO
 	msgbox Route104_MrBrineysHouse_Text_WaitUpPeeko, MSGBOX_DEFAULT
 	msgbox Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford, MSGBOX_YESNO
@@ -41,7 +41,7 @@ Route104_MrBrineysHouse_EventScript_SailingIntro:: @ 8229D8A
 	goto Route104_MrBrineysHouse_EventScript_SailToDewford
 	end
 
-Route104_MrBrineysHouse_EventScript_WhereAreWeBound:: @ 8229DAE
+Route104_MrBrineysHouse_EventScript_WhereAreWeBound::
 	message Route104_MrBrineysHouse_Text_WhereAreWeBound
 	waitmessage
 	multichoicedefault 20, 8, MULTI_BRINEY_OFF_DEWFORD, 1, FALSE
@@ -51,31 +51,31 @@ Route104_MrBrineysHouse_EventScript_WhereAreWeBound:: @ 8229DAE
 	case MULTI_B_PRESSED, Route104_MrBrineysHouse_EventScript_DeclineSailing
 	end
 
-Route104_MrBrineysHouse_EventScript_SailBothDeliveries:: @ 8229DE1
+Route104_MrBrineysHouse_EventScript_SailBothDeliveries::
 	msgbox Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
 	goto Route104_MrBrineysHouse_EventScript_SailToDewford
 	end
 
-Route104_MrBrineysHouse_EventScript_SailDeliverPackage:: @ 8229DFA
+Route104_MrBrineysHouse_EventScript_SailDeliverPackage::
 	msgbox Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing
 	goto Route104_MrBrineysHouse_EventScript_SailToDewford
 	end
 
-Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing:: @ 8229E13
+Route104_MrBrineysHouse_EventScript_DeclineDeliverySailing::
 	msgbox Route104_MrBrineysHouse_Text_DeclineDeliverySail, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_MrBrineysHouse_EventScript_DeclineSailing:: @ 8229E1D
+Route104_MrBrineysHouse_EventScript_DeclineSailing::
 	msgbox Route104_MrBrineysHouse_Text_TellMeWheneverYouWantToSail, MSGBOX_DEFAULT
 	release
 	end
 
-Route104_MrBrineysHouse_EventScript_SailToDewford:: @ 8229E27
+Route104_MrBrineysHouse_EventScript_SailToDewford::
 	msgbox Route104_MrBrineysHouse_Text_SetSailForDewford, MSGBOX_DEFAULT
 	call EventScript_BackupMrBrineyLocation
 	setvar VAR_BOARD_BRINEY_BOAT_STATE, 1
@@ -91,7 +91,7 @@ Route104_MrBrineysHouse_EventScript_SailToDewford:: @ 8229E27
 	releaseall
 	end
 
-Route104_MrBrineysHouse_EventScript_Peeko:: @ 8229E5D
+Route104_MrBrineysHouse_EventScript_Peeko::
 	lock
 	faceplayer
 	waitse
@@ -101,11 +101,11 @@ Route104_MrBrineysHouse_EventScript_Peeko:: @ 8229E5D
 	release
 	end
 
-Route104_MrBrineysHouse_Text_WaitUpPeeko: @ 8229E70
+Route104_MrBrineysHouse_Text_WaitUpPeeko:
 	.string "MR. BRINEY: Hold on, lass!\n"
 	.string "Wait up, PEEKO!$"
 
-Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford: @ 8229E9B
+Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford:
 	.string "Hm? You're {PLAYER}{KUN}!\n"
 	.string "You saved my darling PEEKO!\l"
 	.string "We owe so much to you!\p"
@@ -120,18 +120,18 @@ Route104_MrBrineysHouse_Text_ItsYouLetsSailToDewford: @ 8229E9B
 	.string "You've come to the right man!\n"
 	.string "We'll set sail for DEWFORD.$"
 
-Route104_MrBrineysHouse_Text_SetSailForDewford: @ 8229FE9
+Route104_MrBrineysHouse_Text_SetSailForDewford:
 	.string "MR. BRINEY: DEWFORD it is, then!\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-Route104_MrBrineysHouse_Text_DeclineDeliverySail: @ 822A041
+Route104_MrBrineysHouse_Text_DeclineDeliverySail:
 	.string "MR. BRINEY: Is that so?\n"
 	.string "Your deliveries can wait?\p"
 	.string "You just go on and tell me whenever\n"
 	.string "you want to set sail!$"
 
-Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford: @ 822A0AD
+Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford:
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "I know exactly what you want to say!\p"
 	.string "You're to deliver a LETTER to DEWFORD\n"
@@ -140,7 +140,7 @@ Route104_MrBrineysHouse_Text_NeedToMakeDeliveriesSailToDewford: @ 822A0AD
 	.string "at all--I'm the man for the job!\p"
 	.string "First, we'll set sail for DEWFORD.$"
 
-Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford: @ 822A18F
+Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford:
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "I know exactly what you want to say!\p"
 	.string "You're to deliver a package to\n"
@@ -149,17 +149,17 @@ Route104_MrBrineysHouse_Text_NeedToDeliverPackageSailToDewford: @ 822A18F
 	.string "at all--I'm the man for the job!\p"
 	.string "First, we'll set sail for DEWFORD.$"
 
-Route104_MrBrineysHouse_Text_WhereAreWeBound: @ 822A268
+Route104_MrBrineysHouse_Text_WhereAreWeBound:
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "For you, I'll go out to sea anytime!\p"
 	.string "Now, my friend, where are we bound?$"
 
-Route104_MrBrineysHouse_Text_TellMeWheneverYouWantToSail: @ 822A2C3
+Route104_MrBrineysHouse_Text_TellMeWheneverYouWantToSail:
 	.string "MR. BRINEY: Is that so?\n"
 	.string "Well, PEEKO owes her life to you.\p"
 	.string "You just go on and tell me whenever\n"
 	.string "you want to set sail!$"
 
-Route104_MrBrineysHouse_Text_Peeko: @ 822A337
+Route104_MrBrineysHouse_Text_Peeko:
 	.string "PEEKO: Pii piihyoro!$"
 
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index e2ed46ddc..34f5ba42c 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
@@ -1,21 +1,21 @@
 .set LOCALID_OWNER, 1
 
-Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C
+Route104_PrettyPetalFlowerShop_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route104_PrettyPetalFlowerShop_OnTransition
 	.byte 0
 
-Route104_PrettyPetalFlowerShop_OnTransition: @ 822A352
+Route104_PrettyPetalFlowerShop_OnTransition:
 	setflag FLAG_LANDMARK_FLOWER_SHOP
 	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner
 	goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner
 	setflag FLAG_TEMP_1
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner:: @ 822A36B
+Route104_PrettyPetalFlowerShop_EventScript_MoveShopOwner::
 	setobjectxyperm LOCALID_OWNER, 4, 6
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_ShopOwner:: @ 822A373
+Route104_PrettyPetalFlowerShop_EventScript_ShopOwner::
 	lock
 	faceplayer
 	goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_SellDecorations
@@ -30,7 +30,7 @@ Route104_PrettyPetalFlowerShop_EventScript_ShopOwner:: @ 822A373
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet:: @ 822A3B2
+Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet::
 	msgbox Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	call_if_eq Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries
@@ -39,15 +39,15 @@ Route104_PrettyPetalFlowerShop_EventScript_AlreadyMet:: @ 822A3B2
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries:: @ 822A3D2
+Route104_PrettyPetalFlowerShop_EventScript_ExplainBerries::
 	msgbox Route104_PrettyPetalFlowerShop_Text_BerriesExplanation, MSGBOX_DEFAULT
 	return
 
-Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries:: @ 822A3DB
+Route104_PrettyPetalFlowerShop_EventScript_DontExplainBerries::
 	msgbox Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness, MSGBOX_DEFAULT
 	return
 
-Route104_PrettyPetalFlowerShop_EventScript_SellDecorations:: @ 822A3E4
+Route104_PrettyPetalFlowerShop_EventScript_SellDecorations::
 	message gText_PlayerWhatCanIDoForYou
 	waitmessage
 	pokemartdecoration2 Route104_PrettyPetalFlowerShop_Pokemart_Plants
@@ -56,7 +56,7 @@ Route104_PrettyPetalFlowerShop_EventScript_SellDecorations:: @ 822A3E4
 	end
 
 	.align 2
-Route104_PrettyPetalFlowerShop_Pokemart_Plants: @ 822A3FC
+Route104_PrettyPetalFlowerShop_Pokemart_Plants:
 	.2byte DECOR_RED_PLANT
 	.2byte DECOR_TROPICAL_PLANT
 	.2byte DECOR_PRETTY_FLOWERS
@@ -67,7 +67,7 @@ Route104_PrettyPetalFlowerShop_Pokemart_Plants: @ 822A3FC
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl:: @ 822A40C
+Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl::
 	lock
 	faceplayer
 	goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail
@@ -75,7 +75,7 @@ Route104_PrettyPetalFlowerShop_EventScript_WailmerPailGirl:: @ 822A40C
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail:: @ 822A421
+Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail::
 	msgbox Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis, MSGBOX_DEFAULT
 	giveitem ITEM_WAILMER_PAIL
 	msgbox Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation, MSGBOX_DEFAULT
@@ -83,7 +83,7 @@ Route104_PrettyPetalFlowerShop_EventScript_GiveWailmerPail:: @ 822A421
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl:: @ 822A442
+Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl::
 	lock
 	faceplayer
 	dotimebasedevents
@@ -99,7 +99,7 @@ Route104_PrettyPetalFlowerShop_EventScript_RandomBerryGirl:: @ 822A442
 	release
 	end
 
-Route104_PrettyPetalFlowerShop_EventScript_AlreadyReceivedBerry:: @ 822A482
+Route104_PrettyPetalFlowerShop_EventScript_AlreadyReceivedBerry::
 	msgbox Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc
index d8274fffc..3ad060c6d 100644
--- a/data/maps/Route104_Prototype/scripts.inc
+++ b/data/maps/Route104_Prototype/scripts.inc
@@ -1,3 +1,3 @@
-Route104_Prototype_MapScripts:: @ 82693F2
+Route104_Prototype_MapScripts::
 	.byte 0
 
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
index bacbad7e9..a94eb24ec 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
@@ -1,3 +1,3 @@
-Route104_PrototypePrettyPetalFlowerShop_MapScripts:: @ 82693F3
+Route104_PrototypePrettyPetalFlowerShop_MapScripts::
 	.byte 0
 
diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc
index a42446e72..b60cd181f 100644
--- a/data/maps/Route105/scripts.inc
+++ b/data/maps/Route105/scripts.inc
@@ -1,10 +1,10 @@
-Route105_MapScripts:: @ 81EE1DB
+Route105_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, Route105_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, Route105_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route105_OnFrame
 	.byte 0
 
-Route105_OnLoad: @ 81EE1EB
+Route105_OnLoad:
 	call_if_unset FLAG_REGI_DOORS_OPENED, Route105_CloseRegiEntrance
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_NORTH
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute105North
@@ -12,12 +12,12 @@ Route105_OnLoad: @ 81EE1EB
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute105South
 	end
 
-Route105_CloseRegiEntrance:: @ 81EE20B
+Route105_CloseRegiEntrance::
 	setmetatile 9, 19, METATILE_General_RockWall_RockBase, 1
 	setmetatile 9, 20, METATILE_General_RockWall_SandBase, 1
 	return
 
-Route105_OnTransition: @ 81EE21E
+Route105_OnTransition:
 	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_105_NORTH
@@ -26,41 +26,41 @@ Route105_OnTransition: @ 81EE21E
 	call_if_eq AbnormalWeather_StartKyogreWeather
 	end
 
-Route105_OnFrame: @ 81EE240
+Route105_OnFrame:
 	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route105_EventScript_Foster:: @ 81EE24A
+Route105_EventScript_Foster::
 	trainerbattle_single TRAINER_FOSTER, Route105_Text_FosterIntro, Route105_Text_FosterDefeated
 	msgbox Route105_Text_FosterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_Luis:: @ 81EE261
+Route105_EventScript_Luis::
 	trainerbattle_single TRAINER_LUIS, Route105_Text_LuisIntro, Route105_Text_LuisDefeated
 	msgbox Route105_Text_LuisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_Dominik:: @ 81EE278
+Route105_EventScript_Dominik::
 	trainerbattle_single TRAINER_DOMINIK, Route105_Text_DominikIntro, Route105_Text_DominikDefeated
 	msgbox Route105_Text_DominikPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_Beverly:: @ 81EE28F
+Route105_EventScript_Beverly::
 	trainerbattle_single TRAINER_BEVERLY, Route105_Text_BeverlyIntro, Route105_Text_BeverlyDefeated
 	msgbox Route105_Text_PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_Imani:: @ 81EE2A6
+Route105_EventScript_Imani::
 	trainerbattle_single TRAINER_IMANI, Route105_Text_ImaniIntro, Route105_Text_ImaniDefeated
 	msgbox Route105_Text_ImaniPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_Josue:: @ 81EE2BD
+Route105_EventScript_Josue::
 	trainerbattle_single TRAINER_JOSUE, Route105_Text_JosueIntro, Route105_Text_JosueDefeated
 	msgbox Route105_Text_JosuePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route105_EventScript_Andres:: @ 81EE2D4
+Route105_EventScript_Andres::
 	trainerbattle_single TRAINER_ANDRES_1, Route105_Text_AndresIntro, Route105_Text_AndresDefeated, Route105_EventScript_AndresRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -69,7 +69,7 @@ Route105_EventScript_Andres:: @ 81EE2D4
 	release
 	end
 
-Route105_EventScript_AndresRegisterMatchCallAfterBattle:: @ 81EE300
+Route105_EventScript_AndresRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route105_Text_AndresRegister, MSGBOX_DEFAULT
@@ -77,12 +77,12 @@ Route105_EventScript_AndresRegisterMatchCallAfterBattle:: @ 81EE300
 	release
 	end
 
-Route105_EventScript_AndresRematch:: @ 81EE31F
+Route105_EventScript_AndresRematch::
 	trainerbattle_rematch TRAINER_ANDRES_1, Route105_Text_AndresRematchIntro, Route105_Text_AndresRematchDefeated
 	msgbox Route105_Text_AndresRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route104_Text_DadPokenavCall: @ 81EE336
+Route104_Text_DadPokenavCall:
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "DAD: Oh, {PLAYER}?\p"
@@ -98,6 +98,6 @@ Route104_Text_DadPokenavCall: @ 81EE336
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-Route104_Text_RegisteredDadInPokenav: @ 81EE463
+Route104_Text_RegisteredDadInPokenav:
 	.string "Registered DAD NORMAN\n"
 	.string "in the POKéNAV.$"
diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc
index f9d3fb3b9..2107ce1c3 100644
--- a/data/maps/Route106/scripts.inc
+++ b/data/maps/Route106/scripts.inc
@@ -1,21 +1,21 @@
-Route106_MapScripts:: @ 81EE489
+Route106_MapScripts::
 	.byte 0
 
-Route106_EventScript_TrainerTipsSign:: @ 81EE48A
+Route106_EventScript_TrainerTipsSign::
 	msgbox Route106_Text_TrainerTips, MSGBOX_SIGN
 	end
 
-Route106_EventScript_Douglas:: @ 81EE493
+Route106_EventScript_Douglas::
 	trainerbattle_single TRAINER_DOUGLAS, Route106_Text_DouglasIntro, Route106_Text_DouglasDefeated
 	msgbox Route106_Text_DouglasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_EventScript_Kyla:: @ 81EE4AA
+Route106_EventScript_Kyla::
 	trainerbattle_single TRAINER_KYLA, Route106_Text_KylaIntro, Route106_Text_KylaDefeated
 	msgbox Route106_Text_KylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_EventScript_Elliot:: @ 81EE4C1
+Route106_EventScript_Elliot::
 	trainerbattle_single TRAINER_ELLIOT_1, Route106_Text_ElliotIntro, Route106_Text_ElliotDefeated, Route106_EventScript_ElliotRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -24,7 +24,7 @@ Route106_EventScript_Elliot:: @ 81EE4C1
 	release
 	end
 
-Route106_EventScript_ElliotRegisterMatchCallAfterBattle:: @ 81EE4ED
+Route106_EventScript_ElliotRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route106_Text_ElliotRegister, MSGBOX_DEFAULT
@@ -32,17 +32,17 @@ Route106_EventScript_ElliotRegisterMatchCallAfterBattle:: @ 81EE4ED
 	release
 	end
 
-Route106_EventScript_ElliotRematch:: @ 81EE50C
+Route106_EventScript_ElliotRematch::
 	trainerbattle_rematch TRAINER_ELLIOT_1, Route106_Text_ElliotRematchIntro, Route106_Text_ElliotRematchDefeated
 	msgbox Route106_Text_ElliotRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_EventScript_Ned:: @ 81EE523
+Route106_EventScript_Ned::
 	trainerbattle_single TRAINER_NED, Route106_Text_NedIntro, Route106_Text_NedDefeated
 	msgbox Route106_Text_NedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route106_Text_TrainerTips: @ 81EE53A
+Route106_Text_TrainerTips:
 	.string "TRAINER TIPS\p"
 	.string "Advice on catching POKéMON with a ROD:\n"
 	.string "Press the A Button if you get a bite.$"
diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc
index 0642c457f..cffeafb08 100644
--- a/data/maps/Route107/scripts.inc
+++ b/data/maps/Route107/scripts.inc
@@ -1,12 +1,12 @@
-Route107_MapScripts:: @ 81EE594
+Route107_MapScripts::
 	.byte 0
 
-Route107_EventScript_Darrin:: @ 81EE595
+Route107_EventScript_Darrin::
 	trainerbattle_single TRAINER_DARRIN, Route107_Text_DarrinIntro, Route107_Text_DarrinDefeated
 	msgbox Route107_Text_DarrinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_Tony:: @ 81EE5AC
+Route107_EventScript_Tony::
 	trainerbattle_single TRAINER_TONY_1, Route107_Text_TonyIntro, Route107_Text_TonyDefeated, Route107_EventScript_TonyRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -15,7 +15,7 @@ Route107_EventScript_Tony:: @ 81EE5AC
 	release
 	end
 
-Route107_EventScript_TonyRegisterMatchCallAfterBattle:: @ 81EE5D8
+Route107_EventScript_TonyRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route107_Text_TonyRegister, MSGBOX_DEFAULT
@@ -23,32 +23,32 @@ Route107_EventScript_TonyRegisterMatchCallAfterBattle:: @ 81EE5D8
 	release
 	end
 
-Route107_EventScript_TonyRematch:: @ 81EE5F7
+Route107_EventScript_TonyRematch::
 	trainerbattle_rematch TRAINER_TONY_1, Route107_Text_TonyRematchIntro, Route107_Text_TonyRematchDefeated
 	msgbox Route107_Text_TonyRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_Denise:: @ 81EE60E
+Route107_EventScript_Denise::
 	trainerbattle_single TRAINER_DENISE, Route107_Text_DeniseIntro, Route107_Text_DeniseDefeated
 	msgbox Route107_Text_DenisePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_Beth:: @ 81EE625
+Route107_EventScript_Beth::
 	trainerbattle_single TRAINER_BETH, Route107_Text_BethIntro, Route107_Text_BethDefeated
 	msgbox Route107_Text_BethPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_Lisa:: @ 81EE63C
+Route107_EventScript_Lisa::
 	trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_LisaIntro, Route107_Text_LisaDefeated, Route107_Text_LisaNotEnoughPokemon
 	msgbox Route107_Text_LisaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_Ray:: @ 81EE657
+Route107_EventScript_Ray::
 	trainerbattle_double TRAINER_LISA_AND_RAY, Route107_Text_RayIntro, Route107_Text_RayDefeated, Route107_Text_RayNotEnoughPokemon
 	msgbox Route107_Text_RayPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route107_EventScript_Camron:: @ 81EE672
+Route107_EventScript_Camron::
 	trainerbattle_single TRAINER_CAMRON, Route107_Text_CamronIntro, Route107_Text_CamronDefeated
 	msgbox Route107_Text_CamronPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc
index 57f353bd1..866391554 100644
--- a/data/maps/Route108/scripts.inc
+++ b/data/maps/Route108/scripts.inc
@@ -1,32 +1,32 @@
-Route108_MapScripts:: @ 81EE689
+Route108_MapScripts::
 	.byte 0
 
-Route108_EventScript_Jerome:: @ 81EE68A
+Route108_EventScript_Jerome::
 	trainerbattle_single TRAINER_JEROME, Route108_Text_JeromeIntro, Route108_Text_JeromeDefeated
 	msgbox Route108_Text_JeromePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route108_EventScript_Matthew:: @ 81EE6A1
+Route108_EventScript_Matthew::
 	trainerbattle_single TRAINER_MATTHEW, Route108_Text_MatthewIntro, Route108_Text_MatthewDefeated
 	msgbox Route108_Text_MatthewPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route108_EventScript_Tara:: @ 81EE6B8
+Route108_EventScript_Tara::
 	trainerbattle_single TRAINER_TARA, Route108_Text_TaraIntro, Route108_Text_TaraDefeated
 	msgbox Route108_Text_TaraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route108_EventScript_Missy:: @ 81EE6CF
+Route108_EventScript_Missy::
 	trainerbattle_single TRAINER_MISSY, Route108_Text_MissyIntro, Route108_Text_MissyDefeated
 	msgbox Route108_Text_MissyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route108_EventScript_Carolina:: @ 81EE6E6
+Route108_EventScript_Carolina::
 	trainerbattle_single TRAINER_CAROLINA, Route108_Text_CarolinaIntro, Route108_Text_CarolinaDefeated
 	msgbox Route108_Text_CarolinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route108_EventScript_Cory:: @ 81EE6FD
+Route108_EventScript_Cory::
 	trainerbattle_single TRAINER_CORY_1, Route108_Text_CoryIntro, Route108_Text_CoryDefeated, Route108_EventScript_CoryRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -35,7 +35,7 @@ Route108_EventScript_Cory:: @ 81EE6FD
 	release
 	end
 
-Route108_EventScript_CoryRegisterMatchCallAfterBattle:: @ 81EE729
+Route108_EventScript_CoryRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route108_Text_CoryRegister, MSGBOX_DEFAULT
@@ -43,7 +43,7 @@ Route108_EventScript_CoryRegisterMatchCallAfterBattle:: @ 81EE729
 	release
 	end
 
-Route108_EventScript_CoryRematch:: @ 81EE748
+Route108_EventScript_CoryRematch::
 	trainerbattle_rematch TRAINER_CORY_1, Route108_Text_CoryRematchIntro, Route108_Text_CoryRematchDefeated
 	msgbox Route108_Text_CoryRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
index a88e86459..6c38a8bd7 100644
--- a/data/maps/Route109/scripts.inc
+++ b/data/maps/Route109/scripts.inc
@@ -1,10 +1,10 @@
-@ NOTE: Route 109's sail to Dewford script references local IDs from Dewford's map. 
+@ NOTE: Route 109's sail to Dewford script references local IDs from Dewford's map.
 @  These are labeled in DewfordTown/scripts.inc
 
-Route109_MapScripts:: @ 81EE75F
+Route109_MapScripts::
 	.byte 0
 
-Route109_EventScript_StartDepartForDewford:: @ 81EE760
+Route109_EventScript_StartDepartForDewford::
 	call EventScript_BackupMrBrineyLocation
 	setobjectpriority LOCALID_BRINEY_R109, MAP_ROUTE109, 0
 	setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_ROUTE109, 0
@@ -17,25 +17,25 @@ Route109_EventScript_StartDepartForDewford:: @ 81EE760
 	case DIR_EAST, Route109_EventScript_EnterBoatEast
 	end
 
-Route109_EventScript_EnterBoatSouth:: @ 81EE7A5
+Route109_EventScript_EnterBoatSouth::
 	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatSouth
 	waitmovement 0
 	goto Route109_EventScript_DoSailToDewford
 	end
 
-Route109_EventScript_EnterBoatEast:: @ 81EE7B5
+Route109_EventScript_EnterBoatEast::
 	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatEast
 	waitmovement 0
 	goto Route109_EventScript_DoSailToDewford
 	end
 
-Route109_EventScript_EnterBoatWest:: @ 81EE7C5
+Route109_EventScript_EnterBoatWest::
 	applymovement OBJ_EVENT_ID_PLAYER, Route109_Movement_PlayerEnterBoatWest
 	waitmovement 0
 	goto Route109_EventScript_DoSailToDewford
 	end
 
-Route109_EventScript_DoSailToDewford:: @ 81EE7D5
+Route109_EventScript_DoSailToDewford::
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_ROUTE109
 	call Common_EventScript_PlayBrineysBoatMusic
 	applymovement LOCALID_BOAT_R109, Route109_Movement_SailToDewford
@@ -65,7 +65,7 @@ Route109_EventScript_DoSailToDewford:: @ 81EE7D5
 	release
 	end
 
-Route109_Movement_SailToDewford: @ 81EE84F
+Route109_Movement_SailToDewford:
 	walk_in_place_fastest_down
 	walk_down
 	walk_down
@@ -241,45 +241,45 @@ Route109_Movement_SailToDewford: @ 81EE84F
 	walk_in_place_fastest_down
 	step_end
 
-Route109_Movement_PlayerEnterBoatSouth: @ 81EE8FD
+Route109_Movement_PlayerEnterBoatSouth:
 	walk_down
 	walk_down
 	step_end
 
-Route109_Movement_PlayerExitBoat: @ 81EE900
+Route109_Movement_PlayerExitBoat:
 	walk_down
 	walk_down
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-Route109_Movement_PlayerEnterBoatEast: @ 81EE905
+Route109_Movement_PlayerEnterBoatEast:
 	walk_right
 	walk_down
 	step_end
 
-Route109_Movement_PlayerEnterBoatWest: @ 81EE908
+Route109_Movement_PlayerEnterBoatWest:
 	walk_left
 	walk_down
 	step_end
 
-Route109_Movement_BrineyEnterBoat: @ 81EE90B
+Route109_Movement_BrineyEnterBoat:
 	walk_down
 	step_end
 
-Route109_Movement_BrineyExitBoat: @ 81EE90D
+Route109_Movement_BrineyExitBoat:
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-Route109_EventScript_MrBriney:: @ 81EE910
+Route109_EventScript_MrBriney::
 	lock
 	faceplayer
 	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_HaveNotDeliveredDevonGood
 	goto Route109_EventScript_DeliveredDevonGoods
 	end
 
-Route109_EventScript_HaveNotDeliveredDevonGood:: @ 81EE921
+Route109_EventScript_HaveNotDeliveredDevonGood::
 	message Route109_Text_BrineySailToDewfordQuestion
 	msgbox Route109_Text_BrineySailToDewfordQuestion, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -287,7 +287,7 @@ Route109_EventScript_HaveNotDeliveredDevonGood:: @ 81EE921
 	goto Route109_EventScript_SailToDewford
 	end
 
-Route109_EventScript_DeliveredDevonGoods:: @ 81EE93F
+Route109_EventScript_DeliveredDevonGoods::
 	message Route109_Text_BrineyWhereAreWeBound
 	waitmessage
 	multichoicedefault 21, 8, MULTI_BRINEY_OFF_DEWFORD, 1, FALSE
@@ -297,27 +297,27 @@ Route109_EventScript_DeliveredDevonGoods:: @ 81EE93F
 	case MULTI_B_PRESSED, Route109_EventScript_ChoseNotToSail
 	end
 
-Route109_EventScript_SailToDewford:: @ 81EE972
+Route109_EventScript_SailToDewford::
 	msgbox Route109_Text_BrineyDewfordItIs, MSGBOX_DEFAULT
 	closemessage
 	goto Route109_EventScript_StartDepartForDewford
 	end
 
-Route109_EventScript_StayHere:: @ 81EE981
+Route109_EventScript_StayHere::
 	msgbox Route109_Text_BrineyDeliverDevonGoods, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_EventScript_ChoseNotToSail:: @ 81EE98B
+Route109_EventScript_ChoseNotToSail::
 	msgbox Route109_Text_BrineyTellMeWhenYouNeedToSail, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_EventScript_SeashoreHouseGirl:: @ 81EE995
+Route109_EventScript_SeashoreHouseGirl::
 	msgbox Route109_Text_ChillAtMyPapasSpot, MSGBOX_NPC
 	end
 
-Route109_EventScript_SandCastleBoy:: @ 81EE99E
+Route109_EventScript_SandCastleBoy::
 	lock
 	faceplayer
 	msgbox Route109_Text_SandCastleTakingLongTime, MSGBOX_DEFAULT
@@ -327,7 +327,7 @@ Route109_EventScript_SandCastleBoy:: @ 81EE99E
 	release
 	end
 
-Route109_EventScript_SoftSandGirl:: @ 81EE9B5
+Route109_EventScript_SoftSandGirl::
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
@@ -343,22 +343,22 @@ Route109_EventScript_SoftSandGirl:: @ 81EE9B5
 	release
 	end
 
-Route109_EventScript_AlreadyReceivedSoftSand:: @ 81EE9F2
+Route109_EventScript_AlreadyReceivedSoftSand::
 	msgbox Route109_Text_WereGoingToMakeBigCastle, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route109_EventScript_Woman:: @ 81EEA06
+Route109_EventScript_Woman::
 	msgbox Route109_Text_LittleKidsDartAround, MSGBOX_NPC
 	end
 
-Route109_EventScript_OldMan:: @ 81EEA0F
+Route109_EventScript_OldMan::
 	msgbox Route109_Text_ZigzagoonPicksUpLitter, MSGBOX_NPC
 	end
 
-Route109_EventScript_Zigzagoon:: @ 81EEA18
+Route109_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
@@ -368,35 +368,35 @@ Route109_EventScript_Zigzagoon:: @ 81EEA18
 	release
 	end
 
-Route109_EventScript_SeashoreHouseSign:: @ 81EEA2B
+Route109_EventScript_SeashoreHouseSign::
 	msgbox Route109_Text_SeashoreHouseSign, MSGBOX_SIGN
 	end
 
-Route109_EventScript_TrainerTipsSign:: @ 81EEA34
+Route109_EventScript_TrainerTipsSign::
 	msgbox Route109_Text_TrainerTipsSign, MSGBOX_SIGN
 	end
 
-Route109_EventScript_David:: @ 81EEA3D
+Route109_EventScript_David::
 	trainerbattle_single TRAINER_DAVID, Route109_Text_DavidIntro, Route109_Text_DavidDefeated
 	msgbox Route109_Text_DavidPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Alice:: @ 81EEA54
+Route109_EventScript_Alice::
 	trainerbattle_single TRAINER_ALICE, Route109_Text_AliceIntro, Route109_Text_AliceDefeated
 	msgbox Route109_Text_AlicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Huey:: @ 81EEA6B
+Route109_EventScript_Huey::
 	trainerbattle_single TRAINER_HUEY, Route109_Text_HueyIntro, Route109_Text_HueyDefeated
 	msgbox Route109_Text_HueyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Edmond:: @ 81EEA82
+Route109_EventScript_Edmond::
 	trainerbattle_single TRAINER_EDMOND, Route109_Text_EdmondIntro, Route109_Text_EdmondDefeated
 	msgbox Route109_Text_EdmondPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Ricky:: @ 81EEA99
+Route109_EventScript_Ricky::
 	trainerbattle_single TRAINER_RICKY_1, Route109_Text_RickyIntro, Route109_Text_RickyDefeated, Route109_EventScript_RickyRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -405,7 +405,7 @@ Route109_EventScript_Ricky:: @ 81EEA99
 	release
 	end
 
-Route109_EventScript_RickyRegisterMatchCallAfterBattle:: @ 81EEAC5
+Route109_EventScript_RickyRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route109_Text_RickyRegister, MSGBOX_DEFAULT
@@ -413,12 +413,12 @@ Route109_EventScript_RickyRegisterMatchCallAfterBattle:: @ 81EEAC5
 	release
 	end
 
-Route109_EventScript_RickyRematch:: @ 81EEAE4
+Route109_EventScript_RickyRematch::
 	trainerbattle_rematch TRAINER_RICKY_1, Route109_Text_RickyRematchIntro, Route109_Text_RickyRematchDefeated
 	msgbox Route109_Text_RickyRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Lola:: @ 81EEAFB
+Route109_EventScript_Lola::
 	trainerbattle_single TRAINER_LOLA_1, Route109_Text_LolaIntro, Route109_Text_LolaDefeated, Route109_EventScript_LolaRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -427,7 +427,7 @@ Route109_EventScript_Lola:: @ 81EEAFB
 	release
 	end
 
-Route109_EventScript_LolaRegisterMatchCallAfterBattle:: @ 81EEB27
+Route109_EventScript_LolaRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route109_Text_LolaRegister, MSGBOX_DEFAULT
@@ -435,115 +435,115 @@ Route109_EventScript_LolaRegisterMatchCallAfterBattle:: @ 81EEB27
 	release
 	end
 
-Route109_EventScript_LolaRematch:: @ 81EEB46
+Route109_EventScript_LolaRematch::
 	trainerbattle_rematch TRAINER_LOLA_1, Route109_Text_LolaRematchIntro, Route109_Text_LolaRematchDefeated
 	msgbox Route109_Text_LolaRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Austina:: @ 81EEB5D
+Route109_EventScript_Austina::
 	trainerbattle_single TRAINER_AUSTINA, Route109_Text_AustinaIntro, Route109_Text_AustinaDefeated
 	msgbox Route109_Text_AustinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Gwen:: @ 81EEB74
+Route109_EventScript_Gwen::
 	trainerbattle_single TRAINER_GWEN, Route109_Text_GwenIntro, Route109_Text_GwenDefeated
 	msgbox Route109_Text_GwenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Carter:: @ 81EEB8B
+Route109_EventScript_Carter::
 	trainerbattle_single TRAINER_CARTER, Route109_Text_CarterIntro, Route109_Text_CarterDefeated
 	msgbox Route109_Text_CarterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Paul:: @ 81EEBA2
+Route109_EventScript_Paul::
 	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_PaulIntro, Route109_Text_PaulDefeated, Route109_Text_PaulNotEnoughPokemon
 	msgbox Route109_Text_PaulPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Mel:: @ 81EEBBD
+Route109_EventScript_Mel::
 	trainerbattle_double TRAINER_MEL_AND_PAUL, Route109_Text_MelIntro, Route109_Text_MelDefeated, Route109_Text_MelNotEnoughPokemon
 	msgbox Route109_Text_MelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Chandler:: @ 81EEBD8
+Route109_EventScript_Chandler::
 	trainerbattle_single TRAINER_CHANDLER, Route109_Text_ChandlerIntro, Route109_Text_ChandlerDefeated
 	msgbox Route109_Text_ChandlerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Hailey:: @ 81EEBEF
+Route109_EventScript_Hailey::
 	trainerbattle_single TRAINER_HAILEY, Route109_Text_HaileyIntro, Route109_Text_HaileyDefeated
 	msgbox Route109_Text_HaileyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_EventScript_Elijah:: @ 81EEC06
+Route109_EventScript_Elijah::
 	trainerbattle_single TRAINER_ELIJAH, Route109_Text_ElijahIntro, Route109_Text_ElijahDefeated
 	msgbox Route109_Text_ElijahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-DewfordTown_Text_BrineyLandedInSlateportDeliverGoods: @ 81EEC1D
+DewfordTown_Text_BrineyLandedInSlateportDeliverGoods:
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "We've made land in SLATEPORT!\p"
 	.string "I suppose you're going to visit CAPT.\n"
 	.string "STERN and deliver the DEVON GOODS?$"
 
-Route109_Text_BrineySailToDewfordQuestion: @ 81EEC96
+Route109_Text_BrineySailToDewfordQuestion:
 	.string "MR. BRINEY: I thought you're supposed\n"
 	.string "to deliver the DEVON GOODS.\p"
 	.string "Would you like to sail back to\n"
 	.string "DEWFORD, then?$"
 
-Route109_Text_BrineyDewfordItIs: @ 81EED06
+Route109_Text_BrineyDewfordItIs:
 	.string "MR. BRINEY: DEWFORD it is, then!\p"
 	.string "Anchors aweigh!\n"
 	.string "PEEKO, we're setting sail, my darling!$"
 
-Route109_Text_BrineyDeliverDevonGoods: @ 81EED5E
+Route109_Text_BrineyDeliverDevonGoods:
 	.string "MR. BRINEY: Then you go on and deliver\n"
 	.string "the DEVON GOODS. I'll be waiting.$"
 
-DewfordTown_Text_BrineyLandedInSlateport: @ 81EEDA7
+DewfordTown_Text_BrineyLandedInSlateport:
 	.string "MR. BRINEY: Ahoy! We've made land in\n"
 	.string "SLATEPORT!\p"
 	.string "You just go on and tell me whenever\n"
 	.string "you want to set sail again!$"
 
-Route109_Text_BrineyWhereAreWeBound: @ 81EEE17
+Route109_Text_BrineyWhereAreWeBound:
 	.string "MR. BRINEY: Ahoy!\n"
 	.string "For you, I'll go out to sea anytime!\p"
 	.string "Now, my friend, where are we bound?$"
 
-Route109_Text_BrineyTellMeWhenYouNeedToSail: @ 81EEE72
+Route109_Text_BrineyTellMeWhenYouNeedToSail:
 	.string "MR. BRINEY: You just tell me whenever\n"
 	.string "you need to set sail again!$"
 
-Route109_Text_ChillAtMyPapasSpot: @ 81EEEB4
+Route109_Text_ChillAtMyPapasSpot:
 	.string "Yo, TRAINERS!\n"
 	.string "Whether you're hot to trot,\l"
 	.string "or cool cat not,\l"
 	.string "chill at my papa's spot!$"
 
-Route109_Text_LittleKidsDartAround: @ 81EEF08
+Route109_Text_LittleKidsDartAround:
 	.string "Little kids can dart around so quickly…\p"
 	.string "You don't dare take your eyes off them\n"
 	.string "for an instant. It's very taxing.\p"
 	.string "Mine are with my POKéMON, so they\n"
 	.string "should be okay, but…$"
 
-Route109_Text_SandCastleTakingLongTime: @ 81EEFB0
+Route109_Text_SandCastleTakingLongTime:
 	.string "Our sand castle's taking a long time\n"
 	.string "to make.$"
 
-Route109_Text_YouCanHaveThis: @ 81EEFDE
+Route109_Text_YouCanHaveThis:
 	.string "You can have this!$"
 
-Route109_Text_WereGoingToMakeBigCastle: @ 81EEFF1
+Route109_Text_WereGoingToMakeBigCastle:
 	.string "We're going to get all the sand from\n"
 	.string "the beach and make a big castle!\p"
 	.string "And then we're going to be a king and\n"
 	.string "queen.\p"
 	.string "We'll let you be a servant.$"
 
-Route109_Text_ZigzagoonPicksUpLitter: @ 81EF080
+Route109_Text_ZigzagoonPicksUpLitter:
 	.string "The water around these parts is clean.\p"
 	.string "But, I get my ZIGZAGOON to pick up\n"
 	.string "litter from the shoreline at times.\p"
@@ -552,15 +552,15 @@ Route109_Text_ZigzagoonPicksUpLitter: @ 81EF080
 	.string "If we pollute the sea, it all comes\n"
 	.string "back to haunt us eventually.$"
 
-Route109_Text_ZigzagoonCry: @ 81EF173
+Route109_Text_ZigzagoonCry:
 	.string "ZIGZAGOON: Guguu?$"
 
-Route109_Text_SeashoreHouseSign: @ 81EF185
+Route109_Text_SeashoreHouseSign:
 	.string "SEASHORE HOUSE\p"
 	.string "“May hot battles rage on hot sands!\n"
 	.string "The place for hot TRAINERS!”$"
 
-Route109_Text_TrainerTipsSign: @ 81EF1D5
+Route109_Text_TrainerTipsSign:
 	.string "TRAINER TIPS\p"
 	.string "POKéMON at the same level may not\n"
 	.string "always have identical stats.\p"
diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index 9334772d6..c4cfd1576 100644
--- a/data/maps/Route109_SeashoreHouse/scripts.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
@@ -1,12 +1,12 @@
-Route109_SeashoreHouse_MapScripts:: @ 82693F4
+Route109_SeashoreHouse_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route109_SeashoreHouse_OnTransition
 	.byte 0
 
-Route109_SeashoreHouse_OnTransition: @ 82693FA
+Route109_SeashoreHouse_OnTransition:
 	setflag FLAG_LANDMARK_SEASHORE_HOUSE
 	end
 
-Route109_SeashoreHouse_EventScript_Owner:: @ 82693FE
+Route109_SeashoreHouse_EventScript_Owner::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop
@@ -17,12 +17,12 @@ Route109_SeashoreHouse_EventScript_Owner:: @ 82693FE
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction:: @ 8269428
+Route109_SeashoreHouse_EventScript_AlreadyGaveIntroduction::
 	msgbox Route109_SeashoreHouse_Text_ShowMeSomeHotMatches, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_DefeatedTrainers:: @ 8269432
+Route109_SeashoreHouse_EventScript_DefeatedTrainers::
 	msgbox Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles, MSGBOX_DEFAULT
 	giveitem ITEM_SODA_POP, 6
 	compare VAR_RESULT, FALSE
@@ -31,12 +31,12 @@ Route109_SeashoreHouse_EventScript_DefeatedTrainers:: @ 8269432
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_BagFull:: @ 8269456
+Route109_SeashoreHouse_EventScript_BagFull::
 	msgbox Route109_SeashoreHouse_Text_BagFull, MSGBOX_DEFAULT
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop:: @ 8269460
+Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop::
 	showmoneybox 0, 0, 0
 	msgbox Route109_SeashoreHouse_Text_WantToBuySodaPop, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -46,7 +46,7 @@ Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop:: @ 8269460
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484
+Route109_SeashoreHouse_EventScript_BuySodaPop::
 	checkmoney 300, 0
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route109_SeashoreHouse_EventScript_NotEnoughMoney
@@ -61,34 +61,34 @@ Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_NotEnoughMoney:: @ 82694C8
+Route109_SeashoreHouse_EventScript_NotEnoughMoney::
 	msgbox Route109_SeashoreHouse_Text_NotEnoughMoney, MSGBOX_DEFAULT
 	hidemoneybox
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_NotEnoughSpace:: @ 82694D5
+Route109_SeashoreHouse_EventScript_NotEnoughSpace::
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	hidemoneybox
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_Dwayne:: @ 82694E2
+Route109_SeashoreHouse_EventScript_Dwayne::
 	trainerbattle_single TRAINER_DWAYNE, Route109_SeashoreHouse_Text_DwayneIntro, Route109_SeashoreHouse_Text_DwayneDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion
 	msgbox Route109_SeashoreHouse_Text_DwaynePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_SeashoreHouse_EventScript_Johanna:: @ 82694FD
+Route109_SeashoreHouse_EventScript_Johanna::
 	trainerbattle_single TRAINER_JOHANNA, Route109_SeashoreHouse_Text_JohannaIntro, Route109_SeashoreHouse_Text_JohannaDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion
 	msgbox Route109_SeashoreHouse_Text_JohannaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_SeashoreHouse_EventScript_Simon:: @ 8269518
+Route109_SeashoreHouse_EventScript_Simon::
 	trainerbattle_single TRAINER_SIMON, Route109_SeashoreHouse_Text_SimonIntro, Route109_SeashoreHouse_Text_SimonDefeated, Route109_SeashoreHouse_EventScript_CheckTrainersCompletion
 	msgbox Route109_SeashoreHouse_Text_SimonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route109_SeashoreHouse_EventScript_CheckTrainersCompletion:: @ 8269533
+Route109_SeashoreHouse_EventScript_CheckTrainersCompletion::
 	goto_if_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_TrainersNotCompleted
 	goto_if_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_TrainersNotCompleted
 	goto_if_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_TrainersNotCompleted
@@ -96,11 +96,11 @@ Route109_SeashoreHouse_EventScript_CheckTrainersCompletion:: @ 8269533
 	release
 	end
 
-Route109_SeashoreHouse_EventScript_TrainersNotCompleted:: @ 8269553
+Route109_SeashoreHouse_EventScript_TrainersNotCompleted::
 	release
 	end
 
-Route109_SeashoreHouse_Text_SeashoreHouseIntro: @ 8269555
+Route109_SeashoreHouse_Text_SeashoreHouseIntro:
 	.string "I'm the owner of the SEASHORE HOUSE.\n"
 	.string "But you can call me MR. SEA!\p"
 	.string "What I love above all is to see hot\n"
@@ -109,12 +109,12 @@ Route109_SeashoreHouse_Text_SeashoreHouseIntro: @ 8269555
 	.string "If you can defeat all the TRAINERS\n"
 	.string "here, I'll reward your efforts.$"
 
-Route109_SeashoreHouse_Text_ShowMeSomeHotMatches: @ 8269635
+Route109_SeashoreHouse_Text_ShowMeSomeHotMatches:
 	.string "Show me some hot matches!\p"
 	.string "I run this SEASHORE HOUSE just for\n"
 	.string "that reason alone!$"
 
-Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles: @ 8269685
+Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles:
 	.string "You're scorching hot!\n"
 	.string "Those battles blazed!\l"
 	.string "I'm more than just satisfied!\p"
@@ -122,59 +122,59 @@ Route109_SeashoreHouse_Text_TakeTheseSodaPopBottles: @ 8269685
 	.string "streak, I want you to take these.\p"
 	.string "It's half a dozen bottles of SODA POP!$"
 
-Route109_SeashoreHouse_Text_BagFull: @ 826973A
+Route109_SeashoreHouse_Text_BagFull:
 	.string "Oh, but hey, your BAG's jammed full.\n"
 	.string "I'll hang on to these for you.$"
 
-Route109_SeashoreHouse_Text_WantToBuySodaPop: @ 826977E
+Route109_SeashoreHouse_Text_WantToBuySodaPop:
 	.string "Want to buy some SODA POP?\n"
 	.string "POKéMON love it!\p"
 	.string "Just ¥300 a bottle!\n"
 	.string "Buy some!$"
 
-Route109_SeashoreHouse_Text_HereYouGo: @ 82697C8
+Route109_SeashoreHouse_Text_HereYouGo:
 	.string "Here you go!$"
 
-Route109_SeashoreHouse_Text_NotEnoughMoney: @ 82697D5
+Route109_SeashoreHouse_Text_NotEnoughMoney:
 	.string "You don't have the money.$"
 
-Route109_SeashoreHouse_Text_ThatsTooBad: @ 82697EF
+Route109_SeashoreHouse_Text_ThatsTooBad:
 	.string "No?\n"
 	.string "That's too bad.$"
 
-Route109_SeashoreHouse_Text_DwayneIntro: @ 8269803
+Route109_SeashoreHouse_Text_DwayneIntro:
 	.string "If you're looking for a battle in the\n"
 	.string "SEASHORE HOUSE, you'll find no\l"
 	.string "hotter TRAINER than me, matey!$"
 
-Route109_SeashoreHouse_Text_DwayneDefeated: @ 8269867
+Route109_SeashoreHouse_Text_DwayneDefeated:
 	.string "That was a hot battle!\n"
 	.string "I can accept that loss, matey!$"
 
-Route109_SeashoreHouse_Text_DwaynePostBattle: @ 826989D
+Route109_SeashoreHouse_Text_DwaynePostBattle:
 	.string "Whenever I'm in SLATEPORT, I enjoy\n"
 	.string "hot battles and ice-cold SODA POP!$"
 
-Route109_SeashoreHouse_Text_JohannaIntro: @ 82698E3
+Route109_SeashoreHouse_Text_JohannaIntro:
 	.string "Boring battles aren't worth the effort.\p"
 	.string "Fiery hot battles are what toughen up\n"
 	.string "TRAINERS and POKéMON!$"
 
-Route109_SeashoreHouse_Text_JohannaDefeated: @ 8269947
+Route109_SeashoreHouse_Text_JohannaDefeated:
 	.string "That's hot!$"
 
-Route109_SeashoreHouse_Text_JohannaPostBattle: @ 8269953
+Route109_SeashoreHouse_Text_JohannaPostBattle:
 	.string "Whew, I'm all thirsty.\n"
 	.string "Maybe I'll have a SODA POP.$"
 
-Route109_SeashoreHouse_Text_SimonIntro: @ 8269986
+Route109_SeashoreHouse_Text_SimonIntro:
 	.string "I'm going to show you how great\n"
 	.string "my POKéMON are, but don't cry!$"
 
-Route109_SeashoreHouse_Text_SimonDefeated: @ 82699C5
+Route109_SeashoreHouse_Text_SimonDefeated:
 	.string "…I lost, but I won't cry…$"
 
-Route109_SeashoreHouse_Text_SimonPostBattle: @ 82699DF
+Route109_SeashoreHouse_Text_SimonPostBattle:
 	.string "If one of my POKéMON knew the move\n"
 	.string "for carrying me across water on its\l"
 	.string "back, I could get rid of this inner tube.$"
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
index f7be3fb9e..e9caf68ad 100644
--- a/data/maps/Route110/scripts.inc
+++ b/data/maps/Route110/scripts.inc
@@ -3,37 +3,37 @@
 .set LOCALID_RIVAL_ON_BIKE, 29
 .set LOCALID_BIRCH, 36
 
-Route110_MapScripts:: @ 81EF269
+Route110_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Route110_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_OnFrame
 	.byte 0
 
-Route110_OnResume: @ 81EF279
+Route110_OnResume:
 	special UpdateCyclingRoadState
 	end
 
-Route110_OnTransition: @ 81EF27D
+Route110_OnTransition:
 	call Common_EventScript_SetupRivalGfxId
 	call Common_EventScript_SetupRivalOnBikeGfxId
 	compare VAR_CYCLING_CHALLENGE_STATE, 1
 	call_if_eq Route110_EventScript_SaveCyclingMusic
 	end
 
-Route110_EventScript_SaveCyclingMusic:: @ 81EF293
+Route110_EventScript_SaveCyclingMusic::
 	savebgm MUS_CYCLING
 	return
 
-Route110_OnFrame: @ 81EF297
+Route110_OnFrame:
 	map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_BeginCylcingRoadChallenge
 	.2byte 0
 
-Route110_EventScript_BeginCylcingRoadChallenge:: @ 81EF2A1
+Route110_EventScript_BeginCylcingRoadChallenge::
 	special Special_BeginCyclingRoadChallenge
 	setvar VAR_CYCLING_CHALLENGE_STATE, 2
 	return
 
-Route110_EventScript_AquaGrunt1:: @ 81EF2AA
+Route110_EventScript_AquaGrunt1::
 	lock
 	faceplayer
 	msgbox Route110_Text_WeCantTalkAboutAquaActivities, MSGBOX_DEFAULT
@@ -42,7 +42,7 @@ Route110_EventScript_AquaGrunt1:: @ 81EF2AA
 	release
 	end
 
-Route110_EventScript_AquaGrunt2:: @ 81EF2C0
+Route110_EventScript_AquaGrunt2::
 	lock
 	faceplayer
 	msgbox Route110_Text_KickUpARuckus, MSGBOX_DEFAULT
@@ -51,7 +51,7 @@ Route110_EventScript_AquaGrunt2:: @ 81EF2C0
 	release
 	end
 
-Route110_EventScript_AquaGrunt3:: @ 81EF2D6
+Route110_EventScript_AquaGrunt3::
 	lock
 	faceplayer
 	msgbox Route110_Text_MyFirstJobInAqua, MSGBOX_DEFAULT
@@ -60,7 +60,7 @@ Route110_EventScript_AquaGrunt3:: @ 81EF2D6
 	release
 	end
 
-Route110_EventScript_AquaGrunt4:: @ 81EF2EC
+Route110_EventScript_AquaGrunt4::
 	lock
 	faceplayer
 	msgbox Route110_Text_AquaActionsBringSmiles, MSGBOX_DEFAULT
@@ -69,71 +69,71 @@ Route110_EventScript_AquaGrunt4:: @ 81EF2EC
 	release
 	end
 
-Route110_EventScript_Boy1:: @ 81EF302
+Route110_EventScript_Boy1::
 	msgbox Route110_Text_RideBikeAtFullSpeed, MSGBOX_NPC
 	end
 
-Route110_EventScript_CyclingGirl1:: @ 81EF30B
+Route110_EventScript_CyclingGirl1::
 	msgbox Route110_Text_HairStreamsBehindMe, MSGBOX_NPC
 	end
 
-Route110_EventScript_CyclingGuy1:: @ 81EF314
+Route110_EventScript_CyclingGuy1::
 	msgbox Route110_Text_YouGotBikeFromRydel, MSGBOX_NPC
 	end
 
-Route110_EventScript_OldMan:: @ 81EF31D
+Route110_EventScript_OldMan::
 	msgbox Route110_Text_TwoRoads, MSGBOX_NPC
 	end
 
-Route110_EventScript_OldWoman:: @ 81EF326
+Route110_EventScript_OldWoman::
 	msgbox Route110_Text_WalkOnTheLowRoad, MSGBOX_NPC
 	end
 
-Route110_EventScript_CyclingGuy2:: @ 81EF32F
+Route110_EventScript_CyclingGuy2::
 	msgbox Route110_Text_BikeTechniques, MSGBOX_NPC
 	end
 
-Route110_EventScript_Boy2:: @ 81EF338
+Route110_EventScript_Boy2::
 	msgbox Route110_Text_WhichShouldIChoose, MSGBOX_NPC
 	end
 
-Route110_EventScript_SlateportCitySign:: @ 81EF341
+Route110_EventScript_SlateportCitySign::
 	msgbox Route110_Text_SlateportCitySign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_CyclingRoadSign:: @ 81EF34A
+Route110_EventScript_CyclingRoadSign::
 	msgbox Route110_Text_CyclingRoadSign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_VandalizedSign:: @ 81EF353
+Route110_EventScript_VandalizedSign::
 	msgbox Route110_Text_AquaWasHere, MSGBOX_SIGN
 	end
 
-Route110_EventScript_Route103Sign:: @ 81EF35C
+Route110_EventScript_Route103Sign::
 	msgbox Route110_Text_Route103Sign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_SeasideParkingSign:: @ 81EF365
+Route110_EventScript_SeasideParkingSign::
 	msgbox Route110_Text_SeasideParkingSign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_MauvilleCitySign:: @ 81EF36E
+Route110_EventScript_MauvilleCitySign::
 	msgbox Route110_Text_MauvilleCitySign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_TrainerTipsPrlzSleep:: @ 81EF377
+Route110_EventScript_TrainerTipsPrlzSleep::
 	msgbox Route110_Text_TrainerTipsPrlzSleep, MSGBOX_SIGN
 	end
 
-Route110_EventScript_TrainerTipsRegisterItems:: @ 81EF380
+Route110_EventScript_TrainerTipsRegisterItems::
 	msgbox Route110_Text_TrainerTipsRegisterItems, MSGBOX_SIGN
 	end
 
-Route110_EventScript_TrickHouseSign:: @ 81EF389
+Route110_EventScript_TrickHouseSign::
 	msgbox Route110_Text_TrickHouseSign, MSGBOX_SIGN
 	end
 
-Route110_EventScript_CyclingRoadResultsSign:: @ 81EF392
+Route110_EventScript_CyclingRoadResultsSign::
 	lockall
 	specialvar VAR_RESULT, GetRecordedCyclingRoadResults
 	compare VAR_RESULT, FALSE
@@ -142,12 +142,12 @@ Route110_EventScript_CyclingRoadResultsSign:: @ 81EF392
 	releaseall
 	end
 
-Route110_EventScript_NoRecordSet:: @ 81EF3AD
+Route110_EventScript_NoRecordSet::
 	msgbox Route110_Text_ThereIsNoRecord, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_EventScript_ChallengeGuy:: @ 81EF3B7
+Route110_EventScript_ChallengeGuy::
 	lock
 	faceplayer
 	specialvar VAR_RESULT, GetPlayerAvatarBike
@@ -159,27 +159,27 @@ Route110_EventScript_ChallengeGuy:: @ 81EF3B7
 	release
 	end
 
-Route110_EventScript_PlayerNotRidingBike:: @ 81EF3DE
+Route110_EventScript_PlayerNotRidingBike::
 	msgbox Route110_Text_RatedForNumberOfCollisions, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_EventScript_PlayerRidingAcroBike:: @ 81EF3E8
+Route110_EventScript_PlayerRidingAcroBike::
 	msgbox Route110_Text_AcroBikesDoNotQualify, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_EventScript_Edward:: @ 81EF3F2
+Route110_EventScript_Edward::
 	trainerbattle_single TRAINER_EDWARD, Route110_Text_EdwardIntro, Route110_Text_EdwardDefeated
 	msgbox Route110_Text_EdwardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Jaclyn:: @ 81EF409
+Route110_EventScript_Jaclyn::
 	trainerbattle_single TRAINER_JACLYN, Route110_Text_JaclynIntro, Route110_Text_JaclynDefeated
 	msgbox Route110_Text_JaclynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Edwin:: @ 81EF420
+Route110_EventScript_Edwin::
 	trainerbattle_single TRAINER_EDWIN_1, Route110_Text_EdwinIntro, Route110_Text_EdwinDefeated, Route110_EventScript_EdwinRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -188,7 +188,7 @@ Route110_EventScript_Edwin:: @ 81EF420
 	release
 	end
 
-Route110_EventScript_EdwinRegisterMatchCallAfterBattle:: @ 81EF44C
+Route110_EventScript_EdwinRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route110_Text_EdwinRegister, MSGBOX_DEFAULT
@@ -196,27 +196,27 @@ Route110_EventScript_EdwinRegisterMatchCallAfterBattle:: @ 81EF44C
 	release
 	end
 
-Route110_EventScript_EdwinRematch:: @ 81EF46B
+Route110_EventScript_EdwinRematch::
 	trainerbattle_rematch TRAINER_EDWIN_1, Route110_Text_EdwinRematchIntro, Route110_Text_EdwinRematchDefeated
 	msgbox Route110_Text_EdwinRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Dale:: @ 81EF482
+Route110_EventScript_Dale::
 	trainerbattle_single TRAINER_DALE, Route110_Text_DaleIntro, Route110_Text_DaleDefeated
 	msgbox Route110_Text_DalePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Jacob:: @ 81EF499
+Route110_EventScript_Jacob::
 	trainerbattle_single TRAINER_JACOB, Route110_Text_JacobIntro, Route110_Text_JacobDefeated
 	msgbox Route110_Text_JacobPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Anthony:: @ 81EF4B0
+Route110_EventScript_Anthony::
 	trainerbattle_single TRAINER_ANTHONY, Route110_Text_AnthonyIntro, Route110_Text_AnthonyDefeated
 	msgbox Route110_Text_AnthonyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Benjamin:: @ 81EF4C7
+Route110_EventScript_Benjamin::
 	trainerbattle_single TRAINER_BENJAMIN_1, Route110_Text_BenjaminIntro, Route110_Text_BenjaminDefeated, Route110_EventScript_BenjaminRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -225,7 +225,7 @@ Route110_EventScript_Benjamin:: @ 81EF4C7
 	release
 	end
 
-Route110_EventScript_BenjaminRegisterMatchCallAfterBattle:: @ 81EF4F3
+Route110_EventScript_BenjaminRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route110_Text_BenjaminRegister, MSGBOX_DEFAULT
@@ -233,17 +233,17 @@ Route110_EventScript_BenjaminRegisterMatchCallAfterBattle:: @ 81EF4F3
 	release
 	end
 
-Route110_EventScript_BenjaminRematch:: @ 81EF512
+Route110_EventScript_BenjaminRematch::
 	trainerbattle_rematch TRAINER_BENJAMIN_1, Route110_Text_BenjaminRematchIntro, Route110_Text_BenjaminRematchDefeated
 	msgbox Route110_Text_BenjaminRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Jasmine:: @ 81EF529
+Route110_EventScript_Jasmine::
 	trainerbattle_single TRAINER_JASMINE, Route110_Text_JasmineIntro, Route110_Text_JasmineDefeated
 	msgbox Route110_Text_JasminePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Abigail:: @ 81EF540
+Route110_EventScript_Abigail::
 	trainerbattle_single TRAINER_ABIGAIL_1, Route110_Text_AbigailIntro, Route110_Text_AbigailDefeated, Route110_EventScript_AbigailRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -252,7 +252,7 @@ Route110_EventScript_Abigail:: @ 81EF540
 	release
 	end
 
-Route110_EventScript_AbigailRegisterMatchCallAfterBattle:: @ 81EF56C
+Route110_EventScript_AbigailRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route110_Text_AbigailRegister, MSGBOX_DEFAULT
@@ -260,12 +260,12 @@ Route110_EventScript_AbigailRegisterMatchCallAfterBattle:: @ 81EF56C
 	release
 	end
 
-Route110_EventScript_AbigailRematch:: @ 81EF58B
+Route110_EventScript_AbigailRematch::
 	trainerbattle_rematch TRAINER_ABIGAIL_1, Route110_Text_AbigailRematchIntro, Route110_Text_AbigailRematchDefeated
 	msgbox Route110_Text_AbigailRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Isabel:: @ 81EF5A2
+Route110_EventScript_Isabel::
 	trainerbattle_single TRAINER_ISABEL_1, Route110_Text_IsabelIntro, Route110_Text_IsabelDefeated, Route110_EventScript_IsabelRegisterMatchCallAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -274,7 +274,7 @@ Route110_EventScript_Isabel:: @ 81EF5A2
 	release
 	end
 
-Route110_EventScript_IsabelRegisterMatchCallAfterBattle:: @ 81EF5CE
+Route110_EventScript_IsabelRegisterMatchCallAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route110_Text_IsabelRegister, MSGBOX_DEFAULT
@@ -282,35 +282,35 @@ Route110_EventScript_IsabelRegisterMatchCallAfterBattle:: @ 81EF5CE
 	release
 	end
 
-Route110_EventScript_IsabelRematch:: @ 81EF5ED
+Route110_EventScript_IsabelRematch::
 	trainerbattle_rematch TRAINER_ISABEL_1, Route110_Text_IsabelRematchIntro, Route110_Text_IsabelRematchDefeated
 	msgbox Route110_Text_IsabelRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Timmy:: @ 81EF604
+Route110_EventScript_Timmy::
 	trainerbattle_single TRAINER_TIMMY, Route110_Text_TimmyIntro, Route110_Text_TimmyDefeated
 	msgbox Route110_Text_TimmyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Unused:: @ 81EF61B
+Route110_EventScript_Unused::
 	end
 
-Route110_EventScript_Kaleb:: @ 81EF61C
+Route110_EventScript_Kaleb::
 	trainerbattle_single TRAINER_KALEB, Route110_Text_KalebIntro, Route110_Text_KalebDefeated
 	msgbox Route110_Text_KalebPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Joseph:: @ 81EF633
+Route110_EventScript_Joseph::
 	trainerbattle_single TRAINER_JOSEPH, Route110_Text_JosephIntro, Route110_Text_JosephDefeated
 	msgbox Route110_Text_JosephPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_Alyssa:: @ 81EF64A
+Route110_EventScript_Alyssa::
 	trainerbattle_single TRAINER_ALYSSA, Route110_Text_AlyssaIntro, Route110_Text_AlyssaDefeated
 	msgbox Route110_Text_AlyssaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_EventScript_CyclingChallengeEnd:: @ 81EF661
+Route110_EventScript_CyclingChallengeEnd::
 	lockall
 	applymovement LOCALID_CHALLENGE_BIKER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
@@ -318,7 +318,7 @@ Route110_EventScript_CyclingChallengeEnd:: @ 81EF661
 	releaseall
 	end
 
-Route110_EventScript_CyclingChallengeResults:: @ 81EF673
+Route110_EventScript_CyclingChallengeResults::
 	special FinishCyclingRoadChallenge
 	msgbox Route110_Text_CyclingChallengeResultSummary, MSGBOX_DEFAULT
 	switch VAR_RESULT
@@ -335,53 +335,53 @@ Route110_EventScript_CyclingChallengeResults:: @ 81EF673
 	case 0, Route110_EventScript_ChallengeReactionWorst
 	end
 
-Route110_EventScript_ChallengeReactionBest:: @ 81EF6FD
+Route110_EventScript_ChallengeReactionBest::
 	msgbox Route110_Text_ChallengeReactionBest, MSGBOX_DEFAULT
 	goto Route110_EventScript_EndChallenge
 	end
 
-Route110_EventScript_ChallengeReactionGood:: @ 81EF70B
+Route110_EventScript_ChallengeReactionGood::
 	msgbox Route110_Text_ChallengeReactionGood, MSGBOX_DEFAULT
 	goto Route110_EventScript_EndChallenge
 	end
 
-Route110_EventScript_ChallengeReactionOk:: @ 81EF719
+Route110_EventScript_ChallengeReactionOk::
 	msgbox Route110_Text_ChallengeReactionOk, MSGBOX_DEFAULT
 	goto Route110_EventScript_EndChallenge
 	end
 
-Route110_EventScript_ChallengeReactionBad:: @ 81EF727
+Route110_EventScript_ChallengeReactionBad::
 	msgbox Route110_Text_ChallengeReactionBad, MSGBOX_DEFAULT
 	goto Route110_EventScript_EndChallenge
 	end
 
-Route110_EventScript_ChallengeReactionWorst:: @ 81EF735
+Route110_EventScript_ChallengeReactionWorst::
 	msgbox Route110_Text_ChallengeReactionWorst, MSGBOX_DEFAULT
 	goto Route110_EventScript_EndChallenge
 	end
 
-Route110_EventScript_EndChallenge:: @ 81EF743
+Route110_EventScript_EndChallenge::
 	setvar VAR_CYCLING_CHALLENGE_STATE, 3
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	return
 
-Route110_EventScript_RivalTrigger1:: @ 81EF74D
+Route110_EventScript_RivalTrigger1::
 	setvar VAR_0x8008, 1
 	goto Route110_EventScript_RivalScene
 	end
 
-Route110_EventScript_RivalTrigger2:: @ 81EF758
+Route110_EventScript_RivalTrigger2::
 	setvar VAR_0x8008, 2
 	goto Route110_EventScript_RivalScene
 	end
 
-Route110_EventScript_RivalTrigger3:: @ 81EF763
+Route110_EventScript_RivalTrigger3::
 	setvar VAR_0x8008, 3
 	goto Route110_EventScript_RivalScene
 	end
 
-Route110_EventScript_RivalScene:: @ 81EF76E
+Route110_EventScript_RivalScene::
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -409,15 +409,15 @@ Route110_EventScript_RivalScene:: @ 81EF76E
 	releaseall
 	end
 
-Route110_EventScript_PlayMayMusic:: @ 81EF7E1
+Route110_EventScript_PlayMayMusic::
 	playbgm MUS_ENCOUNTER_MAY, TRUE
 	return
 
-Route110_EventScript_PlayBrendanMusic:: @ 81EF7E6
+Route110_EventScript_PlayBrendanMusic::
 	playbgm MUS_ENCOUNTER_BRENDAN, TRUE
 	return
 
-Route110_EventScript_MayBattle:: @ 81EF7EB
+Route110_EventScript_MayBattle::
 	msgbox Route110_Text_MayLetsBattle, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route110_EventScript_MayBattleTreecko
@@ -425,29 +425,29 @@ Route110_EventScript_MayBattle:: @ 81EF7EB
 	case 2, Route110_EventScript_MayBattleMudkip
 	end
 
-Route110_EventScript_MayBattleTreecko:: @ 81EF81A
+Route110_EventScript_MayBattleTreecko::
 	trainerbattle_no_intro TRAINER_MAY_ROUTE_110_TREECKO, Route110_Text_MayDefeated
 	goto Route110_EventScript_MayDefeated
 	end
 
-Route110_EventScript_MayBattleTorchic:: @ 81EF82A
+Route110_EventScript_MayBattleTorchic::
 	trainerbattle_no_intro TRAINER_MAY_ROUTE_110_TORCHIC, Route110_Text_MayDefeated
 	goto Route110_EventScript_MayDefeated
 	end
 
-Route110_EventScript_MayBattleMudkip:: @ 81EF83A
+Route110_EventScript_MayBattleMudkip::
 	trainerbattle_no_intro TRAINER_MAY_ROUTE_110_MUDKIP, Route110_Text_MayDefeated
 	goto Route110_EventScript_MayDefeated
 	end
 
-Route110_EventScript_MayDefeated:: @ 81EF84A
+Route110_EventScript_MayDefeated::
 	msgbox Route110_Text_MayTakeThis, MSGBOX_DEFAULT
 	call Route110_EventScript_GiveItemfinder
 	msgbox Route110_Text_MayExplainItemfinder, MSGBOX_DEFAULT
 	goto Route110_EventScript_RivalExit
 	end
 
-Route110_EventScript_BrendanBattle:: @ 81EF865
+Route110_EventScript_BrendanBattle::
 	msgbox Route110_Text_BrendanLetsBattle, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route110_EventScript_BrendanBattleTreecko
@@ -455,33 +455,33 @@ Route110_EventScript_BrendanBattle:: @ 81EF865
 	case 2, Route110_EventScript_BrendanBattleMudkip
 	end
 
-Route110_EventScript_BrendanBattleTreecko:: @ 81EF894
+Route110_EventScript_BrendanBattleTreecko::
 	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_TREECKO, Route110_Text_BrendanDefeated
 	goto Route110_EventScript_BrendanDefeated
 	end
 
-Route110_EventScript_BrendanBattleTorchic:: @ 81EF8A4
+Route110_EventScript_BrendanBattleTorchic::
 	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_TORCHIC, Route110_Text_BrendanDefeated
 	goto Route110_EventScript_BrendanDefeated
 	end
 
-Route110_EventScript_BrendanBattleMudkip:: @ 81EF8B4
+Route110_EventScript_BrendanBattleMudkip::
 	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_110_MUDKIP, Route110_Text_BrendanDefeated
 	goto Route110_EventScript_BrendanDefeated
 	end
 
-Route110_EventScript_BrendanDefeated:: @ 81EF8C4
+Route110_EventScript_BrendanDefeated::
 	msgbox Route110_Text_BrendanTakeThis, MSGBOX_DEFAULT
 	call Route110_EventScript_GiveItemfinder
 	msgbox Route110_Text_BrendanExplainItemfinder, MSGBOX_DEFAULT
 	goto Route110_EventScript_RivalExit
 	end
 
-Route110_EventScript_GiveItemfinder:: @ 81EF8DF
+Route110_EventScript_GiveItemfinder::
 	giveitem ITEM_ITEMFINDER
 	return
 
-Route110_EventScript_RivalExit:: @ 81EF8EC
+Route110_EventScript_RivalExit::
 	closemessage
 	compare VAR_0x8008, 1
 	call_if_eq Route110_EventScript_MoveRival1
@@ -507,65 +507,65 @@ Route110_EventScript_RivalExit:: @ 81EF8EC
 	releaseall
 	end
 
-Route110_EventScript_RivalApproachPlayer1:: @ 81EF94E
+Route110_EventScript_RivalApproachPlayer1::
 	applymovement LOCALID_RIVAL, Route110_Movement_RivalApproachPlayer1
 	waitmovement 0
 	return
 
-Route110_EventScript_RivalApproachPlayer2:: @ 81EF959
+Route110_EventScript_RivalApproachPlayer2::
 	applymovement LOCALID_RIVAL, Route110_Movement_RivalApproachPlayer2
 	waitmovement 0
 	return
 
-Route110_EventScript_RivalApproachPlayer3:: @ 81EF964
+Route110_EventScript_RivalApproachPlayer3::
 	applymovement LOCALID_RIVAL, Route110_Movement_RivalApproachPlayer3
 	waitmovement 0
 	return
 
-Route110_EventScript_RivalExit1:: @ 81EF96F
+Route110_EventScript_RivalExit1::
 	applymovement LOCALID_RIVAL_ON_BIKE, Route110_Movement_RivalExit1
 	waitmovement 0
 	return
 
-Route110_EventScript_RivalExit2:: @ 81EF97A
+Route110_EventScript_RivalExit2::
 	applymovement LOCALID_RIVAL_ON_BIKE, Route110_Movement_RivalExit2
 	waitmovement 0
 	return
 
-Route110_EventScript_RivalExit3:: @ 81EF985
+Route110_EventScript_RivalExit3::
 	applymovement LOCALID_RIVAL_ON_BIKE, Route110_Movement_RivalExit3
 	waitmovement 0
 	return
 
-Route110_EventScript_MoveRival1:: @ 81EF990
+Route110_EventScript_MoveRival1::
 	setobjectxyperm LOCALID_RIVAL_ON_BIKE, 33, 55
 	return
 
-Route110_EventScript_MoveRival2:: @ 81EF998
+Route110_EventScript_MoveRival2::
 	setobjectxyperm LOCALID_RIVAL_ON_BIKE, 34, 55
 	return
 
-Route110_EventScript_MoveRival3:: @ 81EF9A0
+Route110_EventScript_MoveRival3::
 	setobjectxyperm LOCALID_RIVAL_ON_BIKE, 35, 55
 	return
 
-Route110_Movement_RivalApproachPlayer1: @ 81EF9A8
+Route110_Movement_RivalApproachPlayer1:
 	walk_down
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-Route110_Movement_RivalApproachPlayer2: @ 81EF9AC
+Route110_Movement_RivalApproachPlayer2:
 	walk_down
 	step_end
 
-Route110_Movement_RivalApproachPlayer3: @ 81EF9AE
+Route110_Movement_RivalApproachPlayer3:
 	walk_down
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-Route110_Movement_RivalExit1: @ 81EF9B2
+Route110_Movement_RivalExit1:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -575,7 +575,7 @@ Route110_Movement_RivalExit1: @ 81EF9B2
 	walk_fast_up
 	step_end
 
-Route110_Movement_RivalExit2: @ 81EF9BA
+Route110_Movement_RivalExit2:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -586,7 +586,7 @@ Route110_Movement_RivalExit2: @ 81EF9BA
 	walk_fast_down
 	step_end
 
-Route110_Movement_RivalExit3: @ 81EF9C3
+Route110_Movement_RivalExit3:
 	walk_fast_up
 	walk_fast_up
 	walk_fast_up
@@ -596,27 +596,27 @@ Route110_Movement_RivalExit3: @ 81EF9C3
 	walk_fast_up
 	step_end
 
-Route110_EventScript_BirchScene1:: @ 81EF9CB
+Route110_EventScript_BirchScene1::
 	lockall
 	setvar VAR_0x8008, 1
 	goto Route110_EventScript_BirchScene
 
-Route110_EventScript_BirchScene2:: @ 81EF9D6
+Route110_EventScript_BirchScene2::
 	lockall
 	setvar VAR_0x8008, 2
 	goto Route110_EventScript_BirchScene
 
-Route110_EventScript_BirchScene3:: @ 81EF9E1
+Route110_EventScript_BirchScene3::
 	lockall
 	setvar VAR_0x8008, 3
 	goto Route110_EventScript_BirchScene
 
-Route110_EventScript_BirchScene4:: @ 81EF9EC
+Route110_EventScript_BirchScene4::
 	lockall
 	setvar VAR_0x8008, 4
 	goto Route110_EventScript_BirchScene
 
-Route110_EventScript_BirchScene:: @ 81EF9F7
+Route110_EventScript_BirchScene::
 	addobject LOCALID_BIRCH
 	applymovement LOCALID_BIRCH, Route110_Movement_BirchEntrance
 	waitmovement 0
@@ -669,77 +669,77 @@ Route110_EventScript_BirchScene:: @ 81EF9F7
 	releaseall
 	end
 
-Route110_EventScript_BirchApproachPlayer1:: @ 81EFAD8
+Route110_EventScript_BirchApproachPlayer1::
 	applymovement LOCALID_BIRCH, Route110_Movement_BirchApproachPlayer1
 	waitmovement 0
 	return
 
-Route110_EventScript_BirchApproachPlayer2:: @ 81EFAE3
+Route110_EventScript_BirchApproachPlayer2::
 	applymovement LOCALID_BIRCH, Route110_Movement_BirchApproachPlayer2
 	waitmovement 0
 	return
 
-Route110_EventScript_BirchApproachPlayer3:: @ 81EFAEE
+Route110_EventScript_BirchApproachPlayer3::
 	applymovement LOCALID_BIRCH, Route110_Movement_BirchApproachPlayer3
 	waitmovement 0
 	return
 
-Route110_EventScript_BirchApproachPlayer4:: @ 81EFAF9
+Route110_EventScript_BirchApproachPlayer4::
 	applymovement LOCALID_BIRCH, Route110_Movement_BirchApproachPlayer4
 	waitmovement 0
 	return
 
-Route110_EventScript_BirchExit1:: @ 81EFB04
+Route110_EventScript_BirchExit1::
 	applymovement LOCALID_BIRCH, Route110_Movement_BirchExit1
 	waitmovement 0
 	return
 
-Route110_EventScript_BirchExit2:: @ 81EFB0F
+Route110_EventScript_BirchExit2::
 	applymovement LOCALID_BIRCH, Route110_Movement_BirchExit2
 	waitmovement 0
 	return
 
-Route110_EventScript_BirchExit3:: @ 81EFB1A
+Route110_EventScript_BirchExit3::
 	applymovement LOCALID_BIRCH, Route110_Movement_BirchExit3
 	waitmovement 0
 	return
 
-Route110_EventScript_BirchExit4:: @ 81EFB25
+Route110_EventScript_BirchExit4::
 	applymovement LOCALID_BIRCH, Route110_Movement_BirchExit4
 	waitmovement 0
 	return
 
-Route110_Movement_BirchEntrance: @ 81EFB30
+Route110_Movement_BirchEntrance:
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-Route110_Movement_BirchApproachPlayer1: @ 81EFB34
+Route110_Movement_BirchApproachPlayer1:
 	walk_down
 	walk_left
 	walk_left
 	walk_down
 	step_end
 
-Route110_Movement_BirchApproachPlayer2: @ 81EFB39
+Route110_Movement_BirchApproachPlayer2:
 	walk_down
 	walk_left
 	walk_down
 	step_end
 
-Route110_Movement_BirchApproachPlayer3: @ 81EFB3D
+Route110_Movement_BirchApproachPlayer3:
 	walk_down
 	walk_down
 	step_end
 
-Route110_Movement_BirchApproachPlayer4: @ 81EFB40
+Route110_Movement_BirchApproachPlayer4:
 	walk_down
 	walk_right
 	walk_down
 	step_end
 
-Route110_Movement_BirchExit1: @ 81EFB44
+Route110_Movement_BirchExit1:
 	walk_up
 	walk_up
 	walk_right
@@ -748,7 +748,7 @@ Route110_Movement_BirchExit1: @ 81EFB44
 	walk_up
 	step_end
 
-Route110_Movement_BirchExit2: @ 81EFB4B
+Route110_Movement_BirchExit2:
 	walk_up
 	walk_up
 	walk_up
@@ -756,7 +756,7 @@ Route110_Movement_BirchExit2: @ 81EFB4B
 	walk_up
 	step_end
 
-Route110_Movement_BirchExit3: @ 81EFB51
+Route110_Movement_BirchExit3:
 	walk_up
 	walk_up
 	walk_up
@@ -764,7 +764,7 @@ Route110_Movement_BirchExit3: @ 81EFB51
 	walk_up
 	step_end
 
-Route110_Movement_BirchExit4: @ 81EFB57
+Route110_Movement_BirchExit4:
 	walk_up
 	walk_up
 	walk_up
@@ -772,40 +772,40 @@ Route110_Movement_BirchExit4: @ 81EFB57
 	walk_up
 	step_end
 
-Route110_Text_WeCantTalkAboutAquaActivities: @ 81EFB5D
+Route110_Text_WeCantTalkAboutAquaActivities:
 	.string "TEAM AQUA's activities…\n"
 	.string "We can't talk about them yet.$"
 
-Route110_Text_KickUpARuckus: @ 81EFB93
+Route110_Text_KickUpARuckus:
 	.string "I want to get going to SLATEPORT and\n"
 	.string "kick up a ruckus!$"
 
-Route110_Text_MyFirstJobInAqua: @ 81EFBCA
+Route110_Text_MyFirstJobInAqua:
 	.string "This is my first job after joining\n"
 	.string "TEAM AQUA. It's a little scary.$"
 
-Route110_Text_AquaActionsBringSmiles: @ 81EFC0D
+Route110_Text_AquaActionsBringSmiles:
 	.string "TEAM AQUA's actions should bring\n"
 	.string "smiles to people's faces!$"
 
-Route110_Text_MayLetsBattle: @ 81EFC48
+Route110_Text_MayLetsBattle:
 	.string "MAY: Hi, {PLAYER}{KUN}, long time no see!\p"
 	.string "While I was searching for other\n"
 	.string "POKéMON, my POKéMON grew stronger.\p"
 	.string "So…\n"
 	.string "How about a little battle?$"
 
-Route110_Text_MayDefeated: @ 81EFCCB
+Route110_Text_MayDefeated:
 	.string "Yikes!\n"
 	.string "You're better than I expected!$"
 
-Route110_Text_MayTakeThis: @ 81EFCF1
+Route110_Text_MayTakeThis:
 	.string "MAY: {PLAYER}{KUN}, you've been busy\n"
 	.string "training, too, haven't you?\p"
 	.string "I think you deserve a reward!\n"
 	.string "This is from me!$"
 
-Route110_Text_MayExplainItemfinder: @ 81EFD58
+Route110_Text_MayExplainItemfinder:
 	.string "MAY: That's an ITEMFINDER.\p"
 	.string "Try it out. If there is an item that's\n"
 	.string "not visible, it emits a sound.\p"
@@ -814,24 +814,24 @@ Route110_Text_MayExplainItemfinder: @ 81EFD58
 	.string "me, but I think you should train a lot\l"
 	.string "harder for the next time.$"
 
-Route110_Text_BrendanLetsBattle: @ 81EFE3F
+Route110_Text_BrendanLetsBattle:
 	.string "BRENDAN: Hey, {PLAYER}.\n"
 	.string "So this is where you were.\l"
 	.string "How's it going?\p"
 	.string "Have you been raising your POKéMON?\n"
 	.string "I'll check for you.$"
 
-Route110_Text_BrendanDefeated: @ 81EFEB4
+Route110_Text_BrendanDefeated:
 	.string "Hmm…\n"
 	.string "You're pretty good.$"
 
-Route110_Text_BrendanTakeThis: @ 81EFECD
+Route110_Text_BrendanTakeThis:
 	.string "BRENDAN: {PLAYER}, you've trained\n"
 	.string "without me noticing…\p"
 	.string "Good enough!\n"
 	.string "Here, take this.$"
 
-Route110_Text_BrendanExplainItemfinder: @ 81EFF1C
+Route110_Text_BrendanExplainItemfinder:
 	.string "BRENDAN: That's an ITEMFINDER.\p"
 	.string "Use it to root around for items that\n"
 	.string "aren't visible.\p"
@@ -840,16 +840,16 @@ Route110_Text_BrendanExplainItemfinder: @ 81EFF1C
 	.string "Anyway, I'm off to look for new\n"
 	.string "POKéMON.$"
 
-Route110_Text_RideBikeAtFullSpeed: @ 81EFFC3
+Route110_Text_RideBikeAtFullSpeed:
 	.string "Wouldn't it be great to ride a BIKE\n"
 	.string "at full speed on CYCLING ROAD?$"
 
-Route110_Text_HairStreamsBehindMe: @ 81F0006
+Route110_Text_HairStreamsBehindMe:
 	.string "How do you like the way my raven-\n"
 	.string "colored hair streams behind me?\p"
 	.string "I grew my hair out just for that.$"
 
-Route110_Text_YouGotBikeFromRydel: @ 81F006A
+Route110_Text_YouGotBikeFromRydel:
 	.string "Oh, hey, you got that BIKE from RYDEL!\p"
 	.string "Oh, it's glaringly obvious.\n"
 	.string "It says right on your bike…\p"
@@ -866,139 +866,139 @@ Route110_Text_YouGotBikeFromRydel: @ 81F006A
 	.string "You should ride it around all over\n"
 	.string "the place--it's good advertising!$"
 
-Route110_Text_TwoRoads: @ 81F0261
+Route110_Text_TwoRoads:
 	.string "The two roads, one above, one below…\p"
 	.string "A road each for people and POKéMON.\n"
 	.string "Perhaps that is right and fair.$"
 
-Route110_Text_WalkOnTheLowRoad: @ 81F02CA
+Route110_Text_WalkOnTheLowRoad:
 	.string "I don't have a BIKE, so I'll take\n"
 	.string "a leisurely walk on the low road.$"
 
-Route110_Text_BikeTechniques: @ 81F030E
+Route110_Text_BikeTechniques:
 	.string "Learning techniques will make BIKE\n"
 	.string "riding even more fun.\p"
 	.string "There are some places that you can\n"
 	.string "reach only by using a BIKE technique.$"
 
-Route110_Text_WhichShouldIChoose: @ 81F0390
+Route110_Text_WhichShouldIChoose:
 	.string "Which should I choose?\p"
 	.string "Make a beeline for MAUVILLE on\n"
 	.string "CYCLING ROAD, or take the low road\l"
 	.string "and look for POKéMON?$"
 
-Route110_Text_CyclingChallengeResultSummary: @ 81F03FF
+Route110_Text_CyclingChallengeResultSummary:
 	.string "Number of collisions:\n"
 	.string "… … {STR_VAR_1}!\p"
 	.string "Total time:\n"
 	.string "… … {STR_VAR_2}!$"
 
-Route110_Text_ChallengeReactionBest: @ 81F0431
+Route110_Text_ChallengeReactionBest:
 	.string "Bravo! Splendid showing!\p"
 	.string "Your love of cycling comes from deep\n"
 	.string "within your heart.\l"
 	.string "You've shaken me to my very soul!$"
 
-Route110_Text_ChallengeReactionGood: @ 81F04A4
+Route110_Text_ChallengeReactionGood:
 	.string "Your technique is remarkable.\p"
 	.string "I suggest you speed up a bit while\n"
 	.string "still avoiding collisions.$"
 
-Route110_Text_ChallengeReactionOk: @ 81F0500
+Route110_Text_ChallengeReactionOk:
 	.string "I would consider you a work in\n"
 	.string "progress.\p"
 	.string "Still, I hope you don't forget the\n"
 	.string "sheer pleasure of cycling.$"
 
-Route110_Text_ChallengeReactionBad: @ 81F0567
+Route110_Text_ChallengeReactionBad:
 	.string "My word… Your cycling skills border\n"
 	.string "on terrifying.\p"
 	.string "Most certainly, you need much more\n"
 	.string "practice riding.$"
 
-Route110_Text_ChallengeReactionWorst: @ 81F05CE
+Route110_Text_ChallengeReactionWorst:
 	.string "…I am aghast…\p"
 	.string "You're perhaps not cut out for this\n"
 	.string "unfortunate cycling business.\p"
 	.string "You ought to give serious thought to\n"
 	.string "returning that BIKE to RYDEL.$"
 
-Route110_Text_RatedForNumberOfCollisions: @ 81F0661
+Route110_Text_RatedForNumberOfCollisions:
 	.string "This is CYCLING ROAD.\p"
 	.string "If you were to ride from MAUVILLE to\n"
 	.string "SLATEPORT on a MACH BIKE, you would\l"
 	.string "be rated for the number of collisions\l"
 	.string "and your total time.$"
 
-Route110_Text_AlwaysAimHigher: @ 81F06FB
+Route110_Text_AlwaysAimHigher:
 	.string "Regardless of the results, I count on\n"
 	.string "seeing more challenges from you.\l"
 	.string "Always aim higher!$"
 
-Route110_Text_AcroBikesDoNotQualify: @ 81F0755
+Route110_Text_AcroBikesDoNotQualify:
 	.string "On this CYCLING ROAD, those riding\n"
 	.string "MACH BIKES are rated for their number\l"
 	.string "of collisions and their total times.\p"
 	.string "ACRO BIKES do not qualify for rating.\n"
 	.string "They are easy to turn, so it's not fair.$"
 
-Route110_Text_SlateportCitySign: @ 81F0812
+Route110_Text_SlateportCitySign:
 	.string "ROUTE 110\n"
 	.string "{DOWN_ARROW} SLATEPORT CITY$"
 
-Route110_Text_CyclingRoadSign: @ 81F082D
+Route110_Text_CyclingRoadSign:
 	.string "SEASIDE CYCLING ROAD$"
 
-Route110_Text_AquaWasHere: @ 81F0842
+Route110_Text_AquaWasHere:
 	.string "“TEAM AQUA was here!”\p"
 	.string "Someone painted that onto this sign,\n"
 	.string "but then someone else painted over it.\p"
 	.string "“TEAM MAGMA rules!” is what it\n"
 	.string "says now.$"
 
-Route110_Text_Route103Sign: @ 81F08CD
+Route110_Text_Route103Sign:
 	.string "ROUTE 110\n"
 	.string "{LEFT_ARROW} ROUTE 103$"
 
-Route110_Text_SeasideParkingSign: @ 81F08E3
+Route110_Text_SeasideParkingSign:
 	.string "SEASIDE PARKING$"
 
-Route110_Text_MauvilleCitySign: @ 81F08F3
+Route110_Text_MauvilleCitySign:
 	.string "ROUTE 110\n"
 	.string "{UP_ARROW} MAUVILLE CITY$"
 
-Route110_Text_TrainerTipsPrlzSleep: @ 81F090D
+Route110_Text_TrainerTipsPrlzSleep:
 	.string "TRAINER TIPS\p"
 	.string "The foe can be made helpless by\n"
 	.string "paralyzing it or causing it to sleep.\p"
 	.string "It is an important technique for\n"
 	.string "POKéMON battles.$"
 
-Route110_Text_TrainerTipsRegisterItems: @ 81F0992
+Route110_Text_TrainerTipsRegisterItems:
 	.string "TRAINER TIPS\p"
 	.string "The items in the BAG can be reorganized\n"
 	.string "by pressing SELECT.$"
 
-Route110_Text_TrickHouseSign: @ 81F09DB
+Route110_Text_TrickHouseSign:
 	.string "“Three steps {RIGHT_ARROW} and two steps {UP_ARROW}\n"
 	.string "to reach the wondrous TRICK HOUSE.”$"
 
-Route110_Text_BestRecord: @ 81F0A1E
+Route110_Text_BestRecord:
 	.string "THE BEST RECORD TO DATE…\p"
 	.string "No. of collisions: {STR_VAR_1}\p"
 	.string "Elapsed time: {STR_VAR_2}$"
 
-Route110_Text_ThereIsNoRecord: @ 81F0A5E
+Route110_Text_ThereIsNoRecord:
 	.string "THE BEST RECORD TO DATE…\p"
 	.string "No one seems to have taken the\n"
 	.string "challenge. There is no record…$"
 
-Route110_Text_ImagineSeeingYouHere: @ 81F0AB5
+Route110_Text_ImagineSeeingYouHere:
 	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
 	.string "Imagine seeing you here!\p"
 	.string "And where might my {RIVAL} be?$"
 
-Route110_Text_HeardYouInstallMatchCall: @ 81F0AFF
+Route110_Text_HeardYouInstallMatchCall:
 	.string "Oh, I see!\n"
 	.string "You two are running separately.\l"
 	.string "Well, that's fine.\p"
@@ -1010,11 +1010,11 @@ Route110_Text_HeardYouInstallMatchCall: @ 81F0AFF
 	.string "I can rate your POKéDEX anytime.\p"
 	.string "… … … … … …$"
 
-Route110_Text_RegisteredBirchInPokenav: @ 81F0C0C
+Route110_Text_RegisteredBirchInPokenav:
 	.string "Registered PROF. BIRCH\n"
 	.string "in the POKéNAV.$"
 
-Route110_Text_KeepAnEyeOutForRival: @ 81F0C33
+Route110_Text_KeepAnEyeOutForRival:
 	.string "PROF. BIRCH: {PLAYER}{KUN}…\p"
 	.string "Please keep an eye out for my {RIVAL}.\n"
 	.string "… … … … … …\p"
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
index 17ecd2be3..4bad754c4 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
@@ -1,14 +1,14 @@
-Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 826EA77
+Route110_SeasideCyclingRoadNorthEntrance_MapScripts::
 	.byte 0
 
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk:: @ 826EA78
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_Clerk::
 	lock
 	faceplayer
 	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck:: @ 826EA84
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck::
 	lockall
 	specialvar VAR_RESULT, GetPlayerAvatarBike
 	compare VAR_RESULT, 0
@@ -18,7 +18,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_BikeCheck:: @ 826EA84
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike:: @ 826EA9F
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike::
 	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter
@@ -26,24 +26,24 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_NoBike:: @ 826EA9F
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter: @ 826EAB4
+Route110_SeasideCyclingRoadNorthEntrance_Movement_PushPlayerBackFromCounter:
 	walk_left
 	step_end
 
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad:: @ 826EAB6
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_ClearCyclingRoad::
 	lockall
 	clearflag FLAG_SYS_CYCLING_ROAD
 	setvar VAR_TEMP_1, 0
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad: @ 826EAC1
+Route110_SeasideCyclingRoadNorthEntrance_Text_GoAllOutOnCyclingRoad:
 	.string "On CYCLING ROAD, you can go all out\n"
 	.string "and cycle as fast as you'd like.\p"
 	.string "It feels great to go that fast, but try\n"
 	.string "not to crash into anyone!$"
 
-Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk: @ 826EB48
+Route110_SeasideCyclingRoadNorthEntrance_Text_TooDangerousToWalk:
 	.string "Sorry, you can't walk on CYCLING\n"
 	.string "ROAD. It's too dangerous.\p"
 	.string "Please come back with a BIKE.$"
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
index 1799f0f5f..92b4b3e44 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
@@ -1,26 +1,26 @@
-Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 826EBA1
+Route110_SeasideCyclingRoadSouthEntrance_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_SeasideCyclingRoadSouthEntrance_OnTransition
 	.byte 0
 
-Route110_SeasideCyclingRoadSouthEntrance_OnTransition: @ 826EBA7
+Route110_SeasideCyclingRoadSouthEntrance_OnTransition:
 	compare VAR_CYCLING_CHALLENGE_STATE, 3
 	call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge
 	compare VAR_CYCLING_CHALLENGE_STATE, 2
 	call_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge
 	end
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge:: @ 826EBBE
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_RestartChallenge::
 	setvar VAR_CYCLING_CHALLENGE_STATE, 1
 	return
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk:: @ 826EBC4
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_Clerk::
 	lock
 	faceplayer
 	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad, MSGBOX_DEFAULT
 	release
 	end
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck:: @ 826EBD0
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck::
 	lockall
 	specialvar VAR_RESULT, GetPlayerAvatarBike
 	compare VAR_RESULT, 2
@@ -32,11 +32,11 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_BikeCheck:: @ 826EBD0
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike:: @ 826EBF6
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_OnMachBike::
 	setvar VAR_CYCLING_CHALLENGE_STATE, 1
 	return
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike:: @ 826EBFC
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike::
 	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk, MSGBOX_DEFAULT
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter
@@ -44,11 +44,11 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_NoBike:: @ 826EBFC
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter: @ 826EC11
+Route110_SeasideCyclingRoadSouthEntrance_Movement_PushPlayerBackFromCounter:
 	walk_left
 	step_end
 
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad:: @ 826EC13
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad::
 	lockall
 	setvar VAR_CYCLING_CHALLENGE_STATE, 0
 	clearflag FLAG_SYS_CYCLING_ROAD
@@ -56,13 +56,13 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_ClearCyclingRoad:: @ 826EC1
 	releaseall
 	end
 
-Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad: @ 826EC23
+Route110_SeasideCyclingRoadSouthEntrance_Text_GoAllOutOnCyclingRoad:
 	.string "On CYCLING ROAD, you can go all out\n"
 	.string "and cycle as fast as you'd like.\p"
 	.string "It feels great to go that fast, but try\n"
 	.string "not to crash into anyone!$"
 
-Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk: @ 826ECAA
+Route110_SeasideCyclingRoadSouthEntrance_Text_TooDangerousToWalk:
 	.string "Sorry, you can't walk on CYCLING\n"
 	.string "ROAD. It's too dangerous.\p"
 	.string "Please come back with a BIKE.$"
diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc
index ad469bc48..ee7791a28 100644
--- a/data/maps/Route110_TrickHouseCorridor/scripts.inc
+++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc
@@ -1,8 +1,8 @@
-Route110_TrickHouseCorridor_MapScripts:: @ 826B903
+Route110_TrickHouseCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseCorridor_OnTransition
 	.byte 0
 
-Route110_TrickHouseCorridor_OnTransition: @ 826B909
+Route110_TrickHouseCorridor_OnTransition:
 	setvar VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 1
 	end
 
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index 8e1ffdeb2..9167cbd34 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -1,48 +1,48 @@
 .set LOCALID_TRICK_MASTER, 1
 
-Route110_TrickHouseEnd_MapScripts:: @ 826ACAF
+Route110_TrickHouseEnd_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_OnWarp
 	.byte 0
 
-Route110_TrickHouseEnd_OnResume: @ 826ACC4
+Route110_TrickHouseEnd_OnResume:
 	compare VAR_TEMP_1, 1
 	call_if_eq Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile
 	end
 
-Route110_TrickHouseEnd_OnTransition: @ 826ACD0
+Route110_TrickHouseEnd_OnTransition:
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	special SetTrickHouseNuggetFlag
 	end
 
-Route110_TrickHouseEnd_OnWarp: @ 826ACDE
+Route110_TrickHouseEnd_OnWarp:
 	map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_SetTrickMasterPos
 	.2byte 0
 
-Route110_TrickHouseEnd_EventScript_SetTrickMasterPos:: @ 826ACE8
+Route110_TrickHouseEnd_EventScript_SetTrickMasterPos::
 	addobject LOCALID_TRICK_MASTER
 	showobjectat LOCALID_TRICK_MASTER, MAP_ROUTE110_TRICK_HOUSE_END
 	turnobject LOCALID_TRICK_MASTER, DIR_EAST
 	end
 
-Route110_TrickHouseEnd_OnFrame: @ 826ACF5
+Route110_TrickHouseEnd_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_CloseDoor
 	.2byte 0
 
-Route110_TrickHouseEnd_EventScript_CloseDoor:: @ 826ACFF
+Route110_TrickHouseEnd_EventScript_CloseDoor::
 	setvar VAR_TEMP_1, 1
 	call Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile
 	special DrawWholeMapView
 	end
 
-Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile:: @ 826AD0D
+Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile::
 	setmetatile 10, 1, METATILE_GenericBuilding_TrickHouse_Door_Closed, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_TrickMaster:: @ 826AD17
+Route110_TrickHouseEnd_EventScript_TrickMaster::
 	lock
 	faceplayer
 	msgbox Route110_TrickHouseEnd_Text_YouveMadeItToMe, MSGBOX_DEFAULT
@@ -58,7 +58,7 @@ Route110_TrickHouseEnd_EventScript_TrickMaster:: @ 826AD17
 	case 7, Route110_TrickHouseEnd_EventScript_CompletedPuzzle8
 	end
 
-Route110_TrickHouseEnd_EventScript_CompletedPuzzle1:: @ 826AD84
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle1::
 	msgbox Route110_TrickHouseEnd_Text_AllNightToPlantTrees, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
@@ -71,7 +71,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle1:: @ 826AD84
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_CompletedPuzzle2:: @ 826ADC0
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle2::
 	msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMaze, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
@@ -84,7 +84,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle2:: @ 826ADC0
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_CompletedPuzzle3:: @ 826ADFC
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle3::
 	msgbox Route110_TrickHouseEnd_Text_AllNightToPreparePanels, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
@@ -97,7 +97,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle3:: @ 826ADFC
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_CompletedPuzzle4:: @ 826AE38
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle4::
 	msgbox Route110_TrickHouseEnd_Text_AllNightToShoveBoulders, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
@@ -110,7 +110,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle4:: @ 826AE38
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_CompletedPuzzle5:: @ 826AE74
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle5::
 	msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
@@ -123,7 +123,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle5:: @ 826AE74
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_CompletedPuzzle6:: @ 826AEB0
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle6::
 	msgbox Route110_TrickHouseEnd_Text_AllNightToInstallDoors, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
@@ -136,7 +136,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle6:: @ 826AEB0
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_CompletedPuzzle7:: @ 826AEEC
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle7::
 	msgbox Route110_TrickHouseEnd_Text_AllNightSettingUpArrows, MSGBOX_DEFAULT
 	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
@@ -149,7 +149,7 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle7:: @ 826AEEC
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_CompletedPuzzle8:: @ 826AF28
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle8::
 	msgbox Route110_TrickHouseEnd_Text_AllNightPolishingFloors, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_SOUTH
@@ -177,21 +177,21 @@ Route110_TrickHouseEnd_EventScript_CompletedPuzzle8:: @ 826AF28
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_ChooseTent:: @ 826AFA5
+Route110_TrickHouseEnd_EventScript_ChooseTent::
 	multichoice 0, 0, MULTI_TENT, TRUE
 	switch VAR_RESULT
 	case 0, Route110_TrickHouseEnd_EventScript_GiveRedTent
 	goto Route110_TrickHouseEnd_EventScript_GiveBlueTent
 
-Route110_TrickHouseEnd_EventScript_GiveRedTent:: @ 826AFBF
+Route110_TrickHouseEnd_EventScript_GiveRedTent::
 	givedecoration DECOR_RED_TENT
 	return
 
-Route110_TrickHouseEnd_EventScript_GiveBlueTent:: @ 826AFC7
+Route110_TrickHouseEnd_EventScript_GiveBlueTent::
 	givedecoration DECOR_BLUE_TENT
 	return
 
-Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 826AFCF
+Route110_TrickHouseEnd_EventScript_TrickMasterExit::
 	applymovement LOCALID_TRICK_MASTER, Route110_TrickHouse_Movement_TrickMasterSpin
 	waitmovement 0
 	playse SE_M_EXPLOSION
@@ -201,39 +201,39 @@ Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 826AFCF
 	addvar VAR_TRICK_HOUSE_LEVEL, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_BagFull:: @ 826AFEF
+Route110_TrickHouseEnd_EventScript_BagFull::
 	call Common_EventScript_BagIsFull
 	msgbox Route110_TrickHouseEnd_Text_NoRoomForThis, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_NoRoomForTent:: @ 826B002
+Route110_TrickHouseEnd_EventScript_NoRoomForTent::
 	call Common_EventScript_NoRoomForDecor
 	msgbox Route110_TrickHouseEnd_Text_NoRoomInPC, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth:: @ 826B015
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth::
 	applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth:: @ 826B020
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth::
 	applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest:: @ 826B02B
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest::
 	applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast:: @ 826B036
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast::
 	applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041
+Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger::
 	lockall
 	turnobject LOCALID_TRICK_MASTER, DIR_WEST
 	playse SE_PIN
@@ -254,70 +254,70 @@ Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041
 	releaseall
 	end
 
-Route110_TrickHouseEnd_Movement_KeepPlayerInRoom: @ 826B089
+Route110_TrickHouseEnd_Movement_KeepPlayerInRoom:
 	walk_down
 	step_end
 
-Route110_TrickHouseEnd_Movement_TrickMasterSurprise: @ 826B08B
+Route110_TrickHouseEnd_Movement_TrickMasterSurprise:
 	jump_in_place_left
 	step_end
 
-Route110_TrickHouseEnd_Text_YouveMadeItToMe: @ 826B08D
+Route110_TrickHouseEnd_Text_YouveMadeItToMe:
 	.string "Aak!\n"
 	.string "You've made it to me?\l"
 	.string "Hmmm… You're sharp!$"
 
-Route110_TrickHouseEnd_Text_AllNightToPlantTrees: @ 826B0BC
+Route110_TrickHouseEnd_Text_AllNightToPlantTrees:
 	.string "It took me all night to plant all those\n"
 	.string "trees…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three, four, five, six places!$"
 
-Route110_TrickHouseEnd_Text_AllNightToMakeMaze: @ 826B13B
+Route110_TrickHouseEnd_Text_AllNightToMakeMaze:
 	.string "It took me all night to make the maze…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three, four, five places!$"
 
-Route110_TrickHouseEnd_Text_AllNightToPreparePanels: @ 826B1AD
+Route110_TrickHouseEnd_Text_AllNightToPreparePanels:
 	.string "It took me all night to prepare\n"
 	.string "the wall panels…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three, four places!$"
 
-Route110_TrickHouseEnd_Text_AllNightToShoveBoulders: @ 826B223
+Route110_TrickHouseEnd_Text_AllNightToShoveBoulders:
 	.string "It took me all night to shove in those\n"
 	.string "boulders…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three places!$"
 
-Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls: @ 826B293
+Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls:
 	.string "It took me all night to make MECHADOLLS\n"
 	.string "and another to think up the quiz…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two places!$"
 
-Route110_TrickHouseEnd_Text_AllNightToInstallDoors: @ 826B315
+Route110_TrickHouseEnd_Text_AllNightToInstallDoors:
 	.string "It took me all night to install\n"
 	.string "the doors…\p"
 	.string "You're almost my equal in greatness!$"
 
-Route110_TrickHouseEnd_Text_AllNightSettingUpArrows: @ 826B365
+Route110_TrickHouseEnd_Text_AllNightSettingUpArrows:
 	.string "It took me all night setting up arrows…\p"
 	.string "You're my equal in greatness!$"
 
-Route110_TrickHouseEnd_Text_AllNightPolishingFloors: @ 826B3AB
+Route110_TrickHouseEnd_Text_AllNightPolishingFloors:
 	.string "It took me all night polishing floors…\p"
 	.string "You're above me in greatness!\n"
 	.string "Possibly…$"
 
-Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry: @ 826B3FA
+Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry:
 	.string "Wh-what should I do?\n"
 	.string "My fountain of ideas for tricks has\l"
 	.string "run dry…\p"
 	.string "Perhaps it is time I toured the country\n"
 	.string "on a quest to devise new tricks…$"
 
-Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent: @ 826B485
+Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent:
 	.string "I hate to admit defeat, but you have\n"
 	.string "bested me!\p"
 	.string "Still, you must have been reeled in by\n"
@@ -333,13 +333,13 @@ Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent: @ 826B485
 	.string "a RED TENT and a BLUE TENT.\l"
 	.string "Which do you prefer?$"
 
-Route110_TrickHouseEnd_Text_NoRoomInPC: @ 826B615
+Route110_TrickHouseEnd_Text_NoRoomInPC:
 	.string "What? No room in your PC?\n"
 	.string "What am I to make of that?\p"
 	.string "I wish I could say that, but I am much\n"
 	.string "too kind and caring, so come back later!$"
 
-Route110_TrickHouseEnd_Text_LeavingOnJourney: @ 826B69A
+Route110_TrickHouseEnd_Text_LeavingOnJourney:
 	.string "… … … … … …\p"
 	.string "I am leaving on a journey of discovery.\n"
 	.string "A quest in search of new tricks.\p"
@@ -347,17 +347,17 @@ Route110_TrickHouseEnd_Text_LeavingOnJourney: @ 826B69A
 	.string "entertain me again.\p"
 	.string "And now, farewell!$"
 
-Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward: @ 826B73D
+Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward:
 	.string "Fine!\n"
 	.string "You have earned this reward!$"
 
-Route110_TrickHouseEnd_Text_NoRoomForThis: @ 826B760
+Route110_TrickHouseEnd_Text_NoRoomForThis:
 	.string "What? Have you no room for this?\n"
 	.string "What manner of items do you carry?\p"
 	.string "But fine, since you've reached me,\n"
 	.string "your reward will be with me till later.$"
 
-Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou: @ 826B7EF
+Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou:
 	.string "Scrub that smug smirk from your face!\n"
 	.string "It's much too early to think you've won!\p"
 	.string "I'll make new tricks to stump you, I will.\n"
@@ -365,7 +365,7 @@ Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou: @ 826B7EF
 	.string "Come back for the next exciting\n"
 	.string "installment!$"
 
-Route110_TrickHouseEnd_Text_YoureIgnoringMe: @ 826B8BD
+Route110_TrickHouseEnd_Text_YoureIgnoringMe:
 	.string "Now, now! You're ignoring me now?\n"
 	.string "Now that, I consider heartbreaking!$"
 
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index 4df752dc1..9375f2046 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -1,6 +1,6 @@
 .set LOCALID_TRICK_MASTER, 1
 
-Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
+Route110_TrickHouseEntrance_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_OnWarp
@@ -15,7 +15,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
 	@ 5: Completed previous challenge
 	@ 6: 'Trick Master' mechadoll ready to give Tent reward from final challenge (if bag was full)
 
-Route110_TrickHouseEntrance_OnTransition: @ 8269A60
+Route110_TrickHouseEntrance_OnTransition:
 	setflag FLAG_LANDMARK_TRICK_HOUSE
 	compare VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 1
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_EnterFromCorridor
@@ -36,24 +36,24 @@ Route110_TrickHouseEntrance_OnTransition: @ 8269A60
 	case 4, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetReadyToGiveReward:: @ 8269AD7
+Route110_TrickHouseEntrance_EventScript_SetReadyToGiveReward::
 	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	compare VAR_TRICK_HOUSE_LEVEL, 8
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 2
 	end
 
-Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward:: @ 8269AED
+Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward::
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 6
 	end
 
-Route110_TrickHouseEntrance_EventScript_EnterFromCorridor:: @ 8269AF3
+Route110_TrickHouseEntrance_EventScript_EnterFromCorridor::
 	setvar VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 0
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 5
 	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle:: @ 8269B03
+Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle::
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0
 	compare VAR_TRICK_HOUSE_LEVEL, 1
 	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2
@@ -73,63 +73,63 @@ Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle:: @ 8269B03
 	call_if_eq Route110_TrickHouseEntrance_EventScript_FinishedPuzzles
 	return
 
-Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2:: @ 8269B61
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2::
 	call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle3:: @ 8269B6B
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle3::
 	call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle4:: @ 8269B75
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle4::
 	call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle5:: @ 8269B7F
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle5::
 	call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle6:: @ 8269B89
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle6::
 	call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle7:: @ 8269B93
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle7::
 	call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle8:: @ 8269B9D
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle8::
 	call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_FinishedPuzzles:: @ 8269BA7
+Route110_TrickHouseEntrance_EventScript_FinishedPuzzles::
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 4
 	return
 
-Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle:: @ 8269BAD
+Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle::
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3
 	return
 
-Route110_TrickHouseEntrance_EventScript_MoveTrickMasterToDoor:: @ 8269BB3
+Route110_TrickHouseEntrance_EventScript_MoveTrickMasterToDoor::
 	setobjectxyperm LOCALID_TRICK_MASTER, 5, 2
 	end
 
-Route110_TrickHouseEntrance_EventScript_ReadyBeingWatchedTrigger:: @ 8269BBB
+Route110_TrickHouseEntrance_EventScript_ReadyBeingWatchedTrigger::
 	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 0
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched1:: @ 8269BC1
+Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched1::
 	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched2:: @ 8269BC7
+Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched2::
 	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3:: @ 8269BCD
+Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3::
 	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_OnWarp: @ 8269BD3
+Route110_TrickHouseEntrance_OnWarp:
 	map_script_2 VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1, Route110_TrickHouseEntrance_EventScript_TrickMasterFound
 	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot
 	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 1, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster
@@ -140,14 +140,14 @@ Route110_TrickHouseEntrance_OnWarp: @ 8269BD3
 	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 6, Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor
 	.2byte 0
 
-Route110_TrickHouseEntrance_EventScript_TrickMasterFound:: @ 8269C15
+Route110_TrickHouseEntrance_EventScript_TrickMasterFound::
 	addobject LOCALID_TRICK_MASTER
 	showobjectat LOCALID_TRICK_MASTER, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
 	turnobject LOCALID_TRICK_MASTER, DIR_EAST
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_WEST
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot:: @ 8269C26
+Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot::
 	addobject LOCALID_TRICK_MASTER
 	hideobjectat LOCALID_TRICK_MASTER, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
 	switch VAR_TRICK_HOUSE_LEVEL
@@ -161,59 +161,59 @@ Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot:: @ 8269C26
 	case 7, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle1:: @ 8269C8C
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle1::
 	setobjectxy LOCALID_TRICK_MASTER, 6, 3
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle2:: @ 8269C94
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle2::
 	setobjectxy LOCALID_TRICK_MASTER, 11, 5
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle3:: @ 8269C9C
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle3::
 	setobjectxy LOCALID_TRICK_MASTER, 9, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle4:: @ 8269CA4
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle4::
 	setobjectxy LOCALID_TRICK_MASTER, 3, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle5:: @ 8269CAC
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle5::
 	setobjectxy LOCALID_TRICK_MASTER, 0, 5
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle6:: @ 8269CB4
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle6::
 	setobjectxy LOCALID_TRICK_MASTER, 11, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle7:: @ 8269CBC
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle7::
 	setobjectxy LOCALID_TRICK_MASTER, 8, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8:: @ 8269CC4
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8::
 	setobjectxy LOCALID_TRICK_MASTER, 4, 4
 	end
 
-Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster:: @ 8269CCC
+Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster::
 	removeobject LOCALID_TRICK_MASTER
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor:: @ 8269CD0
+Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor::
 	addobject LOCALID_TRICK_MASTER
 	setobjectxy LOCALID_TRICK_MASTER, 5, 2
 	turnobject LOCALID_TRICK_MASTER, DIR_NORTH
 	end
 
-Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor:: @ 8269CDF
+Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor::
 	addobject LOCALID_TRICK_MASTER
 	setobjectxy LOCALID_TRICK_MASTER, 5, 2
 	turnobject LOCALID_TRICK_MASTER, DIR_SOUTH
 	end
 
-Route110_TrickHouseEntrance_OnFrame: @ 8269CEE
+Route110_TrickHouseEntrance_OnFrame:
 	map_script_2 VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1, Route110_TrickHouseEntrance_EventScript_BeginChallenge
 	.2byte 0
 
-Route110_TrickHouseEntrance_EventScript_BeginChallenge:: @ 8269CF8
+Route110_TrickHouseEntrance_EventScript_BeginChallenge::
 	lockall
 	delay 20
 	compare VAR_TRICK_HOUSE_LEVEL, 0
@@ -232,11 +232,11 @@ Route110_TrickHouseEntrance_EventScript_BeginChallenge:: @ 8269CF8
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_UnusedRelease:: @ 8269D39
+Route110_TrickHouseEntrance_EventScript_UnusedRelease::
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_TrickMaster:: @ 8269D3B
+Route110_TrickHouseEntrance_EventScript_TrickMaster::
 	lockall
 	switch VAR_TRICK_HOUSE_ENTRANCE_STATE
 	case 0, Route110_TrickHouseEntrance_EventScript_FoundTrickMaster
@@ -245,7 +245,7 @@ Route110_TrickHouseEntrance_EventScript_TrickMaster:: @ 8269D3B
 	case 6, Route110_TrickHouseEntrance_EventScript_MechadollReward
 	end
 
-Route110_TrickHouseEntrance_EventScript_FoundTrickMaster:: @ 8269D6E
+Route110_TrickHouseEntrance_EventScript_FoundTrickMaster::
 	playse SE_PIN
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -274,39 +274,39 @@ Route110_TrickHouseEntrance_EventScript_FoundTrickMaster:: @ 8269D6E
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk:: @ 8269DEE
+Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk::
 	msgbox Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_FoundBehindTree:: @ 8269DF7
+Route110_TrickHouseEntrance_EventScript_FoundBehindTree::
 	msgbox Route110_TrickHouseEntrance_Text_ConcealedBehindTree, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_FoundInDresser:: @ 8269E00
+Route110_TrickHouseEntrance_EventScript_FoundInDresser::
 	msgbox Route110_TrickHouseEntrance_Text_ConcealedInDresser, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_FoundBeyondWindow:: @ 8269E09
+Route110_TrickHouseEntrance_EventScript_FoundBeyondWindow::
 	msgbox Route110_TrickHouseEntrance_Text_ConealedBeyondWindow, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_FoundInPlanter:: @ 8269E12
+Route110_TrickHouseEntrance_EventScript_FoundInPlanter::
 	msgbox Route110_TrickHouseEntrance_Text_ConcealedInPlanter, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_FoundInCupboard:: @ 8269E1B
+Route110_TrickHouseEntrance_EventScript_FoundInCupboard::
 	msgbox Route110_TrickHouseEntrance_Text_ConcealedInCupboard, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_FoundBehindWindow:: @ 8269E24
+Route110_TrickHouseEntrance_EventScript_FoundBehindWindow::
 	msgbox Route110_TrickHouseEntrance_Text_ConcealedBehindWindow, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion:: @ 8269E2D
+Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion::
 	msgbox Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouse_Movement_TrickMasterSpin: @ 8269E36
+Route110_TrickHouse_Movement_TrickMasterSpin:
 	face_up
 	delay_4
 	face_left
@@ -317,7 +317,7 @@ Route110_TrickHouse_Movement_TrickMasterSpin: @ 8269E36
 	delay_4
 	step_end
 
-Route110_TrickHouse_Movement_TrickMasterJumpAway: @ 8269E3F
+Route110_TrickHouse_Movement_TrickMasterJumpAway:
 	face_up
 	disable_anim
 	slide_up
@@ -328,11 +328,11 @@ Route110_TrickHouse_Movement_TrickMasterJumpAway: @ 8269E3F
 	slide_up
 	step_end
 
-Route110_TrickHouseEntrance_EventScript_MeetTrickMaster:: @ 8269E48
+Route110_TrickHouseEntrance_EventScript_MeetTrickMaster::
 	msgbox Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle:: @ 8269E51
+Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle::
 	msgbox Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_TRICK_MASTER, Common_Movement_FacePlayer
@@ -348,7 +348,7 @@ Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle:: @ 8269E51
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_GiveReward:: @ 8269E8F
+Route110_TrickHouseEntrance_EventScript_GiveReward::
 	applymovement LOCALID_TRICK_MASTER, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward, MSGBOX_DEFAULT
@@ -368,7 +368,7 @@ Route110_TrickHouseEntrance_EventScript_GiveReward:: @ 8269E8F
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward
 	end
 
-Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF
+Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward::
 	giveitem ITEM_RARE_CANDY
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
@@ -378,7 +378,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B
+Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward::
 	giveitem ITEM_TIMER_BALL
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
@@ -388,7 +388,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47
+Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward::
 	giveitem ITEM_HARD_STONE
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
@@ -398,7 +398,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73
+Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward::
 	giveitem ITEM_SMOKE_BALL
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
@@ -408,7 +408,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F
+Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward::
 	giveitem ITEM_TM12
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
@@ -418,7 +418,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB
+Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward::
 	giveitem ITEM_MAGNET
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
@@ -428,7 +428,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward:: @ 8269FF7
+Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward::
 	giveitem ITEM_PP_MAX
 	compare VAR_RESULT, TRUE
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
@@ -438,7 +438,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward:: @ 8269FF7
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_GotReward:: @ 826A023
+Route110_TrickHouseEntrance_EventScript_GotReward::
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3
 	applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestUp
@@ -446,7 +446,7 @@ Route110_TrickHouseEntrance_EventScript_GotReward:: @ 826A023
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_MechadollReward:: @ 826A039
+Route110_TrickHouseEntrance_EventScript_MechadollReward::
 	applymovement LOCALID_TRICK_MASTER, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox Route110_TrickHouseEntrance_Text_MechadollWhichTent, MSGBOX_DEFAULT
@@ -459,21 +459,21 @@ Route110_TrickHouseEntrance_EventScript_MechadollReward:: @ 826A039
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_ChooseTent:: @ 826A070
+Route110_TrickHouseEntrance_EventScript_ChooseTent::
 	multichoice 0, 0, MULTI_TENT, TRUE
 	switch VAR_RESULT
 	case 0, Route110_TrickHouseEntrance_EventScript_GiveRedTent
 	goto Route110_TrickHouseEntrance_EventScript_GiveBlueTent
 
-Route110_TrickHouseEntrance_EventScript_GiveRedTent:: @ 826A08A
+Route110_TrickHouseEntrance_EventScript_GiveRedTent::
 	givedecoration DECOR_RED_TENT
 	return
 
-Route110_TrickHouseEntrance_EventScript_GiveBlueTent:: @ 826A092
+Route110_TrickHouseEntrance_EventScript_GiveBlueTent::
 	givedecoration DECOR_BLUE_TENT
 	return
 
-Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A
+Route110_TrickHouseEntrance_EventScript_ReceivedTent::
 	msgbox Route110_TrickHouseEntrance_Text_ThenFarewell, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_TRICK_MASTER, Route110_TrickHousePuzzle5_Movement_MechadollShake
@@ -489,7 +489,7 @@ Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_Door:: @ 826A0D3
+Route110_TrickHouseEntrance_EventScript_Door::
 	lockall
 	switch VAR_TRICK_HOUSE_ENTRANCE_STATE
 	case 0, Route110_TrickHouseEntrance_EventScript_ItsAScroll
@@ -498,12 +498,12 @@ Route110_TrickHouseEntrance_EventScript_Door:: @ 826A0D3
 	case 5, Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage
 	end
 
-Route110_TrickHouseEntrance_EventScript_ItsAScroll:: @ 826A106
+Route110_TrickHouseEntrance_EventScript_ItsAScroll::
 	msgbox Route110_TrickHouseEntrance_Text_ItsAScroll, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_GoInHolePrompt:: @ 826A110
+Route110_TrickHouseEntrance_EventScript_GoInHolePrompt::
 	msgbox Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll, MSGBOX_YESNO
 	closemessage
 	compare VAR_RESULT, YES
@@ -511,7 +511,7 @@ Route110_TrickHouseEntrance_EventScript_GoInHolePrompt:: @ 826A110
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom:: @ 826A126
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom::
 	setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0
 	special DrawWholeMapView
 	delay 20
@@ -530,76 +530,76 @@ Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom:: @ 826A126
 	case 7, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8
 	end
 
-Route110_TrickHouseEntrance_Movement_EnterRoom: @ 826A1A7
+Route110_TrickHouseEntrance_Movement_EnterRoom:
 	set_invisible
 	step_end
 
-Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1:: @ 826A1A9
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1::
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2:: @ 826A1B4
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2::
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3:: @ 826A1BF
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3::
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4:: @ 826A1CA
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4::
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5:: @ 826A1D5
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5::
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6:: @ 826A1E0
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6::
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7:: @ 826A1EB
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7::
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8:: @ 826A1F6
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8::
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote:: @ 826A201
+Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote::
 	msgbox Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage:: @ 826A20B
+Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage::
 	compare VAR_TRICK_HOUSE_LEVEL, 8
 	goto_if_eq Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2
 	msgbox Route110_TrickHouseEntrance_Text_ItsAScroll, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2:: @ 826A220
+Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2::
 	msgbox Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHousePuzzle_EventScript_Door:: @ 826A22A
+Route110_TrickHousePuzzle_EventScript_Door::
 	lockall
 	switch VAR_TRICK_HOUSE_LEVEL
 	case 0, Route110_TrickHousePuzzle1_EventScript_Door
@@ -612,7 +612,7 @@ Route110_TrickHousePuzzle_EventScript_Door:: @ 826A22A
 	case 7, Route110_TrickHousePuzzle8_EventScript_Door
 	end
 
-Route110_TrickHousePuzzle1_EventScript_Door:: @ 826A289
+Route110_TrickHousePuzzle1_EventScript_Door::
 	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
 	msgbox Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
@@ -623,7 +623,7 @@ Route110_TrickHousePuzzle1_EventScript_Door:: @ 826A289
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_Door:: @ 826A2B2
+Route110_TrickHousePuzzle2_EventScript_Door::
 	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
 	msgbox Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
@@ -634,7 +634,7 @@ Route110_TrickHousePuzzle2_EventScript_Door:: @ 826A2B2
 	releaseall
 	end
 
-Route110_TrickHousePuzzle3_EventScript_Door:: @ 826A2DB
+Route110_TrickHousePuzzle3_EventScript_Door::
 	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
 	msgbox Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
@@ -645,7 +645,7 @@ Route110_TrickHousePuzzle3_EventScript_Door:: @ 826A2DB
 	releaseall
 	end
 
-Route110_TrickHousePuzzle4_EventScript_Door:: @ 826A304
+Route110_TrickHousePuzzle4_EventScript_Door::
 	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
 	msgbox Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
@@ -656,7 +656,7 @@ Route110_TrickHousePuzzle4_EventScript_Door:: @ 826A304
 	releaseall
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Door:: @ 826A32D
+Route110_TrickHousePuzzle5_EventScript_Door::
 	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
 	msgbox Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
@@ -667,7 +667,7 @@ Route110_TrickHousePuzzle5_EventScript_Door:: @ 826A32D
 	releaseall
 	end
 
-Route110_TrickHousePuzzle6_EventScript_Door:: @ 826A356
+Route110_TrickHousePuzzle6_EventScript_Door::
 	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
 	msgbox Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
@@ -678,7 +678,7 @@ Route110_TrickHousePuzzle6_EventScript_Door:: @ 826A356
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Door:: @ 826A37F
+Route110_TrickHousePuzzle7_EventScript_Door::
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
 	msgbox Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
@@ -689,7 +689,7 @@ Route110_TrickHousePuzzle7_EventScript_Door:: @ 826A37F
 	releaseall
 	end
 
-Route110_TrickHousePuzzle8_EventScript_Door:: @ 826A3A8
+Route110_TrickHousePuzzle8_EventScript_Door::
 	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
 	msgbox Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
@@ -700,17 +700,17 @@ Route110_TrickHousePuzzle8_EventScript_Door:: @ 826A3A8
 	releaseall
 	end
 
-Route110_TrickHousePuzzle_EventScript_DoorLocked:: @ 826A3D1
+Route110_TrickHousePuzzle_EventScript_DoorLocked::
 	msgbox Route110_TrickHouseEntrance_Text_DoorLockedWriteSecretCodeHere, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHousePuzzle_EventScript_ReadScrollAgain:: @ 826A3DB
+Route110_TrickHousePuzzle_EventScript_ReadScrollAgain::
 	msgbox Route110_TrickHousePuzzle_Text_SecretCodeWrittenOnIt, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHousePuzzle_EventScript_FoundScroll:: @ 826A3E5
+Route110_TrickHousePuzzle_EventScript_FoundScroll::
 	playfanfare MUS_OBTAIN_ITEM
 	message Route110_TrickHousePuzzle_Text_FoundAScroll
 	waitfanfare
@@ -718,7 +718,7 @@ Route110_TrickHousePuzzle_EventScript_FoundScroll:: @ 826A3E5
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_TrickMasterHiding:: @ 826A3F8
+Route110_TrickHouseEntrance_EventScript_TrickMasterHiding::
 	lockall
 	msgbox Route110_TrickHouseEntrance_Text_YoureBeingWatched, MSGBOX_DEFAULT
 	releaseall
@@ -731,75 +731,75 @@ Route110_TrickHouseEntrance_EventScript_TrickMasterHiding:: @ 826A3F8
 	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle1:: @ 826A429
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle1::
 	setvar VAR_0x8004, 6  @ x
 	setvar VAR_0x8005, 3  @ y
 	call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle
 	return
 
-Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle2:: @ 826A439
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle2::
 	setvar VAR_0x8004, 11  @ x
 	setvar VAR_0x8005, 5   @ y
 	call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle
 	return
 
-Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3:: @ 826A449
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3::
 	setvar VAR_0x8004, 9  @ x
 	setvar VAR_0x8005, 2  @ y
 	call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle
 	return
 
-Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle:: @ 826A459
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle::
 	setvar VAR_0x8006, 0
 	dofieldeffectsparkle VAR_0x8004, VAR_0x8005, VAR_0x8006
 	waitfieldeffect FLDEFF_SPARKLE
 	delay 10
 	return
 
-Route110_TrickHouseEntrance_Text_YoureBeingWatched: @ 826A474
+Route110_TrickHouseEntrance_Text_YoureBeingWatched:
 	.string "You're being watched…$"
 
-Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk: @ 826A48A
+Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk:
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "beneath this desk? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_ConcealedBehindTree: @ 826A4DA
+Route110_TrickHouseEntrance_Text_ConcealedBehindTree:
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "behind this tree? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_ConcealedInDresser: @ 826A529
+Route110_TrickHouseEntrance_Text_ConcealedInDresser:
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "in this dresser? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_ConealedBeyondWindow: @ 826A577
+Route110_TrickHouseEntrance_Text_ConealedBeyondWindow:
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "beyond this window? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_ConcealedInPlanter: @ 826A5C8
+Route110_TrickHouseEntrance_Text_ConcealedInPlanter:
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "in this planter? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_ConcealedInCupboard: @ 826A616
+Route110_TrickHouseEntrance_Text_ConcealedInCupboard:
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "in this cupboard? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_ConcealedBehindWindow: @ 826A665
+Route110_TrickHouseEntrance_Text_ConcealedBehindWindow:
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "behind this window? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion: @ 826A6B6
+Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion:
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "beneath this cushion? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster: @ 826A709
+Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster:
 	.string "Behold!\p"
 	.string "For I am the greatest living mystery\n"
 	.string "of a man in all of HOENN!\l"
@@ -807,7 +807,7 @@ Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster: @ 826A709
 	.string "The TRICK MASTER!\n"
 	.string "Wahahaha! Glad to meet you!$"
 
-Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse: @ 826A78C
+Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse:
 	.string "You, you've come to challenge\n"
 	.string "my TRICK HOUSE, haven't you?\p"
 	.string "That's why you're here, isn't it?\n"
@@ -817,25 +817,25 @@ Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse: @ 826A78C
 	.string "and let your challenge commence!\p"
 	.string "I shall be waiting in the back!$"
 
-Route110_TrickHouseEntrance_Text_ItsAScroll: @ 826A878
+Route110_TrickHouseEntrance_Text_ItsAScroll:
 	.string "It's a scroll.$"
 
-Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll: @ 826A887
+Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll:
 	.string "There is a big hole behind the scroll!\p"
 	.string "Want to go in?$"
 
-Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote: @ 826A8BD
+Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote:
 	.string "There is a note affixed to the scroll…\p"
 	.string "“I am leaving on a journey.\n"
 	.string "Don't look for me. TRICK MASTER”$"
 
-Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick: @ 826A921
+Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick:
 	.string "For the next time, I'll use this trick,\n"
 	.string "and that scheme, and those ruses…\p"
 	.string "Mufufufu… If I may say so, it's\n"
 	.string "brilliantly difficult, even for me!$"
 
-Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges: @ 826A9AF
+Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges:
 	.string "Hah? What?!\n"
 	.string "Oh, it's you!\p"
 	.string "I'm in the midst of devising new tricky\n"
@@ -845,42 +845,42 @@ Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges: @ 826A9AF
 	.string "You wouldn't begrudge me that?\l"
 	.string "Come back in a little while!$"
 
-Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward: @ 826AA82
+Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward:
 	.string "Ah, it's you! You're here to accept the\n"
 	.string "reward from before, isn't that right?\l"
 	.string "Yes, right I am!\p"
 	.string "Here!\n"
 	.string "I'll give it to you now!$"
 
-Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward: @ 826AB00
+Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward:
 	.string "Hah?\n"
 	.string "Did you not come to claim your reward?$"
 
-Route110_TrickHouseEntrance_Text_MechadollWhichTent: @ 826AB2C
+Route110_TrickHouseEntrance_Text_MechadollWhichTent:
 	.string "MECHADOLL 5 I AM!\n"
 	.string "IF REWARD IS NOT TAKEN BY YOU,\l"
 	.string "THEN TRICK MASTER YOU CANNOT FOLLOW.\p"
 	.string "RED TENT OR BLUE TENT,\n"
 	.string "WHICH DO YOU PREFER?$"
 
-Route110_TrickHouseEntrance_Text_ThenFarewell: @ 826ABAE
+Route110_TrickHouseEntrance_Text_ThenFarewell:
 	.string "THEN FAREWELL.$"
 
-Route110_TrickHouseEntrance_Text_PCFullAgain: @ 826ABBD
+Route110_TrickHouseEntrance_Text_PCFullAgain:
 	.string "YOUR PC STATUS: FULL AGAIN.\n"
 	.string "MEAN, YOU ARE.$"
 
-Route110_TrickHousePuzzle_Text_FoundAScroll: @ 826ABE8
+Route110_TrickHousePuzzle_Text_FoundAScroll:
 	.string "{PLAYER} found a scroll.$"
 
-Route110_TrickHousePuzzle_Text_MemorizedSecretCode: @ 826ABFB
+Route110_TrickHousePuzzle_Text_MemorizedSecretCode:
 	.string "{PLAYER} memorized the secret code\n"
 	.string "written on the scroll.$"
 
-Route110_TrickHousePuzzle_Text_SecretCodeWrittenOnIt: @ 826AC2F
+Route110_TrickHousePuzzle_Text_SecretCodeWrittenOnIt:
 	.string "A secret code is written on it.$"
 
-Route110_TrickHouseEntrance_Text_DoorLockedWriteSecretCodeHere: @ 826AC4F
+Route110_TrickHouseEntrance_Text_DoorLockedWriteSecretCodeHere:
 	.string "The door is locked.\p"
 	.string "…On closer inspection, this is written\n"
 	.string "on it: “Write the secret code here.”$"
diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index 3797ec29d..6fc6adcd5 100644
--- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
@@ -1,79 +1,79 @@
-Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F
+Route110_TrickHousePuzzle1_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_OnLoad
 	.byte 0
 
-Route110_TrickHousePuzzle1_OnLoad: @ 826B915
+Route110_TrickHousePuzzle1_OnLoad:
 	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
 	goto_if_eq Route110_TrickHousePuzzle1_EventScript_OpenDoor
 	end
 
-Route110_TrickHousePuzzle1_EventScript_OpenDoor:: @ 826B921
+Route110_TrickHousePuzzle1_EventScript_OpenDoor::
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	end
 
-Route110_TrickHousePuzzle1_EventScript_Scroll:: @ 826B92B
+Route110_TrickHousePuzzle1_EventScript_Scroll::
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle1_EventScript_FoundScroll
 	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle1_EventScript_FoundScroll:: @ 826B93D
+Route110_TrickHousePuzzle1_EventScript_FoundScroll::
 	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1
 	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle1_EventScript_Sally:: @ 826B948
+Route110_TrickHousePuzzle1_EventScript_Sally::
 	trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_SallyIntro, Route110_TrickHousePuzzle1_Text_SallyDefeat
 	msgbox Route110_TrickHousePuzzle1_Text_SallyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle1_EventScript_Eddie:: @ 826B95F
+Route110_TrickHousePuzzle1_EventScript_Eddie::
 	trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_EddieIntro, Route110_TrickHousePuzzle1_Text_EddieDefeat
 	msgbox Route110_TrickHousePuzzle1_Text_EddiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle1_EventScript_Robin:: @ 826B976
+Route110_TrickHousePuzzle1_EventScript_Robin::
 	trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_RobinIntro, Route110_TrickHousePuzzle1_Text_RobinDefeat
 	msgbox Route110_TrickHousePuzzle1_Text_RobinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened:: @ 826B98D
+Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened::
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is fabulous.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle1_Text_SallyIntro: @ 826B9FB
+Route110_TrickHousePuzzle1_Text_SallyIntro:
 	.string "I'll hack and slash my way to victory\n"
 	.string "with the CUT we just learned!$"
 
-Route110_TrickHousePuzzle1_Text_SallyDefeat: @ 826BA3F
+Route110_TrickHousePuzzle1_Text_SallyDefeat:
 	.string "Why are you so serious?$"
 
-Route110_TrickHousePuzzle1_Text_SallyPostBattle: @ 826BA57
+Route110_TrickHousePuzzle1_Text_SallyPostBattle:
 	.string "I never get tired of hacking\n"
 	.string "and slashing!$"
 
-Route110_TrickHousePuzzle1_Text_EddieIntro: @ 826BA82
+Route110_TrickHousePuzzle1_Text_EddieIntro:
 	.string "I wandered into this weird house\n"
 	.string "by accident…$"
 
-Route110_TrickHousePuzzle1_Text_EddieDefeat: @ 826BAB0
+Route110_TrickHousePuzzle1_Text_EddieDefeat:
 	.string "And now I've lost…$"
 
-Route110_TrickHousePuzzle1_Text_EddiePostBattle: @ 826BAC3
+Route110_TrickHousePuzzle1_Text_EddiePostBattle:
 	.string "I lost my way, I lost a battle, and I'm\n"
 	.string "now even more lost… I can't get out…$"
 
-Route110_TrickHousePuzzle1_Text_RobinIntro: @ 826BB10
+Route110_TrickHousePuzzle1_Text_RobinIntro:
 	.string "Just who is the TRICK MASTER?$"
 
-Route110_TrickHousePuzzle1_Text_RobinDefeat: @ 826BB2E
+Route110_TrickHousePuzzle1_Text_RobinDefeat:
 	.string "I lost while I was lost in thought!$"
 
-Route110_TrickHousePuzzle1_Text_RobinPostBattle: @ 826BB52
+Route110_TrickHousePuzzle1_Text_RobinPostBattle:
 	.string "You're strong!\n"
 	.string "Just who are you?$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index 2b65ca95c..a0222733a 100644
--- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
@@ -1,9 +1,9 @@
-Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73
+Route110_TrickHousePuzzle2_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_OnTransition
 	.byte 0
 
-Route110_TrickHousePuzzle2_OnResume: @ 826BB7E
+Route110_TrickHousePuzzle2_OnResume:
 	compare VAR_TEMP_1, 1
 	call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton1
 	compare VAR_TEMP_2, 1
@@ -14,26 +14,26 @@ Route110_TrickHousePuzzle2_OnResume: @ 826BB7E
 	call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton4
 	end
 
-Route110_TrickHousePuzzle2_OnTransition: @ 826BBAB
+Route110_TrickHousePuzzle2_OnTransition:
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
 	setvar VAR_TEMP_4, 0
 	end
 
-Route110_TrickHousePuzzle2_EventScript_Scroll:: @ 826BBC0
+Route110_TrickHousePuzzle2_EventScript_Scroll::
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle2_EventScript_FoundScroll
 	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle2_EventScript_FoundScroll:: @ 826BBD2
+Route110_TrickHousePuzzle2_EventScript_FoundScroll::
 	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1
 	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle2_EventScript_Button1:: @ 826BBDD
+Route110_TrickHousePuzzle2_EventScript_Button1::
 	lockall
 	setvar VAR_TEMP_1, 1
 	playse SE_PIN
@@ -42,7 +42,7 @@ Route110_TrickHousePuzzle2_EventScript_Button1:: @ 826BBDD
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_Button2:: @ 826BBF0
+Route110_TrickHousePuzzle2_EventScript_Button2::
 	lockall
 	setvar VAR_TEMP_2, 1
 	playse SE_PIN
@@ -51,7 +51,7 @@ Route110_TrickHousePuzzle2_EventScript_Button2:: @ 826BBF0
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_Button3:: @ 826BC03
+Route110_TrickHousePuzzle2_EventScript_Button3::
 	lockall
 	setvar VAR_TEMP_3, 1
 	playse SE_PIN
@@ -60,7 +60,7 @@ Route110_TrickHousePuzzle2_EventScript_Button3:: @ 826BC03
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_Button4:: @ 826BC16
+Route110_TrickHousePuzzle2_EventScript_Button4::
 	lockall
 	setvar VAR_TEMP_4, 1
 	playse SE_PIN
@@ -69,78 +69,78 @@ Route110_TrickHousePuzzle2_EventScript_Button4:: @ 826BC16
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_PressButton1:: @ 826BC29
+Route110_TrickHousePuzzle2_EventScript_PressButton1::
 	setmetatile 11, 12, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 1, 13, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_PressButton2:: @ 826BC3C
+Route110_TrickHousePuzzle2_EventScript_PressButton2::
 	setmetatile 0, 4, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 5, 6, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_PressButton3:: @ 826BC4F
+Route110_TrickHousePuzzle2_EventScript_PressButton3::
 	setmetatile 14, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 7, 15, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_PressButton4:: @ 826BC62
+Route110_TrickHousePuzzle2_EventScript_PressButton4::
 	setmetatile 7, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 14, 12, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_Ted:: @ 826BC75
+Route110_TrickHousePuzzle2_EventScript_Ted::
 	trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_TedIntro, Route110_TrickHousePuzzle2_Text_TedDefeat
 	msgbox Route110_TrickHousePuzzle2_Text_TedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle2_EventScript_Paul:: @ 826BC8C
+Route110_TrickHousePuzzle2_EventScript_Paul::
 	trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_PaulIntro, Route110_TrickHousePuzzle2_Text_PaulDefeat
 	msgbox Route110_TrickHousePuzzle2_Text_PaulPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle2_EventScript_Georgia:: @ 826BCA3
+Route110_TrickHousePuzzle2_EventScript_Georgia::
 	trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_GeorgiaIntro, Route110_TrickHousePuzzle2_Text_GeorgiaDefeat
 	msgbox Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened: @ 826BCBA
+Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened:
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is smart.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle2_Text_TedIntro: @ 826BD25
+Route110_TrickHousePuzzle2_Text_TedIntro:
 	.string "Which switch closes which hole?$"
 
-Route110_TrickHousePuzzle2_Text_TedDefeat: @ 826BD45
+Route110_TrickHousePuzzle2_Text_TedDefeat:
 	.string "After that battle, I'm even more\n"
 	.string "confused!$"
 
-Route110_TrickHousePuzzle2_Text_TedPostBattle: @ 826BD70
+Route110_TrickHousePuzzle2_Text_TedPostBattle:
 	.string "Can I get you to push all the buttons\n"
 	.string "for me?$"
 
-Route110_TrickHousePuzzle2_Text_PaulIntro: @ 826BD9E
+Route110_TrickHousePuzzle2_Text_PaulIntro:
 	.string "Oh! You're on your second TRICK HOUSE\n"
 	.string "challenge!$"
 
-Route110_TrickHousePuzzle2_Text_PaulDefeat: @ 826BDCF
+Route110_TrickHousePuzzle2_Text_PaulDefeat:
 	.string "You're good at battling too?$"
 
-Route110_TrickHousePuzzle2_Text_PaulPostBattle: @ 826BDEC
+Route110_TrickHousePuzzle2_Text_PaulPostBattle:
 	.string "The TRICK MASTER rigged all the tricks\n"
 	.string "in this house all by himself.$"
 
-Route110_TrickHousePuzzle2_Text_GeorgiaIntro: @ 826BE31
+Route110_TrickHousePuzzle2_Text_GeorgiaIntro:
 	.string "I want to make my own GYM one day.\n"
 	.string "So, I'm studying how to set traps.$"
 
-Route110_TrickHousePuzzle2_Text_GeorgiaDefeat: @ 826BE77
+Route110_TrickHousePuzzle2_Text_GeorgiaDefeat:
 	.string "I didn't study battling enough!$"
 
-Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle: @ 826BE97
+Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle:
 	.string "You're strong, aren't you?\n"
 	.string "Maybe even enough to be a GYM LEADER!$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index ddad0d549..4e706268c 100644
--- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
@@ -1,9 +1,9 @@
-Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8
+Route110_TrickHousePuzzle3_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_OnTransition
 	.byte 0
 
-Route110_TrickHousePuzzle3_OnResume: @ 826BEE3
+Route110_TrickHousePuzzle3_OnResume:
 	call Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles
 	compare VAR_TEMP_9, 0
 	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState0
@@ -11,7 +11,7 @@ Route110_TrickHousePuzzle3_OnResume: @ 826BEE3
 	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState1
 	end
 
-Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF
+Route110_TrickHousePuzzle3_OnTransition:
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
@@ -20,7 +20,7 @@ Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF
 	setvar VAR_TEMP_9, 0
 	end
 
-Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles:: @ 826BF1E
+Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles::
 	setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Up, 0
 	setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Up, 0
 	setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Up, 0
@@ -35,23 +35,23 @@ Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles:: @ 826BF1E
 	call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile
 	return
 
-Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile:: @ 826BF6F
+Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile::
 	setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile:: @ 826BF79
+Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile::
 	setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile:: @ 826BF83
+Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile::
 	setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile:: @ 826BF8D
+Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile::
 	setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_SetDoorsState0:: @ 826BF97
+Route110_TrickHousePuzzle3_EventScript_SetDoorsState0::
 	setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
 	setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
 	setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
@@ -128,7 +128,7 @@ Route110_TrickHousePuzzle3_EventScript_SetDoorsState0:: @ 826BF97
 	setmetatile 9, 5, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_SetDoorsState1:: @ 826C232
+Route110_TrickHousePuzzle3_EventScript_SetDoorsState1::
 	setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
 	setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
 	setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
@@ -205,38 +205,38 @@ Route110_TrickHousePuzzle3_EventScript_SetDoorsState1:: @ 826C232
 	setmetatile 9, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_Button1:: @ 826C4CD
+Route110_TrickHousePuzzle3_EventScript_Button1::
 	lockall
 	setvar VAR_TEMP_8, 1
 	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_Button2:: @ 826C4D9
+Route110_TrickHousePuzzle3_EventScript_Button2::
 	lockall
 	setvar VAR_TEMP_8, 2
 	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_Button3:: @ 826C4E5
+Route110_TrickHousePuzzle3_EventScript_Button3::
 	lockall
 	setvar VAR_TEMP_8, 3
 	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_Button4:: @ 826C4F1
+Route110_TrickHousePuzzle3_EventScript_Button4::
 	lockall
 	setvar VAR_TEMP_8, 4
 	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_PressButton:: @ 826C4FD
+Route110_TrickHousePuzzle3_EventScript_PressButton::
 	call Route110_TrickHousePuzzle3_EventScript_SetButton
 	playse SE_PIN
 	call Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles
 	goto Route110_TrickHousePuzzle3_EventScript_AlternateDoors
 	end
 
-Route110_TrickHousePuzzle3_EventScript_SetButton:: @ 826C510
+Route110_TrickHousePuzzle3_EventScript_SetButton::
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
@@ -251,23 +251,23 @@ Route110_TrickHousePuzzle3_EventScript_SetButton:: @ 826C510
 	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton4
 	return
 
-Route110_TrickHousePuzzle3_EventScript_SetButton1:: @ 826C551
+Route110_TrickHousePuzzle3_EventScript_SetButton1::
 	setvar VAR_TEMP_1, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_SetButton2:: @ 826C557
+Route110_TrickHousePuzzle3_EventScript_SetButton2::
 	setvar VAR_TEMP_2, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_SetButton3:: @ 826C55D
+Route110_TrickHousePuzzle3_EventScript_SetButton3::
 	setvar VAR_TEMP_3, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_SetButton4:: @ 826C563
+Route110_TrickHousePuzzle3_EventScript_SetButton4::
 	setvar VAR_TEMP_4, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_AlternateDoors:: @ 826C569
+Route110_TrickHousePuzzle3_EventScript_AlternateDoors::
 	compare VAR_TEMP_9, 1
 	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState0
 	compare VAR_TEMP_9, 0
@@ -279,81 +279,81 @@ Route110_TrickHousePuzzle3_EventScript_AlternateDoors:: @ 826C569
 	goto_if_eq Route110_TrickHousePuzzle3_EventScript_SetAltDoorState
 	end
 
-Route110_TrickHousePuzzle3_EventScript_ClearAltDoorState:: @ 826C599
+Route110_TrickHousePuzzle3_EventScript_ClearAltDoorState::
 	setvar VAR_TEMP_9, 0
 	releaseall
 	end
 
-Route110_TrickHousePuzzle3_EventScript_SetAltDoorState:: @ 826C5A0
+Route110_TrickHousePuzzle3_EventScript_SetAltDoorState::
 	setvar VAR_TEMP_9, 1
 	releaseall
 	end
 
-Route110_TrickHousePuzzle3_EventScript_Scroll:: @ 826C5A7
+Route110_TrickHousePuzzle3_EventScript_Scroll::
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle3_EventScript_FoundScroll
 	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle3_EventScript_FoundScroll:: @ 826C5B9
+Route110_TrickHousePuzzle3_EventScript_FoundScroll::
 	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1
 	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle3_EventScript_Justin:: @ 826C5C4
+Route110_TrickHousePuzzle3_EventScript_Justin::
 	trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_JustinIntro, Route110_TrickHousePuzzle3_Text_JustinDefeat
 	msgbox Route110_TrickHousePuzzle3_Text_JustinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle3_EventScript_Martha:: @ 826C5DB
+Route110_TrickHousePuzzle3_EventScript_Martha::
 	trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_MarthaIntro, Route110_TrickHousePuzzle3_Text_MarthaDefeat
 	msgbox Route110_TrickHousePuzzle3_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle3_EventScript_Alan:: @ 826C5F2
+Route110_TrickHousePuzzle3_EventScript_Alan::
 	trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_AlanIntro, Route110_TrickHousePuzzle3_Text_AlanDefeat
 	msgbox Route110_TrickHousePuzzle3_Text_AlanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened: @ 826C609
+Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened:
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is coveted.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle3_Text_JustinIntro: @ 826C676
+Route110_TrickHousePuzzle3_Text_JustinIntro:
 	.string "I keep coming back to this same place!$"
 
-Route110_TrickHousePuzzle3_Text_JustinDefeat: @ 826C69D
+Route110_TrickHousePuzzle3_Text_JustinDefeat:
 	.string "I'm already having trouble, and then\n"
 	.string "you have to beat me? It's not fair!$"
 
-Route110_TrickHousePuzzle3_Text_JustinPostBattle: @ 826C6E6
+Route110_TrickHousePuzzle3_Text_JustinPostBattle:
 	.string "It's full of doors here!\n"
 	.string "It's too small and dark in here! Help!$"
 
-Route110_TrickHousePuzzle3_Text_MarthaIntro: @ 826C726
+Route110_TrickHousePuzzle3_Text_MarthaIntro:
 	.string "I don't know what's going on here.\n"
 	.string "I'm starting to feel sad…$"
 
-Route110_TrickHousePuzzle3_Text_MarthaDefeat: @ 826C763
+Route110_TrickHousePuzzle3_Text_MarthaDefeat:
 	.string "You… You're awful!$"
 
-Route110_TrickHousePuzzle3_Text_MarthaPostBattle: @ 826C776
+Route110_TrickHousePuzzle3_Text_MarthaPostBattle:
 	.string "I know I'm weak!\n"
 	.string "And, I have no sense of direction!$"
 
-Route110_TrickHousePuzzle3_Text_AlanIntro: @ 826C7AA
+Route110_TrickHousePuzzle3_Text_AlanIntro:
 	.string "I don't get it. What would anyone want\n"
 	.string "with a house this bizarre?$"
 
-Route110_TrickHousePuzzle3_Text_AlanDefeat: @ 826C7EC
+Route110_TrickHousePuzzle3_Text_AlanDefeat:
 	.string "I don't get it.\n"
 	.string "How did I lose?$"
 
-Route110_TrickHousePuzzle3_Text_AlanPostBattle: @ 826C80C
+Route110_TrickHousePuzzle3_Text_AlanPostBattle:
 	.string "I don't get it.\n"
 	.string "How many traps are in this house?\p"
 	.string "You may be the one to solve that.$"
diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
index 44610a10f..10f49adb5 100644
--- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
@@ -1,71 +1,71 @@
-Route110_TrickHousePuzzle4_MapScripts:: @ 826C860
+Route110_TrickHousePuzzle4_MapScripts::
 	.byte 0
 
-Route110_TrickHousePuzzle4_EventScript_Scroll:: @ 826C861
+Route110_TrickHousePuzzle4_EventScript_Scroll::
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle4_EventScript_FoundScroll
 	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle4_EventScript_FoundScroll:: @ 826C873
+Route110_TrickHousePuzzle4_EventScript_FoundScroll::
 	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1
 	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle4_EventScript_Cora:: @ 826C87E
+Route110_TrickHousePuzzle4_EventScript_Cora::
 	trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_CoraIntro, Route110_TrickHousePuzzle4_Text_CoraDefeat
 	msgbox Route110_TrickHousePuzzle4_Text_CoraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle4_EventScript_Yuji:: @ 826C895
+Route110_TrickHousePuzzle4_EventScript_Yuji::
 	trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_YujiIntro, Route110_TrickHousePuzzle4_Text_YujiDefeat
 	msgbox Route110_TrickHousePuzzle4_Text_YujiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle4_EventScript_Paula:: @ 826C8AC
+Route110_TrickHousePuzzle4_EventScript_Paula::
 	trainerbattle_single TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_PaulaIntro, Route110_TrickHousePuzzle4_Text_PaulaDefeat
 	msgbox Route110_TrickHousePuzzle4_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened: @ 826C8C3
+Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened:
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is cool.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle4_Text_CoraIntro: @ 826C92D
+Route110_TrickHousePuzzle4_Text_CoraIntro:
 	.string "It's too much bother to think this out.\n"
 	.string "I only wanted to battle!$"
 
-Route110_TrickHousePuzzle4_Text_CoraDefeat: @ 826C96E
+Route110_TrickHousePuzzle4_Text_CoraDefeat:
 	.string "Even though I lost, I still like battling\n"
 	.string "the best!$"
 
-Route110_TrickHousePuzzle4_Text_CoraPostBattle: @ 826C9A2
+Route110_TrickHousePuzzle4_Text_CoraPostBattle:
 	.string "Wouldn't you agree? You would go\n"
 	.string "anywhere if TRAINERS were there.$"
 
-Route110_TrickHousePuzzle4_Text_YujiIntro: @ 826C9E4
+Route110_TrickHousePuzzle4_Text_YujiIntro:
 	.string "Heh! Boulders like this, I can brush\n"
 	.string "aside with one finger!$"
 
-Route110_TrickHousePuzzle4_Text_YujiDefeat: @ 826CA20
+Route110_TrickHousePuzzle4_Text_YujiDefeat:
 	.string "I can push boulders, but I can't solve\n"
 	.string "the puzzle…$"
 
-Route110_TrickHousePuzzle4_Text_YujiPostBattle: @ 826CA53
+Route110_TrickHousePuzzle4_Text_YujiPostBattle:
 	.string "It's not good enough to be brawny…\n"
 	.string "You have to use your head. Be brainy!$"
 
-Route110_TrickHousePuzzle4_Text_PaulaIntro: @ 826CA9C
+Route110_TrickHousePuzzle4_Text_PaulaIntro:
 	.string "The TRICK HOUSE is getting trickier,\n"
 	.string "isn't it?$"
 
-Route110_TrickHousePuzzle4_Text_PaulaDefeat: @ 826CACB
+Route110_TrickHousePuzzle4_Text_PaulaDefeat:
 	.string "Aaak!$"
 
-Route110_TrickHousePuzzle4_Text_PaulaPostBattle: @ 826CAD1
+Route110_TrickHousePuzzle4_Text_PaulaPostBattle:
 	.string "Has anyone made it to the end?$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
index 9c66a2c8f..3c574441e 100644
--- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
@@ -4,11 +4,11 @@
 .set LOCALID_MECHADOLL_4, 4
 .set LOCALID_MECHADOLL_5, 5
 
-Route110_TrickHousePuzzle5_MapScripts:: @ 826CAF0
+Route110_TrickHousePuzzle5_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle5_OnTransition
 	.byte 0
 
-Route110_TrickHousePuzzle5_OnTransition: @ 826CAF6
+Route110_TrickHousePuzzle5_OnTransition:
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
@@ -17,19 +17,19 @@ Route110_TrickHousePuzzle5_OnTransition: @ 826CAF6
 	setvar VAR_TEMP_8, 0
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Scroll:: @ 826CB15
+Route110_TrickHousePuzzle5_EventScript_Scroll::
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle5_EventScript_FoundScroll
 	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle5_EventScript_FoundScroll:: @ 826CB27
+Route110_TrickHousePuzzle5_EventScript_FoundScroll::
 	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1
 	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1:: @ 826CB32
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1::
 	lockall
 	applymovement LOCALID_MECHADOLL_1, Common_Movement_FacePlayer
 	waitmovement 0
@@ -39,7 +39,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll1:: @ 826CB32
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2:: @ 826CB53
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2::
 	lockall
 	applymovement LOCALID_MECHADOLL_2, Common_Movement_FacePlayer
 	waitmovement 0
@@ -49,7 +49,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll2:: @ 826CB53
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3:: @ 826CB74
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3::
 	lockall
 	applymovement LOCALID_MECHADOLL_3, Common_Movement_FacePlayer
 	waitmovement 0
@@ -59,7 +59,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll3:: @ 826CB74
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4:: @ 826CB95
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4::
 	lockall
 	applymovement LOCALID_MECHADOLL_4, Common_Movement_FacePlayer
 	waitmovement 0
@@ -69,7 +69,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll4:: @ 826CB95
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5:: @ 826CBB6
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5::
 	lockall
 	applymovement LOCALID_MECHADOLL_5, Common_Movement_FacePlayer
 	waitmovement 0
@@ -79,146 +79,146 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5:: @ 826CBB6
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger0:: @ 826CBD7
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger0::
 	lockall
 	setvar VAR_TEMP_9, 0
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger1:: @ 826CBE3
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger1::
 	lockall
 	setvar VAR_TEMP_9, 1
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger2:: @ 826CBEF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger2::
 	lockall
 	setvar VAR_TEMP_9, 2
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger3:: @ 826CBFB
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger3::
 	lockall
 	setvar VAR_TEMP_9, 3
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger4:: @ 826CC07
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger4::
 	lockall
 	setvar VAR_TEMP_9, 4
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger0:: @ 826CC13
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger0::
 	lockall
 	setvar VAR_TEMP_9, 0
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger1:: @ 826CC1F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger1::
 	lockall
 	setvar VAR_TEMP_9, 1
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger2:: @ 826CC2B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger2::
 	lockall
 	setvar VAR_TEMP_9, 2
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger3:: @ 826CC37
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger3::
 	lockall
 	setvar VAR_TEMP_9, 3
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger4:: @ 826CC43
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger4::
 	lockall
 	setvar VAR_TEMP_9, 4
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger5:: @ 826CC4F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger5::
 	lockall
 	setvar VAR_TEMP_9, 5
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger0:: @ 826CC5B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger0::
 	lockall
 	setvar VAR_TEMP_9, 0
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger1:: @ 826CC67
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger1::
 	lockall
 	setvar VAR_TEMP_9, 1
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger2:: @ 826CC73
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger2::
 	lockall
 	setvar VAR_TEMP_9, 2
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger3:: @ 826CC7F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger3::
 	lockall
 	setvar VAR_TEMP_9, 3
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger4:: @ 826CC8B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger4::
 	lockall
 	setvar VAR_TEMP_9, 4
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger0:: @ 826CC97
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger0::
 	lockall
 	setvar VAR_TEMP_9, 0
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger1:: @ 826CCA3
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger1::
 	lockall
 	setvar VAR_TEMP_9, 1
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger2:: @ 826CCAF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger2::
 	lockall
 	setvar VAR_TEMP_9, 2
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger3:: @ 826CCBB
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger3::
 	lockall
 	setvar VAR_TEMP_9, 3
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger4:: @ 826CCC7
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger4::
 	lockall
 	setvar VAR_TEMP_9, 4
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
 @ Unused
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger5:: @ 826CCD3
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger5::
 	lockall
 	setvar VAR_TEMP_9, 5
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger0:: @ 826CCDF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger0::
 	lockall
 	setvar VAR_TEMP_9, 0
 	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate:: @ 826CCEB
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate::
 	setvar VAR_TEMP_1, 1
 	setvar VAR_TEMP_8, LOCALID_MECHADOLL_1
 	playse SE_PIN
@@ -242,7 +242,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate:: @ 826CCEB
 	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate:: @ 826CD6A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate::
 	setvar VAR_TEMP_2, 1
 	setvar VAR_TEMP_8, LOCALID_MECHADOLL_2
 	playse SE_PIN
@@ -268,7 +268,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate:: @ 826CD6A
 	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate:: @ 826CDF4
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate::
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_8, LOCALID_MECHADOLL_3
 	playse SE_PIN
@@ -292,7 +292,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate:: @ 826CDF4
 	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate:: @ 826CE73
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate::
 	setvar VAR_TEMP_4, 1
 	setvar VAR_TEMP_8, LOCALID_MECHADOLL_4
 	playse SE_PIN
@@ -316,7 +316,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate:: @ 826CE73
 	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate:: @ 826CEF2
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate::
 	setvar VAR_TEMP_5, 1
 	setvar VAR_TEMP_8, LOCALID_MECHADOLL_5
 	playse SE_PIN
@@ -332,7 +332,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate:: @ 826CEF2
 	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1:: @ 826CF45
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL1_Q1, TRUE
 	switch VAR_RESULT
@@ -340,7 +340,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1:: @ 826CF45
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2:: @ 826CF68
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL1_Q2, TRUE
 	switch VAR_RESULT
@@ -348,7 +348,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2:: @ 826CF68
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3:: @ 826CF8B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL1_Q3, TRUE
 	switch VAR_RESULT
@@ -356,7 +356,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3:: @ 826CF8B
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1:: @ 826CFAE
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL2_Q1, TRUE
 	switch VAR_RESULT
@@ -364,7 +364,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1:: @ 826CFAE
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2:: @ 826CFD1
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL2_Q2, TRUE
 	switch VAR_RESULT
@@ -372,7 +372,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2:: @ 826CFD1
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3:: @ 826CFF4
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL2_Q3, TRUE
 	switch VAR_RESULT
@@ -380,7 +380,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3:: @ 826CFF4
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1:: @ 826D017
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL3_Q1, TRUE
 	switch VAR_RESULT
@@ -388,7 +388,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1:: @ 826D017
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2:: @ 826D03A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL3_Q2, TRUE
 	switch VAR_RESULT
@@ -396,7 +396,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2:: @ 826D03A
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3:: @ 826D05D
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL3_Q3, TRUE
 	switch VAR_RESULT
@@ -404,7 +404,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3:: @ 826D05D
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1:: @ 826D080
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL4_Q1, TRUE
 	switch VAR_RESULT
@@ -412,7 +412,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1:: @ 826D080
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2:: @ 826D0A3
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL4_Q2, TRUE
 	switch VAR_RESULT
@@ -420,7 +420,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2:: @ 826D0A3
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3:: @ 826D0C6
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL4_Q3, TRUE
 	switch VAR_RESULT
@@ -428,7 +428,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3:: @ 826D0C6
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1:: @ 826D0E9
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL5_Q1, TRUE
 	switch VAR_RESULT
@@ -436,7 +436,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1:: @ 826D0E9
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2:: @ 826D10C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL5_Q2, TRUE
 	switch VAR_RESULT
@@ -444,7 +444,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2:: @ 826D10C
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3:: @ 826D12F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3::
 	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL5_Q3, TRUE
 	switch VAR_RESULT
@@ -452,7 +452,7 @@ Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3:: @ 826D12F
 	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152
+Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer::
 	waitse
 	playse SE_FAILURE
 	msgbox Route110_TrickHousePuzzle5_Text_DisappointmentError, MSGBOX_DEFAULT
@@ -470,13 +470,13 @@ Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152
 	releaseall
 	end
 
-Route110_TrickHousePuzzle5_EventScript_CorrectAnswer:: @ 826D1A0
+Route110_TrickHousePuzzle5_EventScript_CorrectAnswer::
 	waitse
 	playse SE_SUCCESS
 	goto Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	end
 
-Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough:: @ 826D1AA
+Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough::
 	msgbox Route110_TrickHousePuzzle5_Text_CorrectGoThrough, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -486,7 +486,7 @@ Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough:: @ 826D1AA
 @   Mechadoll 2 is the only mechadoll to walk right, all the other WalkRight scripts are unused
 @   Mechadoll 5 never walks, all the Mechadoll5Walk scripts are unused
 @   No mechadoll walks left 5 paces, all the WalkLeft5 scripts are unused
-Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1:: @ 826D1B4
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1::
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft1
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_2
@@ -499,7 +499,7 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1:: @ 826D1B4
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft1
 	return
 
-Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2:: @ 826D1EC
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2::
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft2
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_2
@@ -512,7 +512,7 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2:: @ 826D1EC
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft2
 	return
 
-Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3:: @ 826D224
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3::
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft3
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_2
@@ -525,7 +525,7 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3:: @ 826D224
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft3
 	return
 
-Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4:: @ 826D25C
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4::
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft4
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_2
@@ -538,7 +538,7 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4:: @ 826D25C
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft4
 	return
 
-Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft5:: @ 826D294
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft5::
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft5
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_2
@@ -551,7 +551,7 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft5:: @ 826D294
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft5
 	return
 
-Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight1:: @ 826D2CC
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight1::
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight1
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_2
@@ -564,7 +564,7 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight1:: @ 826D2CC
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight1
 	return
 
-Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight2:: @ 826D304
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight2::
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight2
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_2
@@ -577,7 +577,7 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight2:: @ 826D304
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight2
 	return
 
-Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight3:: @ 826D33C
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight3::
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight3
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_2
@@ -590,7 +590,7 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight3:: @ 826D33C
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight3
 	return
 
-Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight4:: @ 826D374
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight4::
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight4
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_2
@@ -603,7 +603,7 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight4:: @ 826D374
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight4
 	return
 
-Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight5:: @ 826D3AC
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight5::
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_1
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight5
 	compare VAR_TEMP_8, LOCALID_MECHADOLL_2
@@ -616,279 +616,279 @@ Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight5:: @ 826D3AC
 	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight5
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft1:: @ 826D3E4
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft1::
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft1:: @ 826D3EF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft1::
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft1:: @ 826D3FA
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft1::
 	applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft1:: @ 826D405
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft1::
 	applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft1:: @ 826D410
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft1::
 	applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft2:: @ 826D41B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft2::
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft2:: @ 826D426
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft2::
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft2:: @ 826D431
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft2::
 	applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft2:: @ 826D43C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft2::
 	applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft2:: @ 826D447
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft2::
 	applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft3:: @ 826D452
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft3::
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft3:: @ 826D45D
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft3::
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft3:: @ 826D468
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft3::
 	applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft3:: @ 826D473
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft3::
 	applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft3:: @ 826D47E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft3::
 	applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft4:: @ 826D489
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft4::
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft4:: @ 826D494
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft4::
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft4:: @ 826D49F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft4::
 	applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft4:: @ 826D4AA
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft4::
 	applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft4:: @ 826D4B5
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft4::
 	applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft5:: @ 826D4C0
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft5::
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft5:: @ 826D4CB
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft5::
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft5:: @ 826D4D6
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft5::
 	applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft5:: @ 826D4E1
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft5::
 	applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft5:: @ 826D4EC
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft5::
 	applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight1:: @ 826D4F7
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight1::
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight1:: @ 826D502
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight1::
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight1:: @ 826D50D
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight1::
 	applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight1:: @ 826D518
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight1::
 	applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight1:: @ 826D523
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight1::
 	applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight2:: @ 826D52E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight2::
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight2:: @ 826D539
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight2::
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight2:: @ 826D544
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight2::
 	applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight2:: @ 826D54F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight2::
 	applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight2:: @ 826D55A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight2::
 	applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight3:: @ 826D565
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight3::
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight3:: @ 826D570
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight3::
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight3:: @ 826D57B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight3::
 	applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight3:: @ 826D586
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight3::
 	applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight3:: @ 826D591
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight3::
 	applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight4:: @ 826D59C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight4::
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight4:: @ 826D5A7
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight4::
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight4:: @ 826D5B2
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight4::
 	applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight4:: @ 826D5BD
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight4::
 	applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight4:: @ 826D5C8
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight4::
 	applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight5:: @ 826D5D3
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight5::
 	applymovement LOCALID_MECHADOLL_1, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight5:: @ 826D5DE
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight5::
 	applymovement LOCALID_MECHADOLL_2, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight5:: @ 826D5E9
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight5::
 	applymovement LOCALID_MECHADOLL_3, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight5:: @ 826D5F4
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight5::
 	applymovement LOCALID_MECHADOLL_4, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight5:: @ 826D5FF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight5::
 	applymovement LOCALID_MECHADOLL_5, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_Movement_WalkLeft1: @ 826D60A
+Route110_TrickHousePuzzle5_Movement_WalkLeft1:
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_WalkLeft2: @ 826D60C
+Route110_TrickHousePuzzle5_Movement_WalkLeft2:
 	walk_left
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_WalkLeft3: @ 826D60F
+Route110_TrickHousePuzzle5_Movement_WalkLeft3:
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_WalkLeft4: @ 826D613
+Route110_TrickHousePuzzle5_Movement_WalkLeft4:
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_WalkLeft5: @ 826D618
+Route110_TrickHousePuzzle5_Movement_WalkLeft5:
 	walk_left
 	walk_left
 	walk_left
@@ -896,29 +896,29 @@ Route110_TrickHousePuzzle5_Movement_WalkLeft5: @ 826D618
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_WalkRight1: @ 826D61E
+Route110_TrickHousePuzzle5_Movement_WalkRight1:
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_WalkRight2: @ 826D620
+Route110_TrickHousePuzzle5_Movement_WalkRight2:
 	walk_right
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_WalkRight3: @ 826D623
+Route110_TrickHousePuzzle5_Movement_WalkRight3:
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_WalkRight4: @ 826D627
+Route110_TrickHousePuzzle5_Movement_WalkRight4:
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_WalkRight5: @ 826D62C
+Route110_TrickHousePuzzle5_Movement_WalkRight5:
 	walk_right
 	walk_right
 	walk_right
@@ -926,7 +926,7 @@ Route110_TrickHousePuzzle5_Movement_WalkRight5: @ 826D62C
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_MechadollShake: @ 826D632
+Route110_TrickHousePuzzle5_Movement_MechadollShake:
 	face_left
 	delay_2
 	face_right
@@ -974,128 +974,128 @@ Route110_TrickHousePuzzle5_Movement_MechadollShake: @ 826D632
 	face_down
 	step_end
 
-Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened: @ 826D660
+Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened:
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is a genius.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll1Intro: @ 826D6CE
+Route110_TrickHousePuzzle5_Text_Mechadoll1Intro:
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 1 AM I!\p"
 	.string "IF YOU ANSWER QUIZZES CORRECTLY,\n"
 	.string "THEN YOU WILL GO TO MECHADOLL 5.\l"
 	.string "THEN YOU CAN OBTAIN THE SECRET CODE.$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1: @ 826D757
+Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1:
 	.string "MECHADOLL 1 QUIZ.\p"
 	.string "One of these POKéMON is not found\n"
 	.string "on ROUTE 110. Which one is it?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2: @ 826D7AA
+Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2:
 	.string "MECHADOLL 1 QUIZ.\p"
 	.string "One of these POKéMON is not of the\n"
 	.string "WATER type. Which one is it?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3: @ 826D7FC
+Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3:
 	.string "MECHADOLL 1 QUIZ.\p"
 	.string "One of these POKéMON does not use\n"
 	.string "LEECH LIFE. Which one is it?$"
 
-Route110_TrickHousePuzzle5_Text_CorrectGoThrough: @ 826D84D
+Route110_TrickHousePuzzle5_Text_CorrectGoThrough:
 	.string "CONGRATULATIONS. CORRECT YOU ARE.\n"
 	.string "GO THROUGH. PLEASE.$"
 
-Route110_TrickHousePuzzle5_Text_DisappointmentError: @ 826D883
+Route110_TrickHousePuzzle5_Text_DisappointmentError:
 	.string "BZZZT. DISAPPOINTMENT.\n"
 	.string "ERROR.$"
 
-Route110_TrickHousePuzzle5_Text_Wahahahaha: @ 826D8A1
+Route110_TrickHousePuzzle5_Text_Wahahahaha:
 	.string "WAHAHAHAHA! WAHAHAHAHA!\n"
 	.string "CLICKETY-CLACK!$"
 
-Route110_TrickHousePuzzle5_Text_WaitForNextChallenge: @ 826D8C9
+Route110_TrickHousePuzzle5_Text_WaitForNextChallenge:
 	.string "YOUR NEXT CHALLENGE WE WAIT FOR.$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll2Intro: @ 826D8EA
+Route110_TrickHousePuzzle5_Text_Mechadoll2Intro:
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 2 AM I!\p"
 	.string "MECHADOLL 1'S QUIZ DIFFICULTY LEVEL\n"
 	.string "IS SET TOO LOW.$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1: @ 826D940
+Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1:
 	.string "MECHADOLL 2 QUIZ.\p"
 	.string "Which of these POKéMON did WALLY\n"
 	.string "borrow from your father?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2: @ 826D98C
+Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2:
 	.string "MECHADOLL 2 QUIZ.\p"
 	.string "Which of these POKéMON was chasing\n"
 	.string "PROF. BIRCH?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3: @ 826D9CE
+Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3:
 	.string "MECHADOLL 2 QUIZ.\p"
 	.string "Which of these POKéMON did TEAM AQUA\n"
 	.string "use in PETALBURG FOREST?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll3Intro: @ 826DA1E
+Route110_TrickHousePuzzle5_Text_Mechadoll3Intro:
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 3 AM I!\p"
 	.string "MATTERS OF MONEY ARE MY SOLE FOCUS.$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1: @ 826DA64
+Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1:
 	.string "MECHADOLL 3 QUIZ.\p"
 	.string "Which costs more?\n"
 	.string "Three HARBOR MAILS or one BURN HEAL?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2: @ 826DAAD
+Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2:
 	.string "MECHADOLL 3 QUIZ.\p"
 	.string "Sell one GREAT BALL and buy\n"
 	.string "one POTION. How much money remains?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3: @ 826DAFF
+Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3:
 	.string "MECHADOLL 3 QUIZ.\p"
 	.string "Do one REPEL and SODA POP cost\n"
 	.string "more than one SUPER POTION?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll4Intro: @ 826DB4C
+Route110_TrickHousePuzzle5_Text_Mechadoll4Intro:
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 4 THAT IS ME!\p"
 	.string "MY QUIZ IS AN OBJECT OF BEAUTY.$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1: @ 826DB94
+Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1:
 	.string "MECHADOLL 4 QUIZ.\p"
 	.string "In SEASHORE HOUSE, were there more men\n"
 	.string "or women?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2: @ 826DBD7
+Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2:
 	.string "MECHADOLL 4 QUIZ.\p"
 	.string "In LAVARIDGE TOWN, were there more\n"
 	.string "elderly men or elderly women?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3: @ 826DC2A
+Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3:
 	.string "MECHADOLL 4 QUIZ.\p"
 	.string "In the TRAINER'S SCHOOL, how many\n"
 	.string "girl students were there?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll5Intro: @ 826DC78
+Route110_TrickHousePuzzle5_Text_Mechadoll5Intro:
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 5 AM I!\p"
 	.string "THE MASTER'S BEST AND PROUDEST\n"
 	.string "ACHIEVEMENT AM I.$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1: @ 826DCCB
+Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1:
 	.string "MECHADOLL 5 QUIZ.\p"
 	.string "In SLATEPORT's POKéMON FAN CLUB,\n"
 	.string "how many POKéMON were there?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2: @ 826DD1B
+Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2:
 	.string "MECHADOLL 5 QUIZ.\p"
 	.string "In FORTREE CITY, how many\n"
 	.string "tree houses were there?$"
 
-Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3: @ 826DD5F
+Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3:
 	.string "MECHADOLL 5 QUIZ.\p"
 	.string "On the CYCLING ROAD, how many\n"
 	.string "TRIATHLETES were there?$"
diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
index 142b89f42..35d657acc 100644
--- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
@@ -1,87 +1,87 @@
-Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7
+Route110_TrickHousePuzzle6_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_OnWarp
 	.byte 0
 
-Route110_TrickHousePuzzle6_OnTransition: @ 826DDB2
+Route110_TrickHousePuzzle6_OnTransition:
 	special RotatingGate_InitPuzzle
 	end
 
-Route110_TrickHousePuzzle6_OnWarp: @ 826DDB6
+Route110_TrickHousePuzzle6_OnWarp:
 	map_script_2 VAR_TEMP_0, VAR_TEMP_0, Route110_TrickHousePuzzle6_EventScript_InitPuzzle
 	.2byte 0
 
-Route110_TrickHousePuzzle6_EventScript_InitPuzzle:: @ 826DDC0
+Route110_TrickHousePuzzle6_EventScript_InitPuzzle::
 	special RotatingGate_InitPuzzleAndGraphics
 	end
 
-Route110_TrickHousePuzzle6_EventScript_Scroll:: @ 826DDC4
+Route110_TrickHousePuzzle6_EventScript_Scroll::
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle6_EventScript_FoundScroll
 	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle6_EventScript_FoundScroll:: @ 826DDD6
+Route110_TrickHousePuzzle6_EventScript_FoundScroll::
 	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1
 	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle6_EventScript_Sophia:: @ 826DDE1
+Route110_TrickHousePuzzle6_EventScript_Sophia::
 	trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_SophiaIntro, Route110_TrickHousePuzzle6_Text_SophiaDefeat
 	msgbox Route110_TrickHousePuzzle6_Text_SophiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle6_EventScript_Benny:: @ 826DDF8
+Route110_TrickHousePuzzle6_EventScript_Benny::
 	trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_BennyIntro, Route110_TrickHousePuzzle6_Text_BennyDefeat
 	msgbox Route110_TrickHousePuzzle6_Text_BennyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle6_EventScript_Sebastian:: @ 826DE0F
+Route110_TrickHousePuzzle6_EventScript_Sebastian::
 	trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_SebastianIntro, Route110_TrickHousePuzzle6_Text_SebastianDefeat
 	msgbox Route110_TrickHousePuzzle6_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened: @ 826DE26
+Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened:
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is my life.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle6_Text_SophiaIntro: @ 826DE93
+Route110_TrickHousePuzzle6_Text_SophiaIntro:
 	.string "When I heard there was a strange\n"
 	.string "house, I had to check it out.$"
 
-Route110_TrickHousePuzzle6_Text_SophiaDefeat: @ 826DED2
+Route110_TrickHousePuzzle6_Text_SophiaDefeat:
 	.string "I've discovered a tough TRAINER!$"
 
-Route110_TrickHousePuzzle6_Text_SophiaPostBattle: @ 826DEF3
+Route110_TrickHousePuzzle6_Text_SophiaPostBattle:
 	.string "I'm sure having a good time checking\n"
 	.string "this place out.\p"
 	.string "It's a challenge I've found worth\n"
 	.string "repeating!$"
 
-Route110_TrickHousePuzzle6_Text_BennyIntro: @ 826DF55
+Route110_TrickHousePuzzle6_Text_BennyIntro:
 	.string "Maybe I could get my BIRD POKéMON\n"
 	.string "to fly over the wall…$"
 
-Route110_TrickHousePuzzle6_Text_BennyDefeat: @ 826DF8D
+Route110_TrickHousePuzzle6_Text_BennyDefeat:
 	.string "Gwaaah! I blew it!$"
 
-Route110_TrickHousePuzzle6_Text_BennyPostBattle: @ 826DFA0
+Route110_TrickHousePuzzle6_Text_BennyPostBattle:
 	.string "Ehehehe… I guess I lost because\n"
 	.string "I was trying to cheat.$"
 
-Route110_TrickHousePuzzle6_Text_SebastianIntro: @ 826DFD7
+Route110_TrickHousePuzzle6_Text_SebastianIntro:
 	.string "I'm getting dizzy from these rotating\n"
 	.string "doors…$"
 
-Route110_TrickHousePuzzle6_Text_SebastianDefeat: @ 826E004
+Route110_TrickHousePuzzle6_Text_SebastianDefeat:
 	.string "Everything's spinning around and\n"
 	.string "around. I can't take this anymore…$"
 
-Route110_TrickHousePuzzle6_Text_SebastianPostBattle: @ 826E048
+Route110_TrickHousePuzzle6_Text_SebastianPostBattle:
 	.string "You don't seem to be affected at all.\n"
 	.string "Or do you have your poker face on?$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index b0cbd3813..b0f1cbea1 100644
--- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
@@ -1,4 +1,4 @@
-Route110_TrickHousePuzzle7_MapScripts:: @ 826E091
+Route110_TrickHousePuzzle7_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_OnLoad
@@ -8,11 +8,11 @@ Route110_TrickHousePuzzle7_MapScripts:: @ 826E091
 @ Puzzle Room 7 in RSE uses whatever puzzle Mossdeep Gym uses
 @ Because Mossdeep Gym was redesigned for Emerald, theres a good deal of leftover script from the old R/S puzzle
 
-Route110_TrickHousePuzzle7_OnResume: @ 826E0A6
+Route110_TrickHousePuzzle7_OnResume:
 	call Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles
 	end
 
-Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles:: @ 826E0AC
+Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles::
 	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn
 	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn
 	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn
@@ -21,57 +21,57 @@ Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles:: @ 826E0AC
 	return
 
 @ Leftover from R/S, none of the below metatile scripts are ever called
-Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn:: @ 826E0DA
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn::
 	setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
 	setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn:: @ 826E0ED
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn::
 	setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
 	setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn:: @ 826E100
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn::
 	setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
 	setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn:: @ 826E113
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn::
 	setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, 0
 	setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn:: @ 826E126
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn::
 	setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
 	setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff:: @ 826E139
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff::
 	setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
 	setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff:: @ 826E14C
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff::
 	setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
 	setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff:: @ 826E15F
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff::
 	setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
 	setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff:: @ 826E172
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff::
 	setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, 0
 	setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff:: @ 826E185
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff::
 	setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, 0
 	setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_OnTransition: @ 826E198
+Route110_TrickHousePuzzle7_OnTransition:
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_TeleportedTransition
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
@@ -81,36 +81,36 @@ Route110_TrickHousePuzzle7_OnTransition: @ 826E198
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	end
 
-Route110_TrickHousePuzzle7_EventScript_TeleportedTransition:: @ 826E1B3
+Route110_TrickHousePuzzle7_EventScript_TeleportedTransition::
 	end
 
-Route110_TrickHousePuzzle7_OnLoad: @ 826E1B4
+Route110_TrickHousePuzzle7_OnLoad:
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	call_if_eq Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles
 	end
 
-Route110_TrickHousePuzzle7_OnFrame: @ 826E1C0
+Route110_TrickHousePuzzle7_OnFrame:
 	map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_ClearState2
 	.2byte 0
 
-Route110_TrickHousePuzzle7_EventScript_ClearState2:: @ 826E1CA
+Route110_TrickHousePuzzle7_EventScript_ClearState2::
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Scroll:: @ 826E1D0
+Route110_TrickHousePuzzle7_EventScript_Scroll::
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle7_EventScript_FoundScroll
 	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle7_EventScript_FoundScroll:: @ 826E1E2
+Route110_TrickHousePuzzle7_EventScript_FoundScroll::
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1
 	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
 @ Unused, leftover from R/S
-Route110_TrickHousePuzzle7_EventScript_TeleportPad:: @ 826E1ED
+Route110_TrickHousePuzzle7_EventScript_TeleportPad::
 	lockall
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19
@@ -119,7 +119,7 @@ Route110_TrickHousePuzzle7_EventScript_TeleportPad:: @ 826E1ED
 	end
 
 @ All the below switch scripts are unused leftover from R/S
-Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 826E1FE
+Route110_TrickHousePuzzle7_EventScript_Switch1::
 	lockall
 	delay 32
 	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn
@@ -130,7 +130,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 826E1FE
 	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 826E22D
+Route110_TrickHousePuzzle7_EventScript_Switch2::
 	lockall
 	delay 32
 	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn
@@ -141,7 +141,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 826E22D
 	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 826E25C
+Route110_TrickHousePuzzle7_EventScript_Switch3::
 	lockall
 	delay 32
 	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn
@@ -152,7 +152,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 826E25C
 	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 826E28B
+Route110_TrickHousePuzzle7_EventScript_Switch4::
 	lockall
 	delay 32
 	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn
@@ -163,7 +163,7 @@ Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 826E28B
 	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 826E2BA
+Route110_TrickHousePuzzle7_EventScript_Switch5::
 	lockall
 	delay 32
 	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn
@@ -175,58 +175,58 @@ Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 826E2BA
 	end
 
 @ All the below switch scripts are unused leftover from R/S
-Route110_TrickHousePuzzle7_EventScript_SetSwitch1On:: @ 826E2E9
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1On::
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off:: @ 826E2EE
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off::
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch2On:: @ 826E2F3
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2On::
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off:: @ 826E2F8
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off::
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch3On:: @ 826E2FD
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3On::
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off:: @ 826E302
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off::
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch4On:: @ 826E307
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4On::
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off:: @ 826E30C
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off::
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch5On:: @ 826E311
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5On::
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off:: @ 826E316
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off::
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	releaseall
 	end
 
 @ From here is where the new, actually used puzzle scripts begin
-Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B
+Route110_TrickHousePuzzle7_EventScript_YellowButton::
 	playse SE_SWITCH
 	waitse
 	playse SE_REPEL
@@ -238,7 +238,7 @@ Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331
+Route110_TrickHousePuzzle7_EventScript_BlueButton::
 	playse SE_SWITCH
 	waitse
 	playse SE_REPEL
@@ -250,7 +250,7 @@ Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347
+Route110_TrickHousePuzzle7_EventScript_GreenButton::
 	playse SE_SWITCH
 	waitse
 	playse SE_REPEL
@@ -262,7 +262,7 @@ Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D
+Route110_TrickHousePuzzle7_EventScript_PurpleButton::
 	playse SE_SWITCH
 	waitse
 	playse SE_REPEL
@@ -275,7 +275,7 @@ Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D
 	end
 
 @ Unused
-Route110_TrickHousePuzzle7_EventScript_RedButton:: @ 826E373
+Route110_TrickHousePuzzle7_EventScript_RedButton::
 	playse SE_SWITCH
 	waitse
 	playse SE_REPEL
@@ -287,109 +287,109 @@ Route110_TrickHousePuzzle7_EventScript_RedButton:: @ 826E373
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Joshua:: @ 826E389
+Route110_TrickHousePuzzle7_EventScript_Joshua::
 	trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_JoshuaIntro, Route110_TrickHousePuzzle7_Text_JoshuaDefeat
 	msgbox Route110_TrickHousePuzzle7_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Patricia:: @ 826E3A0
+Route110_TrickHousePuzzle7_EventScript_Patricia::
 	trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_PatriciaIntro, Route110_TrickHousePuzzle7_Text_PatriciaDefeat
 	msgbox Route110_TrickHousePuzzle7_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Alexis:: @ 826E3B7
+Route110_TrickHousePuzzle7_EventScript_Alexis::
 	trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_AlexisIntro, Route110_TrickHousePuzzle7_Text_AlexisDefeat
 	msgbox Route110_TrickHousePuzzle7_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Mariela:: @ 826E3CE
+Route110_TrickHousePuzzle7_EventScript_Mariela::
 	trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_MarielaIntro, Route110_TrickHousePuzzle7_Text_MarielaDefeat
 	msgbox Route110_TrickHousePuzzle7_Text_MarielaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Alvaro:: @ 826E3E5
+Route110_TrickHousePuzzle7_EventScript_Alvaro::
 	trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_AlvaroIntro, Route110_TrickHousePuzzle7_Text_AlvaroDefeat
 	msgbox Route110_TrickHousePuzzle7_Text_AlvaroPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_Everett:: @ 826E3FC
+Route110_TrickHousePuzzle7_EventScript_Everett::
 	trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_EverettIntro, Route110_TrickHousePuzzle7_Text_EverettDefeat
 	msgbox Route110_TrickHousePuzzle7_Text_EverettPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened:: @ 826E413
+Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened::
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is huggable.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle7_Text_JoshuaIntro: @ 826E481
+Route110_TrickHousePuzzle7_Text_JoshuaIntro:
 	.string "The TRICK MASTER always vanishes\n"
 	.string "like smoke. How does he do it?$"
 
-Route110_TrickHousePuzzle7_Text_JoshuaDefeat: @ 826E4C1
+Route110_TrickHousePuzzle7_Text_JoshuaDefeat:
 	.string "Aiyeeeh! You're much too strong!\n"
 	.string "How do you do it?$"
 
-Route110_TrickHousePuzzle7_Text_JoshuaPostBattle: @ 826E4F4
+Route110_TrickHousePuzzle7_Text_JoshuaPostBattle:
 	.string "I wish I could appear and disappear as\n"
 	.string "if I were smoke, too.$"
 
-Route110_TrickHousePuzzle7_Text_PatriciaIntro: @ 826E531
+Route110_TrickHousePuzzle7_Text_PatriciaIntro:
 	.string "Going around the same spot…\n"
 	.string "It begets ill fortune…$"
 
-Route110_TrickHousePuzzle7_Text_PatriciaDefeat: @ 826E564
+Route110_TrickHousePuzzle7_Text_PatriciaDefeat:
 	.string "Defeated!\n"
 	.string "It's a bad sign…$"
 
-Route110_TrickHousePuzzle7_Text_PatriciaPostBattle: @ 826E57F
+Route110_TrickHousePuzzle7_Text_PatriciaPostBattle:
 	.string "I've circled the same spot over ten\n"
 	.string "times now… It's ill fortune…$"
 
-Route110_TrickHousePuzzle7_Text_AlexisIntro: @ 826E5C0
+Route110_TrickHousePuzzle7_Text_AlexisIntro:
 	.string "Whoever wins will get through here\n"
 	.string "first. That's the feeling I get.$"
 
-Route110_TrickHousePuzzle7_Text_AlexisDefeat: @ 826E604
+Route110_TrickHousePuzzle7_Text_AlexisDefeat:
 	.string "Oh!\n"
 	.string "Well, go ahead, then!$"
 
-Route110_TrickHousePuzzle7_Text_AlexisPostBattle: @ 826E61E
+Route110_TrickHousePuzzle7_Text_AlexisPostBattle:
 	.string "You're solving all the puzzles in the\n"
 	.string "TRICK HOUSE. That's the feeling I get.$"
 
-Route110_TrickHousePuzzle7_Text_MarielaIntro: @ 826E66B
+Route110_TrickHousePuzzle7_Text_MarielaIntro:
 	.string "Nufufufu, here at last!\n"
 	.string "Let's get right with it!$"
 
-Route110_TrickHousePuzzle7_Text_MarielaDefeat: @ 826E69C
+Route110_TrickHousePuzzle7_Text_MarielaDefeat:
 	.string "You're so casual about winning!$"
 
-Route110_TrickHousePuzzle7_Text_MarielaPostBattle: @ 826E6BC
+Route110_TrickHousePuzzle7_Text_MarielaPostBattle:
 	.string "Humph! I'm not upset!\n"
 	.string "Not me!$"
 
-Route110_TrickHousePuzzle7_Text_AlvaroIntro: @ 826E6DA
+Route110_TrickHousePuzzle7_Text_AlvaroIntro:
 	.string "I ever so closely watched you coming!$"
 
-Route110_TrickHousePuzzle7_Text_AlvaroDefeat: @ 826E700
+Route110_TrickHousePuzzle7_Text_AlvaroDefeat:
 	.string "This outcome I didn't see coming…$"
 
-Route110_TrickHousePuzzle7_Text_AlvaroPostBattle: @ 826E722
+Route110_TrickHousePuzzle7_Text_AlvaroPostBattle:
 	.string "Well, anyway, we both picked a weird\n"
 	.string "place to get acquainted.\p"
 	.string "As one weirdo to another,\n"
 	.string "let's do our best!$"
 
-Route110_TrickHousePuzzle7_Text_EverettIntro: @ 826E78D
+Route110_TrickHousePuzzle7_Text_EverettIntro:
 	.string "It's awfully cramped in here…$"
 
-Route110_TrickHousePuzzle7_Text_EverettDefeat: @ 826E7AB
+Route110_TrickHousePuzzle7_Text_EverettDefeat:
 	.string "Oh, yes, strong you are.$"
 
-Route110_TrickHousePuzzle7_Text_EverettPostBattle: @ 826E7C4
+Route110_TrickHousePuzzle7_Text_EverettPostBattle:
 	.string "I was hoping to switch places with you\n"
 	.string "when I beat you, but…$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
index 9e4218234..310751e5d 100644
--- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
@@ -1,72 +1,72 @@
-Route110_TrickHousePuzzle8_MapScripts:: @ 826E801
+Route110_TrickHousePuzzle8_MapScripts::
 	.byte 0
 
-Route110_TrickHousePuzzle8_EventScript_Scroll:: @ 826E802
+Route110_TrickHousePuzzle8_EventScript_Scroll::
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
 	goto_if_eq Route110_TrickHousePuzzle8_EventScript_FoundScroll
 	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle8_EventScript_FoundScroll:: @ 826E814
+Route110_TrickHousePuzzle8_EventScript_FoundScroll::
 	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1
 	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle8_EventScript_Vincent:: @ 826E81F
+Route110_TrickHousePuzzle8_EventScript_Vincent::
 	trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_VincentIntro, Route110_TrickHousePuzzle8_Text_VincentDefeat
 	msgbox Route110_TrickHousePuzzle8_Text_VincentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle8_EventScript_Keira:: @ 826E836
+Route110_TrickHousePuzzle8_EventScript_Keira::
 	trainerbattle_single TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_KeiraIntro, Route110_TrickHousePuzzle8_Text_KeiraDefeat
 	msgbox Route110_TrickHousePuzzle8_Text_KeiraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle8_EventScript_Leroy:: @ 826E84D
+Route110_TrickHousePuzzle8_EventScript_Leroy::
 	trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_LeroyIntro, Route110_TrickHousePuzzle8_Text_LeroyDefeat
 	msgbox Route110_TrickHousePuzzle8_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened:: @ 826E864
+Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened::
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER I love.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle8_Text_VincentIntro: @ 826E8CD
+Route110_TrickHousePuzzle8_Text_VincentIntro:
 	.string "Not many TRAINERS have made it\n"
 	.string "this far.$"
 
-Route110_TrickHousePuzzle8_Text_VincentDefeat: @ 826E8F6
+Route110_TrickHousePuzzle8_Text_VincentDefeat:
 	.string "That must mean you're tough, too…$"
 
-Route110_TrickHousePuzzle8_Text_VincentPostBattle: @ 826E918
+Route110_TrickHousePuzzle8_Text_VincentPostBattle:
 	.string "You've beaten the POKéMON LEAGUE\n"
 	.string "CHAMPION? That's too much!$"
 
-Route110_TrickHousePuzzle8_Text_KeiraIntro: @ 826E954
+Route110_TrickHousePuzzle8_Text_KeiraIntro:
 	.string "Consider yourself lucky to be\n"
 	.string "battling me!$"
 
-Route110_TrickHousePuzzle8_Text_KeiraDefeat: @ 826E97F
+Route110_TrickHousePuzzle8_Text_KeiraDefeat:
 	.string "This isn't right!\n"
 	.string "I can't lose!$"
 
-Route110_TrickHousePuzzle8_Text_KeiraPostBattle: @ 826E99F
+Route110_TrickHousePuzzle8_Text_KeiraPostBattle:
 	.string "It's a miracle that you beat me.\n"
 	.string "You can brag about it.$"
 
-Route110_TrickHousePuzzle8_Text_LeroyIntro: @ 826E9D7
+Route110_TrickHousePuzzle8_Text_LeroyIntro:
 	.string "You've been slugging through the TRICK\n"
 	.string "HOUSE challenge, too.$"
 
-Route110_TrickHousePuzzle8_Text_LeroyDefeat: @ 826EA14
+Route110_TrickHousePuzzle8_Text_LeroyDefeat:
 	.string "I see…\n"
 	.string "You possess an extraordinary style.$"
 
-Route110_TrickHousePuzzle8_Text_LeroyPostBattle: @ 826EA3F
+Route110_TrickHousePuzzle8_Text_LeroyPostBattle:
 	.string "Seeing someone like you should please\n"
 	.string "the TRICK MASTER.$"
 
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
index 428011645..95f262dd2 100644
--- a/data/maps/Route111/scripts.inc
+++ b/data/maps/Route111/scripts.inc
@@ -6,26 +6,26 @@
 
 @ Note: LOCALID_ROUTE111_PLAYER_FALLING is a local id for this map used elsewhere. It's defined in event_objects.h
 
-Route111_MapScripts:: @ 81F0CA7
+Route111_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, Route111_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, Route111_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_OnFrame
 	.byte 0
 
-Route111_OnLoad: @ 81F0CBC
+Route111_OnLoad:
 	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_CloseDesertRuins
 	compare VAR_MIRAGE_TOWER_STATE, 1
 	call_if_eq Route111_EventScript_ShowTemporaryMirageTower
 	end
 
-Route111_EventScript_CloseDesertRuins:: @ 81F0CD1
+Route111_EventScript_CloseDesertRuins::
 	setmetatile 29, 86, METATILE_General_RockWall_RockBase, 1
 	setmetatile 29, 87, METATILE_General_RockWall_SandBase, 1
 	return
 
 @ Show Mirage Tower just prior to disintegration. Mirage Tower is otherwise handled by the map layout
-Route111_EventScript_ShowTemporaryMirageTower:: @ 81F0CE4
+Route111_EventScript_ShowTemporaryMirageTower::
 	setmetatile 18, 53, METATILE_Mauville_MirageTower_Tile0, 0
 	setmetatile 19, 53, METATILE_Mauville_MirageTower_Tile1, 0
 	setmetatile 20, 53, METATILE_Mauville_MirageTower_Tile2, 0
@@ -46,7 +46,7 @@ Route111_EventScript_ShowTemporaryMirageTower:: @ 81F0CE4
 	setmetatile 20, 58, METATILE_Mauville_MirageTower_Tile11, 0
 	return
 
-Route111_OnTransition: @ 81F0D87
+Route111_OnTransition:
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
 	special SetMirageTowerVisibility
 	call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_SetLayoutNoMirageTower
@@ -59,7 +59,7 @@ Route111_OnTransition: @ 81F0D87
 	goto_if_not_defeated TRAINER_VICKY, Route111_EventScript_SetWinstratesNotDefeated
 	end
 
-Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2
+Route111_EventScript_SetFallingPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq Route111_EventScript_SetFallingPlayerGfxMale
@@ -67,15 +67,15 @@ Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2
 	goto_if_eq Route111_EventScript_SetFallingPlayerGfxFemale
 	return
 
-Route111_EventScript_SetFallingPlayerGfxMale:: @ 81F0DDA
+Route111_EventScript_SetFallingPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-Route111_EventScript_SetFallingPlayerGfxFemale:: @ 81F0DE0
+Route111_EventScript_SetFallingPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-Route111_EventScript_CheckSetSandstorm:: @ 81F0DE6
+Route111_EventScript_CheckSetSandstorm::
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 34
 	goto_if_lt Route111_EventScript_EndCheckSetSandstorm
@@ -87,12 +87,12 @@ Route111_EventScript_CheckSetSandstorm:: @ 81F0DE6
 	goto_if_gt Route111_EventScript_EndCheckSetSandstorm
 	compare VAR_TEMP_0, 8
 	goto_if_lt Route111_EventScript_EndCheckSetSandstorm
-Route111_EventScript_SetSandstorm:: @ 81F0E22
+Route111_EventScript_SetSandstorm::
 	setweather WEATHER_SANDSTORM
-Route111_EventScript_EndCheckSetSandstorm:: @ 81F0E25
+Route111_EventScript_EndCheckSetSandstorm::
 	return
 
-Route111_EventScript_SetWinstratesNotDefeated:: @ 81F0E26
+Route111_EventScript_SetWinstratesNotDefeated::
 	clearflag FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
@@ -102,27 +102,27 @@ Route111_EventScript_SetWinstratesNotDefeated:: @ 81F0E26
 	cleartrainerflag TRAINER_VIVI
 	end
 
-Route111_EventScript_SetLayoutNoMirageTower:: @ 81F0E3C
+Route111_EventScript_SetLayoutNoMirageTower::
 	setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER
 	return
 
-Route111_EventScript_SetMirageTowerGone:: @ 81F0E40
+Route111_EventScript_SetMirageTowerGone::
 	setvar VAR_MIRAGE_TOWER_STATE, 3
 	return
 
-Route111_OnWarp: @ 81F0E46
+Route111_OnWarp:
 	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_HidePlayerForMirageTower
 	.2byte 0
 
-Route111_EventScript_HidePlayerForMirageTower:: @ 81F0E50
+Route111_EventScript_HidePlayerForMirageTower::
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN
 	end
 
-Route111_OnFrame: @ 81F0E56
+Route111_OnFrame:
 	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_MirageTowerDisappear
 	.2byte 0
 
-Route111_EventScript_MirageTowerDisappear:: @ 81F0E60
+Route111_EventScript_MirageTowerDisappear::
 	lockall
 	special StartMirageTowerShake
 	waitstate
@@ -147,13 +147,13 @@ Route111_EventScript_MirageTowerDisappear:: @ 81F0E60
 	releaseall
 	end
 
-Route111_EventScript_RootFossilDisappeared:: @ 81F0EA7
+Route111_EventScript_RootFossilDisappeared::
 	msgbox Route111_Text_RootFossilDisappeared, MSGBOX_DEFAULT
 	releaseall
 	end
 
 @ Unused
-Route111_Movement_PlayerFall:: @ 81F0EB1
+Route111_Movement_PlayerFall::
 	store_lock_anim
 	walk_fast_down
 	walk_fast_down
@@ -163,7 +163,7 @@ Route111_Movement_PlayerFall:: @ 81F0EB1
 	walk_fast_down
 	step_end
 
-Route111_EventScript_Girl:: @ 81F0EB9
+Route111_EventScript_Girl::
 	lock
 	faceplayer
 	dotimebasedevents
@@ -178,38 +178,38 @@ Route111_EventScript_Girl:: @ 81F0EB9
 	release
 	end
 
-Route111_EventScript_ReceivedBerry:: @ 81F0EF4
+Route111_EventScript_ReceivedBerry::
 	msgbox Route111_Text_WhatColorBerriesToLookForToday, MSGBOX_DEFAULT
 	release
 	end
 
 @ Unused
-Route111_EventScript_ViciousSandstormTriggerUp:: @ 81F0EFE
+Route111_EventScript_ViciousSandstormTriggerUp::
 	lockall
 	setvar VAR_0x8004, 0
 	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_ViciousSandstormTriggerDown:: @ 81F0F0A
+Route111_EventScript_ViciousSandstormTriggerDown::
 	lockall
 	setvar VAR_0x8004, 1
 	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_ViciousSandstormTriggerLeft:: @ 81F0F16
+Route111_EventScript_ViciousSandstormTriggerLeft::
 	lockall
 	setvar VAR_0x8004, 2
 	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
 @ Unused
-Route111_EventScript_ViciousSandstormTriggerRight:: @ 81F0F22
+Route111_EventScript_ViciousSandstormTriggerRight::
 	lockall
 	setvar VAR_0x8004, 3
 	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_ViciousSandstormTrigger:: @ 81F0F2E
+Route111_EventScript_ViciousSandstormTrigger::
 	checkitem ITEM_GO_GOGGLES, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route111_EventScript_PreventRouteAccess
@@ -217,7 +217,7 @@ Route111_EventScript_ViciousSandstormTrigger:: @ 81F0F2E
 	releaseall
 	end
 
-Route111_EventScript_PreventRouteAccess:: @ 81F0F45
+Route111_EventScript_PreventRouteAccess::
 	msgbox gText_SandstormIsVicious, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8004, 0
@@ -231,56 +231,56 @@ Route111_EventScript_PreventRouteAccess:: @ 81F0F45
 	releaseall
 	end
 
-Route111_EventScript_PushUpFromRoute:: @ 81F0F7C
+Route111_EventScript_PushUpFromRoute::
 	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushUpFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_PushDownFromRoute:: @ 81F0F87
+Route111_EventScript_PushDownFromRoute::
 	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushDownFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_PushLeftFromRoute:: @ 81F0F92
+Route111_EventScript_PushLeftFromRoute::
 	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushLeftFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_PushRightFromRoute:: @ 81F0F9D
+Route111_EventScript_PushRightFromRoute::
 	applymovement OBJ_EVENT_ID_PLAYER, Route111_Movement_PushRightFromRoute
 	waitmovement 0
 	return
 
-Route111_Movement_PushUpFromRoute: @ 81F0FA8
+Route111_Movement_PushUpFromRoute:
 	walk_up
 	step_end
 
-Route111_Movement_PushDownFromRoute: @ 81F0FAA
+Route111_Movement_PushDownFromRoute:
 	walk_down
 	step_end
 
-Route111_Movement_PushLeftFromRoute: @ 81F0FAC
+Route111_Movement_PushLeftFromRoute:
 	walk_left
 	step_end
 
-Route111_Movement_PushRightFromRoute: @ 81F0FAE
+Route111_Movement_PushRightFromRoute:
 	walk_right
 	step_end
 
-Route111_EventScript_SunTrigger:: @ 81F0FB0
+Route111_EventScript_SunTrigger::
 	setweather WEATHER_SUNNY
 	fadenewbgm MUS_ROUTE110
 	doweather
 	setvar VAR_TEMP_3, 0
 	end
 
-Route111_EventScript_SandstormTrigger:: @ 81F0FBD
+Route111_EventScript_SandstormTrigger::
 	setweather WEATHER_SANDSTORM
 	fadenewbgm MUS_ROUTE111
 	doweather
 	end
 
-Route111_EventScript_Victor:: @ 81F0FC5
+Route111_EventScript_Victor::
 	lock
 	faceplayer
 	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
@@ -291,7 +291,7 @@ Route111_EventScript_Victor:: @ 81F0FC5
 	release
 	end
 
-Route111_EventScript_BattleWinstrates:: @ 81F0FE7
+Route111_EventScript_BattleWinstrates::
 	msgbox Route111_Text_VictorIntro, MSGBOX_DEFAULT
 	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_VictorDefeat
 	applymovement LOCALID_VICTOR, Common_Movement_WalkInPlaceFastestUp
@@ -360,64 +360,64 @@ Route111_EventScript_BattleWinstrates:: @ 81F0FE7
 	release
 	end
 
-Route111_EventScript_OpenWinstrateDoor:: @ 81F113C
+Route111_EventScript_OpenWinstrateDoor::
 	opendoor 13, 113
 	waitdooranim
 	return
 
-Route111_EventScript_CloseWinstrateDoor:: @ 81F1143
+Route111_EventScript_CloseWinstrateDoor::
 	closedoor 13, 113
 	waitdooranim
 	return
 
-Route111_Movement_WinstrateEnterHouse: @ 81F114A
+Route111_Movement_WinstrateEnterHouse:
 	walk_in_place_fastest_up
 	walk_up
 	step_end
 
-Route111_Movement_WinstrateExitHouse: @ 81F114D
+Route111_Movement_WinstrateExitHouse:
 	walk_down
 	step_end
 
-Route111_Movement_WaitForNextWinstrate: @ 81F114F
+Route111_Movement_WaitForNextWinstrate:
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-Route111_EventScript_RouteSignMauville:: @ 81F1153
+Route111_EventScript_RouteSignMauville::
 	msgbox Route111_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route111_EventScript_WinstrateHouseSign:: @ 81F115C
+Route111_EventScript_WinstrateHouseSign::
 	msgbox Route111_Text_WinstrateHouseSign, MSGBOX_SIGN
 	end
 
-Route111_EventScript_RouteSign112:: @ 81F1165
+Route111_EventScript_RouteSign112::
 	msgbox Route111_Text_RouteSign112, MSGBOX_SIGN
 	end
 
-Route111_EventScript_RouteSign113:: @ 81F116E
+Route111_EventScript_RouteSign113::
 	msgbox Route111_Text_RouteSign113, MSGBOX_SIGN
 	end
 
-Route111_EventScript_OldLadysRestStopSign:: @ 81F1177
+Route111_EventScript_OldLadysRestStopSign::
 	msgbox Route111_Text_OldLadysRestStopSign, MSGBOX_SIGN
 	end
 
-Route111_EventScript_TrainerTipsSpAtkSpDef:: @ 81F1180
+Route111_EventScript_TrainerTipsSpAtkSpDef::
 	msgbox Route111_Text_TrainerTipsSpAtkSpDef, MSGBOX_SIGN
 	end
 
-Route111_EventScript_Man1:: @ 81F1189
+Route111_EventScript_Man1::
 	msgbox Route111_Text_ToughToKeepWinningUpTheRanks, MSGBOX_NPC
 	end
 
-Route111_EventScript_Man2:: @ 81F1192
+Route111_EventScript_Man2::
 	msgbox Route111_Text_WinstrateFamilyDestroyedMe, MSGBOX_NPC
 	end
 
-Route111_EventScript_Hiker:: @ 81F119B
+Route111_EventScript_Hiker::
 	lock
 	faceplayer
 	compare VAR_MIRAGE_TOWER_STATE, 3
@@ -429,22 +429,22 @@ Route111_EventScript_Hiker:: @ 81F119B
 	release
 	end
 
-Route111_EventScript_HikerMirageTowerGone:: @ 81F11C6
+Route111_EventScript_HikerMirageTowerGone::
 	msgbox Route111_Text_MirageTowerHasntBeenSeenSince, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_HikerMirageTowerDisintegrated:: @ 81F11D0
+Route111_EventScript_HikerMirageTowerDisintegrated::
 	msgbox Route111_Text_ThatWasShockingSandRainedDown, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_HikerMirageTowerVisible:: @ 81F11DA
+Route111_EventScript_HikerMirageTowerVisible::
 	msgbox Route111_Text_MirageTowerClearlyVisible, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_RockSmashTipFatMan:: @ 81F11E4
+Route111_EventScript_RockSmashTipFatMan::
 	lockall
 	applymovement LOCALID_ROCK_SMASH_MAN, Common_Movement_FacePlayer
 	waitmovement 0
@@ -455,27 +455,27 @@ Route111_EventScript_RockSmashTipFatMan:: @ 81F11E4
 	releaseall
 	end
 
-Route111_EventScript_Drew:: @ 81F1204
+Route111_EventScript_Drew::
 	trainerbattle_single TRAINER_DREW, Route111_Text_DrewIntro, Route111_Text_DrewDefeat
 	msgbox Route111_Text_DrewPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Heidi:: @ 81F121B
+Route111_EventScript_Heidi::
 	trainerbattle_single TRAINER_HEIDI, Route111_Text_HeidiIntro, Route111_Text_HeidiDefeat
 	msgbox Route111_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Beau:: @ 81F1232
+Route111_EventScript_Beau::
 	trainerbattle_single TRAINER_BEAU, Route111_Text_BeauIntro, Route111_Text_BeauDefeat
 	msgbox Route111_Text_BeauPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Becky:: @ 81F1249
+Route111_EventScript_Becky::
 	trainerbattle_single TRAINER_BECKY, Route111_Text_BeckyIntro, Route111_Text_BeckyDefeat
 	msgbox Route111_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Dusty:: @ 81F1260
+Route111_EventScript_Dusty::
 	trainerbattle_single TRAINER_DUSTY_1, Route111_Text_DustyIntro, Route111_Text_DustyDefeat, Route111_EventScript_RegisterDusty
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -484,7 +484,7 @@ Route111_EventScript_Dusty:: @ 81F1260
 	release
 	end
 
-Route111_EventScript_RegisterDusty:: @ 81F128C
+Route111_EventScript_RegisterDusty::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route111_Text_DustyRegister, MSGBOX_DEFAULT
@@ -492,27 +492,27 @@ Route111_EventScript_RegisterDusty:: @ 81F128C
 	release
 	end
 
-Route111_EventScript_RematchDusty:: @ 81F12AB
+Route111_EventScript_RematchDusty::
 	trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_DustyRematchIntro, Route111_Text_DustyRematchDefeat
 	msgbox Route111_Text_DustyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Travis:: @ 81F12C2
+Route111_EventScript_Travis::
 	trainerbattle_single TRAINER_TRAVIS, Route111_Text_TravisIntro, Route111_Text_TravisDefeat
 	msgbox Route111_Text_TravisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Irene:: @ 81F12D9
+Route111_EventScript_Irene::
 	trainerbattle_single TRAINER_IRENE, Route111_Text_IreneIntro, Route111_Text_IreneDefeat
 	msgbox Route111_Text_IrenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Daisuke:: @ 81F12F0
+Route111_EventScript_Daisuke::
 	trainerbattle_single TRAINER_DAISUKE, Route111_Text_DaisukeIntro, Route111_Text_DaisukeDefeat
 	msgbox Route111_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Wilton:: @ 81F1307
+Route111_EventScript_Wilton::
 	trainerbattle_single TRAINER_WILTON_1, Route111_Text_WiltonIntro, Route111_Text_WiltonDefeat, Route111_EventScript_RegisterWilton
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -521,7 +521,7 @@ Route111_EventScript_Wilton:: @ 81F1307
 	release
 	end
 
-Route111_EventScript_RegisterWilton:: @ 81F1333
+Route111_EventScript_RegisterWilton::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route111_Text_WiltonRegister, MSGBOX_DEFAULT
@@ -529,12 +529,12 @@ Route111_EventScript_RegisterWilton:: @ 81F1333
 	release
 	end
 
-Route111_EventScript_RematchWilton:: @ 81F1352
+Route111_EventScript_RematchWilton::
 	trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_WiltonRematchIntro, Route111_Text_WiltonRematchDefeat
 	msgbox Route111_Text_WiltonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Brooke:: @ 81F1369
+Route111_EventScript_Brooke::
 	trainerbattle_single TRAINER_BROOKE_1, Route111_Text_BrookeIntro, Route111_Text_BrookeDefeat, Route111_EventScript_RegisterBrooke
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -543,7 +543,7 @@ Route111_EventScript_Brooke:: @ 81F1369
 	release
 	end
 
-Route111_EventScript_RegisterBrooke:: @ 81F1395
+Route111_EventScript_RegisterBrooke::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route111_Text_BrookeRegister, MSGBOX_DEFAULT
@@ -551,112 +551,112 @@ Route111_EventScript_RegisterBrooke:: @ 81F1395
 	release
 	end
 
-Route111_EventScript_RematchBrooke:: @ 81F13B4
+Route111_EventScript_RematchBrooke::
 	trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_BrookeRematchIntro, Route111_Text_BrookeRematchDefeat
 	msgbox Route111_Text_BrookePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Hayden:: @ 81F13CB
+Route111_EventScript_Hayden::
 	trainerbattle_single TRAINER_HAYDEN, Route111_Text_HaydenIntro, Route111_Text_HaydenDefeat
 	msgbox Route111_Text_HaydenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Bianca:: @ 81F13E2
+Route111_EventScript_Bianca::
 	trainerbattle_single TRAINER_BIANCA, Route111_Text_BiancaIntro, Route111_Text_BiancaDefeat
 	msgbox Route111_Text_BiancaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Tyron:: @ 81F13F9
+Route111_EventScript_Tyron::
 	trainerbattle_single TRAINER_TYRON, Route111_Text_TyronIntro, Route111_Text_TyronDefeat
 	msgbox Route111_Text_TyronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Celina:: @ 81F1410
+Route111_EventScript_Celina::
 	trainerbattle_single TRAINER_CELINA, Route111_Text_CelinaIntro, Route111_Text_CelinaDefeat
 	msgbox Route111_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Celia:: @ 81F1427
+Route111_EventScript_Celia::
 	trainerbattle_single TRAINER_CELIA, Route111_Text_CeliaIntro, Route111_Text_CeliaDefeat
 	msgbox Route111_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Bryan:: @ 81F143E
+Route111_EventScript_Bryan::
 	trainerbattle_single TRAINER_BRYAN, Route111_Text_BryanIntro, Route111_Text_BryanDefeat
 	msgbox Route111_Text_BryanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_Branden:: @ 81F1455
+Route111_EventScript_Branden::
 	trainerbattle_single TRAINER_BRANDEN, Route111_Text_BrandenIntro, Route111_Text_BrandenDefeat
 	msgbox Route111_Text_BrandenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_TrainerHillSign:: @ 81F146C
+Route111_EventScript_TrainerHillSign::
 	msgbox Route111_Text_TrainerHillSign, MSGBOX_SIGN
 	end
 
-Route111_Text_BattleOurFamily: @ 81F1475
+Route111_Text_BattleOurFamily:
 	.string "Hello! I take it you're a traveler.\p"
 	.string "How's this? What do you say to taking\n"
 	.string "on our family of four in a series of\l"
 	.string "POKéMON battles?$"
 
-Route111_Text_IsThatSo: @ 81F14F5
+Route111_Text_IsThatSo:
 	.string "Is that so?\n"
 	.string "Drop in, if you change your mind!$"
 
-Route111_Text_VictorIntro: @ 81F1523
+Route111_Text_VictorIntro:
 	.string "That's the spirit! I like you!$"
 
-Route111_Text_VictorDefeat: @ 81F1542
+Route111_Text_VictorDefeat:
 	.string "Aiyah!\n"
 	.string "You're a lot tougher than I expected!$"
 
-Route111_Text_VictorPostBattle: @ 81F156F
+Route111_Text_VictorPostBattle:
 	.string "Hey, all!\n"
 	.string "I've found a pretty strong TRAINER!$"
 
-Route111_Text_VictoriaIntro: @ 81F159D
+Route111_Text_VictoriaIntro:
 	.string "Oh, my goodness! Aren't you young?\p"
 	.string "You must be quite the TRAINER to beat\n"
 	.string "my husband, though.\p"
 	.string "It's my turn to battle now!$"
 
-Route111_Text_VictoriaDefeat: @ 81F1616
+Route111_Text_VictoriaDefeat:
 	.string "Oh, gosh!\n"
 	.string "I can't get over how strong you are!$"
 
-Route111_Text_VictoriaPostBattle: @ 81F1645
+Route111_Text_VictoriaPostBattle:
 	.string "There's a strong TRAINER here!\n"
 	.string "This one's really strong!$"
 
-Route111_Text_ViviIntro: @ 81F167E
+Route111_Text_ViviIntro:
 	.string "You're stronger than Mommy? Wow!\p"
 	.string "But I'm strong, too!\n"
 	.string "Really! Honestly!$"
 
-Route111_Text_ViviDefeat: @ 81F16C6
+Route111_Text_ViviDefeat:
 	.string "Huh? Did I just lose?$"
 
-Route111_Text_ViviPostBattle: @ 81F16DC
+Route111_Text_ViviPostBattle:
 	.string "This stinks…\p"
 	.string "…Snivel… Grandma!$"
 
-Route111_Text_VickyIntro: @ 81F16FB
+Route111_Text_VickyIntro:
 	.string "How dare you make my granddaughter\n"
 	.string "cry!\p"
 	.string "For that, I'm going to smack you!\n"
 	.string "Prepare to lose!$"
 
-Route111_Text_VickyDefeat: @ 81F1756
+Route111_Text_VickyDefeat:
 	.string "Kwah! You are strong…\n"
 	.string "My granddaughter was right…$"
 
-Route111_Text_VickyPostBattle: @ 81F1788
+Route111_Text_VickyPostBattle:
 	.string "If you're not in any hurry,\n"
 	.string "visit with us awhile.$"
 
-Route111_Text_ToughToKeepWinningUpTheRanks: @ 81F17BA
+Route111_Text_ToughToKeepWinningUpTheRanks:
 	.string "If you don't raise your POKéMON some\n"
 	.string "more, it could be tough to keep winning\l"
 	.string "up through the ranks.\p"
@@ -664,32 +664,32 @@ Route111_Text_ToughToKeepWinningUpTheRanks: @ 81F17BA
 	.string "ELITE FOUR are far stronger than\l"
 	.string "any GYM LEADER.$"
 
-Route111_Text_WinstrateFamilyDestroyedMe: @ 81F186E
+Route111_Text_WinstrateFamilyDestroyedMe:
 	.string "I challenged the WINSTRATE family,\n"
 	.string "but four matches in a row is tough\l"
 	.string "going… They destroyed me.$"
 
-Route111_Text_RouteSignMauville: @ 81F18CE
+Route111_Text_RouteSignMauville:
 	.string "ROUTE 111\n"
 	.string "{DOWN_ARROW} MAUVILLE CITY$"
 
-Route111_Text_WinstrateHouseSign: @ 81F18E8
+Route111_Text_WinstrateHouseSign:
 	.string "“Our family's hearts beat as one!”\n"
 	.string "THE WINSTRATE'S HOUSE$"
 
-Route111_Text_RouteSign112: @ 81F1921
+Route111_Text_RouteSign112:
 	.string "ROUTE 111\n"
 	.string "{LEFT_ARROW} ROUTE 112$"
 
-Route111_Text_RouteSign113: @ 81F1937
+Route111_Text_RouteSign113:
 	.string "ROUTE 111\n"
 	.string "{LEFT_ARROW} ROUTE 113$"
 
-Route111_Text_OldLadysRestStopSign: @ 81F194D
+Route111_Text_OldLadysRestStopSign:
 	.string "OLD LADY'S REST STOP\n"
 	.string "“Come in and rest your tired bones.”$"
 
-Route111_Text_TrainerTipsSpAtkSpDef: @ 81F1987
+Route111_Text_TrainerTipsSpAtkSpDef:
 	.string "TRAINER TIPS\p"
 	.string "One of the indicators of a POKéMON's\n"
 	.string "powerfulness is SP. ATK. It stands for\l"
@@ -697,14 +697,14 @@ Route111_Text_TrainerTipsSpAtkSpDef: @ 81F1987
 	.string "Likewise, SP. DEF stands for “SPECIAL\n"
 	.string "DEFENSE.”$"
 
-Route111_Text_ShouldBeMirageTowerAroundHere: @ 81F1A22
+Route111_Text_ShouldBeMirageTowerAroundHere:
 	.string "There should be a tower made of sand\n"
 	.string "around here somewhere.\p"
 	.string "But for some reason, it can be seen\n"
 	.string "sometimes, and sometimes not.\p"
 	.string "That's why I call it the MIRAGE TOWER.$"
 
-Route111_Text_MirageTowerClearlyVisible: @ 81F1AC7
+Route111_Text_MirageTowerClearlyVisible:
 	.string "I see it!\n"
 	.string "The tower of sand!\p"
 	.string "The sand tower they called a mirage\n"
@@ -714,7 +714,7 @@ Route111_Text_MirageTowerClearlyVisible: @ 81F1AC7
 	.string "I want to go inside it, but I can't\n"
 	.string "get my courage up for it…$"
 
-Route111_Text_ThatWasShockingSandRainedDown: @ 81F1B92
+Route111_Text_ThatWasShockingSandRainedDown:
 	.string "Whoa…\n"
 	.string "That was shocking.\p"
 	.string "Sand rained down in chunks all of\n"
@@ -722,21 +722,21 @@ Route111_Text_ThatWasShockingSandRainedDown: @ 81F1B92
 	.string "What was it like inside?\n"
 	.string "Were there sandy ghosts and such?$"
 
-Route111_Text_MirageTowerHasntBeenSeenSince: @ 81F1C12
+Route111_Text_MirageTowerHasntBeenSeenSince:
 	.string "Since I spoke to you, the tower of sand\n"
 	.string "hasn't been seen.\p"
 	.string "Perhaps it really was\n"
 	.string "the MIRAGE TOWER…$"
 
-Route111_Text_ClawFossilDisappeared: @ 81F1C74
+Route111_Text_ClawFossilDisappeared:
 	.string "The CLAW FOSSIL disappeared into\n"
 	.string "the sand…$"
 
-Route111_Text_RootFossilDisappeared: @ 81F1C9F
+Route111_Text_RootFossilDisappeared:
 	.string "The ROOT FOSSIL disappeared into\n"
 	.string "the sand…$"
 
-Route111_Text_MauvilleUncleToldMeToTakeRockSmash: @ 81F1CCA
+Route111_Text_MauvilleUncleToldMeToTakeRockSmash:
 	.string "Oh, no!\p"
 	.string "My uncle in MAUVILLE told me to take\n"
 	.string "ROCK SMASH with me if I was going to\l"
@@ -744,7 +744,7 @@ Route111_Text_MauvilleUncleToldMeToTakeRockSmash: @ 81F1CCA
 	.string "My uncle? He lives across from\n"
 	.string "the bike shop in MAUVILLE.$"
 
-Route111_Text_TrainerHillSign: @ 81F1D61
+Route111_Text_TrainerHillSign:
 	.string "{RIGHT_ARROW} TRAINER HILL ENTRANCE\p"
 	.string "“Scale the heights, you hot-blooded\n"
 	.string "TRAINERS!”$"
diff --git a/data/maps/Route111_OldLadysRestStop/scripts.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc
index 0df1e6b6e..645ce4de4 100644
--- a/data/maps/Route111_OldLadysRestStop/scripts.inc
+++ b/data/maps/Route111_OldLadysRestStop/scripts.inc
@@ -1,12 +1,12 @@
-Route111_OldLadysRestStop_MapScripts:: @ 822A916
+Route111_OldLadysRestStop_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route111_OldLadysRestStop_OnTransition
 	.byte 0
 
-Route111_OldLadysRestStop_OnTransition: @ 822A91C
+Route111_OldLadysRestStop_OnTransition:
 	setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP
 	end
 
-Route111_OldLadysRestStop_EventScript_OldLady:: @ 822A920
+Route111_OldLadysRestStop_EventScript_OldLady::
 	lock
 	faceplayer
 	msgbox Route111_OldLadysRestStop_Text_RestUpHere, MSGBOX_YESNO
@@ -16,7 +16,7 @@ Route111_OldLadysRestStop_EventScript_OldLady:: @ 822A920
 	goto_if_eq Route111_OldLadysRestStop_EventScript_DeclineRest
 	end
 
-Route111_OldLadysRestStop_EventScript_Rest:: @ 822A941
+Route111_OldLadysRestStop_EventScript_Rest::
 	msgbox Route111_OldLadysRestStop_Text_TakeYourTimeRestUp, MSGBOX_DEFAULT
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
@@ -27,28 +27,28 @@ Route111_OldLadysRestStop_EventScript_Rest:: @ 822A941
 	goto_if_eq Route111_OldLadysRestStop_EventScript_DeclineRest
 	end
 
-Route111_OldLadysRestStop_EventScript_DeclineRest:: @ 822A96E
+Route111_OldLadysRestStop_EventScript_DeclineRest::
 	msgbox Route111_OldLadysRestStop_Text_DontNeedToBeShy, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_OldLadysRestStop_Text_RestUpHere: @ 822A978
+Route111_OldLadysRestStop_Text_RestUpHere:
 	.string "Oh, dear, dear.\n"
 	.string "Aren't your POKéMON exhausted?\p"
 	.string "If you'd like, rest up here.\n"
 	.string "That's a fine idea! You should do that.$"
 
-Route111_OldLadysRestStop_Text_TakeYourTimeRestUp: @ 822A9EC
+Route111_OldLadysRestStop_Text_TakeYourTimeRestUp:
 	.string "That's right.\n"
 	.string "Take your time and rest up!$"
 
-Route111_OldLadysRestStop_Text_StillTiredTakeAnotherRest: @ 822AA16
+Route111_OldLadysRestStop_Text_StillTiredTakeAnotherRest:
 	.string "Oh, dear, dear.\n"
 	.string "Are your POKéMON still tired?\p"
 	.string "You should take another rest here.\n"
 	.string "That's a fine idea. You should do that.$"
 
-Route111_OldLadysRestStop_Text_DontNeedToBeShy: @ 822AA8F
+Route111_OldLadysRestStop_Text_DontNeedToBeShy:
 	.string "Is that so?\n"
 	.string "You don't need to be shy about it.$"
 
diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
index 28bf17dbf..eedd83f06 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
@@ -3,10 +3,10 @@
 .set LOCALID_VICTORIA, 3
 .set LOCALID_VICKY, 4
 
-Route111_WinstrateFamilysHouse_MapScripts:: @ 822A48C
+Route111_WinstrateFamilysHouse_MapScripts::
 	.byte 0
 
-Route111_WinstrateFamilysHouse_EventScript_Victor:: @ 822A48D
+Route111_WinstrateFamilysHouse_EventScript_Victor::
 	lock
 	faceplayer
 	setvar VAR_0x8008, LOCALID_VICTOR
@@ -14,7 +14,7 @@ Route111_WinstrateFamilysHouse_EventScript_Victor:: @ 822A48D
 	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_Victoria:: @ 822A4A2
+Route111_WinstrateFamilysHouse_EventScript_Victoria::
 	lock
 	faceplayer
 	setvar VAR_0x8008, LOCALID_VICTORIA
@@ -27,12 +27,12 @@ Route111_WinstrateFamilysHouse_EventScript_Victoria:: @ 822A4A2
 	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace:: @ 822A4DA
+Route111_WinstrateFamilysHouse_EventScript_ReceivedMachoBrace::
 	msgbox Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles, MSGBOX_DEFAULT
 	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_Vivi:: @ 822A4E8
+Route111_WinstrateFamilysHouse_EventScript_Vivi::
 	lock
 	faceplayer
 	setvar VAR_0x8008, LOCALID_VIVI
@@ -40,7 +40,7 @@ Route111_WinstrateFamilysHouse_EventScript_Vivi:: @ 822A4E8
 	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_Vicky:: @ 822A4FD
+Route111_WinstrateFamilysHouse_EventScript_Vicky::
 	lock
 	faceplayer
 	setvar VAR_0x8008, LOCALID_VICKY
@@ -50,19 +50,19 @@ Route111_WinstrateFamilysHouse_EventScript_Vicky:: @ 822A4FD
 	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo:: @ 822A51E
+Route111_WinstrateFamilysHouse_EventScript_AlreadySpokenTo::
 	msgbox Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort, MSGBOX_DEFAULT
 	goto Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection
 	end
 
-Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection:: @ 822A52C
+Route111_WinstrateFamilysHouse_EventScript_FaceOriginalDirection::
 	closemessage
 	applymovement VAR_0x8008, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou: @ 822A539
+Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou:
 	.string "You're the first TRAINER I've seen who\n"
 	.string "deploys POKéMON so masterfully.\p"
 	.string "But, I should tell you--my son is\n"
@@ -70,7 +70,7 @@ Route111_WinstrateFamilysHouse_Text_MySonIsStrongerThanYou: @ 822A539
 	.string "He even took the POKéMON LEAGUE\n"
 	.string "challenge, I'll have you know.$"
 
-Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace: @ 822A5F4
+Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace:
 	.string "We use this MACHO BRACE to more\n"
 	.string "effectively strengthen our POKéMON\l"
 	.string "in training.\p"
@@ -78,18 +78,18 @@ Route111_WinstrateFamilysHouse_Text_LikeYouToHaveMachoBrace: @ 822A5F4
 	.string "I don't know if you need it, but we\l"
 	.string "would like you to have our MACHO BRACE.$"
 
-Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles: @ 822A6B4
+Route111_WinstrateFamilysHouse_Text_PassionateAboutBattles:
 	.string "When it comes to POKéMON battles,\n"
 	.string "we tend to be pretty passionate.$"
 
-Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers: @ 822A6F7
+Route111_WinstrateFamilysHouse_Text_StrongerFamilyMembers:
 	.string "Mommy is stronger than Daddy.\p"
 	.string "I'm stronger than Mommy.\p"
 	.string "And Grandma's stronger than me!\p"
 	.string "But my big brother is even stronger\n"
 	.string "than Grandma.$"
 
-Route111_WinstrateFamilysHouse_Text_GrandsonStrong: @ 822A780
+Route111_WinstrateFamilysHouse_Text_GrandsonStrong:
 	.string "There's no question that you're strong.\p"
 	.string "But if you were to battle my grandson,\n"
 	.string "you'd end up crying in frustration.\p"
@@ -100,7 +100,7 @@ Route111_WinstrateFamilysHouse_Text_GrandsonStrong: @ 822A780
 	.string "Knowing my grandson, he could be the\n"
 	.string "CHAMPION already!$"
 
-Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort: @ 822A89B
+Route111_WinstrateFamilysHouse_Text_GrandsonStrongShort:
 	.string "My grandson must be challenging the\n"
 	.string "POKéMON LEAGUE CHAMPION by now.\p"
 	.string "Knowing my grandson, he could be the\n"
diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc
index 67f776f67..4f9d60206 100644
--- a/data/maps/Route112/scripts.inc
+++ b/data/maps/Route112/scripts.inc
@@ -1,16 +1,16 @@
 .set LOCALID_GRUNT_1, 1
 .set LOCALID_GRUNT_2, 6
 
-Route112_MapScripts:: @ 81F1DA8
+Route112_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route112_OnTransition
 	.byte 0
 
-Route112_OnTransition: @ 81F1DAE
+Route112_OnTransition:
 	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
-Route112_EventScript_MagmaGrunts:: @ 81F1DB7
+Route112_EventScript_MagmaGrunts::
 	lockall
 	delay 40
 	applymovement LOCALID_GRUNT_1, Common_Movement_WalkInPlaceFastestRight
@@ -47,28 +47,28 @@ Route112_EventScript_MagmaGrunts:: @ 81F1DB7
 	releaseall
 	end
 
-Route112_EventScript_MtChimneyCableCarSign:: @ 81F1E46
+Route112_EventScript_MtChimneyCableCarSign::
 	msgbox Route112_Text_MtChimneyCableCarSign, MSGBOX_SIGN
 	end
 
-Route112_EventScript_MtChimneySign:: @ 81F1E4F
+Route112_EventScript_MtChimneySign::
 	msgbox Route112_Text_MtChimneySign, MSGBOX_SIGN
 	end
 
-Route112_EventScript_RouteSignLavaridge:: @ 81F1E58
+Route112_EventScript_RouteSignLavaridge::
 	msgbox Route112_Text_RouteSignLavaridge, MSGBOX_SIGN
 	end
 
-Route112_EventScript_Hiker:: @ 81F1E61
+Route112_EventScript_Hiker::
 	msgbox Route112_Text_NotEasyToGetBackToLavaridge, MSGBOX_NPC
 	end
 
-Route112_EventScript_Brice:: @ 81F1E6A
+Route112_EventScript_Brice::
 	trainerbattle_single TRAINER_BRICE, Route112_Text_BriceIntro, Route112_Text_BriceDefeat
 	msgbox Route112_Text_BricePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_Trent:: @ 81F1E81
+Route112_EventScript_Trent::
 	trainerbattle_single TRAINER_TRENT_1, Route112_Text_TrentIntro, Route112_Text_TrentDefeat, Route112_EventScript_RegisterTrent
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -77,7 +77,7 @@ Route112_EventScript_Trent:: @ 81F1E81
 	release
 	end
 
-Route112_EventScript_RegisterTrent:: @ 81F1EAD
+Route112_EventScript_RegisterTrent::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route112_Text_TrentRegister, MSGBOX_DEFAULT
@@ -85,62 +85,62 @@ Route112_EventScript_RegisterTrent:: @ 81F1EAD
 	release
 	end
 
-Route112_EventScript_RematchTrent:: @ 81F1ECC
+Route112_EventScript_RematchTrent::
 	trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_TrentRematchIntro, Route112_Text_TrentRematchDefeat
 	msgbox Route112_Text_TrentRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_Larry:: @ 81F1EE3
+Route112_EventScript_Larry::
 	trainerbattle_single TRAINER_LARRY, Route112_Text_LarryIntro, Route112_Text_LarryDefeat
 	msgbox Route112_Text_LarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_Carol:: @ 81F1EFA
+Route112_EventScript_Carol::
 	trainerbattle_single TRAINER_CAROL, Route112_Text_CarolIntro, Route112_Text_CarolDefeat
 	msgbox Route112_Text_CarolPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_Bryant:: @ 81F1F11
+Route112_EventScript_Bryant::
 	trainerbattle_single TRAINER_BRYANT, Route112_Text_BryantIntro, Route112_Text_BryantDefeat
 	msgbox Route112_Text_BryantPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_Shayla:: @ 81F1F28
+Route112_EventScript_Shayla::
 	trainerbattle_single TRAINER_SHAYLA, Route112_Text_ShaylaIntro, Route112_Text_ShaylaDefeat
 	msgbox Route112_Text_ShaylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_Text_LeaderGoingToAwakenThing: @ 81F1F3F
+Route112_Text_LeaderGoingToAwakenThing:
 	.string "Hey, man, is our leader really going\n"
 	.string "to awaken that thing?$"
 
-Route112_Text_YeahWeNeedMeteorite: @ 81F1F7A
+Route112_Text_YeahWeNeedMeteorite:
 	.string "Sounds like it, yeah. But I heard\n"
 	.string "we need a METEORITE to do it.$"
 
-Route112_Text_OhThatsWhyCrewWentToFallarbor: @ 81F1FBA
+Route112_Text_OhThatsWhyCrewWentToFallarbor:
 	.string "Oh, I get it now. That's why the rest\n"
 	.string "of the crew went out to FALLARBOR.$"
 
-Route112_Text_CantLetAnyonePassUntilTheyreBack: @ 81F2003
+Route112_Text_CantLetAnyonePassUntilTheyreBack:
 	.string "You got it. And until they come back,\n"
 	.string "we're not to let anyone pass, right.$"
 
-Route112_Text_NotEasyToGetBackToLavaridge: @ 81F204E
+Route112_Text_NotEasyToGetBackToLavaridge:
 	.string "Eh, I'd like to get to MAUVILLE, but if\n"
 	.string "I went down these ledges, it'd be no\l"
 	.string "easy matter to get back to LAVARIDGE.$"
 
-Route112_Text_MtChimneyCableCarSign: @ 81F20C1
+Route112_Text_MtChimneyCableCarSign:
 	.string "MT. CHIMNEY CABLE CAR\n"
 	.string "“A short walk {UP_ARROW} way!”$"
 
-Route112_Text_MtChimneySign: @ 81F20ED
+Route112_Text_MtChimneySign:
 	.string "MT. CHIMNEY\p"
 	.string "“For LAVARIDGE TOWN or the summit,\n"
 	.string "please take the CABLE CAR.”$"
 
-Route112_Text_RouteSignLavaridge: @ 81F2138
+Route112_Text_RouteSignLavaridge:
 	.string "ROUTE 112\n"
 	.string "{LEFT_ARROW} LAVARIDGE TOWN$"
 
diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc
index 6781b154c..ebc5142ae 100644
--- a/data/maps/Route112_CableCarStation/scripts.inc
+++ b/data/maps/Route112_CableCarStation/scripts.inc
@@ -1,26 +1,26 @@
 .set LOCALID_ATTENDANT, 1
 
-Route112_CableCarStation_MapScripts:: @ 822AABE
+Route112_CableCarStation_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route112_CableCarStation_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route112_CableCarStation_OnFrame
 	.byte 0
 
-Route112_CableCarStation_OnTransition: @ 822AAC9
+Route112_CableCarStation_OnTransition:
 	setescapewarp MAP_ROUTE112, 255, 28, 28
 	compare VAR_CABLE_CAR_STATION_STATE, 2
 	call_if_eq Route112_CableCarStation_EventScript_MoveAttendantAside
 	end
 
-Route112_CableCarStation_EventScript_MoveAttendantAside:: @ 822AADD
+Route112_CableCarStation_EventScript_MoveAttendantAside::
 	setobjectxyperm LOCALID_ATTENDANT, 7, 4
 	setobjectmovementtype LOCALID_ATTENDANT, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-Route112_CableCarStation_OnFrame: @ 822AAE9
+Route112_CableCarStation_OnFrame:
 	map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_ExitCableCar
 	.2byte 0
 
-Route112_CableCarStation_EventScript_ExitCableCar:: @ 822AAF3
+Route112_CableCarStation_EventScript_ExitCableCar::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_ExitCableCar
 	applymovement LOCALID_ATTENDANT, Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar
@@ -31,7 +31,7 @@ Route112_CableCarStation_EventScript_ExitCableCar:: @ 822AAF3
 	releaseall
 	end
 
-Route112_CableCarStation_EventScript_Attendant:: @ 822AB17
+Route112_CableCarStation_EventScript_Attendant::
 	lock
 	faceplayer
 	msgbox Route112_CableCarStation_Text_CableCarReadyGetOn, MSGBOX_YESNO
@@ -41,7 +41,7 @@ Route112_CableCarStation_EventScript_Attendant:: @ 822AB17
 	goto_if_eq Route112_CableCarStation_EventScript_DeclineRide
 	end
 
-Route112_CableCarStation_EventScript_RideCableCar:: @ 822AB38
+Route112_CableCarStation_EventScript_RideCableCar::
 	msgbox Route112_CableCarStation_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_ATTENDANT, Route112_CableCarStation_Movement_LeadPlayerToCableCar
@@ -56,46 +56,46 @@ Route112_CableCarStation_EventScript_RideCableCar:: @ 822AB38
 	release
 	end
 
-Route112_CableCarStation_EventScript_DeclineRide:: @ 822AB67
+Route112_CableCarStation_EventScript_DeclineRide::
 	msgbox Route112_CableCarStation_Text_RideAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-Route112_CableCarStation_Movement_LeadPlayerToCableCar: @ 822AB71
+Route112_CableCarStation_Movement_LeadPlayerToCableCar:
 	walk_up
 	walk_up
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar: @ 822AB76
+Route112_CableCarStation_Movement_FollowPlayerOutFromCableCar:
 	delay_16
 	walk_left
 	walk_down
 	walk_down
 	step_end
 
-Route112_CableCarStation_Movement_BoardCableCar: @ 822AB7B
+Route112_CableCarStation_Movement_BoardCableCar:
 	walk_up
 	walk_up
 	walk_up
 	delay_16
 	step_end
 
-Route112_CableCarStation_Movement_ExitCableCar: @ 822AB80
+Route112_CableCarStation_Movement_ExitCableCar:
 	walk_down
 	walk_down
 	walk_down
 	delay_16
 	step_end
 
-Route112_CableCarStation_Text_CableCarReadyGetOn: @ 822AB85
+Route112_CableCarStation_Text_CableCarReadyGetOn:
 	.string "The CABLE CAR is ready to go up.\n"
 	.string "Would you like to be on it?$"
 
-Route112_CableCarStation_Text_StepThisWay: @ 822ABC2
+Route112_CableCarStation_Text_StepThisWay:
 	.string "Please step this way.$"
 
-Route112_CableCarStation_Text_RideAnotherTime: @ 822ABD8
+Route112_CableCarStation_Text_RideAnotherTime:
 	.string "Please ride with us another time.$"
 
diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc
index 24c57c29c..0a8bb092c 100644
--- a/data/maps/Route113/scripts.inc
+++ b/data/maps/Route113/scripts.inc
@@ -1,18 +1,18 @@
-Route113_MapScripts:: @ 81F2153
+Route113_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Route113_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route113_OnTransition
 	.byte 0
 
-Route113_OnResume: @ 81F215E
+Route113_OnResume:
 	setstepcallback STEP_CB_ASH
 	end
 
-Route113_OnTransition: @ 81F2161
+Route113_OnTransition:
 	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
 	call Route113_EventScript_CheckSetAshWeather
 	end
 
-Route113_EventScript_CheckSetAshWeather:: @ 81F216A
+Route113_EventScript_CheckSetAshWeather::
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_0, 19
 	goto_if_lt Route113_EventScript_DontSetAshWeather
@@ -21,44 +21,44 @@ Route113_EventScript_CheckSetAshWeather:: @ 81F216A
 	setweather WEATHER_VOLCANIC_ASH
 	return
 
-Route113_EventScript_DontSetAshWeather:: @ 81F2189
+Route113_EventScript_DontSetAshWeather::
 	return
 
-Route113_EventScript_Gentleman:: @ 81F218A
+Route113_EventScript_Gentleman::
 	msgbox Route113_Text_AshCanBeFashionedIntoGlass, MSGBOX_NPC
 	end
 
-Route113_EventScript_NinjaBoy:: @ 81F2193
+Route113_EventScript_NinjaBoy::
 	msgbox Route113_Text_FunWalkingThroughAsh, MSGBOX_NPC
 	end
 
-Route113_EventScript_RouteSign111:: @ 81F219C
+Route113_EventScript_RouteSign111::
 	msgbox Route113_Text_RouteSign111, MSGBOX_SIGN
 	end
 
-Route113_EventScript_RouteSignFallarbor:: @ 81F21A5
+Route113_EventScript_RouteSignFallarbor::
 	msgbox Route113_Text_RouteSignFallarbor, MSGBOX_SIGN
 	end
 
-Route113_EventScript_GlassWorkshopSign:: @ 81F21AE
+Route113_EventScript_GlassWorkshopSign::
 	msgbox Route113_Text_GlassWorkshopSign, MSGBOX_SIGN
 	end
 
-Route113_EventScript_TrainerTipsRegisterKeyItems:: @ 81F21B7
+Route113_EventScript_TrainerTipsRegisterKeyItems::
 	msgbox Route113_Text_TrainerTipsRegisterKeyItems, MSGBOX_SIGN
 	end
 
-Route113_EventScript_Jaylen:: @ 81F21C0
+Route113_EventScript_Jaylen::
 	trainerbattle_single TRAINER_JAYLEN, Route113_Text_JaylenIntro, Route113_Text_JaylenDefeat
 	msgbox Route113_Text_JaylenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_Dillon:: @ 81F21D7
+Route113_EventScript_Dillon::
 	trainerbattle_single TRAINER_DILLON, Route113_Text_DillonIntro, Route113_Text_DillonDefeat
 	msgbox Route113_Text_DillonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_Madeline:: @ 81F21EE
+Route113_EventScript_Madeline::
 	trainerbattle_single TRAINER_MADELINE_1, Route113_Text_MadelineIntro, Route113_Text_MadelineDefeat, Route113_EventScript_RegisterMadeline
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -67,7 +67,7 @@ Route113_EventScript_Madeline:: @ 81F21EE
 	release
 	end
 
-Route113_EventScript_RegisterMadeline:: @ 81F221A
+Route113_EventScript_RegisterMadeline::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route113_Text_MadelineRegister, MSGBOX_DEFAULT
@@ -75,12 +75,12 @@ Route113_EventScript_RegisterMadeline:: @ 81F221A
 	release
 	end
 
-Route113_EventScript_RematchMadeline:: @ 81F2239
+Route113_EventScript_RematchMadeline::
 	trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_MadelineRematchIntro, Route113_Text_MadelineRematchDefeat
 	msgbox Route113_Text_MadelinePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_Lao:: @ 81F2250
+Route113_EventScript_Lao::
 	trainerbattle_single TRAINER_LAO_1, Route113_Text_LaoIntro, Route113_Text_LaoDefeat, Route113_EventScript_RegisterLao
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -89,7 +89,7 @@ Route113_EventScript_Lao:: @ 81F2250
 	release
 	end
 
-Route113_EventScript_RegisterLao:: @ 81F227C
+Route113_EventScript_RegisterLao::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route113_Text_LaoRegister, MSGBOX_DEFAULT
@@ -97,74 +97,74 @@ Route113_EventScript_RegisterLao:: @ 81F227C
 	release
 	end
 
-Route113_EventScript_RematchLao:: @ 81F229B
+Route113_EventScript_RematchLao::
 	trainerbattle_rematch TRAINER_LAO_1, Route113_Text_LaoRematchIntro, Route113_Text_LaoRematchDefeat
 	msgbox Route113_Text_LaoPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_Lung:: @ 81F22B2
+Route113_EventScript_Lung::
 	trainerbattle_single TRAINER_LUNG, Route113_Text_LungIntro, Route113_Text_LungDefeat
 	msgbox Route113_Text_LungPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_Tori:: @ 81F22C9
+Route113_EventScript_Tori::
 	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_ToriIntro, Route113_Text_ToriDefeat, Route113_Text_ToriNotEnoughMons
 	msgbox Route113_Text_ToriPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_Tia:: @ 81F22E4
+Route113_EventScript_Tia::
 	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_TiaIntro, Route113_Text_TiaDefeat, Route113_Text_TiaNotEnoughMons
 	msgbox Route113_Text_TiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_Sophie:: @ 81F22FF
+Route113_EventScript_Sophie::
 	trainerbattle_single TRAINER_SOPHIE, Route113_Text_SophieIntro, Route113_Text_SophieDefeat
 	msgbox Route113_Text_SophiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_Coby:: @ 81F2316
+Route113_EventScript_Coby::
 	trainerbattle_single TRAINER_COBY, Route113_Text_CobyIntro, Route113_Text_CobyDefeat
 	msgbox Route113_Text_CobyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_Lawrence:: @ 81F232D
+Route113_EventScript_Lawrence::
 	trainerbattle_single TRAINER_LAWRENCE, Route113_Text_LawrenceIntro, Route113_Text_LawrenceDefeat
 	msgbox Route113_Text_LawrencePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_Wyatt:: @ 81F2344
+Route113_EventScript_Wyatt::
 	trainerbattle_single TRAINER_WYATT, Route113_Text_WyattIntro, Route113_Text_WyattDefeat
 	msgbox Route113_Text_WyattPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_Text_AshCanBeFashionedIntoGlass: @ 81F235B
+Route113_Text_AshCanBeFashionedIntoGlass:
 	.string "Wahahaha! Today's technology is a\n"
 	.string "wondrous thing!\p"
 	.string "Take this volcanic ash here.\n"
 	.string "It can be fashioned into glass.$"
 
-Route113_Text_FunWalkingThroughAsh: @ 81F23CA
+Route113_Text_FunWalkingThroughAsh:
 	.string "It's fun walking through the volcano's\n"
 	.string "ashes on the ground and grass.\p"
 	.string "You can see where you walked--it's\n"
 	.string "really neat!$"
 
-Route113_Text_RouteSign111: @ 81F2440
+Route113_Text_RouteSign111:
 	.string "ROUTE 113\n"
 	.string "{RIGHT_ARROW} ROUTE 111$"
 
-Route113_Text_RouteSignFallarbor: @ 81F2456
+Route113_Text_RouteSignFallarbor:
 	.string "ROUTE 113\n"
 	.string "{LEFT_ARROW} FALLARBOR TOWN$"
 
-Route113_Text_TrainerTipsRegisterKeyItems: @ 81F2471
+Route113_Text_TrainerTipsRegisterKeyItems:
 	.string "TRAINER TIPS\p"
 	.string "You may register one of the KEY ITEMS\n"
 	.string "in your BAG as SELECT.\p"
 	.string "Simply press SELECT to use\n"
 	.string "the registered item conveniently.$"
 
-Route113_Text_GlassWorkshopSign: @ 81F24F8
+Route113_Text_GlassWorkshopSign:
 	.string "GLASS WORKSHOP\n"
 	.string "“Turning Volcanic Ash into Glass Items”$"
 
diff --git a/data/maps/Route113_GlassWorkshop/scripts.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index eed6d8eab..bad739806 100644
--- a/data/maps/Route113_GlassWorkshop/scripts.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
@@ -1,4 +1,4 @@
-Route113_GlassWorkshop_MapScripts:: @ 826ED03
+Route113_GlassWorkshop_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route113_GlassWorkshop_OnTransition
 	.byte 0
 
@@ -11,17 +11,17 @@ Route113_GlassWorkshop_MapScripts:: @ 826ED03
 	.set PRETTY_DESK_PRICE,  8000
 	.set LOWEST_ASH_PRICE,   BLUE_FLUTE_PRICE
 
-Route113_GlassWorkshop_OnTransition: @ 826ED09
+Route113_GlassWorkshop_OnTransition:
 	setflag FLAG_LANDMARK_GLASS_WORKSHOP
 	compare VAR_GLASS_WORKSHOP_STATE, 1
 	call_if_eq Route113_GlassWorkshop_EventScript_ReenterWorkshopAfterSootSack
 	end
 
-Route113_GlassWorkshop_EventScript_ReenterWorkshopAfterSootSack:: @ 826ED18
+Route113_GlassWorkshop_EventScript_ReenterWorkshopAfterSootSack::
 	setvar VAR_GLASS_WORKSHOP_STATE, 2
 	return
 
-Route113_GlassWorkshop_EventScript_GlassWorker:: @ 826ED1E
+Route113_GlassWorkshop_EventScript_GlassWorker::
 	lock
 	faceplayer
 	compare VAR_GLASS_WORKSHOP_STATE, 10
@@ -37,12 +37,12 @@ Route113_GlassWorkshop_EventScript_GlassWorker:: @ 826ED1E
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_ExplainSootSack:: @ 826ED64
+Route113_GlassWorkshop_EventScript_ExplainSootSack::
 	msgbox Route113_GlassWorkshop_Text_ExplainSootSack, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_CheckCollectedAsh:: @ 826ED6E
+Route113_GlassWorkshop_EventScript_CheckCollectedAsh::
 	checkitem ITEM_SOOT_SACK, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route113_GlassWorkshop_EventScript_SootSackNotInBag
@@ -54,12 +54,12 @@ Route113_GlassWorkshop_EventScript_CheckCollectedAsh:: @ 826ED6E
 	goto Route113_GlassWorkshop_EventScript_ChooseGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_SootSackNotInBag:: @ 826ED9D
+Route113_GlassWorkshop_EventScript_SootSackNotInBag::
 	msgbox Route113_GlassWorkshop_Text_HaventGotYourSootSack, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_ChooseGlassItem:: @ 826EDA7
+Route113_GlassWorkshop_EventScript_ChooseGlassItem::
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8004, SCROLL_MULTI_GLASS_WORKSHOP_VENDOR
 	special ShowScrollableMultichoice
@@ -76,7 +76,7 @@ Route113_GlassWorkshop_EventScript_ChooseGlassItem:: @ 826EDA7
 	case MULTI_B_PRESSED, Route113_GlassWorkshop_EventScript_CancelGlassItemSelect
 	end
 
-Route113_GlassWorkshop_EventScript_BlueFlute:: @ 826EE1E
+Route113_GlassWorkshop_EventScript_BlueFlute::
 	setvar VAR_0x8008, ITEM_BLUE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, BLUE_FLUTE_PRICE
@@ -90,7 +90,7 @@ Route113_GlassWorkshop_EventScript_BlueFlute:: @ 826EE1E
 	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_YellowFlute:: @ 826EE5A
+Route113_GlassWorkshop_EventScript_YellowFlute::
 	setvar VAR_0x8008, ITEM_YELLOW_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, YELLOW_FLUTE_PRICE
@@ -104,7 +104,7 @@ Route113_GlassWorkshop_EventScript_YellowFlute:: @ 826EE5A
 	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_RedFlute:: @ 826EE96
+Route113_GlassWorkshop_EventScript_RedFlute::
 	setvar VAR_0x8008, ITEM_RED_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, RED_FLUTE_PRICE
@@ -118,7 +118,7 @@ Route113_GlassWorkshop_EventScript_RedFlute:: @ 826EE96
 	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_WhiteFlute:: @ 826EED2
+Route113_GlassWorkshop_EventScript_WhiteFlute::
 	setvar VAR_0x8008, ITEM_WHITE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, WHITE_FLUTE_PRICE
@@ -132,7 +132,7 @@ Route113_GlassWorkshop_EventScript_WhiteFlute:: @ 826EED2
 	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_BlackFlute:: @ 826EF0E
+Route113_GlassWorkshop_EventScript_BlackFlute::
 	setvar VAR_0x8008, ITEM_BLACK_FLUTE
 	bufferitemname 0, VAR_0x8008
 	setvar VAR_0x800A, BLACK_FLUTE_PRICE
@@ -146,7 +146,7 @@ Route113_GlassWorkshop_EventScript_BlackFlute:: @ 826EF0E
 	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_PrettyChair:: @ 826EF4A
+Route113_GlassWorkshop_EventScript_PrettyChair::
 	setvar VAR_0x8009, 1
 	setvar VAR_0x8008, DECOR_PRETTY_CHAIR
 	bufferdecorationname 0, VAR_0x8008
@@ -161,7 +161,7 @@ Route113_GlassWorkshop_EventScript_PrettyChair:: @ 826EF4A
 	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_PrettyDesk:: @ 826EF8B
+Route113_GlassWorkshop_EventScript_PrettyDesk::
 	setvar VAR_0x8009, 1
 	setvar VAR_0x8008, DECOR_PRETTY_DESK
 	bufferdecorationname 0, VAR_0x8008
@@ -176,12 +176,12 @@ Route113_GlassWorkshop_EventScript_PrettyDesk:: @ 826EF8B
 	goto Route113_GlassWorkshop_EventScript_MakeGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_CancelGlassItemSelect:: @ 826EFCC
+Route113_GlassWorkshop_EventScript_CancelGlassItemSelect::
 	msgbox Route113_GlassWorkshop_Text_AllThatAshButDontWantAnything, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_NotEnoughAsh:: @ 826EFD6
+Route113_GlassWorkshop_EventScript_NotEnoughAsh::
 	setvar VAR_0x800A, LOWEST_ASH_PRICE
 	subvar VAR_0x800A, VAR_ASH_GATHER_COUNT
 	buffernumberstring 0, VAR_0x800A
@@ -189,7 +189,7 @@ Route113_GlassWorkshop_EventScript_NotEnoughAsh:: @ 826EFD6
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_NotEnoughAshForItem:: @ 826EFEE
+Route113_GlassWorkshop_EventScript_NotEnoughAshForItem::
 	subvar VAR_0x800A, VAR_ASH_GATHER_COUNT
 	buffernumberstring 1, VAR_0x800A
 	message Route113_GlassWorkshop_Text_NotEnoughAshToMakeItem
@@ -197,13 +197,13 @@ Route113_GlassWorkshop_EventScript_NotEnoughAshForItem:: @ 826EFEE
 	goto Route113_GlassWorkshop_EventScript_ChooseGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_ChooseDifferentItem:: @ 826F003
+Route113_GlassWorkshop_EventScript_ChooseDifferentItem::
 	message Route113_GlassWorkshop_Text_WhichWouldYouLike
 	waitmessage
 	goto Route113_GlassWorkshop_EventScript_ChooseGlassItem
 	end
 
-Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F
+Route113_GlassWorkshop_EventScript_MakeGlassItem::
 	msgbox Route113_GlassWorkshop_Text_IllMakeItemForYou, MSGBOX_DEFAULT
 	closemessage
 	fadescreen FADE_TO_BLACK
@@ -219,31 +219,31 @@ Route113_GlassWorkshop_EventScript_MakeGlassItem:: @ 826F00F
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_GiveGlassFlute:: @ 826F047
+Route113_GlassWorkshop_EventScript_GiveGlassFlute::
 	giveitem VAR_0x8008
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForFlute
 	return
 
-Route113_GlassWorkshop_EventScript_GiveGlassDecor:: @ 826F05F
+Route113_GlassWorkshop_EventScript_GiveGlassDecor::
 	givedecoration VAR_0x8008
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route113_GlassWorkshop_EventScript_NoRoomForDecor
 	return
 
-Route113_GlassWorkshop_EventScript_NoRoomForFlute:: @ 826F072
+Route113_GlassWorkshop_EventScript_NoRoomForFlute::
 	call Common_EventScript_BagIsFull
 	msgbox Route113_GlassWorkshop_Text_NoRoomInBag, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_NoRoomForDecor:: @ 826F081
+Route113_GlassWorkshop_EventScript_NoRoomForDecor::
 	call Common_EventScript_NoRoomForDecor
 	msgbox Route113_GlassWorkshop_Text_NoRoomInPC, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_GiveItemAfterNoRoom:: @ 826F090
+Route113_GlassWorkshop_EventScript_GiveItemAfterNoRoom::
 	switch VAR_GLASS_WORKSHOP_STATE
 	case 10, Route113_GlassWorkshop_EventScript_GiveBlueFlute
 	case 11, Route113_GlassWorkshop_EventScript_GiveYellowFlute
@@ -254,56 +254,56 @@ Route113_GlassWorkshop_EventScript_GiveItemAfterNoRoom:: @ 826F090
 	case 16, Route113_GlassWorkshop_EventScript_GivePrettyDesk
 	end
 
-Route113_GlassWorkshop_EventScript_GiveBlueFlute:: @ 826F0E3
+Route113_GlassWorkshop_EventScript_GiveBlueFlute::
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8008, ITEM_BLUE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_GiveYellowFlute:: @ 826F0F7
+Route113_GlassWorkshop_EventScript_GiveYellowFlute::
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8008, ITEM_YELLOW_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_GiveRedFlute:: @ 826F10B
+Route113_GlassWorkshop_EventScript_GiveRedFlute::
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8008, ITEM_RED_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_GiveWhiteFlute:: @ 826F11F
+Route113_GlassWorkshop_EventScript_GiveWhiteFlute::
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8008, ITEM_WHITE_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_GiveBlackFlute:: @ 826F133
+Route113_GlassWorkshop_EventScript_GiveBlackFlute::
 	setvar VAR_0x8009, 0
 	setvar VAR_0x8008, ITEM_BLACK_FLUTE
 	bufferitemname 0, VAR_0x8008
 	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_GivePrettyChair:: @ 826F147
+Route113_GlassWorkshop_EventScript_GivePrettyChair::
 	setvar VAR_0x8009, 1
 	setvar VAR_0x8008, DECOR_PRETTY_CHAIR
 	bufferdecorationname 0, DECOR_PRETTY_CHAIR
 	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_GivePrettyDesk:: @ 826F15B
+Route113_GlassWorkshop_EventScript_GivePrettyDesk::
 	setvar VAR_0x8009, 1
 	setvar VAR_0x8008, DECOR_PRETTY_DESK
 	bufferdecorationname 0, DECOR_PRETTY_DESK
 	goto Route113_GlassWorkshop_EventScript_TryGiveItemAgain
 	end
 
-Route113_GlassWorkshop_EventScript_TryGiveItemAgain:: @ 826F16F
+Route113_GlassWorkshop_EventScript_TryGiveItemAgain::
 	msgbox Route113_GlassWorkshop_Text_IveFinishedGlassItem, MSGBOX_DEFAULT
 	compare VAR_0x8009, 0
 	call_if_eq Route113_GlassWorkshop_EventScript_GiveGlassFlute
@@ -313,11 +313,11 @@ Route113_GlassWorkshop_EventScript_TryGiveItemAgain:: @ 826F16F
 	release
 	end
 
-Route113_GlassWorkshop_EventScript_NinjaBoy:: @ 826F194
+Route113_GlassWorkshop_EventScript_NinjaBoy::
 	msgbox Route113_GlassWorkshop_Text_FunToBlowGlassFlute, MSGBOX_NPC
 	end
 
-Route113_GlassWorkshop_Text_GoCollectAshWithThis: @ 826F19D
+Route113_GlassWorkshop_Text_GoCollectAshWithThis:
 	.string "This area is covered in volcanic ash,\n"
 	.string "huff-puff!\p"
 	.string "I'm specially gifted, huff-puff.\p"
@@ -325,7 +325,7 @@ Route113_GlassWorkshop_Text_GoCollectAshWithThis: @ 826F19D
 	.string "and make items, huff-puff.\p"
 	.string "Go collect ashes with this, huff-puff.$"
 
-Route113_GlassWorkshop_Text_ExplainSootSack: @ 826F252
+Route113_GlassWorkshop_Text_ExplainSootSack:
 	.string "Just take that SOOT SACK and walk\n"
 	.string "through piles of ash, huff-puff.\p"
 	.string "And it will fill up with the volcanic ash,\n"
@@ -333,11 +333,11 @@ Route113_GlassWorkshop_Text_ExplainSootSack: @ 826F252
 	.string "Once you think you've collected a good\n"
 	.string "amount, come see me, huff-puff.$"
 
-Route113_GlassWorkshop_Text_LetsSeeCollectedAshes: @ 826F312
+Route113_GlassWorkshop_Text_LetsSeeCollectedAshes:
 	.string "Have you collected ashes, huff-puff?\n"
 	.string "Let me see, huff-puff.$"
 
-Route113_GlassWorkshop_Text_NotEnoughAshNeedX: @ 826F34E
+Route113_GlassWorkshop_Text_NotEnoughAshNeedX:
 	.string "Hmmm…\n"
 	.string "There's not enough ash here, huff-puff.\l"
 	.string "I can't make glass with this, huff-puff.\p"
@@ -345,25 +345,25 @@ Route113_GlassWorkshop_Text_NotEnoughAshNeedX: @ 826F34E
 	.string "you'll need to walk for me to make you\l"
 	.string "a BLUE FLUTE, huff-puff.$"
 
-Route113_GlassWorkshop_Text_WhichGlassItemWoudYouLike: @ 826F40A
+Route113_GlassWorkshop_Text_WhichGlassItemWoudYouLike:
 	.string "Oh!\n"
 	.string "You've got a lot of ashes, huff-puff!\p"
 	.string "I'll make you a glass item, huff-puff!\n"
 	.string "Which one would you like, huff-puff?$"
 
-Route113_GlassWorkshop_Text_IsThatTheItemForYou: @ 826F480
+Route113_GlassWorkshop_Text_IsThatTheItemForYou:
 	.string "A {STR_VAR_1}, huff-puff?\n"
 	.string "Is that the one for you, huff-puff?$"
 
-Route113_GlassWorkshop_Text_WhichWouldYouLike: @ 826F4B5
+Route113_GlassWorkshop_Text_WhichWouldYouLike:
 	.string "Which one would you like, huff-puff?$"
 
-Route113_GlassWorkshop_Text_IllMakeItemForYou: @ 826F4DA
+Route113_GlassWorkshop_Text_IllMakeItemForYou:
 	.string "A {STR_VAR_1} it is, then, huff-puff!\p"
 	.string "Okay! I'll make it for you, huff-puff.\n"
 	.string "Just wait a little while, huff-puff.$"
 
-Route113_GlassWorkshop_Text_NotEnoughAshToMakeItem: @ 826F543
+Route113_GlassWorkshop_Text_NotEnoughAshToMakeItem:
 	.string "A {STR_VAR_1}, huff-puff?\p"
 	.string "There's not enough ash here to make\n"
 	.string "that, though, huff-puff.\p"
@@ -373,33 +373,33 @@ Route113_GlassWorkshop_Text_NotEnoughAshToMakeItem: @ 826F543
 	.string "Which item would you rather have me\n"
 	.string "make instead, huff-puff?$"
 
-Route113_GlassWorkshop_Text_AllThatAshButDontWantAnything: @ 826F641
+Route113_GlassWorkshop_Text_AllThatAshButDontWantAnything:
 	.string "You've collected all that ash, but you\n"
 	.string "don't want anything, huff-puff?$"
 
-Route113_GlassWorkshop_Text_IveFinishedGlassItem: @ 826F688
+Route113_GlassWorkshop_Text_IveFinishedGlassItem:
 	.string "Ah, I've finished your {STR_VAR_1}.\n"
 	.string "Take it, huff-puff.$"
 
-Route113_GlassWorkshop_Text_NoRoomInBag: @ 826F6B7
+Route113_GlassWorkshop_Text_NoRoomInBag:
 	.string "Oh?\n"
 	.string "You've no room in your BAG, huff-puff.\p"
 	.string "I'll hold on to it, so come back later,\n"
 	.string "huff-puff.$"
 
-Route113_GlassWorkshop_Text_NoRoomInPC: @ 826F715
+Route113_GlassWorkshop_Text_NoRoomInPC:
 	.string "Oh?\n"
 	.string "You've no room in your PC, huff-puff?\p"
 	.string "I'll hold on to it, so come back later,\n"
 	.string "huff-puff.$"
 
-Route113_GlassWorkshop_Text_HaventGotYourSootSack: @ 826F772
+Route113_GlassWorkshop_Text_HaventGotYourSootSack:
 	.string "Hah? You haven't got your SOOT SACK\n"
 	.string "with you, huff-puff.\p"
 	.string "You have to keep it with you to collect\n"
 	.string "volcanic ash, huff-puff.$"
 
-Route113_GlassWorkshop_Text_FunToBlowGlassFlute: @ 826F7EC
+Route113_GlassWorkshop_Text_FunToBlowGlassFlute:
 	.string "It's fun to blow a glass flute while\n"
 	.string "my boss is talking.\p"
 	.string "Huff-huff! Puff-puff!$"
diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc
index dda7f270d..3eb92d0f1 100644
--- a/data/maps/Route114/scripts.inc
+++ b/data/maps/Route114/scripts.inc
@@ -1,10 +1,10 @@
-Route114_MapScripts:: @ 81F252F
+Route114_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route114_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route114_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_OnFrame
 	.byte 0
 
-Route114_OnTransition: @ 81F253F
+Route114_OnTransition:
 	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_NORTH
@@ -13,18 +13,18 @@ Route114_OnTransition: @ 81F253F
 	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 
-Route114_OnLoad: @ 81F2561
+Route114_OnLoad:
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_NORTH
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute114North
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_114_SOUTH
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute114South
 	end
 
-Route114_OnFrame: @ 81F2578
+Route114_OnFrame:
 	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route114_EventScript_Man:: @ 81F2582
+Route114_EventScript_Man::
 	lock
 	faceplayer
 	dotimebasedevents
@@ -41,12 +41,12 @@ Route114_EventScript_Man:: @ 81F2582
 	release
 	end
 
-Route114_EventScript_ReceivedBerry:: @ 81F25C7
+Route114_EventScript_ReceivedBerry::
 	msgbox Route114_Text_FunToThinkAboutBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_RoarGentleman:: @ 81F25D1
+Route114_EventScript_RoarGentleman::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_ReceivedRoar
@@ -59,12 +59,12 @@ Route114_EventScript_RoarGentleman:: @ 81F25D1
 	release
 	end
 
-Route114_EventScript_ReceivedRoar:: @ 81F2608
+Route114_EventScript_ReceivedRoar::
 	msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_Poochyena:: @ 81F2612
+Route114_EventScript_Poochyena::
 	lock
 	faceplayer
 	waitse
@@ -74,39 +74,39 @@ Route114_EventScript_Poochyena:: @ 81F2612
 	release
 	end
 
-Route114_EventScript_MeteorFallsSign:: @ 81F2625
+Route114_EventScript_MeteorFallsSign::
 	msgbox Route114_Text_MeteorFallsSign, MSGBOX_SIGN
 	end
 
-Route114_EventScript_FossilManiacsHouseSign:: @ 81F262E
+Route114_EventScript_FossilManiacsHouseSign::
 	msgbox Route114_Text_FossilManiacsHouseSign, MSGBOX_SIGN
 	end
 
-Route114_EventScript_LanettesHouseSign:: @ 81F2637
+Route114_EventScript_LanettesHouseSign::
 	msgbox Route114_Text_LanettesHouse, MSGBOX_SIGN
 	end
 
-Route114_EventScript_Lenny:: @ 81F2640
+Route114_EventScript_Lenny::
 	trainerbattle_single TRAINER_LENNY, Route114_Text_LennyIntro, Route114_Text_LennyDefeat
 	msgbox Route114_Text_LennyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Lucas:: @ 81F2657
+Route114_EventScript_Lucas::
 	trainerbattle_single TRAINER_LUCAS_1, Route114_Text_LucasIntro, Route114_Text_LucasDefeat
 	msgbox Route114_Text_LucasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Shane:: @ 81F266E
+Route114_EventScript_Shane::
 	trainerbattle_single TRAINER_SHANE, Route114_Text_ShaneIntro, Route114_Text_ShaneDefeat
 	msgbox Route114_Text_ShanePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Nancy:: @ 81F2685
+Route114_EventScript_Nancy::
 	trainerbattle_single TRAINER_NANCY, Route114_Text_NancyIntro, Route114_Text_NancyDefeat
 	msgbox Route114_Text_NancyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Steve:: @ 81F269C
+Route114_EventScript_Steve::
 	trainerbattle_single TRAINER_STEVE_1, Route114_Text_SteveIntro, Route114_Text_SteveDefeat, Route114_EventScript_RegisterSteve
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -115,7 +115,7 @@ Route114_EventScript_Steve:: @ 81F269C
 	release
 	end
 
-Route114_EventScript_RegisterSteve:: @ 81F26C8
+Route114_EventScript_RegisterSteve::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route114_Text_SteveRegister, MSGBOX_DEFAULT
@@ -123,12 +123,12 @@ Route114_EventScript_RegisterSteve:: @ 81F26C8
 	release
 	end
 
-Route114_EventScript_RematchSteve:: @ 81F26E7
+Route114_EventScript_RematchSteve::
 	trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_SteveRematchIntro, Route114_Text_SteveRematchDefeat
 	msgbox Route114_Text_StevePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Bernie:: @ 81F26FE
+Route114_EventScript_Bernie::
 	trainerbattle_single TRAINER_BERNIE_1, Route114_Text_BernieIntro, Route114_Text_BernieDefeat, Route114_EventScript_RegisterBernie
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -137,7 +137,7 @@ Route114_EventScript_Bernie:: @ 81F26FE
 	release
 	end
 
-Route114_EventScript_RegisterBernie:: @ 81F272A
+Route114_EventScript_RegisterBernie::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route114_Text_BernieRegister, MSGBOX_DEFAULT
@@ -145,67 +145,67 @@ Route114_EventScript_RegisterBernie:: @ 81F272A
 	release
 	end
 
-Route114_EventScript_RematchBernie:: @ 81F2749
+Route114_EventScript_RematchBernie::
 	trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_BernieRematchIntro, Route114_Text_BernieRematchDefeat
 	msgbox Route114_Text_BerniePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Claude:: @ 81F2760
+Route114_EventScript_Claude::
 	trainerbattle_single TRAINER_CLAUDE, Route114_Text_ClaudeIntro, Route114_Text_ClaudeDefeat
 	msgbox Route114_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Nolan:: @ 81F2777
+Route114_EventScript_Nolan::
 	trainerbattle_single TRAINER_NOLAN, Route114_Text_NolanIntro, Route114_Text_NolanDefeat
 	msgbox Route114_Text_NolanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Tyra:: @ 81F278E
+Route114_EventScript_Tyra::
 	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_TyraIntro, Route114_Text_TyraDefeat, Route114_Text_TyraNotEnoughMons
 	msgbox Route114_Text_TyraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Ivy:: @ 81F27A9
+Route114_EventScript_Ivy::
 	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_IvyIntro, Route114_Text_IvyDefeat, Route114_Text_IvyNotEnoughMons
 	msgbox Route114_Text_IvyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Angelina:: @ 81F27C4
+Route114_EventScript_Angelina::
 	trainerbattle_single TRAINER_ANGELINA, Route114_Text_AngelinaIntro, Route114_Text_AngelinaDefeat
 	msgbox Route114_Text_AngelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Charlotte:: @ 81F27DB
+Route114_EventScript_Charlotte::
 	trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_CharlotteIntro, Route114_Text_CharlotteDefeat
 	msgbox Route114_Text_CharlottePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_Kai:: @ 81F27F2
+Route114_EventScript_Kai::
 	trainerbattle_single TRAINER_KAI, Route114_Text_KaiIntro, Route114_Text_KaiDefeat
 	msgbox Route114_Text_KaiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_Text_AllMyMonDoesIsRoarTakeThis: @ 81F2809
+Route114_Text_AllMyMonDoesIsRoarTakeThis:
 	.string "All my POKéMON does is ROAR…\n"
 	.string "No one dares to come near me…\p"
 	.string "Sigh… If you would, please take\n"
 	.string "this TM away…$"
 
-Route114_Text_ExplainRoar: @ 81F2872
+Route114_Text_ExplainRoar:
 	.string "TM05 contains ROAR.\n"
 	.string "A ROAR sends POKéMON scurrying.$"
 
-Route114_Text_Poochyena: @ 81F28A6
+Route114_Text_Poochyena:
 	.string "Bow! Bowwow!$"
 
-Route114_Text_MeteorFallsSign: @ 81F28B3
+Route114_Text_MeteorFallsSign:
 	.string "METEOR FALLS\n"
 	.string "RUSTBORO CITY THROUGH HERE$"
 
-Route114_Text_FossilManiacsHouseSign: @ 81F28DB
+Route114_Text_FossilManiacsHouseSign:
 	.string "FOSSIL MANIAC'S HOUSE\n"
 	.string "“Fossils gratefully accepted!”$"
 
-Route114_Text_LanettesHouse: @ 81F2910
+Route114_Text_LanettesHouse:
 	.string "LANETTE'S HOUSE$"
 
diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc
index 8db686d10..f291cd5ee 100644
--- a/data/maps/Route114_FossilManiacsHouse/scripts.inc
+++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc
@@ -1,12 +1,12 @@
-Route114_FossilManiacsHouse_MapScripts:: @ 822AD30
+Route114_FossilManiacsHouse_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsHouse_OnTransition
 	.byte 0
 
-Route114_FossilManiacsHouse_OnTransition: @ 822AD36
+Route114_FossilManiacsHouse_OnTransition:
 	setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE
 	end
 
-Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother:: @ 822AD3A
+Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_ReceivedDig
@@ -18,20 +18,20 @@ Route114_FossilManiacsHouse_EventScript_FossilManiacsBrother:: @ 822AD3A
 	release
 	end
 
-Route114_FossilManiacsHouse_EventScript_ReceivedDig:: @ 822AD69
+Route114_FossilManiacsHouse_EventScript_ReceivedDig::
 	msgbox Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_FossilManiacsHouse_EventScript_RockDisplay:: @ 822AD73
+Route114_FossilManiacsHouse_EventScript_RockDisplay::
 	msgbox Route114_FossilManiacsHouse_Text_RocksFillDisplayCase, MSGBOX_SIGN
 	end
 
-Route114_FossilManiacsHouse_EventScript_Bookshelf:: @ 822AD7C
+Route114_FossilManiacsHouse_EventScript_Bookshelf::
 	msgbox Route114_FossilManiacsHouse_Text_CrammedWithBooks, MSGBOX_SIGN
 	end
 
-Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother: @ 822AD85
+Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother:
 	.string "My big brother's the FOSSIL MANIAC…\n"
 	.string "He's a nice guy who loves FOSSILS…\p"
 	.string "He loves digging holes, too…\n"
@@ -39,15 +39,15 @@ Route114_FossilManiacsHouse_Text_HaveThisToDigLikeMyBrother: @ 822AD85
 	.string "You can have this, so you can DIG\n"
 	.string "holes just like my big brother…$"
 
-Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance: @ 822AE48
+Route114_FossilManiacsHouse_Text_DigReturnsYouToEntrance:
 	.string "If you make a POKéMON DIG inside a\n"
 	.string "cave, you're returned to the entrance…$"
 
-Route114_FossilManiacsHouse_Text_RocksFillDisplayCase: @ 822AE92
+Route114_FossilManiacsHouse_Text_RocksFillDisplayCase:
 	.string "Rocks in peculiar shapes fill\n"
 	.string "the display case…$"
 
-Route114_FossilManiacsHouse_Text_CrammedWithBooks: @ 822AEC2
+Route114_FossilManiacsHouse_Text_CrammedWithBooks:
 	.string "THE COMPOSITION OF STRATA…\n"
 	.string "HOW RAIN SHAPES THE LAND…\l"
 	.string "STONES, SOIL, AND ROCK…\p"
diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
index 86bb20eed..a5181be79 100644
--- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
@@ -1,29 +1,29 @@
 .set LOCALID_FOSSIL_MANIAC, 1
 
-Route114_FossilManiacsTunnel_MapScripts:: @ 822AF28
+Route114_FossilManiacsTunnel_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route114_FossilManiacsTunnel_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route114_FossilManiacsTunnel_OnLoad
 	.byte 0
 
-Route114_FossilManiacsTunnel_OnTransition: @ 822AF33
+Route114_FossilManiacsTunnel_OnTransition:
 	call_if_set FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac
 	end
 
-Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac:: @ 822AF3D
+Route114_FossilManiacsTunnel_EventScript_MoveFossilManiac::
 	setobjectxyperm LOCALID_FOSSIL_MANIAC, 6, 5
 	setobjectmovementtype LOCALID_FOSSIL_MANIAC, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-Route114_FossilManiacsTunnel_OnLoad: @ 822AF49
+Route114_FossilManiacsTunnel_OnLoad:
 	call_if_unset FLAG_SYS_GAME_CLEAR, Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass
 	end
 
-Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass:: @ 822AF53
+Route114_FossilManiacsTunnel_EventScript_CloseDesertUnderpass::
 	setmetatile 6, 1, METATILE_Fallarbor_RedRockWall, 1
 	setmetatile 6, 2, METATILE_Fallarbor_RedRockWall, 1
 	return
 
-Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn:: @ 822AF66
+Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn::
 	lockall
 	applymovement LOCALID_FOSSIL_MANIAC, Common_Movement_WalkInPlaceFastestUp
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
@@ -33,7 +33,7 @@ Route114_FossilManiacsTunnel_EventScript_ManiacMentionCaveIn:: @ 822AF66
 	releaseall
 	end
 
-Route114_FossilManiacsTunnel_EventScript_FossilManiac:: @ 822AF87
+Route114_FossilManiacsTunnel_EventScript_FossilManiac::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil
@@ -47,17 +47,17 @@ Route114_FossilManiacsTunnel_EventScript_FossilManiac:: @ 822AF87
 	release
 	end
 
-Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil:: @ 822AFBC
+Route114_FossilManiacsTunnel_EventScript_PlayerHasFossil::
 	msgbox Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil:: @ 822AFC6
+Route114_FossilManiacsTunnel_EventScript_PlayerRevivedFossil::
 	msgbox Route114_FossilManiacsTunnel_Text_FossilsAreWonderful, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_FossilManiacsTunnel_Text_LookInDesertForFossils: @ 822AFD0
+Route114_FossilManiacsTunnel_Text_LookInDesertForFossils:
 	.string "I'm the FOSSIL MANIAC…\n"
 	.string "I'm a nice guy who loves FOSSILS…\p"
 	.string "Do you want a FOSSIL?\p"
@@ -68,7 +68,7 @@ Route114_FossilManiacsTunnel_Text_LookInDesertForFossils: @ 822AFD0
 	.string "are boulders and sand that may hide\l"
 	.string "FOSSILS…$"
 
-Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils: @ 822B0D6
+Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils:
 	.string "You found a FOSSIL, didn't you?\n"
 	.string "That's so nice… It's so dreamy…\p"
 	.string "What are you going to do with that\n"
@@ -79,11 +79,11 @@ Route114_FossilManiacsTunnel_Text_DevonCorpRevivingFossils: @ 822B0D6
 	.string "I love my FOSSILS, so I would never\n"
 	.string "do anything like that…$"
 
-Route114_FossilManiacsTunnel_Text_FossilsAreWonderful: @ 822B1CC
+Route114_FossilManiacsTunnel_Text_FossilsAreWonderful:
 	.string "FOSSILS are so… Wonderful…\n"
 	.string "It's so dreamy…$"
 
-Route114_FossilManiacsTunnel_Text_NotSafeThatWay: @ 822B1F7
+Route114_FossilManiacsTunnel_Text_NotSafeThatWay:
 	.string "Oh…\n"
 	.string "It's not safe that way…\p"
 	.string "I was digging away, you see…\n"
diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc
index cd2f808fc..5a7ccb341 100644
--- a/data/maps/Route114_LanettesHouse/scripts.inc
+++ b/data/maps/Route114_LanettesHouse/scripts.inc
@@ -1,12 +1,12 @@
-Route114_LanettesHouse_MapScripts:: @ 822B2C8
+Route114_LanettesHouse_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route114_LanettesHouse_OnTransition
 	.byte 0
 
-Route114_LanettesHouse_OnTransition: @ 822B2CE
+Route114_LanettesHouse_OnTransition:
 	setflag FLAG_LANDMARK_LANETTES_HOUSE
 	end
 
-Route114_LanettesHouse_EventScript_Lanette:: @ 822B2D2
+Route114_LanettesHouse_EventScript_Lanette::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_OfferAdvice
@@ -19,12 +19,12 @@ Route114_LanettesHouse_EventScript_Lanette:: @ 822B2D2
 	release
 	end
 
-Route114_LanettesHouse_EventScript_OfferAdvice:: @ 822B2FF
+Route114_LanettesHouse_EventScript_OfferAdvice::
 	msgbox Route114_LanettesHouse_Text_OrganizeYourBoxes, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_LanettesHouse_EventScript_Notebook:: @ 822B309
+Route114_LanettesHouse_EventScript_Notebook::
 	lockall
 	msgbox Route114_LanettesHouse_Text_ResearchNotesPage1, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -33,22 +33,22 @@ Route114_LanettesHouse_EventScript_Notebook:: @ 822B309
 	releaseall
 	end
 
-Route114_LanettesHouse_EventScript_NotebookPage2:: @ 822B327
+Route114_LanettesHouse_EventScript_NotebookPage2::
 	msgbox Route114_LanettesHouse_Text_ResearchNotesPage2, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	call_if_eq Route114_LanettesHouse_EventScript_NotebookPage3
 	releaseall
 	end
 
-Route114_LanettesHouse_EventScript_NotebookPage3:: @ 822B33C
+Route114_LanettesHouse_EventScript_NotebookPage3::
 	msgbox Route114_LanettesHouse_Text_ResearchNotesPage3, MSGBOX_DEFAULT
 	return
 
-Route114_LanettesHouse_EventScript_PC:: @ 822B345
+Route114_LanettesHouse_EventScript_PC::
 	msgbox Route114_LanettesHouse_Text_EmailFromBill, MSGBOX_SIGN
 	end
 
-Route114_LanettesHouse_Text_EverythingClutteredKeepThis: @ 822B34E
+Route114_LanettesHouse_Text_EverythingClutteredKeepThis:
 	.string "LANETTE: Oh! {PLAYER}{KUN}!\p"
 	.string "I'm sorry everything is so cluttered…\n"
 	.string "When I get engrossed in research,\l"
@@ -56,13 +56,13 @@ Route114_LanettesHouse_Text_EverythingClutteredKeepThis: @ 822B34E
 	.string "This is embarrassing… Please keep\n"
 	.string "this a secret in exchange for this.$"
 
-Route114_LanettesHouse_Text_OrganizeYourBoxes: @ 822B407
+Route114_LanettesHouse_Text_OrganizeYourBoxes:
 	.string "May I offer advice about my POKéMON\n"
 	.string "Storage System?\p"
 	.string "You should organize your BOXES so you\n"
 	.string "can tell which POKéMON are in them.$"
 
-Route114_LanettesHouse_Text_ResearchNotesPage1: @ 822B485
+Route114_LanettesHouse_Text_ResearchNotesPage1:
 	.string "It's LANETTE's research notes.\n"
 	.string "There's information about BOXES.\p"
 	.string "Design BOXES to hold 30 POKéMON each.\p"
@@ -70,7 +70,7 @@ Route114_LanettesHouse_Text_ResearchNotesPage1: @ 822B485
 	.string "420 POKéMON on the PC system.\p"
 	.string "Keep reading?$"
 
-Route114_LanettesHouse_Text_ResearchNotesPage2: @ 822B53C
+Route114_LanettesHouse_Text_ResearchNotesPage2:
 	.string "A marking system should be added to\n"
 	.string "make POKéMON easier to organize.\p"
 	.string "The name and wallpaper design of each\n"
@@ -78,7 +78,7 @@ Route114_LanettesHouse_Text_ResearchNotesPage2: @ 822B53C
 	.string "the stored POKéMON.\p"
 	.string "Keep reading?$"
 
-Route114_LanettesHouse_Text_ResearchNotesPage3: @ 822B5EF
+Route114_LanettesHouse_Text_ResearchNotesPage3:
 	.string "When storing a POKéMON, it should be\n"
 	.string "sent to the BOX inspected last.\p"
 	.string "If that BOX is full, the received\n"
@@ -87,10 +87,10 @@ Route114_LanettesHouse_Text_ResearchNotesPage3: @ 822B5EF
 	.string "it is automatically selected as the BOX\l"
 	.string "to which POKéMON are sent.$"
 
-Route114_LanettesHouse_Text_ClosedTheNotebook: @ 822B6E4
+Route114_LanettesHouse_Text_ClosedTheNotebook:
 	.string "{PLAYER} closed the notebook.$"
 
-Route114_LanettesHouse_Text_EmailFromBill: @ 822B6FC
+Route114_LanettesHouse_Text_EmailFromBill:
 	.string "There's an e-mail from someone on\n"
 	.string "the PC.\p"
 	.string "“… … … … … … …\p"
diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc
index a9d0d93c1..600e6751f 100644
--- a/data/maps/Route115/scripts.inc
+++ b/data/maps/Route115/scripts.inc
@@ -1,17 +1,17 @@
-Route115_MapScripts:: @ 81F2920
+Route115_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, Route115_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, Route115_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_OnFrame
 	.byte 0
 
-Route115_OnLoad: @ 81F2930
+Route115_OnLoad:
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute115West
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_EAST
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute115East
 	end
 
-Route115_OnTransition: @ 81F2947
+Route115_OnTransition:
 	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_115_WEST
@@ -20,23 +20,23 @@ Route115_OnTransition: @ 81F2947
 	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 
-Route115_OnFrame: @ 81F2969
+Route115_OnFrame:
 	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route115_EventScript_Woman:: @ 81F2973
+Route115_EventScript_Woman::
 	msgbox Route115_Text_NeverKnowWhenCavePokemonWillAppear, MSGBOX_NPC
 	end
 
-Route115_EventScript_RouteSignRustboro:: @ 81F297C
+Route115_EventScript_RouteSignRustboro::
 	msgbox Route115_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route115_EventScript_MeteorFallsSign:: @ 81F2985
+Route115_EventScript_MeteorFallsSign::
 	msgbox Route115_Text_MeteorFallsSign, MSGBOX_SIGN
 	end
 
-Route115_EventScript_Timothy:: @ 81F298E
+Route115_EventScript_Timothy::
 	trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_TimothyIntro, Route115_Text_TimothyDefeat, Route115_EventScript_RegisterTimothy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -45,7 +45,7 @@ Route115_EventScript_Timothy:: @ 81F298E
 	release
 	end
 
-Route115_EventScript_RegisterTimothy:: @ 81F29BA
+Route115_EventScript_RegisterTimothy::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route115_Text_TimothyRegister, MSGBOX_DEFAULT
@@ -53,17 +53,17 @@ Route115_EventScript_RegisterTimothy:: @ 81F29BA
 	release
 	end
 
-Route115_EventScript_RematchTimothy:: @ 81F29D9
+Route115_EventScript_RematchTimothy::
 	trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_TimothyRematchIntro, Route115_Text_TimothyRematchDefeat
 	msgbox Route115_Text_TimothyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_Koichi:: @ 81F29F0
+Route115_EventScript_Koichi::
 	trainerbattle_single TRAINER_KOICHI, Route115_Text_KoichiIntro, Route115_Text_KoichiDefeat
 	msgbox Route115_Text_KoichiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_Nob:: @ 81F2A07
+Route115_EventScript_Nob::
 	trainerbattle_single TRAINER_NOB_1, Route115_Text_NobIntro, Route115_Text_NobDefeat, Route115_EventScript_RegisterNob
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -72,7 +72,7 @@ Route115_EventScript_Nob:: @ 81F2A07
 	release
 	end
 
-Route115_EventScript_RegisterNob:: @ 81F2A33
+Route115_EventScript_RegisterNob::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route115_Text_NobRegister, MSGBOX_DEFAULT
@@ -80,12 +80,12 @@ Route115_EventScript_RegisterNob:: @ 81F2A33
 	release
 	end
 
-Route115_EventScript_RematchNob:: @ 81F2A52
+Route115_EventScript_RematchNob::
 	trainerbattle_rematch TRAINER_NOB_1, Route115_Text_NobRematchIntro, Route115_Text_NobRematchDefeat
 	msgbox Route115_Text_NobPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_Cyndy:: @ 81F2A69
+Route115_EventScript_Cyndy::
 	trainerbattle_single TRAINER_CYNDY_1, Route115_Text_CyndyIntro, Route115_Text_CyndyDefeat, Route115_EventScript_RegisterCyndy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -94,7 +94,7 @@ Route115_EventScript_Cyndy:: @ 81F2A69
 	release
 	end
 
-Route115_EventScript_RegisterCyndy:: @ 81F2A95
+Route115_EventScript_RegisterCyndy::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route115_Text_CyndyRegister, MSGBOX_DEFAULT
@@ -102,52 +102,52 @@ Route115_EventScript_RegisterCyndy:: @ 81F2A95
 	release
 	end
 
-Route115_EventScript_RematchCyndy:: @ 81F2AB4
+Route115_EventScript_RematchCyndy::
 	trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_CyndyRematchIntro, Route115_Text_CyndyRematchDefeat
 	msgbox Route115_Text_CyndyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_Hector:: @ 81F2ACB
+Route115_EventScript_Hector::
 	trainerbattle_single TRAINER_HECTOR, Route115_Text_HectorIntro, Route115_Text_HectorDefeat
 	msgbox Route115_Text_HectorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_Kyra:: @ 81F2AE2
+Route115_EventScript_Kyra::
 	trainerbattle_single TRAINER_KYRA, Route115_Text_KyraIntro, Route115_Text_KyraDefeat
 	msgbox Route115_Text_KyraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_Jaiden:: @ 81F2AF9
+Route115_EventScript_Jaiden::
 	trainerbattle_single TRAINER_JAIDEN, Route115_Text_JaidenIntro, Route115_Text_JaidenDefeat
 	msgbox Route115_Text_JaidenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_Alix:: @ 81F2B10
+Route115_EventScript_Alix::
 	trainerbattle_single TRAINER_ALIX, Route115_Text_AlixIntro, Route115_Text_AlixDefeat
 	msgbox Route115_Text_AlixPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_Helene:: @ 81F2B27
+Route115_EventScript_Helene::
 	trainerbattle_single TRAINER_HELENE, Route115_Text_HeleneIntro, Route115_Text_HeleneDefeat
 	msgbox Route115_Text_HelenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_Marlene:: @ 81F2B3E
+Route115_EventScript_Marlene::
 	trainerbattle_single TRAINER_MARLENE, Route115_Text_MarleneIntro, Route115_Text_MarleneDefeat
 	msgbox Route115_Text_MarlenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_Text_NeverKnowWhenCavePokemonWillAppear: @ 81F2B55
+Route115_Text_NeverKnowWhenCavePokemonWillAppear:
 	.string "Exploring a cave isn't like walking\n"
 	.string "on a road.\p"
 	.string "You never know when wild POKéMON will\n"
 	.string "appear. It's full of suspense.$"
 
-Route115_Text_RouteSignRustboro: @ 81F2BC9
+Route115_Text_RouteSignRustboro:
 	.string "ROUTE 115\n"
 	.string "{DOWN_ARROW} RUSTBORO CITY$"
 
-Route115_Text_MeteorFallsSign: @ 81F2BE3
+Route115_Text_MeteorFallsSign:
 	.string "METEOR FALLS\n"
 	.string "FALLARBOR TOWN THROUGH HERE$"
 
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
index d904fb9eb..2b974035a 100644
--- a/data/maps/Route116/scripts.inc
+++ b/data/maps/Route116/scripts.inc
@@ -1,13 +1,13 @@
 .set LOCALID_BRINEY, 11
 .set LOCALID_WANDAS_BF_OUTSIDE, 21
 
-Route116_MapScripts:: @ 81F2C0C
+Route116_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route116_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_OnFrame
 	.byte 0
 
-Route116_OnTransition: @ 81F2C1C
+Route116_OnTransition:
 	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos
 	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
@@ -17,22 +17,22 @@ Route116_OnTransition: @ 81F2C1C
 	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 
-Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47
+Route116_EventScript_SetWandasBoyfriendPos::
 	setobjectxyperm LOCALID_WANDAS_BF_OUTSIDE, 38, 10
 	return
 
-Route116_OnLoad: @ 81F2C4F
+Route116_OnLoad:
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_NORTH
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116North
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_116_SOUTH
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute116South
 	end
 
-Route116_OnFrame: @ 81F2C66
+Route116_OnFrame:
 	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route116_EventScript_WandasBoyfriend:: @ 81F2C70
+Route116_EventScript_WandasBoyfriend::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_BoyfriendGruntLeftTunnel
@@ -41,17 +41,17 @@ Route116_EventScript_WandasBoyfriend:: @ 81F2C70
 	release
 	end
 
-Route116_EventScript_BoyfriendGruntLeftTunnel:: @ 81F2C8E
+Route116_EventScript_BoyfriendGruntLeftTunnel::
 	msgbox Route116_Text_GoonHightailedItOutOfTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_BoyfriendGruntInTunnel:: @ 81F2C98
+Route116_EventScript_BoyfriendGruntInTunnel::
 	msgbox Route116_Text_DiggingTunnelWhenGoonOrderedMeOut, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_DevonEmployee:: @ 81F2CA2
+Route116_EventScript_DevonEmployee::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_TryGiveRepeatBallAgain
@@ -59,7 +59,7 @@ Route116_EventScript_DevonEmployee:: @ 81F2CA2
 	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_GiveRepeatBall:: @ 81F2CBB
+Route116_EventScript_GiveRepeatBall::
 	setflag FLAG_MET_DEVON_EMPLOYEE
 	giveitem ITEM_REPEAT_BALL
 	compare VAR_RESULT, FALSE
@@ -80,27 +80,27 @@ Route116_EventScript_GiveRepeatBall:: @ 81F2CBB
 	release
 	end
 
-Route116_EventScript_DevonEmployeeExit:: @ 81F2D15
+Route116_EventScript_DevonEmployeeExit::
 	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExit
 	waitmovement 0
 	return
 
-Route116_EventScript_DevonEmployeeExitEast:: @ 81F2D20
+Route116_EventScript_DevonEmployeeExitEast::
 	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExitEast
 	waitmovement 0
 	return
 
-Route116_EventScript_TryGiveRepeatBallAgain:: @ 81F2D2B
+Route116_EventScript_TryGiveRepeatBallAgain::
 	msgbox Route116_Text_TokenOfAppreciation, MSGBOX_DEFAULT
 	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_NoRoomForRepeatBall:: @ 81F2D39
+Route116_EventScript_NoRoomForRepeatBall::
 	msgbox Route116_Text_BagIsJamPacked, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_Movement_DevonEmployeeExit: @ 81F2D43
+Route116_Movement_DevonEmployeeExit:
 	walk_left
 	walk_left
 	walk_left
@@ -111,7 +111,7 @@ Route116_Movement_DevonEmployeeExit: @ 81F2D43
 	walk_left
 	step_end
 
-Route116_Movement_DevonEmployeeExitEast: @ 81F2D4C
+Route116_Movement_DevonEmployeeExitEast:
 	walk_down
 	walk_left
 	walk_left
@@ -124,27 +124,27 @@ Route116_Movement_DevonEmployeeExitEast: @ 81F2D4C
 	walk_left
 	step_end
 
-Route116_EventScript_RouteSignRustboro:: @ 81F2D57
+Route116_EventScript_RouteSignRustboro::
 	msgbox Route116_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route116_EventScript_RusturfTunnelSign:: @ 81F2D60
+Route116_EventScript_RusturfTunnelSign::
 	msgbox Route116_Text_RusturfTunnelSign, MSGBOX_SIGN
 	end
 
-Route116_EventScript_TunnelersRestHouseSign:: @ 81F2D69
+Route116_EventScript_TunnelersRestHouseSign::
 	msgbox Route116_Text_TunnelersRestHouse, MSGBOX_SIGN
 	end
 
-Route116_EventScript_TrainerTipsBToStopEvolution:: @ 81F2D72
+Route116_EventScript_TrainerTipsBToStopEvolution::
 	msgbox Route116_Text_TrainerTipsBToStopEvolution, MSGBOX_SIGN
 	end
 
-Route116_EventScript_TrainerTipsBagHasPockets:: @ 81F2D7B
+Route116_EventScript_TrainerTipsBagHasPockets::
 	msgbox Route116_Text_TrainerTipsBagHasPockets, MSGBOX_SIGN
 	end
 
-Route116_EventScript_Briney:: @ 81F2D84
+Route116_EventScript_Briney::
 	lock
 	faceplayer
 	msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT
@@ -152,7 +152,7 @@ Route116_EventScript_Briney:: @ 81F2D84
 	release
 	end
 
-Route116_EventScript_BrineyTrigger:: @ 81F2D95
+Route116_EventScript_BrineyTrigger::
 	lockall
 	applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestRight
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
@@ -162,7 +162,7 @@ Route116_EventScript_BrineyTrigger:: @ 81F2D95
 	releaseall
 	end
 
-Route116_EventScript_GlassesMan:: @ 81F2DB6
+Route116_EventScript_GlassesMan::
 	lock
 	faceplayer
 	checkitem ITEM_BLACK_GLASSES, 1
@@ -175,13 +175,13 @@ Route116_EventScript_GlassesMan:: @ 81F2DB6
 	release
 	end
 
-Route116_EventScript_FoundGlassesNotOnPlayer:: @ 81F2DE2
+Route116_EventScript_FoundGlassesNotOnPlayer::
 	msgbox Route116_Text_CantFindGlassesNotHere, MSGBOX_DEFAULT
 	closemessage
 	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_PlayerHasGlasses:: @ 81F2DF1
+Route116_EventScript_PlayerHasGlasses::
 	msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT
 	msgbox Route116_Text_MayISeeThoseGlasses, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, FoundBlackGlasses
@@ -191,13 +191,13 @@ Route116_EventScript_PlayerHasGlasses:: @ 81F2DF1
 	release
 	end
 
-Route116_EventScript_FoundGlassesOnPlayer:: @ 81F2E1B
+Route116_EventScript_FoundGlassesOnPlayer::
 	msgbox Route116_Text_NotWhatImLookingForMaybeTheyArentHere, MSGBOX_DEFAULT
 	closemessage
 	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_GlassesManExit:: @ 81F2E2A
+Route116_EventScript_GlassesManExit::
 	delay 20
 	compare VAR_FACING, DIR_NORTH
 	call_if_eq Route116_EventScript_GlassesManExitNormal
@@ -211,17 +211,17 @@ Route116_EventScript_GlassesManExit:: @ 81F2E2A
 	release
 	end
 
-Route116_EventScript_GlassesManExitNormal:: @ 81F2E5E
+Route116_EventScript_GlassesManExitNormal::
 	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExit
 	waitmovement 0
 	return
 
-Route116_EventScript_GlassesManExitEast:: @ 81F2E69
+Route116_EventScript_GlassesManExitEast::
 	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExitEast
 	waitmovement 0
 	return
 
-Route116_Movement_GlassesManExit: @ 81F2E74
+Route116_Movement_GlassesManExit:
 	walk_left
 	walk_left
 	walk_left
@@ -233,7 +233,7 @@ Route116_Movement_GlassesManExit: @ 81F2E74
 	walk_left
 	step_end
 
-Route116_Movement_GlassesManExitEast: @ 81F2E7E
+Route116_Movement_GlassesManExitEast:
 	walk_up
 	walk_left
 	walk_left
@@ -246,17 +246,17 @@ Route116_Movement_GlassesManExitEast: @ 81F2E7E
 	walk_left
 	step_end
 
-Route116_EventScript_Joey:: @ 81F2E89
+Route116_EventScript_Joey::
 	trainerbattle_single TRAINER_JOEY, Route116_Text_JoeyIntro, Route116_Text_JoeyDefeat
 	msgbox Route116_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Jose:: @ 81F2EA0
+Route116_EventScript_Jose::
 	trainerbattle_single TRAINER_JOSE, Route116_Text_JoseIntro, Route116_Text_JoseDefeat
 	msgbox Route116_Text_JosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Jerry:: @ 81F2EB7
+Route116_EventScript_Jerry::
 	trainerbattle_single TRAINER_JERRY_1, Route116_Text_JerryIntro, Route116_Text_JerryDefeat, Route116_EventScript_TryRegisterJerryAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -269,12 +269,12 @@ Route116_EventScript_Jerry:: @ 81F2EB7
 	release
 	end
 
-Route116_EventScript_TryRegisterJerryAfterBattle:: @ 81F2EF8
+Route116_EventScript_TryRegisterJerryAfterBattle::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerryAfterBattle
 	release
 	end
 
-Route116_EventScript_RegisterJerryAfterBattle:: @ 81F2F03
+Route116_EventScript_RegisterJerryAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route116_Text_JerryRegister2, MSGBOX_DEFAULT
@@ -282,34 +282,34 @@ Route116_EventScript_RegisterJerryAfterBattle:: @ 81F2F03
 	release
 	end
 
-Route116_EventScript_TryRegisterJerry:: @ 81F2F22
+Route116_EventScript_TryRegisterJerry::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerry
 	msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_RegisterJerry:: @ 81F2F35
+Route116_EventScript_RegisterJerry::
 	msgbox Route116_Text_JerryRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JERRY_1
 	release
 	end
 
-Route116_EventScript_RematchJerry:: @ 81F2F4E
+Route116_EventScript_RematchJerry::
 	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_JerryRematchIntro, Route116_Text_JerryRematchDefeat
 	msgbox Route116_Text_JerryPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Clark:: @ 81F2F65
+Route116_EventScript_Clark::
 	trainerbattle_single TRAINER_CLARK, Route116_Text_ClarkIntro, Route116_Text_ClarkDefeat
 	msgbox Route116_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Janice:: @ 81F2F7C
+Route116_EventScript_Janice::
 	trainerbattle_single TRAINER_JANICE, Route116_Text_JaniceIntro, Route116_Text_JaniceDefeat
 	msgbox Route116_Text_JanicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Karen:: @ 81F2F93
+Route116_EventScript_Karen::
 	trainerbattle_single TRAINER_KAREN_1, Route116_Text_KarenIntro, Route116_Text_KarenDefeat, Route116_EventScript_TryRegisterKarenAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -322,12 +322,12 @@ Route116_EventScript_Karen:: @ 81F2F93
 	release
 	end
 
-Route116_EventScript_TryRegisterKarenAfterBattle:: @ 81F2FD4
+Route116_EventScript_TryRegisterKarenAfterBattle::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKarenAfterBattle
 	release
 	end
 
-Route116_EventScript_RegisterKarenAfterBattle:: @ 81F2FDF
+Route116_EventScript_RegisterKarenAfterBattle::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route116_Text_KarenRegister2, MSGBOX_DEFAULT
@@ -335,44 +335,44 @@ Route116_EventScript_RegisterKarenAfterBattle:: @ 81F2FDF
 	release
 	end
 
-Route116_EventScript_TryRegisterKaren:: @ 81F2FFE
+Route116_EventScript_TryRegisterKaren::
 	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKaren
 	msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_RegisterKaren:: @ 81F3011
+Route116_EventScript_RegisterKaren::
 	msgbox Route116_Text_KarenRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KAREN_1
 	release
 	end
 
-Route116_EventScript_RematchKaren:: @ 81F302A
+Route116_EventScript_RematchKaren::
 	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_KarenRematchIntro, Route116_Text_KarenRematchDefeat
 	msgbox Route116_Text_KarenPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Sarah:: @ 81F3041
+Route116_EventScript_Sarah::
 	trainerbattle_single TRAINER_SARAH, Route116_Text_SarahIntro, Route116_Text_SarahDefeat
 	msgbox Route116_Text_SarahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Dawson:: @ 81F3058
+Route116_EventScript_Dawson::
 	trainerbattle_single TRAINER_DAWSON, Route116_Text_DawsonIntro, Route116_Text_DawsonDefeat
 	msgbox Route116_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Devan:: @ 81F306F
+Route116_EventScript_Devan::
 	trainerbattle_single TRAINER_DEVAN, Route116_Text_DevanIntro, Route116_Text_DevanDefeat
 	msgbox Route116_Text_DevanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_Johnson:: @ 81F3086
+Route116_EventScript_Johnson::
 	trainerbattle_single TRAINER_JOHNSON, Route116_Text_JohnsonIntro, Route116_Text_JohnsonDefeat
 	msgbox Route116_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_Text_ScoundrelMadeOffWithPeeko: @ 81F309D
+Route116_Text_ScoundrelMadeOffWithPeeko:
 	.string "Ohhh, what am I to do?\p"
 	.string "We were on our walk, PEEKO and I, when\n"
 	.string "we were jumped by an odd thug…\p"
@@ -380,11 +380,11 @@ Route116_Text_ScoundrelMadeOffWithPeeko: @ 81F309D
 	.string "darling PEEKO!\p"
 	.string "Wrrrooooooaaaar! PEEKO!$"
 
-Route116_Text_WantToDigTunnel: @ 81F3140
+Route116_Text_WantToDigTunnel:
 	.string "Nnn… Roar!\p"
 	.string "I want to dig that tunnel!$"
 
-Route116_Text_DiggingTunnelWhenGoonOrderedMeOut: @ 81F3166
+Route116_Text_DiggingTunnelWhenGoonOrderedMeOut:
 	.string "Nnn… Roar!\n"
 	.string "What's going on?\p"
 	.string "I was digging the tunnel without any\n"
@@ -398,12 +398,12 @@ Route116_Text_DiggingTunnelWhenGoonOrderedMeOut: @ 81F3166
 	.string "something stupid and startle the\l"
 	.string "POKéMON into an uproar.$"
 
-Route116_Text_GoonHightailedItOutOfTunnel: @ 81F32C1
+Route116_Text_GoonHightailedItOutOfTunnel:
 	.string "Nnn… Roar!\p"
 	.string "That goofy goon hightailed it out of\n"
 	.string "the tunnel! I can go back to digging!$"
 
-Route116_Text_ThankYouTokenOfAppreciation: @ 81F3317
+Route116_Text_ThankYouTokenOfAppreciation:
 	.string "Oh! It's you!\p"
 	.string "You're that person who not only helped\n"
 	.string "me in PETALBURG WOODS, but also got\l"
@@ -422,61 +422,61 @@ Route116_Text_ThankYouTokenOfAppreciation: @ 81F3317
 	.string "As a token of our appreciation, this\n"
 	.string "is our gift to our wonderful TRAINER!$"
 
-Route116_Text_NewBallAvailableAtMart: @ 81F3521
+Route116_Text_NewBallAvailableAtMart:
 	.string "Our new POKé BALL will be available\n"
 	.string "at the POKéMON MART in RUSTBORO.\p"
 	.string "Please do try it out!\n"
 	.string "Thank you and bye-bye!$"
 
-Route116_Text_BagIsJamPacked: @ 81F3593
+Route116_Text_BagIsJamPacked:
 	.string "Your BAG is jam-packed.\n"
 	.string "I can't give you this REPEAT BALL.$"
 
-Route116_Text_TokenOfAppreciation: @ 81F35CE
+Route116_Text_TokenOfAppreciation:
 	.string "As a token of our appreciation for\n"
 	.string "your delivering our package, I have\l"
 	.string "a gift of a new kind of POKé BALL\l"
 	.string "for our most wonderful TRAINER!$"
 
-Route116_Text_CanYouHelpMeFindGlasses: @ 81F3657
+Route116_Text_CanYouHelpMeFindGlasses:
 	.string "I dropped my glasses…\n"
 	.string "Can you help me find them?$"
 
-Route116_Text_MayISeeThoseGlasses: @ 81F3688
+Route116_Text_MayISeeThoseGlasses:
 	.string "Those glasses!\n"
 	.string "May I see them for a second?$"
 
-Route116_Text_NotWhatImLookingForMaybeTheyArentHere: @ 81F36B4
+Route116_Text_NotWhatImLookingForMaybeTheyArentHere:
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…\p"
 	.string "Maybe my glasses aren't around\n"
 	.string "here…$"
 
-Route116_Text_CantFindGlassesNotHere: @ 81F3718
+Route116_Text_CantFindGlassesNotHere:
 	.string "Hmm…\n"
 	.string "I can't find my glasses anywhere…\l"
 	.string "Maybe they're not around here…$"
 
-Route116_Text_NotWhatImLookingFor: @ 81F375E
+Route116_Text_NotWhatImLookingFor:
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…$"
 
-Route116_Text_RouteSignRustboro: @ 81F379D
+Route116_Text_RouteSignRustboro:
 	.string "ROUTE 116\n"
 	.string "{LEFT_ARROW} RUSTBORO CITY$"
 
-Route116_Text_RusturfTunnelSign: @ 81F37B7
+Route116_Text_RusturfTunnelSign:
 	.string "RUSTURF TUNNEL\n"
 	.string "“Linking RUSTBORO and VERDANTURF\p"
 	.string "“The tunnel project has been\n"
 	.string "canceled.”$"
 
-Route116_Text_TunnelersRestHouse: @ 81F380F
+Route116_Text_TunnelersRestHouse:
 	.string "TUNNELER'S REST HOUSE$"
 
-Route116_Text_TrainerTipsBToStopEvolution: @ 81F3825
+Route116_Text_TrainerTipsBToStopEvolution:
 	.string "TRAINER TIPS\p"
 	.string "If you want to stop a POKéMON from\n"
 	.string "evolving, press the B Button while it\l"
@@ -484,7 +484,7 @@ Route116_Text_TrainerTipsBToStopEvolution: @ 81F3825
 	.string "The startled POKéMON will stop.\p"
 	.string "This is called an evolution cancel.$"
 
-Route116_Text_TrainerTipsBagHasPockets: @ 81F38D4
+Route116_Text_TrainerTipsBagHasPockets:
 	.string "TRAINER TIPS\p"
 	.string "Your BAG has several POCKETS.\p"
 	.string "Items you obtain are automatically\n"
diff --git a/data/maps/Route116_TunnelersRestHouse/scripts.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc
index 42a80fc78..bc46cec73 100644
--- a/data/maps/Route116_TunnelersRestHouse/scripts.inc
+++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc
@@ -1,20 +1,20 @@
-Route116_TunnelersRestHouse_MapScripts:: @ 822B850
+Route116_TunnelersRestHouse_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route116_TunnelersRestHouse_OnTransition
 	.byte 0
 
-Route116_TunnelersRestHouse_OnTransition: @ 822B856
+Route116_TunnelersRestHouse_OnTransition:
 	setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE
 	end
 
-Route116_TunnelersRestHouse_EventScript_Tunneler1:: @ 822B85A
+Route116_TunnelersRestHouse_EventScript_Tunneler1::
 	msgbox Route116_TunnelersRestHouse_Text_WeHadToStopBoring, MSGBOX_NPC
 	end
 
-Route116_TunnelersRestHouse_EventScript_Tunneler2:: @ 822B863
+Route116_TunnelersRestHouse_EventScript_Tunneler2::
 	msgbox Route116_TunnelersRestHouse_Text_ManDiggingHisWayToVerdanturf, MSGBOX_NPC
 	end
 
-Route116_TunnelersRestHouse_EventScript_Tunneler3:: @ 822B86C
+Route116_TunnelersRestHouse_EventScript_Tunneler3::
 	lock
 	faceplayer
 	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_TunnelOpened
@@ -22,12 +22,12 @@ Route116_TunnelersRestHouse_EventScript_Tunneler3:: @ 822B86C
 	release
 	end
 
-Route116_TunnelersRestHouse_EventScript_TunnelOpened:: @ 822B881
+Route116_TunnelersRestHouse_EventScript_TunnelOpened::
 	msgbox Route116_TunnelersRestHouse_Text_TunnelHasGoneThrough, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_TunnelersRestHouse_Text_WeHadToStopBoring: @ 822B88B
+Route116_TunnelersRestHouse_Text_WeHadToStopBoring:
 	.string "That RUSTURF TUNNEL there…\p"
 	.string "At first, we had a huge work crew boring\n"
 	.string "through rock with the latest machinery.\l"
@@ -38,7 +38,7 @@ Route116_TunnelersRestHouse_Text_WeHadToStopBoring: @ 822B88B
 	.string "So, we've got nothing to do but loll\n"
 	.string "around here doing nothing.$"
 
-Route116_TunnelersRestHouse_Text_ManDiggingHisWayToVerdanturf: @ 822B99F
+Route116_TunnelersRestHouse_Text_ManDiggingHisWayToVerdanturf:
 	.string "There's a man digging his way to\n"
 	.string "VERDANTURF all by his lonesome.\l"
 	.string "He's desperate to get through.\p"
@@ -48,13 +48,13 @@ Route116_TunnelersRestHouse_Text_ManDiggingHisWayToVerdanturf: @ 822B99F
 	.string "harming the natural environment.\p"
 	.string "I wonder if he made it through yet.$"
 
-Route116_TunnelersRestHouse_Text_GetToVerdanturfWithoutTunnel: @ 822BAAF
+Route116_TunnelersRestHouse_Text_GetToVerdanturfWithoutTunnel:
 	.string "To get to VERDANTURF without using\n"
 	.string "this TUNNEL, you'd have to cross the\l"
 	.string "sea to DEWFORD, sail on to SLATEPORT,\l"
 	.string "then travel through MAUVILLE.$"
 
-Route116_TunnelersRestHouse_Text_TunnelHasGoneThrough: @ 822BB3B
+Route116_TunnelersRestHouse_Text_TunnelHasGoneThrough:
 	.string "Did you hear? The TUNNEL to VERDANTURF\n"
 	.string "has gone through!\p"
 	.string "Sometimes, if you hope strongly enough,\n"
diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc
index 08f8d0500..f6ab88591 100644
--- a/data/maps/Route117/scripts.inc
+++ b/data/maps/Route117/scripts.inc
@@ -1,44 +1,44 @@
 .set LOCALID_DAYCARE_MAN, 3
 
-Route117_MapScripts:: @ 81F397D
+Route117_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route117_OnTransition
 	.byte 0
 
-Route117_OnTransition: @ 81F3983
+Route117_OnTransition:
 	call Route117_EventScript_TryMoveDayCareMan
 	end
 
-Route117_EventScript_TryMoveDayCareMan:: @ 81F3989
+Route117_EventScript_TryMoveDayCareMan::
 	goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_StopMoveDayCareMan
 	setobjectxyperm LOCALID_DAYCARE_MAN, 47, 6
-Route117_EventScript_StopMoveDayCareMan:: @ 81F3999
+Route117_EventScript_StopMoveDayCareMan::
 	return
 
-Route117_EventScript_Woman:: @ 81F399A
+Route117_EventScript_Woman::
 	msgbox Route117_Text_ArentTheseFlowersPretty, MSGBOX_NPC
 	end
 
-Route117_EventScript_LittleBoy:: @ 81F39A3
+Route117_EventScript_LittleBoy::
 	msgbox Route117_Text_AirIsTastyHere, MSGBOX_NPC
 	end
 
-Route117_EventScript_Girl:: @ 81F39AC
+Route117_EventScript_Girl::
 	msgbox Route117_Text_DayCarePokemonHadNewMove, MSGBOX_NPC
 	end
 
-Route117_EventScript_RouteSignVerdanturf:: @ 81F39B5
+Route117_EventScript_RouteSignVerdanturf::
 	msgbox Route117_Text_RouteSignVerdanturf, MSGBOX_SIGN
 	end
 
-Route117_EventScript_RouteSignMauville:: @ 81F39BE
+Route117_EventScript_RouteSignMauville::
 	msgbox Route117_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route117_EventScript_DayCareSign:: @ 81F39C7
+Route117_EventScript_DayCareSign::
 	msgbox Route117_Text_DayCareSign, MSGBOX_SIGN
 	end
 
-Route117_EventScript_Isaac:: @ 81F39D0
+Route117_EventScript_Isaac::
 	trainerbattle_single TRAINER_ISAAC_1, Route117_Text_IsaacIntro, Route117_Text_IsaacDefeat, Route117_EventScript_RegisterIsaac
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -47,7 +47,7 @@ Route117_EventScript_Isaac:: @ 81F39D0
 	release
 	end
 
-Route117_EventScript_RegisterIsaac:: @ 81F39FC
+Route117_EventScript_RegisterIsaac::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route117_Text_IsaacRegister, MSGBOX_DEFAULT
@@ -55,12 +55,12 @@ Route117_EventScript_RegisterIsaac:: @ 81F39FC
 	release
 	end
 
-Route117_EventScript_RematchIsaac:: @ 81F3A1B
+Route117_EventScript_RematchIsaac::
 	trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_IsaacRematchIntro, Route117_Text_IsaacRematchDefeat
 	msgbox Route117_Text_IsaacPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_Lydia:: @ 81F3A32
+Route117_EventScript_Lydia::
 	trainerbattle_single TRAINER_LYDIA_1, Route117_Text_LydiaIntro, Route117_Text_LydiaDefeat, Route117_EventScript_RegisterLydia
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -69,7 +69,7 @@ Route117_EventScript_Lydia:: @ 81F3A32
 	release
 	end
 
-Route117_EventScript_RegisterLydia:: @ 81F3A5E
+Route117_EventScript_RegisterLydia::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route117_Text_LydiaRegister, MSGBOX_DEFAULT
@@ -77,12 +77,12 @@ Route117_EventScript_RegisterLydia:: @ 81F3A5E
 	release
 	end
 
-Route117_EventScript_RematchLydia:: @ 81F3A7D
+Route117_EventScript_RematchLydia::
 	trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_LydiaRematchIntro, Route117_Text_LydiaRematchDefeat
 	msgbox Route117_Text_LydiaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_Dylan:: @ 81F3A94
+Route117_EventScript_Dylan::
 	trainerbattle_single TRAINER_DYLAN_1, Route117_Text_DylanIntro, Route117_Text_DylanDefeat, Route117_EventScript_RegisterDylan
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -91,7 +91,7 @@ Route117_EventScript_Dylan:: @ 81F3A94
 	release
 	end
 
-Route117_EventScript_RegisterDylan:: @ 81F3AC0
+Route117_EventScript_RegisterDylan::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route117_Text_DylanRegister, MSGBOX_DEFAULT
@@ -99,12 +99,12 @@ Route117_EventScript_RegisterDylan:: @ 81F3AC0
 	release
 	end
 
-Route117_EventScript_RematchDylan:: @ 81F3ADF
+Route117_EventScript_RematchDylan::
 	trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_DylanRematchIntro, Route117_Text_DylanRematchDefeat
 	msgbox Route117_Text_DylanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_Maria:: @ 81F3AF6
+Route117_EventScript_Maria::
 	trainerbattle_single TRAINER_MARIA_1, Route117_Text_MariaIntro, Route117_Text_MariaDefeat, Route117_EventScript_RegisterMaria
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -113,7 +113,7 @@ Route117_EventScript_Maria:: @ 81F3AF6
 	release
 	end
 
-Route117_EventScript_RegisterMaria:: @ 81F3B22
+Route117_EventScript_RegisterMaria::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route117_Text_MariaRegister, MSGBOX_DEFAULT
@@ -121,17 +121,17 @@ Route117_EventScript_RegisterMaria:: @ 81F3B22
 	release
 	end
 
-Route117_EventScript_RematchMaria:: @ 81F3B41
+Route117_EventScript_RematchMaria::
 	trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_MariaRematchIntro, Route117_Text_MariaRematchDefeat
 	msgbox Route117_Text_MariaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_Derek:: @ 81F3B58
+Route117_EventScript_Derek::
 	trainerbattle_single TRAINER_DEREK, Route117_Text_DerekIntro, Route117_Text_DerekDefeat
 	msgbox Route117_Text_DerekPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_Anna:: @ 81F3B6F
+Route117_EventScript_Anna::
 	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaIntro, Route117_Text_AnnaDefeat, Route117_Text_AnnaNotEnoughMons, Route117_EventScript_RegisterAnna
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -140,18 +140,18 @@ Route117_EventScript_Anna:: @ 81F3B6F
 	release
 	end
 
-Route117_EventScript_RegisterAnna:: @ 81F3B9F
+Route117_EventScript_RegisterAnna::
 	msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ANNA_AND_MEG_1
 	release
 	end
 
-Route117_EventScript_RematchAnna:: @ 81F3BB8
+Route117_EventScript_RematchAnna::
 	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaRematchIntro, Route117_Text_AnnaRematchDefeat, Route117_Text_AnnaRematchNotEnoughMons
 	msgbox Route117_Text_AnnaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_Meg:: @ 81F3BD3
+Route117_EventScript_Meg::
 	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegIntro, Route117_Text_MegDefeat, Route117_Text_MegNotEnoughMons, Route117_EventScript_RegisterMeg
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -160,55 +160,55 @@ Route117_EventScript_Meg:: @ 81F3BD3
 	release
 	end
 
-Route117_EventScript_RegisterMeg:: @ 81F3C03
+Route117_EventScript_RegisterMeg::
 	msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ANNA_AND_MEG_1
 	release
 	end
 
-Route117_EventScript_RematchMeg:: @ 81F3C1C
+Route117_EventScript_RematchMeg::
 	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegRematchIntro, Route117_Text_MegRematchDefeat, Route117_Text_MegRematchNotEnoughMons
 	msgbox Route117_Text_MegPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_Melina:: @ 81F3C37
+Route117_EventScript_Melina::
 	trainerbattle_single TRAINER_MELINA, Route117_Text_MelinaIntro, Route117_Text_MelinaDefeat
 	msgbox Route117_Text_MelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_Brandi:: @ 81F3C4E
+Route117_EventScript_Brandi::
 	trainerbattle_single TRAINER_BRANDI, Route117_Text_BrandiIntro, Route117_Text_BrandiDefeat
 	msgbox Route117_Text_BrandiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_Aisha:: @ 81F3C65
+Route117_EventScript_Aisha::
 	trainerbattle_single TRAINER_AISHA, Route117_Text_AishaIntro, Route117_Text_AishaDefeat
 	msgbox Route117_Text_AishaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_Text_DayCarePokemonHadNewMove: @ 81F3C7C
+Route117_Text_DayCarePokemonHadNewMove:
 	.string "I left my POKéMON at the DAY CARE.\p"
 	.string "When I got it back, it had a new move\n"
 	.string "that I didn't teach it.\l"
 	.string "I was really, really surprised.$"
 
-Route117_Text_ArentTheseFlowersPretty: @ 81F3CFD
+Route117_Text_ArentTheseFlowersPretty:
 	.string "What do you think?\n"
 	.string "Aren't these flowers pretty?\p"
 	.string "I planted them all!$"
 
-Route117_Text_AirIsTastyHere: @ 81F3D41
+Route117_Text_AirIsTastyHere:
 	.string "The air is tasty here!$"
 
-Route117_Text_RouteSignVerdanturf: @ 81F3D58
+Route117_Text_RouteSignVerdanturf:
 	.string "ROUTE 117\n"
 	.string "{LEFT_ARROW} VERDANTURF TOWN$"
 
-Route117_Text_RouteSignMauville: @ 81F3D74
+Route117_Text_RouteSignMauville:
 	.string "ROUTE 117\n"
 	.string "{RIGHT_ARROW} MAUVILLE CITY$"
 
-Route117_Text_DayCareSign: @ 81F3D8E
+Route117_Text_DayCareSign:
 	.string "POKéMON DAY CARE\n"
 	.string "“Let us raise your POKéMON.”$"
 
diff --git a/data/maps/Route117_PokemonDayCare/scripts.inc b/data/maps/Route117_PokemonDayCare/scripts.inc
index 898935b26..264778dce 100644
--- a/data/maps/Route117_PokemonDayCare/scripts.inc
+++ b/data/maps/Route117_PokemonDayCare/scripts.inc
@@ -1,8 +1,8 @@
-Route117_PokemonDayCare_MapScripts:: @ 822BBB1
+Route117_PokemonDayCare_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route117_PokemonDayCare_OnTransition
 	.byte 0
 
-Route117_PokemonDayCare_OnTransition: @ 822BBB7
+Route117_PokemonDayCare_OnTransition:
 	setflag FLAG_LANDMARK_POKEMON_DAYCARE
 	end
 
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
index 0197508bb..723f3c0b5 100644
--- a/data/maps/Route118/scripts.inc
+++ b/data/maps/Route118/scripts.inc
@@ -1,12 +1,12 @@
 .set LOCALID_STEVEN, 19
 
-Route118_MapScripts:: @ 81F3DBC
+Route118_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route118_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route118_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_OnFrame
 	.byte 0
 
-Route118_OnTransition: @ 81F3DCC
+Route118_OnTransition:
 	call GabbyAndTy_EventScript_UpdateLocation
 	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
@@ -16,18 +16,18 @@ Route118_OnTransition: @ 81F3DCC
 	call_if_eq AbnormalWeather_StartGroudonWeather
 	end
 
-Route118_OnLoad: @ 81F3DF3
+Route118_OnLoad:
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_EAST
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118East
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_118_WEST
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute118West
 	end
 
-Route118_OnFrame: @ 81F3E0A
+Route118_OnFrame:
 	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route118_EventScript_GoodRodFisherman:: @ 81F3E14
+Route118_EventScript_GoodRodFisherman::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_ReceivedGoodRod
@@ -38,7 +38,7 @@ Route118_EventScript_GoodRodFisherman:: @ 81F3E14
 	goto_if_eq Route118_EventScript_DeclineGoodRod
 	end
 
-Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E
+Route118_EventScript_ReceiveGoodRod::
 	msgbox Route118_Text_IdenticalMindsTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_GOOD_ROD
 	setflag FLAG_RECEIVED_GOOD_ROD
@@ -46,29 +46,29 @@ Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E
 	release
 	end
 
-Route118_EventScript_DeclineGoodRod:: @ 81F3E5F
+Route118_EventScript_DeclineGoodRod::
 	msgbox Route118_Text_DontYouLikeToFish, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_ReceivedGoodRod:: @ 81F3E69
+Route118_EventScript_ReceivedGoodRod::
 	msgbox Route118_Text_TryCatchingMonWithGoodRod, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_Girl:: @ 81F3E73
+Route118_EventScript_Girl::
 	msgbox Route118_Text_CanCrossRiversWithSurf, MSGBOX_NPC
 	end
 
-Route118_EventScript_RouteSignMauville:: @ 81F3E7C
+Route118_EventScript_RouteSignMauville::
 	msgbox Route118_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route118_EventScript_RouteSign119:: @ 81F3E85
+Route118_EventScript_RouteSign119::
 	msgbox Route118_Text_RouteSign119, MSGBOX_SIGN
 	end
 
-Route118_EventScript_StevenTrigger0:: @ 81F3E8E
+Route118_EventScript_StevenTrigger0::
 	lockall
 	setvar VAR_0x8008, 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
@@ -78,7 +78,7 @@ Route118_EventScript_StevenTrigger0:: @ 81F3E8E
 	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_StevenTrigger1:: @ 81F3EAE
+Route118_EventScript_StevenTrigger1::
 	lockall
 	setvar VAR_0x8008, 1
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
@@ -86,7 +86,7 @@ Route118_EventScript_StevenTrigger1:: @ 81F3EAE
 	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_StevenTrigger2:: @ 81F3EC4
+Route118_EventScript_StevenTrigger2::
 	lockall
 	setvar VAR_0x8008, 2
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
@@ -96,7 +96,7 @@ Route118_EventScript_StevenTrigger2:: @ 81F3EC4
 	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_StevenTrigger:: @ 81F3EE4
+Route118_EventScript_StevenTrigger::
 	playse SE_LEDGE
 	applymovement LOCALID_STEVEN, Route118_Movement_StevenJumpLedge
 	waitmovement 0
@@ -114,44 +114,44 @@ Route118_EventScript_StevenTrigger:: @ 81F3EE4
 	releaseall
 	end
 
-Route118_EventScript_StevenExit0:: @ 81F3F28
+Route118_EventScript_StevenExit0::
 	applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
 	applymovement LOCALID_STEVEN, Route118_Movement_StevenExit0
 	waitmovement 0
 	return
 
-Route118_EventScript_StevenExit1:: @ 81F3F3A
+Route118_EventScript_StevenExit1::
 	applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
 	applymovement LOCALID_STEVEN, Route118_Movement_StevenExit1
 	waitmovement 0
 	return
 
-Route118_EventScript_StevenExit2:: @ 81F3F4C
+Route118_EventScript_StevenExit2::
 	applymovement OBJ_EVENT_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
 	applymovement LOCALID_STEVEN, Route118_Movement_StevenExit2
 	waitmovement 0
 	return
 
-Route118_Movement_PlayerWatchStevenExit: @ 81F3F5E
+Route118_Movement_PlayerWatchStevenExit:
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-Route118_Movement_StevenApproachLedge0: @ 81F3F61
+Route118_Movement_StevenApproachLedge0:
 	walk_left
 	step_end
 
-Route118_Movement_StevenApproachLedge2: @ 81F3F63
+Route118_Movement_StevenApproachLedge2:
 	walk_right
 	step_end
 
-Route118_Movement_StevenJumpLedge: @ 81F3F65
+Route118_Movement_StevenJumpLedge:
 	jump_2_down
 	delay_16
 	walk_down
 	step_end
 
-Route118_Movement_StevenExit0: @ 81F3F69
+Route118_Movement_StevenExit0:
 	walk_right
 	walk_right
 	walk_right
@@ -164,7 +164,7 @@ Route118_Movement_StevenExit0: @ 81F3F69
 	walk_right
 	step_end
 
-Route118_Movement_StevenExit1: @ 81F3F74
+Route118_Movement_StevenExit1:
 	walk_right
 	walk_right
 	walk_right
@@ -176,7 +176,7 @@ Route118_Movement_StevenExit1: @ 81F3F74
 	walk_right
 	step_end
 
-Route118_Movement_StevenExit2: @ 81F3F7E
+Route118_Movement_StevenExit2:
 	walk_right
 	walk_right
 	walk_right
@@ -187,7 +187,7 @@ Route118_Movement_StevenExit2: @ 81F3F7E
 	walk_right
 	step_end
 
-Route118_EventScript_Rose:: @ 81F3F87
+Route118_EventScript_Rose::
 	trainerbattle_single TRAINER_ROSE_1, Route118_Text_RoseIntro, Route118_Text_RoseDefeat, Route118_EventScript_RegisterRose
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -196,7 +196,7 @@ Route118_EventScript_Rose:: @ 81F3F87
 	release
 	end
 
-Route118_EventScript_RegisterRose:: @ 81F3FB3
+Route118_EventScript_RegisterRose::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route118_Text_RoseRegister, MSGBOX_DEFAULT
@@ -204,22 +204,22 @@ Route118_EventScript_RegisterRose:: @ 81F3FB3
 	release
 	end
 
-Route118_EventScript_RematchRose:: @ 81F3FD2
+Route118_EventScript_RematchRose::
 	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_RoseRematchIntro, Route118_Text_RoseRematchDefeat
 	msgbox Route118_Text_RosePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Barny:: @ 81F3FE9
+Route118_EventScript_Barny::
 	trainerbattle_single TRAINER_BARNY, Route118_Text_BarnyIntro, Route118_Text_BarnyDefeat
 	msgbox Route118_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Wade:: @ 81F4000
+Route118_EventScript_Wade::
 	trainerbattle_single TRAINER_WADE, Route118_Text_WadeIntro, Route118_Text_WadeDefeat
 	msgbox Route118_Text_WadePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Dalton:: @ 81F4017
+Route118_EventScript_Dalton::
 	trainerbattle_single TRAINER_DALTON_1, Route118_Text_DaltonIntro, Route118_Text_DaltonDefeat, Route118_EventScript_RegisterDalton
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -228,7 +228,7 @@ Route118_EventScript_Dalton:: @ 81F4017
 	release
 	end
 
-Route118_EventScript_RegisterDalton:: @ 81F4043
+Route118_EventScript_RegisterDalton::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route118_Text_DaltonRegister, MSGBOX_DEFAULT
@@ -236,27 +236,27 @@ Route118_EventScript_RegisterDalton:: @ 81F4043
 	release
 	end
 
-Route118_EventScript_RematchDalton:: @ 81F4062
+Route118_EventScript_RematchDalton::
 	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_DaltonRematchIntro, Route118_Text_DaltonRematchDefeat
 	msgbox Route118_Text_DaltonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Perry:: @ 81F4079
+Route118_EventScript_Perry::
 	trainerbattle_single TRAINER_PERRY, Route118_Text_PerryIntro, Route118_Text_PerryDefeat
 	msgbox Route118_Text_PerryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Chester:: @ 81F4090
+Route118_EventScript_Chester::
 	trainerbattle_single TRAINER_CHESTER, Route118_Text_ChesterIntro, Route118_Text_ChesterDefeat
 	msgbox Route118_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_Deandre:: @ 81F40A7
+Route118_EventScript_Deandre::
 	trainerbattle_single TRAINER_DEANDRE, Route118_Text_DeandreIntro, Route118_Text_DeandreDefeat
 	msgbox Route118_Text_DeandrePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_Text_StevenQuestions: @ 81F40BE
+Route118_Text_StevenQuestions:
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "It's me, STEVEN!\n"
 	.string "We met in the cave near DEWFORD.\p"
@@ -274,40 +274,40 @@ Route118_Text_StevenQuestions: @ 81F40BE
 	.string "It would be nice if we were to meet\n"
 	.string "again somewhere.$"
 
-Route118_Text_YouAgreeGoodRodIsGood: @ 81F427B
+Route118_Text_YouAgreeGoodRodIsGood:
 	.string "Hmm!\n"
 	.string "A GOOD ROD is really good!\p"
 	.string "Wouldn't you agree?$"
 
-Route118_Text_IdenticalMindsTakeThis: @ 81F42AF
+Route118_Text_IdenticalMindsTakeThis:
 	.string "Hmm!\n"
 	.string "We're of identical minds!\p"
 	.string "Hmm!\n"
 	.string "Take this GOOD ROD!$"
 
-Route118_Text_TryYourLuckFishing: @ 81F42E7
+Route118_Text_TryYourLuckFishing:
 	.string "Wherever there's water, try your luck\n"
 	.string "at fishing.$"
 
-Route118_Text_DontYouLikeToFish: @ 81F4319
+Route118_Text_DontYouLikeToFish:
 	.string "Don't you like to fish?$"
 
-Route118_Text_TryCatchingMonWithGoodRod: @ 81F4331
+Route118_Text_TryCatchingMonWithGoodRod:
 	.string "Try catching all sorts of POKéMON\n"
 	.string "with your GOOD ROD.$"
 
-Route118_Text_CanCrossRiversWithSurf: @ 81F4367
+Route118_Text_CanCrossRiversWithSurf:
 	.string "Even if there isn't a boat, you can\n"
 	.string "cross rivers and the sea if you have\l"
 	.string "a POKéMON that knows SURF.\p"
 	.string "POKéMON can be counted on to do so\n"
 	.string "much!$"
 
-Route118_Text_RouteSignMauville: @ 81F43F4
+Route118_Text_RouteSignMauville:
 	.string "ROUTE 118\n"
 	.string "{LEFT_ARROW} MAUVILLE CITY$"
 
-Route118_Text_RouteSign119: @ 81F440E
+Route118_Text_RouteSign119:
 	.string "ROUTE 118\n"
 	.string "{UP_ARROW} ROUTE 119$"
 
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
index 37da701a0..5e53f4ac8 100644
--- a/data/maps/Route119/scripts.inc
+++ b/data/maps/Route119/scripts.inc
@@ -2,23 +2,23 @@
 .set LOCALID_RIVAL_ON_BIKE, 25
 .set LOCALID_SCOTT, 43
 
-Route119_MapScripts:: @ 81F4424
+Route119_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Route119_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route119_OnTransition
 	.byte 0
 
-Route119_OnResume: @ 81F442F
+Route119_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_TryRemoveKecleon
 	end
 
-Route119_EventScript_TryRemoveKecleon:: @ 81F4439
+Route119_EventScript_TryRemoveKecleon::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-Route119_OnTransition: @ 81F444D
+Route119_OnTransition:
 	call Common_EventScript_SetupRivalGfxId
 	call Common_EventScript_SetupRivalOnBikeGfxId
 	compare VAR_WEATHER_INSTITUTE_STATE, 1
@@ -26,23 +26,23 @@ Route119_OnTransition: @ 81F444D
 	special SetRoute119Weather
 	end
 
-Route119_EventScript_MoveInstituteWorkersDownstairs:: @ 81F4466
+Route119_EventScript_MoveInstituteWorkersDownstairs::
 	setflag FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS
 	clearflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
 	setvar VAR_WEATHER_INSTITUTE_STATE, 2
 	return
 
-Route119_EventScript_RivalTrigger1:: @ 81F4472
+Route119_EventScript_RivalTrigger1::
 	setvar VAR_TEMP_1, 1
 	goto Route119_EventScript_RivalEncounter
 	end
 
-Route119_EventScript_RivalTrigger2:: @ 81F447D
+Route119_EventScript_RivalTrigger2::
 	setvar VAR_TEMP_1, 2
 	goto Route119_EventScript_RivalEncounter
 	end
 
-Route119_EventScript_RivalEncounter:: @ 81F4488
+Route119_EventScript_RivalEncounter::
 	lockall
 	addobject LOCALID_RIVAL_ON_BIKE
 	checkplayergender
@@ -73,15 +73,15 @@ Route119_EventScript_RivalEncounter:: @ 81F4488
 	releaseall
 	end
 
-Route119_EventScript_PlayMayMusic:: @ 81F4501
+Route119_EventScript_PlayMayMusic::
 	playbgm MUS_ENCOUNTER_MAY, TRUE
 	return
 
-Route119_EventScript_PlayBrendanMusic:: @ 81F4506
+Route119_EventScript_PlayBrendanMusic::
 	playbgm MUS_ENCOUNTER_BRENDAN, TRUE
 	return
 
-Route119_EventScript_BattleMay:: @ 81F450B
+Route119_EventScript_BattleMay::
 	msgbox Route119_Text_MayIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route119_EventScript_BattleMayTreecko
@@ -89,29 +89,29 @@ Route119_EventScript_BattleMay:: @ 81F450B
 	case 2, Route119_EventScript_BattleMayMudkip
 	end
 
-Route119_EventScript_BattleMayTreecko:: @ 81F453A
+Route119_EventScript_BattleMayTreecko::
 	trainerbattle_no_intro TRAINER_MAY_ROUTE_119_TREECKO, Route119_Text_MayDefeat
 	goto Route119_EventScript_DefeatedMay
 	end
 
-Route119_EventScript_BattleMayTorchic:: @ 81F454A
+Route119_EventScript_BattleMayTorchic::
 	trainerbattle_no_intro TRAINER_MAY_ROUTE_119_TORCHIC, Route119_Text_MayDefeat
 	goto Route119_EventScript_DefeatedMay
 	end
 
-Route119_EventScript_BattleMayMudkip:: @ 81F455A
+Route119_EventScript_BattleMayMudkip::
 	trainerbattle_no_intro TRAINER_MAY_ROUTE_119_MUDKIP, Route119_Text_MayDefeat
 	goto Route119_EventScript_DefeatedMay
 	end
 
-Route119_EventScript_DefeatedMay:: @ 81F456A
+Route119_EventScript_DefeatedMay::
 	msgbox Route119_Text_MayPresentForYou, MSGBOX_DEFAULT
 	call Route119_EventScript_GiveFlyHM
 	msgbox Route119_Text_MayExplainFly, MSGBOX_DEFAULT
 	goto Route119_EventScript_RivalExitScottArrive
 	end
 
-Route119_EventScript_BattleBrendan:: @ 81F4585
+Route119_EventScript_BattleBrendan::
 	msgbox Route119_Text_BrendanIntro, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, Route119_EventScript_BattleBrendanTreecko
@@ -119,34 +119,34 @@ Route119_EventScript_BattleBrendan:: @ 81F4585
 	case 2, Route119_EventScript_BattleBrendanMudkip
 	end
 
-Route119_EventScript_BattleBrendanTreecko:: @ 81F45B4
+Route119_EventScript_BattleBrendanTreecko::
 	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_TREECKO, Route119_Text_BrendanDefeat
 	goto Route119_EventScript_DefeatedBrendan
 	end
 
-Route119_EventScript_BattleBrendanTorchic:: @ 81F45C4
+Route119_EventScript_BattleBrendanTorchic::
 	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_TORCHIC, Route119_Text_BrendanDefeat
 	goto Route119_EventScript_DefeatedBrendan
 	end
 
-Route119_EventScript_BattleBrendanMudkip:: @ 81F45D4
+Route119_EventScript_BattleBrendanMudkip::
 	trainerbattle_no_intro TRAINER_BRENDAN_ROUTE_119_MUDKIP, Route119_Text_BrendanDefeat
 	goto Route119_EventScript_DefeatedBrendan
 	end
 
-Route119_EventScript_DefeatedBrendan:: @ 81F45E4
+Route119_EventScript_DefeatedBrendan::
 	msgbox Route119_Text_BrendanIllGiveYouThis, MSGBOX_DEFAULT
 	call Route119_EventScript_GiveFlyHM
 	msgbox Route119_Text_BrendanExplainFly, MSGBOX_DEFAULT
 	goto Route119_EventScript_RivalExitScottArrive
 	end
 
-Route119_EventScript_GiveFlyHM:: @ 81F45FF
+Route119_EventScript_GiveFlyHM::
 	giveitem ITEM_HM02
 	setflag FLAG_RECEIVED_HM02
 	return
 
-Route119_EventScript_RivalExitScottArrive:: @ 81F460F
+Route119_EventScript_RivalExitScottArrive::
 	closemessage
 	compare VAR_TEMP_1, 1
 	call_if_eq Route119_EventScript_SetRivalPos1
@@ -182,71 +182,71 @@ Route119_EventScript_RivalExitScottArrive:: @ 81F460F
 	releaseall
 	end
 
-Route119_EventScript_SetScottPos1:: @ 81F46A0
+Route119_EventScript_SetScottPos1::
 	setobjectxyperm LOCALID_SCOTT, 27, 25
 	return
 
-Route119_EventScript_SetScottPos2:: @ 81F46A8
+Route119_EventScript_SetScottPos2::
 	setobjectxyperm LOCALID_SCOTT, 28, 25
 	return
 
-Route119_EventScript_ScottExit1:: @ 81F46B0
+Route119_EventScript_ScottExit1::
 	applymovement LOCALID_SCOTT, Route119_Movement_ScottExit1
 	waitmovement 0
 	return
 
-Route119_EventScript_ScottExit2:: @ 81F46BB
+Route119_EventScript_ScottExit2::
 	applymovement LOCALID_SCOTT, Route119_Movement_ScottExit2
 	waitmovement 0
 	return
 
-Route119_EventScript_RivalEnter1:: @ 81F46C6
+Route119_EventScript_RivalEnter1::
 	applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalEnter1
 	waitmovement 0
 	return
 
-Route119_EventScript_RivalEnter2:: @ 81F46D1
+Route119_EventScript_RivalEnter2::
 	applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalEnter2
 	waitmovement 0
 	return
 
-Route119_EventScript_RivalExit1:: @ 81F46DC
+Route119_EventScript_RivalExit1::
 	applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit1
 	applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalExit1
 	waitmovement 0
 	return
 
-Route119_EventScript_RivalExit2:: @ 81F46EE
+Route119_EventScript_RivalExit2::
 	applymovement OBJ_EVENT_ID_PLAYER, Route119_Movement_PlayerWatchRivalExit2
 	applymovement LOCALID_RIVAL_ON_BIKE, Route119_Movement_RivalExit2
 	waitmovement 0
 	return
 
-Route119_EventScript_SetRivalPos1:: @ 81F4700
+Route119_EventScript_SetRivalPos1::
 	setobjectxyperm LOCALID_RIVAL, 25, 32
 	setobjectxyperm LOCALID_RIVAL_ON_BIKE, 25, 32
 	return
 
-Route119_EventScript_SetRivalPos2:: @ 81F470F
+Route119_EventScript_SetRivalPos2::
 	setobjectxyperm LOCALID_RIVAL, 26, 32
 	setobjectxyperm LOCALID_RIVAL_ON_BIKE, 26, 32
 	return
 
-Route119_Movement_PlayerWatchRivalExit1: @ 81F471E
+Route119_Movement_PlayerWatchRivalExit1:
 	delay_16
 	walk_in_place_fastest_right
 	delay_8
 	walk_in_place_fastest_up
 	step_end
 
-Route119_Movement_PlayerWatchRivalExit2: @ 81F4723
+Route119_Movement_PlayerWatchRivalExit2:
 	delay_16
 	walk_in_place_fastest_left
 	delay_8
 	walk_in_place_fastest_up
 	step_end
 
-Route119_Movement_RivalEnter1: @ 81F4728
+Route119_Movement_RivalEnter1:
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -258,7 +258,7 @@ Route119_Movement_RivalEnter1: @ 81F4728
 	walk_fast_up
 	step_end
 
-Route119_Movement_RivalEnter2: @ 81F4732
+Route119_Movement_RivalEnter2:
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -271,7 +271,7 @@ Route119_Movement_RivalEnter2: @ 81F4732
 	walk_fast_up
 	step_end
 
-Route119_Movement_RivalExit1: @ 81F473D
+Route119_Movement_RivalExit1:
 	walk_fast_right
 	walk_fast_up
 	walk_fast_up
@@ -283,7 +283,7 @@ Route119_Movement_RivalExit1: @ 81F473D
 	walk_fast_up
 	step_end
 
-Route119_Movement_RivalExit2: @ 81F4747
+Route119_Movement_RivalExit2:
 	walk_fast_left
 	walk_fast_up
 	walk_fast_up
@@ -296,7 +296,7 @@ Route119_Movement_RivalExit2: @ 81F4747
 	walk_fast_up
 	step_end
 
-Route119_Movement_ScottEnter: @ 81F4752
+Route119_Movement_ScottEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -306,7 +306,7 @@ Route119_Movement_ScottEnter: @ 81F4752
 	walk_down
 	step_end
 
-Route119_Movement_ScottExit1: @ 81F475A
+Route119_Movement_ScottExit1:
 	walk_up
 	walk_right
 	walk_right
@@ -317,7 +317,7 @@ Route119_Movement_ScottExit1: @ 81F475A
 	walk_up
 	step_end
 
-Route119_Movement_ScottExit2: @ 81F4763
+Route119_Movement_ScottExit2:
 	walk_up
 	walk_right
 	walk_up
@@ -327,49 +327,49 @@ Route119_Movement_ScottExit2: @ 81F4763
 	walk_up
 	step_end
 
-Route119_EventScript_CyclingTriathleteM:: @ 81F476B
+Route119_EventScript_CyclingTriathleteM::
 	msgbox Route119_Text_TallGrassSnaresBikeTires, MSGBOX_NPC
 	end
 
-Route119_EventScript_RouteSignFortree:: @ 81F4774
+Route119_EventScript_RouteSignFortree::
 	msgbox Route119_Text_RouteSignFortree, MSGBOX_SIGN
 	end
 
-Route119_EventScript_WeatherInstituteSign:: @ 81F477D
+Route119_EventScript_WeatherInstituteSign::
 	msgbox Route119_Text_WeatherInstitute, MSGBOX_SIGN
 	end
 
-Route119_EventScript_Brent:: @ 81F4786
+Route119_EventScript_Brent::
 	trainerbattle_single TRAINER_BRENT, Route119_Text_BrentIntro, Route119_Text_BrentDefeat
 	msgbox Route119_Text_BrentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Donald:: @ 81F479D
+Route119_EventScript_Donald::
 	trainerbattle_single TRAINER_DONALD, Route119_Text_DonaldIntro, Route119_Text_DonaldDefeat
 	msgbox Route119_Text_DonaldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Taylor:: @ 81F47B4
+Route119_EventScript_Taylor::
 	trainerbattle_single TRAINER_TAYLOR, Route119_Text_TaylorIntro, Route119_Text_TaylorDefeat
 	msgbox Route119_Text_TaylorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Doug:: @ 81F47CB
+Route119_EventScript_Doug::
 	trainerbattle_single TRAINER_DOUG, Route119_Text_DougIntro, Route119_Text_DougDefeat
 	msgbox Route119_Text_DougPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Greg:: @ 81F47E2
+Route119_EventScript_Greg::
 	trainerbattle_single TRAINER_GREG, Route119_Text_GregIntro, Route119_Text_GregDefeat
 	msgbox Route119_Text_GregPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Kent:: @ 81F47F9
+Route119_EventScript_Kent::
 	trainerbattle_single TRAINER_KENT, Route119_Text_KentIntro, Route119_Text_KentDefeat
 	msgbox Route119_Text_KentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Jackson:: @ 81F4810
+Route119_EventScript_Jackson::
 	trainerbattle_single TRAINER_JACKSON_1, Route119_Text_JacksonIntro, Route119_Text_JacksonDefeat, Route119_EventScript_RegisterJackson
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -378,7 +378,7 @@ Route119_EventScript_Jackson:: @ 81F4810
 	release
 	end
 
-Route119_EventScript_RegisterJackson:: @ 81F483C
+Route119_EventScript_RegisterJackson::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route119_Text_JacksonRegister, MSGBOX_DEFAULT
@@ -386,12 +386,12 @@ Route119_EventScript_RegisterJackson:: @ 81F483C
 	release
 	end
 
-Route119_EventScript_RematchJackson:: @ 81F485B
+Route119_EventScript_RematchJackson::
 	trainerbattle_rematch TRAINER_JACKSON_1, Route119_Text_JacksonRematchIntro, Route119_Text_JacksonRematchDefeat
 	msgbox Route119_Text_JacksonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Catherine:: @ 81F4872
+Route119_EventScript_Catherine::
 	trainerbattle_single TRAINER_CATHERINE_1, Route119_Text_CatherineIntro, Route119_Text_CatherineDefeat, Route119_EventScript_RegisterCatherine
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -400,7 +400,7 @@ Route119_EventScript_Catherine:: @ 81F4872
 	release
 	end
 
-Route119_EventScript_RegisterCatherine:: @ 81F489E
+Route119_EventScript_RegisterCatherine::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route119_Text_CatherineRegister, MSGBOX_DEFAULT
@@ -408,57 +408,57 @@ Route119_EventScript_RegisterCatherine:: @ 81F489E
 	release
 	end
 
-Route119_EventScript_RematchCatherine:: @ 81F48BD
+Route119_EventScript_RematchCatherine::
 	trainerbattle_rematch TRAINER_CATHERINE_1, Route119_Text_CatherineRematchIntro, Route119_Text_CatherineRematchDefeat
 	msgbox Route119_Text_CatherinePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Hugh:: @ 81F48D4
+Route119_EventScript_Hugh::
 	trainerbattle_single TRAINER_HUGH, Route119_Text_HughIntro, Route119_Text_HughDefeat
 	msgbox Route119_Text_HughPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Phil:: @ 81F48EB
+Route119_EventScript_Phil::
 	trainerbattle_single TRAINER_PHIL, Route119_Text_PhilIntro, Route119_Text_PhilDefeat
 	msgbox Route119_Text_PhilPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Yasu:: @ 81F4902
+Route119_EventScript_Yasu::
 	trainerbattle_single TRAINER_YASU, Route119_Text_YasuIntro, Route119_Text_YasuDefeat
 	msgbox Route119_Text_YasuPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Takashi:: @ 81F4919
+Route119_EventScript_Takashi::
 	trainerbattle_single TRAINER_TAKASHI, Route119_Text_TakashiIntro, Route119_Text_TakashiDefeat
 	msgbox Route119_Text_TakashiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Hideo:: @ 81F4930
+Route119_EventScript_Hideo::
 	trainerbattle_single TRAINER_HIDEO, Route119_Text_HideoIntro, Route119_Text_HideoDefeat
 	msgbox Route119_Text_HideoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Chris:: @ 81F4947
+Route119_EventScript_Chris::
 	trainerbattle_single TRAINER_CHRIS, Route119_Text_ChrisIntro, Route119_Text_ChrisDefeat
 	msgbox Route119_Text_ChrisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Fabian:: @ 81F495E
+Route119_EventScript_Fabian::
 	trainerbattle_single TRAINER_FABIAN, Route119_Text_FabianIntro, Route119_Text_FabianDefeat
 	msgbox Route119_Text_FabianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Dayton:: @ 81F4975
+Route119_EventScript_Dayton::
 	trainerbattle_single TRAINER_DAYTON, Route119_Text_DaytonIntro, Route119_Text_DaytonDefeat
 	msgbox Route119_Text_DaytonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_Rachel:: @ 81F498C
+Route119_EventScript_Rachel::
 	trainerbattle_single TRAINER_RACHEL, Route119_Text_RachelIntro, Route119_Text_RachelDefeat
 	msgbox Route119_Text_RachelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_EventScript_BridgeAquaGrunt1:: @ 81F49A3
+Route119_EventScript_BridgeAquaGrunt1::
 	lock
 	faceplayer
 	msgbox Route119_Text_StayAwayFromWeatherInstitute, MSGBOX_DEFAULT
@@ -468,7 +468,7 @@ Route119_EventScript_BridgeAquaGrunt1:: @ 81F49A3
 	release
 	end
 
-Route119_EventScript_BridgeAquaGrunt2:: @ 81F49BA
+Route119_EventScript_BridgeAquaGrunt2::
 	lock
 	faceplayer
 	msgbox Route119_Text_DontGoNearWeatherInstitute, MSGBOX_DEFAULT
@@ -478,19 +478,19 @@ Route119_EventScript_BridgeAquaGrunt2:: @ 81F49BA
 	release
 	end
 
-Route119_EventScript_Boy1:: @ 81F49D1
+Route119_EventScript_Boy1::
 	msgbox Route119_Text_ThoughtFlyByCatchingBirdMons, MSGBOX_NPC
 	end
 
-Route119_EventScript_Boy2:: @ 81F49DA
+Route119_EventScript_Boy2::
 	msgbox Route119_Text_CanYourMonMakeSecretBase, MSGBOX_NPC
 	end
 
-Route119_EventScript_TrainerTipsDecoration:: @ 81F49E3
+Route119_EventScript_TrainerTipsDecoration::
 	msgbox Route119_Text_TrainerTipsDecoration, MSGBOX_SIGN
 	end
 
-Route119_EventScript_ScottWonAtFortreeGymCall:: @ 81F49EC
+Route119_EventScript_ScottWonAtFortreeGymCall::
 	lockall
 	pokenavcall Route119_Text_ScottYouWonAtFortreeGym
 	waitmessage
@@ -499,7 +499,7 @@ Route119_EventScript_ScottWonAtFortreeGymCall:: @ 81F49EC
 	releaseall
 	end
 
-Route119_Text_MayIntro: @ 81F49FD
+Route119_Text_MayIntro:
 	.string "MAY: {PLAYER}{KUN}!\n"
 	.string "Where were you? I was looking for you!\p"
 	.string "How much stronger have you gotten?\n"
@@ -507,18 +507,18 @@ Route119_Text_MayIntro: @ 81F49FD
 	.string "Ready with your POKéMON?\n"
 	.string "Of course you are! Go!$"
 
-Route119_Text_MayDefeat: @ 81F4A98
+Route119_Text_MayDefeat:
 	.string "Achah!\n"
 	.string "{PLAYER}{KUN}, you're strong!\p"
 	.string "I was worried that you might be\n"
 	.string "struggling with your training.$"
 
-Route119_Text_MayPresentForYou: @ 81F4AF3
+Route119_Text_MayPresentForYou:
 	.string "MAY: But I had absolutely nothing to\n"
 	.string "worry about! Keep it up!\p"
 	.string "And, here! I have a present for you.$"
 
-Route119_Text_MayExplainFly: @ 81F4B56
+Route119_Text_MayExplainFly:
 	.string "MAY: Use FLY, and your POKéMON will\n"
 	.string "instantly carry you to any town you've\l"
 	.string "already visited.\p"
@@ -531,7 +531,7 @@ Route119_Text_MayExplainFly: @ 81F4B56
 	.string "{PLAYER}{KUN}.\p"
 	.string "Well, let's meet again somewhere!$"
 
-Route119_Text_BrendanIntro: @ 81F4C9A
+Route119_Text_BrendanIntro:
 	.string "BRENDAN: {PLAYER}! So this is where\n"
 	.string "you've been looking for POKéMON?\p"
 	.string "Let me see how good you got.\n"
@@ -539,17 +539,17 @@ Route119_Text_BrendanIntro: @ 81F4C9A
 	.string "Now!\n"
 	.string "It's a battle, so battle!$"
 
-Route119_Text_BrendanDefeat: @ 81F4D24
+Route119_Text_BrendanDefeat:
 	.string "Hmm…\n"
 	.string "You've gotten pretty darn decent.$"
 
-Route119_Text_BrendanIllGiveYouThis: @ 81F4D4B
+Route119_Text_BrendanIllGiveYouThis:
 	.string "BRENDAN: I'd say you're good enough\n"
 	.string "to search for POKéMON anywhere.\p"
 	.string "Here, I'll give you this.\n"
 	.string "Try it out.$"
 
-Route119_Text_BrendanExplainFly: @ 81F4DB5
+Route119_Text_BrendanExplainFly:
 	.string "BRENDAN: Use FLY, and your POKéMON\n"
 	.string "instantly carries you to any town\l"
 	.string "you've already visited.\p"
@@ -557,7 +557,7 @@ Route119_Text_BrendanExplainFly: @ 81F4DB5
 	.string "to do that.\p"
 	.string "Anyway, I have to move along.$"
 
-Route119_Text_ScottWayToGoBeSeeingYou: @ 81F4E60
+Route119_Text_ScottWayToGoBeSeeingYou:
 	.string "SCOTT: Hahahah!\n"
 	.string "Way to go, {PLAYER}{KUN}!\p"
 	.string "I just passed by a TRAINER riding\n"
@@ -572,7 +572,7 @@ Route119_Text_ScottWayToGoBeSeeingYou: @ 81F4E60
 	.string "Well, I'll be seeing you!$"
 
 
-Route119_Text_ScottYouWonAtFortreeGym: @ 81F4FBA
+Route119_Text_ScottYouWonAtFortreeGym:
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "SCOTT: Hiya, {PLAYER}{KUN}, it's me!\p"
@@ -587,17 +587,17 @@ Route119_Text_ScottYouWonAtFortreeGym: @ 81F4FBA
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-Route119_Text_StayAwayFromWeatherInstitute: @ 81F50EB
+Route119_Text_StayAwayFromWeatherInstitute:
 	.string "We're standing lookout here.\p"
 	.string "Hey, you! Stay away from the WEATHER\n"
 	.string "INSTITUTE. It's not safe.$"
 
-Route119_Text_DontGoNearWeatherInstitute: @ 81F5147
+Route119_Text_DontGoNearWeatherInstitute:
 	.string "Lookout duty is surprisingly boring.\p"
 	.string "Hey, you! Please don't go near the\n"
 	.string "WEATHER INSTITUTE.$"
 
-Route119_Text_ThoughtFlyByCatchingBirdMons: @ 81F51A2
+Route119_Text_ThoughtFlyByCatchingBirdMons:
 	.string "I thought you FLY by catching a whole\n"
 	.string "flock of BIRD POKéMON, and then\l"
 	.string "hanging on to them somehow.\p"
@@ -606,25 +606,25 @@ Route119_Text_ThoughtFlyByCatchingBirdMons: @ 81F51A2
 	.string "I wish I'd known about that a long\n"
 	.string "time ago…$"
 
-Route119_Text_TallGrassSnaresBikeTires: @ 81F5261
+Route119_Text_TallGrassSnaresBikeTires:
 	.string "Tch…\n"
 	.string "It's a no-go…\p"
 	.string "The tall grass snares BIKE tires.\n"
 	.string "There's no way you can cycle here.$"
 
-Route119_Text_CanYourMonMakeSecretBase: @ 81F52B9
+Route119_Text_CanYourMonMakeSecretBase:
 	.string "Can your POKéMON use its SECRET POWER\n"
 	.string "on a big pile of grass and make a\l"
 	.string "SECRET BASE?$"
 
-Route119_Text_RouteSignFortree: @ 81F530E
+Route119_Text_RouteSignFortree:
 	.string "ROUTE 119\n"
 	.string "{RIGHT_ARROW} FORTREE CITY$"
 
-Route119_Text_WeatherInstitute: @ 81F5327
+Route119_Text_WeatherInstitute:
 	.string "WEATHER INSTITUTE$"
 
-Route119_Text_TrainerTipsDecoration: @ 81F5339
+Route119_Text_TrainerTipsDecoration:
 	.string "TRAINER TIPS\p"
 	.string "Up to sixteen decorations and\n"
 	.string "furniture items can be placed in\l"
diff --git a/data/maps/Route119_House/scripts.inc b/data/maps/Route119_House/scripts.inc
index b6915aaa3..548b2c394 100644
--- a/data/maps/Route119_House/scripts.inc
+++ b/data/maps/Route119_House/scripts.inc
@@ -1,11 +1,11 @@
-Route119_House_MapScripts:: @ 8270965
+Route119_House_MapScripts::
 	.byte 0
 
-Route119_House_EventScript_Woman:: @ 8270966
+Route119_House_EventScript_Woman::
 	msgbox Route119_House_Text_RumorAboutCaveOfOrigin, MSGBOX_NPC
 	end
 
-Route119_House_EventScript_Wingull:: @ 827096F
+Route119_House_EventScript_Wingull::
 	lock
 	faceplayer
 	waitse
@@ -15,13 +15,13 @@ Route119_House_EventScript_Wingull:: @ 827096F
 	release
 	end
 
-Route119_House_Text_RumorAboutCaveOfOrigin: @ 8270982
+Route119_House_Text_RumorAboutCaveOfOrigin:
 	.string "I heard about a cave called the CAVE\n"
 	.string "OF ORIGIN.\p"
 	.string "People rumor that the spirits of\n"
 	.string "POKéMON are revived there. Could\l"
 	.string "something like that really happen?$"
 
-Route119_House_Text_Wingull: @ 8270A17
+Route119_House_Text_Wingull:
 	.string "WINGULL: Pihyoh!$"
 
diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
index 03c537cf0..33ba0b025 100644
--- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
@@ -1,20 +1,20 @@
 .set LOCALID_LITTLE_BOY, 5
 
-Route119_WeatherInstitute_1F_MapScripts:: @ 826FA86
+Route119_WeatherInstitute_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_1F_OnTransition
 	.byte 0
 
-Route119_WeatherInstitute_1F_OnTransition: @ 826FA8C
+Route119_WeatherInstitute_1F_OnTransition:
 	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	call_if_eq Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos
 	end
 
-Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos:: @ 826FA98
+Route119_WeatherInstitute_1F_EventScript_SetLittleBoyPos::
 	setobjectxyperm LOCALID_LITTLE_BOY, 0, 5
 	setobjectmovementtype LOCALID_LITTLE_BOY, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-Route119_WeatherInstitute_1F_EventScript_LittleBoy:: @ 826FAA4
+Route119_WeatherInstitute_1F_EventScript_LittleBoy::
 	lock
 	faceplayer
 	special GetPlayerBigGuyGirlString
@@ -24,12 +24,12 @@ Route119_WeatherInstitute_1F_EventScript_LittleBoy:: @ 826FAA4
 	release
 	end
 
-Route119_WeatherInstitute_1F_EventScript_LittleBoyTeamAquaHere:: @ 826FABE
+Route119_WeatherInstitute_1F_EventScript_LittleBoyTeamAquaHere::
 	msgbox Route119_WeatherInstitute_1F_Text_EveryoneWentUpstairs, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_1F_EventScript_InstituteWorker1:: @ 826FAC8
+Route119_WeatherInstitute_1F_EventScript_InstituteWorker1::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_StudyingRain
@@ -42,20 +42,20 @@ Route119_WeatherInstitute_1F_EventScript_InstituteWorker1:: @ 826FAC8
 	release
 	end
 
-Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated:: @ 826FAFF
+Route119_WeatherInstitute_1F_EventScript_LegendaryDefeated::
 	addvar VAR_0x8004, 1
 	return
 
-Route119_WeatherInstitute_1F_EventScript_StudyingRain:: @ 826FB05
+Route119_WeatherInstitute_1F_EventScript_StudyingRain::
 	msgbox Route119_WeatherInstitute_1F_Text_ProfStudyingRain, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_1F_EventScript_InstituteWorker2:: @ 826FB0F
+Route119_WeatherInstitute_1F_EventScript_InstituteWorker2::
 	msgbox Route119_WeatherInstitute_1F_Text_WhatWereAquasUpTo, MSGBOX_NPC
 	end
 
-Route119_WeatherInstitute_1F_EventScript_Bed:: @ 826FB18
+Route119_WeatherInstitute_1F_EventScript_Bed::
 	lockall
 	msgbox Route119_WeatherInstitute_1F_Text_TakeRestInBed, MSGBOX_DEFAULT
 	closemessage
@@ -63,54 +63,54 @@ Route119_WeatherInstitute_1F_EventScript_Bed:: @ 826FB18
 	releaseall
 	end
 
-Route119_WeatherInstitute_1F_EventScript_Grunt1:: @ 826FB29
+Route119_WeatherInstitute_1F_EventScript_Grunt1::
 	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_1, Route119_WeatherInstitute_1F_Text_Grunt1Intro, Route119_WeatherInstitute_1F_Text_Grunt1Defeat
 	msgbox Route119_WeatherInstitute_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_1F_EventScript_Grunt4:: @ 826FB40
+Route119_WeatherInstitute_1F_EventScript_Grunt4::
 	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_4, Route119_WeatherInstitute_1F_Text_Grunt4Intro, Route119_WeatherInstitute_1F_Text_Grunt4Defeat
 	msgbox Route119_WeatherInstitute_1F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_1F_Text_Grunt1Intro: @ 826FB57
+Route119_WeatherInstitute_1F_Text_Grunt1Intro:
 	.string "The BOSS got interested in\n"
 	.string "the research they have going here,\l"
 	.string "so he sent us out.\p"
 	.string "You quit meddling!$"
 
-Route119_WeatherInstitute_1F_Text_Grunt1Defeat: @ 826FBBB
+Route119_WeatherInstitute_1F_Text_Grunt1Defeat:
 	.string "Blast it…\n"
 	.string "Blasted by a kid…$"
 
-Route119_WeatherInstitute_1F_Text_Grunt1PostBattle: @ 826FBD7
+Route119_WeatherInstitute_1F_Text_Grunt1PostBattle:
 	.string "Our BOSS knows everything.\p"
 	.string "But I'm just a GRUNT. What would I know\n"
 	.string "about what he's thinking?$"
 
-Route119_WeatherInstitute_1F_Text_Grunt4Intro: @ 826FC34
+Route119_WeatherInstitute_1F_Text_Grunt4Intro:
 	.string "Huh?\n"
 	.string "What's a kid doing here?$"
 
-Route119_WeatherInstitute_1F_Text_Grunt4Defeat: @ 826FC52
+Route119_WeatherInstitute_1F_Text_Grunt4Defeat:
 	.string "Huh?\n"
 	.string "I lost?!$"
 
-Route119_WeatherInstitute_1F_Text_Grunt4PostBattle: @ 826FC60
+Route119_WeatherInstitute_1F_Text_Grunt4PostBattle:
 	.string "Oh, no…\n"
 	.string "I'll catch an earful for losing to a kid…\p"
 	.string "I should just take a nap in the bed…$"
 
-Route119_WeatherInstitute_1F_Text_EveryoneWentUpstairs: @ 826FCB7
+Route119_WeatherInstitute_1F_Text_EveryoneWentUpstairs:
 	.string "While I was sleeping, everyone went\n"
 	.string "upstairs!$"
 
-Route119_WeatherInstitute_1F_Text_WowYoureStrong: @ 826FCE5
+Route119_WeatherInstitute_1F_Text_WowYoureStrong:
 	.string "Wow, you're really strong!\p"
 	.string "I wish I could be a POKéMON TRAINER\n"
 	.string "like you!$"
 
-Route119_WeatherInstitute_1F_Text_ProfStudyingRain: @ 826FD2E
+Route119_WeatherInstitute_1F_Text_ProfStudyingRain:
 	.string "The PROFESSOR loves rain.\n"
 	.string "That's a fact.\p"
 	.string "But if it keeps raining, people will be in\n"
@@ -118,7 +118,7 @@ Route119_WeatherInstitute_1F_Text_ProfStudyingRain: @ 826FD2E
 	.string "And thus, the PROFESSOR is studying\n"
 	.string "if the rain can be put to good use.$"
 
-Route119_WeatherInstitute_1F_Text_NoticingAbnormalWeather: @ 826FDE8
+Route119_WeatherInstitute_1F_Text_NoticingAbnormalWeather:
 	.string "On the 2nd floor of the INSTITUTE,\n"
 	.string "we study the weather patterns over\l"
 	.string "the HOENN region.\p"
@@ -126,13 +126,13 @@ Route119_WeatherInstitute_1F_Text_NoticingAbnormalWeather: @ 826FDE8
 	.string "isolated cases of droughts and\l"
 	.string "heavy rain lately…$"
 
-Route119_WeatherInstitute_1F_Text_WhatWereAquasUpTo: @ 826FE94
+Route119_WeatherInstitute_1F_Text_WhatWereAquasUpTo:
 	.string "Hello!\n"
 	.string "We've been saved by your actions!\p"
 	.string "What I don't understand is what on\n"
 	.string "earth the AQUAS were up to.$"
 
-Route119_WeatherInstitute_1F_Text_TakeRestInBed: @ 826FEFC
+Route119_WeatherInstitute_1F_Text_TakeRestInBed:
 	.string "There's a bed…\n"
 	.string "Let's take a rest.$"
 
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
index 85d9d928f..af281ea0a 100644
--- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -5,11 +5,11 @@
 .set LOCALID_GRUNT_3, 7
 .set LOCALID_GRUNT_4, 8
 
-Route119_WeatherInstitute_2F_MapScripts:: @ 826FF1E
+Route119_WeatherInstitute_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route119_WeatherInstitute_2F_OnTransition
 	.byte 0
 
-Route119_WeatherInstitute_2F_OnTransition: @ 826FF24
+Route119_WeatherInstitute_2F_OnTransition:
 	compare VAR_WEATHER_INSTITUTE_STATE, 0
 	call_if_eq Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere
 	compare VAR_WEATHER_INSTITUTE_STATE, 1
@@ -17,42 +17,42 @@ Route119_WeatherInstitute_2F_OnTransition: @ 826FF24
 	call_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear
 	end
 
-Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere:: @ 826FF44
+Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaHere::
 	setobjectxyperm LOCALID_SCIENTIST, 1, 6
 	setobjectmovementtype LOCALID_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone:: @ 826FF50
+Route119_WeatherInstitute_2F_EventScript_SetScientistPosAquaGone::
 	setobjectxyperm LOCALID_SCIENTIST, 4, 6
 	setobjectmovementtype LOCALID_SCIENTIST, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear:: @ 826FF5C
+Route119_WeatherInstitute_2F_EventScript_SetScientistPosGameClear::
 	setobjectxyperm LOCALID_SCIENTIST, 2, 2
 	setobjectmovementtype LOCALID_SCIENTIST, MOVEMENT_TYPE_FACE_UP
 	return
 
-Route119_WeatherInstitute_2F_EventScript_Grunt5:: @ 826FF68
+Route119_WeatherInstitute_2F_EventScript_Grunt5::
 	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_5, Route119_WeatherInstitute_2F_Text_Grunt5Intro, Route119_WeatherInstitute_2F_Text_Grunt5Defeat
 	msgbox Route119_WeatherInstitute_2F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_2F_EventScript_Grunt2:: @ 826FF7F
+Route119_WeatherInstitute_2F_EventScript_Grunt2::
 	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_2, Route119_WeatherInstitute_2F_Text_Grunt2Intro, Route119_WeatherInstitute_2F_Text_Grunt2Defeat
 	msgbox Route119_WeatherInstitute_2F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_2F_EventScript_Grunt3:: @ 826FF96
+Route119_WeatherInstitute_2F_EventScript_Grunt3::
 	trainerbattle_single TRAINER_GRUNT_WEATHER_INST_3, Route119_WeatherInstitute_2F_Text_Grunt3Intro, Route119_WeatherInstitute_2F_Text_Grunt3Defeat
 	msgbox Route119_WeatherInstitute_2F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_2F_EventScript_Shelly:: @ 826FFAD
+Route119_WeatherInstitute_2F_EventScript_Shelly::
 	trainerbattle_single TRAINER_SHELLY_WEATHER_INSTITUTE, Route119_WeatherInstitute_2F_Text_ShellyIntro, Route119_WeatherInstitute_2F_Text_ShellyDefeat, Route119_WeatherInstitute_2F_EventScript_ShellyDefeated
 	msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8
+Route119_WeatherInstitute_2F_EventScript_ShellyDefeated::
 	msgbox Route119_WeatherInstitute_2F_Text_ShellyPostBattle, MSGBOX_DEFAULT
 	closemessage
 	addobject LOCALID_GRUNT_3
@@ -88,7 +88,7 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated:: @ 826FFC8
 	goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform
 	end
 
-Route119_WeatherInstitute_2F_EventScript_ReceiveCastform:: @ 827004D
+Route119_WeatherInstitute_2F_EventScript_ReceiveCastform::
 	msgbox Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon, MSGBOX_DEFAULT
 	setvar VAR_TEMP_1, SPECIES_CASTFORM
 	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER
@@ -99,7 +99,7 @@ Route119_WeatherInstitute_2F_EventScript_ReceiveCastform:: @ 827004D
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty:: @ 8270085
+Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty::
 	call Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -109,7 +109,7 @@ Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty:: @ 8270085
 	goto Route119_WeatherInstitute_2F_EventScript_ExplainCastform
 	end
 
-Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC:: @ 82700AD
+Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC::
 	call Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -118,12 +118,12 @@ Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC:: @ 82700AD
 	goto Route119_WeatherInstitute_2F_EventScript_SendCastformToPC
 	end
 
-Route119_WeatherInstitute_2F_EventScript_SendCastformToPC:: @ 82700D0
+Route119_WeatherInstitute_2F_EventScript_SendCastformToPC::
 	call Common_EventScript_TransferredToPC
 	goto Route119_WeatherInstitute_2F_EventScript_ExplainCastform
 	end
 
-Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare:: @ 82700DB
+Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare::
 	playfanfare MUS_OBTAIN_ITEM
 	message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform
 	waitmessage
@@ -131,19 +131,19 @@ Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare:: @ 82700DB
 	bufferspeciesname 0, SPECIES_CASTFORM
 	return
 
-Route119_WeatherInstitute_2F_EventScript_ExplainCastform:: @ 82700EA
+Route119_WeatherInstitute_2F_EventScript_ExplainCastform::
 	msgbox Route119_WeatherInstitute_2F_Text_PokemonChangesWithWeather, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_CASTFORM
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather:: @ 82700F7
+Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather::
 	goto_if_set FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather
 	msgbox Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather:: @ 827010A
+Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather::
 	setvar VAR_0x8004, 0
 	call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated
 	call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated
@@ -157,26 +157,26 @@ Route119_WeatherInstitute_2F_EventScript_TryStartAbnormalWeather:: @ 827010A
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_KyogreWeather:: @ 827014F
+Route119_WeatherInstitute_2F_EventScript_KyogreWeather::
 	msgbox Route119_WeatherInstitute_2F_Text_KyogreWeather, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_2F_EventScript_CreateAbnormalWeather:: @ 8270159
+Route119_WeatherInstitute_2F_EventScript_CreateAbnormalWeather::
 	special CreateAbnormalWeatherEvent
 	setflag FLAG_TEMP_2
 	return
 
-Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated:: @ 8270160
+Route119_WeatherInstitute_2F_EventScript_LegendaryDefeated::
 	addvar VAR_0x8004, 1
 	return
 
-Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather:: @ 8270166
+Route119_WeatherInstitute_2F_EventScript_NoAbnormalWeather::
 	msgbox Route119_WeatherInstitute_2F_Text_NoAbnormalWeather, MSGBOX_DEFAULT
 	release
 	end
 
-Route119_WeatherInstitute_2F_Movement_GruntApproachShelly: @ 8270170
+Route119_WeatherInstitute_2F_Movement_GruntApproachShelly:
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -190,7 +190,7 @@ Route119_WeatherInstitute_2F_Movement_GruntApproachShelly: @ 8270170
 	walk_fast_left
 	step_end
 
-Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay: @ 827017C
+Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay:
 	delay_16
 	delay_16
 	delay_16
@@ -200,66 +200,66 @@ Route119_WeatherInstitute_2F_Movement_ShovePlayerOutOfWay: @ 827017C
 	walk_in_place_fastest_down
 	step_end
 
-Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition: @ 8270184
+Route119_WeatherInstitute_2F_Movement_PlayerReturnToPosition:
 	slide_down
 	walk_in_place_fastest_left
 	step_end
 
-Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer: @ 8270187
+Route119_WeatherInstitute_2F_Movement_ScientistApproachPlayer:
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-Route119_WeatherInstitute_2F_EventScript_WeatherScientist:: @ 827018B
+Route119_WeatherInstitute_2F_EventScript_WeatherScientist::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_ScientistMentionWeather
 	goto Route119_WeatherInstitute_2F_EventScript_ReceiveCastform
 	end
 
-Route119_WeatherInstitute_2F_Text_Grunt2Intro: @ 827019C
+Route119_WeatherInstitute_2F_Text_Grunt2Intro:
 	.string "The INSTITUTE created a type of\n"
 	.string "POKéMON that has something to do with\l"
 	.string "the weather. We're here to take them!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt2Defeat: @ 8270208
+Route119_WeatherInstitute_2F_Text_Grunt2Defeat:
 	.string "Our plan's being spoiled by a kid?$"
 
-Route119_WeatherInstitute_2F_Text_Grunt2PostBattle: @ 827022B
+Route119_WeatherInstitute_2F_Text_Grunt2PostBattle:
 	.string "If the POKéMON they made here can\n"
 	.string "control the weather freely, then we of\l"
 	.string "TEAM AQUA definitely need it!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt3Intro: @ 8270292
+Route119_WeatherInstitute_2F_Text_Grunt3Intro:
 	.string "We're TEAM AQUA!\n"
 	.string "We appear wherever anything rare is\l"
 	.string "found!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt3Defeat: @ 82702CE
+Route119_WeatherInstitute_2F_Text_Grunt3Defeat:
 	.string "You got me!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt3PostBattle: @ 82702DA
+Route119_WeatherInstitute_2F_Text_Grunt3PostBattle:
 	.string "You don't have any idea what we of\n"
 	.string "TEAM AQUA are working towards!\l"
 	.string "You stay out of our way!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt5Intro: @ 8270335
+Route119_WeatherInstitute_2F_Text_Grunt5Intro:
 	.string "Don't tell me you're looking for that\n"
 	.string "weather POKéMON, too?\p"
 	.string "That's a no-no!\n"
 	.string "We were here to get it first!$"
 
-Route119_WeatherInstitute_2F_Text_Grunt5Defeat: @ 827039F
+Route119_WeatherInstitute_2F_Text_Grunt5Defeat:
 	.string "Oh, will you look at my POKéMON?$"
 
-Route119_WeatherInstitute_2F_Text_Grunt5PostBattle: @ 82703C0
+Route119_WeatherInstitute_2F_Text_Grunt5PostBattle:
 	.string "Humph, so what?\n"
 	.string "What we want…\p"
 	.string "What we really want isn't here…\n"
 	.string "Ihihihihi…$"
 
-Route119_WeatherInstitute_2F_Text_ShellyIntro: @ 8270409
+Route119_WeatherInstitute_2F_Text_ShellyIntro:
 	.string "Ahahahaha!\p"
 	.string "You're going to meddle in TEAM AQUA's\n"
 	.string "affairs?\p"
@@ -268,56 +268,56 @@ Route119_WeatherInstitute_2F_Text_ShellyIntro: @ 8270409
 	.string "You're so cute, you're disgusting!\n"
 	.string "I'll put you down, kiddy!$"
 
-Route119_WeatherInstitute_2F_Text_ShellyDefeat: @ 82704BD
+Route119_WeatherInstitute_2F_Text_ShellyDefeat:
 	.string "Ahahahaha!\n"
 	.string "You're disgustingly strong!$"
 
-Route119_WeatherInstitute_2F_Text_ShellyPostBattle: @ 82704E4
+Route119_WeatherInstitute_2F_Text_ShellyPostBattle:
 	.string "It's bad enough to have TEAM MAGMA\n"
 	.string "blunder about, but now there's you!\p"
 	.string "What makes you want to sniff around\n"
 	.string "in our business, anyway?$"
 
-Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy: @ 8270568
+Route119_WeatherInstitute_2F_Text_TeamMagmaJustPassedBy:
 	.string "We have a situation here!\p"
 	.string "A TEAM MAGMA mob just passed\n"
 	.string "the WEATHER INSTITUTE.\p"
 	.string "They appear to be headed for\n"
 	.string "MT. PYRE!$"
 
-Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre: @ 82705DD
+Route119_WeatherInstitute_2F_Text_WeHaveToHurryToMtPyre:
 	.string "What?!\p"
 	.string "We can't waste any more time here!\n"
 	.string "We have to hurry to MT. PYRE, too!\p"
 	.string "Ahahahaha!\n"
 	.string "TEAM MAGMA, just you wait!$"
 
-Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon: @ 8270650
+Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon:
 	.string "Thanks!\n"
 	.string "Thanks to you, we're safe!\p"
 	.string "It might be an odd way of thanking you,\n"
 	.string "but take this POKéMON.$"
 
 @ Unused
-Route119_WeatherInstitute_2F_Text_NoRoomForPokemon: @ 82706B2
+Route119_WeatherInstitute_2F_Text_NoRoomForPokemon:
 	.string "Hm? You don't seem to have any room\n"
 	.string "for this POKéMON.$"
 
-Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform: @ 82706E8
+Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform:
 	.string "{PLAYER} received CASTFORM!$"
 
-Route119_WeatherInstitute_2F_Text_PokemonChangesWithWeather: @ 82706FE
+Route119_WeatherInstitute_2F_Text_PokemonChangesWithWeather:
 	.string "That POKéMON changes shape according\n"
 	.string "to the weather conditions.\p"
 	.string "There're plenty of them in the\n"
 	.string "INSTITUTE--go ahead and take it.$"
 
-Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous: @ 827077E
+Route119_WeatherInstitute_2F_Text_ChangingWeatherRidiculous:
 	.string "I've been researching rain for many\n"
 	.string "years, but it's ridiculous to think that\l"
 	.string "humans can freely change the weather.$"
 
-Route119_WeatherInstitute_2F_Text_GroudonWeather: @ 82707F1
+Route119_WeatherInstitute_2F_Text_GroudonWeather:
 	.string "I track weather patterns over\n"
 	.string "the HOENN region.\p"
 	.string "Presently, a drought has been recorded\n"
@@ -325,7 +325,7 @@ Route119_WeatherInstitute_2F_Text_GroudonWeather: @ 82707F1
 	.string "Could that mean, somewhere near\n"
 	.string "{STR_VAR_1}…$"
 
-Route119_WeatherInstitute_2F_Text_KyogreWeather: @ 8270873
+Route119_WeatherInstitute_2F_Text_KyogreWeather:
 	.string "I track weather patterns over\n"
 	.string "the HOENN region.\p"
 	.string "Presently, heavy rainfall has been\n"
@@ -333,7 +333,7 @@ Route119_WeatherInstitute_2F_Text_KyogreWeather: @ 8270873
 	.string "Could that mean, somewhere near\n"
 	.string "{STR_VAR_1}…$"
 
-Route119_WeatherInstitute_2F_Text_NoAbnormalWeather: @ 82708FC
+Route119_WeatherInstitute_2F_Text_NoAbnormalWeather:
 	.string "Abnormal weather conditions are\n"
 	.string "no longer being reported.\p"
 	.string "The occasional rainfall is a blessing,\n"
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 0056acbd7..f07395824 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -2,17 +2,17 @@
 .set LOCALID_STEVEN, 31
 .set LOCALID_BRIDGE_KECLEON_SHADOW, 36  @ They use a second object which is identical to Kecleon but has a reflection palette tag for the bridge shadow
 
-Route120_MapScripts:: @ 81F53EC
+Route120_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Route120_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route120_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route120_OnLoad
 	.byte 0
 
-Route120_OnResume: @ 81F53FC
+Route120_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_RemoveKecleonObject
 	end
 
-Route120_EventScript_RemoveKecleonObject:: @ 81F5406
+Route120_EventScript_RemoveKecleonObject::
 	compare VAR_0x8009, 0
 	call_if_eq Route120_EventScript_RemoveBridgeKecleon
 	compare VAR_0x8009, 1
@@ -27,7 +27,7 @@ Route120_EventScript_RemoveKecleonObject:: @ 81F5406
 	call_if_eq Route120_EventScript_RemoveKecleon
 	return
 
-Route120_EventScript_RemoveBridgeKecleon:: @ 81F5449
+Route120_EventScript_RemoveBridgeKecleon::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
@@ -35,41 +35,41 @@ Route120_EventScript_RemoveBridgeKecleon:: @ 81F5449
 	removeobject LOCALID_BRIDGE_KECLEON_SHADOW
 	return
 
-Route120_EventScript_RemoveKecleon:: @ 81F5460
+Route120_EventScript_RemoveKecleon::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-Route120_OnLoad: @ 81F5474
+Route120_OnLoad:
 	call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_CloseAncientTomb
 	call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_SetBridgeClearMetatiles
 	call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_SetBridgeKecleonMovement
 	end
 
-Route120_EventScript_CloseAncientTomb:: @ 81F5490
+Route120_EventScript_CloseAncientTomb::
 	setmetatile 7, 54, METATILE_General_RockWall_RockBase, 1
 	setmetatile 7, 55, METATILE_General_RockWall_SandBase, 1
 	return
 
-Route120_EventScript_SetBridgeClearMetatiles:: @ 81F54A3
+Route120_EventScript_SetBridgeClearMetatiles::
 	setmetatile 13, 15, METATILE_Fortree_WoodBridge1_Top, 0
 	setmetatile 12, 16, METATILE_Fortree_WoodBridge1_Bottom, 0
 	setmetatile 12, 17, METATILE_General_ReflectiveWater, 0
 	setmetatile 13, 17, METATILE_General_ReflectiveWater, 0
 	return
 
-Route120_EventScript_SetBridgeKecleonMovement:: @ 81F54C8
+Route120_EventScript_SetBridgeKecleonMovement::
 	setobjectmovementtype LOCALID_BRIDGE_KECLEON_SHADOW, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-Route120_OnTransition: @ 81F54CD
+Route120_OnTransition:
 	call GabbyAndTy_EventScript_UpdateLocation
 	call Route120_EventScript_SetWeather
 	end
 
-Route120_EventScript_SetWeather:: @ 81F54D8
+Route120_EventScript_SetWeather::
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 14
 	goto_if_le Route120_EventScript_SetSunnyWeather
@@ -79,15 +79,15 @@ Route120_EventScript_SetWeather:: @ 81F54D8
 	goto_if_ge Route120_EventScript_SetCloudyWeather
 	return
 
-Route120_EventScript_SetCloudyWeather:: @ 81F54FF
+Route120_EventScript_SetCloudyWeather::
 	setweather WEATHER_SUNNY_CLOUDS
 	return
 
-Route120_EventScript_SetSunnyWeather:: @ 81F5503
+Route120_EventScript_SetSunnyWeather::
 	setweather WEATHER_SUNNY
 	return
 
-Route120_EventScript_TrySetRainyWeather:: @ 81F5507
+Route120_EventScript_TrySetRainyWeather::
 	compare VAR_TEMP_0, 7
 	goto_if_le Route120_EventScript_SetRainyWeather
 	compare VAR_TEMP_0, 19
@@ -95,11 +95,11 @@ Route120_EventScript_TrySetRainyWeather:: @ 81F5507
 	goto Route120_EventScript_SetRainyWeather
 	end
 
-Route120_EventScript_SetRainyWeather:: @ 81F5523
+Route120_EventScript_SetRainyWeather::
 	setweather WEATHER_RAIN
 	return
 
-Route120_EventScript_BerryBeauty:: @ 81F5527
+Route120_EventScript_BerryBeauty::
 	lock
 	faceplayer
 	dotimebasedevents
@@ -123,32 +123,32 @@ Route120_EventScript_BerryBeauty:: @ 81F5527
 	case 9, Route120_EventScript_GiveIapapaBerry
 	end
 
-Route120_EventScript_GiveFigyBerry:: @ 81F55CA
+Route120_EventScript_GiveFigyBerry::
 	setvar VAR_0x8004, ITEM_FIGY_BERRY
 	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_GiveWikiBerry:: @ 81F55D5
+Route120_EventScript_GiveWikiBerry::
 	setvar VAR_0x8004, ITEM_WIKI_BERRY
 	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_GiveMagoBerry:: @ 81F55E0
+Route120_EventScript_GiveMagoBerry::
 	setvar VAR_0x8004, ITEM_MAGO_BERRY
 	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_GiveAguavBerry:: @ 81F55EB
+Route120_EventScript_GiveAguavBerry::
 	setvar VAR_0x8004, ITEM_AGUAV_BERRY
 	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_GiveIapapaBerry:: @ 81F55F6
+Route120_EventScript_GiveIapapaBerry::
 	setvar VAR_0x8004, ITEM_IAPAPA_BERRY
 	goto Route120_EventScript_GiveBerry
 	end
 
-Route120_EventScript_GiveBerry:: @ 81F5601
+Route120_EventScript_GiveBerry::
 	giveitem VAR_0x8004
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -157,20 +157,20 @@ Route120_EventScript_GiveBerry:: @ 81F5601
 	release
 	end
 
-Route120_EventScript_ReceivedBerry:: @ 81F5625
+Route120_EventScript_ReceivedBerry::
 	msgbox Route120_Text_IllGetMoreBerriesFromBerryMaster, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_BerryLove:: @ 81F562F
+Route120_EventScript_BerryLove::
 	msgbox Route120_Text_YesYouUnderstand, MSGBOX_DEFAULT
 	return
 
-Route120_EventScript_BerryNotLove:: @ 81F5638
+Route120_EventScript_BerryNotLove::
 	msgbox Route120_Text_MakeYourOwnImpressions, MSGBOX_DEFAULT
 	return
 
-Route120_EventScript_Steven:: @ 81F5641
+Route120_EventScript_Steven::
 	lock
 	faceplayer
 	goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_StevenAskReadyForBattle
@@ -180,20 +180,20 @@ Route120_EventScript_Steven:: @ 81F5641
 	goto Route120_EventScript_StevenBattleKecleon
 	end
 
-Route120_EventScript_StevenNotReady:: @ 81F5665
+Route120_EventScript_StevenNotReady::
 	msgbox Route120_Text_StevenIllWaitHere, MSGBOX_DEFAULT
 	setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE_120
 	release
 	end
 
-Route120_EventScript_StevenAskReadyForBattle:: @ 81F5672
+Route120_EventScript_StevenAskReadyForBattle::
 	msgbox Route120_Text_StevenReadyForBattle, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq Route120_EventScript_StevenNotReady
 	goto Route120_EventScript_StevenBattleKecleon
 	end
 
-Route120_EventScript_StevenBattleKecleon:: @ 81F568B
+Route120_EventScript_StevenBattleKecleon::
 	msgbox Route120_Text_StevenShowMeYourPower, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
@@ -228,7 +228,7 @@ Route120_EventScript_StevenBattleKecleon:: @ 81F568B
 	goto Route120_EventScript_StevenGiveDeconScope
 	end
 
-Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C
+Route120_EventScript_RemoveBridgeKecleonPostBattle::
 	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject LOCALID_BRIDGE_KECLEON
 	removeobject LOCALID_BRIDGE_KECLEON_SHADOW
@@ -236,7 +236,7 @@ Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C
 	goto Route120_EventScript_StevenGiveDeconScope
 	end
 
-Route120_EventScript_StevenGiveDeconScope:: @ 81F572C
+Route120_EventScript_StevenGiveDeconScope::
 	applymovement LOCALID_STEVEN, Common_Movement_WalkInPlaceFastestDown
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
@@ -261,39 +261,39 @@ Route120_EventScript_StevenGiveDeconScope:: @ 81F572C
 	release
 	end
 
-Route120_EventScript_PlayerApproachKecleonNorth:: @ 81F57A3
+Route120_EventScript_PlayerApproachKecleonNorth::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-Route120_EventScript_PlayerApproachKecleonWest:: @ 81F57AE
+Route120_EventScript_PlayerApproachKecleonWest::
 	applymovement OBJ_EVENT_ID_PLAYER, Route120_Movement_ApproachKecleonWest
 	waitmovement 0
 	return
 
-Route120_Movement_ApproachKecleonWest: @ 81F57B9
+Route120_Movement_ApproachKecleonWest:
 	walk_down
 	walk_left
 	step_end
 
-Route120_EventScript_BridgeKecleon:: @ 81F57BC
+Route120_EventScript_BridgeKecleon::
 	msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_NPC
 	end
 
-Route120_EventScript_RouteSignFortree:: @ 81F57C5
+Route120_EventScript_RouteSignFortree::
 	msgbox Route120_Text_RouteSignFortree, MSGBOX_SIGN
 	end
 
-Route120_EventScript_RouteSign121:: @ 81F57CE
+Route120_EventScript_RouteSign121::
 	msgbox Route120_Text_RouteSign121, MSGBOX_SIGN
 	end
 
-Route120_EventScript_Colin:: @ 81F57D7
+Route120_EventScript_Colin::
 	trainerbattle_single TRAINER_COLIN, Route120_Text_ColinIntro, Route120_Text_ColinDefeat
 	msgbox Route120_Text_ColinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Robert:: @ 81F57EE
+Route120_EventScript_Robert::
 	trainerbattle_single TRAINER_ROBERT_1, Route120_Text_RobertIntro, Route120_Text_RobertDefeat, Route120_EventScript_RegisterRobert
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -302,7 +302,7 @@ Route120_EventScript_Robert:: @ 81F57EE
 	release
 	end
 
-Route120_EventScript_RegisterRobert:: @ 81F581A
+Route120_EventScript_RegisterRobert::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route120_Text_RobertRegister, MSGBOX_DEFAULT
@@ -310,22 +310,22 @@ Route120_EventScript_RegisterRobert:: @ 81F581A
 	release
 	end
 
-Route120_EventScript_RematchRobert:: @ 81F5839
+Route120_EventScript_RematchRobert::
 	trainerbattle_rematch TRAINER_ROBERT_1, Route120_Text_RobertRematchIntro, Route120_Text_RobertRematchDefeat
 	msgbox Route120_Text_RobertPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Lorenzo:: @ 81F5850
+Route120_EventScript_Lorenzo::
 	trainerbattle_single TRAINER_LORENZO, Route120_Text_LorenzoIntro, Route120_Text_LorenzoDefeat
 	msgbox Route120_Text_LorenzoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Jenna:: @ 81F5867
+Route120_EventScript_Jenna::
 	trainerbattle_single TRAINER_JENNA, Route120_Text_JennaIntro, Route120_Text_JennaDefeat
 	msgbox Route120_Text_JennaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Jeffrey:: @ 81F587E
+Route120_EventScript_Jeffrey::
 	trainerbattle_single TRAINER_JEFFREY_1, Route120_Text_JeffreyIntro, Route120_Text_JeffreyDefeat, Route120_EventScript_RegisterJeffrey
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -334,7 +334,7 @@ Route120_EventScript_Jeffrey:: @ 81F587E
 	release
 	end
 
-Route120_EventScript_RegisterJeffrey:: @ 81F58AA
+Route120_EventScript_RegisterJeffrey::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route120_Text_JeffreyRegister, MSGBOX_DEFAULT
@@ -342,52 +342,52 @@ Route120_EventScript_RegisterJeffrey:: @ 81F58AA
 	release
 	end
 
-Route120_EventScript_RematchJeffrey:: @ 81F58C9
+Route120_EventScript_RematchJeffrey::
 	trainerbattle_rematch TRAINER_JEFFREY_1, Route120_Text_JeffreyRematchIntro, Route120_Text_JeffreyRematchDefeat
 	msgbox Route120_Text_JeffreyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Jennifer:: @ 81F58E0
+Route120_EventScript_Jennifer::
 	trainerbattle_single TRAINER_JENNIFER, Route120_Text_JenniferIntro, Route120_Text_JenniferDefeat
 	msgbox Route120_Text_JenniferPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Chip:: @ 81F58F7
+Route120_EventScript_Chip::
 	trainerbattle_single TRAINER_CHIP, Route120_Text_ChipIntro, Route120_Text_ChipDefeat
 	msgbox Route120_Text_ChipPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Clarissa:: @ 81F590E
+Route120_EventScript_Clarissa::
 	trainerbattle_single TRAINER_CLARISSA, Route120_Text_ClarissaIntro, Route120_Text_ClarissaDefeat
 	msgbox Route120_Text_ClarissaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Angelica:: @ 81F5925
+Route120_EventScript_Angelica::
 	trainerbattle_single TRAINER_ANGELICA, Route120_Text_AngelicaIntro, Route120_Text_AngelicaDefeat
 	msgbox Route120_Text_AngelicaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Keigo:: @ 81F593C
+Route120_EventScript_Keigo::
 	trainerbattle_single TRAINER_KEIGO, Route120_Text_KeigoIntro, Route120_Text_KeigoDefeat
 	msgbox Route120_Text_KeigoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Riley:: @ 81F5953
+Route120_EventScript_Riley::
 	trainerbattle_single TRAINER_RILEY, Route120_Text_RileyIntro, Route120_Text_RileyDefeat
 	msgbox Route120_Text_RileyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Leonel:: @ 81F596A
+Route120_EventScript_Leonel::
 	trainerbattle_single TRAINER_LEONEL, Route120_Text_LeonelIntro, Route120_Text_LeonelDefeat
 	msgbox Route120_Text_LeonelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_EventScript_Callie:: @ 81F5981
+Route120_EventScript_Callie::
 	trainerbattle_single TRAINER_CALLIE, Route120_Text_CallieIntro, Route120_Text_CallieDefeat
 	msgbox Route120_Text_CalliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route120_Text_StevenGreeting: @ 81F5998
+Route120_Text_StevenGreeting:
 	.string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n"
 	.string "It's been a while.\p"
 	.string "There's something here that you can't\n"
@@ -400,25 +400,25 @@ Route120_Text_StevenGreeting: @ 81F5998
 	.string "{PLAYER}{KUN}, are your POKéMON ready for\n"
 	.string "battle?$"
 
-Route120_Text_StevenIllWaitHere: @ 81F5AAC
+Route120_Text_StevenIllWaitHere:
 	.string "STEVEN: No?\p"
 	.string "I'll wait here, so you can get ready.$"
 
-Route120_Text_StevenReadyForBattle: @ 81F5ADE
+Route120_Text_StevenReadyForBattle:
 	.string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n"
 	.string "ready for battle?$"
 
-Route120_Text_StevenShowMeYourPower: @ 81F5B0F
+Route120_Text_StevenShowMeYourPower:
 	.string "STEVEN: {PLAYER}{KUN}, show me your true\n"
 	.string "power as a TRAINER!$"
 
-Route120_Text_StevenUsedDevonScope: @ 81F5B43
+Route120_Text_StevenUsedDevonScope:
 	.string "STEVEN used the DEVON SCOPE.\p"
 	.string "An invisible POKéMON became completely\n"
 	.string "visible!\p"
 	.string "The startled POKéMON attacked!$"
 
-Route120_Text_StevenGiveDevonScope: @ 81F5BAF
+Route120_Text_StevenGiveDevonScope:
 	.string "STEVEN: I see…\n"
 	.string "Your battle style is intriguing.\p"
 	.string "Your POKéMON have obviously grown\n"
@@ -428,30 +428,30 @@ Route120_Text_StevenGiveDevonScope: @ 81F5BAF
 	.string "Who knows, there may be other\n"
 	.string "concealed POKéMON.$"
 
-Route120_Text_StevenGoodbye: @ 81F5C7B
+Route120_Text_StevenGoodbye:
 	.string "STEVEN: {PLAYER}{KUN}.\p"
 	.string "I enjoy seeing POKéMON and TRAINERS\n"
 	.string "who strive together.\p"
 	.string "I think you're doing great.\p"
 	.string "Well, let's meet again somewhere.$"
 
-Kecleon_Text_SomethingUnseeable: @ 81F5D00
+Kecleon_Text_SomethingUnseeable:
 	.string "Something unseeable is in the way.$"
 
-Kecleon_Text_WantToUseDevonScope: @ 81F5D23
+Kecleon_Text_WantToUseDevonScope:
 	.string "Something unseeable is in the way.\p"
 	.string "Want to use the DEVON SCOPE?$"
 
-Kecleon_Text_UseDevonScopeMonAttacked: @ 81F5D63
+Kecleon_Text_UseDevonScopeMonAttacked:
 	.string "{PLAYER} used the DEVON SCOPE.\p"
 	.string "An invisible POKéMON became completely\n"
 	.string "visible!\p"
 	.string "The startled POKéMON attacked!$"
 
-Route120_Text_RouteSignFortree: @ 81F5DCB
+Route120_Text_RouteSignFortree:
 	.string "ROUTE 120\n"
 	.string "{LEFT_ARROW} FORTREE CITY$"
 
-Route120_Text_RouteSign121: @ 81F5DE4
+Route120_Text_RouteSign121:
 	.string "{RIGHT_ARROW} ROUTE 121\n"
 	.string "{LEFT_ARROW} ROUTE 120$"
diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc
index 6dc93cf6b..3bd0a42ee 100644
--- a/data/maps/Route121/scripts.inc
+++ b/data/maps/Route121/scripts.inc
@@ -2,22 +2,22 @@
 .set LOCALID_GRUNT_2, 13
 .set LOCALID_GRUNT_3, 14
 
-Route121_MapScripts:: @ 81F5DFC
+Route121_MapScripts::
 	.byte 0
 
-Route121_EventScript_Woman:: @ 81F5DFD
+Route121_EventScript_Woman::
 	msgbox Route121_Text_AheadLoomsMtPyre, MSGBOX_NPC
 	end
 
-Route121_EventScript_MtPyrePierSign:: @ 81F5E06
+Route121_EventScript_MtPyrePierSign::
 	msgbox Route121_Text_MtPyrePierSign, MSGBOX_SIGN
 	end
 
-Route121_EventScript_SafariZoneSign:: @ 81F5E0F
+Route121_EventScript_SafariZoneSign::
 	msgbox Route121_Text_SafariZoneSign, MSGBOX_SIGN
 	end
 
-Route121_EventScript_AquaGruntsMoveOut:: @ 81F5E18
+Route121_EventScript_AquaGruntsMoveOut::
 	lockall
 	playbgm MUS_ENCOUNTER_AQUA, FALSE
 	applymovement LOCALID_GRUNT_2, Common_Movement_WalkInPlaceRight
@@ -36,7 +36,7 @@ Route121_EventScript_AquaGruntsMoveOut:: @ 81F5E18
 	releaseall
 	end
 
-Route121_Movement_Grunt1Exit: @ 81F5E59
+Route121_Movement_Grunt1Exit:
 	walk_down
 	walk_down
 	walk_down
@@ -47,7 +47,7 @@ Route121_Movement_Grunt1Exit: @ 81F5E59
 	walk_down
 	step_end
 
-Route121_Movement_Grunt2Exit: @ 81F5E62
+Route121_Movement_Grunt2Exit:
 	walk_down
 	walk_down
 	walk_down
@@ -58,7 +58,7 @@ Route121_Movement_Grunt2Exit: @ 81F5E62
 	walk_down
 	step_end
 
-Route121_Movement_Grunt3Exit: @ 81F5E6B
+Route121_Movement_Grunt3Exit:
 	walk_down
 	walk_down
 	walk_down
@@ -69,12 +69,12 @@ Route121_Movement_Grunt3Exit: @ 81F5E6B
 	walk_down
 	step_end
 
-Route121_EventScript_Vanessa:: @ 81F5E74
+Route121_EventScript_Vanessa::
 	trainerbattle_single TRAINER_VANESSA, Route121_Text_VanessaIntro, Route121_Text_VanessaDefeat
 	msgbox Route121_Text_VanessaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_Walter:: @ 81F5E8B
+Route121_EventScript_Walter::
 	trainerbattle_single TRAINER_WALTER_1, Route121_Text_WalterIntro, Route121_Text_WalterDefeat, Route121_EventScript_RegisterWalter
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -83,7 +83,7 @@ Route121_EventScript_Walter:: @ 81F5E8B
 	release
 	end
 
-Route121_EventScript_RegisterWalter:: @ 81F5EB7
+Route121_EventScript_RegisterWalter::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route121_Text_WalterRegister, MSGBOX_DEFAULT
@@ -91,27 +91,27 @@ Route121_EventScript_RegisterWalter:: @ 81F5EB7
 	release
 	end
 
-Route121_EventScript_RematchWalter:: @ 81F5ED6
+Route121_EventScript_RematchWalter::
 	trainerbattle_rematch TRAINER_WALTER_1, Route121_Text_WalterRematchIntro, Route121_Text_WalterRematchDefeat
 	msgbox Route121_Text_WalterPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_Tammy:: @ 81F5EED
+Route121_EventScript_Tammy::
 	trainerbattle_single TRAINER_TAMMY, Route121_Text_TammyIntro, Route121_Text_TammyDefeat
 	msgbox Route121_Text_TammyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_Kate:: @ 81F5F04
+Route121_EventScript_Kate::
 	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_KateIntro, Route121_Text_KateDefeat, Route121_Text_KateNotEnoughMons
 	msgbox Route121_Text_KatePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_Joy:: @ 81F5F1F
+Route121_EventScript_Joy::
 	trainerbattle_double TRAINER_KATE_AND_JOY, Route121_Text_JoyIntro, Route121_Text_JoyDefeat, Route121_Text_JoyNotEnoughMons
 	msgbox Route121_Text_JoyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_Jessica:: @ 81F5F3A
+Route121_EventScript_Jessica::
 	trainerbattle_single TRAINER_JESSICA_1, Route121_Text_JessicaIntro, Route121_Text_JessicaDefeat, Route121_EventScript_RegisterJessica
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -120,7 +120,7 @@ Route121_EventScript_Jessica:: @ 81F5F3A
 	release
 	end
 
-Route121_EventScript_RegisterJessica:: @ 81F5F66
+Route121_EventScript_RegisterJessica::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route121_Text_JessicaRegister, MSGBOX_DEFAULT
@@ -128,32 +128,32 @@ Route121_EventScript_RegisterJessica:: @ 81F5F66
 	release
 	end
 
-Route121_EventScript_RematchJessica:: @ 81F5F85
+Route121_EventScript_RematchJessica::
 	trainerbattle_rematch TRAINER_JESSICA_1, Route121_Text_JessicaRematchIntro, Route121_Text_JessicaRematchDefeat
 	msgbox Route121_Text_JessicaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_Cale:: @ 81F5F9C
+Route121_EventScript_Cale::
 	trainerbattle_single TRAINER_CALE, Route121_Text_CaleIntro, Route121_Text_CaleDefeat
 	msgbox Route121_Text_CalePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_Myles:: @ 81F5FB3
+Route121_EventScript_Myles::
 	trainerbattle_single TRAINER_MYLES, Route121_Text_MylesIntro, Route121_Text_MylesDefeat
 	msgbox Route121_Text_MylesPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_Pat:: @ 81F5FCA
+Route121_EventScript_Pat::
 	trainerbattle_single TRAINER_PAT, Route121_Text_PatIntro, Route121_Text_PatDefeat
 	msgbox Route121_Text_PatPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_Marcel:: @ 81F5FE1
+Route121_EventScript_Marcel::
 	trainerbattle_single TRAINER_MARCEL, Route121_Text_MarcelIntro, Route121_Text_MarcelDefeat
 	msgbox Route121_Text_MarcelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route121_EventScript_Cristin:: @ 81F5FF8
+Route121_EventScript_Cristin::
 	trainerbattle_single TRAINER_CRISTIN_1, Route121_Text_CristinIntro, Route121_Text_CristinDefeat, Route121_EventScript_RegisterCristin
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -162,7 +162,7 @@ Route121_EventScript_Cristin:: @ 81F5FF8
 	release
 	end
 
-Route121_EventScript_RegisterCristin:: @ 81F6024
+Route121_EventScript_RegisterCristin::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route121_Text_CristinRegister, MSGBOX_DEFAULT
@@ -170,26 +170,26 @@ Route121_EventScript_RegisterCristin:: @ 81F6024
 	release
 	end
 
-Route121_EventScript_RematchCristin:: @ 81F6043
+Route121_EventScript_RematchCristin::
 	trainerbattle_rematch TRAINER_CRISTIN_1, Route121_Text_CristinRematchIntro, Route121_Text_CristinRematchDefeat
 	msgbox Route121_Text_CristinPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route121_Text_OkayMoveOutToMtPyre: @ 81F605A
+Route121_Text_OkayMoveOutToMtPyre:
 	.string "Okay!\n"
 	.string "We're to move out to MT. PYRE!$"
 
-Route121_Text_AheadLoomsMtPyre: @ 81F607F
+Route121_Text_AheadLoomsMtPyre:
 	.string "Ahead looms MT. PYRE…\p"
 	.string "It is a natural monument to the spirits \n"
 	.string "of departed POKéMON…$"
 
-Route121_Text_MtPyrePierSign: @ 81F60D3
+Route121_Text_MtPyrePierSign:
 	.string "MT. PYRE PIER\p"
 	.string "…The sign is old and worn out.\n"
 	.string "The words are barely legible…$"
 
-Route121_Text_SafariZoneSign: @ 81F611E
+Route121_Text_SafariZoneSign:
 	.string "“Filled with rare POKéMON!”\n"
 	.string "SAFARI ZONE$"
 
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
index a87a374d2..6945f69dc 100644
--- a/data/maps/Route121_SafariZoneEntrance/scripts.inc
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -1,12 +1,12 @@
-Route121_SafariZoneEntrance_MapScripts:: @ 822BBBB
+Route121_SafariZoneEntrance_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route121_SafariZoneEntrance_OnFrame
 	.byte 0
 
-Route121_SafariZoneEntrance_OnFrame: @ 822BBC1
+Route121_SafariZoneEntrance_OnFrame:
 	map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_ExitSafariZone
 	.2byte 0
 
-Route121_SafariZoneEntrance_EventScript_ExitSafariZone:: @ 822BBCB
+Route121_SafariZoneEntrance_EventScript_ExitSafariZone::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_ExitSafariZone
 	waitmovement 0
@@ -14,7 +14,7 @@ Route121_SafariZoneEntrance_EventScript_ExitSafariZone:: @ 822BBCB
 	releaseall
 	end
 
-Route121_SafariZoneEntrance_Movement_ExitSafariZone: @ 822BBDD
+Route121_SafariZoneEntrance_Movement_ExitSafariZone:
 	walk_up
 	walk_right
 	walk_right
@@ -25,11 +25,11 @@ Route121_SafariZoneEntrance_Movement_ExitSafariZone: @ 822BBDD
 	walk_right
 	step_end
 
-Route121_SafariZoneEntrance_EventScript_WelcomeAttendant:: @ 822BBE6
+Route121_SafariZoneEntrance_EventScript_WelcomeAttendant::
 	msgbox Route121_SafariZoneEntrance_Text_WelcomeToSafariZone, MSGBOX_NPC
 	end
 
-Route121_SafariZoneEntrance_EventScript_InfoAttendant:: @ 822BBEF
+Route121_SafariZoneEntrance_EventScript_InfoAttendant::
 	lock
 	faceplayer
 	msgbox Route121_SafariZoneEntrance_Text_WelcomeFirstTime, MSGBOX_YESNO
@@ -39,12 +39,12 @@ Route121_SafariZoneEntrance_EventScript_InfoAttendant:: @ 822BBEF
 	release
 	end
 
-Route121_SafariZoneEntrance_EventScript_FirstTimeInfo:: @ 822BC0E
+Route121_SafariZoneEntrance_EventScript_FirstTimeInfo::
 	msgbox Route121_SafariZoneEntrance_Text_FirstTimeInfo, MSGBOX_DEFAULT
 	release
 	end
 
-Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger:: @ 822BC18
+Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
@@ -56,7 +56,7 @@ Route121_SafariZoneEntrance_EventScript_EntranceCounterTrigger:: @ 822BC18
 	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
 	end
 
-Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48
+Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone::
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, 0
 	goto_if_eq Route121_SafariZoneEntrance_EventScript_NoPokeblockCase
@@ -84,7 +84,7 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48
 	waitstate
 	end
 
-Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon:: @ 822BCBF
+Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon::
 	getpartysize
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_ne Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon
@@ -95,20 +95,20 @@ Route121_SafariZoneEntrance_EventScript_CheckHasRoomForPokemon:: @ 822BCBF
 	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
 	end
 
-Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon:: @ 822BCE9
+Route121_SafariZoneEntrance_EventScript_HasRoomForPokemon::
 	return
 
-Route121_SafariZoneEntrance_EventScript_NoPokeblockCase:: @ 822BCEA
+Route121_SafariZoneEntrance_EventScript_NoPokeblockCase::
 	msgbox Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase, MSGBOX_DEFAULT
 	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
 	end
 
-Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8
+Route121_SafariZoneEntrance_EventScript_NotEnoughMoney::
 	msgbox Route121_SafariZoneEntrance_Text_NotEnoughMoney, MSGBOX_DEFAULT
 	goto Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter
 	end
 
-Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06
+Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter::
 	closemessage
 	hidemoneybox
 	applymovement OBJ_EVENT_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter
@@ -116,11 +116,11 @@ Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06
 	releaseall
 	end
 
-Route121_SafariZoneEntrance_Movement_BackAwayFromCounter: @ 822BD16
+Route121_SafariZoneEntrance_Movement_BackAwayFromCounter:
 	walk_right
 	step_end
 
-Route121_SafariZoneEntrance_Movement_EnterSafariZone: @ 822BD18
+Route121_SafariZoneEntrance_Movement_EnterSafariZone:
 	walk_left
 	walk_left
 	walk_left
@@ -131,7 +131,7 @@ Route121_SafariZoneEntrance_Movement_EnterSafariZone: @ 822BD18
 	delay_16
 	step_end
 
-Route121_SafariZoneEntrance_EventScript_TrainerTipSign:: @ 822BD21
+Route121_SafariZoneEntrance_EventScript_TrainerTipSign::
 	msgbox Route121_SafariZoneEntrance_Text_TrainerTip, MSGBOX_SIGN
 	end
 
diff --git a/data/maps/Route122/scripts.inc b/data/maps/Route122/scripts.inc
index 8fcfb4c09..3c23a3982 100644
--- a/data/maps/Route122/scripts.inc
+++ b/data/maps/Route122/scripts.inc
@@ -1,3 +1,3 @@
-Route122_MapScripts:: @ 81F6146
+Route122_MapScripts::
 	.byte 0
 
diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc
index 0c57d209c..6ce0de654 100644
--- a/data/maps/Route123/scripts.inc
+++ b/data/maps/Route123/scripts.inc
@@ -1,12 +1,12 @@
-Route123_MapScripts:: @ 81F6147
+Route123_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route123_OnTransition
 	.byte 0
 
-Route123_OnTransition: @ 81F614D
+Route123_OnTransition:
 	special SetRoute123Weather
 	end
 
-Route123_EventScript_GigaDrainGirl:: @ 81F6151
+Route123_EventScript_GigaDrainGirl::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_ReceivedGigaDrain
@@ -23,43 +23,43 @@ Route123_EventScript_GigaDrainGirl:: @ 81F6151
 	release
 	end
 
-Route123_EventScript_NoGrassMons:: @ 81F619E
+Route123_EventScript_NoGrassMons::
 	release
 	end
 
-Route123_EventScript_ReceivedGigaDrain:: @ 81F61A0
+Route123_EventScript_ReceivedGigaDrain::
 	msgbox Route123_Text_CheckTreesWithMyGrassMon, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_EventScript_RouteSign:: @ 81F61AA
+Route123_EventScript_RouteSign::
 	msgbox Route123_Text_RouteSign, MSGBOX_SIGN
 	end
 
-Route123_EventScript_RouteSignMtPyre:: @ 81F61B3
+Route123_EventScript_RouteSignMtPyre::
 	msgbox Route123_Text_RouteSignMtPyre, MSGBOX_SIGN
 	end
 
-Route123_EventScript_BerryMastersHouseSign:: @ 81F61BC
+Route123_EventScript_BerryMastersHouseSign::
 	msgbox Route123_Text_BerryMastersHouse, MSGBOX_SIGN
 	end
 
-Route123_EventScript_Wendy:: @ 81F61C5
+Route123_EventScript_Wendy::
 	trainerbattle_single TRAINER_WENDY, Route123_Text_WendyIntro, Route123_Text_WendyDefeat
 	msgbox Route123_Text_WendyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Braxton:: @ 81F61DC
+Route123_EventScript_Braxton::
 	trainerbattle_single TRAINER_BRAXTON, Route123_Text_BraxtonIntro, Route123_Text_BraxtonDefeat
 	msgbox Route123_Text_BraxtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Violet:: @ 81F61F3
+Route123_EventScript_Violet::
 	trainerbattle_single TRAINER_VIOLET, Route123_Text_VioletIntro, Route123_Text_VioletDefeat
 	msgbox Route123_Text_VioletPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Cameron:: @ 81F620A
+Route123_EventScript_Cameron::
 	trainerbattle_single TRAINER_CAMERON_1, Route123_Text_CameronIntro, Route123_Text_CameronDefeat, Route123_EventScript_RegisterCameron
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -68,7 +68,7 @@ Route123_EventScript_Cameron:: @ 81F620A
 	release
 	end
 
-Route123_EventScript_RegisterCameron:: @ 81F6236
+Route123_EventScript_RegisterCameron::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route123_Text_CameronRegister, MSGBOX_DEFAULT
@@ -76,12 +76,12 @@ Route123_EventScript_RegisterCameron:: @ 81F6236
 	release
 	end
 
-Route123_EventScript_RematchCameron:: @ 81F6255
+Route123_EventScript_RematchCameron::
 	trainerbattle_rematch TRAINER_CAMERON_1, Route123_Text_CameronRematchIntro, Route123_Text_CameronRematchDefeat
 	msgbox Route123_Text_CameronPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Jacki:: @ 81F626C
+Route123_EventScript_Jacki::
 	trainerbattle_single TRAINER_JACKI_1, Route123_Text_JackiIntro, Route123_Text_JackiDefeat, Route123_EventScript_RegisterJacki
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -90,7 +90,7 @@ Route123_EventScript_Jacki:: @ 81F626C
 	release
 	end
 
-Route123_EventScript_RegisterJacki:: @ 81F6298
+Route123_EventScript_RegisterJacki::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route123_Text_JackiRegister, MSGBOX_DEFAULT
@@ -98,62 +98,62 @@ Route123_EventScript_RegisterJacki:: @ 81F6298
 	release
 	end
 
-Route123_EventScript_RematchJacki:: @ 81F62B7
+Route123_EventScript_RematchJacki::
 	trainerbattle_rematch TRAINER_JACKI_1, Route123_Text_JackiRematchIntro, Route123_Text_JackiRematchDefeat
 	msgbox Route123_Text_JackiPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Miu:: @ 81F62CE
+Route123_EventScript_Miu::
 	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_MiuIntro, Route123_Text_MiuDefeat, Route123_Text_MiuNotEnoughMons
 	msgbox Route123_Text_MiuPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Yuki:: @ 81F62E9
+Route123_EventScript_Yuki::
 	trainerbattle_double TRAINER_MIU_AND_YUKI, Route123_Text_YukiIntro, Route123_Text_YukiDefeat, Route123_Text_YukiNotEnoughMons
 	msgbox Route123_Text_YukiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Kindra:: @ 81F6304
+Route123_EventScript_Kindra::
 	trainerbattle_single TRAINER_KINDRA, Route123_Text_KindraIntro, Route123_Text_KindraDefeat
 	msgbox Route123_Text_KindraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Frederick:: @ 81F631B
+Route123_EventScript_Frederick::
 	trainerbattle_single TRAINER_FREDRICK, Route123_Text_FrederickIntro, Route123_Text_FrederickDefeat
 	msgbox Route123_Text_FrederickPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Alberto:: @ 81F6332
+Route123_EventScript_Alberto::
 	trainerbattle_single TRAINER_ALBERTO, Route123_Text_AlbertoIntro, Route123_Text_AlbertoDefeat
 	msgbox Route123_Text_AlbertoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Ed:: @ 81F6349
+Route123_EventScript_Ed::
 	trainerbattle_single TRAINER_ED, Route123_Text_EdIntro, Route123_Text_EdDefeat
 	msgbox Route123_Text_EdPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Kayley:: @ 81F6360
+Route123_EventScript_Kayley::
 	trainerbattle_single TRAINER_KAYLEY, Route123_Text_KayleyIntro, Route123_Text_KayleyDefeat
 	msgbox Route123_Text_KayleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Jonas:: @ 81F6377
+Route123_EventScript_Jonas::
 	trainerbattle_single TRAINER_JONAS, Route123_Text_JonasIntro, Route123_Text_JonasDefeat
 	msgbox Route123_Text_JonasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Jazmyn:: @ 81F638E
+Route123_EventScript_Jazmyn::
 	trainerbattle_single TRAINER_JAZMYN, Route123_Text_JazmynIntro, Route123_Text_JazmynDefeat
 	msgbox Route123_Text_JazmynPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Davis:: @ 81F63A5
+Route123_EventScript_Davis::
 	trainerbattle_single TRAINER_DAVIS, Route123_Text_DavisIntro, Route123_Text_DavisDefeat
 	msgbox Route123_Text_DavisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route123_EventScript_Fernando:: @ 81F63BC
+Route123_EventScript_Fernando::
 	trainerbattle_single TRAINER_FERNANDO_1, Route123_Text_FernandoIntro, Route123_Text_FernandoDefeat, Route123_EventScript_RegisterFernando
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -162,7 +162,7 @@ Route123_EventScript_Fernando:: @ 81F63BC
 	release
 	end
 
-Route123_EventScript_RegisterFernando:: @ 81F63E8
+Route123_EventScript_RegisterFernando::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route123_Text_FernandoRegister, MSGBOX_DEFAULT
@@ -170,34 +170,34 @@ Route123_EventScript_RegisterFernando:: @ 81F63E8
 	release
 	end
 
-Route123_EventScript_RematchFernando:: @ 81F6407
+Route123_EventScript_RematchFernando::
 	trainerbattle_rematch TRAINER_FERNANDO_1, Route123_Text_FernandoRematchIntro, Route123_Text_FernandoRematchDefeat
 	msgbox Route123_Text_FernandoPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route123_Text_LoveGrassMonsHaveAny: @ 81F641E
+Route123_Text_LoveGrassMonsHaveAny:
 	.string "I love GRASS-type POKéMON!\p"
 	.string "Do you have any GRASS-type POKéMON?$"
 
-Route123_Text_YouLikeGrassMonsTooHaveThis: @ 81F645D
+Route123_Text_YouLikeGrassMonsTooHaveThis:
 	.string "Oh?\p"
 	.string "You like GRASS-type POKéMON, too,\n"
 	.string "don't you?\p"
 	.string "I'm so happy, you can have this!\n"
 	.string "It's a token of our friendship.$"
 
-Route123_Text_CheckTreesWithMyGrassMon: @ 81F64CF
+Route123_Text_CheckTreesWithMyGrassMon:
 	.string "I check trees with my GRASS-type\n"
 	.string "POKéMON. I'm like a tree doctor.$"
 
-Route123_Text_RouteSign: @ 81F6511
+Route123_Text_RouteSign:
 	.string "{RIGHT_ARROW} ROUTE 123\n"
 	.string "{LEFT_ARROW} ROUTE 118$"
 
-Route123_Text_RouteSignMtPyre: @ 81F6529
+Route123_Text_RouteSignMtPyre:
 	.string "{UP_ARROW} MT. PYRE\n"
 	.string "“Forbidden to the faint of heart.”$"
 
-Route123_Text_BerryMastersHouse: @ 81F6557
+Route123_Text_BerryMastersHouse:
 	.string "BERRY MASTER'S HOUSE$"
 
diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index 8b2cc5919..a9fbfd9d0 100644
--- a/data/maps/Route123_BerryMastersHouse/scripts.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
@@ -1,12 +1,12 @@
-Route123_BerryMastersHouse_MapScripts:: @ 826F83B
+Route123_BerryMastersHouse_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route123_BerryMastersHouse_OnTransition
 	.byte 0
 
-Route123_BerryMastersHouse_OnTransition: @ 826F841
+Route123_BerryMastersHouse_OnTransition:
 	setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE
 	end
 
-Route123_BerryMastersHouse_EventScript_BerryMaster:: @ 826F845
+Route123_BerryMastersHouse_EventScript_BerryMaster::
 	lock
 	faceplayer
 	dotimebasedevents
@@ -30,12 +30,12 @@ Route123_BerryMastersHouse_EventScript_BerryMaster:: @ 826F845
 	release
 	end
 
-Route123_BerryMastersHouse_EventScript_ReceivedBerryToday:: @ 826F8B6
+Route123_BerryMastersHouse_EventScript_ReceivedBerryToday::
 	msgbox Route123_BerryMastersHouse_Text_DoneForToday, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_BerryMastersHouse_EventScript_BerryMastersWife:: @ 826F8C0
+Route123_BerryMastersHouse_EventScript_BerryMastersWife::
 	lock
 	faceplayer
 	dotimebasedevents
@@ -51,13 +51,13 @@ Route123_BerryMastersHouse_EventScript_BerryMastersWife:: @ 826F8C0
 	goto_if_eq Route123_BerryMastersHouse_EventScript_CancelPhrase
 	end
 
-Route123_BerryMastersHouse_EventScript_CancelPhrase:: @ 826F8F7
+Route123_BerryMastersHouse_EventScript_CancelPhrase::
 	msgbox Route123_BerryMastersHouse_Text_Ah, MSGBOX_DEFAULT
 	msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_BerryMastersHouse_EventScript_GavePhrase:: @ 826F909
+Route123_BerryMastersHouse_EventScript_GavePhrase::
 	compare VAR_0x8004, NOT_SPECIAL_PHRASE
 	goto_if_eq Route123_BerryMastersHouse_EventScript_GiveNormalBerry
 	compare VAR_0x8004, PHRASE_GREAT_BATTLE
@@ -72,7 +72,7 @@ Route123_BerryMastersHouse_EventScript_GavePhrase:: @ 826F909
 	goto_if_eq Route123_BerryMastersHouse_EventScript_GiveBelueBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_GiveNormalBerry:: @ 826F94C
+Route123_BerryMastersHouse_EventScript_GiveNormalBerry::
 	msgbox Route123_BerryMastersHouse_Text_GoodSayingTakeThis, MSGBOX_DEFAULT
 	random NUM_BERRY_MASTER_WIFE_BERRIES
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
@@ -83,7 +83,7 @@ Route123_BerryMastersHouse_EventScript_GiveNormalBerry:: @ 826F94C
 	release
 	end
 
-Route123_BerryMastersHouse_EventScript_GiveSpelonBerry:: @ 826F97A
+Route123_BerryMastersHouse_EventScript_GiveSpelonBerry::
 	goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
 	msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_SPELON_BERRY
@@ -93,7 +93,7 @@ Route123_BerryMastersHouse_EventScript_GiveSpelonBerry:: @ 826F97A
 	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_GivePamtreBerry:: @ 826F9AB
+Route123_BerryMastersHouse_EventScript_GivePamtreBerry::
 	goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
 	msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_PAMTRE_BERRY
@@ -103,7 +103,7 @@ Route123_BerryMastersHouse_EventScript_GivePamtreBerry:: @ 826F9AB
 	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_GiveWatmelBerry:: @ 826F9DC
+Route123_BerryMastersHouse_EventScript_GiveWatmelBerry::
 	goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
 	msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_WATMEL_BERRY
@@ -113,7 +113,7 @@ Route123_BerryMastersHouse_EventScript_GiveWatmelBerry:: @ 826F9DC
 	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_GiveDurinBerry:: @ 826FA0D
+Route123_BerryMastersHouse_EventScript_GiveDurinBerry::
 	goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
 	msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_DURIN_BERRY
@@ -123,7 +123,7 @@ Route123_BerryMastersHouse_EventScript_GiveDurinBerry:: @ 826FA0D
 	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_GiveBelueBerry:: @ 826FA3E
+Route123_BerryMastersHouse_EventScript_GiveBelueBerry::
 	goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_GiveNormalBerry
 	msgbox Route123_BerryMastersHouse_Text_InspirationalTakeThis, MSGBOX_DEFAULT
 	giveitem ITEM_BELUE_BERRY
@@ -133,12 +133,12 @@ Route123_BerryMastersHouse_EventScript_GiveBelueBerry:: @ 826FA3E
 	goto Route123_BerryMastersHouse_EventScript_GaveBerry
 	end
 
-Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday:: @ 826FA6F
+Route123_BerryMastersHouse_EventScript_ReceivedWifeBerryToday::
 	msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT
 	release
 	end
 
-Route123_BerryMastersHouse_EventScript_GaveBerry:: @ 826FA79
+Route123_BerryMastersHouse_EventScript_GaveBerry::
 	setflag FLAG_DAILY_BERRY_MASTERS_WIFE
 	msgbox Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife, MSGBOX_DEFAULT
 	release
diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc
index 92d43e6ad..d1cd8ef8c 100644
--- a/data/maps/Route124/scripts.inc
+++ b/data/maps/Route124/scripts.inc
@@ -1,26 +1,26 @@
-Route124_MapScripts:: @ 81F656C
+Route124_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route124_OnTransition
 	.byte 0
 
-Route124_OnTransition: @ 81F6572
+Route124_OnTransition:
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 
-Route124_EventScript_HuntersHouseSign:: @ 81F657C
+Route124_EventScript_HuntersHouseSign::
 	msgbox Route124_Text_HuntersHouse, MSGBOX_SIGN
 	end
 
-Route124_EventScript_Spencer:: @ 81F6585
+Route124_EventScript_Spencer::
 	trainerbattle_single TRAINER_SPENCER, Route124_Text_SpencerIntro, Route124_Text_SpencerDefeat
 	msgbox Route124_Text_SpencerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_Roland:: @ 81F659C
+Route124_EventScript_Roland::
 	trainerbattle_single TRAINER_ROLAND, Route124_Text_RolandIntro, Route124_Text_RolandDefeat
 	msgbox Route124_Text_RolandPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_Jenny:: @ 81F65B3
+Route124_EventScript_Jenny::
 	trainerbattle_single TRAINER_JENNY_1, Route124_Text_JennyIntro, Route124_Text_JennyDefeat, Route124_EventScript_RegisterJenny
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -29,7 +29,7 @@ Route124_EventScript_Jenny:: @ 81F65B3
 	release
 	end
 
-Route124_EventScript_RegisterJenny:: @ 81F65DF
+Route124_EventScript_RegisterJenny::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route124_Text_JennyRegister, MSGBOX_DEFAULT
@@ -37,22 +37,22 @@ Route124_EventScript_RegisterJenny:: @ 81F65DF
 	release
 	end
 
-Route124_EventScript_RematchJenny:: @ 81F65FE
+Route124_EventScript_RematchJenny::
 	trainerbattle_rematch TRAINER_JENNY_1, Route124_Text_JennyRematchIntro, Route124_Text_JennyRematchDefeat
 	msgbox Route124_Text_JennyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_Grace:: @ 81F6615
+Route124_EventScript_Grace::
 	trainerbattle_single TRAINER_GRACE, Route124_Text_GraceIntro, Route124_Text_GraceDefeat
 	msgbox Route124_Text_GracePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_Chad:: @ 81F662C
+Route124_EventScript_Chad::
 	trainerbattle_single TRAINER_CHAD, Route124_Text_ChadIntro, Route124_Text_ChadDefeat
 	msgbox Route124_Text_ChadPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_Lila:: @ 81F6643
+Route124_EventScript_Lila::
 	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_LilaIntro, Route124_Text_LilaDefeat, Route124_Text_LilaNotEnoughMons, Route124_EventScript_RegisterLila
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -61,18 +61,18 @@ Route124_EventScript_Lila:: @ 81F6643
 	release
 	end
 
-Route124_EventScript_RegisterLila:: @ 81F6673
+Route124_EventScript_RegisterLila::
 	msgbox Route124_Text_LilaRoyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LILA_AND_ROY_1
 	release
 	end
 
-Route124_EventScript_RematchLila:: @ 81F668C
+Route124_EventScript_RematchLila::
 	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_LilaRematchIntro, Route124_Text_LilaRematchDefeat, Route124_Text_LilaRematchNotEnoughMons
 	msgbox Route124_Text_LilaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_Roy:: @ 81F66A7
+Route124_EventScript_Roy::
 	trainerbattle_double TRAINER_LILA_AND_ROY_1, Route124_Text_RoyIntro, Route124_Text_RoyDefeat, Route124_Text_RoyNotEnoughMons, Route124_EventScript_RegisterRoy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -81,27 +81,27 @@ Route124_EventScript_Roy:: @ 81F66A7
 	release
 	end
 
-Route124_EventScript_RegisterRoy:: @ 81F66D7
+Route124_EventScript_RegisterRoy::
 	msgbox Route124_Text_LilaRoyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LILA_AND_ROY_1
 	release
 	end
 
-Route124_EventScript_RematchRoy:: @ 81F66F0
+Route124_EventScript_RematchRoy::
 	trainerbattle_rematch_double TRAINER_LILA_AND_ROY_1, Route124_Text_RoyRematchIntro, Route124_Text_RoyRematchDefeat, Route124_Text_RoyRematchNotEnoughMons
 	msgbox Route124_Text_RoyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_Declan:: @ 81F670B
+Route124_EventScript_Declan::
 	trainerbattle_single TRAINER_DECLAN, Route124_Text_DeclanIntro, Route124_Text_DeclanDefeat
 	msgbox Route124_Text_DeclanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_EventScript_Isabella:: @ 81F6722
+Route124_EventScript_Isabella::
 	trainerbattle_single TRAINER_ISABELLA, Route124_Text_IsabellaIntro, Route124_Text_IsabellaDefeat
 	msgbox Route124_Text_IsabellaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route124_Text_HuntersHouse: @ 81F6739
+Route124_Text_HuntersHouse:
 	.string "HUNTER'S HOUSE$"
 
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index acf53c1ed..63bee6ed5 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
@@ -1,12 +1,12 @@
-Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8270A28
+Route124_DivingTreasureHuntersHouse_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route124_DivingTreasureHuntersHouse_OnTransition
 	.byte 0
 
-Route124_DivingTreasureHuntersHouse_OnTransition: @ 8270A2E
+Route124_DivingTreasureHuntersHouse_OnTransition:
 	setflag FLAG_LANDMARK_HUNTERS_HOUSE
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_TreasureHunter:: @ 8270A32
+Route124_DivingTreasureHuntersHouse_EventScript_TreasureHunter::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_SkipGreeting
@@ -15,19 +15,19 @@ Route124_DivingTreasureHuntersHouse_EventScript_TreasureHunter:: @ 8270A32
 	goto Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_SkipGreeting:: @ 8270A4E
+Route124_DivingTreasureHuntersHouse_EventScript_SkipGreeting::
 	msgbox Route124_DivingTreasureHuntersHouse_Text_HaveYouSeenAnyShards, MSGBOX_DEFAULT
 	goto Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard:: @ 8270A5C
+Route124_DivingTreasureHuntersHouse_EventScript_CheckPlayerHasShard::
 	call Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards
 	compare VAR_TEMP_1, 0
 	goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_NoShards
 	goto Route124_DivingTreasureHuntersHouse_EventScript_HasShard
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards:: @ 8270A72
+Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards::
 	setvar VAR_TEMP_1, 0
 	checkitem ITEM_RED_SHARD, 1
 	compare VAR_RESULT, TRUE
@@ -43,28 +43,28 @@ Route124_DivingTreasureHuntersHouse_EventScript_GetPlayersShards:: @ 8270A72
 	call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard
 	return
 
-Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard:: @ 8270AB8
+Route124_DivingTreasureHuntersHouse_EventScript_HasRedShard::
 	addvar VAR_TEMP_1, 1
 	return
 
-Route124_DivingTreasureHuntersHouse_EventScript_HasYellowShard:: @ 8270ABE
+Route124_DivingTreasureHuntersHouse_EventScript_HasYellowShard::
 	addvar VAR_TEMP_1, 2
 	return
 
-Route124_DivingTreasureHuntersHouse_EventScript_HasBlueShard:: @ 8270AC4
+Route124_DivingTreasureHuntersHouse_EventScript_HasBlueShard::
 	addvar VAR_TEMP_1, 4
 	return
 
-Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard:: @ 8270ACA
+Route124_DivingTreasureHuntersHouse_EventScript_HasGreenShard::
 	addvar VAR_TEMP_1, 8
 	return
 
-Route124_DivingTreasureHuntersHouse_EventScript_HasShard:: @ 8270AD0
+Route124_DivingTreasureHuntersHouse_EventScript_HasShard::
 	msgbox Route124_DivingTreasureHuntersHouse_Text_ThatsAShardIllTradeYou, MSGBOX_DEFAULT
 	goto Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions:: @ 8270ADE
+Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions::
 	message Route124_DivingTreasureHuntersHouse_Text_WhatDoYouWantToTrade
 	waitmessage
 	switch VAR_TEMP_1
@@ -85,7 +85,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShowTradeOptions:: @ 8270ADE
 	case 15, Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR:: @ 8270B8F
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR::
 	multichoice 0, 0, MULTI_SHARDS_R, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
@@ -93,7 +93,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsR:: @ 8270B8F
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY:: @ 8270BB5
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY::
 	multichoice 0, 0, MULTI_SHARDS_Y, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
@@ -101,7 +101,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsY:: @ 8270BB5
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY:: @ 8270BDB
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY::
 	multichoice 0, 0, MULTI_SHARDS_RY, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
@@ -110,7 +110,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRY:: @ 8270BDB
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB:: @ 8270C0C
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB::
 	multichoice 0, 0, MULTI_SHARDS_B, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
@@ -118,7 +118,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsB:: @ 8270C0C
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB:: @ 8270C32
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB::
 	multichoice 0, 0, MULTI_SHARDS_RB, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
@@ -127,7 +127,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRB:: @ 8270C32
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB:: @ 8270C63
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB::
 	multichoice 0, 0, MULTI_SHARDS_YB, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
@@ -136,7 +136,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYB:: @ 8270C63
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB:: @ 8270C94
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB::
 	multichoice 0, 0, MULTI_SHARDS_RYB, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
@@ -146,7 +146,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYB:: @ 8270C94
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG:: @ 8270CD0
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG::
 	multichoice 0, 0, MULTI_SHARDS_G, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard
@@ -154,7 +154,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsG:: @ 8270CD0
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG:: @ 8270CF6
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG::
 	multichoice 0, 0, MULTI_SHARDS_RG, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
@@ -163,7 +163,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRG:: @ 8270CF6
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG:: @ 8270D27
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG::
 	multichoice 0, 0, MULTI_SHARDS_YG, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
@@ -172,7 +172,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYG:: @ 8270D27
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG:: @ 8270D58
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG::
 	multichoice 0, 0, MULTI_SHARDS_RYG, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
@@ -182,7 +182,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYG:: @ 8270D58
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG:: @ 8270D94
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG::
 	multichoice 0, 0, MULTI_SHARDS_BG, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard
@@ -191,7 +191,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsBG:: @ 8270D94
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG:: @ 8270DC5
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG::
 	multichoice 0, 0, MULTI_SHARDS_RBG, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
@@ -201,7 +201,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRBG:: @ 8270DC5
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG:: @ 8270E01
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG::
 	multichoice 0, 0, MULTI_SHARDS_YBG, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard
@@ -211,7 +211,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsYBG:: @ 8270E01
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG:: @ 8270E3D
+Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG::
 	multichoice 0, 0, MULTI_SHARDS_RYBG, FALSE
 	switch VAR_RESULT
 	case 0, Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard
@@ -222,27 +222,27 @@ Route124_DivingTreasureHuntersHouse_EventScript_ShardOptionsRYBG:: @ 8270E3D
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard:: @ 8270E84
+Route124_DivingTreasureHuntersHouse_EventScript_TradeRedShard::
 	setvar VAR_0x8008, ITEM_RED_SHARD
 	setvar VAR_0x8009, ITEM_FIRE_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
 
-Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard:: @ 8270E93
+Route124_DivingTreasureHuntersHouse_EventScript_TradeYellowShard::
 	setvar VAR_0x8008, ITEM_YELLOW_SHARD
 	setvar VAR_0x8009, ITEM_THUNDER_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
 
-Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard:: @ 8270EA2
+Route124_DivingTreasureHuntersHouse_EventScript_TradeBlueShard::
 	setvar VAR_0x8008, ITEM_BLUE_SHARD
 	setvar VAR_0x8009, ITEM_WATER_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
 
-Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard:: @ 8270EB1
+Route124_DivingTreasureHuntersHouse_EventScript_TradeGreenShard::
 	setvar VAR_0x8008, ITEM_GREEN_SHARD
 	setvar VAR_0x8009, ITEM_LEAF_STONE
 	goto Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard
 
-Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard:: @ 8270EC0
+Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard::
 	bufferitemname 0, VAR_0x8008
 	bufferitemname 1, VAR_0x8009
 	msgbox Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone, MSGBOX_YESNO
@@ -257,7 +257,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_TryTradeShard:: @ 8270EC0
 	goto Route124_DivingTreasureHuntersHouse_EventScript_BagFull
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_TradeShard:: @ 8270F01
+Route124_DivingTreasureHuntersHouse_EventScript_TradeShard::
 	removeitem VAR_0x8008
 	giveitem VAR_0x8009
 	msgbox Route124_DivingTreasureHuntersHouse_Text_ItsADeal, MSGBOX_DEFAULT
@@ -270,74 +270,74 @@ Route124_DivingTreasureHuntersHouse_EventScript_TradeShard:: @ 8270F01
 	goto Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_BagFull:: @ 8270F43
+Route124_DivingTreasureHuntersHouse_EventScript_BagFull::
 	msgbox Route124_DivingTreasureHuntersHouse_Text_BagFull, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade:: @ 8270F4D
+Route124_DivingTreasureHuntersHouse_EventScript_DeclineTrade::
 	msgbox Route124_DivingTreasureHuntersHouse_Text_ComeBackIfYouChangeMind, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_NoShards:: @ 8270F57
+Route124_DivingTreasureHuntersHouse_EventScript_NoShards::
 	msgbox Route124_DivingTreasureHuntersHouse_Text_YouHaventGotAnyShards, MSGBOX_DEFAULT
 	release
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_EndTrade:: @ 8270F61
+Route124_DivingTreasureHuntersHouse_EventScript_EndTrade::
 	release
 	end
 
-Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard:: @ 8270F63
+Route124_DivingTreasureHuntersHouse_EventScript_ShardTradeBoard::
 	msgbox Route124_DivingTreasureHuntersHouse_Text_ShardTradeBoard, MSGBOX_SIGN
 	end
 
-Route124_DivingTreasureHuntersHouse_Text_Greeting: @ 8270F6C
+Route124_DivingTreasureHuntersHouse_Text_Greeting:
 	.string "I'm the DIVING TREASURE HUNTER!\p"
 	.string "I'm the awesome dude who makes\n"
 	.string "deep-sea dives to gather treasures\l"
 	.string "resting at the bottom.$"
 
-Route124_DivingTreasureHuntersHouse_Text_HaveYouSeenAnyShards: @ 8270FE5
+Route124_DivingTreasureHuntersHouse_Text_HaveYouSeenAnyShards:
 	.string "Tell me, have you seen any SHARDS of\n"
 	.string "tools made in ancient times?$"
 
-Route124_DivingTreasureHuntersHouse_Text_YouHaventGotAnyShards: @ 8271027
+Route124_DivingTreasureHuntersHouse_Text_YouHaventGotAnyShards:
 	.string "You haven't got any treasures\n"
 	.string "for me…\p"
 	.string "If you see any SHARDS, like the RED\n"
 	.string "SHARD, you've got to trade it with me!$"
 
-Route124_DivingTreasureHuntersHouse_Text_ThatsAShardIllTradeYou: @ 8271098
+Route124_DivingTreasureHuntersHouse_Text_ThatsAShardIllTradeYou:
 	.string "Oh, hey! That…\n"
 	.string "That's a SHARD! I'm looking for those!\p"
 	.string "Oh, man, you've got to trade that\n"
 	.string "with me! I'll give you something good!$"
 
-Route124_DivingTreasureHuntersHouse_Text_WhatDoYouWantToTrade: @ 8271117
+Route124_DivingTreasureHuntersHouse_Text_WhatDoYouWantToTrade:
 	.string "What do you want to trade?$"
 
-Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone: @ 8271132
+Route124_DivingTreasureHuntersHouse_Text_YoullTradeShardForStone:
 	.string "You'll trade your {STR_VAR_1} for\n"
 	.string "my {STR_VAR_2}, then?$"
 
-Route124_DivingTreasureHuntersHouse_Text_ItsADeal: @ 8271158
+Route124_DivingTreasureHuntersHouse_Text_ItsADeal:
 	.string "It's a done deal!\n"
 	.string "Use that wisely!$"
 
-Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse: @ 827117B
+Route124_DivingTreasureHuntersHouse_Text_TradeSomethingElse:
 	.string "Do you want to trade something else?$"
 
-Route124_DivingTreasureHuntersHouse_Text_BagFull: @ 82711A0
+Route124_DivingTreasureHuntersHouse_Text_BagFull:
 	.string "Whoops, your BAG's full.\n"
 	.string "Get rid of some items, friend!$"
 
-Route124_DivingTreasureHuntersHouse_Text_ComeBackIfYouChangeMind: @ 82711D8
+Route124_DivingTreasureHuntersHouse_Text_ComeBackIfYouChangeMind:
 	.string "No? That's a downer.\n"
 	.string "Well, if you change your mind, come back.$"
 
-Route124_DivingTreasureHuntersHouse_Text_ShardTradeBoard: @ 8271217
+Route124_DivingTreasureHuntersHouse_Text_ShardTradeBoard:
 	.string "{CLEAR_TO 0x0a}Wanted item{CLEAR_TO 0x7c}Trade item\n"
 	.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"
diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc
index b771e75f9..7a2d3f15f 100644
--- a/data/maps/Route125/scripts.inc
+++ b/data/maps/Route125/scripts.inc
@@ -1,10 +1,10 @@
-Route125_MapScripts:: @ 81F6748
+Route125_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route125_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route125_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route125_OnFrame
 	.byte 0
 
-Route125_OnTransition: @ 81F6758
+Route125_OnTransition:
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
@@ -14,38 +14,38 @@ Route125_OnTransition: @ 81F6758
 	call_if_eq AbnormalWeather_StartKyogreWeather
 	end
 
-Route125_OnLoad: @ 81F6783
+Route125_OnLoad:
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_WEST
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute125West
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_125_EAST
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute125East
 	end
 
-Route125_OnFrame: @ 81F679A
+Route125_OnFrame:
 	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route125_EventScript_Nolen:: @ 81F67A4
+Route125_EventScript_Nolen::
 	trainerbattle_single TRAINER_NOLEN, Route125_Text_NolenIntro, Route125_Text_NolenDefeat
 	msgbox Route125_Text_NolenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_Stan:: @ 81F67BB
+Route125_EventScript_Stan::
 	trainerbattle_single TRAINER_STAN, Route125_Text_StanIntro, Route125_Text_StanDefeat
 	msgbox Route125_Text_StanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_Tanya:: @ 81F67D2
+Route125_EventScript_Tanya::
 	trainerbattle_single TRAINER_TANYA, Route125_Text_TanyaIntro, Route125_Text_TanyaDefeat
 	msgbox Route125_Text_TanyaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_Sharon:: @ 81F67E9
+Route125_EventScript_Sharon::
 	trainerbattle_single TRAINER_SHARON, Route125_Text_SharonIntro, Route125_Text_SharonDefeat
 	msgbox Route125_Text_SharonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_Ernest:: @ 81F6800
+Route125_EventScript_Ernest::
 	trainerbattle_single TRAINER_ERNEST_1, Route125_Text_ErnestIntro, Route125_Text_ErnestDefeat, Route125_EventScript_RegisterErnest
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -54,7 +54,7 @@ Route125_EventScript_Ernest:: @ 81F6800
 	release
 	end
 
-Route125_EventScript_RegisterErnest:: @ 81F682C
+Route125_EventScript_RegisterErnest::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route125_Text_ErnestRegister, MSGBOX_DEFAULT
@@ -62,27 +62,27 @@ Route125_EventScript_RegisterErnest:: @ 81F682C
 	release
 	end
 
-Route125_EventScript_RematchErnest:: @ 81F684B
+Route125_EventScript_RematchErnest::
 	trainerbattle_rematch TRAINER_ERNEST_1, Route125_Text_ErnestRematchIntro, Route125_Text_ErnestRematchDefeat
 	msgbox Route125_Text_ErnestRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_Kim:: @ 81F6862
+Route125_EventScript_Kim::
 	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_KimIntro, Route125_Text_KimDefeat, Route125_Text_KimNotEnoughMons
 	msgbox Route125_Text_KimPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_Iris:: @ 81F687D
+Route125_EventScript_Iris::
 	trainerbattle_double TRAINER_KIM_AND_IRIS, Route125_Text_IrisIntro, Route125_Text_IrisDefeat, Route125_Text_IrisNotEnoughMons
 	msgbox Route125_Text_IrisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_Presley:: @ 81F6898
+Route125_EventScript_Presley::
 	trainerbattle_single TRAINER_PRESLEY, Route125_Text_PresleyIntro, Route125_Text_PresleyDefeat
 	msgbox Route125_Text_PresleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route125_EventScript_Auron:: @ 81F68AF
+Route125_EventScript_Auron::
 	trainerbattle_single TRAINER_AURON, Route125_Text_AuronIntro, Route125_Text_AuronDefeat
 	msgbox Route125_Text_AuronPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc
index 6fbc43592..79f5bb11b 100644
--- a/data/maps/Route126/scripts.inc
+++ b/data/maps/Route126/scripts.inc
@@ -1,47 +1,47 @@
-Route126_MapScripts:: @ 81F68C6
+Route126_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route126_OnTransition
 	.byte 0
 
-Route126_OnTransition: @ 81F68CC
+Route126_OnTransition:
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 
-Route126_EventScript_Barry:: @ 81F68D6
+Route126_EventScript_Barry::
 	trainerbattle_single TRAINER_BARRY, Route126_Text_BarryIntro, Route126_Text_BarryDefeat
 	msgbox Route126_Text_BarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_Dean:: @ 81F68ED
+Route126_EventScript_Dean::
 	trainerbattle_single TRAINER_DEAN, Route126_Text_DeanIntro, Route126_Text_DeanDefeat
 	msgbox Route126_Text_DeanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_Nikki:: @ 81F6904
+Route126_EventScript_Nikki::
 	trainerbattle_single TRAINER_NIKKI, Route126_Text_NikkiIntro, Route126_Text_NikkiDefeat
 	msgbox Route126_Text_NikkiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_Brenda:: @ 81F691B
+Route126_EventScript_Brenda::
 	trainerbattle_single TRAINER_BRENDA, Route126_Text_BrendaIntro, Route126_Text_BrendaDefeat
 	msgbox Route126_Text_BrendaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_Leonardo:: @ 81F6932
+Route126_EventScript_Leonardo::
 	trainerbattle_single TRAINER_LEONARDO, Route126_Text_LeonardoIntro, Route126_Text_LeonardoDefeat
 	msgbox Route126_Text_LeonardoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_Isobel:: @ 81F6949
+Route126_EventScript_Isobel::
 	trainerbattle_single TRAINER_ISOBEL, Route126_Text_IsobelIntro, Route126_Text_IsobelDefeat
 	msgbox Route126_Text_IsobelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_Sienna:: @ 81F6960
+Route126_EventScript_Sienna::
 	trainerbattle_single TRAINER_SIENNA, Route126_Text_SiennaIntro, Route126_Text_SiennaDefeat
 	msgbox Route126_Text_SiennaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route126_EventScript_Pablo:: @ 81F6977
+Route126_EventScript_Pablo::
 	trainerbattle_single TRAINER_PABLO_1, Route126_Text_PabloIntro, Route126_Text_PabloDefeat, Route126_EventScript_RegisterPablo
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -50,7 +50,7 @@ Route126_EventScript_Pablo:: @ 81F6977
 	release
 	end
 
-Route126_EventScript_RegisterPablo:: @ 81F69A3
+Route126_EventScript_RegisterPablo::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route126_Text_PabloRegister, MSGBOX_DEFAULT
@@ -58,7 +58,7 @@ Route126_EventScript_RegisterPablo:: @ 81F69A3
 	release
 	end
 
-Route126_EventScript_RematchPablo:: @ 81F69C2
+Route126_EventScript_RematchPablo::
 	trainerbattle_rematch TRAINER_PABLO_1, Route126_Text_PabloRematchIntro, Route126_Text_PabloRematchDefeat
 	msgbox Route126_Text_PabloPostRematch, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc
index 323315b04..426e81470 100644
--- a/data/maps/Route127/scripts.inc
+++ b/data/maps/Route127/scripts.inc
@@ -1,10 +1,10 @@
-Route127_MapScripts:: @ 81F69D9
+Route127_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route127_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route127_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route127_OnFrame
 	.byte 0
 
-Route127_OnTransition: @ 81F69E9
+Route127_OnTransition:
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
@@ -14,53 +14,53 @@ Route127_OnTransition: @ 81F69E9
 	call_if_eq AbnormalWeather_StartKyogreWeather
 	end
 
-Route127_OnLoad: @ 81F6A14
+Route127_OnLoad:
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_NORTH
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute127North
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_127_SOUTH
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute127South
 	end
 
-Route127_OnFrame: @ 81F6A2B
+Route127_OnFrame:
 	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route127_EventScript_Camden:: @ 81F6A35
+Route127_EventScript_Camden::
 	trainerbattle_single TRAINER_CAMDEN, Route127_Text_CamdenIntro, Route127_Text_CamdenDefeat
 	msgbox Route127_Text_CamdenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_Donny:: @ 81F6A4C
+Route127_EventScript_Donny::
 	trainerbattle_single TRAINER_DONNY, Route127_Text_DonnyIntro, Route127_Text_DonnyDefeat
 	msgbox Route127_Text_DonnyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_Jonah:: @ 81F6A63
+Route127_EventScript_Jonah::
 	trainerbattle_single TRAINER_JONAH, Route127_Text_JonahIntro, Route127_Text_JonahDefeat
 	msgbox Route127_Text_JonahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_Henry:: @ 81F6A7A
+Route127_EventScript_Henry::
 	trainerbattle_single TRAINER_HENRY, Route127_Text_HenryIntro, Route127_Text_HenryDefeat
 	msgbox Route127_Text_HenryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_Roger:: @ 81F6A91
+Route127_EventScript_Roger::
 	trainerbattle_single TRAINER_ROGER, Route127_Text_RogerIntro, Route127_Text_RogerDefeat
 	msgbox Route127_Text_RogerPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_Aidan:: @ 81F6AA8
+Route127_EventScript_Aidan::
 	trainerbattle_single TRAINER_AIDAN, Route127_Text_AidanIntro, Route127_Text_AidanDefeat
 	msgbox Route127_Text_AidanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_Athena:: @ 81F6ABF
+Route127_EventScript_Athena::
 	trainerbattle_single TRAINER_ATHENA, Route127_Text_AthenaIntro, Route127_Text_AthenaDefeat
 	msgbox Route127_Text_AthenaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route127_EventScript_Koji:: @ 81F6AD6
+Route127_EventScript_Koji::
 	trainerbattle_single TRAINER_KOJI_1, Route127_Text_KojiIntro, Route127_Text_KojiDefeat, Route127_EventScript_RegisterKoji
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -69,7 +69,7 @@ Route127_EventScript_Koji:: @ 81F6AD6
 	release
 	end
 
-Route127_EventScript_RegisterKoji:: @ 81F6B02
+Route127_EventScript_RegisterKoji::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route127_Text_KojiRegister, MSGBOX_DEFAULT
@@ -77,7 +77,7 @@ Route127_EventScript_RegisterKoji:: @ 81F6B02
 	release
 	end
 
-Route127_EventScript_RematchKoji:: @ 81F6B21
+Route127_EventScript_RematchKoji::
 	trainerbattle_rematch TRAINER_KOJI_1, Route127_Text_KojiRematchIntro, Route127_Text_KojiRematchDefeat
 	msgbox Route127_Text_KojiPostRematch, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
index 2e69a50ad..09b5c404a 100644
--- a/data/maps/Route128/scripts.inc
+++ b/data/maps/Route128/scripts.inc
@@ -2,20 +2,20 @@
 .set LOCALID_ARCHIE, 4
 .set LOCALID_MAXIE, 5
 
-Route128_MapScripts:: @ 81F6B38
+Route128_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route128_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route128_OnFrame
 	.byte 0
 
-Route128_OnTransition: @ 81F6B43
+Route128_OnTransition:
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	end
 
-Route128_OnFrame: @ 81F6B4D
+Route128_OnFrame:
 	map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_KyogreAwakenedScene
 	.2byte 0
 
-Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57
+Route128_EventScript_KyogreAwakenedScene::
 	lockall
 	delay 20
 	applymovement LOCALID_ARCHIE, Route128_Movement_ArchieLookAround
@@ -82,11 +82,11 @@ Route128_EventScript_KyogreAwakenedScene:: @ 81F6B57
 	releaseall
 	end
 
-Route128_Movement_Unused1: @ 81F6C76
+Route128_Movement_Unused1:
 	walk_fast_left
 	step_end
 
-Route128_Movement_Unused2: @ 81F6C78
+Route128_Movement_Unused2:
 	walk_left
 	walk_left
 	walk_left
@@ -101,15 +101,15 @@ Route128_Movement_Unused2: @ 81F6C78
 	walk_up
 	step_end
 
-Route128_Movement_StevenWalkUp: @ 81F6C85
+Route128_Movement_StevenWalkUp:
 	walk_up
 	step_end
 
-Route128_Movement_StevenApproachPlayer: @ 81F6C87
+Route128_Movement_StevenApproachPlayer:
 	walk_fast_left
 	step_end
 
-Route128_Movement_ArchieLookAround: @ 81F6C89
+Route128_Movement_ArchieLookAround:
 	walk_fast_down
 	walk_in_place_fastest_left
 	delay_16
@@ -119,21 +119,21 @@ Route128_Movement_ArchieLookAround: @ 81F6C89
 	walk_in_place_fastest_down
 	step_end
 
-Route128_Movement_ArchieBackUp: @ 81F6C91
+Route128_Movement_ArchieBackUp:
 	lock_facing_direction
 	walk_slow_up
 	delay_16
 	unlock_facing_direction
 	step_end
 
-Route128_Movement_ArchieRunLeft: @ 81F6C96
+Route128_Movement_ArchieRunLeft:
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
 	walk_in_place_fastest_right
 	step_end
 
-Route128_Movement_ArchieExit: @ 81F6C9B
+Route128_Movement_ArchieExit:
 	delay_16
 	delay_16
 	walk_fast_up
@@ -148,19 +148,19 @@ Route128_Movement_ArchieExit: @ 81F6C9B
 	walk_fast_up
 	step_end
 
-Route128_Movement_MaxieWalkLeft: @ 81F6CA8
+Route128_Movement_MaxieWalkLeft:
 	walk_left
 	walk_left
 	delay_8
 	delay_4
 	step_end
 
-Route128_Movement_MaxieApproachArchie: @ 81F6CAD
+Route128_Movement_MaxieApproachArchie:
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-Route128_Movement_MaxieExit: @ 81F6CB0
+Route128_Movement_MaxieExit:
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -173,12 +173,12 @@ Route128_Movement_MaxieExit: @ 81F6CB0
 	walk_fast_up
 	step_end
 
-Route128_Movement_MaxieApproachPlayer: @ 81F6CBB
+Route128_Movement_MaxieApproachPlayer:
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-Route128_EventScript_Isaiah:: @ 81F6CBE
+Route128_EventScript_Isaiah::
 	trainerbattle_single TRAINER_ISAIAH_1, Route128_Text_IsaiahIntro, Route128_Text_IsaiahDefeat, Route128_EventScript_RegisterIsaiah
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -187,7 +187,7 @@ Route128_EventScript_Isaiah:: @ 81F6CBE
 	release
 	end
 
-Route128_EventScript_RegisterIsaiah:: @ 81F6CEA
+Route128_EventScript_RegisterIsaiah::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route128_Text_IsaiahRegister, MSGBOX_DEFAULT
@@ -195,12 +195,12 @@ Route128_EventScript_RegisterIsaiah:: @ 81F6CEA
 	release
 	end
 
-Route128_EventScript_RematchIsaiah:: @ 81F6D09
+Route128_EventScript_RematchIsaiah::
 	trainerbattle_rematch TRAINER_ISAIAH_1, Route128_Text_IsaiahRematchIntro, Route128_Text_IsaiahRematchDefeat
 	msgbox Route128_Text_IsaiahPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_Katelyn:: @ 81F6D20
+Route128_EventScript_Katelyn::
 	trainerbattle_single TRAINER_KATELYN_1, Route128_Text_KatelynIntro, Route128_Text_KatelynDefeat, Route128_EventScript_RegisterKatelyn
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -209,7 +209,7 @@ Route128_EventScript_Katelyn:: @ 81F6D20
 	release
 	end
 
-Route128_EventScript_RegisterKatelyn:: @ 81F6D4C
+Route128_EventScript_RegisterKatelyn::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox Route128_Text_KatelynRegister, MSGBOX_DEFAULT
@@ -217,46 +217,46 @@ Route128_EventScript_RegisterKatelyn:: @ 81F6D4C
 	release
 	end
 
-Route128_EventScript_RematchKatelyn:: @ 81F6D6B
+Route128_EventScript_RematchKatelyn::
 	trainerbattle_rematch TRAINER_KATELYN_1, Route128_Text_KatelynRematchIntro, Route128_Text_KatelynRematchDefeat
 	msgbox Route128_Text_KatelynPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_Alexa:: @ 81F6D82
+Route128_EventScript_Alexa::
 	trainerbattle_single TRAINER_ALEXA, Route128_Text_AlexaIntro, Route128_Text_AlexaDefeat
 	msgbox Route128_Text_AlexaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_Ruben:: @ 81F6D99
+Route128_EventScript_Ruben::
 	trainerbattle_single TRAINER_RUBEN, Route128_Text_RubenIntro, Route128_Text_RubenDefeat
 	msgbox Route128_Text_RubenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_Wayne:: @ 81F6DB0
+Route128_EventScript_Wayne::
 	trainerbattle_single TRAINER_WAYNE, Route128_Text_WayneIntro, Route128_Text_WayneDefeat
 	msgbox Route128_Text_WaynePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_Harrison:: @ 81F6DC7
+Route128_EventScript_Harrison::
 	trainerbattle_single TRAINER_HARRISON, Route128_Text_HarrisonIntro, Route128_Text_HarrisonDefeat
 	msgbox Route128_Text_HarrisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_EventScript_Carlee:: @ 81F6DDE
+Route128_EventScript_Carlee::
 	trainerbattle_single TRAINER_CARLEE, Route128_Text_CarleeIntro, Route128_Text_CarleeDefeat
 	msgbox Route128_Text_CarleePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route128_Text_ArchieWhatHappened: @ 81F6DF5
+Route128_Text_ArchieWhatHappened:
 	.string "ARCHIE: What happened…\n"
 	.string "What is this wretched scene…\p"
 	.string "Did I…make a horrible mistake?$"
 
-Route128_Text_ArchieIOnlyWanted: @ 81F6E48
+Route128_Text_ArchieIOnlyWanted:
 	.string "I…\n"
 	.string "I only wanted…$"
 
-Route128_Text_MaxieDoYouUnderstandNow: @ 81F6E5A
+Route128_Text_MaxieDoYouUnderstandNow:
 	.string "MAXIE: Do you understand now,\n"
 	.string "ARCHIE?\p"
 	.string "Do you finally see how disastrous\n"
@@ -265,7 +265,7 @@ Route128_Text_MaxieDoYouUnderstandNow: @ 81F6E5A
 	.string "something before the situation goes\l"
 	.string "completely out of control!$"
 
-Route128_Text_MaxieResposibilityFallsToArchieAndMe: @ 81F6F1E
+Route128_Text_MaxieResposibilityFallsToArchieAndMe:
 	.string "MAXIE: {PLAYER}, don't say anything.\p"
 	.string "I know that I have no right to be\n"
 	.string "critical of ARCHIE…\p"
@@ -277,17 +277,17 @@ Route128_Text_MaxieResposibilityFallsToArchieAndMe: @ 81F6F1E
 	.string "The responsibility for putting an end\n"
 	.string "to this falls to ARCHIE and me…$"
 
-Route128_Text_MaxieThisDefiesBelief: @ 81F704F
+Route128_Text_MaxieThisDefiesBelief:
 	.string "MAXIE: This defies belief…\p"
 	.string "Those super-ancient POKéMON…\p"
 	.string "Their power is unbelievable.\n"
 	.string "They've upset the balance of nature…$"
 
-Route128_Text_StevenWhatIsHappening: @ 81F70C9
+Route128_Text_StevenWhatIsHappening:
 	.string "STEVEN: {PLAYER}{KUN}!\n"
 	.string "What is happening?$"
 
-Route128_Text_StevenWholeWorldWillDrown: @ 81F70EA
+Route128_Text_StevenWholeWorldWillDrown:
 	.string "This is terrible…\p"
 	.string "After the scorching heat wave ended,\n"
 	.string "this deluge began.\p"
@@ -299,7 +299,7 @@ Route128_Text_StevenWholeWorldWillDrown: @ 81F70EA
 	.string "There's no point arguing here…\n"
 	.string "SOOTOPOLIS might provide answers…$"
 
-Route128_Text_StevenImGoingToSootopolis: @ 81F721B
+Route128_Text_StevenImGoingToSootopolis:
 	.string "{PLAYER}{KUN}…\n"
 	.string "I don't know what you intend to do,\l"
 	.string "but don't do anything reckless.\p"
diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc
index ea53c3bf2..e996722cc 100644
--- a/data/maps/Route129/scripts.inc
+++ b/data/maps/Route129/scripts.inc
@@ -1,17 +1,17 @@
-Route129_MapScripts:: @ 81F7284
+Route129_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route129_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Route129_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route129_OnFrame
 	.byte 0
 
-Route129_OnLoad: @ 81F7294
+Route129_OnLoad:
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_WEST
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute129West
 	compare VAR_ABNORMAL_WEATHER_LOCATION, ABNORMAL_WEATHER_ROUTE_129_EAST
 	call_if_eq AbnormalWeather_EventScript_PlaceTilesRoute129East
 	end
 
-Route129_OnTransition: @ 81F72AB
+Route129_OnTransition:
 	compare VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	call_if_eq AbnormalWeather_EventScript_HideMapNamePopup
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
@@ -22,35 +22,35 @@ Route129_OnTransition: @ 81F72AB
 	call_if_eq AbnormalWeather_StartKyogreWeather
 	end
 
-Route129_EventScript_CheckSetAbnormalWeather:: @ 81F72D8
+Route129_EventScript_CheckSetAbnormalWeather::
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	return
 
-Route129_OnFrame: @ 81F72E2
+Route129_OnFrame:
 	map_script_2 VAR_SHOULD_END_ABNORMAL_WEATHER, 1, AbnormalWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route129_EventScript_Chase:: @ 81F72EC
+Route129_EventScript_Chase::
 	trainerbattle_single TRAINER_CHASE, Route129_Text_ChaseIntro, Route129_Text_ChaseDefeat
 	msgbox Route129_Text_ChasePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_Allison:: @ 81F7303
+Route129_EventScript_Allison::
 	trainerbattle_single TRAINER_ALLISON, Route129_Text_AllisonIntro, Route129_Text_AllisonDefeat
 	msgbox Route129_Text_AllisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_Reed:: @ 81F731A
+Route129_EventScript_Reed::
 	trainerbattle_single TRAINER_REED, Route129_Text_ReedIntro, Route129_Text_ReedDefeat
 	msgbox Route129_Text_ReedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_Tisha:: @ 81F7331
+Route129_EventScript_Tisha::
 	trainerbattle_single TRAINER_TISHA, Route129_Text_TishaIntro, Route129_Text_TishaDefeat
 	msgbox Route129_Text_TishaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route129_EventScript_Clarence:: @ 81F7348
+Route129_EventScript_Clarence::
 	trainerbattle_single TRAINER_CLARENCE, Route129_Text_ClarenceIntro, Route129_Text_ClarenceDefeat
 	msgbox Route129_Text_ClarencePostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc
index 141196a2d..fe360a36b 100644
--- a/data/maps/Route130/scripts.inc
+++ b/data/maps/Route130/scripts.inc
@@ -1,8 +1,8 @@
-Route130_MapScripts:: @ 81F735F
+Route130_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route130_OnTransition
 	.byte 0
 
-Route130_OnTransition: @ 81F7365
+Route130_OnTransition:
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
 	call_if_ge Route130_EventScript_CheckSetAbnormalWeather
 	specialvar VAR_RESULT, IsMirageIslandPresent
@@ -26,25 +26,25 @@ Route130_OnTransition: @ 81F7365
 	setmaplayoutindex LAYOUT_ROUTE130
 	end
 
-Route130_EventScript_SetMirageIslandLayout:: @ 81F73B1
+Route130_EventScript_SetMirageIslandLayout::
 	setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND
 	end
 
-Route130_EventScript_CheckSetAbnormalWeather:: @ 81F73B5
+Route130_EventScript_CheckSetAbnormalWeather::
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	return
 
-Route130_EventScript_Rodney:: @ 81F73BF
+Route130_EventScript_Rodney::
 	trainerbattle_single TRAINER_RODNEY, Route130_Text_RodneyIntro, Route130_Text_RodneyDefeat
 	msgbox Route130_Text_RodneyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route130_EventScript_Katie:: @ 81F73D6
+Route130_EventScript_Katie::
 	trainerbattle_single TRAINER_KATIE, Route130_Text_KatieIntro, Route130_Text_KatieDefeat
 	msgbox Route130_Text_KatiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route130_EventScript_Santiago:: @ 81F73ED
+Route130_EventScript_Santiago::
 	trainerbattle_single TRAINER_SANTIAGO, Route130_Text_SantiagoIntro, Route130_Text_SantiagoDefeat
 	msgbox Route130_Text_SantiagoPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc
index b419adcf6..846998bfe 100644
--- a/data/maps/Route131/scripts.inc
+++ b/data/maps/Route131/scripts.inc
@@ -1,57 +1,57 @@
-Route131_MapScripts:: @ 81F7404
+Route131_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, Route131_OnTransition
 	.byte 0
 
-Route131_OnTransition: @ 81F740A
+Route131_OnTransition:
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
 	call_if_ge Route131_EventScript_CheckSetAbnormalWeather
 	call Route131_EventScript_SetLayout
 	end
 
-Route131_EventScript_SetLayout:: @ 81F741B
+Route131_EventScript_SetLayout::
 	setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR
 	return
 
-Route131_EventScript_CheckSetAbnormalWeather:: @ 81F741F
+Route131_EventScript_CheckSetAbnormalWeather::
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	return
 
-Route131_EventScript_Richard:: @ 81F7429
+Route131_EventScript_Richard::
 	trainerbattle_single TRAINER_RICHARD, Route131_Text_RichardIntro, Route131_Text_RichardDefeat
 	msgbox Route131_Text_RichardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_Herman:: @ 81F7440
+Route131_EventScript_Herman::
 	trainerbattle_single TRAINER_HERMAN, Route131_Text_HermanIntro, Route131_Text_HermanDefeat
 	msgbox Route131_Text_HermanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_Susie:: @ 81F7457
+Route131_EventScript_Susie::
 	trainerbattle_single TRAINER_SUSIE, Route131_Text_SusieIntro, Route131_Text_SusieDefeat
 	msgbox Route131_Text_SusiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_Kara:: @ 81F746E
+Route131_EventScript_Kara::
 	trainerbattle_single TRAINER_KARA, Route131_Text_KaraIntro, Route131_Text_KaraDefeat
 	msgbox Route131_Text_KaraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_Reli:: @ 81F7485
+Route131_EventScript_Reli::
 	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_ReliIntro, Route131_Text_ReliDefeat, Route131_Text_ReliNotEnoughMons
 	msgbox Route131_Text_ReliPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_Ian:: @ 81F74A0
+Route131_EventScript_Ian::
 	trainerbattle_double TRAINER_RELI_AND_IAN, Route131_Text_IanIntro, Route131_Text_IanDefeat, Route131_Text_IanNotEnoughMons
 	msgbox Route131_Text_IanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_Talia:: @ 81F74BB
+Route131_EventScript_Talia::
 	trainerbattle_single TRAINER_TALIA, Route131_Text_TaliaIntro, Route131_Text_TaliaDefeat
 	msgbox Route131_Text_TaliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route131_EventScript_Kevin:: @ 81F74D2
+Route131_EventScript_Kevin::
 	trainerbattle_single TRAINER_KEVIN, Route131_Text_KevinIntro, Route131_Text_KevinDefeat
 	msgbox Route131_Text_KevinPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc
index 6b82102be..40d47a630 100644
--- a/data/maps/Route132/scripts.inc
+++ b/data/maps/Route132/scripts.inc
@@ -1,42 +1,42 @@
-Route132_MapScripts:: @ 81F74E9
+Route132_MapScripts::
 	.byte 0
 
-Route132_EventScript_Gilbert:: @ 81F74EA
+Route132_EventScript_Gilbert::
 	trainerbattle_single TRAINER_GILBERT, Route132_Text_GilbertIntro, Route132_Text_GilbertDefeat
 	msgbox Route132_Text_GilbertPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_Dana:: @ 81F7501
+Route132_EventScript_Dana::
 	trainerbattle_single TRAINER_DANA, Route132_Text_DanaIntro, Route132_Text_DanaDefeat
 	msgbox Route132_Text_DanaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_Ronald:: @ 81F7518
+Route132_EventScript_Ronald::
 	trainerbattle_single TRAINER_RONALD, Route132_Text_RonaldIntro, Route132_Text_RonaldDefeat
 	msgbox Route132_Text_RonaldPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_Kiyo:: @ 81F752F
+Route132_EventScript_Kiyo::
 	trainerbattle_single TRAINER_KIYO, Route132_Text_KiyoIntro, Route132_Text_KiyoDefeat
 	msgbox Route132_Text_KiyoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_Paxton:: @ 81F7546
+Route132_EventScript_Paxton::
 	trainerbattle_single TRAINER_PAXTON, Route132_Text_PaxtonIntro, Route132_Text_PaxtonDefeat
 	msgbox Route132_Text_PaxtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_Darcy:: @ 81F755D
+Route132_EventScript_Darcy::
 	trainerbattle_single TRAINER_DARCY, Route132_Text_DarcyIntro, Route132_Text_DarcyDefeat
 	msgbox Route132_Text_DarcyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_Jonathan:: @ 81F7574
+Route132_EventScript_Jonathan::
 	trainerbattle_single TRAINER_JONATHAN, Route132_Text_JonathanIntro, Route132_Text_JonathanDefeat
 	msgbox Route132_Text_JonathanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route132_EventScript_Makayla:: @ 81F758B
+Route132_EventScript_Makayla::
 	trainerbattle_single TRAINER_MAKAYLA, Route132_Text_MakaylaIntro, Route132_Text_MakaylaDefeat
 	msgbox Route132_Text_MakaylaPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc
index ebe28f5db..c9350b683 100644
--- a/data/maps/Route133/scripts.inc
+++ b/data/maps/Route133/scripts.inc
@@ -1,37 +1,37 @@
-Route133_MapScripts:: @ 81F75A2
+Route133_MapScripts::
 	.byte 0
 
-Route133_EventScript_Franklin:: @ 81F75A3
+Route133_EventScript_Franklin::
 	trainerbattle_single TRAINER_FRANKLIN, Route133_Text_FranklinIntro, Route133_Text_FranklinDefeat
 	msgbox Route133_Text_FranklinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_Debra:: @ 81F75BA
+Route133_EventScript_Debra::
 	trainerbattle_single TRAINER_DEBRA, Route133_Text_DebraIntro, Route133_Text_DebraDefeat
 	msgbox Route133_Text_DebraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_Linda:: @ 81F75D1
+Route133_EventScript_Linda::
 	trainerbattle_single TRAINER_LINDA, Route133_Text_LindaIntro, Route133_Text_LindaDefeat
 	msgbox Route133_Text_LindaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_Warren:: @ 81F75E8
+Route133_EventScript_Warren::
 	trainerbattle_single TRAINER_WARREN, Route133_Text_WarrenIntro, Route133_Text_WarrenDefeat
 	msgbox Route133_Text_WarrenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_Beck:: @ 81F75FF
+Route133_EventScript_Beck::
 	trainerbattle_single TRAINER_BECK, Route133_Text_BeckIntro, Route133_Text_BeckDefeat
 	msgbox Route133_Text_BeckPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_Mollie:: @ 81F7616
+Route133_EventScript_Mollie::
 	trainerbattle_single TRAINER_MOLLIE, Route133_Text_MollieIntro, Route133_Text_MollieDefeat
 	msgbox Route133_Text_MolliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route133_EventScript_Conor:: @ 81F762D
+Route133_EventScript_Conor::
 	trainerbattle_single TRAINER_CONOR, Route133_Text_ConorIntro, Route133_Text_ConorDefeat
 	msgbox Route133_Text_ConorPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc
index 3da2781b9..043835373 100644
--- a/data/maps/Route134/scripts.inc
+++ b/data/maps/Route134/scripts.inc
@@ -1,52 +1,52 @@
-Route134_MapScripts:: @ 81F7644
+Route134_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Route134_OnResume
 	.byte 0
 
-Route134_OnResume: @ 81F764A
+Route134_OnResume:
 	setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6
 	end
 
-Route134_EventScript_Jack:: @ 81F7653
+Route134_EventScript_Jack::
 	trainerbattle_single TRAINER_JACK, Route134_Text_JackIntro, Route134_Text_JackDefeat
 	msgbox Route134_Text_JackPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_Laurel:: @ 81F766A
+Route134_EventScript_Laurel::
 	trainerbattle_single TRAINER_LAUREL, Route134_Text_LaurelIntro, Route134_Text_LaurelDefeat
 	msgbox Route134_Text_LaurelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_Alex:: @ 81F7681
+Route134_EventScript_Alex::
 	trainerbattle_single TRAINER_ALEX, Route134_Text_AlexIntro, Route134_Text_AlexDefeat
 	msgbox Route134_Text_AlexPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_Aaron:: @ 81F7698
+Route134_EventScript_Aaron::
 	trainerbattle_single TRAINER_AARON, Route134_Text_AaronIntro, Route134_Text_AaronDefeat
 	msgbox Route134_Text_AaronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_Hitoshi:: @ 81F76AF
+Route134_EventScript_Hitoshi::
 	trainerbattle_single TRAINER_HITOSHI, Route134_Text_HitoshiIntro, Route134_Text_HitoshiDefeat
 	msgbox Route134_Text_HitoshiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_Hudson:: @ 81F76C6
+Route134_EventScript_Hudson::
 	trainerbattle_single TRAINER_HUDSON, Route134_Text_HudsonIntro, Route134_Text_HudsonDefeat
 	msgbox Route134_Text_HudsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_Reyna:: @ 81F76DD
+Route134_EventScript_Reyna::
 	trainerbattle_single TRAINER_REYNA, Route134_Text_ReynaIntro, Route134_Text_ReynaDefeat
 	msgbox Route134_Text_ReynaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_Marley:: @ 81F76F4
+Route134_EventScript_Marley::
 	trainerbattle_single TRAINER_MARLEY, Route134_Text_MarleyIntro, Route134_Text_MarleyDefeat
 	msgbox Route134_Text_MarleyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route134_EventScript_Kelvin:: @ 81F770B
+Route134_EventScript_Kelvin::
 	trainerbattle_single TRAINER_KELVIN, Route134_Text_KelvinIntro, Route134_Text_KelvinDefeat
 	msgbox Route134_Text_KelvinPostBattle, MSGBOX_AUTOCLOSE
 	end
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
index 05bd25247..5c6ef0902 100644
--- a/data/maps/RustboroCity/scripts.inc
+++ b/data/maps/RustboroCity/scripts.inc
@@ -5,12 +5,12 @@
 .set LOCALID_RIVAL, 14
 .set LOCALID_SCIENTIST, 15
 
-RustboroCity_MapScripts:: @ 81E06BD
+RustboroCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_OnFrame
 	.byte 0
 
-RustboroCity_OnTransition: @ 81E06C8
+RustboroCity_OnTransition:
 	setflag FLAG_VISITED_RUSTBORO_CITY
 	call Common_EventScript_SetupRivalGfxId
 	compare VAR_RUSTBORO_CITY_STATE, 6
@@ -20,25 +20,25 @@ RustboroCity_OnTransition: @ 81E06C8
 	goto_if_eq RustboroCity_EventScript_PositionScientistForExit
 	end
 
-RustboroCity_EventScript_PositionScientistForExit:: @ 81E06EC
+RustboroCity_EventScript_PositionScientistForExit::
 	compare VAR_TEMP_0, 11
 	goto_if_eq RustboroCity_EventScript_PositionScientistLeftExit
 	setobjectxyperm LOCALID_SCIENTIST, 12, 15
 	end
 
-RustboroCity_EventScript_PositionScientistLeftExit:: @ 81E06FF
+RustboroCity_EventScript_PositionScientistLeftExit::
 	setobjectxyperm LOCALID_SCIENTIST, 11, 15
 	end
 
-RustboroCity_EventScript_HideMapNamePopup:: @ 81E0707
+RustboroCity_EventScript_HideMapNamePopup::
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-RustboroCity_OnFrame: @ 81E070B
+RustboroCity_OnFrame:
 	map_script_2 VAR_RUSTBORO_CITY_STATE, 6, RustboroCity_EventScript_ScientistAddMatchCall
 	.2byte 0
 
-RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715
+RustboroCity_EventScript_ScientistAddMatchCall::
 	lockall
 	setvar VAR_ROUTE104_STATE, 1
 	applymovement OBJ_EVENT_ID_PLAYER, RustboroCity_Movement_PlayerWalkDown
@@ -77,13 +77,13 @@ RustboroCity_EventScript_ScientistAddMatchCall:: @ 81E0715
 	delay 20
 	goto RustboroCity_EventScript_MatchCallTutorial
 
-RustboroCity_EventScript_PleaseSelectPokenav:: @ 81E07AC
+RustboroCity_EventScript_PleaseSelectPokenav::
 	msgbox RustboroCity_Text_PleaseSelectPokenav, MSGBOX_DEFAULT
 	closemessage
 	delay 10
 	goto RustboroCity_EventScript_MatchCallTutorial
 
-RustboroCity_EventScript_MatchCallTutorial:: @ 81E07BD
+RustboroCity_EventScript_MatchCallTutorial::
 	setflag FLAG_ADDED_MATCH_CALL_TO_POKENAV
 	special ScriptMenu_CreateStartMenuForPokenavTutorial
 	waitstate
@@ -111,21 +111,21 @@ RustboroCity_EventScript_MatchCallTutorial:: @ 81E07BD
 	releaseall
 	end
 
-RustboroCity_Movement_ScientistWalkInPlaceDown: @ 81E084E
+RustboroCity_Movement_ScientistWalkInPlaceDown:
 	walk_in_place_down
 	step_end
 
-RustboroCity_Movement_PlayerWalkDown: @ 81E0850
+RustboroCity_Movement_PlayerWalkDown:
 	walk_down
 	step_end
 
-RustboroCity_Movement_ScientistApproachPlayer: @ 81E0852
+RustboroCity_Movement_ScientistApproachPlayer:
 	walk_down
 	delay_16
 	step_end
 
 @ Unused
-RustboroCity_Movement_ScientistWalkAroundPlayer: @ 81E0855
+RustboroCity_Movement_ScientistWalkAroundPlayer:
 	delay_16
 	walk_left
 	walk_down
@@ -135,11 +135,11 @@ RustboroCity_Movement_ScientistWalkAroundPlayer: @ 81E0855
 	delay_16
 	step_end
 
-RustboroCity_Movement_ScientistLeave: @ 81E085D
+RustboroCity_Movement_ScientistLeave:
 	walk_up
 	step_end
 
-RustboroCity_EventScript_FatMan:: @ 81E085F
+RustboroCity_EventScript_FatMan::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_FatManSawGrunt
@@ -147,23 +147,23 @@ RustboroCity_EventScript_FatMan:: @ 81E085F
 	release
 	end
 
-RustboroCity_EventScript_FatManSawGrunt:: @ 81E0874
+RustboroCity_EventScript_FatManSawGrunt::
 	msgbox RustboroCity_Text_SneakyLookingManWentAroundCorner, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_DevonEmployee2:: @ 81E087E
+RustboroCity_EventScript_DevonEmployee2::
 	lock
 	faceplayer
 	msgbox RustboroCity_Text_YoureNewAroundHere, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_Woman:: @ 81E088A
+RustboroCity_EventScript_Woman::
 	msgbox RustboroCity_Text_GymLeaderIsntEasyWithFire, MSGBOX_NPC
 	end
 
-RustboroCity_EventScript_Man1:: @ 81E0893
+RustboroCity_EventScript_Man1::
 	lock
 	faceplayer
 	goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_Man1HaveBadge
@@ -171,12 +171,12 @@ RustboroCity_EventScript_Man1:: @ 81E0893
 	release
 	end
 
-RustboroCity_EventScript_Man1HaveBadge:: @ 81E08A8
+RustboroCity_EventScript_Man1HaveBadge::
 	msgbox RustboroCity_Text_HeyThatsRustborosGymBadge, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_Boy2:: @ 81E08B2
+RustboroCity_EventScript_Boy2::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_Boy2BrineyLeftTunnel
@@ -184,49 +184,49 @@ RustboroCity_EventScript_Boy2:: @ 81E08B2
 	release
 	end
 
-RustboroCity_EventScript_Boy2BrineyLeftTunnel:: @ 81E08C7
+RustboroCity_EventScript_Boy2BrineyLeftTunnel::
 	msgbox RustboroCity_Text_MrBrineyLovesPeeko, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_Twin:: @ 81E08D1
+RustboroCity_EventScript_Twin::
 	msgbox RustboroCity_Text_WowYouHavePokemon, MSGBOX_NPC
 	end
 
-RustboroCity_EventScript_NinjaBoy:: @ 81E08DA
+RustboroCity_EventScript_NinjaBoy::
 	msgbox RustboroCity_Text_CatchRarePokemonIfIGoToSchool, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_TunnelSign:: @ 81E08E3
+RustboroCity_EventScript_TunnelSign::
 	msgbox RustboroCity_Text_TunnelNearingCompletion, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_DevonCorpSign:: @ 81E08EC
+RustboroCity_EventScript_DevonCorpSign::
 	msgbox RustboroCity_Text_DevonCorpSign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_GymSign:: @ 81E08F5
+RustboroCity_EventScript_GymSign::
 	msgbox RustboroCity_Text_GymSign, MSGBOX_SIGN
 	end
 
 @ Unused
-RustboroCity_EventScript_DevonCorpBranchOfficeSign:: @ 81E08FE
+RustboroCity_EventScript_DevonCorpBranchOfficeSign::
 	msgbox RustboroCity_Text_DevonCorpBranchOfficeSign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_CitySign:: @ 81E0907
+RustboroCity_EventScript_CitySign::
 	msgbox RustboroCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_TrainersSchoolSign:: @ 81E0910
+RustboroCity_EventScript_TrainersSchoolSign::
 	msgbox RustboroCity_Text_TrainersSchoolSign, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_CuttersHouseSign:: @ 81E0919
+RustboroCity_EventScript_CuttersHouseSign::
 	msgbox RustboroCity_Text_CuttersHouse, MSGBOX_SIGN
 	end
 
-RustboroCity_EventScript_LittleBoy:: @ 81E0922
+RustboroCity_EventScript_LittleBoy::
 	lock
 	faceplayer
 	msgbox RustboroCity_Text_PokemonCanChangeLookFromExp, MSGBOX_DEFAULT
@@ -235,7 +235,7 @@ RustboroCity_EventScript_LittleBoy:: @ 81E0922
 	release
 	end
 
-RustboroCity_EventScript_LittleGirl:: @ 81E0938
+RustboroCity_EventScript_LittleGirl::
 	lock
 	faceplayer
 	msgbox RustboroCity_Text_PokemonChangeShape, MSGBOX_DEFAULT
@@ -244,14 +244,14 @@ RustboroCity_EventScript_LittleGirl:: @ 81E0938
 	release
 	end
 
-RustboroCity_EventScript_Man2:: @ 81E094E
+RustboroCity_EventScript_Man2::
 	lock
 	faceplayer
 	msgbox RustboroCity_Text_TradePokemonGrowFast, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_EventScript_StolenGoodsTrigger0:: @ 81E095A
+RustboroCity_EventScript_StolenGoodsTrigger0::
 	lockall
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
@@ -259,7 +259,7 @@ RustboroCity_EventScript_StolenGoodsTrigger0:: @ 81E095A
 	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_StolenGoodsTrigger1:: @ 81E0971
+RustboroCity_EventScript_StolenGoodsTrigger1::
 	lockall
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
@@ -267,7 +267,7 @@ RustboroCity_EventScript_StolenGoodsTrigger1:: @ 81E0971
 	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_StolenGoodsTrigger2:: @ 81E0988
+RustboroCity_EventScript_StolenGoodsTrigger2::
 	lockall
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
@@ -275,7 +275,7 @@ RustboroCity_EventScript_StolenGoodsTrigger2:: @ 81E0988
 	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_StolenGoodsTrigger3:: @ 81E099F
+RustboroCity_EventScript_StolenGoodsTrigger3::
 	lockall
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
@@ -283,7 +283,7 @@ RustboroCity_EventScript_StolenGoodsTrigger3:: @ 81E099F
 	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_StolenGoodsTrigger4:: @ 81E09B6
+RustboroCity_EventScript_StolenGoodsTrigger4::
 	lockall
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 14, 21
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_RIGHT
@@ -291,7 +291,7 @@ RustboroCity_EventScript_StolenGoodsTrigger4:: @ 81E09B6
 	goto RustboroCity_EventScript_StolenGoodsScene
 	end
 
-RustboroCity_EventScript_StolenGoodsScene:: @ 81E09CD
+RustboroCity_EventScript_StolenGoodsScene::
 	msgbox RustboroCity_Text_OutOfTheWay, MSGBOX_DEFAULT
 	closemessage
 	playbgm MUS_ENCOUNTER_AQUA, FALSE
@@ -323,41 +323,41 @@ RustboroCity_EventScript_StolenGoodsScene:: @ 81E09CD
 	end
 
 @ Unused
-RustboroCity_EventScript_ShadyCharacterTookOff:: @ 81E0A3B
+RustboroCity_EventScript_ShadyCharacterTookOff::
 	msgbox RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel, MSGBOX_DEFAULT
 	return
 
 @ Unused
-RustboroCity_EventScript_YouGotItThankYou:: @ 81E0A44
+RustboroCity_EventScript_YouGotItThankYou::
 	msgbox RustboroCity_Text_YouGotItThankYou, MSGBOX_DEFAULT
 	return
 
 @ Unknown, unused employee movements. Based on the differences in movement theyre for approaching an object (probably the player) in different positions
-RustboroCity_EventScript_EmployeeApproachUp:: @ 81E0A4D
+RustboroCity_EventScript_EmployeeApproachUp::
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachUp
 	waitmovement 0
 	return
 
 @ Unused, see above
-RustboroCity_EventScript_EmployeeApproachLeft:: @ 81E0A58
+RustboroCity_EventScript_EmployeeApproachLeft::
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachLeft
 	waitmovement 0
 	return
 
 @ Unused, see above
-RustboroCity_EventScript_EmployeeApproachRight:: @ 81E0A63
+RustboroCity_EventScript_EmployeeApproachRight::
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachRight
 	waitmovement 0
 	return
 
 @ Unused, see above
-RustboroCity_EventScript_EmployeeApproachDown:: @ 81E0A6E
+RustboroCity_EventScript_EmployeeApproachDown::
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachDown
 	waitmovement 0
 	return
 
 @ Unused, similar movement to the above scripts
-RustboroCity_EventScript_EmployeeApproachPlayerFar:: @ 81E0A79
+RustboroCity_EventScript_EmployeeApproachPlayerFar::
 	applymovement LOCALID_DEVON_EMPLOYEE, RustboroCity_Movement_EmployeeApproachPlayerFar
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
@@ -365,7 +365,7 @@ RustboroCity_EventScript_EmployeeApproachPlayerFar:: @ 81E0A79
 	return
 
 @ Unused
-RustboroCity_Movement_GruntEscapeExtended: @ 81E0A8E
+RustboroCity_Movement_GruntEscapeExtended:
 	walk_fastest_right
 	walk_fastest_right
 	walk_fast_right
@@ -385,7 +385,7 @@ RustboroCity_Movement_GruntEscapeExtended: @ 81E0A8E
 	walk_fast_up
 	step_end
 
-RustboroCity_Movement_GruntEscape: @ 81E0AA0
+RustboroCity_Movement_GruntEscape:
 	walk_fastest_right
 	walk_fastest_right
 	walk_fast_right
@@ -404,7 +404,7 @@ RustboroCity_Movement_GruntEscape: @ 81E0AA0
 	walk_fast_up
 	step_end
 
-RustboroCity_Movement_EmployeeChaseGrunt1: @ 81E0AB1
+RustboroCity_Movement_EmployeeChaseGrunt1:
 	walk_right
 	walk_right
 	walk_right
@@ -414,7 +414,7 @@ RustboroCity_Movement_EmployeeChaseGrunt1: @ 81E0AB1
 	walk_in_place_fastest_up
 	step_end
 
-RustboroCity_Movement_EmployeeChaseGrunt2: @ 81E0AB9
+RustboroCity_Movement_EmployeeChaseGrunt2:
 	walk_up
 	walk_up
 	walk_up
@@ -425,14 +425,14 @@ RustboroCity_Movement_EmployeeChaseGrunt2: @ 81E0AB9
 	step_end
 
 @ Functionally unused
-RustboroCity_Movement_EmployeeApproachUp: @ 81E0AC1
+RustboroCity_Movement_EmployeeApproachUp:
 	walk_down
 	walk_right
 	walk_right
 	step_end
 
 @ Functionally unused
-RustboroCity_Movement_EmployeeApproachLeft: @ 81E0AC5
+RustboroCity_Movement_EmployeeApproachLeft:
 	walk_down
 	walk_down
 	walk_right
@@ -440,7 +440,7 @@ RustboroCity_Movement_EmployeeApproachLeft: @ 81E0AC5
 	step_end
 
 @ Functionally unused
-RustboroCity_Movement_EmployeeApproachRight: @ 81E0ACA
+RustboroCity_Movement_EmployeeApproachRight:
 	walk_down
 	walk_down
 	walk_right
@@ -448,7 +448,7 @@ RustboroCity_Movement_EmployeeApproachRight: @ 81E0ACA
 	step_end
 
 @ Functionally unused
-RustboroCity_Movement_EmployeeApproachDown: @ 81E0ACF
+RustboroCity_Movement_EmployeeApproachDown:
 	walk_down
 	walk_down
 	walk_down
@@ -457,7 +457,7 @@ RustboroCity_Movement_EmployeeApproachDown: @ 81E0ACF
 	step_end
 
 @ Functionally unused
-RustboroCity_Movement_EmployeeApproachPlayerFar: @ 81E0AD5
+RustboroCity_Movement_EmployeeApproachPlayerFar:
 	walk_down
 	walk_down
 	walk_down
@@ -467,7 +467,7 @@ RustboroCity_Movement_EmployeeApproachPlayerFar: @ 81E0AD5
 	walk_in_place_fastest_down
 	step_end
 
-RustboroCity_EventScript_DevonEmployee1:: @ 81E0ADD
+RustboroCity_EventScript_DevonEmployee1::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_ReturnGoodsSpokeToEmployee
@@ -475,37 +475,37 @@ RustboroCity_EventScript_DevonEmployee1:: @ 81E0ADD
 	release
 	end
 
-RustboroCity_EventScript_ReturnGoodsSpokeToEmployee:: @ 81E0AF2
+RustboroCity_EventScript_ReturnGoodsSpokeToEmployee::
 	waitse
 	setvar VAR_TEMP_1, 4
 	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_HelpGetGoodsTrigger0:: @ 81E0AFE
+RustboroCity_EventScript_HelpGetGoodsTrigger0::
 	lockall
 	setvar VAR_TEMP_1, 0
 	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_HelpGetGoodsTrigger1:: @ 81E0B0A
+RustboroCity_EventScript_HelpGetGoodsTrigger1::
 	lockall
 	setvar VAR_TEMP_1, 1
 	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_HelpGetGoodsTrigger2:: @ 81E0B16
+RustboroCity_EventScript_HelpGetGoodsTrigger2::
 	lockall
 	setvar VAR_TEMP_1, 2
 	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_HelpGetGoodsTrigger3:: @ 81E0B22
+RustboroCity_EventScript_HelpGetGoodsTrigger3::
 	lockall
 	setvar VAR_TEMP_1, 3
 	goto RustboroCity_EventScript_EmployeeAskToGetGoods
 	end
 
-RustboroCity_EventScript_EmployeeAskToGetGoods:: @ 81E0B2E
+RustboroCity_EventScript_EmployeeAskToGetGoods::
 	compare VAR_TEMP_1, 0
 	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp1
 	compare VAR_TEMP_1, 1
@@ -522,7 +522,7 @@ RustboroCity_EventScript_EmployeeAskToGetGoods:: @ 81E0B2E
 	end
 
 @ The below movement scripts are either partially or fully duplicated by the movement scripts when the player returns the goods
-RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 81E0B6F
+RustboroCity_EventScript_EmployeeFacePlayerUp1::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
@@ -534,7 +534,7 @@ RustboroCity_EventScript_EmployeeFacePlayerUp1:: @ 81E0B6F
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 81E0B9B
+RustboroCity_EventScript_EmployeeFacePlayerLeft1::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	playse SE_PIN
@@ -546,7 +546,7 @@ RustboroCity_EventScript_EmployeeFacePlayerLeft1:: @ 81E0B9B
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 81E0BC7
+RustboroCity_EventScript_EmployeeFacePlayerDown1::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -558,7 +558,7 @@ RustboroCity_EventScript_EmployeeFacePlayerDown1:: @ 81E0BC7
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 81E0BF3
+RustboroCity_EventScript_EmployeeApproachPlayerDown1::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -572,35 +572,35 @@ RustboroCity_EventScript_EmployeeApproachPlayerDown1:: @ 81E0BF3
 	waitmovement 0
 	return
 
-RustboroCity_Movement_EmployeeApproachPlayerDown: @ 81E0C29
+RustboroCity_Movement_EmployeeApproachPlayerDown:
 	walk_down
 	step_end
 
-RustboroCity_EventScript_ReturnGoodsTrigger0:: @ 81E0C2B
+RustboroCity_EventScript_ReturnGoodsTrigger0::
 	lockall
 	setvar VAR_TEMP_1, 0
 	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_ReturnGoodsTrigger1:: @ 81E0C37
+RustboroCity_EventScript_ReturnGoodsTrigger1::
 	lockall
 	setvar VAR_TEMP_1, 1
 	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_ReturnGoodsTrigger2:: @ 81E0C43
+RustboroCity_EventScript_ReturnGoodsTrigger2::
 	lockall
 	setvar VAR_TEMP_1, 2
 	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_ReturnGoodsTrigger3:: @ 81E0C4F
+RustboroCity_EventScript_ReturnGoodsTrigger3::
 	lockall
 	setvar VAR_TEMP_1, 3
 	goto RustboroCity_EventScript_ReturnGoods
 	end
 
-RustboroCity_EventScript_ReturnGoods:: @ 81E0C5B
+RustboroCity_EventScript_ReturnGoods::
 	compare VAR_TEMP_1, 0
 	call_if_eq RustboroCity_EventScript_EmployeeFacePlayerUp2
 	compare VAR_TEMP_1, 1
@@ -626,11 +626,11 @@ RustboroCity_EventScript_ReturnGoods:: @ 81E0C5B
 	releaseall
 	end
 
-RustboroCity_EventScript_BagFull:: @ 81E0CD3
+RustboroCity_EventScript_BagFull::
 	msgbox RustboroCity_Text_YoureLoadedWithItems, MSGBOX_DEFAULT
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 81E0CDC
+RustboroCity_EventScript_EmployeeFacePlayerUp2::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	playse SE_PIN
@@ -642,7 +642,7 @@ RustboroCity_EventScript_EmployeeFacePlayerUp2:: @ 81E0CDC
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 81E0D08
+RustboroCity_EventScript_EmployeeFacePlayerLeft2::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	playse SE_PIN
@@ -654,7 +654,7 @@ RustboroCity_EventScript_EmployeeFacePlayerLeft2:: @ 81E0D08
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 81E0D34
+RustboroCity_EventScript_EmployeeFacePlayerDown2::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -666,7 +666,7 @@ RustboroCity_EventScript_EmployeeFacePlayerDown2:: @ 81E0D34
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 81E0D60
+RustboroCity_EventScript_EmployeeApproachPlayerDown2::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	playse SE_PIN
@@ -680,7 +680,7 @@ RustboroCity_EventScript_EmployeeApproachPlayerDown2:: @ 81E0D60
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_EmployeeFacePlayerRight:: @ 81E0D96
+RustboroCity_EventScript_EmployeeFacePlayerRight::
 	applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	playse SE_PIN
@@ -690,14 +690,14 @@ RustboroCity_EventScript_EmployeeFacePlayerRight:: @ 81E0D96
 	waitmovement 0
 	return
 
-RustboroCity_EventScript_Rival:: @ 81E0DB8
+RustboroCity_EventScript_Rival::
 	lockall
 	call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_FacePlayer
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_PlayRivalMusic:: @ 81E0DD1
+RustboroCity_EventScript_PlayRivalMusic::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq RustboroCity_EventScript_PlayMayMusic
@@ -705,15 +705,15 @@ RustboroCity_EventScript_PlayRivalMusic:: @ 81E0DD1
 	goto_if_eq RustboroCity_EventScript_PlayBrendanMusic
 	return
 
-RustboroCity_EventScript_PlayMayMusic:: @ 81E0DE9
+RustboroCity_EventScript_PlayMayMusic::
 	playbgm MUS_ENCOUNTER_MAY, TRUE
 	return
 
-RustboroCity_EventScript_PlayBrendanMusic:: @ 81E0DEE
+RustboroCity_EventScript_PlayBrendanMusic::
 	playbgm MUS_ENCOUNTER_BRENDAN, TRUE
 	return
 
-RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3
+RustboroCity_EventScript_RivalTrigger0::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -729,7 +729,7 @@ RustboroCity_EventScript_RivalTrigger0:: @ 81E0DF3
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger1:: @ 81E0E33
+RustboroCity_EventScript_RivalTrigger1::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -745,7 +745,7 @@ RustboroCity_EventScript_RivalTrigger1:: @ 81E0E33
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger2:: @ 81E0E73
+RustboroCity_EventScript_RivalTrigger2::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -761,7 +761,7 @@ RustboroCity_EventScript_RivalTrigger2:: @ 81E0E73
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger3:: @ 81E0EB3
+RustboroCity_EventScript_RivalTrigger3::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -777,7 +777,7 @@ RustboroCity_EventScript_RivalTrigger3:: @ 81E0EB3
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger4:: @ 81E0EF3
+RustboroCity_EventScript_RivalTrigger4::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -793,7 +793,7 @@ RustboroCity_EventScript_RivalTrigger4:: @ 81E0EF3
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger5:: @ 81E0F33
+RustboroCity_EventScript_RivalTrigger5::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -809,7 +809,7 @@ RustboroCity_EventScript_RivalTrigger5:: @ 81E0F33
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger6:: @ 81E0F73
+RustboroCity_EventScript_RivalTrigger6::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -825,7 +825,7 @@ RustboroCity_EventScript_RivalTrigger6:: @ 81E0F73
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalTrigger7:: @ 81E0FB3
+RustboroCity_EventScript_RivalTrigger7::
 	lockall
 	call RustboroCity_EventScript_PlayRivalMusic
 	applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown
@@ -841,7 +841,7 @@ RustboroCity_EventScript_RivalTrigger7:: @ 81E0FB3
 	waitmovement 0
 	goto RustboroCity_EventScript_RivalEncounter
 
-RustboroCity_EventScript_RivalEncounter:: @ 81E0FF3
+RustboroCity_EventScript_RivalEncounter::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq RustboroCity_EventScript_MayEncounter
@@ -849,7 +849,7 @@ RustboroCity_EventScript_RivalEncounter:: @ 81E0FF3
 	goto_if_eq RustboroCity_EventScript_BrendanEncounter
 	end
 
-RustboroCity_EventScript_MayEncounter:: @ 81E100B
+RustboroCity_EventScript_MayEncounter::
 	goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_MayBrineyHint
 	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_MayAskToBattle
 	setflag FLAG_MET_RIVAL_RUSTBORO
@@ -873,7 +873,7 @@ RustboroCity_EventScript_MayEncounter:: @ 81E100B
 	releaseall
 	end
 
-RustboroCity_EventScript_MayAskToBattle:: @ 81E1070
+RustboroCity_EventScript_MayAskToBattle::
 	setvar VAR_0x8008, 1
 	msgbox RustboroCity_Text_MayWantToBattle, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -882,7 +882,7 @@ RustboroCity_EventScript_MayAskToBattle:: @ 81E1070
 	releaseall
 	end
 
-RustboroCity_EventScript_BattleMay:: @ 81E1092
+RustboroCity_EventScript_BattleMay::
 	msgbox RustboroCity_Text_MayImNotGoingToLose, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, RustboroCity_EventScript_BattleMayTreecko
@@ -890,37 +890,37 @@ RustboroCity_EventScript_BattleMay:: @ 81E1092
 	case 2, RustboroCity_EventScript_BattleMayMudkip
 	end
 
-RustboroCity_EventScript_MayBrineyHint:: @ 81E10C1
+RustboroCity_EventScript_MayBrineyHint::
 	msgbox RustboroCity_Text_MayMrBrineyHint, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
 	call_if_eq RustboroCity_EventScript_RestoreBgm
 	releaseall
 	end
 
-RustboroCity_EventScript_RestoreBgm:: @ 81E10D6
+RustboroCity_EventScript_RestoreBgm::
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	return
 
-RustboroCity_EventScript_BattleMayTreecko:: @ 81E10DB
+RustboroCity_EventScript_BattleMayTreecko::
 	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TREECKO, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
-RustboroCity_EventScript_BattleMayTorchic:: @ 81E10EE
+RustboroCity_EventScript_BattleMayTorchic::
 	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_TORCHIC, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
-RustboroCity_EventScript_BattleMayMudkip:: @ 81E1101
+RustboroCity_EventScript_BattleMayMudkip::
 	trainerbattle_no_intro TRAINER_MAY_RUSTBORO_MUDKIP, RustboroCity_Text_MayDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_MayBrineyHint
 	end
 
-RustboroCity_EventScript_BrendanEncounter:: @ 81E1114
+RustboroCity_EventScript_BrendanEncounter::
 	goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_BrendanBrineyHint
 	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_BrendanAskToBattle
 	setflag FLAG_MET_RIVAL_RUSTBORO
@@ -943,7 +943,7 @@ RustboroCity_EventScript_BrendanEncounter:: @ 81E1114
 	releaseall
 	end
 
-RustboroCity_EventScript_BrendanAskToBattle:: @ 81E1174
+RustboroCity_EventScript_BrendanAskToBattle::
 	msgbox RustboroCity_Text_BrendanWantToBattle, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq RustboroCity_EventScript_BattleBrendan
@@ -951,7 +951,7 @@ RustboroCity_EventScript_BrendanAskToBattle:: @ 81E1174
 	releaseall
 	end
 
-RustboroCity_EventScript_BattleBrendan:: @ 81E1191
+RustboroCity_EventScript_BattleBrendan::
 	msgbox RustboroCity_Text_BrendanIWontGoEasy, MSGBOX_DEFAULT
 	switch VAR_STARTER_MON
 	case 0, RustboroCity_EventScript_BattleBrendanTreecko
@@ -959,32 +959,32 @@ RustboroCity_EventScript_BattleBrendan:: @ 81E1191
 	case 2, RustboroCity_EventScript_BattleBrendanMudkip
 	end
 
-RustboroCity_EventScript_BrendanBrineyHint:: @ 81E11C0
+RustboroCity_EventScript_BrendanBrineyHint::
 	msgbox RustboroCity_Text_BrendanMrBrineyHint, MSGBOX_DEFAULT
 	compare VAR_0x8008, 0
 	call_if_eq RustboroCity_EventScript_RestoreBgm
 	releaseall
 	end
 
-RustboroCity_EventScript_BattleBrendanTreecko:: @ 81E11D5
+RustboroCity_EventScript_BattleBrendanTreecko::
 	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TREECKO, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
-RustboroCity_EventScript_BattleBrendanTorchic:: @ 81E11E8
+RustboroCity_EventScript_BattleBrendanTorchic::
 	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_TORCHIC, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
-RustboroCity_EventScript_BattleBrendanMudkip:: @ 81E11FB
+RustboroCity_EventScript_BattleBrendanMudkip::
 	trainerbattle_no_intro TRAINER_BRENDAN_RUSTBORO_MUDKIP, RustboroCity_Text_BrendanDefeat
 	setflag FLAG_DEFEATED_RIVAL_RUSTBORO
 	goto RustboroCity_EventScript_BrendanBrineyHint
 	end
 
-RustboroCity_Movement_RivalApproachPlayer0: @ 81E120E
+RustboroCity_Movement_RivalApproachPlayer0:
 	walk_down
 	walk_left
 	walk_left
@@ -993,7 +993,7 @@ RustboroCity_Movement_RivalApproachPlayer0: @ 81E120E
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer1: @ 81E1215
+RustboroCity_Movement_RivalApproachPlayer1:
 	walk_down
 	walk_left
 	walk_left
@@ -1001,38 +1001,38 @@ RustboroCity_Movement_RivalApproachPlayer1: @ 81E1215
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer2: @ 81E121B
+RustboroCity_Movement_RivalApproachPlayer2:
 	walk_down
 	walk_left
 	walk_left
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer3: @ 81E1220
+RustboroCity_Movement_RivalApproachPlayer3:
 	walk_down
 	walk_left
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer4: @ 81E1224
+RustboroCity_Movement_RivalApproachPlayer4:
 	walk_down
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer5: @ 81E1227
+RustboroCity_Movement_RivalApproachPlayer5:
 	walk_down
 	walk_right
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer6: @ 81E122B
+RustboroCity_Movement_RivalApproachPlayer6:
 	walk_down
 	walk_right
 	walk_right
 	walk_down
 	step_end
 
-RustboroCity_Movement_RivalApproachPlayer7: @ 81E1230
+RustboroCity_Movement_RivalApproachPlayer7:
 	walk_down
 	walk_right
 	walk_right
@@ -1040,53 +1040,53 @@ RustboroCity_Movement_RivalApproachPlayer7: @ 81E1230
 	walk_down
 	step_end
 
-RustboroCity_EventScript_Boy1:: @ 81E1236
+RustboroCity_EventScript_Boy1::
 	msgbox RustboroCity_Text_YouCanHave2On2Battle, MSGBOX_NPC
 	end
 
-RustboroCity_Text_WeShortenItToDevon: @ 81E123F
+RustboroCity_Text_WeShortenItToDevon:
 	.string "The DEVON CORPORATION…\n"
 	.string "We all just shorten it to DEVON.\p"
 	.string "That company makes all sorts of\n"
 	.string "convenient products.$"
 
-RustboroCity_Text_SneakyLookingManWentAroundCorner: @ 81E12AC
+RustboroCity_Text_SneakyLookingManWentAroundCorner:
 	.string "Hm? A sneaky-looking man?\p"
 	.string "Come to think of it, yes, a shady-\n"
 	.string "looking guy went around the corner.$"
 
-RustboroCity_Text_HaveYouChallengedGym: @ 81E130D
+RustboroCity_Text_HaveYouChallengedGym:
 	.string "Have you taken the POKéMON GYM\n"
 	.string "challenge?\p"
 	.string "When you get that shiny GYM BADGE\n"
 	.string "in hand, I guess TRAINERS begin to\l"
 	.string "realize what is required of them.$"
 
-RustboroCity_Text_HeyThatsRustborosGymBadge: @ 81E139E
+RustboroCity_Text_HeyThatsRustborosGymBadge:
 	.string "Hey, that's RUSTBORO's GYM BADGE!\p"
 	.string "Out of all the POKéMON GYM BADGES,\n"
 	.string "RUSTBORO's is the coolest, I'd say.$"
 
-RustboroCity_Text_YoureNewAroundHere: @ 81E1407
+RustboroCity_Text_YoureNewAroundHere:
 	.string "Oh? Who might you be?\n"
 	.string "You're a new face around these parts.\p"
 	.string "Have you just transferred into the\n"
 	.string "POKéMON TRAINER'S SCHOOL?$"
 
-RustboroCity_Text_GymLeaderIsntEasyWithFire: @ 81E1480
+RustboroCity_Text_GymLeaderIsntEasyWithFire:
 	.string "I challenged the GYM LEADER, but…\p"
 	.string "It's not going to be easy winning with\n"
 	.string "my FIRE-type POKéMON…\p"
 	.string "FIRE-type POKéMON don't match up\n"
 	.string "well against ROCK-type POKéMON…$"
 
-RustboroCity_Text_MrBrineyWalksInTheTunnel: @ 81E1520
+RustboroCity_Text_MrBrineyWalksInTheTunnel:
 	.string "The old sailor MR. BRINEY lives in\n"
 	.string "a cottage by the sea.\p"
 	.string "He goes for walks in the tunnel every\n"
 	.string "so often.$"
 
-RustboroCity_Text_MrBrineyLovesPeeko: @ 81E1589
+RustboroCity_Text_MrBrineyLovesPeeko:
 	.string "The old sailor MR. BRINEY lives in\n"
 	.string "a cottage by the sea.\p"
 	.string "He said he was going shopping in\n"
@@ -1094,40 +1094,40 @@ RustboroCity_Text_MrBrineyLovesPeeko: @ 81E1589
 	.string "That old sea dog, he must really love\n"
 	.string "that PEEKO.$"
 
-RustboroCity_Text_WowYouHavePokemon: @ 81E1633
+RustboroCity_Text_WowYouHavePokemon:
 	.string "Wow, you have POKéMON with you, too.\p"
 	.string "When I get bigger, I'm going to go\n"
 	.string "places with POKéMON, too.$"
 
-RustboroCity_Text_CatchRarePokemonIfIGoToSchool: @ 81E1695
+RustboroCity_Text_CatchRarePokemonIfIGoToSchool:
 	.string "POKéMON TRAINER'S SCHOOL!\p"
 	.string "If I go to this school, will I be able\n"
 	.string "to catch rare POKéMON easily?$"
 
-RustboroCity_Text_PokemonCanChangeLookFromExp: @ 81E16F4
+RustboroCity_Text_PokemonCanChangeLookFromExp:
 	.string "If a POKéMON gains experience in\n"
 	.string "battles, it can sometimes change in\l"
 	.string "the way it looks.$"
 
-RustboroCity_Text_PokemonChangeShape: @ 81E174B
+RustboroCity_Text_PokemonChangeShape:
 	.string "A POKéMON changes shape?\n"
 	.string "If one did that, I would be shocked!$"
 
-RustboroCity_Text_TradePokemonGrowFast: @ 81E1789
+RustboroCity_Text_TradePokemonGrowFast:
 	.string "A POKéMON you get in a trade from\n"
 	.string "someone grows fast.\p"
 	.string "But if you don't have certain GYM\n"
 	.string "BADGES, it may not obey you…$"
 
-RustboroCity_Text_OutOfTheWay: @ 81E17FE
+RustboroCity_Text_OutOfTheWay:
 	.string "Get out!\n"
 	.string "Out of the way!$"
 
-RustboroCity_Text_WaitDontTakeMyGoods: @ 81E1817
+RustboroCity_Text_WaitDontTakeMyGoods:
 	.string "Wait! Pleeeaaase!\p"
 	.string "Don't take my GOODS!$"
 
-RustboroCity_Text_HelpMeIWasRobbed: @ 81E183E
+RustboroCity_Text_HelpMeIWasRobbed:
 	.string "Oh, it's you!\p"
 	.string "You're that fantastic TRAINER who\n"
 	.string "helped me in PETALBURG WOODS!\p"
@@ -1136,11 +1136,11 @@ RustboroCity_Text_HelpMeIWasRobbed: @ 81E183E
 	.string "If I don't…\n"
 	.string "I'm going to be in serious trouble.$"
 
-RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel: @ 81E1904
+RustboroCity_Text_ShadyCharacterTookOffTowardsTunnel:
 	.string "That shady character, I think he took\n"
 	.string "off towards the tunnel over there.$"
 
-RustboroCity_Text_YouGotItThankYou: @ 81E194D
+RustboroCity_Text_YouGotItThankYou:
 	.string "Oh! How did it go?\n"
 	.string "The DEVON GOODS?\p"
 	.string "You did!\n"
@@ -1149,15 +1149,15 @@ RustboroCity_Text_YouGotItThankYou: @ 81E194D
 	.string "I know! As my thanks, I'll give you\n"
 	.string "another GREAT BALL!$"
 
-RustboroCity_Text_YoureLoadedWithItems: @ 81E19E5
+RustboroCity_Text_YoureLoadedWithItems:
 	.string "You're loaded with items.\n"
 	.string "I can't give you this GREAT BALL.$"
 
-RustboroCity_Text_PleaseComeWithMe: @ 81E1A21
+RustboroCity_Text_PleaseComeWithMe:
 	.string "Excuse me, please!\n"
 	.string "Please come with me!$"
 
-RustboroCity_Text_MayHiLetsRegister: @ 81E1A49
+RustboroCity_Text_MayHiLetsRegister:
 	.string "MAY: Oh, hi, {PLAYER}{KUN}!\p"
 	.string "You had a MATCH CALL feature put\n"
 	.string "on your POKéNAV!\p"
@@ -1165,11 +1165,11 @@ RustboroCity_Text_MayHiLetsRegister: @ 81E1A49
 	.string "contact one another anytime!\p"
 	.string "… … … … … …$"
 
-RustboroCity_Text_RegisteredMay: @ 81E1ADB
+RustboroCity_Text_RegisteredMay:
 	.string "Registered MAY\n"
 	.string "in the POKéNAV.$"
 
-RustboroCity_Text_MayPassedBrineyWantToBattle: @ 81E1AFA
+RustboroCity_Text_MayPassedBrineyWantToBattle:
 	.string "MAY: Oh, by the way, I passed\n"
 	.string "MR. BRINEY in PETALBURG WOODS.\p"
 	.string "I guess he's on his way home to his\n"
@@ -1179,32 +1179,32 @@ RustboroCity_Text_MayPassedBrineyWantToBattle: @ 81E1AFA
 	.string "So…\n"
 	.string "How about a little battle?$"
 
-RustboroCity_Text_MayOhHaventRaisedPokemonEnough: @ 81E1BD3
+RustboroCity_Text_MayOhHaventRaisedPokemonEnough:
 	.string "MAY: Oh, what's the matter?\p"
 	.string "Haven't you caught or raised your\n"
 	.string "POKéMON very much?\p"
 	.string "That's not very good for a TRAINER!$"
 
-RustboroCity_Text_MayWantToBattle: @ 81E1C48
+RustboroCity_Text_MayWantToBattle:
 	.string "MAY: So, what do you think?\n"
 	.string "How about a little battle here?$"
 
-RustboroCity_Text_MayImNotGoingToLose: @ 81E1C84
+RustboroCity_Text_MayImNotGoingToLose:
 	.string "MAY: You just became a TRAINER,\n"
 	.string "{PLAYER}{KUN}. I'm not going to lose!$"
 
-RustboroCity_Text_MayDefeat: @ 81E1CC1
+RustboroCity_Text_MayDefeat:
 	.string "Yikes!\n"
 	.string "You're better than I expected!$"
 
-RustboroCity_Text_MayMrBrineyHint: @ 81E1CE7
+RustboroCity_Text_MayMrBrineyHint:
 	.string "MAY: Oh, by the way, MR. BRINEY, who\n"
 	.string "I just passed…\p"
 	.string "{PLAYER}{KUN}, you just moved here so you\n"
 	.string "might not know this, but MR. BRINEY\l"
 	.string "was once a revered seafarer.$"
 
-RustboroCity_Text_BrendanHiLetsRegister: @ 81E1D7D
+RustboroCity_Text_BrendanHiLetsRegister:
 	.string "BRENDAN: Oh, hey, {PLAYER}!\p"
 	.string "You had a MATCH CALL feature put\n"
 	.string "on your POKéNAV! Cool!\p"
@@ -1212,11 +1212,11 @@ RustboroCity_Text_BrendanHiLetsRegister: @ 81E1D7D
 	.string "get in touch anytime!\p"
 	.string "… … … … … …$"
 
-RustboroCity_Text_RegisteredBrendan: @ 81E1E11
+RustboroCity_Text_RegisteredBrendan:
 	.string "Registered BRENDAN\n"
 	.string "in the POKéNAV.$"
 
-RustboroCity_Text_BrendanPassedBrineyWantToBattle: @ 81E1E34
+RustboroCity_Text_BrendanPassedBrineyWantToBattle:
 	.string "BRENDAN: By the way, {PLAYER}, I walked\n"
 	.string "by MR. BRINEY in PETALBURG WOODS.\p"
 	.string "I bet he was on his way home to his\n"
@@ -1227,72 +1227,72 @@ RustboroCity_Text_BrendanPassedBrineyWantToBattle: @ 81E1E34
 	.string "Want to have a battle to test how\n"
 	.string "far you've progressed?$"
 
-RustboroCity_Text_BrendanNoConfidenceInPokemon: @ 81E1F2F
+RustboroCity_Text_BrendanNoConfidenceInPokemon:
 	.string "BRENDAN: What's the matter? Don't have\n"
 	.string "any confidence in your POKéMON?$"
 
-RustboroCity_Text_BrendanWantToBattle: @ 81E1F76
+RustboroCity_Text_BrendanWantToBattle:
 	.string "BRENDAN: What's up?\n"
 	.string "Want to have a battle with me?$"
 
-RustboroCity_Text_BrendanIWontGoEasy: @ 81E1FA9
+RustboroCity_Text_BrendanIWontGoEasy:
 	.string "BRENDAN: I know you just became\n"
 	.string "a TRAINER, but I won't go easy!$"
 
-RustboroCity_Text_BrendanDefeat: @ 81E1FE9
+RustboroCity_Text_BrendanDefeat:
 	.string "Hmm…\n"
 	.string "You're pretty good.$"
 
-RustboroCity_Text_BrendanMrBrineyHint: @ 81E2002
+RustboroCity_Text_BrendanMrBrineyHint:
 	.string "BRENDAN: By the way, you know\n"
 	.string "MR. BRINEY? The guy I just passed?\p"
 	.string "I bet you didn't know this, since you\n"
 	.string "just moved here, {PLAYER}, but\l"
 	.string "MR. BRINEY was once a great sailor.$"
 
-RustboroCity_Text_TunnelNearingCompletion: @ 81E20A6
+RustboroCity_Text_TunnelNearingCompletion:
 	.string "“Timesaving tunnel nearing\n"
 	.string "completion!”\p"
 	.string "…Is what it says on the sign, but\n"
 	.string "there's also a big “X” splashed\l"
 	.string "across it in red paint…$"
 
-RustboroCity_Text_DevonCorpSign: @ 81E2128
+RustboroCity_Text_DevonCorpSign:
 	.string "DEVON CORPORATION\p"
 	.string "“For all your living needs, we make\n"
 	.string "it all.”$"
 
-RustboroCity_Text_GymSign: @ 81E2167
+RustboroCity_Text_GymSign:
 	.string "RUSTBORO CITY POKéMON GYM\n"
 	.string "LEADER: ROXANNE\p"
 	.string "“The ROCK-loving honors student!”$"
 
-RustboroCity_Text_DevonCorpBranchOfficeSign: @ 81E21B3
+RustboroCity_Text_DevonCorpBranchOfficeSign:
 	.string "DEVON CORP. BRANCH OFFICE\p"
 	.string "“Access limited to DEVON employees\n"
 	.string "and authorized personnel.”$"
 
-RustboroCity_Text_CitySign: @ 81E220B
+RustboroCity_Text_CitySign:
 	.string "RUSTBORO CITY\p"
 	.string "“The city probing the integration of\n"
 	.string "nature and science.”$"
 
-RustboroCity_Text_TrainersSchoolSign: @ 81E2253
+RustboroCity_Text_TrainersSchoolSign:
 	.string "POKéMON TRAINER'S SCHOOL\p"
 	.string "“We'll teach you anything about\n"
 	.string "POKéMON!”$"
 
-RustboroCity_Text_CuttersHouse: @ 81E2296
+RustboroCity_Text_CuttersHouse:
 	.string "CUTTER'S HOUSE$"
 
-RustboroCity_Text_DevelopedNewPokenavFeature: @ 81E22A5
+RustboroCity_Text_DevelopedNewPokenavFeature:
 	.string "I've been developing an added feature\n"
 	.string "for the POKéNAV…\p"
 	.string "And it turned out great!\p"
 	.string "{PLAYER}, may I see that POKéNAV?\n"
 	.string "The one our PRESIDENT gave you?$"
 
-RustboroCity_Text_AddedMatchCallPleaseCallMrStone: @ 81E2331
+RustboroCity_Text_AddedMatchCallPleaseCallMrStone:
 	.string "There you go, {PLAYER}!\p"
 	.string "I added a new feature named\n"
 	.string "MATCH CALL to your POKéNAV.\p"
@@ -1304,14 +1304,14 @@ RustboroCity_Text_AddedMatchCallPleaseCallMrStone: @ 81E2331
 	.string "Test it out.\n"
 	.string "Please give our PRESIDENT a call.$"
 
-RustboroCity_Text_PleaseSelectPokenav: @ 81E2449
+RustboroCity_Text_PleaseSelectPokenav:
 	.string "Please select the POKéNAV.$"
 
-RustboroCity_Text_IdBetterGetBackToWork: @ 81E2464
+RustboroCity_Text_IdBetterGetBackToWork:
 	.string "Okay, I'd better get back to work.\n"
 	.string "Please take care, {PLAYER}!$"
 
-RustboroCity_Text_YouCanHave2On2Battle: @ 81E249D
+RustboroCity_Text_YouCanHave2On2Battle:
 	.string "Did you know this?\p"
 	.string "You can have a 2-on-2 battle even\n"
 	.string "if you're not with another TRAINER.\p"
diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc
index 9ee4fc575..f1d603076 100644
--- a/data/maps/RustboroCity_CuttersHouse/scripts.inc
+++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc
@@ -1,7 +1,7 @@
-RustboroCity_CuttersHouse_MapScripts:: @ 8215BD3
+RustboroCity_CuttersHouse_MapScripts::
 	.byte 0
 
-RustboroCity_CuttersHouse_EventScript_Cutter:: @ 8215BD4
+RustboroCity_CuttersHouse_EventScript_Cutter::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_ExplainCut
@@ -12,16 +12,16 @@ RustboroCity_CuttersHouse_EventScript_Cutter:: @ 8215BD4
 	release
 	end
 
-RustboroCity_CuttersHouse_EventScript_ExplainCut:: @ 8215C00
+RustboroCity_CuttersHouse_EventScript_ExplainCut::
 	msgbox RustboroCity_CuttersHouse_Text_ExplainCut, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_CuttersHouse_EventScript_Lass:: @ 8215C0A
+RustboroCity_CuttersHouse_EventScript_Lass::
 	msgbox RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees, MSGBOX_NPC
 	end
 
-RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse: @ 8215C13
+RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse:
 	.string "That determined expression…\n"
 	.string "That limber way you move…\l"
 	.string "And your well-trained POKéMON…\p"
@@ -33,7 +33,7 @@ RustboroCity_CuttersHouse_Text_YouCanPutThisHMToGoodUse: @ 8215C13
 	.string "No need to be modest or shy.\n"
 	.string "Go on, take it!$"
 
-RustboroCity_CuttersHouse_Text_ExplainCut: @ 8215D33
+RustboroCity_CuttersHouse_Text_ExplainCut:
 	.string "That HIDDEN MACHINE, or HM for\n"
 	.string "short, is CUT.\p"
 	.string "An HM move is one that can be used\n"
@@ -44,7 +44,7 @@ RustboroCity_CuttersHouse_Text_ExplainCut: @ 8215D33
 	.string "And, unlike a TM, an HM can be used\n"
 	.string "more than once.$"
 
-RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees: @ 8215E39
+RustboroCity_CuttersHouse_Text_DadHelpedClearLandOfTrees:
 	.string "When they were expanding the city of\n"
 	.string "RUSTBORO, my dad helped out.\p"
 	.string "He made his POKéMON use CUT to clear\n"
diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
index 80e8f3cf1..11953d338 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
@@ -1,19 +1,19 @@
 .set LOCALID_STAIR_GUARD, 2
 
-RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245
+RustboroCity_DevonCorp_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_1F_OnTransition
 	.byte 0
 
-RustboroCity_DevonCorp_1F_OnTransition: @ 821124B
+RustboroCity_DevonCorp_1F_OnTransition:
 	call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_BlockStairs
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_BlockStairs:: @ 8211255
+RustboroCity_DevonCorp_1F_EventScript_BlockStairs::
 	setobjectxyperm LOCALID_STAIR_GUARD, 14, 2
 	setobjectmovementtype LOCALID_STAIR_GUARD, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-RustboroCity_DevonCorp_1F_EventScript_Employee:: @ 8211261
+RustboroCity_DevonCorp_1F_EventScript_Employee::
 	lock
 	faceplayer
 	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered
@@ -22,17 +22,17 @@ RustboroCity_DevonCorp_1F_EventScript_Employee:: @ 8211261
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright:: @ 821127F
+RustboroCity_DevonCorp_1F_EventScript_RobberWasntBright::
 	msgbox RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered:: @ 8211289
+RustboroCity_DevonCorp_1F_EventScript_GoodsRecovered::
 	msgbox RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_StairGuard:: @ 8211293
+RustboroCity_DevonCorp_1F_EventScript_StairGuard::
 	lock
 	faceplayer
 	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome
@@ -42,17 +42,17 @@ RustboroCity_DevonCorp_1F_EventScript_StairGuard:: @ 8211293
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome:: @ 82112BA
+RustboroCity_DevonCorp_1F_EventScript_AlwaysWelcome::
 	msgbox RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_GotRobbed:: @ 82112C4
+RustboroCity_DevonCorp_1F_EventScript_GotRobbed::
 	msgbox RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_Greeter:: @ 82112CE
+RustboroCity_DevonCorp_1F_EventScript_Greeter::
 	lock
 	faceplayer
 	goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp
@@ -62,64 +62,64 @@ RustboroCity_DevonCorp_1F_EventScript_Greeter:: @ 82112CE
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp:: @ 82112F5
+RustboroCity_DevonCorp_1F_EventScript_WelcomeToDevonCorp::
 	msgbox RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed:: @ 82112FF
+RustboroCity_DevonCorp_1F_EventScript_StaffGotRobbed::
 	msgbox RustboroCity_DevonCorp_1F_Text_StaffGotRobbed, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay:: @ 8211309
+RustboroCity_DevonCorp_1F_EventScript_RocksMetalDisplay::
 	msgbox RustboroCity_DevonCorp_1F_Text_RocksMetalDisplay, MSGBOX_SIGN
 	end
 
-RustboroCity_DevonCorp_1F_EventScript_ProductsDisplay:: @ 8211312
+RustboroCity_DevonCorp_1F_EventScript_ProductsDisplay::
 	msgbox RustboroCity_DevonCorp_1F_Text_ProductDisplay, MSGBOX_SIGN
 	end
 
-RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp: @ 821131B
+RustboroCity_DevonCorp_1F_Text_WelcomeToDevonCorp:
 	.string "Hello and welcome to the DEVON\n"
 	.string "CORPORATION.\p"
 	.string "We're proud producers of items and\n"
 	.string "medicine that enhance your life.$"
 
-RustboroCity_DevonCorp_1F_Text_StaffGotRobbed: @ 821138B
+RustboroCity_DevonCorp_1F_Text_StaffGotRobbed:
 	.string "One of our research staff stupidly\n"
 	.string "got robbed of an important parcel.$"
 
-RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct: @ 82113D1
+RustboroCity_DevonCorp_1F_Text_ThoseShoesAreOurProduct:
 	.string "Hey, those RUNNING SHOES!\n"
 	.string "They're one of our products!\p"
 	.string "It makes me happy when I see someone\n"
 	.string "using something we made.$"
 
-RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright: @ 8211446
+RustboroCity_DevonCorp_1F_Text_RobberWasntVeryBright:
 	.string "That stolen parcel…\p"
 	.string "Well, sure it's important, but it's not\n"
 	.string "anything that anyone can use.\p"
 	.string "In my estimation, that robber must not\n"
 	.string "have been very bright.$"
 
-RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered: @ 82114DE
+RustboroCity_DevonCorp_1F_Text_SoundsLikeStolenGoodsRecovered:
 	.string "It sounds like they've recovered\n"
 	.string "the ripped-off DEVON GOODS.$"
 
-RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter: @ 821151B
+RustboroCity_DevonCorp_1F_Text_OnlyAuthorizedPeopleEnter:
 	.string "I'm sorry, only authorized people\n"
 	.string "are allowed to enter here.$"
 
-RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed: @ 8211558
+RustboroCity_DevonCorp_1F_Text_HowCouldWeGetRobbed:
 	.string "It's beyond stupid.\n"
 	.string "How could we get robbed?$"
 
-RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere: @ 8211585
+RustboroCity_DevonCorp_1F_Text_YoureAlwaysWelcomeHere:
 	.string "Hi, there!\n"
 	.string "You're always welcome here!$"
 
-RustboroCity_DevonCorp_1F_Text_RocksMetalDisplay: @ 82115AC
+RustboroCity_DevonCorp_1F_Text_RocksMetalDisplay:
 	.string "Samples of rocks and metal are\n"
 	.string "displayed in the glass case.\p"
 	.string "There's a panel with some writing\n"
@@ -133,7 +133,7 @@ RustboroCity_DevonCorp_1F_Text_RocksMetalDisplay: @ 82115AC
 	.string "“DEVON is now a manufacturer of a wide\n"
 	.string "range of industrial products.”$"
 
-RustboroCity_DevonCorp_1F_Text_ProductDisplay: @ 8211722
+RustboroCity_DevonCorp_1F_Text_ProductDisplay:
 	.string "Prototypes and test products fill\n"
 	.string "the glass display case.\p"
 	.string "There's a panel with a description…\p"
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
index 03396cc8f..326cd946e 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -1,19 +1,19 @@
 .set LOCALID_FOSSIL_SCIENTIST, 5
 
-RustboroCity_DevonCorp_2F_MapScripts:: @ 8211857
+RustboroCity_DevonCorp_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_2F_OnTransition
 	.byte 0
 
-RustboroCity_DevonCorp_2F_OnTransition: @ 821185D
+RustboroCity_DevonCorp_2F_OnTransition:
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
 	call_if_eq RustboroCity_DevonCorp_2F_EventScript_SetFossilReady
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_SetFossilReady:: @ 8211869
+RustboroCity_DevonCorp_2F_EventScript_SetFossilReady::
 	setvar VAR_FOSSIL_RESURRECTION_STATE, 2
 	return
 
-RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist:: @ 821186F
+RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist::
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
@@ -22,7 +22,7 @@ RustboroCity_DevonCorp_2F_EventScript_TalkToPokemonScientist:: @ 821186F
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_BallScientist:: @ 8211886
+RustboroCity_DevonCorp_2F_EventScript_BallScientist::
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
@@ -32,12 +32,12 @@ RustboroCity_DevonCorp_2F_EventScript_BallScientist:: @ 8211886
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls:: @ 82118A6
+RustboroCity_DevonCorp_2F_EventScript_DevelopedBalls::
 	msgbox RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_PokenavScientist:: @ 82118B0
+RustboroCity_DevonCorp_2F_EventScript_PokenavScientist::
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
@@ -47,12 +47,12 @@ RustboroCity_DevonCorp_2F_EventScript_PokenavScientist:: @ 82118B0
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_HasPokenav:: @ 82118D0
+RustboroCity_DevonCorp_2F_EventScript_HasPokenav::
 	msgbox RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist:: @ 82118DA
+RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist::
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
@@ -61,7 +61,7 @@ RustboroCity_DevonCorp_2F_EventScript_PokemonDreamsScientist:: @ 82118DA
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_FossilScientist:: @ 82118F1
+RustboroCity_DevonCorp_2F_EventScript_FossilScientist::
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 2
@@ -79,7 +79,7 @@ RustboroCity_DevonCorp_2F_EventScript_FossilScientist:: @ 82118F1
 	end
 
 @ This whole section has needless duplication and could be condensed considerably
-RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil:: @ 8211933
+RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil::
 	closemessage
 	playse SE_PIN
 	applymovement LOCALID_FOSSIL_SCIENTIST, Common_Movement_ExclamationMark
@@ -95,7 +95,7 @@ RustboroCity_DevonCorp_2F_EventScript_NoticeRootFossil:: @ 8211933
 	goto RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil:: @ 8211974
+RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil::
 	bufferitemname 0, ITEM_ROOT_FOSSIL
 	msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT
 	removeitem ITEM_ROOT_FOSSIL
@@ -104,7 +104,7 @@ RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil:: @ 8211974
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil:: @ 8211991
+RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil::
 	closemessage
 	playse SE_PIN
 	applymovement LOCALID_FOSSIL_SCIENTIST, Common_Movement_ExclamationMark
@@ -120,7 +120,7 @@ RustboroCity_DevonCorp_2F_EventScript_NoticeClawFossil:: @ 8211991
 	goto RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil:: @ 82119D2
+RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil::
 	bufferitemname 0, ITEM_CLAW_FOSSIL
 	msgbox RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher, MSGBOX_DEFAULT
 	removeitem ITEM_CLAW_FOSSIL
@@ -129,36 +129,36 @@ RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil:: @ 82119D2
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil:: @ 82119EF
+RustboroCity_DevonCorp_2F_EventScript_DeclineGiveFossil::
 	msgbox RustboroCity_DevonCorp_2F_Text_OhIsThatSo, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_StillRegenerating:: @ 82119F9
+RustboroCity_DevonCorp_2F_EventScript_StillRegenerating::
 	msgbox RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_FossilMonReady:: @ 8211A03
+RustboroCity_DevonCorp_2F_EventScript_FossilMonReady::
 	compare VAR_WHICH_FOSSIL_REVIVED, 1
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_LileepReady
 	compare VAR_WHICH_FOSSIL_REVIVED, 2
 	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_AnorithReady
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_LileepReady:: @ 8211A1A
+RustboroCity_DevonCorp_2F_EventScript_LileepReady::
 	bufferspeciesname 1, SPECIES_LILEEP
 	msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT
 	goto RustboroCity_DevonCorp_2F_EventScript_ReceiveLileep
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_AnorithReady:: @ 8211A2C
+RustboroCity_DevonCorp_2F_EventScript_AnorithReady::
 	bufferspeciesname 1, SPECIES_ANORITH
 	msgbox RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife, MSGBOX_DEFAULT
 	goto RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorith
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ReceiveLileep:: @ 8211A3E
+RustboroCity_DevonCorp_2F_EventScript_ReceiveLileep::
 	setvar VAR_TEMP_1, SPECIES_LILEEP
 	givemon SPECIES_LILEEP, 20, ITEM_NONE
 	compare VAR_RESULT, 0
@@ -168,7 +168,7 @@ RustboroCity_DevonCorp_2F_EventScript_ReceiveLileep:: @ 8211A3E
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepParty:: @ 8211A6E
+RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepParty::
 	call RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -178,7 +178,7 @@ RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepParty:: @ 8211A6E
 	goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepPC:: @ 8211A96
+RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepPC::
 	call RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -187,12 +187,12 @@ RustboroCity_DevonCorp_2F_EventScript_ReceiveLileepPC:: @ 8211A96
 	goto RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC:: @ 8211AB9
+RustboroCity_DevonCorp_2F_EventScript_TransferLileepToPC::
 	call Common_EventScript_TransferredToPC
 	goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare:: @ 8211AC4
+RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare::
 	bufferspeciesname 1, SPECIES_LILEEP
 	playfanfare MUS_OBTAIN_ITEM
 	message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher
@@ -201,13 +201,13 @@ RustboroCity_DevonCorp_2F_EventScript_ReceivedLileepFanfare:: @ 8211AC4
 	bufferspeciesname 0, SPECIES_LILEEP
 	return
 
-RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep:: @ 8211AD7
+RustboroCity_DevonCorp_2F_EventScript_FinishReceivingLileep::
 	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
 	setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorith:: @ 8211AE1
+RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorith::
 	setvar VAR_TEMP_1, SPECIES_ANORITH
 	givemon SPECIES_ANORITH, 20, ITEM_NONE
 	compare VAR_RESULT, 0
@@ -217,7 +217,7 @@ RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorith:: @ 8211AE1
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithParty:: @ 8211B11
+RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithParty::
 	call RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -227,7 +227,7 @@ RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithParty:: @ 8211B11
 	goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithPC:: @ 8211B39
+RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithPC::
 	call RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -236,12 +236,12 @@ RustboroCity_DevonCorp_2F_EventScript_ReceiveAnorithPC:: @ 8211B39
 	goto RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC:: @ 8211B5C
+RustboroCity_DevonCorp_2F_EventScript_TransferAnorithToPC::
 	call Common_EventScript_TransferredToPC
 	goto RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare:: @ 8211B67
+RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare::
 	bufferspeciesname 1, SPECIES_ANORITH
 	playfanfare MUS_OBTAIN_ITEM
 	message RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher
@@ -250,13 +250,13 @@ RustboroCity_DevonCorp_2F_EventScript_ReceivedAnorithFanfare:: @ 8211B67
 	bufferspeciesname 0, SPECIES_ANORITH
 	return
 
-RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith:: @ 8211B7A
+RustboroCity_DevonCorp_2F_EventScript_FinishReceivingAnorith::
 	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
 	setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ChooseFossil:: @ 8211B84
+RustboroCity_DevonCorp_2F_EventScript_ChooseFossil::
 	message RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne
 	waitmessage
 	multichoice 17, 6, MULTI_FOSSIL, FALSE
@@ -267,19 +267,19 @@ RustboroCity_DevonCorp_2F_EventScript_ChooseFossil:: @ 8211B84
 	case MULTI_B_PRESSED, RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ChooseClawFossil:: @ 8211BC1
+RustboroCity_DevonCorp_2F_EventScript_ChooseClawFossil::
 	goto RustboroCity_DevonCorp_2F_EventScript_GiveClawFossil
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_ChooseRootFossil:: @ 8211BC7
+RustboroCity_DevonCorp_2F_EventScript_ChooseRootFossil::
 	goto RustboroCity_DevonCorp_2F_EventScript_GiveRootFossil
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect:: @ 8211BCD
+RustboroCity_DevonCorp_2F_EventScript_CancelFossilSelect::
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_MatchCallScientist:: @ 8211BCF
+RustboroCity_DevonCorp_2F_EventScript_MatchCallScientist::
 	lock
 	faceplayer
 	compare VAR_FOSSIL_RESURRECTION_STATE, 1
@@ -290,22 +290,22 @@ RustboroCity_DevonCorp_2F_EventScript_MatchCallScientist:: @ 8211BCF
 	release
 	end
 
-RustboroCity_DevonCorp_2F_EventScript_WorkOnNext:: @ 8211BF1
+RustboroCity_DevonCorp_2F_EventScript_WorkOnNext::
 	msgbox RustboroCity_DevonCorp_2F_Text_WhatToWorkOnNext, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon: @ 8211BFB
+RustboroCity_DevonCorp_2F_Text_DeviceForTalkingToPokemon:
 	.string "We're developing a device for talking\n"
 	.string "with POKéMON.\p"
 	.string "But we haven't had much success…$"
 
-RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls: @ 8211C50
+RustboroCity_DevonCorp_2F_Text_DevelopingNewBalls:
 	.string "I'm developing new kinds of\n"
 	.string "POKé BALLS…\p"
 	.string "But I haven't made much headway…$"
 
-RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls: @ 8211C99
+RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls:
 	.string "We finally made new kinds of\n"
 	.string "POKé BALLS!\p"
 	.string "The REPEAT BALL makes it easier to\n"
@@ -316,12 +316,12 @@ RustboroCity_DevonCorp_2F_Text_WeFinallyMadeNewBalls: @ 8211C99
 	.string "the DEVON CORPORATION.\p"
 	.string "Please give them a try!$"
 
-RustboroCity_DevonCorp_2F_Text_IMadePokenav: @ 8211D9F
+RustboroCity_DevonCorp_2F_Text_IMadePokenav:
 	.string "I made the POKéNAV!\p"
 	.string "As an engineer, I feel blessed to have\n"
 	.string "made something so great!$"
 
-RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav: @ 8211DF3
+RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav:
 	.string "Oh, wow!\n"
 	.string "That's a POKéNAV!\p"
 	.string "It came about as a result of our\n"
@@ -332,18 +332,18 @@ RustboroCity_DevonCorp_2F_Text_WowThatsAPokenav: @ 8211DF3
 	.string "No, no. I think you'll find out just by\n"
 	.string "trying the POKéNAV out.$"
 
-RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams: @ 8211EE0
+RustboroCity_DevonCorp_2F_Text_DeviceToVisualizePokemonDreams:
 	.string "I'm trying to develop a device that\n"
 	.string "visually reproduces the dreams of\l"
 	.string "POKéMON…\p"
 	.string "But it's not going well.$"
 
-RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils: @ 8211F48
+RustboroCity_DevonCorp_2F_Text_DevelopDeviceToResurrectFossils:
 	.string "I've been trying to develop a device\n"
 	.string "that resurrects POKéMON from fossils…\p"
 	.string "And, it's working!$"
 
-RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife: @ 8211FA6
+RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife:
 	.string "Wait! That thing you have there…\n"
 	.string "Is that a POKéMON fossil?\p"
 	.string "Would you like to bring that POKéMON\n"
@@ -351,12 +351,12 @@ RustboroCity_DevonCorp_2F_Text_WantToBringFossilBackToLife: @ 8211FA6
 	.string "I can with my newly developed\n"
 	.string "FOSSIL REGENERATOR.$"
 
-RustboroCity_DevonCorp_2F_Text_OhIsThatSo: @ 8212046
+RustboroCity_DevonCorp_2F_Text_OhIsThatSo:
 	.string "Oh, is that so?\p"
 	.string "DEVON's technological expertise\n"
 	.string "is outstanding, I tell you.$"
 
-RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne: @ 8212092
+RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne:
 	.string "Oh, now that's a surprise!\n"
 	.string "You have not one, but two, fossils?\p"
 	.string "Unfortunately, my machine can only\n"
@@ -364,13 +364,13 @@ RustboroCity_DevonCorp_2F_Text_TwoFossilsPickOne: @ 8212092
 	.string "Would you like to pick one of your\n"
 	.string "fossils for regeneration?$"
 
-RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher: @ 8212153
+RustboroCity_DevonCorp_2F_Text_HandedFossilToResearcher:
 	.string "Excellent!\n"
 	.string "Let's do this right away.\p"
 	.string "{PLAYER} handed the {STR_VAR_1} to\n"
 	.string "the DEVON RESEARCHER.$"
 
-RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime: @ 82121A2
+RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime:
 	.string "The FOSSIL REGENERATOR, which I made,\n"
 	.string "is incredible.\p"
 	.string "But it has one drawback--it takes\n"
@@ -378,28 +378,28 @@ RustboroCity_DevonCorp_2F_Text_FossilRegeneratorTakesTime: @ 82121A2
 	.string "So, uh… How about you go for a stroll\n"
 	.string "and look around for a while?$"
 
-RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife: @ 8212251
+RustboroCity_DevonCorp_2F_Text_FossilizedMonBroughtBackToLife:
 	.string "Thanks for waiting!\p"
 	.string "Your fossilized POKéMON has been\n"
 	.string "brought back to life!\p"
 	.string "The fossil was an ancient POKéMON.\n"
 	.string "{STR_VAR_2}, it was!$"
 
-RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher: @ 82122CB
+RustboroCity_DevonCorp_2F_Text_ReceivedMonFromResearcher:
 	.string "{PLAYER} received {STR_VAR_2} from\n"
 	.string "the DEVON RESEARCHER.$"
 
 @ Unused
-RustboroCity_DevonCorp_2F_Text_TooManyPokemon: @ 82122F5
+RustboroCity_DevonCorp_2F_Text_TooManyPokemon:
 	.string "Uh-oh, you've got too many POKéMON.\n"
 	.string "You have no room for this one.$"
 
-RustboroCity_DevonCorp_2F_Text_DevelopNewPokenavFeature: @ 8212338
+RustboroCity_DevonCorp_2F_Text_DevelopNewPokenavFeature:
 	.string "I'm trying to develop a new feature\n"
 	.string "for the POKéNAV…\p"
 	.string "But it's not going well.$"
 
-RustboroCity_DevonCorp_2F_Text_WhatToWorkOnNext: @ 8212386
+RustboroCity_DevonCorp_2F_Text_WhatToWorkOnNext:
 	.string "Well, now what shall I work on\n"
 	.string "developing next?\p"
 	.string "Our company allows us to make our\n"
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
index 9d4c69cd9..cfd670998 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -1,34 +1,34 @@
 .set LOCALID_DEVON_EMPLOYEE, 2
 
-RustboroCity_DevonCorp_3F_MapScripts:: @ 821242D
+RustboroCity_DevonCorp_3F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_DevonCorp_3F_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, RustboroCity_DevonCorp_3F_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, RustboroCity_DevonCorp_3F_OnFrame
 	.byte 0
 
-RustboroCity_DevonCorp_3F_OnTransition: @ 821243D
+RustboroCity_DevonCorp_3F_OnTransition:
 	compare VAR_DEVON_CORP_3F_STATE, 0
 	call_if_eq RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos:: @ 8212449
+RustboroCity_DevonCorp_3F_EventScript_SetEmployeePos::
 	setobjectxyperm LOCALID_DEVON_EMPLOYEE, 3, 2
 	setobjectmovementtype LOCALID_DEVON_EMPLOYEE, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-RustboroCity_DevonCorp_3F_OnWarp: @ 8212455
+RustboroCity_DevonCorp_3F_OnWarp:
 	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast
 	.2byte 0
 
-RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast:: @ 821245F
+RustboroCity_DevonCorp_3F_EventScript_PlayerFaceEast::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_EAST
 	end
 
-RustboroCity_DevonCorp_3F_OnFrame: @ 8212464
+RustboroCity_DevonCorp_3F_OnFrame:
 	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_MeetPresident
 	.2byte 0
 
-RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
+RustboroCity_DevonCorp_3F_EventScript_MeetPresident::
 	lockall
 	msgbox RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere, MSGBOX_DEFAULT
 	closemessage
@@ -74,14 +74,14 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
 	releaseall
 	end
 
-RustboroCity_DevonCorp_3F_Movement_Unused: @ 821252F
+RustboroCity_DevonCorp_3F_Movement_Unused:
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_left
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident: @ 8212534
+RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident:
 	walk_right
 	walk_right
 	walk_right
@@ -98,12 +98,12 @@ RustboroCity_DevonCorp_3F_Movement_LeadPlayerToPresident: @ 8212534
 	walk_in_place_fastest_left
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk: @ 8212543
+RustboroCity_DevonCorp_3F_Movement_EmployeeFaceDesk:
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen: @ 8212546
+RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen:
 	walk_right
 	walk_right
 	walk_right
@@ -114,7 +114,7 @@ RustboroCity_DevonCorp_3F_Movement_EmployeeWalkOffscreen: @ 8212546
 	walk_right
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer: @ 821254F
+RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer:
 	walk_left
 	walk_left
 	walk_left
@@ -125,7 +125,7 @@ RustboroCity_DevonCorp_3F_Movement_EmployeeReturnToPlayer: @ 821254F
 	walk_left
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident: @ 8212558
+RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident:
 	walk_right
 	walk_right
 	walk_right
@@ -141,7 +141,7 @@ RustboroCity_DevonCorp_3F_Movement_PlayerFollowToPresident: @ 8212558
 	walk_right
 	step_end
 
-RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk: @ 8212566
+RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk:
 	delay_16
 	delay_16
 	walk_down
@@ -149,7 +149,7 @@ RustboroCity_DevonCorp_3F_Movement_PlayerApproachDesk: @ 8212566
 	walk_in_place_fastest_right
 	step_end
 
-RustboroCity_DevonCorp_3F_EventScript_MrStone:: @ 821256C
+RustboroCity_DevonCorp_3F_EventScript_MrStone::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor
@@ -161,7 +161,7 @@ RustboroCity_DevonCorp_3F_EventScript_MrStone:: @ 821256C
 	release
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_GiveExpShare:: @ 8212595
+RustboroCity_DevonCorp_3F_EventScript_GiveExpShare::
 	msgbox RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter, MSGBOX_DEFAULT
 	giveitem ITEM_EXP_SHARE
 	compare VAR_RESULT, FALSE
@@ -174,7 +174,7 @@ RustboroCity_DevonCorp_3F_EventScript_GiveExpShare:: @ 8212595
 	release
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor:: @ 82125CC
+RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor::
 	msgbox RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
@@ -182,7 +182,7 @@ RustboroCity_DevonCorp_3F_EventScript_MrStoneAfterFavor:: @ 82125CC
 	release
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_Employee:: @ 82125E1
+RustboroCity_DevonCorp_3F_EventScript_Employee::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls
@@ -190,16 +190,16 @@ RustboroCity_DevonCorp_3F_EventScript_Employee:: @ 82125E1
 	release
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls:: @ 82125F6
+RustboroCity_DevonCorp_3F_EventScript_EmployeeBalls::
 	msgbox RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay:: @ 8212600
+RustboroCity_DevonCorp_3F_EventScript_RareRocksDisplay::
 	msgbox RustboroCity_DevonCorp_3F_Text_RareRocksDisplay, MSGBOX_SIGN
 	end
 
-RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor: @ 8212609
+RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor:
 	.string "I'm MR. STONE, the PRESIDENT of\n"
 	.string "the DEVON CORPORATION.\p"
 	.string "I'd just got word about you!\p"
@@ -214,17 +214,17 @@ RustboroCity_DevonCorp_3F_Text_MrStoneIHaveFavor: @ 8212609
 	.string "I was hoping that you'd deliver a\n"
 	.string "LETTER to STEVEN in DEWFORD.$"
 
-RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis: @ 821277C
+RustboroCity_DevonCorp_3F_Text_MrStoneWantYouToHaveThis:
 	.string "MR. STONE: Now, you should know that\n"
 	.string "I am a great PRESIDENT.\p"
 	.string "So, I'd never be so cheap as to ask\n"
 	.string "a favor for nothing in return.\p"
 	.string "That's why I want you to have this!$"
 
-RustboroCity_DevonCorp_3F_Text_ReceivedPokenav: @ 8212820
+RustboroCity_DevonCorp_3F_Text_ReceivedPokenav:
 	.string "{PLAYER} received a POKéNAV.$"
 
-RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenavRestUp: @ 8212837
+RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenavRestUp:
 	.string "MR. STONE: That device…\p"
 	.string "It's a POKéMON NAVIGATOR, or POKéNAV\n"
 	.string "for short.\p"
@@ -239,20 +239,20 @@ RustboroCity_DevonCorp_3F_Text_MrStoneExplainPokenavRestUp: @ 8212837
 	.string "I think it would be best if you rested\n"
 	.string "up before you go on your way.$"
 
-RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare: @ 82129D2
+RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare:
 	.string "MR. STONE: Well, then, {PLAYER}{KUN},\n"
 	.string "go with caution and care!$"
 
-RustboroCity_DevonCorp_3F_Text_CountingOnYou: @ 8212A09
+RustboroCity_DevonCorp_3F_Text_CountingOnYou:
 	.string "MR. STONE: I'm counting on you!$"
 
-RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter: @ 8212A29
+RustboroCity_DevonCorp_3F_Text_ThankYouForDeliveringLetter:
 	.string "MR. STONE: You delivered my LETTER?\n"
 	.string "Thank you kindly!\p"
 	.string "This is my way of thanking you.\n"
 	.string "It should help you, a TRAINER.$"
 
-RustboroCity_DevonCorp_3F_Text_ExplainExpShare: @ 8212A9E
+RustboroCity_DevonCorp_3F_Text_ExplainExpShare:
 	.string "MR. STONE: A POKéMON holding that\n"
 	.string "EXP. SHARE will be given some of the\l"
 	.string "EXP Points from battle.\p"
@@ -261,7 +261,7 @@ RustboroCity_DevonCorp_3F_Text_ExplainExpShare: @ 8212A9E
 	.string "I would say EXP. SHARE is quite useful\n"
 	.string "for raising weak POKéMON.$"
 
-RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends: @ 8212B78
+RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends:
 	.string "MR. STONE: Since my youth, I've immersed\n"
 	.string "myself in work.\p"
 	.string "Consequently, I'm not familiar with\n"
@@ -269,7 +269,7 @@ RustboroCity_DevonCorp_3F_Text_NotFamiliarWithTrends: @ 8212B78
 	.string "But do young people all want to be\n"
 	.string "TRAINERS in the POKéMON LEAGUE?$"
 
-RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere: @ 8212C37
+RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere:
 	.string "This is the DEVON CORPORATION's\n"
 	.string "third floor.\p"
 	.string "Our PRESIDENT's OFFICE is on\n"
@@ -287,24 +287,24 @@ RustboroCity_DevonCorp_3F_Text_ThisIs3rdFloorWaitHere: @ 8212C37
 	.string "Oh, that's right.\n"
 	.string "Could you wait here a second?$"
 
-RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe: @ 8212DE8
+RustboroCity_DevonCorp_3F_Text_WordWithPresidentComeWithMe:
 	.string "Our PRESIDENT would like to have\n"
 	.string "a word with you.\p"
 	.string "Please come with me.$"
 
-RustboroCity_DevonCorp_3F_Text_PleaseGoAhead: @ 8212E2F
+RustboroCity_DevonCorp_3F_Text_PleaseGoAhead:
 	.string "Please, go ahead.$"
 
-RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard: @ 8212E41
+RustboroCity_DevonCorp_3F_Text_VisitCaptSternShipyard:
 	.string "If you visit the SHIPYARD in SLATEPORT,\n"
 	.string "you should go see CAPT. STERN.$"
 
-RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular: @ 8212E88
+RustboroCity_DevonCorp_3F_Text_RepeatAndTimerHugelyPopular:
 	.string "DEVON's new products, the REPEAT BALL\n"
 	.string "and TIMER BALL, have become hugely\l"
 	.string "popular among TRAINERS.$"
 
-RustboroCity_DevonCorp_3F_Text_RareRocksDisplay: @ 8212EE9
+RustboroCity_DevonCorp_3F_Text_RareRocksDisplay:
 	.string "It's a collection of rare rocks and\n"
 	.string "stones assembled by the PRESIDENT.$"
 
diff --git a/data/maps/RustboroCity_Flat1_1F/scripts.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc
index c52c7f069..43b09a2dc 100644
--- a/data/maps/RustboroCity_Flat1_1F/scripts.inc
+++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc
@@ -1,18 +1,18 @@
-RustboroCity_Flat1_1F_MapScripts:: @ 82150CD
+RustboroCity_Flat1_1F_MapScripts::
 	.byte 0
 
-RustboroCity_Flat1_1F_EventScript_Man:: @ 82150CE
+RustboroCity_Flat1_1F_EventScript_Man::
 	msgbox RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility, MSGBOX_NPC
 	end
 
-RustboroCity_Flat1_1F_EventScript_Woman:: @ 82150D7
+RustboroCity_Flat1_1F_EventScript_Woman::
 	msgbox RustboroCity_Flat1_1F_Text_PokemonStrange, MSGBOX_NPC
 	end
 
-RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility: @ 82150E0
+RustboroCity_Flat1_1F_Text_EveryPokemonHasAbility:
 	.string "Every POKéMON has a special ability\n"
 	.string "that it can use.$"
 
-RustboroCity_Flat1_1F_Text_PokemonStrange: @ 8215115
+RustboroCity_Flat1_1F_Text_PokemonStrange:
 	.string "POKéMON are such strange creatures.$"
 
diff --git a/data/maps/RustboroCity_Flat1_2F/scripts.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc
index a1943adae..a9d24092f 100644
--- a/data/maps/RustboroCity_Flat1_2F/scripts.inc
+++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc
@@ -1,9 +1,9 @@
 .set LOCALID_WALDAS_DAD, 6
 
-RustboroCity_Flat1_2F_MapScripts:: @ 8215139
+RustboroCity_Flat1_2F_MapScripts::
 	.byte 0
 
-RustboroCity_Flat1_2F_EventScript_WaldasDad:: @ 821513A
+RustboroCity_Flat1_2F_EventScript_WaldasDad::
 	lock
 	faceplayer
 	specialvar VAR_RESULT, TryBufferWaldaPhrase
@@ -12,7 +12,7 @@ RustboroCity_Flat1_2F_EventScript_WaldasDad:: @ 821513A
 	compare VAR_RESULT, TRUE
 	goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase
 
-RustboroCity_Flat1_2F_EventScript_GivePhrase:: @ 8215157
+RustboroCity_Flat1_2F_EventScript_GivePhrase::
 	special DoWaldaNamingScreen
 	waitstate
 	compare VAR_0x8004, 1
@@ -26,38 +26,38 @@ RustboroCity_Flat1_2F_EventScript_GivePhrase:: @ 8215157
 	goto_if_eq RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase
 	end
 
-RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase:: @ 821518D
+RustboroCity_Flat1_2F_EventScript_WaldasDadFirstPhrase::
 	msgbox RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase
 	msgbox RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion, MSGBOX_DEFAULT
 	goto RustboroCity_Flat1_2F_EventScript_GivePhrase
 
-RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase:: @ 82151AD
+RustboroCity_Flat1_2F_EventScript_WaldasDadNewPhrase::
 	msgbox RustboroCity_Flat1_2F_Text_BeenSayingXDoYouKnowBetterPhrase, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase
 	msgbox RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion, MSGBOX_DEFAULT
 	goto RustboroCity_Flat1_2F_EventScript_GivePhrase
 
-RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase:: @ 82151CD
+RustboroCity_Flat1_2F_EventScript_DeclineGivePhrase::
 	msgbox RustboroCity_Flat1_2F_Text_OhIsThatRight, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat1_2F_EventScript_CancelGivePhrase:: @ 82151D7
+RustboroCity_Flat1_2F_EventScript_CancelGivePhrase::
 	msgbox RustboroCity_Flat1_2F_Text_OhYouDontKnowAny, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat1_2F_EventScript_CancelGiveFirstPhrase:: @ 82151E1
+RustboroCity_Flat1_2F_EventScript_CancelGiveFirstPhrase::
 	msgbox RustboroCity_Flat1_2F_Text_ThinkOfMyOwnPhrase, MSGBOX_DEFAULT
 	call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda
 	msgbox RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll2, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase:: @ 82151F8
+RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase::
 	msgbox RustboroCity_Flat1_2F_Text_LetsGiveItATry2, MSGBOX_DEFAULT
 	call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda
 	msgbox RustboroCity_Flat1_2F_Text_OhShesLaughing, MSGBOX_DEFAULT
@@ -67,26 +67,26 @@ RustboroCity_Flat1_2F_EventScript_WaldaLikesPhrase:: @ 82151F8
 	release
 	end
 
-RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase:: @ 8215221
+RustboroCity_Flat1_2F_EventScript_WaldaDoesntLikePhrase::
 	msgbox RustboroCity_Flat1_2F_Text_LetsGiveItATry, MSGBOX_DEFAULT
 	call RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda
 	msgbox RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda:: @ 8215238
+RustboroCity_Flat1_2F_EventScript_WaldasDadFaceWalda::
 	turnobject LOCALID_WALDAS_DAD, DIR_EAST
 	return
 
-RustboroCity_Flat1_2F_EventScript_WaldasMom:: @ 821523D
+RustboroCity_Flat1_2F_EventScript_WaldasMom::
 	msgbox RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard, MSGBOX_NPC
 	end
 
-RustboroCity_Flat1_2F_EventScript_PokeDoll:: @ 8215246
+RustboroCity_Flat1_2F_EventScript_PokeDoll::
 	msgbox RustboroCity_Flat1_2F_Text_ItsAPokemonPlushDoll, MSGBOX_SIGN
 	end
 
-RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard: @ 821524F
+RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard:
 	.string "Oh, it's so hard every day…\p"
 	.string "What's hard?\n"
 	.string "You need to ask?\p"
@@ -95,7 +95,7 @@ RustboroCity_Flat1_2F_Text_ComingUpWithMealsIsHard: @ 821524F
 	.string "It really isn't easy coming up with\n"
 	.string "meals every day.$"
 
-RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase: @ 82152FA
+RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase:
 	.string "Oh, hello!\n"
 	.string "Welcome to the PEPPER household.\p"
 	.string "I have a question for you.\n"
@@ -109,62 +109,62 @@ RustboroCity_Flat1_2F_Text_HelloDoYouKnowFunnyPhrase: @ 82152FA
 	.string "Do you know of a funny word or\n"
 	.string "phrase you can tell me?$"
 
-RustboroCity_Flat1_2F_Text_BeenSayingXDoYouKnowBetterPhrase: @ 8215448
+RustboroCity_Flat1_2F_Text_BeenSayingXDoYouKnowBetterPhrase:
 	.string "I've been saying “{STR_VAR_1}”\n"
 	.string "to amuse her lately.\p"
 	.string "Do you know of a better word or\n"
 	.string "a phrase that might work?$"
 
-RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion: @ 82154AD
+RustboroCity_Flat1_2F_Text_WonderfulLetsHearSuggestion:
 	.string "Oh, that's wonderful.\n"
 	.string "So, let's hear it, your suggestion.$"
 
-RustboroCity_Flat1_2F_Text_OhIsThatRight: @ 82154E7
+RustboroCity_Flat1_2F_Text_OhIsThatRight:
 	.string "Oh, is that right?\p"
 	.string "Well, if you come up with a good\n"
 	.string "suggestion, I'm all ears.$"
 
-RustboroCity_Flat1_2F_Text_LetsGiveItATry2: @ 8215535
+RustboroCity_Flat1_2F_Text_LetsGiveItATry2:
 	.string "Ah, I see.\n"
 	.string "Well, let's give it a try, shall we?$"
 
-RustboroCity_Flat1_2F_Text_OhShesLaughing: @ 8215565
+RustboroCity_Flat1_2F_Text_OhShesLaughing:
 	.string "{STR_VAR_1}.\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Oh, yes! She's laughing!\n"
 	.string "Oh, I am as delighted as she!$"
 
-RustboroCity_Flat1_2F_Text_LetsGiveItATry: @ 82155A4
+RustboroCity_Flat1_2F_Text_LetsGiveItATry:
 	.string "Ah, I see.\n"
 	.string "Well, let's give it a try, shall we?$"
 
-RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll: @ 82155D4
+RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll:
 	.string "{STR_VAR_1}.\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Hmmm… She's not smiling at all.\n"
 	.string "Maybe WALDA is one serious child…$"
 
-RustboroCity_Flat1_2F_Text_ThinkOfMyOwnPhrase: @ 821561E
+RustboroCity_Flat1_2F_Text_ThinkOfMyOwnPhrase:
 	.string "Oh, so you don't know any good words.\n"
 	.string "I'd better think for myself, then.\p"
 	.string "Hmm…\n"
 	.string "How about “{STR_VAR_1}”?\l"
 	.string "Let's see if that will work.$"
 
-RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll2: @ 8215699
+RustboroCity_Flat1_2F_Text_ShesNotSmilingAtAll2:
 	.string "{STR_VAR_1}.\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Hmmm… She's not smiling at all.\n"
 	.string "Maybe WALDA is one serious child…$"
 
-RustboroCity_Flat1_2F_Text_OhYouDontKnowAny: @ 82156E3
+RustboroCity_Flat1_2F_Text_OhYouDontKnowAny:
 	.string "Oh, so you don't know any good words.\n"
 	.string "I guess I'll try to amuse her with\l"
 	.string "the saying I used before.\p"
 	.string "Anyways, if you have a good suggestion,\n"
 	.string "don't hesitate in telling me, okay?$"
 
-RustboroCity_Flat1_2F_Text_ThankYouIllGiveYouWallpaper: @ 8215792
+RustboroCity_Flat1_2F_Text_ThankYouIllGiveYouWallpaper:
 	.string "Thank you!\p"
 	.string "Thanks to you, my darling WALDA\n"
 	.string "laughed for me!\p"
@@ -181,6 +181,6 @@ RustboroCity_Flat1_2F_Text_ThankYouIllGiveYouWallpaper: @ 8215792
 	.string "That will give you access to the new\n"
 	.string "wallpaper patterns.$"
 
-RustboroCity_Flat1_2F_Text_ItsAPokemonPlushDoll: @ 8215923
+RustboroCity_Flat1_2F_Text_ItsAPokemonPlushDoll:
 	.string "It's a POKéMON plush DOLL!$"
 
diff --git a/data/maps/RustboroCity_Flat2_1F/scripts.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc
index 182060955..eda27c716 100644
--- a/data/maps/RustboroCity_Flat2_1F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc
@@ -1,11 +1,11 @@
-RustboroCity_Flat2_1F_MapScripts:: @ 8215F76
+RustboroCity_Flat2_1F_MapScripts::
 	.byte 0
 
-RustboroCity_Flat2_1F_EventScript_OldWoman:: @ 8215F77
+RustboroCity_Flat2_1F_EventScript_OldWoman::
 	msgbox RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere, MSGBOX_NPC
 	end
 
-RustboroCity_Flat2_1F_EventScript_Skitty:: @ 8215F80
+RustboroCity_Flat2_1F_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
@@ -15,10 +15,10 @@ RustboroCity_Flat2_1F_EventScript_Skitty:: @ 8215F80
 	release
 	end
 
-RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere: @ 8215F93
+RustboroCity_Flat2_1F_Text_DevonWorkersLiveHere:
 	.string "DEVON CORPORATION's workers live in\n"
 	.string "this building.$"
 
-RustboroCity_Flat2_1F_Text_Skitty: @ 8215FC6
+RustboroCity_Flat2_1F_Text_Skitty:
 	.string "SKITTY: Gyaaaah!$"
 
diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc
index e7909d54b..29edb7b58 100644
--- a/data/maps/RustboroCity_Flat2_2F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc
@@ -1,11 +1,11 @@
-RustboroCity_Flat2_2F_MapScripts:: @ 8215FD7
+RustboroCity_Flat2_2F_MapScripts::
 	.byte 0
 
-RustboroCity_Flat2_2F_EventScript_OldMan:: @ 8215FD8
+RustboroCity_Flat2_2F_EventScript_OldMan::
 	msgbox RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays, MSGBOX_NPC
 	end
 
-RustboroCity_Flat2_2F_EventScript_NinjaBoy:: @ 8215FE1
+RustboroCity_Flat2_2F_EventScript_NinjaBoy::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_GavePremierBall
@@ -17,21 +17,21 @@ RustboroCity_Flat2_2F_EventScript_NinjaBoy:: @ 8215FE1
 	release
 	end
 
-RustboroCity_Flat2_2F_EventScript_GavePremierBall:: @ 8216010
+RustboroCity_Flat2_2F_EventScript_GavePremierBall::
 	msgbox RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays: @ 821601A
+RustboroCity_Flat2_2F_Text_DevonWasTinyInOldDays:
 	.string "Way back in the old days, DEVON was just\n"
 	.string "a teeny, tiny company.$"
 
-RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt: @ 821605A
+RustboroCity_Flat2_2F_Text_MyDaddyMadeThisYouCanHaveIt:
 	.string "My daddy's working at the CORPORATION.\p"
 	.string "My daddy made this!\n"
 	.string "But I can't use it, so you can have it.$"
 
-RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo: @ 82160BD
+RustboroCity_Flat2_2F_Text_GoingToWorkAtDevonToo:
 	.string "My daddy's working at the CORPORATION.\p"
 	.string "When I grow up, I'm going to work for\n"
 	.string "DEVON, too.$"
diff --git a/data/maps/RustboroCity_Flat2_3F/scripts.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc
index 8af31531d..3f644f19c 100644
--- a/data/maps/RustboroCity_Flat2_3F/scripts.inc
+++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc
@@ -1,19 +1,19 @@
-RustboroCity_Flat2_3F_MapScripts:: @ 8216116
+RustboroCity_Flat2_3F_MapScripts::
 	.byte 0
 
-RustboroCity_Flat2_3F_EventScript_DevonEmployee:: @ 8216117
+RustboroCity_Flat2_3F_EventScript_DevonEmployee::
 	msgbox RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones, MSGBOX_NPC
 	end
 
-RustboroCity_Flat2_3F_EventScript_Woman:: @ 8216120
+RustboroCity_Flat2_3F_EventScript_Woman::
 	msgbox RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones, MSGBOX_NPC
 	end
 
-RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones: @ 8216129
+RustboroCity_Flat2_3F_Text_PresidentCollectsRareStones:
 	.string "DEVON's PRESIDENT likes to collect\n"
 	.string "rare stones.$"
 
-RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones: @ 8216159
+RustboroCity_Flat2_3F_Text_PresidentsSonAlsoCollectsRareStones:
 	.string "I think the PRESIDENT's son also\n"
 	.string "collects rare stones.$"
 
diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc
index 6d9895fe5..11354fac0 100644
--- a/data/maps/RustboroCity_Gym/scripts.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
@@ -1,7 +1,7 @@
-RustboroCity_Gym_MapScripts:: @ 8212F30
+RustboroCity_Gym_MapScripts::
 	.byte 0
 
-RustboroCity_Gym_EventScript_Roxanne:: @ 8212F31
+RustboroCity_Gym_EventScript_Roxanne::
 	trainerbattle_single TRAINER_ROXANNE_1, RustboroCity_Gym_Text_RoxanneIntro, RustboroCity_Gym_Text_RoxanneDefeat, RustboroCity_Gym_EventScript_RoxanneDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -11,7 +11,7 @@ RustboroCity_Gym_EventScript_Roxanne:: @ 8212F31
 	release
 	end
 
-RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 8212F66
+RustboroCity_Gym_EventScript_RoxanneDefeated::
 	message RustboroCity_Gym_Text_ReceivedStoneBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
@@ -27,7 +27,7 @@ RustboroCity_Gym_EventScript_RoxanneDefeated:: @ 8212F66
 	goto RustboroCity_Gym_EventScript_GiveRockTomb
 	end
 
-RustboroCity_Gym_EventScript_GiveRockTomb:: @ 8212FA4
+RustboroCity_Gym_EventScript_GiveRockTomb::
 	giveitem ITEM_TM39
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -36,27 +36,27 @@ RustboroCity_Gym_EventScript_GiveRockTomb:: @ 8212FA4
 	release
 	end
 
-RustboroCity_Gym_EventScript_RoxanneRematch:: @ 8212FC8
+RustboroCity_Gym_EventScript_RoxanneRematch::
 	trainerbattle_rematch_double TRAINER_ROXANNE_1, RustboroCity_Gym_Text_RoxannePreRematch, RustboroCity_Gym_Text_RoxanneRematchDefeat, RustboroCity_Gym_Text_RoxanneRematchNeedTwoMons
 	msgbox RustboroCity_Gym_Text_RoxannePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-RustboroCity_Gym_EventScript_Josh:: @ 8212FE3
+RustboroCity_Gym_EventScript_Josh::
 	trainerbattle_single TRAINER_JOSH, RustboroCity_Gym_Text_JoshIntro, RustboroCity_Gym_Text_JoshDefeat
 	msgbox RustboroCity_Gym_Text_JoshPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RustboroCity_Gym_EventScript_Tommy:: @ 8212FFA
+RustboroCity_Gym_EventScript_Tommy::
 	trainerbattle_single TRAINER_TOMMY, RustboroCity_Gym_Text_TommyIntro, RustboroCity_Gym_Text_TommyDefeat
 	msgbox RustboroCity_Gym_Text_TommyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RustboroCity_Gym_EventScript_Marc:: @ 8213011
+RustboroCity_Gym_EventScript_Marc::
 	trainerbattle_single TRAINER_MARC, RustboroCity_Gym_Text_MarcIntro, RustboroCity_Gym_Text_MarcDefeat
 	msgbox RustboroCity_Gym_Text_MarcPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RustboroCity_Gym_EventScript_GymGuide:: @ 8213028
+RustboroCity_Gym_EventScript_GymGuide::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_GymGuidePostVictory
@@ -64,34 +64,34 @@ RustboroCity_Gym_EventScript_GymGuide:: @ 8213028
 	release
 	end
 
-RustboroCity_Gym_EventScript_GymGuidePostVictory:: @ 821303D
+RustboroCity_Gym_EventScript_GymGuidePostVictory::
 	msgbox RustboroCity_Gym_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Gym_EventScript_LeftGymStatue:: @ 8213047
+RustboroCity_Gym_EventScript_LeftGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified
 	goto RustboroCity_Gym_EventScript_GymStatue
 	end
 
-RustboroCity_Gym_EventScript_RightGymStatue:: @ 8213057
+RustboroCity_Gym_EventScript_RightGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_GymStatueCertified
 	goto RustboroCity_Gym_EventScript_GymStatue
 	end
 
-RustboroCity_Gym_EventScript_GymStatueCertified:: @ 8213067
+RustboroCity_Gym_EventScript_GymStatueCertified::
 	msgbox RustboroCity_Gym_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-RustboroCity_Gym_EventScript_GymStatue:: @ 8213071
+RustboroCity_Gym_EventScript_GymStatue::
 	msgbox RustboroCity_Gym_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-RustboroCity_Gym_EventScript_RegisterRoxanne:: @ 821307B
+RustboroCity_Gym_EventScript_RegisterRoxanne::
 	lockall
 	pokenavcall RustboroCity_Gym_Text_RoxanneRegisterCall
 	waitmessage
@@ -106,7 +106,7 @@ RustboroCity_Gym_EventScript_RegisterRoxanne:: @ 821307B
 	releaseall
 	end
 
-RustboroCity_Gym_Text_GymGuideAdvice: @ 821309D
+RustboroCity_Gym_Text_GymGuideAdvice:
 	.string "Yo, how's it going?\p"
 	.string "Listen, my friend!\n"
 	.string "Would you like to become the CHAMPION?\p"
@@ -128,7 +128,7 @@ RustboroCity_Gym_Text_GymGuideAdvice: @ 821309D
 	.string "the GYM LEADER.\p"
 	.string "Well, go for it!$"
 
-RustboroCity_Gym_Text_GymGuidePostVictory: @ 82132E2
+RustboroCity_Gym_Text_GymGuidePostVictory:
 	.string "Whoa! What a breathtaking victory!\n"
 	.string "My cheering must've worked!\p"
 	.string "Great!\n"
@@ -140,45 +140,45 @@ RustboroCity_Gym_Text_GymGuidePostVictory: @ 82132E2
 	.string "the stairs to the CHAMPIONSHIP!\p"
 	.string "That's got to feel awesome!$"
 
-RustboroCity_Gym_Text_JoshIntro: @ 82133E9
+RustboroCity_Gym_Text_JoshIntro:
 	.string "Don't take us GYM TRAINERS lightly!\n"
 	.string "I'll show you why we're better!$"
 
-RustboroCity_Gym_Text_JoshDefeat: @ 821342D
+RustboroCity_Gym_Text_JoshDefeat:
 	.string "You were too good for me…$"
 
-RustboroCity_Gym_Text_JoshPostBattle: @ 8213447
+RustboroCity_Gym_Text_JoshPostBattle:
 	.string "You haven't seen anything of the ROCK\n"
 	.string "type's terrifying power!$"
 
-RustboroCity_Gym_Text_TommyIntro: @ 8213486
+RustboroCity_Gym_Text_TommyIntro:
 	.string "If you can't beat me, you won't stand\n"
 	.string "a chance against ROXANNE!$"
 
-RustboroCity_Gym_Text_TommyDefeat: @ 82134C6
+RustboroCity_Gym_Text_TommyDefeat:
 	.string "Wow! You've got some potential!$"
 
-RustboroCity_Gym_Text_TommyPostBattle: @ 82134E6
+RustboroCity_Gym_Text_TommyPostBattle:
 	.string "ROXANNE is stronger than me by\n"
 	.string "several times.\p"
 	.string "You'd better be on your guard!$"
 
-RustboroCity_Gym_Text_MarcIntro: @ 8213533
+RustboroCity_Gym_Text_MarcIntro:
 	.string "We might be in the middle of town,\n"
 	.string "but so what?\p"
 	.string "My ROCK POKéMON need room to\n"
 	.string "rampage!$"
 
-RustboroCity_Gym_Text_MarcDefeat: @ 8213589
+RustboroCity_Gym_Text_MarcDefeat:
 	.string "Oh, man oh man!\n"
 	.string "Our challenger is one feisty customer!$"
 
-RustboroCity_Gym_Text_MarcPostBattle: @ 82135C0
+RustboroCity_Gym_Text_MarcPostBattle:
 	.string "I have to hand it to our LEADER.\p"
 	.string "It took smarts and sense for her to\n"
 	.string "pick the ROCK type at her young age.$"
 
-RustboroCity_Gym_Text_RoxanneIntro: @ 821362A
+RustboroCity_Gym_Text_RoxanneIntro:
 	.string "Hello, I am ROXANNE, the RUSTBORO\n"
 	.string "POKéMON GYM LEADER.\p"
 	.string "I became a GYM LEADER so that I might\n"
@@ -187,7 +187,7 @@ RustboroCity_Gym_Text_RoxanneIntro: @ 821362A
 	.string "Would you kindly demonstrate how you\n"
 	.string "battle, and with which POKéMON?$"
 
-RustboroCity_Gym_Text_RoxanneDefeat: @ 821370B
+RustboroCity_Gym_Text_RoxanneDefeat:
 	.string "So…\n"
 	.string "I lost…\p"
 	.string "It seems that I still have much more\n"
@@ -199,18 +199,18 @@ RustboroCity_Gym_Text_RoxanneDefeat: @ 821370B
 	.string "Please accept the official POKéMON\n"
 	.string "LEAGUE STONE BADGE.$"
 
-RustboroCity_Gym_Text_ReceivedStoneBadge: @ 82137EC
+RustboroCity_Gym_Text_ReceivedStoneBadge:
 	.string "{PLAYER} received the STONE BADGE\n"
 	.string "from ROXANNE.$"
 
-RustboroCity_Gym_Text_StoneBadgeInfoTakeThis: @ 8213816
+RustboroCity_Gym_Text_StoneBadgeInfoTakeThis:
 	.string "The STONE BADGE heightens the ATTACK\n"
 	.string "power of your POKéMON.\p"
 	.string "It also enables them to use the HM move\n"
 	.string "CUT outside of battle.\p"
 	.string "Please take this with you, too.$"
 
-RustboroCity_Gym_Text_ExplainRockTomb: @ 82138B1
+RustboroCity_Gym_Text_ExplainRockTomb:
 	.string "That TECHNICAL MACHINE, TM39,\n"
 	.string "contains ROCK TOMB.\p"
 	.string "It not only inflicts damage by dropping\n"
@@ -220,21 +220,21 @@ RustboroCity_Gym_Text_ExplainRockTomb: @ 82138B1
 	.string "Remember, a TM can be used only once,\n"
 	.string "so think before you use it.$"
 
-RustboroCity_Gym_Text_RoxannePostBattle: @ 82139A7
+RustboroCity_Gym_Text_RoxannePostBattle:
 	.string "Since you are so strong, you should\n"
 	.string "challenge other GYM LEADERS.\p"
 	.string "By battling many TRAINERS, you should\n"
 	.string "learn many things.$"
 
-RustboroCity_Gym_Text_GymStatue: @ 8213A21
+RustboroCity_Gym_Text_GymStatue:
 	.string "RUSTBORO CITY POKéMON GYM$"
 
-RustboroCity_Gym_Text_GymStatueCertified: @ 8213A3B
+RustboroCity_Gym_Text_GymStatueCertified:
 	.string "RUSTBORO CITY POKéMON GYM\p"
 	.string "ROXANNE'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-RustboroCity_Gym_Text_RoxanneRegisterCall: @ 8213A76
+RustboroCity_Gym_Text_RoxanneRegisterCall:
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "ROXANNE: Oh, hello, {PLAYER}?\n"
@@ -251,11 +251,11 @@ RustboroCity_Gym_Text_RoxanneRegisterCall: @ 8213A76
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-RustboroCity_Gym_Text_RegisteredRoxanne: @ 8213C01
+RustboroCity_Gym_Text_RegisteredRoxanne:
 	.string "Registered GYM LEADER ROXANNE\n"
 	.string "in the POKéNAV.$"
 
-RustboroCity_Gym_Text_RoxannePreRematch: @ 8213C2F
+RustboroCity_Gym_Text_RoxannePreRematch:
 	.string "ROXANNE: I'm so glad to see you again.\n"
 	.string "I'm ROXANNE, the GYM LEADER here.\p"
 	.string "I'm sure we've both experienced many\n"
@@ -263,17 +263,17 @@ RustboroCity_Gym_Text_RoxannePreRematch: @ 8213C2F
 	.string "I would like to see how much better\n"
 	.string "we've become. Let us battle!$"
 
-RustboroCity_Gym_Text_RoxanneRematchDefeat: @ 8213CF9
+RustboroCity_Gym_Text_RoxanneRematchDefeat:
 	.string "Grr…\n"
 	.string "Again, I have lost…$"
 
-RustboroCity_Gym_Text_RoxannePostRematch: @ 8213D12
+RustboroCity_Gym_Text_RoxannePostRematch:
 	.string "ROXANNE: I still have much to learn\n"
 	.string "when it comes to battling POKéMON.\p"
 	.string "That awareness makes me love battling\n"
 	.string "all that much more!$"
 
-RustboroCity_Gym_Text_RoxanneRematchNeedTwoMons: @ 8213D93
+RustboroCity_Gym_Text_RoxanneRematchNeedTwoMons:
 	.string "ROXANNE: I'm so glad to see you again.\n"
 	.string "I'm ROXANNE, the GYM LEADER here.\p"
 	.string "I'm sure we've both experienced many\n"
diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc
index cf1cec610..0b7de48bc 100644
--- a/data/maps/RustboroCity_House1/scripts.inc
+++ b/data/maps/RustboroCity_House1/scripts.inc
@@ -1,7 +1,7 @@
-RustboroCity_House1_MapScripts:: @ 821593E
+RustboroCity_House1_MapScripts::
 	.byte 0
 
-RustboroCity_House1_EventScript_Trader:: @ 821593F
+RustboroCity_House1_EventScript_Trader::
 	lock
 	faceplayer
 	goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_TradeCompleted
@@ -32,27 +32,27 @@ RustboroCity_House1_EventScript_Trader:: @ 821593F
 	release
 	end
 
-RustboroCity_House1_EventScript_DeclineTrade:: @ 82159BD
+RustboroCity_House1_EventScript_DeclineTrade::
 	msgbox RustboroCity_House1_Text_YouDontWantToThatsOkay, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_House1_EventScript_NotRequestedMon:: @ 82159C7
+RustboroCity_House1_EventScript_NotRequestedMon::
 	bufferspeciesname 0, VAR_0x8009
 	msgbox RustboroCity_House1_Text_DoesntLookLikeMonToMe, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_House1_EventScript_TradeCompleted:: @ 82159D5
+RustboroCity_House1_EventScript_TradeCompleted::
 	msgbox RustboroCity_House1_Text_AnyPokemonCanBeCute, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_House1_EventScript_Hiker:: @ 82159DF
+RustboroCity_House1_EventScript_Hiker::
 	msgbox RustboroCity_House1_Text_AllSortsOfPlaces, MSGBOX_NPC
 	end
 
-RustboroCity_House1_Text_IllTradeIfYouWant: @ 82159E8
+RustboroCity_House1_Text_IllTradeIfYouWant:
 	.string "Huh? My POKéMON is cute?\n"
 	.string "Sure, I knew that.\p"
 	.string "But if you really want, I'm willing\n"
@@ -60,23 +60,23 @@ RustboroCity_House1_Text_IllTradeIfYouWant: @ 82159E8
 	.string "I'll trade you my {STR_VAR_2} for\n"
 	.string "a {STR_VAR_1} if you want.$"
 
-RustboroCity_House1_Text_PleaseBeGoodToMyPokemon: @ 8215A77
+RustboroCity_House1_Text_PleaseBeGoodToMyPokemon:
 	.string "Eheheh…\n"
 	.string "Please be good to my POKéMON.$"
 
-RustboroCity_House1_Text_DoesntLookLikeMonToMe: @ 8215A9D
+RustboroCity_House1_Text_DoesntLookLikeMonToMe:
 	.string "Huh? That doesn't look anything like\n"
 	.string "a {STR_VAR_1} to me.$"
 
-RustboroCity_House1_Text_YouDontWantToThatsOkay: @ 8215ACE
+RustboroCity_House1_Text_YouDontWantToThatsOkay:
 	.string "Oh, if you don't want to, that's okay.\n"
 	.string "But my POKéMON is cute, you know…$"
 
-RustboroCity_House1_Text_AnyPokemonCanBeCute: @ 8215B17
+RustboroCity_House1_Text_AnyPokemonCanBeCute:
 	.string "Any POKéMON can be cute if you raise\n"
 	.string "it with care and kindness.$"
 
-RustboroCity_House1_Text_AllSortsOfPlaces: @ 8215B57
+RustboroCity_House1_Text_AllSortsOfPlaces:
 	.string "In all sorts of places, there are all\n"
 	.string "sorts of POKéMON and people.\p"
 	.string "I find that fascinating, so I go to all\n"
diff --git a/data/maps/RustboroCity_House2/scripts.inc b/data/maps/RustboroCity_House2/scripts.inc
index c8e80ee9f..6b517a04a 100644
--- a/data/maps/RustboroCity_House2/scripts.inc
+++ b/data/maps/RustboroCity_House2/scripts.inc
@@ -1,20 +1,20 @@
-RustboroCity_House2_MapScripts:: @ 8215EB3
+RustboroCity_House2_MapScripts::
 	.byte 0
 
-RustboroCity_House2_EventScript_PokefanF:: @ 8215EB4
+RustboroCity_House2_EventScript_PokefanF::
 	msgbox RustboroCity_House2_Text_TrainerSchoolExcellent, MSGBOX_NPC
 	end
 
-RustboroCity_House2_EventScript_LittleGirl:: @ 8215EBD
+RustboroCity_House2_EventScript_LittleGirl::
 	msgbox RustboroCity_House2_Text_RoxanneKnowsALot, MSGBOX_NPC
 	end
 
-RustboroCity_House2_Text_TrainerSchoolExcellent: @ 8215EC6
+RustboroCity_House2_Text_TrainerSchoolExcellent:
 	.string "The TRAINER'S SCHOOL is excellent.\p"
 	.string "If you study there, you could even\n"
 	.string "become a GYM LEADER.$"
 
-RustboroCity_House2_Text_RoxanneKnowsALot: @ 8215F21
+RustboroCity_House2_Text_RoxanneKnowsALot:
 	.string "ROXANNE, the GYM LEADER, really knows\n"
 	.string "a lot about POKéMON.\p"
 	.string "She's really strong, too!$"
diff --git a/data/maps/RustboroCity_House3/scripts.inc b/data/maps/RustboroCity_House3/scripts.inc
index d55166e67..70a359df6 100644
--- a/data/maps/RustboroCity_House3/scripts.inc
+++ b/data/maps/RustboroCity_House3/scripts.inc
@@ -1,16 +1,16 @@
-RustboroCity_House3_MapScripts:: @ 8216190
+RustboroCity_House3_MapScripts::
 	.byte 0
 
-RustboroCity_House3_EventScript_OldMan:: @ 8216191
+RustboroCity_House3_EventScript_OldMan::
 	msgbox RustboroCity_House3_Text_IGivePerfectlySuitedNicknames, MSGBOX_NPC
 	end
 
-RustboroCity_House3_EventScript_OldWoman:: @ 821619A
+RustboroCity_House3_EventScript_OldWoman::
 	msgbox RustboroCity_House3_Text_NamingPikachuPekachu, MSGBOX_NPC
 	end
 
 @ Misspelling on purpose, see nickname
-RustboroCity_House3_EventScript_Pekachu:: @ 82161A3
+RustboroCity_House3_EventScript_Pekachu::
 	lock
 	faceplayer
 	waitse
@@ -20,18 +20,18 @@ RustboroCity_House3_EventScript_Pekachu:: @ 82161A3
 	release
 	end
 
-RustboroCity_House3_Text_IGivePerfectlySuitedNicknames: @ 82161B6
+RustboroCity_House3_Text_IGivePerfectlySuitedNicknames:
 	.string "For my own POKéMON, I give them\n"
 	.string "perfectly suited nicknames!\p"
 	.string "It's my expression of, uh…\n"
 	.string "originality, yes, that's it!$"
 
-RustboroCity_House3_Text_NamingPikachuPekachu: @ 821622A
+RustboroCity_House3_Text_NamingPikachuPekachu:
 	.string "But giving the name PEKACHU to\n"
 	.string "a PIKACHU? It seems pointless.\p"
 	.string "I suppose it is good to use a name\n"
 	.string "that's easy to understand, but…$"
 
-RustboroCity_House3_Text_Pekachu: @ 82162AB
+RustboroCity_House3_Text_Pekachu:
 	.string "PEKACHU: Peka!$"
 
diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc
index 063c5b64f..18120cb4d 100644
--- a/data/maps/RustboroCity_Mart/scripts.inc
+++ b/data/maps/RustboroCity_Mart/scripts.inc
@@ -1,7 +1,7 @@
-RustboroCity_Mart_MapScripts:: @ 8214F05
+RustboroCity_Mart_MapScripts::
 	.byte 0
 
-RustboroCity_Mart_EventScript_Clerk:: @ 8214F06
+RustboroCity_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -10,13 +10,14 @@ RustboroCity_Mart_EventScript_Clerk:: @ 8214F06
 	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_PokemartExpanded
 	end
 
-RustboroCity_Mart_EventScript_PokemartBasic:: @ 8214F21
+RustboroCity_Mart_EventScript_PokemartBasic::
 	pokemart RustboroCity_Mart_Pokemart_Basic
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_Mart_Pokemart_Basic: @ 8214F30
+	.align 2
+RustboroCity_Mart_Pokemart_Basic:
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_POTION
 	.2byte ITEM_SUPER_POTION
@@ -31,14 +32,14 @@ RustboroCity_Mart_Pokemart_Basic: @ 8214F30
 	release
 	end
 
-RustboroCity_Mart_EventScript_PokemartExpanded:: @ 8214F48
+RustboroCity_Mart_EventScript_PokemartExpanded::
 	pokemart RustboroCity_Mart_Pokemart_Expanded
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-RustboroCity_Mart_Pokemart_Expanded: @ 8214F58
+RustboroCity_Mart_Pokemart_Expanded:
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_TIMER_BALL
 	.2byte ITEM_REPEAT_BALL
@@ -55,31 +56,31 @@ RustboroCity_Mart_Pokemart_Expanded: @ 8214F58
 	release
 	end
 
-RustboroCity_Mart_EventScript_PokefanF:: @ 8214F74
+RustboroCity_Mart_EventScript_PokefanF::
 	msgbox RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish, MSGBOX_NPC
 	end
 
-RustboroCity_Mart_EventScript_Boy:: @ 8214F7D
+RustboroCity_Mart_EventScript_Boy::
 	msgbox RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead, MSGBOX_NPC
 	end
 
-RustboroCity_Mart_EventScript_BugCatcher:: @ 8214F86
+RustboroCity_Mart_EventScript_BugCatcher::
 	msgbox RustboroCity_Mart_Text_GettingEscapeRopeJustInCase, MSGBOX_NPC
 	end
 
-RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish: @ 8214F8F
+RustboroCity_Mart_Text_BuyingHealsInCaseOfShroomish:
 	.string "I'm buying some PARLYZ HEALS and\n"
 	.string "ANTIDOTES.\p"
 	.string "Just in case I run into SHROOMISH\n"
 	.string "in PETALBURG WOODS.$"
 
-RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead: @ 8214FF1
+RustboroCity_Mart_Text_ShouldBuySuperPotionsInstead:
 	.string "My POKéMON evolved.\n"
 	.string "It has a lot of HP now.\p"
 	.string "I should buy SUPER POTIONS for it\n"
 	.string "instead of ordinary POTIONS.$"
 
-RustboroCity_Mart_Text_GettingEscapeRopeJustInCase: @ 821505C
+RustboroCity_Mart_Text_GettingEscapeRopeJustInCase:
 	.string "I'm getting an ESCAPE ROPE just in\n"
 	.string "case I get lost in a cave.\p"
 	.string "I just need to use it to get back to\n"
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index fbe1ac739..ff7d76568 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
@@ -1,16 +1,16 @@
 .set LOCALID_NURSE, 1
 
-RustboroCity_PokemonCenter_1F_MapScripts:: @ 8214D62
+RustboroCity_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, RustboroCity_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-RustboroCity_PokemonCenter_1F_OnTransition: @ 8214D6D
+RustboroCity_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_RUSTBORO_CITY
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_Nurse:: @ 8214D76
+RustboroCity_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -18,31 +18,31 @@ RustboroCity_PokemonCenter_1F_EventScript_Nurse:: @ 8214D76
 	release
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_Man:: @ 8214D84
+RustboroCity_PokemonCenter_1F_EventScript_Man::
 	msgbox RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_Boy:: @ 8214D8D
+RustboroCity_PokemonCenter_1F_EventScript_Boy::
 	msgbox RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonCenter_1F_EventScript_Girl:: @ 8214D96
+RustboroCity_PokemonCenter_1F_EventScript_Girl::
 	msgbox RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities: @ 8214D9F
+RustboroCity_PokemonCenter_1F_Text_PokemonHavePersonalities:
 	.string "My POKéMON has a NAIVE nature, and my\n"
 	.string "friend's has a JOLLY nature.\p"
 	.string "It's fascinating how POKéMON have\n"
 	.string "personalities!$"
 
-RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon: @ 8214E13
+RustboroCity_PokemonCenter_1F_Text_MaleAndFemalePokemon:
 	.string "Just like people, there are male and\n"
 	.string "female POKéMON.\p"
 	.string "But no one seems to have any idea how\n"
 	.string "they're different.$"
 
-RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor: @ 8214E81
+RustboroCity_PokemonCenter_1F_Text_HMCutNextDoor:
 	.string "The man next door gave me an HM!\p"
 	.string "I used it to teach my POKéMON how to\n"
 	.string "CUT down skinny trees.$"
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
index ba7b5b285..693204377 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE
+RustboroCity_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ RustboroCity_PokemonCenter_2F_MapScripts:: @ 8214EDE
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-RustboroCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8214EF3
+RustboroCity_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-RustboroCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8214EF9
+RustboroCity_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-RustboroCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 8214EFF
+RustboroCity_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc
index 29c37fe49..791f5ee84 100644
--- a/data/maps/RustboroCity_PokemonSchool/scripts.inc
+++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc
@@ -1,13 +1,13 @@
-RustboroCity_PokemonSchool_MapScripts:: @ 8213EA8
+RustboroCity_PokemonSchool_MapScripts::
 	.byte 0
 
-RustboroCity_PokemonSchool_EventScript_Blackboard:: @ 8213EA9
+RustboroCity_PokemonSchool_EventScript_Blackboard::
 	lockall
 	msgbox RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic:: @ 8213EB8
+RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic::
 	message RustboroCity_PokemonSchool_Text_ReadWhichTopic
 	waitmessage
 	multichoicegrid 8, 1, MULTI_STATUS_INFO, 3, FALSE
@@ -21,60 +21,60 @@ RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic:: @ 8213EB8
 	case MULTI_B_PRESSED, RustboroCity_PokemonSchool_EventScript_ExitTopicSelect
 	end
 
-RustboroCity_PokemonSchool_EventScript_Poison:: @ 8213F17
+RustboroCity_PokemonSchool_EventScript_Poison::
 	msgbox RustboroCity_PokemonSchool_Text_ExplainPoison, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_Paralysis:: @ 8213F25
+RustboroCity_PokemonSchool_EventScript_Paralysis::
 	msgbox RustboroCity_PokemonSchool_Text_ExplainParalysis, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_Sleep:: @ 8213F33
+RustboroCity_PokemonSchool_EventScript_Sleep::
 	msgbox RustboroCity_PokemonSchool_Text_ExplainSleep, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_Burn:: @ 8213F41
+RustboroCity_PokemonSchool_EventScript_Burn::
 	msgbox RustboroCity_PokemonSchool_Text_ExplainBurn, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_Freeze:: @ 8213F4F
+RustboroCity_PokemonSchool_EventScript_Freeze::
 	msgbox RustboroCity_PokemonSchool_Text_ExplainFreeze, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_ChooseBlackboardTopic
 	end
 
-RustboroCity_PokemonSchool_EventScript_ExitTopicSelect:: @ 8213F5D
+RustboroCity_PokemonSchool_EventScript_ExitTopicSelect::
 	releaseall
 	end
 
-RustboroCity_PokemonSchool_EventScript_GameboyKid1:: @ 8213F5F
+RustboroCity_PokemonSchool_EventScript_GameboyKid1::
 	msgbox RustboroCity_PokemonSchool_Text_TradingRightNow, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonSchool_EventScript_GameboyKid2:: @ 8213F68
+RustboroCity_PokemonSchool_EventScript_GameboyKid2::
 	msgbox RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonSchool_EventScript_RichBoy:: @ 8213F71
+RustboroCity_PokemonSchool_EventScript_RichBoy::
 	msgbox RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonSchool_EventScript_Lass:: @ 8213F7A
+RustboroCity_PokemonSchool_EventScript_Lass::
 	msgbox RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonSchool_EventScript_SchoolKidM:: @ 8213F83
+RustboroCity_PokemonSchool_EventScript_SchoolKidM::
 	msgbox RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry, MSGBOX_NPC
 	end
 
-RustboroCity_PokemonSchool_EventScript_StudentNotebook:: @ 8213F8C
+RustboroCity_PokemonSchool_EventScript_StudentNotebook::
 	msgbox RustboroCity_PokemonSchool_Text_StudentsNotes, MSGBOX_SIGN
 	end
 
-RustboroCity_PokemonSchool_EventScript_Teacher:: @ 8213F95
+RustboroCity_PokemonSchool_EventScript_Teacher::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_GaveQuickClaw
@@ -93,17 +93,17 @@ RustboroCity_PokemonSchool_EventScript_Teacher:: @ 8213F95
 	release
 	end
 
-RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast:: @ 8213FE5
+RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsEast::
 	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast
 	waitmovement 0
 	return
 
-RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest:: @ 8213FF0
+RustboroCity_PokemonSchool_EventScript_TeacherCheckOnStudentsWest::
 	applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest
 	waitmovement 0
 	return
 
-RustboroCity_PokemonSchool_EventScript_GaveQuickClaw:: @ 8213FFB
+RustboroCity_PokemonSchool_EventScript_GaveQuickClaw::
 	msgbox RustboroCity_PokemonSchool_Text_ExplainQuickClaw, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
@@ -111,7 +111,7 @@ RustboroCity_PokemonSchool_EventScript_GaveQuickClaw:: @ 8213FFB
 	release
 	end
 
-RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest: @ 8214010
+RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest:
 	walk_left
 	walk_down
 	walk_down
@@ -136,7 +136,7 @@ RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsWest: @ 8214010
 	walk_right
 	step_end
 
-RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast: @ 8214027
+RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast:
 	walk_right
 	walk_right
 	walk_down
@@ -163,7 +163,7 @@ RustboroCity_PokemonSchool_Movement_TeacherCheckOnStudentsEast: @ 8214027
 	walk_left
 	step_end
 
-RustboroCity_PokemonSchool_EventScript_Scott:: @ 8214040
+RustboroCity_PokemonSchool_EventScript_Scott::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE, RustboroCity_PokemonSchool_EventScript_ScottWatchStudents
@@ -175,41 +175,41 @@ RustboroCity_PokemonSchool_EventScript_Scott:: @ 8214040
 	release
 	end
 
-RustboroCity_PokemonSchool_EventScript_ScottSpokeAlready:: @ 821406F
+RustboroCity_PokemonSchool_EventScript_ScottSpokeAlready::
 	goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_ScottNoticeBadge
 	msgbox RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_PokemonSchool_EventScript_ScottGreetHasBadge:: @ 8214082
+RustboroCity_PokemonSchool_EventScript_ScottGreetHasBadge::
 	msgbox RustboroCity_PokemonSchool_Text_ScottMetAlreadyStoneBadge, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge
 	end
 
-RustboroCity_PokemonSchool_EventScript_ScottNoticeBadge:: @ 8214090
+RustboroCity_PokemonSchool_EventScript_ScottNoticeBadge::
 	msgbox RustboroCity_PokemonSchool_Text_ScottStoneBadge, MSGBOX_DEFAULT
 	goto RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge
 	end
 
-RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge:: @ 821409E
+RustboroCity_PokemonSchool_EventScript_MetScottAfterBadge::
 	addvar VAR_SCOTT_STATE, 1
 	setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE
 	release
 	end
 
-RustboroCity_PokemonSchool_EventScript_ScottWatchStudents:: @ 82140A8
+RustboroCity_PokemonSchool_EventScript_ScottWatchStudents::
 	msgbox RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown, MSGBOX_DEFAULT
 	release
 	end
 
-RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges: @ 82140B2
+RustboroCity_PokemonSchool_Text_BlackboardListsStatusChanges:
 	.string "The blackboard lists status changes\n"
 	.string "that may affect POKéMON in battle.$"
 
-RustboroCity_PokemonSchool_Text_ReadWhichTopic: @ 82140F9
+RustboroCity_PokemonSchool_Text_ReadWhichTopic:
 	.string "Which topic do you want to read?$"
 
-RustboroCity_PokemonSchool_Text_ExplainPoison: @ 821411A
+RustboroCity_PokemonSchool_Text_ExplainPoison:
 	.string "If a POKéMON is poisoned, it will\n"
 	.string "steadily lose HP.\p"
 	.string "The effects of poison remain after\n"
@@ -218,7 +218,7 @@ RustboroCity_PokemonSchool_Text_ExplainPoison: @ 821411A
 	.string "while it is traveling.\p"
 	.string "Heal a poisoning using an ANTIDOTE.$"
 
-RustboroCity_PokemonSchool_Text_ExplainParalysis: @ 82141D8
+RustboroCity_PokemonSchool_Text_ExplainParalysis:
 	.string "If a POKéMON becomes paralyzed,\n"
 	.string "its SPEED drops.\p"
 	.string "It may also not be able to move while\n"
@@ -226,7 +226,7 @@ RustboroCity_PokemonSchool_Text_ExplainParalysis: @ 82141D8
 	.string "Paralysis remains after battle.\n"
 	.string "Cure it using a PARLYZ HEAL.$"
 
-RustboroCity_PokemonSchool_Text_ExplainSleep: @ 821427D
+RustboroCity_PokemonSchool_Text_ExplainSleep:
 	.string "If a POKéMON falls asleep, it will be\n"
 	.string "unable to attack.\p"
 	.string "A POKéMON may wake up on its own,\n"
@@ -234,26 +234,26 @@ RustboroCity_PokemonSchool_Text_ExplainSleep: @ 821427D
 	.string "sleeping, it will stay asleep.\p"
 	.string "Wake it up using an AWAKENING.$"
 
-RustboroCity_PokemonSchool_Text_ExplainBurn: @ 8214336
+RustboroCity_PokemonSchool_Text_ExplainBurn:
 	.string "A burn reduces ATTACK power, and it\n"
 	.string "steadily reduces the victim's HP.\p"
 	.string "A burn lingers after battle.\n"
 	.string "Cure a burn using a BURN HEAL.$"
 
-RustboroCity_PokemonSchool_Text_ExplainFreeze: @ 82143B8
+RustboroCity_PokemonSchool_Text_ExplainFreeze:
 	.string "If a POKéMON is frozen, it becomes\n"
 	.string "completely helpless.\p"
 	.string "It will remain frozen after battle.\n"
 	.string "Thaw it out using an ICE HEAL.$"
 
-RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw: @ 8214433
+RustboroCity_PokemonSchool_Text_StudentsWhoDontStudyGetQuickClaw:
 	.string "Students who don't study get a little\n"
 	.string "taste of my QUICK CLAW.\p"
 	.string "Whether or not you are a good student \n"
 	.string "will be evident from the way you use\l"
 	.string "this item.$"
 
-RustboroCity_PokemonSchool_Text_ExplainQuickClaw: @ 82144C8
+RustboroCity_PokemonSchool_Text_ExplainQuickClaw:
 	.string "A POKéMON holding the QUICK CLAW will\n"
 	.string "occasionally speed up and get to move\l"
 	.string "before its opponent.\p"
@@ -262,20 +262,20 @@ RustboroCity_PokemonSchool_Text_ExplainQuickClaw: @ 82144C8
 	.string "Just those alone will give you many\n"
 	.string "topics to study!$"
 
-RustboroCity_PokemonSchool_Text_TradingRightNow: @ 821459F
+RustboroCity_PokemonSchool_Text_TradingRightNow:
 	.string "I'm trading POKéMON with my friend\n"
 	.string "right now.$"
 
-RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot: @ 82145CD
+RustboroCity_PokemonSchool_Text_AlwaysWantedSeedot:
 	.string "I always wanted a SEEDOT, and\n"
 	.string "I'm finally getting one!$"
 
-RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems: @ 8214604
+RustboroCity_PokemonSchool_Text_PokemontCantUseManMadeItems:
 	.string "POKéMON can hold items, but they\n"
 	.string "don't know what to do with man-made\l"
 	.string "items like POTION and ANTIDOTE.$"
 
-RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself: @ 8214669
+RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself:
 	.string "You know how some POKéMON moves can\n"
 	.string "confuse a POKéMON?\p"
 	.string "A confused POKéMON will sometimes\n"
@@ -283,7 +283,7 @@ RustboroCity_PokemonSchool_Text_ConfusedPokemonAttacksItself: @ 8214669
 	.string "But once it leaves battle, it will\n"
 	.string "return to normal.$"
 
-RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry: @ 8214719
+RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry:
 	.string "A POKéMON holding a BERRY will heal\n"
 	.string "itself…\p"
 	.string "There are many kinds of items that\n"
@@ -291,7 +291,7 @@ RustboroCity_PokemonSchool_Text_PokemonHealItselfWithBerry: @ 8214719
 	.string "Boy, it sure is hard taking notes\n"
 	.string "down…$"
 
-RustboroCity_PokemonSchool_Text_StudentsNotes: @ 82147A2
+RustboroCity_PokemonSchool_Text_StudentsNotes:
 	.string "It's this student's notebook…\p"
 	.string "POKéMON are to be caught using\n"
 	.string "POKé BALLS.\p"
@@ -304,7 +304,7 @@ RustboroCity_PokemonSchool_Text_StudentsNotes: @ 82147A2
 	.string "the strong TRAINERS who await\l"
 	.string "challengers in POKéMON GYMS.$"
 
-RustboroCity_PokemonSchool_Text_ScottMetAlreadyCut: @ 82148C0
+RustboroCity_PokemonSchool_Text_ScottMetAlreadyCut:
 	.string "Hello? Didn't we meet before?\n"
 	.string "I think back in PETALBURG CITY.\p"
 	.string "Let me introduce myself.\n"
@@ -320,12 +320,12 @@ RustboroCity_PokemonSchool_Text_ScottMetAlreadyCut: @ 82148C0
 	.string "If I remember correctly, someone in\n"
 	.string "this town has CUT.$"
 
-RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown: @ 8214A5F
+RustboroCity_PokemonSchool_Text_StudentTalentLevelUnknown:
 	.string "SCOTT: Hmm…\p"
 	.string "The talent levels of the students here\n"
 	.string "are unknown. The potential's there.$"
 
-RustboroCity_PokemonSchool_Text_ScottStoneBadge: @ 8214AB6
+RustboroCity_PokemonSchool_Text_ScottStoneBadge:
 	.string "SCOTT: Oh, what's that?\p"
 	.string "It's a STONE BADGE, isn't it?\n"
 	.string "That's pretty impressive, I'd say.\p"
@@ -334,7 +334,7 @@ RustboroCity_PokemonSchool_Text_ScottStoneBadge: @ 8214AB6
 	.string "It's hard to tell what you're like as\n"
 	.string "a TRAINER from a LEAGUE BADGE.$"
 
-RustboroCity_PokemonSchool_Text_ScottMetAlreadyStoneBadge: @ 8214B8A
+RustboroCity_PokemonSchool_Text_ScottMetAlreadyStoneBadge:
 	.string "Hello? Didn't we meet before?\n"
 	.string "I think back in PETALBURG CITY.\p"
 	.string "Let me introduce myself.\n"
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index 75f5820e0..1ba3c240c 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -4,27 +4,27 @@
 .set LOCALID_PEEKO, 7
 .equ LOCALID_WANDA, 10
 
-RusturfTunnel_MapScripts:: @ 822CE27
+RusturfTunnel_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, RusturfTunnel_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, RusturfTunnel_OnFrame
 	.byte 0
 
-RusturfTunnel_OnFrame: @ 822CE32
+RusturfTunnel_OnFrame:
 	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_ClearTunnelScene
 	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_ClearTunnelScene
 	.2byte 0
 
-RusturfTunnel_OnTransition: @ 822CE44
+RusturfTunnel_OnTransition:
 	compare VAR_RUSTURF_TUNNEL_STATE, 2
 	call_if_eq RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos
 	end
 
-RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos:: @ 822CE50
+RusturfTunnel_EventScript_SetAquaGruntAndPeekoPos::
 	setobjectxyperm LOCALID_PEEKO, 13, 4
 	setobjectxyperm LOCALID_GRUNT, 13, 5
 	return
 
-RusturfTunnel_EventScript_Wanda:: @ 822CE5F
+RusturfTunnel_EventScript_Wanda::
 	lock
 	faceplayer
 	msgbox RusturfTunnel_Text_BoyfriendOnOtherSideOfRock, MSGBOX_DEFAULT
@@ -34,7 +34,7 @@ RusturfTunnel_EventScript_Wanda:: @ 822CE5F
 	release
 	end
 
-RusturfTunnel_EventScript_WandasBoyfriend:: @ 822CE76
+RusturfTunnel_EventScript_WandasBoyfriend::
 	lock
 	faceplayer
 	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_AlreadySpokenTo
@@ -46,7 +46,7 @@ RusturfTunnel_EventScript_WandasBoyfriend:: @ 822CE76
 	release
 	end
 
-RusturfTunnel_EventScript_AlreadySpokenTo:: @ 822CE99
+RusturfTunnel_EventScript_AlreadySpokenTo::
 	msgbox RusturfTunnel_Text_ToGetToVerdanturf, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
@@ -54,7 +54,7 @@ RusturfTunnel_EventScript_AlreadySpokenTo:: @ 822CE99
 	release
 	end
 
-RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE
+RusturfTunnel_EventScript_ClearTunnelScene::
 	lockall
 	compare VAR_TEMP_1, 1
 	call_if_eq RusturfTunnel_EventScript_FaceWandasBoyfriend1
@@ -90,13 +90,13 @@ RusturfTunnel_EventScript_ClearTunnelScene:: @ 822CEAE
 	releaseall
 	end
 
-RusturfTunnel_EventScript_BoyfriendApproachWanda1:: @ 822CF5D
+RusturfTunnel_EventScript_BoyfriendApproachWanda1::
 	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend1
 	applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda1
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F
+RusturfTunnel_EventScript_BoyfriendApproachWanda2::
 	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
 	applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda
 	waitmovement 0
@@ -104,7 +104,7 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda2:: @ 822CF6F
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B
+RusturfTunnel_EventScript_BoyfriendApproachWanda3::
 	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchBoyfriend
 	applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendApproachWanda
 	waitmovement 0
@@ -112,41 +112,41 @@ RusturfTunnel_EventScript_BoyfriendApproachWanda3:: @ 822CF8B
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_FaceWandasBoyfriend1:: @ 822CFA7
+RusturfTunnel_EventScript_FaceWandasBoyfriend1::
 	applymovement LOCALID_WANDAS_BF, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_FaceWandasBoyfriend2:: @ 822CFBC
+RusturfTunnel_EventScript_FaceWandasBoyfriend2::
 	applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_BoyfriendFaceRight
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_FaceWandasBoyfriend3:: @ 822CFC7
+RusturfTunnel_EventScript_FaceWandasBoyfriend3::
 	return
 
-RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer:: @ 822CFC8
+RusturfTunnel_EventScript_WandasBoyfriendApproachPlayer::
 	closemessage
 	applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendApproachPlayer
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_WandaAndBoyfriendExit1:: @ 822CFD4
+RusturfTunnel_EventScript_WandaAndBoyfriendExit1::
 	applymovement LOCALID_WANDA, RusturfTunnel_Movement_WandaExit1
 	applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendExit1
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_WandaAndBoyfriendExit:: @ 822CFE6
+RusturfTunnel_EventScript_WandaAndBoyfriendExit::
 	applymovement OBJ_EVENT_ID_PLAYER, RusturfTunnel_Movement_PlayerWatchWandaExit
 	applymovement LOCALID_WANDA, RusturfTunnel_Movement_WandaExit
 	applymovement LOCALID_WANDAS_BF, RusturfTunnel_Movement_WandasBoyfriendExit
 	waitmovement 0
 	return
 
-RusturfTunnel_EventScript_WandasBoyfriendNotice:: @ 822CFFF
+RusturfTunnel_EventScript_WandasBoyfriendNotice::
 	playse SE_PIN
 	applymovement LOCALID_WANDAS_BF, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -154,7 +154,7 @@ RusturfTunnel_EventScript_WandasBoyfriendNotice:: @ 822CFFF
 	waitmovement 0
 	return
 
-RusturfTunnel_Movement_WandaExit1: @ 822D017
+RusturfTunnel_Movement_WandaExit1:
 	walk_right
 	walk_right
 	walk_right
@@ -168,7 +168,7 @@ RusturfTunnel_Movement_WandaExit1: @ 822D017
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_WandaExit: @ 822D023
+RusturfTunnel_Movement_WandaExit:
 	walk_right
 	walk_right
 	walk_right
@@ -182,7 +182,7 @@ RusturfTunnel_Movement_WandaExit: @ 822D023
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F
+RusturfTunnel_Movement_PlayerWatchWandaExit:
 	delay_8
 	walk_in_place_fastest_up
 	delay_16
@@ -190,41 +190,41 @@ RusturfTunnel_Movement_PlayerWatchWandaExit: @ 822D02F
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_Unused1: @ 822D035
+RusturfTunnel_Movement_Unused1:
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_Unused2: @ 822D038
+RusturfTunnel_Movement_Unused2:
 	walk_down
 	walk_in_place_fastest_up
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_Unused3: @ 822D03D
+RusturfTunnel_Movement_Unused3:
 	walk_up
 	walk_in_place_fastest_down
 	delay_8
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_PlayerWatchBoyfriend1: @ 822D042
+RusturfTunnel_Movement_PlayerWatchBoyfriend1:
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_PlayerWatchBoyfriend: @ 822D045
+RusturfTunnel_Movement_PlayerWatchBoyfriend:
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-RusturfTunnel_Movement_BoyfriendFaceRight: @ 822D048
+RusturfTunnel_Movement_BoyfriendFaceRight:
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-RusturfTunnel_Movement_WandasBoyfriendExit1: @ 822D04B
+RusturfTunnel_Movement_WandasBoyfriendExit1:
 	walk_right
 	walk_right
 	walk_right
@@ -239,7 +239,7 @@ RusturfTunnel_Movement_WandasBoyfriendExit1: @ 822D04B
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_WandasBoyfriendExit: @ 822D058
+RusturfTunnel_Movement_WandasBoyfriendExit:
 	walk_up
 	walk_right
 	walk_right
@@ -254,37 +254,37 @@ RusturfTunnel_Movement_WandasBoyfriendExit: @ 822D058
 	walk_down
 	step_end
 
-RusturfTunnel_Movement_WandasBoyfriendApproachPlayer: @ 822D065
+RusturfTunnel_Movement_WandasBoyfriendApproachPlayer:
 	walk_right
 	step_end
 
-RusturfTunnel_Movement_BoyfriendApproachWanda1: @ 822D067
+RusturfTunnel_Movement_BoyfriendApproachWanda1:
 	walk_in_place_fast_up
 	walk_in_place_fast_up
 	walk_fast_up
 	walk_fast_right
 	step_end
 
-RusturfTunnel_Movement_BoyfriendApproachWanda: @ 822D06C
+RusturfTunnel_Movement_BoyfriendApproachWanda:
 	walk_in_place_fast_right
 	walk_in_place_fast_right
 	walk_fast_right
 	walk_in_place_fastest_up
 	step_end
 
-RusturfTunnel_EventScript_TunnelBlockagePos1:: @ 822D071
+RusturfTunnel_EventScript_TunnelBlockagePos1::
 	setvar VAR_TEMP_1, 1
 	end
 
-RusturfTunnel_EventScript_TunnelBlockagePos2:: @ 822D077
+RusturfTunnel_EventScript_TunnelBlockagePos2::
 	setvar VAR_TEMP_1, 2
 	end
 
-RusturfTunnel_EventScript_TunnelBlockagePos3:: @ 822D07D
+RusturfTunnel_EventScript_TunnelBlockagePos3::
 	setvar VAR_TEMP_1, 3
 	end
 
-RusturfTunnel_EventScript_AquaGruntBackUp:: @ 822D083
+RusturfTunnel_EventScript_AquaGruntBackUp::
 	lockall
 	msgbox RusturfTunnel_Text_ComeAndGetSome, MSGBOX_DEFAULT
 	closemessage
@@ -297,13 +297,13 @@ RusturfTunnel_EventScript_AquaGruntBackUp:: @ 822D083
 	releaseall
 	end
 
-RusturfTunnel_Movement_GruntAndPeekoBackUp: @ 822D0AB
+RusturfTunnel_Movement_GruntAndPeekoBackUp:
 	lock_facing_direction
 	walk_right
 	unlock_facing_direction
 	step_end
 
-RusturfTunnel_EventScript_Peeko:: @ 822D0AF
+RusturfTunnel_EventScript_Peeko::
 	lock
 	faceplayer
 	waitse
@@ -313,7 +313,7 @@ RusturfTunnel_EventScript_Peeko:: @ 822D0AF
 	release
 	end
 
-RusturfTunnel_EventScript_Grunt:: @ 822D0C2
+RusturfTunnel_EventScript_Grunt::
 	lock
 	faceplayer
 	playbgm MUS_ENCOUNTER_AQUA, FALSE
@@ -357,7 +357,7 @@ RusturfTunnel_EventScript_Grunt:: @ 822D0C2
 	release
 	end
 
-RusturfTunnel_Movement_PushPlayerAsideForGrunt: @ 822D178
+RusturfTunnel_Movement_PushPlayerAsideForGrunt:
 	face_down
 	lock_facing_direction
 	walk_up
@@ -365,12 +365,12 @@ RusturfTunnel_Movement_PushPlayerAsideForGrunt: @ 822D178
 	walk_in_place_fastest_left
 	step_end
 
-RusturfTunnel_Movement_PlayerMoveAsideForBriney: @ 822D17E
+RusturfTunnel_Movement_PlayerMoveAsideForBriney:
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-RusturfTunnel_Movement_GruntEscape: @ 822D181
+RusturfTunnel_Movement_GruntEscape:
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -382,7 +382,7 @@ RusturfTunnel_Movement_GruntEscape: @ 822D181
 	walk_fast_left
 	step_end
 
-RusturfTunnel_Movement_BrineyApproachPeeko1: @ 822D18B
+RusturfTunnel_Movement_BrineyApproachPeeko1:
 	walk_right
 	walk_right
 	walk_right
@@ -392,7 +392,7 @@ RusturfTunnel_Movement_BrineyApproachPeeko1: @ 822D18B
 	walk_right
 	step_end
 
-RusturfTunnel_Movement_BrineyExit: @ 822D193
+RusturfTunnel_Movement_BrineyExit:
 	walk_left
 	walk_left
 	walk_left
@@ -406,19 +406,19 @@ RusturfTunnel_Movement_BrineyExit: @ 822D193
 	walk_left
 	step_end
 
-RusturfTunnel_Movement_PlayerWatchBrineyExit: @ 822D19F
+RusturfTunnel_Movement_PlayerWatchBrineyExit:
 	delay_16
 	delay_8
 	delay_4
 	walk_in_place_fastest_left
 	step_end
 
-RusturfTunnel_Movement_BrineyApproachPeeko2: @ 822D1A4
+RusturfTunnel_Movement_BrineyApproachPeeko2:
 	delay_16
 	walk_right
 	step_end
 
-RusturfTunnel_Movement_PeekoExit: @ 822D1A7
+RusturfTunnel_Movement_PeekoExit:
 	walk_left
 	walk_left
 	walk_left
@@ -430,19 +430,19 @@ RusturfTunnel_Movement_PeekoExit: @ 822D1A7
 	walk_left
 	step_end
 
-RusturfTunnel_EventScript_Mike:: @ 822D1B1
+RusturfTunnel_EventScript_Mike::
 	trainerbattle_single TRAINER_MIKE_2, RusturfTunnel_Text_MikeIntro, RusturfTunnel_Text_MikeDefeat
 	msgbox RusturfTunnel_Text_MikePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-RusturfTunnel_Text_ComeAndGetSome: @ 822D1C8
+RusturfTunnel_Text_ComeAndGetSome:
 	.string "What, are you coming?\n"
 	.string "Come and get some, then!$"
 
-RusturfTunnel_Text_Peeko: @ 822D1F7
+RusturfTunnel_Text_Peeko:
 	.string "PEEKO: Pii pihyoh!$"
 
-RusturfTunnel_Text_GruntIntro: @ 822D20A
+RusturfTunnel_Text_GruntIntro:
 	.string "Grah, keelhaul it all!\p"
 	.string "That hostage POKéMON turned out to\n"
 	.string "be worthless!\p"
@@ -451,11 +451,11 @@ RusturfTunnel_Text_GruntIntro: @ 822D20A
 	.string "Hey! You!\n"
 	.string "So you want to battle me?$"
 
-RusturfTunnel_Text_GruntDefeat: @ 822D2B0
+RusturfTunnel_Text_GruntDefeat:
 	.string "Urrrggh! My career in crime comes to\n"
 	.string "a dead end!$"
 
-RusturfTunnel_Text_GruntTakePackage: @ 822D2E1
+RusturfTunnel_Text_GruntTakePackage:
 	.string "This is plain not right…\p"
 	.string "The BOSS told me this would be a\n"
 	.string "slick-and-easy job to pull.\p"
@@ -464,11 +464,11 @@ RusturfTunnel_Text_GruntTakePackage: @ 822D2E1
 	.string "Tch!\n"
 	.string "You want it back that badly, take it!$"
 
-RusturfTunnel_Text_PeekoGladToSeeYouSafe: @ 822D395
+RusturfTunnel_Text_PeekoGladToSeeYouSafe:
 	.string "PEEKO!\n"
 	.string "Am I glad to see you're safe!$"
 
-RusturfTunnel_Text_ThankYouLetsGoHomePeeko: @ 822D3BA
+RusturfTunnel_Text_ThankYouLetsGoHomePeeko:
 	.string "PEEKO owes her life to you!\p"
 	.string "They call me MR. BRINEY.\n"
 	.string "And, you are?\p"
@@ -484,7 +484,7 @@ RusturfTunnel_Text_ThankYouLetsGoHomePeeko: @ 822D3BA
 	.string "home.\p"
 	.string "PEEKO: Pihyoh!$"
 
-RusturfTunnel_Text_WhyCantTheyKeepDigging: @ 822D510
+RusturfTunnel_Text_WhyCantTheyKeepDigging:
 	.string "… …\p"
 	.string "Why can't they keep digging?\n"
 	.string "Is the bedrock too hard?\p"
@@ -496,30 +496,30 @@ RusturfTunnel_Text_WhyCantTheyKeepDigging: @ 822D510
 	.string "But this…\n"
 	.string "What am I to do?$"
 
-RusturfTunnel_Text_ToGetToVerdanturf: @ 822D5F3
+RusturfTunnel_Text_ToGetToVerdanturf:
 	.string "To get from RUSTBORO to VERDANTURF,\n"
 	.string "you need to go to DEWFORD, then pass\l"
 	.string "through SLATEPORT and MAUVILLE…$"
 
-RusturfTunnel_Text_YouShatteredBoulderTakeHM: @ 822D65C
+RusturfTunnel_Text_YouShatteredBoulderTakeHM:
 	.string "Wow! You shattered that boulder\n"
 	.string "blocking the way.\p"
 	.string "To show you how much I appreciate it,\n"
 	.string "I'd like you to have this HM.$"
 
-RusturfTunnel_Text_ExplainStrength: @ 822D6D2
+RusturfTunnel_Text_ExplainStrength:
 	.string "That HM contains STRENGTH.\p"
 	.string "If a muscular POKéMON were to learn\n"
 	.string "that, it would be able to move even\l"
 	.string "large boulders.$"
 
-RusturfTunnel_Text_WandaReunion: @ 822D745
+RusturfTunnel_Text_WandaReunion:
 	.string "WANDA!\n"
 	.string "Now I can see you anytime!\p"
 	.string "WANDA: That's…wonderful.\p"
 	.string "Please, take some rest at my home.$"
 
-RusturfTunnel_Text_BoyfriendOnOtherSideOfRock: @ 822D7A3
+RusturfTunnel_Text_BoyfriendOnOtherSideOfRock:
 	.string "On the other side of this rock…\n"
 	.string "My boyfriend is there.\p"
 	.string "He… He's not just digging the tunnel\n"
@@ -527,17 +527,17 @@ RusturfTunnel_Text_BoyfriendOnOtherSideOfRock: @ 822D7A3
 	.string "He works his hands raw and rough\n"
 	.string "for the benefit of everyone.$"
 
-RusturfTunnel_Text_MikeIntro: @ 822D84D
+RusturfTunnel_Text_MikeIntro:
 	.string "What do you call a wild man up in the\n"
 	.string "mountains? A mountain man, right?\p"
 	.string "So why don't they call a POKéMON in\n"
 	.string "the mountains a mountain POKéMON?$"
 
-RusturfTunnel_Text_MikeDefeat: @ 822D8DB
+RusturfTunnel_Text_MikeDefeat:
 	.string "My POKéMON…\n"
 	.string "Ran out of power…$"
 
-RusturfTunnel_Text_MikePostBattle: @ 822D8F9
+RusturfTunnel_Text_MikePostBattle:
 	.string "They halted development here to\n"
 	.string "protect POKéMON, right?\l"
 	.string "There's a feel-good story!$"
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index b6fa7428e..07c397e8c 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -1,11 +1,11 @@
 .set LOCALID_SAILOR, 1
 .set LOCALID_SCOTT, 5
 
-SSTidalCorridor_MapScripts:: @ 823BFCF
+SSTidalCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_OnFrame
 	.byte 0
 
-SSTidalCorridor_OnFrame: @ 823BFD5
+SSTidalCorridor_OnFrame:
 	map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_ScottScene
 	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT, SSTidalCorridor_EventScript_DepartSlateportForLilycove
 	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE, SSTidalCorridor_EventScript_DepartLilycoveForSlateport
@@ -13,7 +13,7 @@ SSTidalCorridor_OnFrame: @ 823BFD5
 	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_LEFT, SSTidalCorridor_EventScript_ArrivedInSlateport
 	.2byte 0
 
-SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF
+SSTidalCorridor_EventScript_DepartSlateportForLilycove::
 	special SetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
 	lockall
@@ -22,7 +22,7 @@ SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015
+SSTidalCorridor_EventScript_DepartLilycoveForSlateport::
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_LILYCOVE
 	lockall
 	playse SE_DING_DONG
@@ -30,28 +30,28 @@ SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015
 	releaseall
 	end
 
-SSTidalRooms_EventScript_HalfwayToSlateport:: @ 823C028
+SSTidalRooms_EventScript_HalfwayToSlateport::
 	special SetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
 	playse SE_DING_DONG
 	msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	return
 
-SSTidalRooms_EventScript_ArrivedInLilycove:: @ 823C03C
+SSTidalRooms_EventScript_ArrivedInLilycove::
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
 	playse SE_DING_DONG
 	msgbox SSTidal_Text_MadeLandInLilycove, MSGBOX_DEFAULT
 	return
 
-SSTidalCorridor_EventScript_ReachedStepCount:: @ 823C050
+SSTidalCorridor_EventScript_ReachedStepCount::
 	compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
 	goto_if_eq SSTidalCorridor_EventScript_HalfwayToLilycove
 	compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
 	goto_if_eq SSTidalCorridor_EventScript_ArrivedInSlateport
 	end
 
-SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067
+SSTidalCorridor_EventScript_HalfwayToLilycove::
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_LILYCOVE
 	lockall
@@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D
+SSTidalCorridor_EventScript_ArrivedInSlateport::
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	lockall
@@ -69,14 +69,14 @@ SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D
 	releaseall
 	end
 
-SSTidalRooms_EventScript_ArrivedInSlateport:: @ 823C093
+SSTidalRooms_EventScript_ArrivedInSlateport::
 	special ResetSSTidalFlag
 	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	playse SE_DING_DONG
 	msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
 	return
 
-SSTidalRooms_EventScript_ProgessCruiseAfterBed:: @ 823C0A7
+SSTidalRooms_EventScript_ProgessCruiseAfterBed::
 	switch VAR_SS_TIDAL_STATE
 	case SS_TIDAL_DEPART_SLATEPORT, SSTidalRooms_EventScript_ArrivedInLilycove
 	case SS_TIDAL_HALFWAY_LILYCOVE, SSTidalRooms_EventScript_ArrivedInLilycove
@@ -84,11 +84,11 @@ SSTidalRooms_EventScript_ProgessCruiseAfterBed:: @ 823C0A7
 	case SS_TIDAL_HALFWAY_SLATEPORT, SSTidalRooms_EventScript_ArrivedInSlateport
 	return
 
-SSTidalCorridor_EventScript_Briney:: @ 823C0D9
+SSTidalCorridor_EventScript_Briney::
 	msgbox SSTidalCorridor_Text_BrineyWelcomeAboard, MSGBOX_NPC
 	end
 
-SSTidalCorridor_EventScript_Peeko:: @ 823C0E2
+SSTidalCorridor_EventScript_Peeko::
 	lock
 	faceplayer
 	waitse
@@ -98,23 +98,23 @@ SSTidalCorridor_EventScript_Peeko:: @ 823C0E2
 	release
 	end
 
-SSTidalCorridor_EventScript_Cabin1Sign:: @ 823C0F5
+SSTidalCorridor_EventScript_Cabin1Sign::
 	msgbox SSTidalCorridor_Text_Cabin1, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_Cabin2Sign:: @ 823C0FE
+SSTidalCorridor_EventScript_Cabin2Sign::
 	msgbox SSTidalCorridor_Text_Cabin2, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_Cabin3Sign:: @ 823C107
+SSTidalCorridor_EventScript_Cabin3Sign::
 	msgbox SSTidalCorridor_Text_Cabin3, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_Cabin4Sign:: @ 823C110
+SSTidalCorridor_EventScript_Cabin4Sign::
 	msgbox SSTidalCorridor_Text_Cabin4, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_ExitSailor:: @ 823C119
+SSTidalCorridor_EventScript_ExitSailor::
 	lock
 	faceplayer
 	compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
@@ -125,7 +125,7 @@ SSTidalCorridor_EventScript_ExitSailor:: @ 823C119
 	release
 	end
 
-SSTidalCorridor_EventScript_ExitLilycove:: @ 823C13B
+SSTidalCorridor_EventScript_ExitLilycove::
 	setrespawn HEAL_LOCATION_LILYCOVE_CITY
 	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
 	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
@@ -134,7 +134,7 @@ SSTidalCorridor_EventScript_ExitLilycove:: @ 823C13B
 	release
 	end
 
-SSTidalCorridor_EventScript_ExitSlateport:: @ 823C15A
+SSTidalCorridor_EventScript_ExitSlateport::
 	setrespawn HEAL_LOCATION_SLATEPORT_CITY
 	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
 	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
@@ -143,11 +143,11 @@ SSTidalCorridor_EventScript_ExitSlateport:: @ 823C15A
 	release
 	end
 
-SSTidalCorridor_EventScript_HideSnatchGiver:: @ 823C179
+SSTidalCorridor_EventScript_HideSnatchGiver::
 	setflag FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER
 	return
 
-SSTidalCorridor_EventScript_Porthole:: @ 823C17D
+SSTidalCorridor_EventScript_Porthole::
 	lockall
 	compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
 	goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
@@ -157,12 +157,12 @@ SSTidalCorridor_EventScript_Porthole:: @ 823C17D
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_LookThroughPorthole:: @ 823C19E
+SSTidalCorridor_EventScript_LookThroughPorthole::
 	special LookThroughPorthole
 	waitstate
 	end
 
-SSTidalCorridor_EventScript_Sailor:: @ 823C1A3
+SSTidalCorridor_EventScript_Sailor::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_EnjoyYourCruise
@@ -171,12 +171,12 @@ SSTidalCorridor_EventScript_Sailor:: @ 823C1A3
 	release
 	end
 
-SSTidalCorridor_EventScript_EnjoyYourCruise:: @ 823C1BD
+SSTidalCorridor_EventScript_EnjoyYourCruise::
 	msgbox SSTidalCorridor_Text_EnjoyYourCruise, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7
+SSTidalCorridor_EventScript_CheckIfTrainersDefeated::
 	goto_if_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_TrainerNotDefeated
 	goto_if_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_TrainerNotDefeated
 	goto_if_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_TrainerNotDefeated
@@ -189,10 +189,10 @@ SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7
 	goto SSTidalCorridor_EventScript_EnjoyYourCruise
 	return
 
-SSTidalCorridor_EventScript_TrainerNotDefeated:: @ 823C218
+SSTidalCorridor_EventScript_TrainerNotDefeated::
 	return
 
-SSTidalCorridor_EventScript_ScottScene:: @ 823C219
+SSTidalCorridor_EventScript_ScottScene::
 	lockall
 	applymovement LOCALID_SCOTT, SSTidalCorridor_Movement_ScottApproachPlayer
 	waitmovement 0
@@ -215,7 +215,7 @@ SSTidalCorridor_EventScript_ScottScene:: @ 823C219
 	releaseall
 	end
 
-SSTidalCorridor_Movement_ScottApproachPlayer: @ 823C26D
+SSTidalCorridor_Movement_ScottApproachPlayer:
 	walk_left
 	walk_left
 	walk_left
@@ -225,7 +225,7 @@ SSTidalCorridor_Movement_ScottApproachPlayer: @ 823C26D
 	walk_left
 	step_end
 
-SSTidalCorridor_Movement_ScottExit: @ 823C275
+SSTidalCorridor_Movement_ScottExit:
 	walk_in_place_fastest_down
 	delay_16
 	delay_16
@@ -235,7 +235,7 @@ SSTidalCorridor_Movement_ScottExit: @ 823C275
 	walk_left
 	step_end
 
-SSTidalCorridor_Movement_PlayerWatchScottExit: @ 823C27D
+SSTidalCorridor_Movement_PlayerWatchScottExit:
 	delay_16
 	delay_16
 	delay_16
@@ -244,7 +244,7 @@ SSTidalCorridor_Movement_PlayerWatchScottExit: @ 823C27D
 	walk_in_place_fastest_down
 	step_end
 
-SSTidalCorridor_Movement_SailorMoveForScott: @ 823C284
+SSTidalCorridor_Movement_SailorMoveForScott:
 	delay_16
 	walk_right
 	walk_right
@@ -253,13 +253,13 @@ SSTidalCorridor_Movement_SailorMoveForScott: @ 823C284
 	walk_in_place_fastest_left
 	step_end
 
-SSTidalCorridor_Movement_SailorReturn: @ 823C28B
+SSTidalCorridor_Movement_SailorReturn:
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-SSTidalCorridor_Text_ScottBattleFrontierInvite: @ 823C28F
+SSTidalCorridor_Text_ScottBattleFrontierInvite:
 	.string "SCOTT: Well, hi, hi!\n"
 	.string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p"
 	.string "Something's come up, so I have to\n"
@@ -279,25 +279,25 @@ SSTidalCorridor_Text_ScottBattleFrontierInvite: @ 823C28F
 	.string "Okay, {PLAYER}{KUN}, I'll be waiting for you\n"
 	.string "at the BATTLE FRONTIER!$"
 
-SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage: @ 823C462
+SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage:
 	.string "This ferry is built to plow through\n"
 	.string "fast-running currents.\p"
 	.string "We hope you enjoy your voyage with us.\n"
 	.string "Feel free to explore the ship.$"
 
-SSTidal_Text_HopeYouEnjoyVoyage: @ 823C4E3
+SSTidal_Text_HopeYouEnjoyVoyage:
 	.string "We hope you enjoy your voyage on\n"
 	.string "our ferry.$"
 
-SSTidal_Text_MadeLandInSlateport: @ 823C50F
+SSTidal_Text_MadeLandInSlateport:
 	.string "We have made land in SLATEPORT CITY.\n"
 	.string "Thank you for sailing with us.$"
 
-SSTidal_Text_MadeLandInLilycove: @ 823C553
+SSTidal_Text_MadeLandInLilycove:
 	.string "We have made land in LILYCOVE CITY.\n"
 	.string "Thank you for sailing with us.$"
 
-SSTidalCorridor_Text_CanRestInCabin2: @ 823C596
+SSTidalCorridor_Text_CanRestInCabin2:
 	.string "It'll be some time before we make land,\n"
 	.string "I reckon.\p"
 	.string "You can rest up in your cabin if you'd\n"
@@ -305,22 +305,22 @@ SSTidalCorridor_Text_CanRestInCabin2: @ 823C596
 	.string "The bed in there is soft and plushy.\n"
 	.string "I can attest to how comfy it is!$"
 
-SSTidalCorridor_Text_WeveArrived: @ 823C64F
+SSTidalCorridor_Text_WeveArrived:
 	.string "We've arrived!$"
 
-SSTidalCorridor_Text_VisitOtherCabins: @ 823C65E
+SSTidalCorridor_Text_VisitOtherCabins:
 	.string "Go visit other cabins.\n"
 	.string "TRAINERS bored of the boat trip will\l"
 	.string "be itching to battle.$"
 
-SSTidalCorridor_Text_EnjoyYourCruise: @ 823C6B0
+SSTidalCorridor_Text_EnjoyYourCruise:
 	.string "Enjoy your cruise!$"
 
-SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole: @ 823C6C3
+SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole:
 	.string "The horizon spreads beyond\n"
 	.string "the porthole.$"
 
-SSTidalCorridor_Text_BrineyWelcomeAboard: @ 823C6EC
+SSTidalCorridor_Text_BrineyWelcomeAboard:
 	.string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p"
 	.string "They made me honorary captain of\n"
 	.string "the S.S. TIDAL!\p"
@@ -330,17 +330,17 @@ SSTidalCorridor_Text_BrineyWelcomeAboard: @ 823C6EC
 	.string "Let me just say, it stirred my sleeping\n"
 	.string "soul as a sailor!$"
 
-SSTidalCorridor_Text_Peeko: @ 823C7E1
+SSTidalCorridor_Text_Peeko:
 	.string "PEEKO: Pihyo pihyohyo…$"
 
-SSTidalCorridor_Text_Cabin1: @ 823C7F8
+SSTidalCorridor_Text_Cabin1:
 	.string "Cabin 1$"
 
-SSTidalCorridor_Text_Cabin2: @ 823C800
+SSTidalCorridor_Text_Cabin2:
 	.string "Cabin 2$"
 
-SSTidalCorridor_Text_Cabin3: @ 823C808
+SSTidalCorridor_Text_Cabin3:
 	.string "Cabin 3$"
 
-SSTidalCorridor_Text_Cabin4: @ 823C810
+SSTidalCorridor_Text_Cabin4:
 	.string "Cabin 4$"
diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc
index c90366c23..7f1d92c9e 100644
--- a/data/maps/SSTidalLowerDeck/scripts.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
@@ -1,38 +1,38 @@
-SSTidalLowerDeck_MapScripts:: @ 823C818
+SSTidalLowerDeck_MapScripts::
 	.byte 0
 
-SSTidalLowerDeck_EventScript_Phillip:: @ 823C819
+SSTidalLowerDeck_EventScript_Phillip::
 	trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_PhillipIntro, SSTidalLowerDeck_Text_PhillipDefeat
 	msgbox SSTidalLowerDeck_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalLowerDeck_EventScript_Leonard:: @ 823C830
+SSTidalLowerDeck_EventScript_Leonard::
 	trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_LeonardIntro, SSTidalLowerDeck_Text_LeonardDefeat
 	msgbox SSTidalLowerDeck_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalLowerDeck_Text_PhillipIntro: @ 823C847
+SSTidalLowerDeck_Text_PhillipIntro:
 	.string "Arrrgh! I'm fed up and dog-tired of\n"
 	.string "cleaning this huge place!\p"
 	.string "Let's have a quick battle!$"
 
-SSTidalLowerDeck_Text_PhillipDefeat: @ 823C8A0
+SSTidalLowerDeck_Text_PhillipDefeat:
 	.string "Little bro, I lost!$"
 
-SSTidalLowerDeck_Text_PhillipPostBattle: @ 823C8B4
+SSTidalLowerDeck_Text_PhillipPostBattle:
 	.string "We're the CLEANUP BROTHERS!\p"
 	.string "The old one dumps the detergent,\n"
 	.string "and the young one does the scrubbing!$"
 
-SSTidalLowerDeck_Text_LeonardIntro: @ 823C917
+SSTidalLowerDeck_Text_LeonardIntro:
 	.string "This is the bottom of the ship's hull.\n"
 	.string "There's plenty of room.\l"
 	.string "It'll be alright for a POKéMON battle.$"
 
-SSTidalLowerDeck_Text_LeonardDefeat: @ 823C97D
+SSTidalLowerDeck_Text_LeonardDefeat:
 	.string "Big bro, I lost!$"
 
-SSTidalLowerDeck_Text_LeonardPostBattle: @ 823C98E
+SSTidalLowerDeck_Text_LeonardPostBattle:
 	.string "We're the CLEANUP BROTHERS!\p"
 	.string "The old one dumps the detergent,\n"
 	.string "and the young one does the scrubbing!$"
diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc
index 1cf464d0d..c5cade489 100644
--- a/data/maps/SSTidalRooms/scripts.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
@@ -1,7 +1,7 @@
-SSTidalRooms_MapScripts:: @ 823C9F1
+SSTidalRooms_MapScripts::
 	.byte 0
 
-SSTidalRooms_EventScript_SnatchGiver:: @ 823C9F2
+SSTidalRooms_EventScript_SnatchGiver::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_ExplainSnatch
@@ -14,12 +14,12 @@ SSTidalRooms_EventScript_SnatchGiver:: @ 823C9F2
 	release
 	end
 
-SSTidalRooms_EventScript_ExplainSnatch:: @ 823CA29
+SSTidalRooms_EventScript_ExplainSnatch::
 	msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalRooms_EventScript_Bed:: @ 823CA33
+SSTidalRooms_EventScript_Bed::
 	lockall
 	msgbox SSTidalRooms_Text_TakeRestOnBed, MSGBOX_DEFAULT
 	closemessage
@@ -28,148 +28,148 @@ SSTidalRooms_EventScript_Bed:: @ 823CA33
 	releaseall
 	end
 
-SSTidalRooms_EventScript_Colton:: @ 823CA49
+SSTidalRooms_EventScript_Colton::
 	trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_ColtonIntro, SSTidalRooms_Text_ColtonDefeat
 	msgbox SSTidalRooms_Text_ColtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_Micah:: @ 823CA60
+SSTidalRooms_EventScript_Micah::
 	trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_MicahIntro, SSTidalRooms_Text_MicahDefeat
 	msgbox SSTidalRooms_Text_MicahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_Thomas:: @ 823CA77
+SSTidalRooms_EventScript_Thomas::
 	trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_ThomasIntro, SSTidalRooms_Text_ThomasDefeat
 	msgbox SSTidalRooms_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_Jed:: @ 823CA8E
+SSTidalRooms_EventScript_Jed::
 	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_JedIntro, SSTidalRooms_Text_JedDefeat, SSTidalRooms_Text_JedNotEnoughMons
 	msgbox SSTidalRooms_Text_JedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_Lea:: @ 823CAA9
+SSTidalRooms_EventScript_Lea::
 	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_LeaIntro, SSTidalRooms_Text_LeaDefeat, SSTidalRooms_Text_LeaNotEnoughMons
 	msgbox SSTidalRooms_Text_LeaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_Garret:: @ 823CAC4
+SSTidalRooms_EventScript_Garret::
 	trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_GarretIntro, SSTidalRooms_Text_GarretDefeat
 	msgbox SSTidalRooms_Text_GarretPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_Naomi:: @ 823CADB
+SSTidalRooms_EventScript_Naomi::
 	trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_NaomiIntro, SSTidalRooms_Text_NaomiDefeat
 	msgbox SSTidalRooms_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_Text_TakeRestOnBed: @ 823CAF2
+SSTidalRooms_Text_TakeRestOnBed:
 	.string "There's a bed…\n"
 	.string "Let's take a rest.$"
 
-SSTidalRooms_Text_ColtonIntro: @ 823CB14
+SSTidalRooms_Text_ColtonIntro:
 	.string "I often sail to LILYCOVE CITY.\p"
 	.string "I enjoy attending CONTESTS,\n"
 	.string "you see.$"
 
-SSTidalRooms_Text_ColtonDefeat: @ 823CB58
+SSTidalRooms_Text_ColtonDefeat:
 	.string "That was an enjoyable match!$"
 
-SSTidalRooms_Text_ColtonPostBattle: @ 823CB75
+SSTidalRooms_Text_ColtonPostBattle:
 	.string "I get so excited imagining what kinds\n"
 	.string "of POKéMON I'll get to see in the next\l"
 	.string "CONTEST. The anticipation of it thrills!$"
 
-SSTidalRooms_Text_MicahIntro: @ 823CBEB
+SSTidalRooms_Text_MicahIntro:
 	.string "Are your friends strong?$"
 
-SSTidalRooms_Text_MicahDefeat: @ 823CC04
+SSTidalRooms_Text_MicahDefeat:
 	.string "Your friends are, indeed, strong.$"
 
-SSTidalRooms_Text_MicahPostBattle: @ 823CC26
+SSTidalRooms_Text_MicahPostBattle:
 	.string "Friends need not be human.\n"
 	.string "For me, POKéMON are treasured friends!$"
 
-SSTidalRooms_Text_ThomasIntro: @ 823CC68
+SSTidalRooms_Text_ThomasIntro:
 	.string "Child…\n"
 	.string "Did you knock on the door?$"
 
-SSTidalRooms_Text_ThomasDefeat: @ 823CC8A
+SSTidalRooms_Text_ThomasDefeat:
 	.string "A loss is to be accepted without haste\n"
 	.string "or panic.$"
 
-SSTidalRooms_Text_ThomasPostBattle: @ 823CCBB
+SSTidalRooms_Text_ThomasPostBattle:
 	.string "To be never ruffled in any situation is\n"
 	.string "the GENTLEMAN's code of conduct.$"
 
-SSTidalRooms_Text_JedIntro: @ 823CD04
+SSTidalRooms_Text_JedIntro:
 	.string "JED: I feel a little shy about this, but…\n"
 	.string "We'll show you our lovey-dovey power!$"
 
-SSTidalRooms_Text_JedDefeat: @ 823CD54
+SSTidalRooms_Text_JedDefeat:
 	.string "JED: Sigh…$"
 
-SSTidalRooms_Text_JedPostBattle: @ 823CD5F
+SSTidalRooms_Text_JedPostBattle:
 	.string "JED: It's the first time that our lovey-\n"
 	.string "dovey power couldn't prevail!\l"
 	.string "You must be an awesome TRAINER!$"
 
-SSTidalRooms_Text_JedNotEnoughMons: @ 823CDC6
+SSTidalRooms_Text_JedNotEnoughMons:
 	.string "JED: You only have one POKéMON?\n"
 	.string "Isn't that just too lonesome?$"
 
-SSTidalRooms_Text_LeaIntro: @ 823CE04
+SSTidalRooms_Text_LeaIntro:
 	.string "LEA: I feel a little silly, but…\n"
 	.string "We'll show you our lovey-dovey power!$"
 
-SSTidalRooms_Text_LeaDefeat: @ 823CE4B
+SSTidalRooms_Text_LeaDefeat:
 	.string "LEA: Oh, boo!$"
 
-SSTidalRooms_Text_LeaPostBattle: @ 823CE59
+SSTidalRooms_Text_LeaPostBattle:
 	.string "LEA: I can't believe it!\n"
 	.string "Our lovey-dovey power failed…\l"
 	.string "You must be an awesome TRAINER!$"
 
-SSTidalRooms_Text_LeaNotEnoughMons: @ 823CEB0
+SSTidalRooms_Text_LeaNotEnoughMons:
 	.string "LEA: I wanted to battle…\n"
 	.string "But you don't even have two POKéMON…$"
 
-SSTidalRooms_Text_GarretIntro: @ 823CEEE
+SSTidalRooms_Text_GarretIntro:
 	.string "Ah, you've come just in time.\p"
 	.string "I'm bored, you see.\n"
 	.string "You may entertain me.$"
 
-SSTidalRooms_Text_GarretDefeat: @ 823CF36
+SSTidalRooms_Text_GarretDefeat:
 	.string "…That will do.$"
 
-SSTidalRooms_Text_GarretPostBattle: @ 823CF45
+SSTidalRooms_Text_GarretPostBattle:
 	.string "Perhaps I shall get Father to acquire\n"
 	.string "a yacht for me.\l"
 	.string "A yacht for me and POKéMON!$"
 
-SSTidalRooms_Text_NaomiIntro: @ 823CF97
+SSTidalRooms_Text_NaomiIntro:
 	.string "Oh, you're such an adorable TRAINER.\n"
 	.string "Would you like to have tea?\l"
 	.string "Or would you rather battle?$"
 
-SSTidalRooms_Text_NaomiDefeat: @ 823CFF4
+SSTidalRooms_Text_NaomiDefeat:
 	.string "I see.\n"
 	.string "You're the active sort.$"
 
-SSTidalRooms_Text_NaomiPostBattle: @ 823D013
+SSTidalRooms_Text_NaomiPostBattle:
 	.string "A world cruise on a luxury liner has its\n"
 	.string "charms, I must say…\p"
 	.string "But, I will admit there is an appealing\n"
 	.string "side to touring HOENN by ferry.$"
 
-SSTidalRooms_Text_NotSuspiciousTakeThis: @ 823D098
+SSTidalRooms_Text_NotSuspiciousTakeThis:
 	.string "Uh… Hi! I… I'm not acting suspicious!\n"
 	.string "Uh… You can have this! For free!\p"
 	.string "It… Honestly, I didn't SNATCH it from\n"
 	.string "someone! I'd never do such a thing!\l"
 	.string "It's clean! You can use it!$"
 
-SSTidalRooms_Text_ExplainSnatch: @ 823D145
+SSTidalRooms_Text_ExplainSnatch:
 	.string "SNATCH steals the beneficial effects\n"
 	.string "of certain moves before they can be\l"
 	.string "used by a foe or ally.$"
diff --git a/data/maps/SafariZone_North/scripts.inc b/data/maps/SafariZone_North/scripts.inc
index 365266b4b..6fb6f2e2a 100644
--- a/data/maps/SafariZone_North/scripts.inc
+++ b/data/maps/SafariZone_North/scripts.inc
@@ -1,11 +1,11 @@
-SafariZone_North_MapScripts:: @ 823D253
+SafariZone_North_MapScripts::
 	.byte 0
 
-SafariZone_North_EventScript_Fisherman:: @ 823D254
+SafariZone_North_EventScript_Fisherman::
 	msgbox SafariZone_North_Text_Fisherman, MSGBOX_NPC
 	end
 
-SafariZone_North_EventScript_Man:: @ 823D25D
+SafariZone_North_EventScript_Man::
 	msgbox SafariZone_North_Text_Man, MSGBOX_NPC
 	end
 
diff --git a/data/maps/SafariZone_Northeast/scripts.inc b/data/maps/SafariZone_Northeast/scripts.inc
index a34d6ab95..5fa40e13d 100644
--- a/data/maps/SafariZone_Northeast/scripts.inc
+++ b/data/maps/SafariZone_Northeast/scripts.inc
@@ -1,4 +1,4 @@
-SafariZone_Northeast_MapScripts:: @ 8242C02
+SafariZone_Northeast_MapScripts::
 	.byte 0
 
 @ Event scripts for SafariZone_Northeast are in SafariZone_South/scripts.inc
diff --git a/data/maps/SafariZone_Northwest/scripts.inc b/data/maps/SafariZone_Northwest/scripts.inc
index 5e6261a2e..ab51f09bc 100644
--- a/data/maps/SafariZone_Northwest/scripts.inc
+++ b/data/maps/SafariZone_Northwest/scripts.inc
@@ -1,7 +1,7 @@
-SafariZone_Northwest_MapScripts:: @ 823D249
+SafariZone_Northwest_MapScripts::
 	.byte 0
 
-SafariZone_Northwest_EventScript_Man:: @ 823D24A
+SafariZone_Northwest_EventScript_Man::
 	msgbox SafariZone_Northwest_Text_Man, MSGBOX_NPC
 	end
 
diff --git a/data/maps/SafariZone_RestHouse/scripts.inc b/data/maps/SafariZone_RestHouse/scripts.inc
index bc5688f0f..672b5123f 100644
--- a/data/maps/SafariZone_RestHouse/scripts.inc
+++ b/data/maps/SafariZone_RestHouse/scripts.inc
@@ -1,15 +1,15 @@
-SafariZone_RestHouse_MapScripts:: @ 8242BE6
+SafariZone_RestHouse_MapScripts::
 	.byte 0
 
-SafariZone_RestHouse_EventScript_Youngster:: @ 8242BE7
+SafariZone_RestHouse_EventScript_Youngster::
 	msgbox SafariZone_RestHouse_Text_Youngster, MSGBOX_NPC
 	end
 
-SafariZone_RestHouse_EventScript_PsychicM:: @ 8242BF0
+SafariZone_RestHouse_EventScript_PsychicM::
 	msgbox SafariZone_RestHouse_Text_PsychicM, MSGBOX_NPC
 	end
 
-SafariZone_RestHouse_EventScript_FatMan:: @ 8242BF9
+SafariZone_RestHouse_EventScript_FatMan::
 	msgbox SafariZone_RestHouse_Text_FatMan, MSGBOX_NPC
 	end
 
diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc
index 75ea52347..ee9844340 100644
--- a/data/maps/SafariZone_South/scripts.inc
+++ b/data/maps/SafariZone_South/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_ATTENDANT, 1
 
-SafariZone_South_MapScripts:: @ 823D279
+SafariZone_South_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SafariZone_South_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SafariZone_South_OnFrame
 	.byte 0
 
-SafariZone_South_OnFrame: @ 823D284
+SafariZone_South_OnFrame:
 	map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_EnterSafariZone
 	.2byte 0
 
-SafariZone_South_EventScript_EnterSafariZone:: @ 823D28E
+SafariZone_South_EventScript_EnterSafariZone::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerEnter
 	waitmovement 0
@@ -20,37 +20,37 @@ SafariZone_South_EventScript_EnterSafariZone:: @ 823D28E
 	releaseall
 	end
 
-SafariZone_South_OnTransition: @ 823D2B1
+SafariZone_South_OnTransition:
 	compare VAR_SAFARI_ZONE_STATE, 2
 	call_if_eq SafariZone_South_EventScript_SetExitAttendantAside
 	end
 
-SafariZone_South_EventScript_SetExitAttendantAside:: @ 823D2BD
+SafariZone_South_EventScript_SetExitAttendantAside::
 	setobjectxyperm LOCALID_ATTENDANT, 31, 34
 	return
 
-SafariZone_South_Movement_PlayerEnter: @ 823D2C5
+SafariZone_South_Movement_PlayerEnter:
 	walk_down
 	step_end
 
-SafariZone_South_Movement_ExitAttendantBlockDoor: @ 823D2C7
+SafariZone_South_Movement_ExitAttendantBlockDoor:
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SafariZone_South_EventScript_Boy:: @ 823D2CA
+SafariZone_South_EventScript_Boy::
 	msgbox SafariZone_South_Text_Boy, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_Man:: @ 823D2D3
+SafariZone_South_EventScript_Man::
 	msgbox SafariZone_South_Text_Man, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_Youngster:: @ 823D2DC
+SafariZone_South_EventScript_Youngster::
 	msgbox SafariZone_South_Text_Youngster, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_ExitAttendant:: @ 823D2E5
+SafariZone_South_EventScript_ExitAttendant::
 	lock
 	faceplayer
 	goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_GoodLuck
@@ -61,13 +61,13 @@ SafariZone_South_EventScript_ExitAttendant:: @ 823D2E5
 	release
 	end
 
-SafariZone_South_EventScript_GoodLuck:: @ 823D30D
+SafariZone_South_EventScript_GoodLuck::
 	setflag FLAG_GOOD_LUCK_SAFARI_ZONE
 	msgbox SafariZone_South_Text_GoodLuck, MSGBOX_DEFAULT
 	release
 	end
 
-SafariZone_South_EventScript_ExitEarly:: @ 823D31A
+SafariZone_South_EventScript_ExitEarly::
 	msgbox SafariZone_South_Text_ExitEarlyThankYouForPlaying, MSGBOX_DEFAULT
 	closemessage
 	switch VAR_FACING
@@ -75,7 +75,7 @@ SafariZone_South_EventScript_ExitEarly:: @ 823D31A
 	case DIR_EAST, SafariZone_South_EventScript_ExitEarlyEast
 	end
 
-SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F
+SafariZone_South_EventScript_ExitEarlyNorth::
 	applymovement LOCALID_ATTENDANT, SafariZone_South_Movement_MoveExitAttendantNorth
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerExitNorth
@@ -83,7 +83,7 @@ SafariZone_South_EventScript_ExitEarlyNorth:: @ 823D33F
 	goto SafariZone_South_EventScript_Exit
 	end
 
-SafariZone_South_EventScript_ExitEarlyEast:: @ 823D359
+SafariZone_South_EventScript_ExitEarlyEast::
 	applymovement LOCALID_ATTENDANT, SafariZone_South_Movement_MoveExitAttendantEast
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, SafariZone_South_Movement_PlayerExitEast
@@ -91,64 +91,64 @@ SafariZone_South_EventScript_ExitEarlyEast:: @ 823D359
 	goto SafariZone_South_EventScript_Exit
 	end
 
-SafariZone_South_EventScript_Exit:: @ 823D373
+SafariZone_South_EventScript_Exit::
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate
 	end
 
-SafariZone_South_Movement_PlayerExitNorth: @ 823D385
+SafariZone_South_Movement_PlayerExitNorth:
 	walk_up
 	step_end
 
-SafariZone_South_Movement_PlayerExitEast: @ 823D387
+SafariZone_South_Movement_PlayerExitEast:
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-SafariZone_South_Movement_MoveExitAttendantNorth: @ 823D38A
+SafariZone_South_Movement_MoveExitAttendantNorth:
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-SafariZone_South_Movement_MoveExitAttendantEast: @ 823D38D
+SafariZone_South_Movement_MoveExitAttendantEast:
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-SafariZone_South_EventScript_ConstructionWorker1:: @ 823D390
+SafariZone_South_EventScript_ConstructionWorker1::
 	msgbox SafariZone_South_Text_AreaOffLimits1, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_ExpansionZoneAttendant:: @ 823D399
+SafariZone_Southeast_EventScript_ExpansionZoneAttendant::
 	msgbox SafariZone_Southeast_Text_ExpansionIsFinished, MSGBOX_NPC
 	end
 
-SafariZone_South_EventScript_ConstructionWorker2:: @ 823D3A2
+SafariZone_South_EventScript_ConstructionWorker2::
 	msgbox SafariZone_South_Text_AreaOffLimits2, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_LittleGirl:: @ 823D3AB
+SafariZone_Southeast_EventScript_LittleGirl::
 	msgbox SafariZone_Southeast_Text_LittleGirl, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_FatMan:: @ 823D3B4
+SafariZone_Southeast_EventScript_FatMan::
 	msgbox SafariZone_Southeast_Text_FatMan, MSGBOX_NPC
 	end
 
-SafariZone_Southeast_EventScript_RichBoy:: @ 823D3BD
+SafariZone_Southeast_EventScript_RichBoy::
 	msgbox SafariZone_Southeast_Text_RichBoy, MSGBOX_NPC
 	end
 
-SafariZone_Northeast_EventScript_Boy:: @ 823D3C6
+SafariZone_Northeast_EventScript_Boy::
 	msgbox SafariZone_Northeast_Text_Boy, MSGBOX_NPC
 	end
 
-SafariZone_Northeast_EventScript_Woman:: @ 823D3CF
+SafariZone_Northeast_EventScript_Woman::
 	msgbox SafariZone_Northeast_Text_Woman, MSGBOX_NPC
 	end
 
-SafariZone_Northeast_EventScript_Girl:: @ 823D3D8
+SafariZone_Northeast_EventScript_Girl::
 	msgbox SafariZone_Northeast_Text_Girl, MSGBOX_NPC
 	end
diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc
index 658d88e56..259ab2535 100644
--- a/data/maps/SafariZone_Southeast/scripts.inc
+++ b/data/maps/SafariZone_Southeast/scripts.inc
@@ -1,4 +1,4 @@
-SafariZone_Southeast_MapScripts:: @ 8242C03
+SafariZone_Southeast_MapScripts::
 	.byte 0
 
 @ Event scripts for SafariZone_Southeast are in SafariZone_South/scripts.inc
diff --git a/data/maps/SafariZone_Southwest/scripts.inc b/data/maps/SafariZone_Southwest/scripts.inc
index c862f7906..3662f4542 100644
--- a/data/maps/SafariZone_Southwest/scripts.inc
+++ b/data/maps/SafariZone_Southwest/scripts.inc
@@ -1,11 +1,11 @@
-SafariZone_Southwest_MapScripts:: @ 823D266
+SafariZone_Southwest_MapScripts::
 	.byte 0
 
-SafariZone_Southwest_EventScript_Woman:: @ 823D267
+SafariZone_Southwest_EventScript_Woman::
 	msgbox SafariZone_Southwest_Text_Woman, MSGBOX_NPC
 	end
 
-SafariZone_Southwest_EventScript_RestHouseSign:: @ 823D270
+SafariZone_Southwest_EventScript_RestHouseSign::
 	msgbox SafariZone_Southwest_Text_RestHouseSign, MSGBOX_SIGN
 	end
 
diff --git a/data/maps/ScorchedSlab/scripts.inc b/data/maps/ScorchedSlab/scripts.inc
index 34ad01330..48ccd0a02 100644
--- a/data/maps/ScorchedSlab/scripts.inc
+++ b/data/maps/ScorchedSlab/scripts.inc
@@ -1,8 +1,8 @@
-ScorchedSlab_MapScripts:: @ 8239291
+ScorchedSlab_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, ScorchedSlab_OnTransition
 	.byte 0
 
-ScorchedSlab_OnTransition: @ 8239297
+ScorchedSlab_OnTransition:
 	setflag FLAG_LANDMARK_SCORCHED_SLAB
 	end
 
diff --git a/data/maps/SeafloorCavern_Entrance/scripts.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc
index 20f731044..b6b7b6675 100644
--- a/data/maps/SeafloorCavern_Entrance/scripts.inc
+++ b/data/maps/SeafloorCavern_Entrance/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_GRUNT, 1
 
-SeafloorCavern_Entrance_MapScripts:: @ 823446E
+SeafloorCavern_Entrance_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, SeafloorCavern_Entrance_OnResume
 	.byte 0
 
-SeafloorCavern_Entrance_OnResume: @ 8234474
+SeafloorCavern_Entrance_OnResume:
 	setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
 	setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5
 	end
 
-SeafloorCavern_Entrance_EventScript_Grunt:: @ 8234485
+SeafloorCavern_Entrance_EventScript_Grunt::
 	lockall
 	compare VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
 	goto_if_eq SeafloorCavern_Entrance_EventScript_GruntSpeechShort
@@ -36,7 +36,7 @@ SeafloorCavern_Entrance_EventScript_Grunt:: @ 8234485
 	releaseall
 	end
 
-SeafloorCavern_Entrance_EventScript_GruntSpeechShort:: @ 82344ED
+SeafloorCavern_Entrance_EventScript_GruntSpeechShort::
 	compare VAR_FACING, DIR_WEST
 	call_if_eq SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest
 	compare VAR_FACING, DIR_EAST
@@ -50,22 +50,22 @@ SeafloorCavern_Entrance_EventScript_GruntSpeechShort:: @ 82344ED
 	releaseall
 	end
 
-SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast:: @ 8234523
+SeafloorCavern_Entrance_EventScript_GruntFacePlayerEast::
 	applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest:: @ 823452E
+SeafloorCavern_Entrance_EventScript_GruntFacePlayerWest::
 	applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth:: @ 8234539
+SeafloorCavern_Entrance_EventScript_GruntFacePlayerNorth::
 	applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep: @ 8234544
+SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep:
 	.string "Hey!\n"
 	.string "I remember your face!\p"
 	.string "If you're here, it must mean that\n"
@@ -81,7 +81,7 @@ SeafloorCavern_Entrance_Text_HearMagmaNearMossdeep: @ 8234544
 	.string "That bunch of goons, they sure don't\n"
 	.string "look good near the sea!$"
 
-SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort: @ 82346C8
+SeafloorCavern_Entrance_Text_HearMagmaNearMossdeepShort:
 	.string "A punk like you, do you really think\n"
 	.string "you can take on TEAM AQUA?\p"
 	.string "I'd say you're too early by about\n"
diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc
index 6baa9ca4e..fefa4ca27 100644
--- a/data/maps/SeafloorCavern_Room1/scripts.inc
+++ b/data/maps/SeafloorCavern_Room1/scripts.inc
@@ -1,35 +1,35 @@
-SeafloorCavern_Room1_MapScripts:: @ 82347EB
+SeafloorCavern_Room1_MapScripts::
 	.byte 0
 
-SeafloorCavern_Room1_EventScript_Grunt1:: @ 82347EC
+SeafloorCavern_Room1_EventScript_Grunt1::
 	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_1, SeafloorCavern_Room1_Text_Grunt1Intro, SeafloorCavern_Room1_Text_Grunt1Defeat
 	msgbox SeafloorCavern_Room1_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room1_EventScript_Grunt2:: @ 8234803
+SeafloorCavern_Room1_EventScript_Grunt2::
 	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_2, SeafloorCavern_Room1_Text_Grunt2Intro, SeafloorCavern_Room1_Text_Grunt2Defeat
 	msgbox SeafloorCavern_Room1_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room1_Text_Grunt1Intro: @ 823481A
+SeafloorCavern_Room1_Text_Grunt1Intro:
 	.string "We don't need a kid around!\n"
 	.string "Go on home already!$"
 
-SeafloorCavern_Room1_Text_Grunt1Defeat: @ 823484A
+SeafloorCavern_Room1_Text_Grunt1Defeat:
 	.string "I want to go home…$"
 
-SeafloorCavern_Room1_Text_Grunt1PostBattle: @ 823485D
+SeafloorCavern_Room1_Text_Grunt1PostBattle:
 	.string "I want to get a promotion so I can\n"
 	.string "boss around the GRUNTS…$"
 
-SeafloorCavern_Room1_Text_Grunt2Intro: @ 8234898
+SeafloorCavern_Room1_Text_Grunt2Intro:
 	.string "That submarine… It's tiny inside.\n"
 	.string "I'm sore all over!$"
 
-SeafloorCavern_Room1_Text_Grunt2Defeat: @ 82348CD
+SeafloorCavern_Room1_Text_Grunt2Defeat:
 	.string "Losing makes me sore!$"
 
-SeafloorCavern_Room1_Text_Grunt2PostBattle: @ 82348E3
+SeafloorCavern_Room1_Text_Grunt2PostBattle:
 	.string "That submarine we jacked, man,\n"
 	.string "it's brutal as a ride.\l"
 	.string "It's way too tight in there!$"
diff --git a/data/maps/SeafloorCavern_Room2/scripts.inc b/data/maps/SeafloorCavern_Room2/scripts.inc
index 15201dac0..e6213c124 100644
--- a/data/maps/SeafloorCavern_Room2/scripts.inc
+++ b/data/maps/SeafloorCavern_Room2/scripts.inc
@@ -1,3 +1,3 @@
-SeafloorCavern_Room2_MapScripts:: @ 8234936
+SeafloorCavern_Room2_MapScripts::
 	.byte 0
 
diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc
index 1cfb702c8..48b4c60ed 100644
--- a/data/maps/SeafloorCavern_Room3/scripts.inc
+++ b/data/maps/SeafloorCavern_Room3/scripts.inc
@@ -1,17 +1,17 @@
-SeafloorCavern_Room3_MapScripts:: @ 8234937
+SeafloorCavern_Room3_MapScripts::
 	.byte 0
 
-SeafloorCavern_Room3_EventScript_Shelly:: @ 8234938
+SeafloorCavern_Room3_EventScript_Shelly::
 	trainerbattle_single TRAINER_SHELLY_SEAFLOOR_CAVERN, SeafloorCavern_Room3_Text_ShellyIntro, SeafloorCavern_Room3_Text_ShellyDefeat
 	msgbox SeafloorCavern_Room3_Text_ShellyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room3_EventScript_Grunt5:: @ 823494F
+SeafloorCavern_Room3_EventScript_Grunt5::
 	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_5, SeafloorCavern_Room3_Text_Grunt5Intro, SeafloorCavern_Room3_Text_Grunt5Defeat
 	msgbox SeafloorCavern_Room3_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room3_Text_ShellyIntro: @ 8234966
+SeafloorCavern_Room3_Text_ShellyIntro:
 	.string "Ahahahaha!\p"
 	.string "How did you manage to get here without\n"
 	.string "a submarine?\l"
@@ -23,11 +23,11 @@ SeafloorCavern_Room3_Text_ShellyIntro: @ 8234966
 	.string "I'm going to give you a little taste\n"
 	.string "of pain! Resign yourself to it!$"
 
-SeafloorCavern_Room3_Text_ShellyDefeat: @ 8234A79
+SeafloorCavern_Room3_Text_ShellyDefeat:
 	.string "Ahahahaha!\p"
 	.string "Ouch!$"
 
-SeafloorCavern_Room3_Text_ShellyPostBattle: @ 8234A8A
+SeafloorCavern_Room3_Text_ShellyPostBattle:
 	.string "Ahahahaha!\n"
 	.string "You're so darn strong.\p"
 	.string "It's terribly disappointing that you're\n"
@@ -36,7 +36,7 @@ SeafloorCavern_Room3_Text_ShellyPostBattle: @ 8234A8A
 	.string "world our BOSS has promised as\l"
 	.string "one of us…$"
 
-SeafloorCavern_Room3_Text_Grunt5Intro: @ 8234B3A
+SeafloorCavern_Room3_Text_Grunt5Intro:
 	.string "For our dream to become real, we need\n"
 	.string "the power of POKéMON.\p"
 	.string "But meddlers like you use the power of\n"
@@ -45,10 +45,10 @@ SeafloorCavern_Room3_Text_Grunt5Intro: @ 8234B3A
 	.string "Life just doesn't work the way we\n"
 	.string "need it to!$"
 
-SeafloorCavern_Room3_Text_Grunt5Defeat: @ 8234BFE
+SeafloorCavern_Room3_Text_Grunt5Defeat:
 	.string "Gwah!$"
 
-SeafloorCavern_Room3_Text_Grunt5PostBattle: @ 8234C04
+SeafloorCavern_Room3_Text_Grunt5PostBattle:
 	.string "You know, we don't dare question\n"
 	.string "the motives of our leader.\p"
 	.string "But here you are, just some punk,\n"
diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc
index e2f32287a..ab1add78f 100644
--- a/data/maps/SeafloorCavern_Room4/scripts.inc
+++ b/data/maps/SeafloorCavern_Room4/scripts.inc
@@ -1,35 +1,35 @@
-SeafloorCavern_Room4_MapScripts:: @ 8234C9B
+SeafloorCavern_Room4_MapScripts::
 	.byte 0
 
-SeafloorCavern_Room4_EventScript_Grunt3:: @ 8234C9C
+SeafloorCavern_Room4_EventScript_Grunt3::
 	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_3, SeafloorCavern_Room4_Text_Grunt3Intro, SeafloorCavern_Room4_Text_Grunt3Defeat
 	msgbox SeafloorCavern_Room4_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room4_EventScript_Grunt4:: @ 8234CB3
+SeafloorCavern_Room4_EventScript_Grunt4::
 	trainerbattle_single TRAINER_GRUNT_SEAFLOOR_CAVERN_4, SeafloorCavern_Room4_Text_Grunt4Intro, SeafloorCavern_Room4_Text_Grunt4Defeat
 	msgbox SeafloorCavern_Room4_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SeafloorCavern_Room4_Text_Grunt3Intro: @ 8234CCA
+SeafloorCavern_Room4_Text_Grunt3Intro:
 	.string "Who are you?\n"
 	.string "Where did you come in from?$"
 
-SeafloorCavern_Room4_Text_Grunt3Defeat: @ 8234CF3
+SeafloorCavern_Room4_Text_Grunt3Defeat:
 	.string "Lost it…$"
 
-SeafloorCavern_Room4_Text_Grunt3PostBattle: @ 8234CFC
+SeafloorCavern_Room4_Text_Grunt3PostBattle:
 	.string "I can't find the way out!\p"
 	.string "I'm not afraid. Don't get me wrong!$"
 
-SeafloorCavern_Room4_Text_Grunt4Intro: @ 8234D3A
+SeafloorCavern_Room4_Text_Grunt4Intro:
 	.string "Who are you?\n"
 	.string "Where do you think you're going?$"
 
-SeafloorCavern_Room4_Text_Grunt4Defeat: @ 8234D68
+SeafloorCavern_Room4_Text_Grunt4Defeat:
 	.string "I failed to win!$"
 
-SeafloorCavern_Room4_Text_Grunt4PostBattle: @ 8234D79
+SeafloorCavern_Room4_Text_Grunt4PostBattle:
 	.string "My partner forgot the map in that\n"
 	.string "submarine!\p"
 	.string "How's that for being useless?$"
diff --git a/data/maps/SeafloorCavern_Room5/scripts.inc b/data/maps/SeafloorCavern_Room5/scripts.inc
index e1c68db6e..244ca5a80 100644
--- a/data/maps/SeafloorCavern_Room5/scripts.inc
+++ b/data/maps/SeafloorCavern_Room5/scripts.inc
@@ -1,3 +1,3 @@
-SeafloorCavern_Room5_MapScripts:: @ 8234DC4
+SeafloorCavern_Room5_MapScripts::
 	.byte 0
 
diff --git a/data/maps/SeafloorCavern_Room6/scripts.inc b/data/maps/SeafloorCavern_Room6/scripts.inc
index ae8cf02fa..49ac33a98 100644
--- a/data/maps/SeafloorCavern_Room6/scripts.inc
+++ b/data/maps/SeafloorCavern_Room6/scripts.inc
@@ -1,3 +1,3 @@
-SeafloorCavern_Room6_MapScripts:: @ 8234DC5
+SeafloorCavern_Room6_MapScripts::
 	.byte 0
 
diff --git a/data/maps/SeafloorCavern_Room7/scripts.inc b/data/maps/SeafloorCavern_Room7/scripts.inc
index e91cf6193..a022e08d2 100644
--- a/data/maps/SeafloorCavern_Room7/scripts.inc
+++ b/data/maps/SeafloorCavern_Room7/scripts.inc
@@ -1,3 +1,3 @@
-SeafloorCavern_Room7_MapScripts:: @ 8234DC6
+SeafloorCavern_Room7_MapScripts::
 	.byte 0
 
diff --git a/data/maps/SeafloorCavern_Room8/scripts.inc b/data/maps/SeafloorCavern_Room8/scripts.inc
index 471cafd17..99a367edb 100644
--- a/data/maps/SeafloorCavern_Room8/scripts.inc
+++ b/data/maps/SeafloorCavern_Room8/scripts.inc
@@ -1,3 +1,3 @@
-SeafloorCavern_Room8_MapScripts:: @ 8234DC7
+SeafloorCavern_Room8_MapScripts::
 	.byte 0
 
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
index 06ae0d6fe..7749d7a19 100644
--- a/data/maps/SeafloorCavern_Room9/scripts.inc
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -5,10 +5,10 @@
 .set LOCALID_GRUNT_2, 5
 .set LOCALID_KYOGRE_SLEEPING, 7
 
-SeafloorCavern_Room9_MapScripts:: @ 8234DC8
+SeafloorCavern_Room9_MapScripts::
 	.byte 0
 
-SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9
+SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre::
 	lockall
 	setvar VAR_0x8004, LOCALID_ARCHIE
 	setvar VAR_0x8005, LOCALID_MAXIE
@@ -150,7 +150,7 @@ SeafloorCavern_Room9_EventScript_ArchieAwakenKyogre:: @ 8234DC9
 	releaseall
 	end
 
-SeafloorCavern_Room9_Movement_ArchieApproachPlayer: @ 823502A
+SeafloorCavern_Room9_Movement_ArchieApproachPlayer:
 	walk_right
 	walk_right
 	walk_right
@@ -160,21 +160,21 @@ SeafloorCavern_Room9_Movement_ArchieApproachPlayer: @ 823502A
 	walk_right
 	step_end
 
-SeafloorCavern_Room9_Movement_Unused1: @ 8235032
+SeafloorCavern_Room9_Movement_Unused1:
 	walk_left
 	walk_left
 	step_end
 
-SeafloorCavern_Room9_Movement_ArchieListenMessage: @ 8235035
+SeafloorCavern_Room9_Movement_ArchieListenMessage:
 	walk_left
 	delay_16
 	step_end
 
-SeafloorCavern_Room9_Movement_Unused2: @ 8235038
+SeafloorCavern_Room9_Movement_Unused2:
 	walk_right
 	step_end
 
-SeafloorCavern_Room9_Movement_ArchieExit: @ 823503A
+SeafloorCavern_Room9_Movement_ArchieExit:
 	face_up
 	lock_facing_direction
 	walk_down
@@ -182,7 +182,7 @@ SeafloorCavern_Room9_Movement_ArchieExit: @ 823503A
 	walk_in_place_fastest_right
 	step_end
 
-SeafloorCavern_Room9_Movement_KyogreApproach: @ 8235040
+SeafloorCavern_Room9_Movement_KyogreApproach:
 	delay_16
 	delay_16
 	walk_slow_down
@@ -195,12 +195,12 @@ SeafloorCavern_Room9_Movement_KyogreApproach: @ 8235040
 	delay_16
 	step_end
 
-SeafloorCavern_Room9_Movement_KyogreExit: @ 823504B
+SeafloorCavern_Room9_Movement_KyogreExit:
 	slide_up
 	slide_up
 	step_end
 
-SeafloorCavern_Room9_Movement_MaxieArrive: @ 823504E
+SeafloorCavern_Room9_Movement_MaxieArrive:
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -208,49 +208,49 @@ SeafloorCavern_Room9_Movement_MaxieArrive: @ 823504E
 	walk_fast_right
 	step_end
 
-SeafloorCavern_Room9_Movement_MaxieExit: @ 8235054
+SeafloorCavern_Room9_Movement_MaxieExit:
 	walk_right
 	walk_right
 	step_end
 
-SeafloorCavern_Room9_Movement_MagmaGruntArrive: @ 8235057
+SeafloorCavern_Room9_Movement_MagmaGruntArrive:
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
 	step_end
 
-SeafloorCavern_Room9_Movement_Delay32: @ 823505C
+SeafloorCavern_Room9_Movement_Delay32:
 	delay_16
 	delay_16
 	step_end
 
-SeafloorCavern_Room9_Text_ArchieHoldItRightThere: @ 823505F
+SeafloorCavern_Room9_Text_ArchieHoldItRightThere:
 	.string "ARCHIE: Hold it right there.$"
 
-SeafloorCavern_Room9_Text_ArchieSoItWasYou: @ 823507C
+SeafloorCavern_Room9_Text_ArchieSoItWasYou:
 	.string "ARCHIE: Fufufu…\n"
 	.string "So it was you, after all.$"
 
-SeafloorCavern_Room9_Text_ArchieBeholdKyogre: @ 82350A6
+SeafloorCavern_Room9_Text_ArchieBeholdKyogre:
 	.string "ARCHIE: Behold!\p"
 	.string "See how beautiful it is, the sleeping\n"
 	.string "form of the ancient POKéMON KYOGRE!\p"
 	.string "I have waited so long for this day to\n"
 	.string "come…$"
 
-SeafloorCavern_Room9_Text_ArchieYouMustDisappear: @ 823512C
+SeafloorCavern_Room9_Text_ArchieYouMustDisappear:
 	.string "ARCHIE: It surprises me, how you've\n"
 	.string "managed to chase me here.\p"
 	.string "But that's all over now.\p"
 	.string "For the realization of my dream,\n"
 	.string "you must disappear now!$"
 
-SeafloorCavern_Room9_Text_ArchieDefeat: @ 82351BC
+SeafloorCavern_Room9_Text_ArchieDefeat:
 	.string "What?!\n"
 	.string "I lost to a mere child like you?!$"
 
-SeafloorCavern_Room9_Text_ArchieWithThisRedOrb: @ 82351E5
+SeafloorCavern_Room9_Text_ArchieWithThisRedOrb:
 	.string "ARCHIE: Fufufu…\p"
 	.string "I commend you. I must recognize that\n"
 	.string "you are truly gifted.\p"
@@ -258,21 +258,21 @@ SeafloorCavern_Room9_Text_ArchieWithThisRedOrb: @ 82351E5
 	.string "I have this in my possession!\p"
 	.string "With this RED ORB, I can make KYOGRE…$"
 
-SeafloorCavern_Room9_Text_RedOrbShinesByItself: @ 8235279
+SeafloorCavern_Room9_Text_RedOrbShinesByItself:
 	.string "The RED ORB suddenly began shining\n"
 	.string "by itself!$"
 
-SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo: @ 82352A7
+SeafloorCavern_Room9_Text_ArchieWhereDidKyogreGo:
 	.string "ARCHIE: What?!\p"
 	.string "I didn't do anything.\n"
 	.string "Why did the RED ORB…\p"
 	.string "Where did KYOGRE go?$"
 
-SeafloorCavern_Room9_Text_ArchieAMessageFromOutside: @ 82352F6
+SeafloorCavern_Room9_Text_ArchieAMessageFromOutside:
 	.string "ARCHIE: Hm? It's a message from our\n"
 	.string "members outside…$"
 
-SeafloorCavern_Room9_Text_ArchieWhatRainingTooHard: @ 823532B
+SeafloorCavern_Room9_Text_ArchieWhatRainingTooHard:
 	.string "ARCHIE: Yes, what is it?\p"
 	.string "Hm…\n"
 	.string "It's raining heavily?\p"
@@ -288,7 +288,7 @@ SeafloorCavern_Room9_Text_ArchieWhatRainingTooHard: @ 823532B
 	.string "Hold your position and monitor\n"
 	.string "the situation!$"
 
-SeafloorCavern_Room9_Text_ArchieWhyDidKyogreDisappear: @ 823546F
+SeafloorCavern_Room9_Text_ArchieWhyDidKyogreDisappear:
 	.string "ARCHIE: There's something wrong…\p"
 	.string "The RED ORB is supposed to awaken\n"
 	.string "and control KYOGRE…\p"
@@ -296,7 +296,7 @@ SeafloorCavern_Room9_Text_ArchieWhyDidKyogreDisappear: @ 823546F
 	.string "Why did KYOGRE disappear?\p"
 	.string "Why?!$"
 
-SeafloorCavern_Room9_Text_MaxieWhatHaveYouWrought: @ 82354F0
+SeafloorCavern_Room9_Text_MaxieWhatHaveYouWrought:
 	.string "MAXIE: What have you wrought?\p"
 	.string "ARCHIE… You've finally awoken KYOGRE,\n"
 	.string "haven't you?\p"
@@ -305,7 +305,7 @@ SeafloorCavern_Room9_Text_MaxieWhatHaveYouWrought: @ 82354F0
 	.string "The world's landmass will drown in\n"
 	.string "the deepening sea…$"
 
-SeafloorCavern_Room9_Text_ArchieDontGetAllHighAndMighty: @ 82355C2
+SeafloorCavern_Room9_Text_ArchieDontGetAllHighAndMighty:
 	.string "ARCHIE: W-what?!\n"
 	.string "Don't get all high and mighty with me!\p"
 	.string "Wasn't it you, TEAM MAGMA, that\n"
@@ -314,13 +314,13 @@ SeafloorCavern_Room9_Text_ArchieDontGetAllHighAndMighty: @ 82355C2
 	.string "I should be able to control KYOGRE…\p"
 	.string "I should be able to control it…$"
 
-SeafloorCavern_Room9_Text_MaxieWeDontHaveTimeToArgue: @ 8235692
+SeafloorCavern_Room9_Text_MaxieWeDontHaveTimeToArgue:
 	.string "MAXIE: We don't have the time to\n"
 	.string "argue about it here!\p"
 	.string "Get outside and see for yourself!\p"
 	.string "See if what you've wrought is the\n"
 	.string "world that we desired!$"
 
-SeafloorCavern_Room9_Text_MaxieComeOnPlayer: @ 8235723
+SeafloorCavern_Room9_Text_MaxieComeOnPlayer:
 	.string "MAXIE: {PLAYER}, come on, you have\n"
 	.string "to get out of here, too!$"
diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc
index c31bb7efc..f81e5f9fd 100644
--- a/data/maps/SealedChamber_InnerRoom/scripts.inc
+++ b/data/maps/SealedChamber_InnerRoom/scripts.inc
@@ -1,7 +1,7 @@
-SealedChamber_InnerRoom_MapScripts:: @ 82391F7
+SealedChamber_InnerRoom_MapScripts::
 	.byte 0
 
-SealedChamber_InnerRoom_EventScript_BrailleBackWall:: @ 82391F8
+SealedChamber_InnerRoom_EventScript_BrailleBackWall::
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth
 	waitbuttonpress
@@ -34,11 +34,11 @@ SealedChamber_InnerRoom_EventScript_BrailleBackWall:: @ 82391F8
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_NoEffect:: @ 8239253
+SealedChamber_InnerRoom_EventScript_NoEffect::
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_BrailleStoryPart1:: @ 8239255
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart1::
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived
 	waitbuttonpress
@@ -46,7 +46,7 @@ SealedChamber_InnerRoom_EventScript_BrailleStoryPart1:: @ 8239255
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_BrailleStoryPart2:: @ 823925F
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart2::
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon
 	waitbuttonpress
@@ -54,7 +54,7 @@ SealedChamber_InnerRoom_EventScript_BrailleStoryPart2:: @ 823925F
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_BrailleStoryPart3:: @ 8239269
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart3::
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway
 	waitbuttonpress
@@ -62,7 +62,7 @@ SealedChamber_InnerRoom_EventScript_BrailleStoryPart3:: @ 8239269
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_BrailleStoryPart4:: @ 8239273
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart4::
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_WeFearedIt
 	waitbuttonpress
@@ -70,7 +70,7 @@ SealedChamber_InnerRoom_EventScript_BrailleStoryPart4:: @ 8239273
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_BrailleStoryPart5:: @ 823927D
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart5::
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_ThoseWithCourageHope
 	waitbuttonpress
@@ -78,7 +78,7 @@ SealedChamber_InnerRoom_EventScript_BrailleStoryPart5:: @ 823927D
 	releaseall
 	end
 
-SealedChamber_InnerRoom_EventScript_BrailleStoryPart6:: @ 8239287
+SealedChamber_InnerRoom_EventScript_BrailleStoryPart6::
 	lockall
 	braillemessage SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits
 	waitbuttonpress
diff --git a/data/maps/SealedChamber_OuterRoom/scripts.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index f3cd05a86..2e80d06c8 100644
--- a/data/maps/SealedChamber_OuterRoom/scripts.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
@@ -1,23 +1,23 @@
-SealedChamber_OuterRoom_MapScripts:: @ 8239106
+SealedChamber_OuterRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, SealedChamber_OuterRoom_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, SealedChamber_OuterRoom_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, SealedChamber_OuterRoom_OnLoad
 	.byte 0
 
-SealedChamber_OuterRoom_OnResume: @ 8239116
+SealedChamber_OuterRoom_OnResume:
 	setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
 	setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44
 	end
 
-SealedChamber_OuterRoom_OnTransition: @ 8239127
+SealedChamber_OuterRoom_OnTransition:
 	setflag FLAG_LANDMARK_SEALED_CHAMBER
 	end
 
-SealedChamber_OuterRoom_OnLoad: @ 823912B
+SealedChamber_OuterRoom_OnLoad:
 	call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance
 	end
 
-SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance:: @ 8239135
+SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance::
 	setmetatile 9, 1, METATILE_Cave_EntranceCover, 1
 	setmetatile 10, 1, METATILE_Cave_EntranceCover, 1
 	setmetatile 11, 1, METATILE_Cave_EntranceCover, 1
@@ -26,7 +26,7 @@ SealedChamber_OuterRoom_EventScript_CloseInnerRoomEntrance:: @ 8239135
 	setmetatile 11, 2, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
-SealedChamber_OuterRoom_EventScript_BrailleABC:: @ 823916C
+SealedChamber_OuterRoom_EventScript_BrailleABC::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_ABC
 	waitbuttonpress
@@ -34,7 +34,7 @@ SealedChamber_OuterRoom_EventScript_BrailleABC:: @ 823916C
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_BrailleGHI:: @ 8239176
+SealedChamber_OuterRoom_EventScript_BrailleGHI::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_GHI
 	waitbuttonpress
@@ -42,7 +42,7 @@ SealedChamber_OuterRoom_EventScript_BrailleGHI:: @ 8239176
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_BrailleMNO:: @ 8239180
+SealedChamber_OuterRoom_EventScript_BrailleMNO::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_MNO
 	waitbuttonpress
@@ -50,7 +50,7 @@ SealedChamber_OuterRoom_EventScript_BrailleMNO:: @ 8239180
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_BrailleTUV:: @ 823918A
+SealedChamber_OuterRoom_EventScript_BrailleTUV::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_TUV
 	waitbuttonpress
@@ -58,7 +58,7 @@ SealedChamber_OuterRoom_EventScript_BrailleTUV:: @ 823918A
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_BrailleDEF:: @ 8239194
+SealedChamber_OuterRoom_EventScript_BrailleDEF::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_DEF
 	waitbuttonpress
@@ -66,7 +66,7 @@ SealedChamber_OuterRoom_EventScript_BrailleDEF:: @ 8239194
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_BrailleJKL:: @ 823919E
+SealedChamber_OuterRoom_EventScript_BrailleJKL::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_JKL
 	waitbuttonpress
@@ -74,7 +74,7 @@ SealedChamber_OuterRoom_EventScript_BrailleJKL:: @ 823919E
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_BraillePQRS:: @ 82391A8
+SealedChamber_OuterRoom_EventScript_BraillePQRS::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_PQRS
 	waitbuttonpress
@@ -82,7 +82,7 @@ SealedChamber_OuterRoom_EventScript_BraillePQRS:: @ 82391A8
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_BraillePeriod:: @ 82391B2
+SealedChamber_OuterRoom_EventScript_BraillePeriod::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_Period
 	waitbuttonpress
@@ -90,7 +90,7 @@ SealedChamber_OuterRoom_EventScript_BraillePeriod:: @ 82391B2
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_BrailleWXYZ:: @ 82391BC
+SealedChamber_OuterRoom_EventScript_BrailleWXYZ::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_WXYZ
 	waitbuttonpress
@@ -98,7 +98,7 @@ SealedChamber_OuterRoom_EventScript_BrailleWXYZ:: @ 82391BC
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_BrailleComma:: @ 82391C6
+SealedChamber_OuterRoom_EventScript_BrailleComma::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_Comma
 	waitbuttonpress
@@ -106,7 +106,7 @@ SealedChamber_OuterRoom_EventScript_BrailleComma:: @ 82391C6
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall:: @ 82391D0
+SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall::
 	lockall
 	goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_HoleInWall
 	braillemessage SealedChamber_OuterRoom_Braille_DigHere
@@ -115,12 +115,12 @@ SealedChamber_OuterRoom_EventScript_InnerRoomEntranceWall:: @ 82391D0
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_HoleInWall:: @ 82391E3
+SealedChamber_OuterRoom_EventScript_HoleInWall::
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SealedChamber_OuterRoom_EventScript_BrailleDigHere:: @ 82391ED
+SealedChamber_OuterRoom_EventScript_BrailleDigHere::
 	lockall
 	braillemessage SealedChamber_OuterRoom_Braille_DigHere
 	waitbuttonpress
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
index d2a93f8e9..0f3518ce6 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
@@ -1,3 +1,3 @@
-ShoalCave_HighTideEntranceRoom_MapScripts:: @ 82372AB
+ShoalCave_HighTideEntranceRoom_MapScripts::
 	.byte 0
 
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
index 6045f80a6..1da508a9b 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
@@ -1,3 +1,3 @@
-ShoalCave_HighTideInnerRoom_MapScripts:: @ 82372AC
+ShoalCave_HighTideInnerRoom_MapScripts::
 	.byte 0
 
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
index 89cadd56d..a1206dfb4 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
@@ -1,21 +1,21 @@
-ShoalCave_LowTideEntranceRoom_MapScripts:: @ 8236DBA
+ShoalCave_LowTideEntranceRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideEntranceRoom_OnTransition
 	.byte 0
 
-ShoalCave_LowTideEntranceRoom_OnTransition: @ 8236DC0
+ShoalCave_LowTideEntranceRoom_OnTransition:
 	special UpdateShoalTideFlag
 	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide
 	goto ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide
 
-ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide:: @ 8236DD1
+ShoalCave_LowTideEntranceRoom_EventScript_SetHighTide::
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide:: @ 8236DD5
+ShoalCave_LowTideEntranceRoom_EventScript_SetLowTide::
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert:: @ 8236DD9
+ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert::
 	lock
 	faceplayer
 	dotimebasedevents
@@ -46,28 +46,28 @@ ShoalCave_LowTideEntranceRoom_EventScript_ShellBellExpert:: @ 8236DD9
 	end
 
 @ If the bag is full, check if a slot will be freed when 4 Shoal Salt or Shells are given
-ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreed:: @ 8236E69
+ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreed::
 	checkitem ITEM_SHOAL_SALT, 5
 	compare VAR_RESULT, TRUE
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells
 	return
 
-ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells:: @ 8236E7A
+ShoalCave_LowTideEntranceRoom_EventScript_CheckSpaceWillBeFreedShells::
 	checkitem ITEM_SHOAL_SHELL, 5
 	compare VAR_RESULT, TRUE
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed
 	return
 
-ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed:: @ 8236E8B
+ShoalCave_LowTideEntranceRoom_EventScript_NoSpaceWillBeFreed::
 	setvar VAR_RESULT, 2
 	return
 
-ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell:: @ 8236E91
+ShoalCave_LowTideEntranceRoom_EventScript_NoRoomForShellBell::
 	msgbox ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells:: @ 8236E9B
+ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells::
 	checkitem ITEM_SHOAL_SALT, 1
 	compare VAR_RESULT, TRUE
 	goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell
@@ -78,17 +78,17 @@ ShoalCave_LowTideEntranceRoom_EventScript_NotEnoughShoalSaltOrShells:: @ 8236E9B
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell:: @ 8236EC5
+ShoalCave_LowTideEntranceRoom_EventScript_HasSomeShoalSaltOrShell::
 	msgbox ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_DeclineShellBell:: @ 8236ECF
+ShoalCave_LowTideEntranceRoom_EventScript_DeclineShellBell::
 	msgbox ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_ResetShoalItems:: @ 8236ED9
+ShoalCave_LowTideEntranceRoom_EventScript_ResetShoalItems::
 	clearflag FLAG_RECEIVED_SHOAL_SALT_1
 	clearflag FLAG_RECEIVED_SHOAL_SALT_2
 	clearflag FLAG_RECEIVED_SHOAL_SALT_3
diff --git a/data/maps/ShoalCave_LowTideIceRoom/scripts.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
index 3f7a5cce8..9c9a1a172 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
@@ -1,3 +1,3 @@
-ShoalCave_LowTideIceRoom_MapScripts:: @ 82396A1
+ShoalCave_LowTideIceRoom_MapScripts::
 	.byte 0
 
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 69ef1e75f..9692d2f69 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
@@ -1,65 +1,65 @@
-ShoalCave_LowTideInnerRoom_MapScripts:: @ 8236EF5
+ShoalCave_LowTideInnerRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideInnerRoom_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, ShoalCave_LowTideInnerRoom_OnTransition
 	.byte 0
 
-ShoalCave_LowTideInnerRoom_OnTransition: @ 8236F00
+ShoalCave_LowTideInnerRoom_OnTransition:
 	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetHighTide
 	goto ShoalCave_LowTideInnerRoom_EventScript_SetLowTide
 
-ShoalCave_LowTideInnerRoom_EventScript_SetHighTide:: @ 8236F0E
+ShoalCave_LowTideInnerRoom_EventScript_SetHighTide::
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_SetLowTide:: @ 8236F12
+ShoalCave_LowTideInnerRoom_EventScript_SetLowTide::
 	setmaplayoutindex LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
 	end
 
-ShoalCave_LowTideInnerRoom_OnLoad: @ 8236F16
+ShoalCave_LowTideInnerRoom_OnLoad:
 	call ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles:: @ 8236F1C
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles::
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
 	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
 	setmetatile 31, 8, METATILE_Cave_ShoalCave_DirtPile_Large, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2:: @ 8236F3D
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles2::
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
 	goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
 	setmetatile 14, 26, METATILE_Cave_ShoalCave_DirtPile_Large, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3:: @ 8236F5E
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles3::
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4
 	setmetatile 41, 20, METATILE_Cave_ShoalCave_BlueStone_Large, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4:: @ 8236F76
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles4::
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5
 	setmetatile 41, 10, METATILE_Cave_ShoalCave_BlueStone_Large, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5:: @ 8236F8E
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles5::
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6
 	setmetatile 6, 9, METATILE_Cave_ShoalCave_BlueStone_Large, 1
 	goto ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6:: @ 8236FA6
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatiles6::
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd
 	setmetatile 16, 13, METATILE_Cave_ShoalCave_BlueStone_Large, 1
 	return
 
-ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8236FB9
+ShoalCave_LowTideInnerRoom_EventScript_SetShoalItemMetatilesEnd::
 	return
 
-ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1:: @ 8236FBA
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1::
 	lockall
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem ITEM_SHOAL_SHELL
@@ -71,12 +71,12 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell1:: @ 8236FBA
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell:: @ 8236FEC
+ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell::
 	msgbox ShoalCave_Text_WasShoallShellNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2:: @ 8236FF6
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2::
 	lockall
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem ITEM_SHOAL_SHELL
@@ -88,7 +88,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell2:: @ 8236FF6
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3:: @ 8237028
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3::
 	lockall
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem ITEM_SHOAL_SHELL
@@ -100,7 +100,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell3:: @ 8237028
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4:: @ 823705A
+ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4::
 	lockall
 	goto_if_set FLAG_RECEIVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalShell
 	giveitem ITEM_SHOAL_SHELL
@@ -112,7 +112,7 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalShell4:: @ 823705A
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1:: @ 823708C
+ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1::
 	lockall
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt
 	giveitem ITEM_SHOAL_SALT
@@ -124,12 +124,12 @@ ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt1:: @ 823708C
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt:: @ 82370BE
+ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt::
 	msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2:: @ 82370C8
+ShoalCave_LowTideInnerRoom_EventScript_ShoalSalt2::
 	lockall
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_ReceivedShoalSalt
 	giveitem ITEM_SHOAL_SALT
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
index 0c259ff23..d7937998e 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
@@ -1,20 +1,20 @@
-ShoalCave_LowTideLowerRoom_MapScripts:: @ 8237156
+ShoalCave_LowTideLowerRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideLowerRoom_OnLoad
 	.byte 0
 
-ShoalCave_LowTideLowerRoom_OnLoad: @ 823715C
+ShoalCave_LowTideLowerRoom_OnLoad:
 	call ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles:: @ 8237162
+ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatiles::
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd
 	setmetatile 18, 2, METATILE_Cave_ShoalCave_DirtPile_Large, 1
 	return
 
-ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237175
+ShoalCave_LowTideLowerRoom_EventScript_SetShoalItemMetatilesEnd::
 	return
 
-ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4:: @ 8237176
+ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4::
 	lockall
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt
 	giveitem ITEM_SHOAL_SALT
@@ -26,12 +26,12 @@ ShoalCave_LowTideLowerRoom_EventScript_ShoalSalt4:: @ 8237176
 	releaseall
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt:: @ 82371A8
+ShoalCave_LowTideLowerRoom_EventScript_ReceivedShoalSalt::
 	msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_BlackBelt:: @ 82371B2
+ShoalCave_LowTideLowerRoom_EventScript_BlackBelt::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand
@@ -43,18 +43,18 @@ ShoalCave_LowTideLowerRoom_EventScript_BlackBelt:: @ 82371B2
 	release
 	end
 
-ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand:: @ 82371E1
+ShoalCave_LowTideLowerRoom_EventScript_ReceivedFocusBand::
 	msgbox ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus, MSGBOX_DEFAULT
 	release
 	end
 
-ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus: @ 82371EB
+ShoalCave_LowTideLowerRoom_Text_CanOvercomeColdWithFocus:
 	.string "The penetrating cold around these\n"
 	.string "parts is an impediment to training.\p"
 	.string "But with focus, one can overcome!\p"
 	.string "With this FOCUS BAND, buckle down and\n"
 	.string "withstand the cold!$"
 
-ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus: @ 823728D
+ShoalCave_LowTideLowerRoom_Text_EverythingStartsWithFocus:
 	.string "Everything starts with focus!$"
 
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
index 6bbdf0345..a778a18e1 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
@@ -1,20 +1,20 @@
-ShoalCave_LowTideStairsRoom_MapScripts:: @ 82370FA
+ShoalCave_LowTideStairsRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, ShoalCave_LowTideStairsRoom_OnLoad
 	.byte 0
 
-ShoalCave_LowTideStairsRoom_OnLoad: @ 8237100
+ShoalCave_LowTideStairsRoom_OnLoad:
 	call ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles
 	end
 
-ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles:: @ 8237106
+ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatiles::
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd
 	setmetatile 11, 11, METATILE_Cave_ShoalCave_DirtPile_Large, 1
 	return
 
-ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd:: @ 8237119
+ShoalCave_LowTideStairsRoom_EventScript_SetShoalItemMetatilesEnd::
 	return
 
-ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3:: @ 823711A
+ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3::
 	lockall
 	goto_if_set FLAG_RECEIVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt
 	giveitem ITEM_SHOAL_SALT
@@ -26,7 +26,7 @@ ShoalCave_LowTideStairsRoom_EventScript_ShoalSalt3:: @ 823711A
 	releaseall
 	end
 
-ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt:: @ 823714C
+ShoalCave_LowTideStairsRoom_EventScript_ReceivedShoalSalt::
 	msgbox ShoalCave_Text_WasShoalSaltNowNothing, MSGBOX_DEFAULT
 	releaseall
 	end
diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc
index d60feb155..3ef94b261 100644
--- a/data/maps/SkyPillar_1F/scripts.inc
+++ b/data/maps/SkyPillar_1F/scripts.inc
@@ -1,13 +1,13 @@
-SkyPillar_1F_MapScripts:: @ 8239615
+SkyPillar_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_1F_OnTransition
 	.byte 0
 
-SkyPillar_1F_OnTransition: @ 823961B
+SkyPillar_1F_OnTransition:
 	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_1F_EventScript_CleanFloor
 	end
 
-SkyPillar_1F_EventScript_CleanFloor:: @ 8239627
+SkyPillar_1F_EventScript_CleanFloor::
 	setmaplayoutindex LAYOUT_SKY_PILLAR_1F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc
index 8a02974ea..9990ebba9 100644
--- a/data/maps/SkyPillar_2F/scripts.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
@@ -1,20 +1,20 @@
-SkyPillar_2F_MapScripts:: @ 823962B
+SkyPillar_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_SetHoleWarp
 	.byte 0
 
-SkyPillar_2F_OnTransition: @ 823963B
+SkyPillar_2F_OnTransition:
 	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_2F_EventScript_CleanFloor
 	copyvar VAR_ICE_STEP_COUNT, 1
 	end
 
-SkyPillar_2F_EventScript_CleanFloor:: @ 823964C
+SkyPillar_2F_EventScript_CleanFloor::
 	setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN
 	return
 
-SkyPillar_2F_SetHoleWarp: @ 8239650
+SkyPillar_2F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
 	setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0
 	end
diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc
index d55ac27af..681137df0 100644
--- a/data/maps/SkyPillar_3F/scripts.inc
+++ b/data/maps/SkyPillar_3F/scripts.inc
@@ -1,13 +1,13 @@
-SkyPillar_3F_MapScripts:: @ 823965B
+SkyPillar_3F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_3F_OnTransition
 	.byte 0
 
-SkyPillar_3F_OnTransition: @ 8239661
+SkyPillar_3F_OnTransition:
 	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_3F_EventScript_CleanFloor
 	end
 
-SkyPillar_3F_EventScript_CleanFloor:: @ 823966D
+SkyPillar_3F_EventScript_CleanFloor::
 	setmaplayoutindex LAYOUT_SKY_PILLAR_3F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc
index af54deaff..bed91a175 100644
--- a/data/maps/SkyPillar_4F/scripts.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
@@ -1,20 +1,20 @@
-SkyPillar_4F_MapScripts:: @ 8239671
+SkyPillar_4F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_SetHoleWarp
 	.byte 0
 
-SkyPillar_4F_OnTransition: @ 8239681
+SkyPillar_4F_OnTransition:
 	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_4F_EventScript_CleanFloor
 	copyvar VAR_ICE_STEP_COUNT, 1
 	end
 
-SkyPillar_4F_EventScript_CleanFloor:: @ 8239692
+SkyPillar_4F_EventScript_CleanFloor::
 	setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN
 	return
 
-SkyPillar_4F_SetHoleWarp: @ 8239696
+SkyPillar_4F_SetHoleWarp:
 	setstepcallback STEP_CB_CRACKED_FLOOR
 	setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0
 	end
diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc
index 2ba0c0db8..12fc72f49 100644
--- a/data/maps/SkyPillar_5F/scripts.inc
+++ b/data/maps/SkyPillar_5F/scripts.inc
@@ -1,13 +1,13 @@
-SkyPillar_5F_MapScripts:: @ 82396A2
+SkyPillar_5F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_5F_OnTransition
 	.byte 0
 
-SkyPillar_5F_OnTransition: @ 82396A8
+SkyPillar_5F_OnTransition:
 	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_5F_EventScript_CleanFloor
 	return
 
-SkyPillar_5F_EventScript_CleanFloor:: @ 82396B4
+SkyPillar_5F_EventScript_CleanFloor::
 	setmaplayoutindex LAYOUT_SKY_PILLAR_5F_CLEAN
 	return
 
diff --git a/data/maps/SkyPillar_Entrance/scripts.inc b/data/maps/SkyPillar_Entrance/scripts.inc
index bc213d376..b90454bc3 100644
--- a/data/maps/SkyPillar_Entrance/scripts.inc
+++ b/data/maps/SkyPillar_Entrance/scripts.inc
@@ -1,8 +1,8 @@
-SkyPillar_Entrance_MapScripts:: @ 823929E
+SkyPillar_Entrance_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Entrance_OnTransition
 	.byte 0
 
-SkyPillar_Entrance_OnTransition: @ 82392A4
+SkyPillar_Entrance_OnTransition:
 	setflag FLAG_LANDMARK_SKY_PILLAR
 	end
 
diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc
index 2e0495bca..f11b378ed 100644
--- a/data/maps/SkyPillar_Outside/scripts.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
@@ -1,40 +1,40 @@
 .set LOCALID_WALLACE, 1
 
-SkyPillar_Outside_MapScripts:: @ 82392A8
+SkyPillar_Outside_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Outside_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, SkyPillar_Outside_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_Outside_OnFrame
 	.byte 0
 
-SkyPillar_Outside_OnTransition: @ 82392B8
+SkyPillar_Outside_OnTransition:
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
 	call_if_eq SkyPillar_Outside_EventScript_HideMapNamePopup
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
 	call_if_ge SkyPillar_Outside_EventScript_CheckSetAbnormalWeather
 	end
 
-SkyPillar_Outside_EventScript_HideMapNamePopup:: @ 82392CF
+SkyPillar_Outside_EventScript_HideMapNamePopup::
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-SkyPillar_Outside_EventScript_CheckSetAbnormalWeather:: @ 82392D3
+SkyPillar_Outside_EventScript_CheckSetAbnormalWeather::
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAbnormalWeather
 	return
 
-SkyPillar_Outside_OnLoad: @ 82392DD
+SkyPillar_Outside_OnLoad:
 	call_if_set FLAG_WALLACE_GOES_TO_SKY_PILLAR, SkyPillar_Outside_EventScript_OpenDoor
 	end
 
-SkyPillar_Outside_EventScript_OpenDoor:: @ 82392E7
+SkyPillar_Outside_EventScript_OpenDoor::
 	setmetatile 14, 4, METATILE_Pacifidlog_SkyPillar_DoorOpen_Top, 0
 	setmetatile 14, 5, METATILE_Pacifidlog_SkyPillar_DoorOpen_Bottom, 0
 	return
 
-SkyPillar_Outside_OnFrame: @ 82392FA
+SkyPillar_Outside_OnFrame:
 	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 3, SkyPillar_Outside_EventScript_WallaceScene
 	.2byte 0
 
-SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
+SkyPillar_Outside_EventScript_WallaceScene::
 	lockall
 	applymovement LOCALID_WALLACE, SkyPillar_Outside_Movement_WallaceApproachPlayer
 	waitmovement 0
@@ -91,7 +91,7 @@ SkyPillar_Outside_EventScript_WallaceScene:: @ 8239304
 	releaseall
 	end
 
-SkyPillar_Outside_Movement_WallaceApproachPlayer: @ 82393D3
+SkyPillar_Outside_Movement_WallaceApproachPlayer:
 	walk_down
 	walk_down
 	walk_down
@@ -104,7 +104,7 @@ SkyPillar_Outside_Movement_WallaceApproachPlayer: @ 82393D3
 	walk_right
 	step_end
 
-SkyPillar_Outside_Movement_WallaceClimbSkyPillar: @ 82393DE
+SkyPillar_Outside_Movement_WallaceClimbSkyPillar:
 	walk_left
 	walk_left
 	walk_left
@@ -119,7 +119,7 @@ SkyPillar_Outside_Movement_WallaceClimbSkyPillar: @ 82393DE
 	walk_up
 	step_end
 
-SkyPillar_Outside_Movement_PlayerClimbSkyPillar: @ 82393EB
+SkyPillar_Outside_Movement_PlayerClimbSkyPillar:
 	walk_left
 	walk_left
 	walk_left
@@ -134,17 +134,17 @@ SkyPillar_Outside_Movement_PlayerClimbSkyPillar: @ 82393EB
 	walk_up
 	step_end
 
-SkyPillar_Outside_EventScript_Wallace:: @ 82393F8
+SkyPillar_Outside_EventScript_Wallace::
 	end
 
-SkyPillar_Outside_EventScript_ClosedDoor:: @ 82393F9
+SkyPillar_Outside_EventScript_ClosedDoor::
 	msgbox SkyPillar_Outside_Text_DoorIsClosed, MSGBOX_SIGN
 	end
 
-SkyPillar_Outside_Text_DoorIsClosed: @ 8239402
+SkyPillar_Outside_Text_DoorIsClosed:
 	.string "The door is closed.$"
 
-SkyPillar_Outside_Text_OpenedDoorToSkyPillar: @ 8239416
+SkyPillar_Outside_Text_OpenedDoorToSkyPillar:
 	.string "WALLACE: Oh, my, I'm terribly sorry!\p"
 	.string "In my haste, I didn't notice that\n"
 	.string "I'd left you behind!\p"
@@ -152,16 +152,16 @@ SkyPillar_Outside_Text_OpenedDoorToSkyPillar: @ 8239416
 	.string "the SKY PILLAR.\p"
 	.string "{PLAYER}{KUN}, let's be on our way!$"
 
-SkyPillar_Outside_Text_EarthquakeNotMomentToWaste: @ 82394BC
+SkyPillar_Outside_Text_EarthquakeNotMomentToWaste:
 	.string "WALLACE: It's an earthquake!\p"
 	.string "There's not a moment to waste!\n"
 	.string "We've got to hurry!$"
 
-SkyPillar_Outside_Text_SituationGettingWorse: @ 823950C
+SkyPillar_Outside_Text_SituationGettingWorse:
 	.string "WALLACE: Hmm…\n"
 	.string "The situation is getting worse…$"
 
-SkyPillar_Outside_Text_GotToGoBackForSootopolis: @ 823953A
+SkyPillar_Outside_Text_GotToGoBackForSootopolis:
 	.string "WALLACE: This isn't good…\p"
 	.string "The weather distortion is spreading\n"
 	.string "even here…\p"
diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc
index 86d6cf717..acbdb4c8b 100644
--- a/data/maps/SkyPillar_Top/scripts.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
@@ -1,51 +1,51 @@
 .set LOCALID_RAYQUAZA_SLEEPING, 1
 
-SkyPillar_Top_MapScripts:: @ 82396B8
+SkyPillar_Top_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, SkyPillar_Top_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_Top_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SkyPillar_Top_OnWarp
 	.byte 0
 
-SkyPillar_Top_OnResume: @ 82396C8
+SkyPillar_Top_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_TryRemoveRayquaza
 	end
 
-SkyPillar_Top_EventScript_TryRemoveRayquaza:: @ 82396D2
+SkyPillar_Top_EventScript_TryRemoveRayquaza::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-SkyPillar_Top_OnTransition: @ 82396E6
+SkyPillar_Top_OnTransition:
 	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_lt SkyPillar_Top_EventScript_SetCleanLayout
 	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_ge SkyPillar_Top_EventScript_TryShowRayquaza
 	end
 
-SkyPillar_Top_EventScript_SetCleanLayout:: @ 82396FD
+SkyPillar_Top_EventScript_SetCleanLayout::
 	setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN
 	setobjectmovementtype LOCALID_RAYQUAZA_SLEEPING, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SkyPillar_Top_EventScript_TryShowRayquaza:: @ 8239705
+SkyPillar_Top_EventScript_TryShowRayquaza::
 	call_if_unset FLAG_DEFEATED_RAYQUAZA, SkyPillar_Top_EventScript_ShowRayquaza
 	return
 
-SkyPillar_Top_EventScript_ShowRayquaza:: @ 823970F
+SkyPillar_Top_EventScript_ShowRayquaza::
 	clearflag FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_STILL
 	return
 
-SkyPillar_Top_OnWarp: @ 8239713
+SkyPillar_Top_OnWarp:
 	map_script_2 VAR_SKY_PILLAR_STATE, 0, SkyPillar_Top_EventScript_RayquazaFaceDown
 	.2byte 0
 
-SkyPillar_Top_EventScript_RayquazaFaceDown:: @ 823971D
+SkyPillar_Top_EventScript_RayquazaFaceDown::
 	turnobject LOCALID_RAYQUAZA_SLEEPING, DIR_SOUTH
 	end
 
-SkyPillar_Top_EventScript_Rayquaza:: @ 8239722
+SkyPillar_Top_EventScript_Rayquaza::
 	lockall
 	waitse
 	playmoncry SPECIES_RAYQUAZA, 2
@@ -67,24 +67,24 @@ SkyPillar_Top_EventScript_Rayquaza:: @ 8239722
 	releaseall
 	end
 
-SkyPillar_Top_EventScript_DefeatedRayquaza:: @ 8239768
+SkyPillar_Top_EventScript_DefeatedRayquaza::
 	setflag FLAG_DEFEATED_RAYQUAZA
 	goto SkyPillar_Top_EventScript_DefeatedRayquaza2
 	end
 
-SkyPillar_Top_EventScript_RanFromRayquaza:: @ 8239771
+SkyPillar_Top_EventScript_RanFromRayquaza::
 	setvar VAR_0x8004, SPECIES_RAYQUAZA
 	goto SkyPillar_Top_EventScript_RanFromRayquaza2
 	end
 
-SkyPillar_Top_EventScript_DefeatedRayquaza2:: @ 823977C
+SkyPillar_Top_EventScript_DefeatedRayquaza2::
 	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject VAR_LAST_TALKED
 	fadescreenswapbuffers FADE_FROM_BLACK
 	releaseall
 	end
 
-SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785
+SkyPillar_Top_EventScript_RanFromRayquaza2::
 	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject VAR_LAST_TALKED
 	fadescreenswapbuffers FADE_FROM_BLACK
@@ -93,7 +93,7 @@ SkyPillar_Top_EventScript_RanFromRayquaza2:: @ 8239785
 	releaseall
 	end
 
-SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A
+SkyPillar_Top_EventScript_AwakenRayquaza::
 	lockall
 	fadeoutbgm 1
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
@@ -140,7 +140,7 @@ SkyPillar_Top_EventScript_AwakenRayquaza:: @ 823979A
 
 @ Rayquaza has unusual movement frames
 @ See comments, or sAnimTable_Rayquaza
-SkyPillar_Top_Movement_RayquazaStir: @ 823983A
+SkyPillar_Top_Movement_RayquazaStir:
 	delay_16
 	walk_in_place_fast_left  @ Coiled, awake
 	delay_16
@@ -159,7 +159,7 @@ SkyPillar_Top_Movement_RayquazaStir: @ 823983A
 	delay_16
 	step_end
 
-SkyPillar_Top_Movement_RayquazaFlyOff: @ 823984B
+SkyPillar_Top_Movement_RayquazaFlyOff:
 	delay_16
 	walk_in_place_down  @ Coiled, asleep
 	delay_8
@@ -174,18 +174,18 @@ SkyPillar_Top_Movement_RayquazaFlyOff: @ 823984B
 	slide_up
 	step_end
 
-SkyPillar_Top_Movement_CameraPanUp: @ 8239858
+SkyPillar_Top_Movement_CameraPanUp:
 	walk_slow_up
 	walk_slow_up
 	walk_slow_up
 	step_end
 
-SkyPillar_Top_Movement_CameraPanDown: @ 823985C
+SkyPillar_Top_Movement_CameraPanDown:
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down
 	step_end
 
-SkyPillar_Top_Text_RayquazaFlewOff: @ 8239860
+SkyPillar_Top_Text_RayquazaFlewOff:
 	.string "The awakened RAYQUAZA flew off…$"
 
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index ceb2e862a..4a5671714 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -19,12 +19,12 @@
 .set LOCALID_GRUNT_11, 33
 .set LOCALID_SCOTT, 35
 
-SlateportCity_MapScripts:: @ 81DCC61
+SlateportCity_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_OnFrame
 	.byte 0
 
-SlateportCity_OnTransition: @ 81DCC6C
+SlateportCity_OnTransition:
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
 	call SlateportCity_EventScript_EnterSlateport
 	compare VAR_SLATEPORT_CITY_STATE, 1
@@ -33,13 +33,13 @@ SlateportCity_OnTransition: @ 81DCC6C
 	call_if_eq SlateportCity_EventScript_SetReadyForScottScene
 	end
 
-SlateportCity_EventScript_EnterSlateport:: @ 81DCC8D
+SlateportCity_EventScript_EnterSlateport::
 	setflag FLAG_VISITED_SLATEPORT_CITY
 	setvar VAR_CONTEST_HALL_STATE, 0
 	setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
 	return
 
-SlateportCity_EventScript_MovePeopleForSternInterview:: @ 81DCC99
+SlateportCity_EventScript_MovePeopleForSternInterview::
 	setobjectxyperm LOCALID_CAPT_STERN, 28, 13
 	setobjectxyperm LOCALID_OLD_WOMAN, 25, 13
 	setobjectxyperm LOCALID_RICH_BOY, 25, 14
@@ -56,7 +56,7 @@ SlateportCity_EventScript_MovePeopleForSternInterview:: @ 81DCC99
 	setobjectmovementtype LOCALID_MAN_1, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-SlateportCity_EventScript_SetReadyForScottScene:: @ 81DCCE7
+SlateportCity_EventScript_SetReadyForScottScene::
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 30
@@ -65,16 +65,16 @@ SlateportCity_EventScript_SetReadyForScottScene:: @ 81DCCE7
 	setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-SlateportCity_EventScript_MoveScottLeft:: @ 81DCD06
+SlateportCity_EventScript_MoveScottLeft::
 	setobjectxyperm LOCALID_SCOTT, 22, 27
 	setobjectmovementtype LOCALID_SCOTT, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-SlateportCity_OnFrame: @ 81DCD12
+SlateportCity_OnFrame:
 	map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_ScottScene
 	.2byte 0
 
-SlateportCity_EventScript_ScottScene:: @ 81DCD1C
+SlateportCity_EventScript_ScottScene::
 	lockall
 	addobject LOCALID_SCOTT
 	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott
@@ -110,13 +110,13 @@ SlateportCity_EventScript_ScottScene:: @ 81DCD1C
 	releaseall
 	end
 
-SlateportCity_Movement_PlayerFaceScott: @ 81DCDA8
+SlateportCity_Movement_PlayerFaceScott:
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_Movement_ScottApproachPlayer: @ 81DCDAC
+SlateportCity_Movement_ScottApproachPlayer:
 	walk_right
 	walk_right
 	walk_right
@@ -126,7 +126,7 @@ SlateportCity_Movement_ScottApproachPlayer: @ 81DCDAC
 	walk_right
 	step_end
 
-SlateportCity_Movement_ScottExit: @ 81DCDB4
+SlateportCity_Movement_ScottExit:
 	walk_left
 	walk_left
 	walk_left
@@ -137,7 +137,7 @@ SlateportCity_Movement_ScottExit: @ 81DCDB4
 	walk_left
 	step_end
 
-SlateportCity_EventScript_EnergyGuru:: @ 81DCDBD
+SlateportCity_EventScript_EnergyGuru::
 	lock
 	faceplayer
 	message SlateportCity_Text_EnergyGuruSellWhatYouNeed
@@ -147,7 +147,8 @@ SlateportCity_EventScript_EnergyGuru:: @ 81DCDBD
 	release
 	end
 
-SlateportCity_Pokemart_EnergyGuru: @ 81DCDD4
+	.align 2
+SlateportCity_Pokemart_EnergyGuru:
 	.2byte ITEM_PROTEIN
 	.2byte ITEM_IRON
 	.2byte ITEM_CARBOS
@@ -158,7 +159,7 @@ SlateportCity_Pokemart_EnergyGuru: @ 81DCDD4
 	release
 	end
 
-SlateportCity_EventScript_EffortRibbonWoman:: @ 81DCDE4
+SlateportCity_EventScript_EffortRibbonWoman::
 	lock
 	faceplayer
 	bufferleadmonspeciesname 0
@@ -178,17 +179,17 @@ SlateportCity_EventScript_EffortRibbonWoman:: @ 81DCDE4
 	release
 	end
 
-SlateportCity_EventScript_MonEVsNotMaxed:: @ 81DCE2E
+SlateportCity_EventScript_MonEVsNotMaxed::
 	msgbox SlateportCity_Text_GoForItLittleHarder, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_MonHasEffortRibbon:: @ 81DCE38
+SlateportCity_EventScript_MonHasEffortRibbon::
 	msgbox SlateportCity_Text_EffortRibbonLooksGoodOnIt, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_Cook:: @ 81DCE42
+SlateportCity_EventScript_Cook::
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
@@ -197,12 +198,12 @@ SlateportCity_EventScript_Cook:: @ 81DCE42
 	release
 	end
 
-SlateportCity_EventScript_CookSternInterview:: @ 81DCE59
+SlateportCity_EventScript_CookSternInterview::
 	msgbox SlateportCity_Text_CaptainComeBackWithBigFish, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_OldWoman:: @ 81DCE63
+SlateportCity_EventScript_OldWoman::
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
@@ -211,12 +212,12 @@ SlateportCity_EventScript_OldWoman:: @ 81DCE63
 	release
 	end
 
-SlateportCity_EventScript_OldWomanSternInterview:: @ 81DCE7A
+SlateportCity_EventScript_OldWomanSternInterview::
 	msgbox SlateportCity_Text_CaptSternBeingInterviewed, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_Girl:: @ 81DCE84
+SlateportCity_EventScript_Girl::
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
@@ -226,17 +227,17 @@ SlateportCity_EventScript_Girl:: @ 81DCE84
 	release
 	end
 
-SlateportCity_EventScript_GirlSternInterview:: @ 81DCEA4
+SlateportCity_EventScript_GirlSternInterview::
 	msgbox SlateportCity_Text_InterviewerSoCool, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_GirlSecretBase:: @ 81DCEAE
+SlateportCity_EventScript_GirlSecretBase::
 	msgbox SlateportCity_Text_BuyBricksSoDecorWontGetDirty, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_RichBoy:: @ 81DCEB8
+SlateportCity_EventScript_RichBoy::
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
@@ -245,22 +246,22 @@ SlateportCity_EventScript_RichBoy:: @ 81DCEB8
 	release
 	end
 
-SlateportCity_EventScript_RichBoySternInterview:: @ 81DCECF
+SlateportCity_EventScript_RichBoySternInterview::
 	msgbox SlateportCity_Text_SternSaysDiscoveredSomething, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_FatMan:: @ 81DCED9
+SlateportCity_EventScript_FatMan::
 	compare VAR_SLATEPORT_CITY_STATE, 1
 	goto_if_eq SlateportCity_EventScript_FatManSternInterview
 	msgbox SlateportCity_Text_BushedHikingFromMauville, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_FatManSternInterview:: @ 81DCEED
+SlateportCity_EventScript_FatManSternInterview::
 	msgbox SlateportCity_Text_AmIOnTV, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_Man1:: @ 81DCEF6
+SlateportCity_EventScript_Man1::
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
@@ -269,12 +270,12 @@ SlateportCity_EventScript_Man1:: @ 81DCEF6
 	release
 	end
 
-SlateportCity_EventScript_Man1SternInterview:: @ 81DCF0D
+SlateportCity_EventScript_Man1SternInterview::
 	msgbox SlateportCity_Text_CaptainsACelebrity, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_Woman1:: @ 81DCF17
+SlateportCity_EventScript_Woman1::
 	lock
 	faceplayer
 	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_Woman1AquaGone
@@ -282,16 +283,16 @@ SlateportCity_EventScript_Woman1:: @ 81DCF17
 	release
 	end
 
-SlateportCity_EventScript_Woman1AquaGone:: @ 81DCF2C
+SlateportCity_EventScript_Woman1AquaGone::
 	msgbox SlateportCity_Text_VisitedMuseumOften, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_BattleTentSign:: @ 81DCF36
+SlateportCity_EventScript_BattleTentSign::
 	msgbox SlateportCity_Text_BattleTentSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_SternsShipyardSign:: @ 81DCF3F
+SlateportCity_EventScript_SternsShipyardSign::
 	lockall
 	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_SternsShipyardFerryComplete
 	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_SternsShipyardNearsCompletion
@@ -299,49 +300,49 @@ SlateportCity_EventScript_SternsShipyardSign:: @ 81DCF3F
 	releaseall
 	end
 
-SlateportCity_EventScript_SternsShipyardNearsCompletion:: @ 81DCF5C
+SlateportCity_EventScript_SternsShipyardNearsCompletion::
 	msgbox SlateportCity_Text_SternsShipyardNearsCompletion, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_SternsShipyardFerryComplete:: @ 81DCF66
+SlateportCity_EventScript_SternsShipyardFerryComplete::
 	msgbox SlateportCity_Text_SternsShipyardFerryComplete, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_PokemonFanClubSign:: @ 81DCF70
+SlateportCity_EventScript_PokemonFanClubSign::
 	msgbox SlateportCity_Text_PokemonFanClubSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_OceanicMuseumSign:: @ 81DCF79
+SlateportCity_EventScript_OceanicMuseumSign::
 	msgbox SlateportCity_Text_OceanicMuseumSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_CitySign:: @ 81DCF82
+SlateportCity_EventScript_CitySign::
 	msgbox SlateportCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_MarketSign:: @ 81DCF8B
+SlateportCity_EventScript_MarketSign::
 	msgbox SlateportCity_Text_MarketSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_HarborSign:: @ 81DCF94
+SlateportCity_EventScript_HarborSign::
 	lockall
 	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_HarborSignFerryComplete
 	msgbox SlateportCity_Text_HarborFerryUnderConstruction, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_HarborSignFerryComplete:: @ 81DCFA8
+SlateportCity_EventScript_HarborSignFerryComplete::
 	msgbox SlateportCity_Text_HarborSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_NameRatersHouseSign:: @ 81DCFB2
+SlateportCity_EventScript_NameRatersHouseSign::
 	msgbox SlateportCity_Text_NameRatersHouseSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_Maniac:: @ 81DCFBB
+SlateportCity_EventScript_Maniac::
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
@@ -351,32 +352,32 @@ SlateportCity_EventScript_Maniac:: @ 81DCFBB
 	end
 
 @ Unclear if the text here was meant to be different, but its not
-SlateportCity_EventScript_ManiacSternInterview:: @ 81DCFD2
+SlateportCity_EventScript_ManiacSternInterview::
 	msgbox SlateportCity_Text_GetNameRaterToHelpYou, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_Woman2:: @ 81DCFDC
+SlateportCity_EventScript_Woman2::
 	msgbox SlateportCity_Text_CantChangeTradeMonName, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_Sailor1:: @ 81DCFE5
+SlateportCity_EventScript_Sailor1::
 	msgbox SlateportCity_Text_SeaIsSoWet, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_Sailor2:: @ 81DCFEE
+SlateportCity_EventScript_Sailor2::
 	msgbox SlateportCity_Text_SinkOldBoats, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_PokefanF:: @ 81DCFF7
+SlateportCity_EventScript_PokefanF::
 	msgbox SlateportCity_Text_BuyTooMuch, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_Man2:: @ 81DD000
+SlateportCity_EventScript_Man2::
 	msgbox SlateportCity_Text_BattleTentBuiltRecently, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_AquaGrunt1:: @ 81DD009
+SlateportCity_EventScript_AquaGrunt1::
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_QuitPushing, MSGBOX_DEFAULT
@@ -386,7 +387,7 @@ SlateportCity_EventScript_AquaGrunt1:: @ 81DD009
 	release
 	end
 
-SlateportCity_EventScript_AquaGrunt2:: @ 81DD020
+SlateportCity_EventScript_AquaGrunt2::
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_AquaHasPolicy, MSGBOX_DEFAULT
@@ -396,7 +397,7 @@ SlateportCity_EventScript_AquaGrunt2:: @ 81DD020
 	release
 	end
 
-SlateportCity_EventScript_AquaGrunt3:: @ 81DD037
+SlateportCity_EventScript_AquaGrunt3::
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_BossIsBrilliant, MSGBOX_DEFAULT
@@ -406,7 +407,7 @@ SlateportCity_EventScript_AquaGrunt3:: @ 81DD037
 	release
 	end
 
-SlateportCity_EventScript_AquaGrunt4:: @ 81DD04E
+SlateportCity_EventScript_AquaGrunt4::
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_WhatsNewSchemeIWonder, MSGBOX_DEFAULT
@@ -416,7 +417,7 @@ SlateportCity_EventScript_AquaGrunt4:: @ 81DD04E
 	release
 	end
 
-SlateportCity_EventScript_AquaGrunt5:: @ 81DD065
+SlateportCity_EventScript_AquaGrunt5::
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_ShouldTakeItAll, MSGBOX_DEFAULT
@@ -426,7 +427,7 @@ SlateportCity_EventScript_AquaGrunt5:: @ 81DD065
 	release
 	end
 
-SlateportCity_EventScript_AquaGrunt6:: @ 81DD07C
+SlateportCity_EventScript_AquaGrunt6::
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_DontButtIn, MSGBOX_DEFAULT
@@ -436,7 +437,7 @@ SlateportCity_EventScript_AquaGrunt6:: @ 81DD07C
 	release
 	end
 
-SlateportCity_EventScript_AquaGrunt7:: @ 81DD093
+SlateportCity_EventScript_AquaGrunt7::
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_RemindsMeOfLongLineForGames, MSGBOX_DEFAULT
@@ -446,7 +447,7 @@ SlateportCity_EventScript_AquaGrunt7:: @ 81DD093
 	release
 	end
 
-SlateportCity_EventScript_AquaGrunt8:: @ 81DD0AA
+SlateportCity_EventScript_AquaGrunt8::
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_WhyAreWeLiningUp, MSGBOX_DEFAULT
@@ -456,7 +457,7 @@ SlateportCity_EventScript_AquaGrunt8:: @ 81DD0AA
 	release
 	end
 
-SlateportCity_EventScript_AquaGrunt9:: @ 81DD0C1
+SlateportCity_EventScript_AquaGrunt9::
 	lock
 	faceplayer
 	playse SE_PIN
@@ -489,16 +490,16 @@ SlateportCity_EventScript_AquaGrunt9:: @ 81DD0C1
 	release
 	end
 
-SlateportCity_Movement_DelayAquaGrunt: @ 81DD147
+SlateportCity_Movement_DelayAquaGrunt:
 	delay_16
 	delay_16
 	step_end
 
-SlateportCity_EventScript_AquaGrunt10:: @ 81DD14A
+SlateportCity_EventScript_AquaGrunt10::
 	msgbox SlateportCity_Text_ShouldveBroughtMyGameBoy, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_AquaGrunt11:: @ 81DD153
+SlateportCity_EventScript_AquaGrunt11::
 	lock
 	faceplayer
 	msgbox SlateportCity_Text_HotSpringsAfterOperation, MSGBOX_DEFAULT
@@ -508,7 +509,7 @@ SlateportCity_EventScript_AquaGrunt11:: @ 81DD153
 	release
 	end
 
-SlateportCity_EventScript_DollClerk:: @ 81DD16A
+SlateportCity_EventScript_DollClerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -519,7 +520,7 @@ SlateportCity_EventScript_DollClerk:: @ 81DD16A
 	end
 
 	.align 2
-SlateportCity_PokemartDecor_Dolls: @ 81DD184
+SlateportCity_PokemartDecor_Dolls:
 	.2byte DECOR_AZURILL_DOLL
 	.2byte DECOR_MARILL_DOLL
 	.2byte DECOR_SKITTY_DOLL
@@ -527,12 +528,12 @@ SlateportCity_PokemartDecor_Dolls: @ 81DD184
 	release
 	end
 
-SlateportCity_EventScript_ComeBackWithSecretPower:: @ 81DD18E
+SlateportCity_EventScript_ComeBackWithSecretPower::
 	msgbox gText_ComeBackWithSecretPower, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_DecorClerk:: @ 81DD198
+SlateportCity_EventScript_DecorClerk::
 	lock
 	faceplayer
 	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_ComeBackWithSecretPower
@@ -543,7 +544,8 @@ SlateportCity_EventScript_DecorClerk:: @ 81DD198
 	release
 	end
 
-SlateportCity_PokemartDecor: @ 81DD1B8
+	.align 2
+SlateportCity_PokemartDecor:
 	.2byte DECOR_RED_BRICK
 	.2byte DECOR_BLUE_BRICK
 	.2byte DECOR_YELLOW_BRICK
@@ -562,7 +564,7 @@ SlateportCity_PokemartDecor: @ 81DD1B8
 	release
 	end
 
-SlateportCity_EventScript_PowerTMClerk:: @ 81DD1D8
+SlateportCity_EventScript_PowerTMClerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -573,7 +575,7 @@ SlateportCity_EventScript_PowerTMClerk:: @ 81DD1D8
 	end
 
 	.align 2
-SlateportCity_Pokemart_PowerTMs: @ 81DD1F0
+SlateportCity_Pokemart_PowerTMs:
 	.2byte ITEM_TM10  @ Hidden Power
 	.2byte ITEM_TM43  @ Secret Power
 	.2byte ITEM_NONE
@@ -581,7 +583,7 @@ SlateportCity_Pokemart_PowerTMs: @ 81DD1F0
 	end
 
 @ Scene with Capt Sterns interview and Team Aqua announcing plans to steal Submarine
-SlateportCity_EventScript_CaptStern:: @ 81DD1F8
+SlateportCity_EventScript_CaptStern::
 	lockall
 	msgbox SlateportCity_Text_SternMoveAheadWithExploration, MSGBOX_DEFAULT
 	msgbox SlateportCity_Text_GabbyWonderfulThanksForInterview, MSGBOX_DEFAULT
@@ -638,7 +640,7 @@ SlateportCity_EventScript_CaptStern:: @ 81DD1F8
 	releaseall
 	end
 
-SlateportCity_Movement_OldWomanConcern: @ 81DD309
+SlateportCity_Movement_OldWomanConcern:
 	delay_16
 	delay_16
 	emote_question_mark
@@ -648,7 +650,7 @@ SlateportCity_Movement_OldWomanConcern: @ 81DD309
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_Movement_ManConcern: @ 81DD311
+SlateportCity_Movement_ManConcern:
 	emote_question_mark
 	walk_in_place_fastest_up
 	delay_16
@@ -658,7 +660,7 @@ SlateportCity_Movement_ManConcern: @ 81DD311
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_Movement_GabbyExit: @ 81DD319
+SlateportCity_Movement_GabbyExit:
 	delay_16
 	walk_left
 	walk_left
@@ -673,7 +675,7 @@ SlateportCity_Movement_GabbyExit: @ 81DD319
 	walk_left
 	step_end
 
-SlateportCity_Movement_TyExit: @ 81DD326
+SlateportCity_Movement_TyExit:
 	walk_down
 	walk_left
 	walk_left
@@ -689,19 +691,19 @@ SlateportCity_Movement_TyExit: @ 81DD326
 	walk_left
 	step_end
 
-SlateportCity_Movement_Unused: @ 81DD334
+SlateportCity_Movement_Unused:
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-SlateportCity_Movement_SternEnterHarbor: @ 81DD337
+SlateportCity_Movement_SternEnterHarbor:
 	walk_right
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_Movement_SternWatchGabbyAndTyExit: @ 81DD33C
+SlateportCity_Movement_SternWatchGabbyAndTyExit:
 	delay_16
 	delay_16
 	delay_16
@@ -711,7 +713,7 @@ SlateportCity_Movement_SternWatchGabbyAndTyExit: @ 81DD33C
 	walk_left
 	step_end
 
-SlateportCity_Movement_PlayerEnterHarbor: @ 81DD344
+SlateportCity_Movement_PlayerEnterHarbor:
 	walk_in_place_fastest_right
 	delay_16
 	delay_16
@@ -719,7 +721,7 @@ SlateportCity_Movement_PlayerEnterHarbor: @ 81DD344
 	walk_up
 	step_end
 
-SlateportCity_Movement_PlayerFaceStern: @ 81DD34A
+SlateportCity_Movement_PlayerFaceStern:
 	delay_16
 	delay_16
 	delay_16
@@ -730,19 +732,19 @@ SlateportCity_Movement_PlayerFaceStern: @ 81DD34A
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_EventScript_Ty:: @ 81DD353
+SlateportCity_EventScript_Ty::
 	msgbox SlateportCity_Text_BigSmileForCamera, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_Gabby:: @ 81DD35C
+SlateportCity_EventScript_Gabby::
 	msgbox SlateportCity_Text_MostInvaluableExperience, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_Man3:: @ 81DD365
+SlateportCity_EventScript_Man3::
 	msgbox SlateportCity_Text_WonderIfLighthouseStartlesPokemon, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_BerryPowderClerk:: @ 81DD36E
+SlateportCity_EventScript_BerryPowderClerk::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_POWDER_JAR, SlateportCity_EventScript_ReceivedPowderJar
@@ -753,7 +755,7 @@ SlateportCity_EventScript_BerryPowderClerk:: @ 81DD36E
 	release
 	end
 
-SlateportCity_EventScript_ReceivedPowderJar:: @ 81DD39A
+SlateportCity_EventScript_ReceivedPowderJar::
 	setvar VAR_0x8004, 1
 	specialvar VAR_RESULT, HasEnoughBerryPowder
 	compare VAR_RESULT, FALSE
@@ -763,12 +765,12 @@ SlateportCity_EventScript_ReceivedPowderJar:: @ 81DD39A
 	goto SlateportCity_EventScript_ChooseBerryPowderItem
 	end
 
-SlateportCity_EventScript_ExplainBerryPowder:: @ 81DD3C0
+SlateportCity_EventScript_ExplainBerryPowder::
 	msgbox SlateportCity_Text_ExplainBerryPowder, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_ChooseBerryPowderItem:: @ 81DD3CA
+SlateportCity_EventScript_ChooseBerryPowderItem::
 	message SlateportCity_Text_ExchangeWhatWithIt
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_BERRY_POWDER_VENDOR
@@ -790,90 +792,90 @@ SlateportCity_EventScript_ChooseBerryPowderItem:: @ 81DD3CA
 	case MULTI_B_PRESSED, SlateportCity_EventScript_CancelPowderItemSelect
 	end
 
-SlateportCity_EventScript_EnergyPowder:: @ 81DD46E
+SlateportCity_EventScript_EnergyPowder::
 	bufferitemname 0, ITEM_ENERGY_POWDER
 	setvar VAR_0x8008, ITEM_ENERGY_POWDER
 	setvar VAR_0x8009, 50
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_EnergyRoot:: @ 81DD482
+SlateportCity_EventScript_EnergyRoot::
 	bufferitemname 0, ITEM_ENERGY_ROOT
 	setvar VAR_0x8008, ITEM_ENERGY_ROOT
 	setvar VAR_0x8009, 80
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_HealPowder:: @ 81DD496
+SlateportCity_EventScript_HealPowder::
 	bufferitemname 0, ITEM_HEAL_POWDER
 	setvar VAR_0x8008, ITEM_HEAL_POWDER
 	setvar VAR_0x8009, 50
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_RevivalHerb:: @ 81DD4AA
+SlateportCity_EventScript_RevivalHerb::
 	bufferitemname 0, ITEM_REVIVAL_HERB
 	setvar VAR_0x8008, ITEM_REVIVAL_HERB
 	setvar VAR_0x8009, 300
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_Protein:: @ 81DD4BE
+SlateportCity_EventScript_Protein::
 	bufferitemname 0, ITEM_PROTEIN
 	setvar VAR_0x8008, ITEM_PROTEIN
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_Iron:: @ 81DD4D2
+SlateportCity_EventScript_Iron::
 	bufferitemname 0, ITEM_IRON
 	setvar VAR_0x8008, ITEM_IRON
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_Carbos:: @ 81DD4E6
+SlateportCity_EventScript_Carbos::
 	bufferitemname 0, ITEM_CARBOS
 	setvar VAR_0x8008, ITEM_CARBOS
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_Calcium:: @ 81DD4FA
+SlateportCity_EventScript_Calcium::
 	bufferitemname 0, ITEM_CALCIUM
 	setvar VAR_0x8008, ITEM_CALCIUM
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_Zinc:: @ 81DD50E
+SlateportCity_EventScript_Zinc::
 	bufferitemname 0, ITEM_ZINC
 	setvar VAR_0x8008, ITEM_ZINC
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_HPUp:: @ 81DD522
+SlateportCity_EventScript_HPUp::
 	bufferitemname 0, ITEM_HP_UP
 	setvar VAR_0x8008, ITEM_HP_UP
 	setvar VAR_0x8009, 1000
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_PPUp:: @ 81DD536
+SlateportCity_EventScript_PPUp::
 	bufferitemname 0, ITEM_PP_UP
 	setvar VAR_0x8008, ITEM_PP_UP
 	setvar VAR_0x8009, 3000
 	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_CancelPowderItemSelect:: @ 81DD54A
+SlateportCity_EventScript_CancelPowderItemSelect::
 	msgbox SlateportCity_Text_ComeBackToTradeBerryPowder, MSGBOX_DEFAULT
 	special RemoveBerryPowderVendorMenu
 	release
 	end
 
-SlateportCity_EventScript_TryBuyBerryPowderItem:: @ 81DD557
+SlateportCity_EventScript_TryBuyBerryPowderItem::
 	msgbox SlateportCity_Text_ExchangeBerryPowderForItem, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_EventScript_ChooseBerryPowderItem
@@ -895,18 +897,18 @@ SlateportCity_EventScript_TryBuyBerryPowderItem:: @ 81DD557
 	release
 	end
 
-SlateportCity_EventScript_NoRoomForBerryPowderItem:: @ 81DD5C1
+SlateportCity_EventScript_NoRoomForBerryPowderItem::
 	msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
 	special RemoveBerryPowderVendorMenu
 	release
 	end
 
-SlateportCity_EventScript_NotEnoughBerryPowder:: @ 81DD5CE
+SlateportCity_EventScript_NotEnoughBerryPowder::
 	msgbox SlateportCity_Text_DontHaveEnoughBerryPowder, MSGBOX_DEFAULT
 	goto SlateportCity_EventScript_ChooseBerryPowderItem
 	end
 
-SlateportCity_EventScript_ScottBattleTentScene:: @ 81DD5DC
+SlateportCity_EventScript_ScottBattleTentScene::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
@@ -929,23 +931,23 @@ SlateportCity_EventScript_ScottBattleTentScene:: @ 81DD5DC
 	releaseall
 	end
 
-SlateportCity_Movement_PushPlayerDown: @ 81DD630
+SlateportCity_Movement_PushPlayerDown:
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-SlateportCity_Movement_PlayerWatchScottExit: @ 81DD634
+SlateportCity_Movement_PlayerWatchScottExit:
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-SlateportCity_Movement_ScottExitBattleTent: @ 81DD637
+SlateportCity_Movement_ScottExitBattleTent:
 	delay_8
 	walk_down
 	step_end
 
-SlateportCity_Movement_ScottExitAfterBattleTent: @ 81DD63A
+SlateportCity_Movement_ScottExitAfterBattleTent:
 	walk_right
 	walk_right
 	walk_right
@@ -956,193 +958,193 @@ SlateportCity_Movement_ScottExitAfterBattleTent: @ 81DD63A
 	walk_right
 	step_end
 
-SlateportCity_EventScript_BerryCrushRankingsSign:: @ 81DD643
+SlateportCity_EventScript_BerryCrushRankingsSign::
 	lockall
 	special ShowBerryCrushRankings
 	waitstate
 	releaseall
 	end
 
-SlateportCity_Text_EnergyGuruSellWhatYouNeed: @ 81DD64A
+SlateportCity_Text_EnergyGuruSellWhatYouNeed:
 	.string "I'm the ENERGY GURU! I'll go for it and\n"
 	.string "sell you what you need!$"
 
-SlateportCity_Text_OhYourPokemon: @ 81DD68A
+SlateportCity_Text_OhYourPokemon:
 	.string "Oh?\n"
 	.string "Your {STR_VAR_1}…$"
 
-SlateportCity_Text_PleaseGiveItThisEffortRibbon: @ 81DD697
+SlateportCity_Text_PleaseGiveItThisEffortRibbon:
 	.string "Went for it stupendously!\p"
 	.string "As its reward, please give it this\n"
 	.string "EFFORT RIBBON.$"
 
-SlateportCity_Text_ReceivedEffortRibbon: @ 81DD6E3
+SlateportCity_Text_ReceivedEffortRibbon:
 	.string "{PLAYER} received the EFFORT RIBBON.$"
 
-SlateportCity_Text_PutEffortRibbonOnMon: @ 81DD702
+SlateportCity_Text_PutEffortRibbonOnMon:
 	.string "{PLAYER} put the EFFORT RIBBON\n"
 	.string "on {STR_VAR_1}.$"
 
-SlateportCity_Text_GoForItLittleHarder: @ 81DD722
+SlateportCity_Text_GoForItLittleHarder:
 	.string "You have to go for it a little harder.\p"
 	.string "If you do, I'll give your POKéMON\n"
 	.string "something nice.$"
 
-SlateportCity_Text_EffortRibbonLooksGoodOnIt: @ 81DD77B
+SlateportCity_Text_EffortRibbonLooksGoodOnIt:
 	.string "Oh! Your {STR_VAR_1}, that EFFORT\n"
 	.string "RIBBON looks good on it!$"
 
-SlateportCity_Text_WonderIfLighthouseStartlesPokemon: @ 81DD7AD
+SlateportCity_Text_WonderIfLighthouseStartlesPokemon:
 	.string "The light of the lighthouse reaches\n"
 	.string "dozens of miles away.\p"
 	.string "I wonder if it doesn't startle POKéMON\n"
 	.string "in the sea.$"
 
-SlateportCity_Text_SeaweedFullOfLife: @ 81DD81A
+SlateportCity_Text_SeaweedFullOfLife:
 	.string "Ooh, look at this!\p"
 	.string "The seaweed you can get around these\n"
 	.string "parts is fresh and full of life.\p"
 	.string "Why, it looks like it can even rear up\n"
 	.string "and attack!$"
 
-SlateportCity_Text_HowTownIsBornAndGrows: @ 81DD8A6
+SlateportCity_Text_HowTownIsBornAndGrows:
 	.string "Where the water is clean, the fruits\n"
 	.string "of bountiful harvest gather.\p"
 	.string "And where people gather, a market\n"
 	.string "soon starts.\p"
 	.string "That is how a town is born and grows.$"
 
-SlateportCity_Text_SlateportWonderfulPlace: @ 81DD93D
+SlateportCity_Text_SlateportWonderfulPlace:
 	.string "Shopping where you can breathe the\n"
 	.string "scent of the ocean…\p"
 	.string "SLATEPORT is such a wonderful place!$"
 
-SlateportCity_Text_BuyBricksSoDecorWontGetDirty: @ 81DD999
+SlateportCity_Text_BuyBricksSoDecorWontGetDirty:
 	.string "If you put DOLLS or CUSHIONS on\n"
 	.string "the floor, they'll get dirty.\p"
 	.string "I'm going to buy some BRICKS so my\n"
 	.string "DOLLS and CUSHIONS won't get dirty\l"
 	.string "when I leave them out.$"
 
-SlateportCity_Text_GoingToCompeteInBattleTent: @ 81DDA34
+SlateportCity_Text_GoingToCompeteInBattleTent:
 	.string "Wroooar! I'm going to compete in\n"
 	.string "the BATTLE TENT, too!\p"
 	.string "But before that, I need to catch\n"
 	.string "some POKéMON!$"
 
-SlateportCity_Text_BushedHikingFromMauville: @ 81DDA9A
+SlateportCity_Text_BushedHikingFromMauville:
 	.string "Whew… I'm just bushed…\p"
 	.string "I hiked over from MAUVILLE CITY.\n"
 	.string "But, boy, this city's huge.\p"
 	.string "If I'd known this, I would've ridden\n"
 	.string "my BIKE here.$"
 
-SlateportCity_Text_EveryoneCallsHimCaptStern: @ 81DDB21
+SlateportCity_Text_EveryoneCallsHimCaptStern:
 	.string "STERN, the fellow who built the\n"
 	.string "MUSEUM, also happens to be the leader\l"
 	.string "of an undersea exploration team.\p"
 	.string "So, everyone calls him CAPT. STERN.$"
 
-SlateportCity_Text_WhatsLongLineOverThere: @ 81DDBAC
+SlateportCity_Text_WhatsLongLineOverThere:
 	.string "What is that over there?\n"
 	.string "That long line…$"
 
-SlateportCity_Text_VisitedMuseumOften: @ 81DDBD5
+SlateportCity_Text_VisitedMuseumOften:
 	.string "When I was a child, I visited\n"
 	.string "the MUSEUM often.\p"
 	.string "I used to dream about the mysteries of\n"
 	.string "the sea after seeing the exhibits.$"
 
-SlateportCity_Text_QuitPushing: @ 81DDC4F
+SlateportCity_Text_QuitPushing:
 	.string "Hey, there! Quit pushing!\n"
 	.string "This is the line, can't you see?$"
 
-SlateportCity_Text_AquaHasPolicy: @ 81DDC8A
+SlateportCity_Text_AquaHasPolicy:
 	.string "TEAM AQUA has a policy of\n"
 	.string "assembling and dispersing at\l"
 	.string "the operation site.$"
 
-SlateportCity_Text_BossIsBrilliant: @ 81DDCD5
+SlateportCity_Text_BossIsBrilliant:
 	.string "Our BOSS is brilliant.\p"
 	.string "What would he want to do with\n"
 	.string "a MUSEUM now?$"
 
-SlateportCity_Text_WhatsNewSchemeIWonder: @ 81DDD18
+SlateportCity_Text_WhatsNewSchemeIWonder:
 	.string "What's the new scheme, I wonder?\p"
 	.string "Our BOSS is scary when he's mad, so\n"
 	.string "I'd better not screw things up…$"
 
-SlateportCity_Text_ShouldTakeItAll: @ 81DDD7D
+SlateportCity_Text_ShouldTakeItAll:
 	.string "If there's something we need in\n"
 	.string "the MUSEUM, we should take it all!$"
 
-SlateportCity_Text_DontButtIn: @ 81DDDC0
+SlateportCity_Text_DontButtIn:
 	.string "Hey, you there!\n"
 	.string "Don't butt in!$"
 
-SlateportCity_Text_RemindsMeOfLongLineForGames: @ 81DDDDF
+SlateportCity_Text_RemindsMeOfLongLineForGames:
 	.string "A long line, huh?\p"
 	.string "It reminds me of the times I lined up to\n"
 	.string "buy smash-hit games…$"
 
-SlateportCity_Text_WhyAreWeLiningUp: @ 81DDE2F
+SlateportCity_Text_WhyAreWeLiningUp:
 	.string "Why are we even lining up and paying?\n"
 	.string "We should just march in!$"
 
-SlateportCity_Text_WhatDoYouWant: @ 81DDE6E
+SlateportCity_Text_WhatDoYouWant:
 	.string "What?\n"
 	.string "What do you want?$"
 
-SlateportCity_Text_IllReadSignForYou: @ 81DDE86
+SlateportCity_Text_IllReadSignForYou:
 	.string "You want to read this sign?\n"
 	.string "I'll read it for you!$"
 
-SlateportCity_Text_SaysSomethingLikeSeaIsEndless: @ 81DDEB8
+SlateportCity_Text_SaysSomethingLikeSeaIsEndless:
 	.string "Let's see…\p"
 	.string "Um… I think it says something like\n"
 	.string "“the life in the sea is endless.”\p"
 	.string "Yup, I'm pretty sure that's what\n"
 	.string "it says.$"
 
-SlateportCity_Text_ShouldveBroughtMyGameBoy: @ 81DDF32
+SlateportCity_Text_ShouldveBroughtMyGameBoy:
 	.string "Grumble…\p"
 	.string "I should've brought my Game Boy\n"
 	.string "Advance so I wouldn't get bored in line…\p"
 	.string "Grumble…$"
 
-SlateportCity_Text_HotSpringsAfterOperation: @ 81DDF8D
+SlateportCity_Text_HotSpringsAfterOperation:
 	.string "When this operation's over, I'll take\n"
 	.string "you to a hot spring spa!\p"
 	.string "That's what our leader said.\n"
 	.string "I can't wait!$"
 
-SlateportCity_Text_SeaIsSoWet: @ 81DDFF7
+SlateportCity_Text_SeaIsSoWet:
 	.string "The sea is just so vast…\p"
 	.string "Could the sea have been made by\n"
 	.string "the tears shed by POKéMON?$"
 
-SlateportCity_Text_SinkOldBoats: @ 81DE04B
+SlateportCity_Text_SinkOldBoats:
 	.string "Do you know what they do with old\n"
 	.string "ships that become too creaky to sail?\p"
 	.string "They sink them in the sea so they\n"
 	.string "become habitats for POKéMON.$"
 
-SlateportCity_Text_BuyTooMuch: @ 81DE0D2
+SlateportCity_Text_BuyTooMuch:
 	.string "Whenever I visit here, I get carried\n"
 	.string "away and buy too much.$"
 
-SlateportCity_Text_GetNameRaterToHelpYou: @ 81DE10E
+SlateportCity_Text_GetNameRaterToHelpYou:
 	.string "If you want to change your POKéMON's\n"
 	.string "nickname, you'll have to get the NAME\l"
 	.string "RATER to help you.$"
 
-SlateportCity_Text_CantChangeTradeMonName: @ 81DE16C
+SlateportCity_Text_CantChangeTradeMonName:
 	.string "Any POKéMON you get in a trade,\n"
 	.string "you can't change its nickname.\p"
 	.string "The original TRAINER's love for that\n"
 	.string "POKéMON is in the nickname.$"
 
-SlateportCity_Text_BattleTentBuiltRecently: @ 81DE1EC
+SlateportCity_Text_BattleTentBuiltRecently:
 	.string "Recently, a BATTLE TENT was built\n"
 	.string "in SLATEPORT.\p"
 	.string "GYMS are fun, but the BATTLE TENT's\n"
@@ -1150,62 +1152,62 @@ SlateportCity_Text_BattleTentBuiltRecently: @ 81DE1EC
 	.string "You should go find tough POKéMON\n"
 	.string "for the BATTLE TENT!$"
 
-SlateportCity_Text_CaptSternBeingInterviewed: @ 81DE28E
+SlateportCity_Text_CaptSternBeingInterviewed:
 	.string "I was hoping that it was a famous star\n"
 	.string "so I could get an autograph.\p"
 	.string "But who's that being interviewed?\n"
 	.string "Isn't that CAPT. STERN?$"
 
-SlateportCity_Text_InterviewerSoCool: @ 81DE30C
+SlateportCity_Text_InterviewerSoCool:
 	.string "That lady interviewer is so cool\n"
 	.string "and pretty.\p"
 	.string "When I grow up, I'm going to be\n"
 	.string "an international journalist!$"
 
-SlateportCity_Text_SternSaysDiscoveredSomething: @ 81DE376
+SlateportCity_Text_SternSaysDiscoveredSomething:
 	.string "CAPT. STERN says they discovered\n"
 	.string "something at the bottom of the sea.\p"
 	.string "I wonder what it is?\n"
 	.string "What could it be?$"
 
-SlateportCity_Text_CaptainComeBackWithBigFish: @ 81DE3E2
+SlateportCity_Text_CaptainComeBackWithBigFish:
 	.string "What's going on here?\p"
 	.string "Did the good CAPTAIN come back with\n"
 	.string "a big fish from the ocean floor?$"
 
-SlateportCity_Text_AmIOnTV: @ 81DE43D
+SlateportCity_Text_AmIOnTV:
 	.string "Hey! Are you watching?\n"
 	.string "Am I on TV?$"
 
-SlateportCity_Text_CaptainsACelebrity: @ 81DE460
+SlateportCity_Text_CaptainsACelebrity:
 	.string "A TV interview! Here!\n"
 	.string "The CAPTAIN's a celebrity!$"
 
-SlateportCity_Text_BigSmileForCamera: @ 81DE491
+SlateportCity_Text_BigSmileForCamera:
 	.string "TY: Okay, CAPT. STERN, a big smile\n"
 	.string "for the camera!$"
 
-SlateportCity_Text_MostInvaluableExperience: @ 81DE4C4
+SlateportCity_Text_MostInvaluableExperience:
 	.string "GABBY: I see, I see. You've had a most\n"
 	.string "invaluable experience…$"
 
-SlateportCity_Text_SternMoveAheadWithExploration: @ 81DE502
+SlateportCity_Text_SternMoveAheadWithExploration:
 	.string "CAPT. STERN: Yes, indeed. We intend to\n"
 	.string "move ahead with our exploration.$"
 
-SlateportCity_Text_GabbyWonderfulThanksForInterview: @ 81DE54A
+SlateportCity_Text_GabbyWonderfulThanksForInterview:
 	.string "GABBY: That's wonderful, CAPT. STERN!\n"
 	.string "Thank you for taking the time from\l"
 	.string "your busy schedule to talk to us.\p"
 	.string "We hope we can interview you again\n"
 	.string "with news of more discoveries!$"
 
-SlateportCity_Text_SternWhewFirstInterview: @ 81DE5F7
+SlateportCity_Text_SternWhewFirstInterview:
 	.string "CAPT. STERN: Whew…\p"
 	.string "That was my first time to be filmed for\n"
 	.string "TV. That was nerve-wracking.$"
 
-SlateportCity_Text_OhPlayerWeMadeDiscovery: @ 81DE64F
+SlateportCity_Text_OhPlayerWeMadeDiscovery:
 	.string "Oh! {PLAYER}{KUN}!\n"
 	.string "You're looking great!\p"
 	.string "We made a huge discovery on our last\n"
@@ -1215,7 +1217,7 @@ SlateportCity_Text_OhPlayerWeMadeDiscovery: @ 81DE64F
 	.string "We think it's the habitat of a POKéMON\n"
 	.string "that's said to have been long extinct.$"
 
-SlateportCity_Text_AquaWillAssumeControlOfSubmarine: @ 81DE724
+SlateportCity_Text_AquaWillAssumeControlOfSubmarine:
 	.string "Fufufu…\n"
 	.string "CAPT. STERN, I presume.\p"
 	.string "We of TEAM AQUA will assume\n"
@@ -1226,77 +1228,77 @@ SlateportCity_Text_AquaWillAssumeControlOfSubmarine: @ 81DE724
 	.string "Just watch and learn what TEAM\l"
 	.string "AQUA has planned!$"
 
-SlateportCity_Text_SternWhatWasAllThat: @ 81DE7F7
+SlateportCity_Text_SternWhatWasAllThat:
 	.string "CAPT. STERN: What was that all about?\p"
 	.string "It sounded like someone using\n"
 	.string "a megaphone…\p"
 	.string "Where did it come from?$"
 
-SlateportCity_Text_FromHarborTryingToTakeSub: @ 81DE860
+SlateportCity_Text_FromHarborTryingToTakeSub:
 	.string "It's from the HARBOR!\p"
 	.string "The submarine!\n"
 	.string "They're trying to take it!$"
 
-SlateportCity_Text_PleaseComeWithMe: @ 81DE8A0
+SlateportCity_Text_PleaseComeWithMe:
 	.string "{PLAYER}{KUN}!\n"
 	.string "Please, come with me!$"
 
-SlateportCity_Text_BattleTentSign: @ 81DE8BC
+SlateportCity_Text_BattleTentSign:
 	.string "BATTLE TENT SLATEPORT SITE\n"
 	.string "“Find it! The ultimate POKéMON!”$"
 
-SlateportCity_Text_SternsShipyardWantedSign: @ 81DE8F8
+SlateportCity_Text_SternsShipyardWantedSign:
 	.string "STERN'S SHIPYARD\p"
 	.string "“Wanted: A sailor capable of sailing\n"
 	.string "in all currents.”$"
 
-SlateportCity_Text_SternsShipyardNearsCompletion: @ 81DE940
+SlateportCity_Text_SternsShipyardNearsCompletion:
 	.string "STERN'S SHIPYARD\p"
 	.string "“The ferry S.S. TIDAL nears\n"
 	.string "completion for serving the ports of\l"
 	.string "SLATEPORT and LILYCOVE.”$"
 
-SlateportCity_Text_SternsShipyardFerryComplete: @ 81DE9AA
+SlateportCity_Text_SternsShipyardFerryComplete:
 	.string "STERN'S SHIPYARD\p"
 	.string "“Boarding of the SLATEPORT-LILYCOVE\n"
 	.string "ferry S.S. TIDAL is handled at the\l"
 	.string "HARBOR.”$"
 
-SlateportCity_Text_PokemonFanClubSign: @ 81DEA0B
+SlateportCity_Text_PokemonFanClubSign:
 	.string "POKéMON FAN CLUB\n"
 	.string "“Calling all fans of POKéMON!”$"
 
-SlateportCity_Text_OceanicMuseumSign: @ 81DEA3B
+SlateportCity_Text_OceanicMuseumSign:
 	.string "“The endless sea sustains\n"
 	.string "all life.”\p"
 	.string "OCEANIC MUSEUM$"
 
-SlateportCity_Text_CitySign: @ 81DEA6F
+SlateportCity_Text_CitySign:
 	.string "SLATEPORT CITY\p"
 	.string "“The port where people and POKéMON\n"
 	.string "cross paths.”$"
 
-SlateportCity_Text_MarketSign: @ 81DEAAF
+SlateportCity_Text_MarketSign:
 	.string "SLATEPORT MARKET\n"
 	.string "“Unique items found nowhere else!”$"
 
-SlateportCity_Text_HarborFerryUnderConstruction: @ 81DEAE3
+SlateportCity_Text_HarborFerryUnderConstruction:
 	.string "SLATEPORT HARBOR\p"
 	.string "“The ferry S.S. TIDAL is under\n"
 	.string "construction in the SHIPYARD.\p"
 	.string "“Service is scheduled to begin\n"
 	.string "shortly.”$"
 
-SlateportCity_Text_HarborSign: @ 81DEB5A
+SlateportCity_Text_HarborSign:
 	.string "SLATEPORT HARBOR\p"
 	.string "“Enjoy a delightful cruise on\n"
 	.string "the ferry S.S. TIDAL.”$"
 
-SlateportCity_Text_NameRatersHouseSign: @ 81DEBA0
+SlateportCity_Text_NameRatersHouseSign:
 	.string "NAME RATER'S HOUSE\n"
 	.string "“POKéMON nicknames rated.”$"
 
-SlateportCity_Text_ExplainBerries: @ 81DEBCE
+SlateportCity_Text_ExplainBerries:
 	.string "If a wild POKéMON gets hurt, it heals\n"
 	.string "itself by chewing on BERRIES.\p"
 	.string "Did you know that?\p"
@@ -1311,7 +1313,7 @@ SlateportCity_Text_ExplainBerries: @ 81DEBCE
 	.string "I've got something good for someone\n"
 	.string "like you.$"
 
-SlateportCity_Text_ExplainBerryPowder: @ 81DED27
+SlateportCity_Text_ExplainBerryPowder:
 	.string "I recently had machines installed at\n"
 	.string "POKéMON CENTERS for crushing BERRIES.\p"
 	.string "The BERRY CRUSH machines are at\n"
@@ -1322,39 +1324,39 @@ SlateportCity_Text_ExplainBerryPowder: @ 81DED27
 	.string "I can make you all sorts of medicine\n"
 	.string "if you bring me lots of BERRY POWDER.$"
 
-SlateportCity_Text_BroughtMeSomeBerryPowder: @ 81DEE40
+SlateportCity_Text_BroughtMeSomeBerryPowder:
 	.string "Have you brought me some\n"
 	.string "BERRY POWDER?$"
 
-SlateportCity_Text_ExchangeWhatWithIt: @ 81DEE67
+SlateportCity_Text_ExchangeWhatWithIt:
 	.string "What would you like to exchange\n"
 	.string "it with?$"
 
-SlateportCity_Text_ExchangeBerryPowderForItem: @ 81DEE90
+SlateportCity_Text_ExchangeBerryPowderForItem:
 	.string "Okay, you want to exchange your\n"
 	.string "BERRY POWDER for one {STR_VAR_1}?$"
 
-SlateportCity_Text_DontHaveEnoughBerryPowder: @ 81DEEC9
+SlateportCity_Text_DontHaveEnoughBerryPowder:
 	.string "Oh, dear. You don't have enough\n"
 	.string "BERRY POWDER.$"
 
-SlateportCity_Text_FineBerryPowderTradeSomethingElse: @ 81DEEF7
+SlateportCity_Text_FineBerryPowderTradeSomethingElse:
 	.string "This is fine BERRY POWDER.\n"
 	.string "It will make excellent medicine.\p"
 	.string "Would you like to trade more of your\n"
 	.string "BERRY POWDER for something else?$"
 
-SlateportCity_Text_WhenYouGetMoreBringItToMe: @ 81DEF79
+SlateportCity_Text_WhenYouGetMoreBringItToMe:
 	.string "Okay! When you get some more\n"
 	.string "BERRY POWDER, bring it to me, please!$"
 
-SlateportCity_Text_ComeBackToTradeBerryPowder: @ 81DEFBC
+SlateportCity_Text_ComeBackToTradeBerryPowder:
 	.string "Come back if you'd like to trade your\n"
 	.string "BERRY POWDER for some medicine.\p"
 	.string "I'm always running a bazaar here.\p"
 	.string "Did you know?$"
 
-SlateportCity_Text_YouDroveTeamAquaAway: @ 81DF032
+SlateportCity_Text_YouDroveTeamAquaAway:
 	.string "SCOTT: Huh?\n"
 	.string "I'm sure I met you somewhere before.\p"
 	.string "Have I introduced myself to you?\n"
@@ -1363,22 +1365,22 @@ SlateportCity_Text_YouDroveTeamAquaAway: @ 81DF032
 	.string "here like they were stung.\p"
 	.string "Let me guess--you drove them away?$"
 
-SlateportCity_Text_MaybeThisTrainer: @ 81DF0FE
+SlateportCity_Text_MaybeThisTrainer:
 	.string "SCOTT: Hmm…\n"
 	.string "Maybe, just maybe, this TRAINER…$"
 
-SlateportCity_Text_LetsRegisterEachOther: @ 81DF12B
+SlateportCity_Text_LetsRegisterEachOther:
 	.string "SCOTT: All right! I think you're going\n"
 	.string "to become a good friend.\p"
 	.string "So, let's register each other in our\n"
 	.string "POKéNAVS.\p"
 	.string "… … … … … …$"
 
-SlateportCity_Text_RegisteredScott: @ 81DF1A6
+SlateportCity_Text_RegisteredScott:
 	.string "Registered this SCOTT person\n"
 	.string "in the POKéNAV.$"
 
-SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou: @ 81DF1D3
+SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou:
 	.string "SCOTT: What I'd like to do is tag along\n"
 	.string "with you, but I do want to keep an eye\l"
 	.string "on the talents of other people, too.\p"
@@ -1386,7 +1388,7 @@ SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou: @ 81DF1D3
 	.string "a bit more.\p"
 	.string "Be seeing you, {PLAYER}{KUN}!$"
 
-SlateportCity_Text_TakingBattleTentChallenge: @ 81DF28C
+SlateportCity_Text_TakingBattleTentChallenge:
 	.string "SCOTT: Oh, hey!\n"
 	.string "If it isn't {PLAYER}{KUN}!\p"
 	.string "{PLAYER}{KUN}, let me guess--you're going\n"
diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
index e642a1386..c1e9bfc53 100644
--- a/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc
@@ -1,7 +1,7 @@
 .set LOCALID_OPPONENT, 2
 .set LOCALID_PLAYER, 3
 
-SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960
+SlateportCity_BattleTentBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_BattleTentBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentBattleRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentBattleRoom_OnFrame
@@ -10,11 +10,11 @@ SlateportCity_BattleTentBattleRoom_MapScripts:: @ 8209960
 	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
 	@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_1
 
-SlateportCity_BattleTentBattleRoom_OnTransition: @ 8209970
+SlateportCity_BattleTentBattleRoom_OnTransition:
 	call SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx
 	end
 
-SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 8209976
+SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxMale
@@ -22,29 +22,29 @@ SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 8209976
 	goto_if_eq SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxMale:: @ 820998E
+SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8209994
+SlateportCity_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-SlateportCity_BattleTentBattleRoom_OnWarp: @ 820999A
+SlateportCity_BattleTentBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 82099A4
+SlateportCity_BattleTentBattleRoom_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_FALLARBOR_TOWN_BATTLE_TENT_BATTLE_ROOM
 	hideobjectat LOCALID_OPPONENT, MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM
 	end
 
-SlateportCity_BattleTentBattleRoom_OnFrame: @ 82099B4
+SlateportCity_BattleTentBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82099BE
+SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom::
 	applymovement LOCALID_PLAYER, SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter
 	waitmovement 0
 	factory_setopponentgfx
@@ -65,14 +65,14 @@ SlateportCity_BattleTentBattleRoom_EventScript_EnterRoom:: @ 82099BE
 	waitstate
 	switch VAR_RESULT
 	case 1, SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent
-SlateportCity_BattleTent_EventScript_WarpToLobbyLost:: @ 8209A1B
+SlateportCity_BattleTent_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
 	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 @ forced stop
 
-SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 8209A39
+SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
@@ -83,21 +83,21 @@ SlateportCity_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 8209A39
 	waitstate
 @ forced stop
 
-SlateportCity_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8209A7B
+SlateportCity_BattleTentBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
 	warp MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 @ forced stop
 
-SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter: @ 8209A99
+SlateportCity_BattleTentBattleRoom_Movement_PlayerEnter:
 	walk_up
 	walk_up
 	walk_up
 	walk_in_place_fastest_right
 	step_end
 
-SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter: @ 8209A9E
+SlateportCity_BattleTentBattleRoom_Movement_OpponentEnter:
 	walk_down
 	walk_down
 	walk_down
diff --git a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
index b04b03b99..08b19391c 100644
--- a/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentCorridor/scripts.inc
@@ -1,31 +1,31 @@
 .set LOCALID_ATTENDANT, 1
 
-SlateportCity_BattleTentCorridor_MapScripts:: @ 8208E26
+SlateportCity_BattleTentCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentCorridor_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentCorridor_OnWarp
 	.byte 0
 
 	@ This is Slateport Tent's version of the Battle Factory Pre-Battle Room
 
-SlateportCity_BattleTentCorridor_OnWarp: @ 8208E31
+SlateportCity_BattleTentCorridor_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentCorridor_EventScript_SetUpObjects
 	.2byte 0
 
-SlateportCity_BattleTentCorridor_EventScript_SetUpObjects:: @ 8208E3B
+SlateportCity_BattleTentCorridor_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
 	compare VAR_0x8006, 1
 	goto_if_ne SlateportCity_BattleTentCorridor_EventScript_TurnPlayerNorth
 	setobjectxy LOCALID_ATTENDANT, 2, 2
 	turnobject LOCALID_ATTENDANT, DIR_SOUTH
-SlateportCity_BattleTentCorridor_EventScript_TurnPlayerNorth:: @ 8208E56
+SlateportCity_BattleTentCorridor_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-SlateportCity_BattleTentCorridor_OnFrame: @ 8208E5B
+SlateportCity_BattleTentCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-SlateportCity_BattleTentCorridor_EventScript_EnterCorridor:: @ 8208E65
+SlateportCity_BattleTentCorridor_EventScript_EnterCorridor::
 	compare VAR_0x8006, 1
 	goto_if_eq SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle
 	setvar VAR_TEMP_0, 1
@@ -40,7 +40,7 @@ SlateportCity_BattleTentCorridor_EventScript_EnterCorridor:: @ 8208E65
 	fadescreen FADE_TO_BLACK
 	slateporttent_rentmons
 	waitstate
-SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom:: @ 8208EB4
+SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFastestUp
@@ -56,14 +56,14 @@ SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom:: @ 8208EB4
 	waitstate
 	end
 
-SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle:: @ 8208EEE
+SlateportCity_BattleTentCorridor_EventScript_ReturnToRoomFromBattle::
 	factory_setopponentmons
 	factory_resethelditems
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT
 	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
-SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent:: @ 8208F0D
+SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq SlateportCity_BattleTentCorridor_EventScript_ReadyFor2ndOpponent
@@ -75,14 +75,14 @@ SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent:: @ 8208F0D
 	case 1, SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge
 	case 2, SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge
 
-SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge:: @ 8208F5B
+SlateportCity_BattleTentCorridor_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
 	case YES, SlateportCity_BattleTentCorridor_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
 
-SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge:: @ 8208F89
+SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -91,7 +91,7 @@ SlateportCity_BattleTentCorridor_EventScript_AskRetireChallenge:: @ 8208F89
 	case 0, SlateportCity_BattleTent_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
 
-SlateportCity_BattleTentCorridor_EventScript_AskSwapMon:: @ 8208FBB
+SlateportCity_BattleTentCorridor_EventScript_AskSwapMon::
 	slateporttent_generateopponentmons
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon, MSGBOX_YESNO
 	switch VAR_RESULT
@@ -99,7 +99,7 @@ SlateportCity_BattleTentCorridor_EventScript_AskSwapMon:: @ 8208FBB
 	case YES, SlateportCity_BattleTentCorridor_EventScript_SwapMons
 	case MULTI_B_PRESSED, SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
 
-SlateportCity_BattleTentCorridor_EventScript_SwapMons:: @ 8208FF1
+SlateportCity_BattleTentCorridor_EventScript_SwapMons::
 	fadescreen FADE_TO_BLACK
 	slateporttent_swapmons
 	waitstate
@@ -108,17 +108,17 @@ SlateportCity_BattleTentCorridor_EventScript_SwapMons:: @ 8208FF1
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentCorridor_EventScript_EnterBattleRoom
 
-SlateportCity_BattleTentCorridor_EventScript_ReadyFor2ndOpponent:: @ 8209014
+SlateportCity_BattleTentCorridor_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-SlateportCity_BattleTentCorridor_EventScript_ReadyFor3rdOpponent:: @ 820901B
+SlateportCity_BattleTentCorridor_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-SlateportCity_BattleTentCorridor_EventScript_PauseChallenge:: @ 8209022
+SlateportCity_BattleTentCorridor_EventScript_PauseChallenge::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait
 	waitmessage
 	slateporttent_save CHALLENGE_STATUS_PAUSED
@@ -128,25 +128,25 @@ SlateportCity_BattleTentCorridor_EventScript_PauseChallenge:: @ 8209022
 	frontier_reset
 	end
 
-SlateportCity_BattleTentCorridor_EventScript_ResumeChallenge:: @ 8209044
+SlateportCity_BattleTentCorridor_EventScript_ResumeChallenge::
 	special SavePlayerParty
 	factory_setparties 0
 	goto SlateportCity_BattleTentCorridor_EventScript_AskReadyForOpponent
 
-SlateportCity_BattleTentCorridor_Movement_PlayerEnter: @ 8209059
+SlateportCity_BattleTentCorridor_Movement_PlayerEnter:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SlateportCity_BattleTentCorridor_Movement_PlayerExit: @ 820905E
+SlateportCity_BattleTentCorridor_Movement_PlayerExit:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_BattleTentCorridor_Movement_AttendantEnter: @ 8209062
+SlateportCity_BattleTentCorridor_Movement_AttendantEnter:
 	walk_up
 	walk_up
 	walk_up
@@ -154,14 +154,14 @@ SlateportCity_BattleTentCorridor_Movement_AttendantEnter: @ 8209062
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_BattleTentCorridor_Movement_AttendantExit: @ 8209068
+SlateportCity_BattleTentCorridor_Movement_AttendantExit:
 	walk_up
 	set_invisible
 	step_end
 
 @ Leftover text from when this was a Contest Hall in R/S
 @ Unused
-SlateportCity_ContestHall_Text_AdviceForContests: @ 820906B
+SlateportCity_ContestHall_Text_AdviceForContests:
 	.string "Want a tasty little bit of advice\n"
 	.string "for CONTESTS?\p"
 	.string "Using a certain move after another\n"
@@ -173,13 +173,13 @@ SlateportCity_ContestHall_Text_AdviceForContests: @ 820906B
 	.string "disrupting your POKéMON's showing.$"
 
 @ Unused
-SlateportCity_ContestHall_Text_MyPapaIsContestJudge: @ 820917A
+SlateportCity_ContestHall_Text_MyPapaIsContestJudge:
 	.string "My papa, he's a CONTEST JUDGE.\p"
 	.string "I wonder what I should be when I\n"
 	.string "grow up, a JUDGE or a GYM LEADER?$"
 
 @ Unused
-SlateportCity_ContestHall_Text_ImLikeMajorlyCheesed: @ 82091DC
+SlateportCity_ContestHall_Text_ImLikeMajorlyCheesed:
 	.string "Hey, man, I'm like majorly cheesed,\n"
 	.string "you know. Like, you know, I just\l"
 	.string "wanted to know why my POKéMON\l"
@@ -192,7 +192,7 @@ SlateportCity_ContestHall_Text_ImLikeMajorlyCheesed: @ 82091DC
 	.string "Just, you know, take this!$"
 
 @ Unused
-SlateportCity_ContestHall_Text_ExplainTorment: @ 8209322
+SlateportCity_ContestHall_Text_ExplainTorment:
 	.string "That's, like, TM41, you know?\n"
 	.string "Hey, it's TORMENT, you hearing me?\p"
 	.string "Like, it won't let the other guy\n"
@@ -201,7 +201,7 @@ SlateportCity_ContestHall_Text_ExplainTorment: @ 8209322
 	.string "I'm not laying a torment on you!$"
 
 @ Unused
-SlateportCity_ContestHall_Text_MCStepUpTakePartInContest: @ 82093ED
+SlateportCity_ContestHall_Text_MCStepUpTakePartInContest:
 	.string "MC: Oh, my, my!\n"
 	.string "Now isn't that a dandy of a POKéMON?\p"
 	.string "Please! Do step right up and take\n"
@@ -210,7 +210,7 @@ SlateportCity_ContestHall_Text_MCStepUpTakePartInContest: @ 82093ED
 	.string "My eyes have never failed me!$"
 
 @ Unused
-SlateportCity_ContestHall_Text_JudgeWouldntDoToMissContest: @ 82094A1
+SlateportCity_ContestHall_Text_JudgeWouldntDoToMissContest:
 	.string "JUDGE: Well, hello there!\n"
 	.string "I see that you're a TRAINER!\p"
 	.string "Then, it just wouldn't do for you\n"
@@ -219,19 +219,19 @@ SlateportCity_ContestHall_Text_JudgeWouldntDoToMissContest: @ 82094A1
 	.string "CITY and enter anytime!$"
 
 @ Unused
-SlateportCity_ContestHall_Text_ItsAppealTime: @ 820954E
+SlateportCity_ContestHall_Text_ItsAppealTime:
 	.string "It's appeal time!\n"
 	.string "What should I lead with?$"
 
 @ Unused
-SlateportCity_ContestHall_Text_DidntPayAttentionToAppeal: @ 8209579
+SlateportCity_ContestHall_Text_DidntPayAttentionToAppeal:
 	.string "They didn't pay much attention to\n"
 	.string "my POKéMON's appeal…\p"
 	.string "Humph, that JUDGE, he doesn't know\n"
 	.string "a good thing when he sees it.$"
 
 @ Unused
-SlateportCity_ContestHall_Text_RewardWithSageAdvice: @ 82095F1
+SlateportCity_ContestHall_Text_RewardWithSageAdvice:
 	.string "Oh, hi! You must be a serious fan to get\n"
 	.string "this close to the action.\p"
 	.string "I'll reward your enthusiasm with\n"
@@ -244,20 +244,20 @@ SlateportCity_ContestHall_Text_RewardWithSageAdvice: @ 82095F1
 	.string "to happen!$"
 
 @ Unused
-SlateportCity_ContestHall_Text_MoreFreakedOutThanMon: @ 8209718
+SlateportCity_ContestHall_Text_MoreFreakedOutThanMon:
 	.string "I can't do this! I'm more freaked out\n"
 	.string "than my POKéMON.\p"
 	.string "I'm shivering and my heart is racing!$"
 
 @ Unused
-SlateportCity_ContestHall_Text_BattleAndContestAlike: @ 8209775
+SlateportCity_ContestHall_Text_BattleAndContestAlike:
 	.string "A battle and a CONTEST aren't the\n"
 	.string "same, but they are alike, too.\p"
 	.string "You need to work hard and believe\n"
 	.string "in the POKéMON you've raised.$"
 
 @ Unused
-SlateportCity_ContestHall_Text_MonLooksOnTopOfGame: @ 82097F6
+SlateportCity_ContestHall_Text_MonLooksOnTopOfGame:
 	.string "That POKéMON looks like it's on top\n"
 	.string "of its game, huh?\p"
 	.string "A POKéMON that does good in the\n"
@@ -265,19 +265,19 @@ SlateportCity_ContestHall_Text_MonLooksOnTopOfGame: @ 82097F6
 	.string "relaxed when it's doing appeals.$"
 
 @ Unused
-SlateportCity_ContestHall_Text_MyMonBetterThanThatLot: @ 8209890
+SlateportCity_ContestHall_Text_MyMonBetterThanThatLot:
 	.string "Will you look at that sorry sight?\p"
 	.string "Heh, my POKéMON's absolutely better\n"
 	.string "than that lot!$"
 
 @ Unused
-SlateportCity_ContestHall_Text_GetUrgeToMoveWithMon: @ 82098E6
+SlateportCity_ContestHall_Text_GetUrgeToMoveWithMon:
 	.string "Don't you get the urge to move with\n"
 	.string "POKéMON if they're putting on an\l"
 	.string "energetic appeal?$"
 
 @ Unused
-SlateportCity_ContestHall_Text_HyperRankStage: @ 820993D
+SlateportCity_ContestHall_Text_HyperRankStage:
 	.string "POKéMON CONTESTS\n"
 	.string "HYPER RANK STAGE!$"
 
diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
index 07758d42d..8361cdfcc 100644
--- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc
+++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc
@@ -1,20 +1,20 @@
 .set LOCALID_ATTENDANT, 1
 
-SlateportCity_BattleTentLobby_MapScripts:: @ 8208730
+SlateportCity_BattleTentLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_BattleTentLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SlateportCity_BattleTentLobby_OnWarp
 	.byte 0
 
-SlateportCity_BattleTentLobby_OnWarp: @ 820873B
+SlateportCity_BattleTentLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, SlateportCity_BattleTentLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-SlateportCity_BattleTentLobby_EventScript_TurnPlayerNorth:: @ 8208745
+SlateportCity_BattleTentLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-SlateportCity_BattleTentLobby_OnFrame: @ 820874F
+SlateportCity_BattleTentLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, SlateportCity_BattleTentLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, SlateportCity_BattleTentLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, SlateportCity_BattleTentLobby_EventScript_ResumeChallenge
@@ -22,11 +22,11 @@ SlateportCity_BattleTentLobby_OnFrame: @ 820874F
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, SlateportCity_BattleTentLobby_EventScript_LostChallenge
 	.2byte 0
 
-SlateportCity_BattleTentLobby_EventScript_GetChallengeStatus:: @ 8208779
+SlateportCity_BattleTentLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-SlateportCity_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 8208782
+SlateportCity_BattleTentLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox SlateportCity_BattleTentLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
@@ -36,7 +36,7 @@ SlateportCity_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 8208782
 	releaseall
 	end
 
-SlateportCity_BattleTentLobby_EventScript_WonChallenge:: @ 82087B7
+SlateportCity_BattleTentLobby_EventScript_WonChallenge::
 	lockall
 	message SlateportCity_BattleTentLobby_Text_WonThreeMatchesReturnMons
 	waitmessage
@@ -45,7 +45,7 @@ SlateportCity_BattleTentLobby_EventScript_WonChallenge:: @ 82087B7
 	slateporttent_save 0
 	playse SE_SAVE
 	waitse
-SlateportCity_BattleTentLobby_EventScript_GivePrize:: @ 82087E9
+SlateportCity_BattleTentLobby_EventScript_GivePrize::
 	msgbox SlateportCity_BattleTentLobby_Text_AwardYouThisPrize, MSGBOX_DEFAULT
 	slateporttent_giveprize
 	switch VAR_RESULT
@@ -57,11 +57,11 @@ SlateportCity_BattleTentLobby_EventScript_GivePrize:: @ 82087E9
 	waitfanfare
 	goto SlateportCity_BattleTentLobby_EventScript_EndGivePrize
 
-SlateportCity_BattleTentLobby_EventScript_NoRoomForPrize:: @ 820882A
+SlateportCity_BattleTentLobby_EventScript_NoRoomForPrize::
 	msgbox SlateportCity_BattleTentLobby_Text_NoRoomInBagMakeRoom, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentLobby_EventScript_EndGivePrize
 
-SlateportCity_BattleTentLobby_EventScript_LostChallenge:: @ 8208837
+SlateportCity_BattleTentLobby_EventScript_LostChallenge::
 	lockall
 	message SlateportCity_BattleTentLobby_Text_ReturnRentalMonsSaveResults
 	waitmessage
@@ -70,14 +70,14 @@ SlateportCity_BattleTentLobby_EventScript_LostChallenge:: @ 8208837
 	playse SE_SAVE
 	waitse
 
-SlateportCity_BattleTentLobby_EventScript_EndGivePrize:: @ 8208861
+SlateportCity_BattleTentLobby_EventScript_EndGivePrize::
 	msgbox SlateportCity_BattleTentLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-SlateportCity_BattleTentLobby_EventScript_ResumeChallenge:: @ 8208871
+SlateportCity_BattleTentLobby_EventScript_ResumeChallenge::
 	lockall
 	message SlateportCity_BattleTentLobby_Text_BeenWaitingForYou
 	waitmessage
@@ -89,7 +89,7 @@ SlateportCity_BattleTentLobby_EventScript_ResumeChallenge:: @ 8208871
 	setvar VAR_0x8006, 2
 	goto SlateportCity_BattleTentLobby_EventScript_EnterChallenge
 
-SlateportCity_BattleTentLobby_EventScript_Attendant:: @ 82088AA
+SlateportCity_BattleTentLobby_EventScript_Attendant::
 	lock
 	faceplayer
 	slateporttent_getprize
@@ -97,7 +97,7 @@ SlateportCity_BattleTentLobby_EventScript_Attendant:: @ 82088AA
 	goto_if_ne SlateportCity_BattleTentLobby_EventScript_GivePrize
 	special SavePlayerParty
 	msgbox SlateportCity_BattleTentLobby_Text_WelcomeToBattleTent, MSGBOX_DEFAULT
-SlateportCity_BattleTentLobby_EventScript_AskEnterChallenge:: @ 82088CA
+SlateportCity_BattleTentLobby_EventScript_AskEnterChallenge::
 	message SlateportCity_BattleTentLobby_Text_TakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -107,7 +107,7 @@ SlateportCity_BattleTentLobby_EventScript_AskEnterChallenge:: @ 82088CA
 	case 2, SlateportCity_BattleTentLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_CancelChallenge
 
-SlateportCity_BattleTentLobby_EventScript_TryEnterChallenge:: @ 8208906
+SlateportCity_BattleTentLobby_EventScript_TryEnterChallenge::
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_TENT
@@ -117,7 +117,7 @@ SlateportCity_BattleTentLobby_EventScript_TryEnterChallenge:: @ 8208906
 	case YES, SlateportCity_BattleTentLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_LoadPartyCancelChallenge
 
-SlateportCity_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 8208950
+SlateportCity_BattleTentLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	slateporttent_init
@@ -130,7 +130,7 @@ SlateportCity_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 8208950
 	compare VAR_RESULT, 0
 	goto_if_eq SlateportCity_BattleTentLobby_EventScript_CancelChallengeSaveFailed
 	setvar VAR_0x8006, 0
-SlateportCity_BattleTentLobby_EventScript_EnterChallenge:: @ 82089AC
+SlateportCity_BattleTentLobby_EventScript_EnterChallenge::
 	msgbox SlateportCity_BattleTentLobby_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
 	call SlateportCity_BattleTentLobby_EventScript_WalkToDoor
@@ -139,7 +139,7 @@ SlateportCity_BattleTentLobby_EventScript_EnterChallenge:: @ 82089AC
 	waitstate
 	end
 
-SlateportCity_BattleTentLobby_EventScript_WalkToDoor:: @ 82089C9
+SlateportCity_BattleTentLobby_EventScript_WalkToDoor::
 	applymovement LOCALID_ATTENDANT, SlateportCity_BattleTentLobby_Movement_AttendantWalkToDoor
 	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_BattleTentLobby_Movement_PlayerWalkToDoor
 	waitmovement 0
@@ -152,53 +152,53 @@ SlateportCity_BattleTentLobby_EventScript_WalkToDoor:: @ 82089C9
 	waitdooranim
 	return
 
-SlateportCity_BattleTentLobby_Movement_AttendantWalkToDoor: @ 82089F8
+SlateportCity_BattleTentLobby_Movement_AttendantWalkToDoor:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SlateportCity_BattleTentLobby_Movement_AttendantEnterDoor: @ 82089FC
+SlateportCity_BattleTentLobby_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_BattleTentLobby_Movement_PlayerWalkToDoor: @ 82089FF
+SlateportCity_BattleTentLobby_Movement_PlayerWalkToDoor:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SlateportCity_BattleTentLobby_Movement_PlayerEnterDoor: @ 8208A03
+SlateportCity_BattleTentLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_BattleTentLobby_EventScript_ExplainChallenge:: @ 8208A07
+SlateportCity_BattleTentLobby_EventScript_ExplainChallenge::
 	msgbox SlateportCity_BattleTentLobby_Text_ExplainSlateportTent, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentLobby_EventScript_AskEnterChallenge
 
-SlateportCity_BattleTentLobby_EventScript_CancelChallengeSaveFailed:: @ 8208A14
+SlateportCity_BattleTentLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto SlateportCity_BattleTentLobby_EventScript_CancelChallenge
 
-SlateportCity_BattleTentLobby_EventScript_LoadPartyCancelChallenge:: @ 8208A2B
+SlateportCity_BattleTentLobby_EventScript_LoadPartyCancelChallenge::
 	special LoadPlayerParty
-SlateportCity_BattleTentLobby_EventScript_CancelChallenge:: @ 8208A2E
+SlateportCity_BattleTentLobby_EventScript_CancelChallenge::
 	msgbox SlateportCity_BattleTentLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
 	release
 	end
 
 @ Unused
-SlateportCity_BattleTentLobby_Movement_UnusedEnterDoor:: @ 8208A38
+SlateportCity_BattleTentLobby_Movement_UnusedEnterDoor::
 	walk_up
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_BattleTentLobby_EventScript_TormentGiver:: @ 8208A3D
+SlateportCity_BattleTentLobby_EventScript_TormentGiver::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM41, SlateportCity_BattleTentLobby_EventScript_ReceivedTorment
@@ -211,30 +211,30 @@ SlateportCity_BattleTentLobby_EventScript_TormentGiver:: @ 8208A3D
 	release
 	end
 
-SlateportCity_BattleTentLobby_EventScript_ReceivedTorment:: @ 8208A74
+SlateportCity_BattleTentLobby_EventScript_ReceivedTorment::
 	msgbox SlateportCity_BattleTentLobby_Text_ExplainTorment, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_BattleTentLobby_EventScript_Man:: @ 8208A7E
+SlateportCity_BattleTentLobby_EventScript_Man::
 	msgbox SlateportCity_BattleTentLobby_Text_IllTryUsingBugMons, MSGBOX_NPC
 	end
 
-SlateportCity_BattleTentLobby_EventScript_Girl:: @ 8208A87
+SlateportCity_BattleTentLobby_EventScript_Girl::
 	msgbox SlateportCity_BattleTentLobby_Text_BattleEvenWithoutToughMons, MSGBOX_NPC
 	end
 
-SlateportCity_BattleTentLobby_EventScript_Woman:: @ 8208A90
+SlateportCity_BattleTentLobby_EventScript_Woman::
 	msgbox SlateportCity_BattleTentLobby_Text_NiceIfMoreSelection, MSGBOX_NPC
 	end
 
-SlateportCity_BattleTentLobby_EventScript_RulesBoard:: @ 8208A99
+SlateportCity_BattleTentLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattleFactoryLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard:: @ 8208AA8
+SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 0, MULTI_SLATEPORT_TENT_RULES, FALSE
@@ -248,36 +248,36 @@ SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard:: @ 8208AA8
 	case MULTI_B_PRESSED, SlateportCity_BattleTentLobby_EventScript_ExitRules
 	end
 
-SlateportCity_BattleTentLobby_EventScript_RulesBasics:: @ 8208B06
+SlateportCity_BattleTentLobby_EventScript_RulesBasics::
 	msgbox SlateportCity_BattleTentLobby_Text_ExplainBasicRules, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_RulesSwapPartner:: @ 8208B14
+SlateportCity_BattleTentLobby_EventScript_RulesSwapPartner::
 	msgbox SlateportCity_BattleTentLobby_Text_ExplainSwapPartnerRules, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_RulesSwapNumber:: @ 8208B22
+SlateportCity_BattleTentLobby_EventScript_RulesSwapNumber::
 	msgbox SlateportCity_BattleTentLobby_Text_ExplainSwapNumberRules, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_RulesSwapNotes:: @ 8208B30
+SlateportCity_BattleTentLobby_EventScript_RulesSwapNotes::
 	msgbox SlateportCity_BattleTentLobby_Text_ExplainSwapNotes, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_RulesMons:: @ 8208B3E
+SlateportCity_BattleTentLobby_EventScript_RulesMons::
 	msgbox SlateportCity_BattleTentLobby_Text_ExplainMonRules, MSGBOX_DEFAULT
 	goto SlateportCity_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-SlateportCity_BattleTentLobby_EventScript_ExitRules:: @ 8208B4C
+SlateportCity_BattleTentLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-SlateportCity_BattleTentLobby_Text_CouldntFindMonForMe: @ 8208B4E
+SlateportCity_BattleTentLobby_Text_CouldntFindMonForMe:
 	.string "So, like, I couldn't find myself any\n"
 	.string "POKéMON that were, like, for me.\p"
 	.string "So, I figured, like, hey, I should file\n"
@@ -287,7 +287,7 @@ SlateportCity_BattleTentLobby_Text_CouldntFindMonForMe: @ 8208B4E
 	.string "Hey, like, you! Zip it, you know?\n"
 	.string "Just, you know, take this!$"
 
-SlateportCity_BattleTentLobby_Text_ExplainTorment: @ 8208C5C
+SlateportCity_BattleTentLobby_Text_ExplainTorment:
 	.string "That's, like, TM41, you know?\n"
 	.string "Hey, it's TORMENT, you hearing me?\p"
 	.string "Like, it won't let the other guy\n"
@@ -295,18 +295,18 @@ SlateportCity_BattleTentLobby_Text_ExplainTorment: @ 8208C5C
 	.string "Hey, now, you listen here, like,\n"
 	.string "I'm not laying a torment on you!$"
 
-SlateportCity_BattleTentLobby_Text_IllTryUsingBugMons: @ 8208D27
+SlateportCity_BattleTentLobby_Text_IllTryUsingBugMons:
 	.string "I don't really like BUG POKéMON,\n"
 	.string "but maybe I'll try using some for\l"
 	.string "a change of pace.\p"
 	.string "Who knows, I might even get to like\n"
 	.string "them!$"
 
-SlateportCity_BattleTentLobby_Text_BattleEvenWithoutToughMons: @ 8208DA6
+SlateportCity_BattleTentLobby_Text_BattleEvenWithoutToughMons:
 	.string "You can battle all you want here even\n"
 	.string "if you don't have any tough POKéMON.$"
 
-SlateportCity_BattleTentLobby_Text_NiceIfMoreSelection: @ 8208DF1
+SlateportCity_BattleTentLobby_Text_NiceIfMoreSelection:
 	.string "Wouldn't it be nice if they had more of\n"
 	.string "a selection?$"
 
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index 276ee32f8..fb73f5b93 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -4,11 +4,11 @@
 .set LOCALID_ARCHIE, 7
 .set LOCALID_SUBMARINE, 8
 
-SlateportCity_Harbor_MapScripts:: @ 820C97D
+SlateportCity_Harbor_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_Harbor_OnTransition
 	.byte 0
 
-SlateportCity_Harbor_OnTransition: @ 820C983
+SlateportCity_Harbor_OnTransition:
 	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
 	setvar VAR_TEMP_1, 0
 	compare VAR_SLATEPORT_HARBOR_STATE, 1
@@ -16,36 +16,36 @@ SlateportCity_Harbor_OnTransition: @ 820C983
 	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_ShowSSTidal
 	end
 
-SlateportCity_Harbor_EventScript_ShowSSTidal:: @ 820C9A5
+SlateportCity_Harbor_EventScript_ShowSSTidal::
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
 	return
 
-SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene:: @ 820C9A9
+SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene::
 	savebgm MUS_ENCOUNTER_AQUA
 	setobjectxyperm LOCALID_CAPT_STERN, 12, 13
 	setobjectmovementtype LOCALID_CAPT_STERN, MOVEMENT_TYPE_FACE_LEFT
 	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
 	return
 
-SlateportCity_Harbor_EventScript_AquaEscapeTrigger0:: @ 820C9BB
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger0::
 	lockall
 	setvar VAR_0x8008, 0
 	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_AquaEscapeTrigger1:: @ 820C9C7
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger1::
 	lockall
 	setvar VAR_0x8008, 1
 	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_AquaEscapeTrigger2:: @ 820C9D3
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger2::
 	lockall
 	setvar VAR_0x8008, 2
 	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_AquaEscapeTrigger3:: @ 820C9DF
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger3::
 	lockall
 	setvar VAR_0x8008, 3
 	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp
@@ -53,7 +53,7 @@ SlateportCity_Harbor_EventScript_AquaEscapeTrigger3:: @ 820C9DF
 	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5
+SlateportCity_Harbor_EventScript_AquaEscapeScene::
 	applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	applymovement LOCALID_GRUNT, Common_Movement_WalkInPlaceFastestDown
@@ -88,28 +88,28 @@ SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5
 	releaseall
 	end
 
-SlateportCity_Harbor_EventScript_SternApproachPlayer0:: @ 820CA89
+SlateportCity_Harbor_EventScript_SternApproachPlayer0::
 	applymovement LOCALID_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer0
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_EventScript_SternApproachPlayer1:: @ 820CA9E
+SlateportCity_Harbor_EventScript_SternApproachPlayer1::
 	applymovement LOCALID_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer1
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_EventScript_SternApproachPlayer:: @ 820CAB3
+SlateportCity_Harbor_EventScript_SternApproachPlayer::
 	applymovement LOCALID_CAPT_STERN, SlateportCity_Harbor_Movement_SternApproachPlayer
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_Movement_AquaBoardSub: @ 820CAC8
+SlateportCity_Harbor_Movement_AquaBoardSub:
 	delay_16
 	delay_16
 	jump_up
@@ -117,14 +117,14 @@ SlateportCity_Harbor_Movement_AquaBoardSub: @ 820CAC8
 	step_end
 
 @ Unused, Archie instead shares above identical movement script with Grunt
-SlateportCity_Harbor_Movement_ArchieBoardSub: @ 820CACD
+SlateportCity_Harbor_Movement_ArchieBoardSub:
 	delay_16
 	delay_16
 	jump_up
 	set_invisible
 	step_end
 
-SlateportCity_Harbor_Movement_SubmarineExit: @ 820CAD2
+SlateportCity_Harbor_Movement_SubmarineExit:
 	delay_16
 	delay_16
 	delay_16
@@ -140,7 +140,7 @@ SlateportCity_Harbor_Movement_SubmarineExit: @ 820CAD2
 	walk_fast_right
 	step_end
 
-SlateportCity_Harbor_Movement_SternApproachPlayer0: @ 820CAE0
+SlateportCity_Harbor_Movement_SternApproachPlayer0:
 	walk_left
 	walk_left
 	walk_left
@@ -148,24 +148,24 @@ SlateportCity_Harbor_Movement_SternApproachPlayer0: @ 820CAE0
 	walk_up
 	step_end
 
-SlateportCity_Harbor_Movement_SternApproachPlayer1: @ 820CAE6
+SlateportCity_Harbor_Movement_SternApproachPlayer1:
 	walk_left
 	walk_left
 	walk_up
 	walk_left
 	step_end
 
-SlateportCity_Harbor_Movement_SternApproachPlayer: @ 820CAEB
+SlateportCity_Harbor_Movement_SternApproachPlayer:
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-SlateportCity_Harbor_Movement_PlayerWalkUp: @ 820CAEF
+SlateportCity_Harbor_Movement_PlayerWalkUp:
 	walk_up
 	step_end
 
-SlateportCity_Harbor_EventScript_FerryAttendant:: @ 820CAF1
+SlateportCity_Harbor_EventScript_FerryAttendant::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_AskForTicket
@@ -173,14 +173,14 @@ SlateportCity_Harbor_EventScript_FerryAttendant:: @ 820CAF1
 	release
 	end
 
-SlateportCity_Harbor_EventScript_AskForTicket:: @ 820CB06
+SlateportCity_Harbor_EventScript_AskForTicket::
 	msgbox SlateportCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT
 	message SlateportCity_Harbor_Text_FlashedTicketWhereTo
 	waitmessage
 	goto SlateportCity_Harbor_EventScript_ChooseDestination
 	end
 
-SlateportCity_Harbor_EventScript_ChooseDestination:: @ 820CB1A
+SlateportCity_Harbor_EventScript_ChooseDestination::
 	goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier
 	multichoicedefault 18, 8, MULTI_SSTIDAL_SLATEPORT_NO_BF, 2, FALSE
 	switch VAR_RESULT
@@ -189,7 +189,7 @@ SlateportCity_Harbor_EventScript_ChooseDestination:: @ 820CB1A
 	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_CancelDestinationSelect
 	end
 
-SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier:: @ 820CB50
+SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier::
 	multichoicedefault 17, 6, MULTI_SSTIDAL_SLATEPORT_WITH_BF, 2, FALSE
 	switch VAR_RESULT
 	case 0, SlateportCity_Harbor_EventScript_Lilycove
@@ -199,12 +199,12 @@ SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier:: @ 820CB50
 	end
 
 @ Unused. Should be impossible for player to reach Ferry without having received SS Tidal ticket
-SlateportCity_Harbor_EventScript_NoTicket:: @ 820CB88
+SlateportCity_Harbor_EventScript_NoTicket::
 	msgbox SlateportCity_Harbor_Text_YouMustHaveTicket, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_Lilycove:: @ 820CB92
+SlateportCity_Harbor_EventScript_Lilycove::
 	msgbox SlateportCity_Harbor_Text_LilycoveItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
@@ -215,7 +215,7 @@ SlateportCity_Harbor_EventScript_Lilycove:: @ 820CB92
 	release
 	end
 
-SlateportCity_Harbor_EventScript_BattleFrontier:: @ 820CBBA
+SlateportCity_Harbor_EventScript_BattleFrontier::
 	msgbox SlateportCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
@@ -225,13 +225,13 @@ SlateportCity_Harbor_EventScript_BattleFrontier:: @ 820CBBA
 	release
 	end
 
-SlateportCity_Harbor_EventScript_ChooseNewDestination:: @ 820CBDD
+SlateportCity_Harbor_EventScript_ChooseNewDestination::
 	message SlateportCity_Harbor_Text_WhereWouldYouLikeToGo
 	waitmessage
 	goto SlateportCity_Harbor_EventScript_ChooseDestination
 	end
 
-SlateportCity_Harbor_EventScript_BoardFerry:: @ 820CBE9
+SlateportCity_Harbor_EventScript_BoardFerry::
 	msgbox SlateportCity_Harbor_Text_PleaseBoardFerry, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
@@ -248,31 +248,31 @@ SlateportCity_Harbor_EventScript_BoardFerry:: @ 820CBE9
 	call Common_EventScript_FerryDepart
 	return
 
-SlateportCity_Harbor_EventScript_CancelDestinationSelect:: @ 820CC2D
+SlateportCity_Harbor_EventScript_CancelDestinationSelect::
 	msgbox SlateportCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_BoardFerryEast:: @ 820CC37
+SlateportCity_Harbor_EventScript_BoardFerryEast::
 	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_EventScript_BoardFerryNorth:: @ 820CC42
+SlateportCity_Harbor_EventScript_BoardFerryNorth::
 	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_Movement_BoardFerryEast: @ 820CC4D
+SlateportCity_Harbor_Movement_BoardFerryEast:
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-SlateportCity_Harbor_Movement_BoardFerryNorth: @ 820CC50
+SlateportCity_Harbor_Movement_BoardFerryNorth:
 	walk_up
 	step_end
 
-SlateportCity_Harbor_EventScript_Sailor:: @ 820CC52
+SlateportCity_Harbor_EventScript_Sailor::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather
@@ -285,20 +285,20 @@ SlateportCity_Harbor_EventScript_Sailor:: @ 820CC52
 	release
 	end
 
-SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather:: @ 820CC89
+SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather::
 	msgbox SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_CountDefeatedLegendary:: @ 820CC93
+SlateportCity_Harbor_EventScript_CountDefeatedLegendary::
 	addvar VAR_0x8004, 1
 	return
 
-SlateportCity_Harbor_EventScript_FatMan:: @ 820CC99
+SlateportCity_Harbor_EventScript_FatMan::
 	msgbox SlateportCity_Harbor_Text_SubTooSmallForMe, MSGBOX_NPC
 	end
 
-SlateportCity_Harbor_EventScript_CaptStern:: @ 820CCA2
+SlateportCity_Harbor_EventScript_CaptStern::
 	lock
 	faceplayer
 	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment
@@ -313,23 +313,23 @@ SlateportCity_Harbor_EventScript_CaptStern:: @ 820CCA2
 	release
 	end
 
-SlateportCity_Harbor_EventScript_WhyStealSubmarine:: @ 820CCDF
+SlateportCity_Harbor_EventScript_WhyStealSubmarine::
 	msgbox SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_TeamAquaLeftNeedDive:: @ 820CCE9
+SlateportCity_Harbor_EventScript_TeamAquaLeftNeedDive::
 	setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
 	msgbox SlateportCity_Harbor_Text_TeamAquaLeftNeedDive, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_NeedDive:: @ 820CCF6
+SlateportCity_Harbor_EventScript_NeedDive::
 	msgbox SlateportCity_Harbor_Text_NeedDiveToCatchSub, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment:: @ 820CD00
+SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment::
 	compare VAR_TEMP_1, 1
 	goto_if_eq SlateportCity_Harbor_EventScript_TradedScanner
 	checkitem ITEM_SCANNER, 1
@@ -340,18 +340,18 @@ SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment:: @ 820CD00
 	release
 	end
 
-SlateportCity_Harbor_EventScript_FerryFinished:: @ 820CD2E
+SlateportCity_Harbor_EventScript_FerryFinished::
 	msgbox SlateportCity_Harbor_Text_FinishedMakingFerry, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_AskToTradeScanner:: @ 820CD38
+SlateportCity_Harbor_EventScript_AskToTradeScanner::
 	message SlateportCity_Harbor_Text_WouldYouTradeScanner
 	waitmessage
 	goto SlateportCity_Harbor_EventScript_ChooseScannerTrade
 	end
 
-SlateportCity_Harbor_EventScript_ChooseScannerTrade:: @ 820CD44
+SlateportCity_Harbor_EventScript_ChooseScannerTrade::
 	multichoice 0, 0, MULTI_STERN_DEEPSEA, FALSE
 	switch VAR_RESULT
 	case 0, SlateportCity_Harbor_EventScript_DeepSeaTooth
@@ -360,7 +360,7 @@ SlateportCity_Harbor_EventScript_ChooseScannerTrade:: @ 820CD44
 	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_DeclineTrade
 	end
 
-SlateportCity_Harbor_EventScript_DeepSeaTooth:: @ 820CD7B
+SlateportCity_Harbor_EventScript_DeepSeaTooth::
 	msgbox SlateportCity_Harbor_Text_TradeForDeepSeaTooth, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade
@@ -373,7 +373,7 @@ SlateportCity_Harbor_EventScript_DeepSeaTooth:: @ 820CD7B
 	goto SlateportCity_Harbor_EventScript_TradedScanner
 	end
 
-SlateportCity_Harbor_EventScript_DeepSeaScale:: @ 820CDBB
+SlateportCity_Harbor_EventScript_DeepSeaScale::
 	msgbox SlateportCity_Harbor_Text_TradeForDeepSeaScale, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade
@@ -386,67 +386,67 @@ SlateportCity_Harbor_EventScript_DeepSeaScale:: @ 820CDBB
 	goto SlateportCity_Harbor_EventScript_TradedScanner
 	end
 
-SlateportCity_Harbor_EventScript_DeclineTrade:: @ 820CDFB
+SlateportCity_Harbor_EventScript_DeclineTrade::
 	msgbox SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_ChooseDifferentTrade:: @ 820CE05
+SlateportCity_Harbor_EventScript_ChooseDifferentTrade::
 	message SlateportCity_Harbor_Text_WhichOneDoYouWant
 	waitmessage
 	goto SlateportCity_Harbor_EventScript_ChooseScannerTrade
 	end
 
-SlateportCity_Harbor_EventScript_TradedScanner:: @ 820CE11
+SlateportCity_Harbor_EventScript_TradedScanner::
 	setvar VAR_TEMP_1, 1
 	msgbox SlateportCity_Harbor_Text_ThisWillHelpResearch, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_Text_FerryServiceUnavailable: @ 820CE20
+SlateportCity_Harbor_Text_FerryServiceUnavailable:
 	.string "I beg your pardon?\n"
 	.string "You're looking for a ship?\p"
 	.string "I'm sorry, the ferry service isn't\n"
 	.string "available at present…$"
 
-SlateportCity_Harbor_Text_MayISeeYourTicket: @ 820CE87
+SlateportCity_Harbor_Text_MayISeeYourTicket:
 	.string "Hello, are you here for the ferry?\n"
 	.string "May I see your TICKET?$"
 
-SlateportCity_Harbor_Text_YouMustHaveTicket: @ 820CEC1
+SlateportCity_Harbor_Text_YouMustHaveTicket:
 	.string "{PLAYER} doesn't have the TICKET…\p"
 	.string "I'm terribly sorry.\p"
 	.string "You must have a TICKET to board\n"
 	.string "the ferry.$"
 
-SlateportCity_Harbor_Text_FlashedTicketWhereTo: @ 820CF1C
+SlateportCity_Harbor_Text_FlashedTicketWhereTo:
 	.string "{PLAYER} flashed the TICKET.\p"
 	.string "Perfect! That's all you need!\p"
 	.string "And where would you like to go?$"
 
-SlateportCity_Harbor_Text_SailAnotherTime: @ 820CF71
+SlateportCity_Harbor_Text_SailAnotherTime:
 	.string "Please sail with us another time!$"
 
-SlateportCity_Harbor_Text_LilycoveItIs: @ 820CF93
+SlateportCity_Harbor_Text_LilycoveItIs:
 	.string "LILYCOVE CITY it is, then!$"
 
-SlateportCity_Harbor_Text_BattleFrontierItIs: @ 820CFAE
+SlateportCity_Harbor_Text_BattleFrontierItIs:
 	.string "BATTLE FRONTIER it is, then!$"
 
-SlateportCity_Harbor_Text_PleaseBoardFerry: @ 820CFCB
+SlateportCity_Harbor_Text_PleaseBoardFerry:
 	.string "Please board the ferry and wait for\n"
 	.string "departure.$"
 
-SlateportCity_Harbor_Text_WhereWouldYouLikeToGo: @ 820CFFA
+SlateportCity_Harbor_Text_WhereWouldYouLikeToGo:
 	.string "Then, where would you like to go?$"
 
-SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday: @ 820D01C
+SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday:
 	.string "A journey to the bottom of the sea…\n"
 	.string "I wonder what it'd be like?\p"
 	.string "I'd love to go deep underwater like\n"
 	.string "that someday.$"
 
-SlateportCity_Harbor_Text_AbnormalWeather: @ 820D08E
+SlateportCity_Harbor_Text_AbnormalWeather:
 	.string "For a ship to sail safely, we need to\n"
 	.string "know about the weather!\p"
 	.string "Speaking of weather, I heard something\n"
@@ -456,19 +456,19 @@ SlateportCity_Harbor_Text_AbnormalWeather: @ 820D08E
 	.string "You should visit the WEATHER INSTITUTE\n"
 	.string "and ask around!$"
 
-SlateportCity_Harbor_Text_SubTooSmallForMe: @ 820D194
+SlateportCity_Harbor_Text_SubTooSmallForMe:
 	.string "I wanted to go with CAPT. STERN on\n"
 	.string "the ocean floor exploration.\p"
 	.string "But the sub's too small for me.\p"
 	.string "If I squeezed in, there wouldn't be\n"
 	.string "any room for the CAPTAIN…$"
 
-SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum: @ 820D232
+SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum:
 	.string "CAPT. STERN: Those thugs…\p"
 	.string "They're the same lot who tried to rob\n"
 	.string "the DEVON GOODS at the MUSEUM.$"
 
-SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove: @ 820D291
+SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove:
 	.string "ARCHIE: Oh?\n"
 	.string "Not you again…\p"
 	.string "You are tenacious to track us here,\n"
@@ -479,7 +479,7 @@ SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove: @ 820D291
 	.string "HIDEOUT in LILYCOVE CITY?\p"
 	.string "Fwahahahaha…$"
 
-SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine: @ 820D35A
+SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine:
 	.string "CAPT. STERN: Why…\p"
 	.string "Why would TEAM AQUA steal my\n"
 	.string "SUBMARINE EXPLORER 1?\p"
@@ -488,7 +488,7 @@ SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine: @ 820D35A
 	.string "But even if I were to chase them,\n"
 	.string "I don't stand a chance against them…$"
 
-SlateportCity_Harbor_Text_TeamAquaLeftNeedDive: @ 820D42B
+SlateportCity_Harbor_Text_TeamAquaLeftNeedDive:
 	.string "CAPT. STERN: Oh, {PLAYER}{KUN}…\p"
 	.string "Okay… So TEAM AQUA left before you\n"
 	.string "could stop them…\p"
@@ -503,7 +503,7 @@ SlateportCity_Harbor_Text_TeamAquaLeftNeedDive: @ 820D42B
 	.string "A lot of divers live out there, so\n"
 	.string "someone might teach you…$"
 
-SlateportCity_Harbor_Text_NeedDiveToCatchSub: @ 820D58A
+SlateportCity_Harbor_Text_NeedDiveToCatchSub:
 	.string "CAPT. STERN: Trying to catch a\n"
 	.string "submarine… It's impossible.\p"
 	.string "You would need a POKéMON that knows\n"
@@ -513,13 +513,13 @@ SlateportCity_Harbor_Text_NeedDiveToCatchSub: @ 820D58A
 	.string "A lot of divers live out there, so\n"
 	.string "someone might teach you…$"
 
-SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry: @ 820D65C
+SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry:
 	.string "CAPT. STERN: Oh, yes.\n"
 	.string "MR. BRINEY came to our SHIPYARD.\p"
 	.string "It won't be long now before we finish\n"
 	.string "making the ferry!$"
 
-SlateportCity_Harbor_Text_FinishedMakingFerry: @ 820D6CB
+SlateportCity_Harbor_Text_FinishedMakingFerry:
 	.string "CAPT. STERN: {PLAYER}{KUN}!\p"
 	.string "We finally finished making the ferry\n"
 	.string "S.S. TIDAL!\p"
@@ -527,7 +527,7 @@ SlateportCity_Harbor_Text_FinishedMakingFerry: @ 820D6CB
 	.string "your friend MR. BRINEY.\p"
 	.string "Please go for a short cruise on it!$"
 
-SlateportCity_Harbor_Text_WouldYouTradeScanner: @ 820D76C
+SlateportCity_Harbor_Text_WouldYouTradeScanner:
 	.string "CAPT. STERN: Oh?\n"
 	.string "{PLAYER}{KUN}, that item you have…\p"
 	.string "That's a SCANNER! That would sure\n"
@@ -537,27 +537,27 @@ SlateportCity_Harbor_Text_WouldYouTradeScanner: @ 820D76C
 	.string "Like, say, a DEEPSEATOOTH or\n"
 	.string "a DEEPSEASCALE that I have?$"
 
-SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow: @ 820D841
+SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow:
 	.string "CAPT. STERN: Are you certain?\n"
 	.string "It's useless to you, {PLAYER}{KUN}…\p"
 	.string "Well, okay, then. If you want to trade\n"
 	.string "your SCANNER, let me know.$"
 
-SlateportCity_Harbor_Text_TradeForDeepSeaTooth: @ 820D8BC
+SlateportCity_Harbor_Text_TradeForDeepSeaTooth:
 	.string "CAPT. STERN: So you'll trade it for\n"
 	.string "my DEEPSEATOOTH?$"
 
-SlateportCity_Harbor_Text_TradeForDeepSeaScale: @ 820D8F1
+SlateportCity_Harbor_Text_TradeForDeepSeaScale:
 	.string "CAPT. STERN: So you'll trade it for\n"
 	.string "my DEEPSEASCALE?$"
 
-SlateportCity_Harbor_Text_WhichOneDoYouWant: @ 820D926
+SlateportCity_Harbor_Text_WhichOneDoYouWant:
 	.string "CAPT. STERN: Which one do you want?$"
 
-SlateportCity_Harbor_Text_HandedScannerToStern: @ 820D94A
+SlateportCity_Harbor_Text_HandedScannerToStern:
 	.string "{PLAYER} handed the SCANNER to\n"
 	.string "CAPT. STERN.$"
 
-SlateportCity_Harbor_Text_ThisWillHelpResearch: @ 820D970
+SlateportCity_Harbor_Text_ThisWillHelpResearch:
 	.string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n"
 	.string "This will help our research a lot!$"
diff --git a/data/maps/SlateportCity_House/scripts.inc b/data/maps/SlateportCity_House/scripts.inc
index 13b0caf91..d903ba865 100644
--- a/data/maps/SlateportCity_House/scripts.inc
+++ b/data/maps/SlateportCity_House/scripts.inc
@@ -1,22 +1,22 @@
-SlateportCity_House_MapScripts:: @ 820D9AE
+SlateportCity_House_MapScripts::
 	.byte 0
 
-SlateportCity_House_EventScript_PokefanM:: @ 820D9AF
+SlateportCity_House_EventScript_PokefanM::
 	msgbox SlateportCity_House_Text_NatureToDoWithStatGains, MSGBOX_NPC
 	end
 
-SlateportCity_House_EventScript_Girl:: @ 820D9B8
+SlateportCity_House_EventScript_Girl::
 	msgbox SlateportCity_House_Text_MustBeGoingToBattleTent, MSGBOX_NPC
 	end
 
-SlateportCity_House_Text_NatureToDoWithStatGains: @ 820D9C1
+SlateportCity_House_Text_NatureToDoWithStatGains:
 	.string "My POKéMON has a HASTY nature.\p"
 	.string "It has higher SPEED compared to\n"
 	.string "my other POKéMON.\p"
 	.string "Maybe their nature has something to\n"
 	.string "do with the stat gains of POKéMON.$"
 
-SlateportCity_House_Text_MustBeGoingToBattleTent: @ 820DA59
+SlateportCity_House_Text_MustBeGoingToBattleTent:
 	.string "You're a TRAINER, aren't you?\p"
 	.string "Since you came to SLATEPORT CITY,\n"
 	.string "you must be going to the BATTLE TENT.$"
diff --git a/data/maps/SlateportCity_Mart/scripts.inc b/data/maps/SlateportCity_Mart/scripts.inc
index a1c557ad2..a0c0a8612 100644
--- a/data/maps/SlateportCity_Mart/scripts.inc
+++ b/data/maps/SlateportCity_Mart/scripts.inc
@@ -1,7 +1,7 @@
-SlateportCity_Mart_MapScripts:: @ 820DC48
+SlateportCity_Mart_MapScripts::
 	.byte 0
 
-SlateportCity_Mart_EventScript_Clerk:: @ 820DC49
+SlateportCity_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -11,7 +11,8 @@ SlateportCity_Mart_EventScript_Clerk:: @ 820DC49
 	release
 	end
 
-SlateportCity_Mart_Pokemart: @ 820DC60
+	.align 2
+SlateportCity_Mart_Pokemart:
 	.2byte ITEM_POKE_BALL
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_POTION
@@ -25,21 +26,21 @@ SlateportCity_Mart_Pokemart: @ 820DC60
 	release
 	end
 
-SlateportCity_Mart_EventScript_BlackBelt:: @ 820DC76
+SlateportCity_Mart_EventScript_BlackBelt::
 	msgbox SlateportCity_Mart_Text_SomeItemsOnlyAtMart, MSGBOX_NPC
 	end
 
-SlateportCity_Mart_EventScript_Man:: @ 820DC7F
+SlateportCity_Mart_EventScript_Man::
 	msgbox SlateportCity_Mart_Text_GreatBallIsBetter, MSGBOX_NPC
 	end
 
-SlateportCity_Mart_Text_SomeItemsOnlyAtMart: @ 820DC88
+SlateportCity_Mart_Text_SomeItemsOnlyAtMart:
 	.string "The MARKET does have some interesting\n"
 	.string "merchandise.\p"
 	.string "But there are some items you can only\n"
 	.string "get at a POKéMON MART.$"
 
-SlateportCity_Mart_Text_GreatBallIsBetter: @ 820DCF8
+SlateportCity_Mart_Text_GreatBallIsBetter:
 	.string "A GREAT BALL is better than a POKé BALL\n"
 	.string "at catching POKéMON.\p"
 	.string "With this, I should be able to get that\n"
diff --git a/data/maps/SlateportCity_NameRatersHouse/scripts.inc b/data/maps/SlateportCity_NameRatersHouse/scripts.inc
index 92c6b7a02..87ed2d07f 100644
--- a/data/maps/SlateportCity_NameRatersHouse/scripts.inc
+++ b/data/maps/SlateportCity_NameRatersHouse/scripts.inc
@@ -1,7 +1,7 @@
-SlateportCity_NameRatersHouse_MapScripts:: @ 8209AA4
+SlateportCity_NameRatersHouse_MapScripts::
 	.byte 0
 
-SlateportCity_NameRatersHouse_EventScript_NameRater:: @ 8209AA5
+SlateportCity_NameRatersHouse_EventScript_NameRater::
 	lock
 	faceplayer
 	msgbox SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname, MSGBOX_YESNO
@@ -11,7 +11,7 @@ SlateportCity_NameRatersHouse_EventScript_NameRater:: @ 8209AA5
 	goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
 	end
 
-SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate:: @ 8209AC6
+SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate::
 	msgbox SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname, MSGBOX_DEFAULT
 	special ChoosePartyMon
 	waitstate
@@ -21,12 +21,12 @@ SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate:: @ 8209AC6
 	goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
 	end
 
-SlateportCity_NameRatersHouse_EventScript_DeclineNameRate:: @ 8209AE9
+SlateportCity_NameRatersHouse_EventScript_DeclineNameRate::
 	msgbox SlateportCity_NameRatersHouse_Text_DoVisitAgain, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_NameRatersHouse_EventScript_RateMonNickname:: @ 8209AF3
+SlateportCity_NameRatersHouse_EventScript_RateMonNickname::
 	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
 	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq SlateportCity_NameRatersHouse_EventScript_CantRateEgg
@@ -45,17 +45,17 @@ SlateportCity_NameRatersHouse_EventScript_RateMonNickname:: @ 8209AF3
 	goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
 	end
 
-SlateportCity_NameRatersHouse_EventScript_CantRateEgg:: @ 8209B46
+SlateportCity_NameRatersHouse_EventScript_CantRateEgg::
 	msgbox SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT:: @ 8209B50
+SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT::
 	msgbox SlateportCity_NameRatersHouse_Text_MagnificentName, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_NameRatersHouse_EventScript_ChangeNickname:: @ 8209B5A
+SlateportCity_NameRatersHouse_EventScript_ChangeNickname::
 	msgbox SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe, MSGBOX_DEFAULT
 	call Common_EventScript_NameReceivedPartyMon
 	specialvar VAR_RESULT, TryPutNameRaterShowOnTheAir
@@ -66,56 +66,56 @@ SlateportCity_NameRatersHouse_EventScript_ChangeNickname:: @ 8209B5A
 	release
 	end
 
-SlateportCity_NameRatersHouse_EventScript_NewNameDifferent:: @ 8209B84
+SlateportCity_NameRatersHouse_EventScript_NewNameDifferent::
 	msgbox SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname: @ 8209B8E
+SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname:
 	.string "Hi, hi! I'm the NAME RATER!\n"
 	.string "I'm the fortune-teller of names!\p"
 	.string "I shall be pleased to rate your\n"
 	.string "POKéMON's nickname.$"
 
-SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname: @ 8209BFF
+SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname:
 	.string "Which POKéMON's nickname should\n"
 	.string "I critique?$"
 
-SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne: @ 8209C2B
+SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne:
 	.string "Hmmm… {STR_VAR_1}, is it? That is\n"
 	.string "quite a fine name you bestowed.\p"
 	.string "But! What say you, if I were to\n"
 	.string "suggest a slightly better name?$"
 
-SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe: @ 8209CA4
+SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe:
 	.string "Ah, good. Then, what shall the new\n"
 	.string "nickname be?$"
 
-SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName: @ 8209CD4
+SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName:
 	.string "Done! From now on, this POKéMON\n"
 	.string "shall be known as {STR_VAR_1}!\p"
 	.string "It is a better name than before!\n"
 	.string "How fortunate for you!$"
 
-SlateportCity_NameRatersHouse_Text_DoVisitAgain: @ 8209D42
+SlateportCity_NameRatersHouse_Text_DoVisitAgain:
 	.string "I see.\n"
 	.string "Do come visit again.$"
 
-SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior: @ 8209D5E
+SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior:
 	.string "Done! From now on, this POKéMON\n"
 	.string "shall be known as {STR_VAR_1}!\p"
 	.string "It looks no different from before,\n"
 	.string "and yet, this is vastly superior!\p"
 	.string "How fortunate for you!$"
 
-SlateportCity_NameRatersHouse_Text_MagnificentName: @ 8209DF0
+SlateportCity_NameRatersHouse_Text_MagnificentName:
 	.string "Hmmm… {STR_VAR_1} it is!\p"
 	.string "This is a magnificent nickname!\n"
 	.string "It is impeccably beyond reproach!\p"
 	.string "You'll do well to cherish your\n"
 	.string "{STR_VAR_1} now and beyond.$"
 
-SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg: @ 8209E74
+SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg:
 	.string "Now, now.\n"
 	.string "That is merely an EGG!$"
 
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index 90c9b93b7..38ec34464 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
@@ -1,27 +1,27 @@
 .set LOCALID_FAMILIAR_GRUNT, 13
 
-SlateportCity_OceanicMuseum_1F_MapScripts:: @ 820AD95
+SlateportCity_OceanicMuseum_1F_MapScripts::
 	.byte 0
 
-SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant:: @ 820AD96
+SlateportCity_OceanicMuseum_1F_EventScript_EntranceAttendant::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft:: @ 820AD9F
+SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeLeft::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight:: @ 820ADB0
+SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFeeRight::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	goto SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1
+SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee::
 	showmoneybox 0, 0, 0
 	msgbox SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -33,7 +33,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1
 	releaseall
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8
+SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee::
 	checkmoney 50, 0
 	compare VAR_RESULT, FALSE
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney
@@ -46,7 +46,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8
 	releaseall
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18
+SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney::
 	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway
 	msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT
 	closemessage
@@ -56,94 +56,94 @@ SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18
 	releaseall
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway:: @ 820AE39
+SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup, MSGBOX_DEFAULT
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
 	hidemoneybox
 	releaseall
 	end
 
-SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter: @ 820AE4B
+SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter:
 	walk_down
 	step_end
 
-SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt1:: @ 820AE4D
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt1::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_AquaExistForGoodOfAll, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt2:: @ 820AE56
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt2::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt3:: @ 820AE5F
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt3::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt4:: @ 820AE68
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt4::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt5:: @ 820AE71
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt5::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_RustboroBungled, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt6:: @ 820AE7A
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumGrunt6::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_WhirlpoolExperiment:: @ 820AE83
+SlateportCity_OceanicMuseum_1F_EventScript_WhirlpoolExperiment::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_WaterfallExperiment:: @ 820AE8C
+SlateportCity_OceanicMuseum_1F_EventScript_WaterfallExperiment::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay:: @ 820AE95
+SlateportCity_OceanicMuseum_1F_EventScript_OceanSoilDisplay::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay:: @ 820AE9E
+SlateportCity_OceanicMuseum_1F_EventScript_BeachSandDisplay::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact1:: @ 820AEA7
+SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact1::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact2:: @ 820AEB0
+SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact2::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact3:: @ 820AEB9
+SlateportCity_OceanicMuseum_1F_EventScript_OceanicMinifact3::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay:: @ 820AEC2
+SlateportCity_OceanicMuseum_1F_EventScript_FossilDisplay::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_FossilDisplay, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine:: @ 820AECB
+SlateportCity_OceanicMuseum_1F_EventScript_DepthMeasuringMachine::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron1:: @ 820AED4
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron1::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron2:: @ 820AEDD
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron2::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron3:: @ 820AEE6
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron3::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron4:: @ 820AEEF
+SlateportCity_OceanicMuseum_1F_EventScript_MuseumPatron4::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 820AEF8
+SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt::
 	lock
 	faceplayer
 	delay 8
@@ -169,51 +169,51 @@ SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGrunt:: @ 820AEF8
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth:: @ 820AF6C
+SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitNorth::
 	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth
 	applymovement LOCALID_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth
 	waitmovement 0
 	goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth:: @ 820AF83
+SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitSouth::
 	applymovement LOCALID_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit
 	waitmovement 0
 	goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast:: @ 820AF93
+SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExitWestEast::
 	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast
 	applymovement LOCALID_FAMILIAR_GRUNT, SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit
 	waitmovement 0
 	goto SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited:: @ 820AFAA
+SlateportCity_OceanicMuseum_1F_EventScript_FamiliarGruntExited::
 	setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT
 	playse SE_EXIT
 	removeobject LOCALID_FAMILIAR_GRUNT
 	release
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief:: @ 820AFB5
+SlateportCity_OceanicMuseum_1F_EventScript_NoRoomForThief::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth: @ 820AFBF
+SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitNorth:
 	delay_16
 	delay_8
 	delay_4
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast: @ 820AFC4
+SlateportCity_OceanicMuseum_1F_Movement_PlayerWatchGruntExitWestEast:
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit: @ 820AFC7
+SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit:
 	face_down
 	walk_fast_down
 	walk_fast_down
@@ -222,7 +222,7 @@ SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExit: @ 820AFC7
 	delay_8
 	step_end
 
-SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth: @ 820AFCE
+SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth:
 	walk_fast_right
 	walk_fast_down
 	walk_fast_down
@@ -231,71 +231,71 @@ SlateportCity_OceanicMuseum_1F_Movement_FamiliarGruntExitNorth: @ 820AFCE
 	delay_8
 	step_end
 
-SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter: @ 820AFD5
+SlateportCity_OceanicMuseum_1F_Text_WouldYouLikeToEnter:
 	.string "Welcome to the OCEANIC MUSEUM.\p"
 	.string "The entrance fee is ¥50.\n"
 	.string "Would you like to enter?$"
 
-SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself: @ 820B026
+SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself:
 	.string "Please enjoy yourself.$"
 
-SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney: @ 820B03D
+SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney:
 	.string "Oh? I'm sorry, but you don't seem to\n"
 	.string "have enough money.$"
 
-SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup: @ 820B075
+SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup:
 	.string "Oh? You're with that group that\n"
 	.string "went in earlier?\p"
 	.string "You're the only one who's late.\n"
 	.string "You'd better go catch up to them!$"
 
-SlateportCity_OceanicMuseum_1F_Text_AquaExistForGoodOfAll: @ 820B0E8
+SlateportCity_OceanicMuseum_1F_Text_AquaExistForGoodOfAll:
 	.string "We, TEAM AQUA, exist for the good\n"
 	.string "of all!$"
 
-SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere: @ 820B112
+SlateportCity_OceanicMuseum_1F_Text_OurBossIsntHere:
 	.string "We were told to assemble here,\n"
 	.string "so we did, but…\p"
 	.string "Our BOSS, the linchpin, isn't here.$"
 
-SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich: @ 820B165
+SlateportCity_OceanicMuseum_1F_Text_WouldStuffHereMakeMeRich:
 	.string "If I ripped off the stuff here,\n"
 	.string "would it make me rich?$"
 
-SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds: @ 820B19C
+SlateportCity_OceanicMuseum_1F_Text_CanLearnForNefariousDeeds:
 	.string "What I learn here, I can put to use on\n"
 	.string "nefarious deeds…$"
 
-SlateportCity_OceanicMuseum_1F_Text_RustboroBungled: @ 820B1D4
+SlateportCity_OceanicMuseum_1F_Text_RustboroBungled:
 	.string "If our goons didn't bungle things\n"
 	.string "in RUSTBORO, we wouldn't be here!$"
 
-SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney: @ 820B218
+SlateportCity_OceanicMuseum_1F_Text_DidntHaveMoney:
 	.string "I didn't have ¥50, so it took a long\n"
 	.string "time getting by the receptionist.$"
 
-SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling: @ 820B25F
+SlateportCity_OceanicMuseum_1F_Text_LearnAboutSeaForBattling:
 	.string "I want to learn about the sea and\n"
 	.string "use that knowledge for battling.$"
 
-SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel: @ 820B2A2
+SlateportCity_OceanicMuseum_1F_Text_SternIsRoleModel:
 	.string "I get all giddy and gooey when\n"
 	.string "I see the sea!\p"
 	.string "For me, CAPT. STERN is the number\n"
 	.string "one role model!$"
 
-SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow: @ 820B302
+SlateportCity_OceanicMuseum_1F_Text_MustBePokemonWeDontKnow:
 	.string "The sea is vast without end, and\n"
 	.string "infinitely deep…\p"
 	.string "There must be many POKéMON that\n"
 	.string "we don't know about.$"
 
-SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon: @ 820B369
+SlateportCity_OceanicMuseum_1F_Text_WantSeaPokemon:
 	.string "I want a sea POKéMON.\p"
 	.string "I think it would feel cool and nice\n"
 	.string "to hug.$"
 
-SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis: @ 820B3AB
+SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis:
 	.string "Aiyeeeh!\n"
 	.string "What are you doing here?\p"
 	.string "Me? I'm the TEAM AQUA member\n"
@@ -304,29 +304,29 @@ SlateportCity_OceanicMuseum_1F_Text_RememberMeTakeThis: @ 820B3AB
 	.string "Here, take this!\n"
 	.string "You have to forgive me!$"
 
-SlateportCity_OceanicMuseum_1F_Text_HopeINeverSeeYouAgain: @ 820B449
+SlateportCity_OceanicMuseum_1F_Text_HopeINeverSeeYouAgain:
 	.string "That TM, it suits you more than it\n"
 	.string "does me.\p"
 	.string "Hope I never see you again!\n"
 	.string "Wahahaha!$"
 
-SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis: @ 820B49B
+SlateportCity_OceanicMuseum_1F_Text_YouHaveToTakeThis:
 	.string "Awww, come on!\n"
 	.string "You have to take this and let me go!$"
 
-SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment: @ 820B4CF
+SlateportCity_OceanicMuseum_1F_Text_WhirlpoolExperiment:
 	.string "A blue fluid is spiraling inside\n"
 	.string "a glass vessel.\p"
 	.string "“This is an experiment to create a\n"
 	.string "WHIRLPOOL artificially using wind.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment: @ 820B547
+SlateportCity_OceanicMuseum_1F_Text_WaterfallExperiment:
 	.string "A red ball is bobbing up and down\n"
 	.string "inside a glass vessel.\p"
 	.string "“This is an experiment simulating a\n"
 	.string "WATERFALL using the ball's buoyancy.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay: @ 820B5CA
+SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay:
 	.string "It's a sample of soil from the ocean\n"
 	.string "floor.\p"
 	.string "“Over many years, the remains of\n"
@@ -335,7 +335,7 @@ SlateportCity_OceanicMuseum_1F_Text_OceanSoilDisplay: @ 820B5CA
 	.string "“By analyzing these layers, the\n"
 	.string "ancient past is revealed.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay: @ 820B699
+SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay:
 	.string "It's a sample of beach sand.\p"
 	.string "“Stones from mountains are washed\n"
 	.string "down by rivers where they are\l"
@@ -343,7 +343,7 @@ SlateportCity_OceanicMuseum_1F_Text_BeachSandDisplay: @ 820B699
 	.string "“They are reduced to grains and end\n"
 	.string "up as sand on beaches.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1: @ 820B74B
+SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1:
 	.string "“OCEANIC MINIFACT 1\n"
 	.string "Why is seawater blue?\p"
 	.string "“Light is composed of many colors.\p"
@@ -352,7 +352,7 @@ SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact1: @ 820B74B
 	.string "“However, blue light retains its\n"
 	.string "color, making the sea appear blue.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2: @ 820B81F
+SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2:
 	.string "“OCEANIC MINIFACT 2\n"
 	.string "Why is the sea salty?\p"
 	.string "“Seawater contains dissolved salt in\n"
@@ -362,7 +362,7 @@ SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact2: @ 820B81F
 	.string "“The concentration of dissolved salt\n"
 	.string "makes the sea salty.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3: @ 820B912
+SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3:
 	.string "“OCEANIC MINIFACT 3\n"
 	.string "Which is bigger? The sea or land?\p"
 	.string "“The sea covers about 70% of\n"
@@ -370,7 +370,7 @@ SlateportCity_OceanicMuseum_1F_Text_OceanicMinifact3: @ 820B912
 	.string "“The sea is therefore more than twice\n"
 	.string "the size of land.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_FossilDisplay: @ 820B9C0
+SlateportCity_OceanicMuseum_1F_Text_FossilDisplay:
 	.string "It's a fossil with wavy ridges on it.\p"
 	.string "“Soil on the ocean floor gets scoured\n"
 	.string "by the tide.\p"
@@ -379,7 +379,7 @@ SlateportCity_OceanicMuseum_1F_Text_FossilDisplay: @ 820B9C0
 	.string "“If this soil becomes fossilized, it is\n"
 	.string "called a ripple mark.”$"
 
-SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine: @ 820BA9C
+SlateportCity_OceanicMuseum_1F_Text_DepthMeasuringMachine:
 	.string "A strange machine is rotating under\n"
 	.string "a glass dome.\p"
 	.string "Maybe it's for measuring the depth\n"
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 782e702f6..90b5c83de 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -3,10 +3,10 @@
 .set LOCALID_GRUNT_1, 3
 .set LOCALID_GRUNT_2, 4
 
-SlateportCity_OceanicMuseum_2F_MapScripts:: @ 820BAFF
+SlateportCity_OceanicMuseum_2F_MapScripts::
 	.byte 0
 
-SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
+SlateportCity_OceanicMuseum_2F_EventScript_CaptStern::
 	lock
 	faceplayer
 	msgbox SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts, MSGBOX_DEFAULT
@@ -96,37 +96,37 @@ SlateportCity_OceanicMuseum_2F_EventScript_CaptStern:: @ 820BB00
 	release
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch:: @ 820BC8C
+SlateportCity_OceanicMuseum_2F_EventScript_ReadyRegisterBirch::
 	setvar VAR_REGISTER_BIRCH_STATE, 1
 	return
 
-SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts:: @ 820BC92
+SlateportCity_OceanicMuseum_2F_EventScript_PlayerFaceGrunts::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts:: @ 820BC9D
+SlateportCity_OceanicMuseum_2F_EventScript_SternFaceGrunts::
 	applymovement LOCALID_CAPT_STERN, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth:: @ 820BCA8
+SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntSouth::
 	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth
 	waitmovement 0
 	return
 
-SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest:: @ 820BCB3
+SlateportCity_OceanicMuseum_2F_EventScript_PlayerApproachGruntWest::
 	applymovement OBJ_EVENT_ID_PLAYER, SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest
 	waitmovement 0
 	return
 
-SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth: @ 820BCBE
+SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntSouth:
 	walk_left
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest: @ 820BCC2
+SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest:
 	walk_up
 	walk_left
 	walk_left
@@ -134,7 +134,7 @@ SlateportCity_OceanicMuseum_2F_Movement_PlayerApproachGruntWest: @ 820BCC2
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_Unused: @ 820BCC8
+SlateportCity_OceanicMuseum_2F_Movement_Unused:
 	walk_up
 	walk_left
 	walk_left
@@ -150,11 +150,11 @@ SlateportCity_OceanicMuseum_2F_Movement_Unused: @ 820BCC8
 	delay_8
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer: @ 820BCD6
+SlateportCity_OceanicMuseum_2F_Movement_ArchieApproachPlayer:
 	walk_right
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter: @ 820BCD8
+SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -166,17 +166,17 @@ SlateportCity_OceanicMuseum_2F_Movement_ArchieEnter: @ 820BCD8
 	walk_right
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle: @ 820BCE2
+SlateportCity_OceanicMuseum_2F_Movement_GruntApproachToBattle:
 	walk_right
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter: @ 820BCE4
+SlateportCity_OceanicMuseum_2F_Movement_FirstGruntEnter:
 	walk_down
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach: @ 820BCE8
+SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach:
 	walk_down
 	walk_down
 	walk_down
@@ -185,17 +185,17 @@ SlateportCity_OceanicMuseum_2F_Movement_FirstGruntApproach: @ 820BCE8
 	walk_right
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated: @ 820BCEF
+SlateportCity_OceanicMuseum_2F_Movement_GruntDefeated:
 	lock_facing_direction
 	walk_left
 	unlock_facing_direction
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter: @ 820BCF3
+SlateportCity_OceanicMuseum_2F_Movement_SecondGruntEnter:
 	walk_down
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach: @ 820BCF5
+SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach:
 	walk_down
 	walk_down
 	walk_down
@@ -206,7 +206,7 @@ SlateportCity_OceanicMuseum_2F_Movement_SecondGruntApproach: @ 820BCF5
 	walk_right
 	step_end
 
-SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie: @ 820BCFE
+SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie:
 	delay_16
 	delay_16
 	delay_16
@@ -220,55 +220,55 @@ SlateportCity_OceanicMuseum_2F_Movement_GruntMoveForArchie: @ 820BCFE
 	walk_in_place_fastest_up
 	step_end
 
-SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample1:: @ 820BD0A
+SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample1::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample2:: @ 820BD13
+SlateportCity_OceanicMuseum_2F_EventScript_WaterQualitySample2::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment:: @ 820BD1C
+SlateportCity_OceanicMuseum_2F_EventScript_PressureExperiment::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_PressureExperiment, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_HoennModel:: @ 820BD25
+SlateportCity_OceanicMuseum_2F_EventScript_HoennModel::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_HoennModel, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay:: @ 820BD2E
+SlateportCity_OceanicMuseum_2F_EventScript_DeepSeawaterDisplay::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay:: @ 820BD37
+SlateportCity_OceanicMuseum_2F_EventScript_SurfaceSeawaterDisplay::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica:: @ 820BD40
+SlateportCity_OceanicMuseum_2F_EventScript_SSTidalReplica::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica:: @ 820BD49
+SlateportCity_OceanicMuseum_2F_EventScript_SubmarineReplica::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica:: @ 820BD52
+SlateportCity_OceanicMuseum_2F_EventScript_SubmersibleReplica::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica:: @ 820BD5B
+SlateportCity_OceanicMuseum_2F_EventScript_SSAnneReplica::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica, MSGBOX_SIGN
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron1:: @ 820BD64
+SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron1::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron2:: @ 820BD6D
+SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron2::
 	msgbox SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum, MSGBOX_NPC
 	end
 
-SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3:: @ 820BD76
+SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3::
 	lock
 	faceplayer
 	msgbox SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine, MSGBOX_DEFAULT
@@ -278,7 +278,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_MuseumPatron3:: @ 820BD76
 	release
 	end
 
-SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts: @ 820BD8D
+SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts:
 	.string "Yes? If you're looking for STERN,\n"
 	.string "that would be me.\p"
 	.string "Ah! Those must be the parts I ordered\n"
@@ -286,47 +286,47 @@ SlateportCity_OceanicMuseum_2F_Text_ThankYouForTheParts: @ 820BD8D
 	.string "Thank you! That's great!\n"
 	.string "We can prepare for our expedition now.$"
 
-SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts: @ 820BE40
+SlateportCity_OceanicMuseum_2F_Text_WellTakeThoseParts:
 	.string "Hehehe, hold it!\n"
 	.string "We'll take those parts!$"
 
-SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou: @ 820BE69
+SlateportCity_OceanicMuseum_2F_Text_SternWhoAreYou:
 	.string "CAPT. STERN: Wh-what?\n"
 	.string "Who are you people?$"
 
-SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua: @ 820BE93
+SlateportCity_OceanicMuseum_2F_Text_WereTeamAqua:
 	.string "We're TEAM AQUA!\p"
 	.string "Our BOSS wants those parts!\n"
 	.string "Shut your yap and fork them over!$"
 
-SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat: @ 820BEE2
+SlateportCity_OceanicMuseum_2F_Text_Grunt1Defeat:
 	.string "Awaaaah!\n"
 	.string "A kid beat me!$"
 
-SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious: @ 820BEFA
+SlateportCity_OceanicMuseum_2F_Text_BossGoingToBeFurious:
 	.string "Oh, man, what a disaster…\n"
 	.string "The BOSS is going to be furious…$"
 
-SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis: @ 820BF35
+SlateportCity_OceanicMuseum_2F_Text_LetMeTakeCareOfThis:
 	.string "Humph, sniveling wimp!\n"
 	.string "Let me take care of this!$"
 
-SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat: @ 820BF66
+SlateportCity_OceanicMuseum_2F_Text_Grunt2Defeat:
 	.string "What?!\n"
 	.string "I lost, too!$"
 
-SlateportCity_OceanicMuseum_2F_Text_MeddlingKid: @ 820BF7A
+SlateportCity_OceanicMuseum_2F_Text_MeddlingKid:
 	.string "Now what? If we don't get the parts,\n"
 	.string "we're in for it!\p"
 	.string "Arrgh, I didn't count on being meddled\n"
 	.string "with by some meddling kid!$"
 
-SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong: @ 820BFF2
+SlateportCity_OceanicMuseum_2F_Text_CameToSeeWhatsTakingSoLong:
 	.string "I came to see what was taking so\n"
 	.string "long to snatch some parts, and you\l"
 	.string "simps are held up by a mere child?$"
 
-SlateportCity_OceanicMuseum_2F_Text_ArchieWarning: @ 820C059
+SlateportCity_OceanicMuseum_2F_Text_ArchieWarning:
 	.string "We are TEAM AQUA,\n"
 	.string "and we love the sea!\p"
 	.string "And I am TEAM AQUA's leader,\n"
@@ -353,7 +353,7 @@ SlateportCity_OceanicMuseum_2F_Text_ArchieWarning: @ 820C059
 	.string "dearly!\p"
 	.string "And don't you forget it!$"
 
-SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs: @ 820C2BE
+SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs:
 	.string "CAPT. STERN: You're…\n"
 	.string "Ah, okay, you're {PLAYER}{KUN}…\p"
 	.string "Anyway, that was a tense situation!\n"
@@ -361,7 +361,7 @@ SlateportCity_OceanicMuseum_2F_Text_SternThankYouForSavingUs: @ 820C2BE
 	.string "Oh, yes, I almost forgot that you\n"
 	.string "even brought the parts from DEVON!$"
 
-SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo: @ 820C36C
+SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo:
 	.string "CAPT. STERN: Whoops!\n"
 	.string "There's no time to lose!\p"
 	.string "We have to set out on our ocean-floor\n"
@@ -371,32 +371,32 @@ SlateportCity_OceanicMuseum_2F_Text_SternIveGotToGo: @ 820C36C
 	.string "Feel free to wander around and check\n"
 	.string "out our facilities, though.$"
 
-SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip: @ 820C43F
+SlateportCity_OceanicMuseum_2F_Text_RemindsMeOfAbandonedShip:
 	.string "I saw a model of a ship here.\p"
 	.string "It reminded me of the ABANDONED SHIP\n"
 	.string "near DEWFORD TOWN…$"
 
-SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum: @ 820C495
+SlateportCity_OceanicMuseum_2F_Text_DontRunInMuseum:
 	.string "Don't you dare run around inside\n"
 	.string "the MUSEUM!$"
 
-SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine: @ 820C4C2
+SlateportCity_OceanicMuseum_2F_Text_WantToRideSubmarine:
 	.string "Wow, the submarine's awesome!\n"
 	.string "I want to go for a ride!$"
 
-SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1: @ 820C4F9
+SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample1:
 	.string "“WATER QUALITY SAMPLE 1,” the\n"
 	.string "label says.\p"
 	.string "The sea is all connected, but the\n"
 	.string "water seems to differ by region.$"
 
-SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2: @ 820C566
+SlateportCity_OceanicMuseum_2F_Text_WaterQualitySample2:
 	.string "“WATER QUALITY SAMPLE 2,” the\n"
 	.string "label says.\p"
 	.string "Does the saltiness of seawater differ\n"
 	.string "by region, too?$"
 
-SlateportCity_OceanicMuseum_2F_Text_PressureExperiment: @ 820C5C6
+SlateportCity_OceanicMuseum_2F_Text_PressureExperiment:
 	.string "A rubber ball is expanding and\n"
 	.string "shrinking.\p"
 	.string "“In the sea, the weight of water itself\n"
@@ -407,39 +407,39 @@ SlateportCity_OceanicMuseum_2F_Text_PressureExperiment: @ 820C5C6
 	.string "the pressure can reach even tens of\l"
 	.string "thousands of tons on a small area.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_HoennModel: @ 820C6C7
+SlateportCity_OceanicMuseum_2F_Text_HoennModel:
 	.string "“MODEL OF HOENN REGION”\p"
 	.string "It's a miniature diorama of the\n"
 	.string "HOENN region.\p"
 	.string "Where is LITTLEROOT TOWN on this?$"
 
-SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay: @ 820C72F
+SlateportCity_OceanicMuseum_2F_Text_DeepSeawaterDisplay:
 	.string "It's a display on the flow of seawater.\p"
 	.string "“Near the bottom of the sea, water\n"
 	.string "flows due to differences in such\l"
 	.string "factors as temperature and salinity.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay: @ 820C7C1
+SlateportCity_OceanicMuseum_2F_Text_SurfaceSeawaterDisplay:
 	.string "It's a display on the flow of seawater.\p"
 	.string "“Toward the surface, seawater flows\n"
 	.string "as currents driven by the winds.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica: @ 820C82F
+SlateportCity_OceanicMuseum_2F_Text_SSTidalReplica:
 	.string "“THE FERRY S.S. TIDAL\p"
 	.string "“A scale replica of the ship under\n"
 	.string "construction at STERN'S SHIPYARD.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica: @ 820C88B
+SlateportCity_OceanicMuseum_2F_Text_SubmarineReplica:
 	.string "“SUBMARINE EXPLORER 1\p"
 	.string "“A replica of the high-performance\n"
 	.string "ocean floor exploration submarine.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica: @ 820C8E8
+SlateportCity_OceanicMuseum_2F_Text_SumbersibleReplica:
 	.string "“SUBMERSIBLE POD\p"
 	.string "“A replica of a compact, unmanned\n"
 	.string "pod for seafloor exploration.”$"
 
-SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica: @ 820C93A
+SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica:
 	.string "“S.S. ANNE\p"
 	.string "“A replica of the luxury liner that\n"
 	.string "circles the globe.”$"
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index e6b1acea8..295409df8 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
@@ -1,16 +1,16 @@
 .set LOCALID_NURSE, 1
 
-SlateportCity_PokemonCenter_1F_MapScripts:: @ 820DABF
+SlateportCity_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-SlateportCity_PokemonCenter_1F_OnTransition: @ 820DACA
+SlateportCity_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_SLATEPORT_CITY
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-SlateportCity_PokemonCenter_1F_EventScript_Nurse:: @ 820DAD3
+SlateportCity_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -18,15 +18,15 @@ SlateportCity_PokemonCenter_1F_EventScript_Nurse:: @ 820DAD3
 	release
 	end
 
-SlateportCity_PokemonCenter_1F_EventScript_Sailor:: @ 820DAE1
+SlateportCity_PokemonCenter_1F_EventScript_Sailor::
 	msgbox SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonCenter_1F_EventScript_Woman:: @ 820DAEA
+SlateportCity_PokemonCenter_1F_EventScript_Woman::
 	msgbox SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon: @ 820DAF3
+SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon:
 	.string "Want a tip for battling?\p"
 	.string "I'd say it's raising different kinds\n"
 	.string "of POKéMON in a balanced manner.\p"
@@ -35,7 +35,7 @@ SlateportCity_PokemonCenter_1F_Text_RaiseDifferentTypesOfPokemon: @ 820DAF3
 	.string "If it has a type disadvantage,\n"
 	.string "it might not stand a chance.$"
 
-SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend: @ 820DBBC
+SlateportCity_PokemonCenter_1F_Text_TradedMonWithFriend:
 	.string "I trade POKéMON with my friends.\p"
 	.string "If a traded POKéMON is holding an\n"
 	.string "item, it makes me twice as happy!$"
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
index 6406df27d..48bad0fe3 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21
+SlateportCity_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ SlateportCity_PokemonCenter_2F_MapScripts:: @ 820DC21
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-SlateportCity_PokemonCenter_2F_EventScript_Colosseum:: @ 820DC36
+SlateportCity_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-SlateportCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 820DC3C
+SlateportCity_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-SlateportCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 820DC42
+SlateportCity_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index e4086fa19..3bff72816 100644
--- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
@@ -1,7 +1,7 @@
-SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95
+SlateportCity_PokemonFanClub_MapScripts::
 	.byte 0
 
-SlateportCity_PokemonFanClub_EventScript_Chairman:: @ 8209E96
+SlateportCity_PokemonFanClub_EventScript_Chairman::
 	lock
 	faceplayer
 	goto_if_unset FLAG_ENTERED_CONTEST, SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest
@@ -13,13 +13,13 @@ SlateportCity_PokemonFanClub_EventScript_Chairman:: @ 8209E96
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment:: @ 8209ED2
+SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment::
 	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1
 	msgbox SlateportCity_PokemonFanClub_Text_AllowMeToExamineYourPokemon, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon
 	end
 
-SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon:: @ 8209EE5
+SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon::
 	setvar VAR_TEMP_2, 0
 	call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
 	call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
@@ -34,12 +34,12 @@ SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon:: @ 8209EE5
 	goto SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon
 	end
 
-SlateportCity_PokemonFanClub_EventScript_NoMoreScarves:: @ 8209F3B
+SlateportCity_PokemonFanClub_EventScript_NoMoreScarves::
 	msgbox SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon:: @ 8209F45
+SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon::
 	msgbox SlateportCity_PokemonFanClub_Text_HmHmISee, MSGBOX_DEFAULT
 	setvar VAR_TEMP_1, 0
 	call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonTough
@@ -58,20 +58,20 @@ SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon:: @ 8209F45
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_ReceivedAllScarves:: @ 8209FCA
+SlateportCity_PokemonFanClub_EventScript_ReceivedAllScarves::
 	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2
 	return
 
-SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf:: @ 8209FD0
+SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf::
 	addvar VAR_TEMP_2, 1
 	return
 
-SlateportCity_PokemonFanClub_EventScript_NoHighConditions:: @ 8209FD6
+SlateportCity_PokemonFanClub_EventScript_NoHighConditions::
 	msgbox SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_GiveRedScarf:: @ 8209FE0
+SlateportCity_PokemonFanClub_EventScript_GiveRedScarf::
 	checkitemspace ITEM_RED_SCARF, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
@@ -82,7 +82,7 @@ SlateportCity_PokemonFanClub_EventScript_GiveRedScarf:: @ 8209FE0
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf:: @ 820A011
+SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf::
 	checkitemspace ITEM_BLUE_SCARF, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
@@ -93,7 +93,7 @@ SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf:: @ 820A011
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_GivePinkScarf:: @ 820A042
+SlateportCity_PokemonFanClub_EventScript_GivePinkScarf::
 	checkitemspace ITEM_PINK_SCARF, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
@@ -104,7 +104,7 @@ SlateportCity_PokemonFanClub_EventScript_GivePinkScarf:: @ 820A042
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf:: @ 820A073
+SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf::
 	checkitemspace ITEM_GREEN_SCARF, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
@@ -115,7 +115,7 @@ SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf:: @ 820A073
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf:: @ 820A0A4
+SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf::
 	checkitemspace ITEM_YELLOW_SCARF, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
@@ -126,79 +126,79 @@ SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf:: @ 820A0A4
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf:: @ 820A0D5
+SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf::
 	msgbox SlateportCity_PokemonFanClub_Text_NoSpaceForReward, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_CheckMonCool:: @ 820A0DF
+SlateportCity_PokemonFanClub_EventScript_CheckMonCool::
 	specialvar VAR_RESULT, CheckLeadMonCool
 	compare VAR_RESULT, TRUE
 	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonCool
 	return
 
-SlateportCity_PokemonFanClub_EventScript_SetMonCool:: @ 820A0F0
+SlateportCity_PokemonFanClub_EventScript_SetMonCool::
 	setvar VAR_TEMP_1, 1
 	return
 
-SlateportCity_PokemonFanClub_EventScript_CheckMonBeauty:: @ 820A0F6
+SlateportCity_PokemonFanClub_EventScript_CheckMonBeauty::
 	specialvar VAR_RESULT, CheckLeadMonBeauty
 	compare VAR_RESULT, TRUE
 	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonBeauty
 	return
 
-SlateportCity_PokemonFanClub_EventScript_SetMonBeauty:: @ 820A107
+SlateportCity_PokemonFanClub_EventScript_SetMonBeauty::
 	setvar VAR_TEMP_1, 2
 	return
 
-SlateportCity_PokemonFanClub_EventScript_CheckMonCute:: @ 820A10D
+SlateportCity_PokemonFanClub_EventScript_CheckMonCute::
 	specialvar VAR_RESULT, CheckLeadMonCute
 	compare VAR_RESULT, TRUE
 	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonCute
 	return
 
-SlateportCity_PokemonFanClub_EventScript_SetMonCute:: @ 820A11E
+SlateportCity_PokemonFanClub_EventScript_SetMonCute::
 	setvar VAR_TEMP_1, 3
 	return
 
-SlateportCity_PokemonFanClub_EventScript_CheckMonSmart:: @ 820A124
+SlateportCity_PokemonFanClub_EventScript_CheckMonSmart::
 	specialvar VAR_RESULT, CheckLeadMonSmart
 	compare VAR_RESULT, TRUE
 	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonSmart
 	return
 
-SlateportCity_PokemonFanClub_EventScript_SetMonSmart:: @ 820A135
+SlateportCity_PokemonFanClub_EventScript_SetMonSmart::
 	setvar VAR_TEMP_1, 4
 	return
 
-SlateportCity_PokemonFanClub_EventScript_CheckMonTough:: @ 820A13B
+SlateportCity_PokemonFanClub_EventScript_CheckMonTough::
 	specialvar VAR_RESULT, CheckLeadMonTough
 	compare VAR_RESULT, TRUE
 	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonTough
 	return
 
-SlateportCity_PokemonFanClub_EventScript_SetMonTough:: @ 820A14C
+SlateportCity_PokemonFanClub_EventScript_SetMonTough::
 	setvar VAR_TEMP_1, 5
 	return
 
-SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest:: @ 820A152
+SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest::
 	goto_if_set FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_ChairmanEnterContest
 	msgbox SlateportCity_PokemonFanClub_Text_MeetChairman, MSGBOX_DEFAULT
 	setflag FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_ChairmanEnterContest:: @ 820A168
+SlateportCity_PokemonFanClub_EventScript_ChairmanEnterContest::
 	msgbox SlateportCity_PokemonFanClub_Text_LikeToSeeEnteredContestPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_MeetChairman:: @ 820A172
+SlateportCity_PokemonFanClub_EventScript_MeetChairman::
 	msgbox SlateportCity_PokemonFanClub_Text_MeetChairman, MSGBOX_DEFAULT
 	setflag FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN
 	return
 
-SlateportCity_PokemonFanClub_EventScript_SootheBellWoman:: @ 820A17E
+SlateportCity_PokemonFanClub_EventScript_SootheBellWoman::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell
@@ -209,7 +209,7 @@ SlateportCity_PokemonFanClub_EventScript_SootheBellWoman:: @ 820A17E
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_GiveSootheBell:: @ 820A1A3
+SlateportCity_PokemonFanClub_EventScript_GiveSootheBell::
 	playse SE_PIN
 	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -223,20 +223,20 @@ SlateportCity_PokemonFanClub_EventScript_GiveSootheBell:: @ 820A1A3
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell:: @ 820A1DE
+SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell::
 	msgbox SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_Man:: @ 820A1E8
+SlateportCity_PokemonFanClub_EventScript_Man::
 	msgbox SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonFanClub_EventScript_Twin:: @ 820A1F1
+SlateportCity_PokemonFanClub_EventScript_Twin::
 	msgbox SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonFanClub_EventScript_Skitty:: @ 820A1FA
+SlateportCity_PokemonFanClub_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
@@ -246,7 +246,7 @@ SlateportCity_PokemonFanClub_EventScript_Skitty:: @ 820A1FA
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_Zigzagoon:: @ 820A20D
+SlateportCity_PokemonFanClub_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
@@ -256,7 +256,7 @@ SlateportCity_PokemonFanClub_EventScript_Zigzagoon:: @ 820A20D
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_Azumarill:: @ 820A220
+SlateportCity_PokemonFanClub_EventScript_Azumarill::
 	lock
 	faceplayer
 	waitse
@@ -266,7 +266,7 @@ SlateportCity_PokemonFanClub_EventScript_Azumarill:: @ 820A220
 	release
 	end
 
-SlateportCity_PokemonFanClub_Text_MeetChairman: @ 820A233
+SlateportCity_PokemonFanClub_Text_MeetChairman:
 	.string "Er-hem! I am the CHAIRMAN of the\n"
 	.string "POKéMON FAN CLUB!\p"
 	.string "Being the CHAIRMAN, I am naturally\n"
@@ -283,12 +283,12 @@ SlateportCity_PokemonFanClub_Text_MeetChairman: @ 820A233
 	.string "off our POKéMON, and have others\l"
 	.string "show us theirs.$"
 
-SlateportCity_PokemonFanClub_Text_LikeToSeeEnteredContestPokemon: @ 820A3EE
+SlateportCity_PokemonFanClub_Text_LikeToSeeEnteredContestPokemon:
 	.string "The POKéMON of a TRAINER who has\n"
 	.string "entered a POKéMON CONTEST…\l"
 	.string "That, I would like to see.$"
 
-SlateportCity_PokemonFanClub_Text_AllowMeToExamineYourPokemon: @ 820A445
+SlateportCity_PokemonFanClub_Text_AllowMeToExamineYourPokemon:
 	.string "Er-hem! I see you've participated in\n"
 	.string "a POKéMON CONTEST!\p"
 	.string "Please! Allow me to examine how you\n"
@@ -306,15 +306,15 @@ SlateportCity_PokemonFanClub_Text_AllowMeToExamineYourPokemon: @ 820A445
 	.string "Please! Allow me to examine how much\n"
 	.string "your POKéMON has grown!$"
 
-SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing: @ 820A62A
+SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing:
 	.string "How is your POKéMON growing?\n"
 	.string "Allow me to examine it.$"
 
-SlateportCity_PokemonFanClub_Text_HmHmISee: @ 820A65F
+SlateportCity_PokemonFanClub_Text_HmHmISee:
 	.string "Hm, hm…\n"
 	.string "I see…$"
 
-SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks: @ 820A66E
+SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks:
 	.string "Hmmm… It's not bad, but it's not\n"
 	.string "good, either…\p"
 	.string "You, the TRAINER, must put more\n"
@@ -322,53 +322,53 @@ SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks: @ 820A66E
 	.string "For instance, may I suggest that\n"
 	.string "you give it more {POKEBLOCK}S?$"
 
-SlateportCity_PokemonFanClub_Text_NoSpaceForReward: @ 820A719
+SlateportCity_PokemonFanClub_Text_NoSpaceForReward:
 	.string "Oh, my…\p"
 	.string "Your POKéMON is growing quite well,\n"
 	.string "so you deserve a reward.\p"
 	.string "Unfortunately, you have no space for\n"
 	.string "this in your BAG.$"
 
-SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis: @ 820A795
+SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis:
 	.string "Your {STR_VAR_1}, it is growing in\n"
 	.string "a most impressive manner!\l"
 	.string "It is one fine specimen!\p"
 	.string "But! If you were to give it this,\n"
 	.string "it would grow even better! Indeed!$"
 
-SlateportCity_PokemonFanClub_Text_ExplainRedScarf: @ 820A827
+SlateportCity_PokemonFanClub_Text_ExplainRedScarf:
 	.string "Let a POKéMON hold that RED SCARF.\p"
 	.string "Everyone will recognize the coolness\n"
 	.string "of that POKéMON!$"
 
-SlateportCity_PokemonFanClub_Text_ExplainBlueScarf: @ 820A880
+SlateportCity_PokemonFanClub_Text_ExplainBlueScarf:
 	.string "Let a POKéMON hold that BLUE SCARF.\p"
 	.string "Its beauty will be accentuated much\n"
 	.string "more than now!$"
 
-SlateportCity_PokemonFanClub_Text_ExplainPinkScarf: @ 820A8D7
+SlateportCity_PokemonFanClub_Text_ExplainPinkScarf:
 	.string "Let a POKéMON hold that PINK SCARF.\p"
 	.string "It will draw out the cuteness of\n"
 	.string "the POKéMON some more!$"
 
-SlateportCity_PokemonFanClub_Text_ExplainGreenScarf: @ 820A933
+SlateportCity_PokemonFanClub_Text_ExplainGreenScarf:
 	.string "Let a POKéMON hold that GREEN SCARF.\p"
 	.string "That will enhance the\n"
 	.string "smartness of POKéMON!$"
 
-SlateportCity_PokemonFanClub_Text_ExplainYellowScarf: @ 820A984
+SlateportCity_PokemonFanClub_Text_ExplainYellowScarf:
 	.string "Let a POKéMON hold that YELLOW SCARF.\p"
 	.string "It will bolster your POKéMON's\n"
 	.string "toughness so much more!$"
 
-SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou: @ 820A9E1
+SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou:
 	.string "I'm sorry, but I've nothing else to\n"
 	.string "give you! None at all!\p"
 	.string "After all, you're blessed with the gift\n"
 	.string "of raising POKéMON without resorting\l"
 	.string "to any items!$"
 
-SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou: @ 820AA77
+SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou:
 	.string "I love seeing POKéMON that love\n"
 	.string "their TRAINERS.\p"
 	.string "POKéMON are very sensitive to\n"
@@ -378,18 +378,18 @@ SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou: @ 820AA77
 	.string "When your POKéMON grow to love you,\n"
 	.string "please come show me.$"
 
-SlateportCity_PokemonFanClub_Text_PokemonAdoresYou: @ 820AB63
+SlateportCity_PokemonFanClub_Text_PokemonAdoresYou:
 	.string "Your POKéMON really adores you.\p"
 	.string "For you, a most compassionate\n"
 	.string "TRAINER, a gift from the FAN CLUB!$"
 
-SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove: @ 820ABC4
+SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove:
 	.string "POKéMON are very sensitive to\n"
 	.string "the feelings of their TRAINERS.\p"
 	.string "If you treat your POKéMON with love\n"
 	.string "and care, they'll love you back.$"
 
-SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting: @ 820AC47
+SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting:
 	.string "If you keep letting a POKéMON faint\n"
 	.string "in battle, it'll come to resent it.\p"
 	.string "Soon, it will become less trusting\n"
@@ -397,18 +397,18 @@ SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting: @ 820AC47
 	.string "In other words, it certainly won't\n"
 	.string "like you very much.$"
 
-SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein: @ 820ACF9
+SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein:
 	.string "Do POKéMON enjoy having items used\n"
 	.string "on them?\p"
 	.string "Mine acted really happy when I gave\n"
 	.string "it some PROTEIN.$"
 
-SlateportCity_PokemonFanClub_Text_Skitty: @ 820AD5A
+SlateportCity_PokemonFanClub_Text_Skitty:
 	.string "SKITTY: Fffnyaaaah…$"
 
-SlateportCity_PokemonFanClub_Text_Zigzagoon: @ 820AD6E
+SlateportCity_PokemonFanClub_Text_Zigzagoon:
 	.string "ZIGZAGOON: Kyuuu…$"
 
-SlateportCity_PokemonFanClub_Text_Azumarill: @ 820AD80
+SlateportCity_PokemonFanClub_Text_Azumarill:
 	.string "AZUMARILL: Marimari?$"
 
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
index 8c65f9592..8b4a4de54 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
@@ -1,9 +1,9 @@
 .set LOCALID_DOCK, 1
 
-SlateportCity_SternsShipyard_1F_MapScripts:: @ 8207F3F
+SlateportCity_SternsShipyard_1F_MapScripts::
 	.byte 0
 
-SlateportCity_SternsShipyard_1F_EventScript_Dock:: @ 8207F40
+SlateportCity_SternsShipyard_1F_EventScript_Dock::
 	lockall
 	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_FerryReady
 	goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined
@@ -21,21 +21,21 @@ SlateportCity_SternsShipyard_1F_EventScript_Dock:: @ 8207F40
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_FerryReady:: @ 8207F92
+SlateportCity_SternsShipyard_1F_EventScript_FerryReady::
 	applymovement LOCALID_DOCK, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_FerryIsReady, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined:: @ 8207FA6
+SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined::
 	applymovement LOCALID_DOCK, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_GoFindStern:: @ 8207FBA
+SlateportCity_SternsShipyard_1F_EventScript_GoFindStern::
 	applymovement LOCALID_DOCK, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern, MSGBOX_DEFAULT
@@ -45,26 +45,26 @@ SlateportCity_SternsShipyard_1F_EventScript_GoFindStern:: @ 8207FBA
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran:: @ 8207FD9
+SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran::
 	applymovement LOCALID_DOCK, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_Scientist1:: @ 8207FED
+SlateportCity_SternsShipyard_1F_EventScript_Scientist1::
 	msgbox SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_Scientist2:: @ 8207FF6
+SlateportCity_SternsShipyard_1F_EventScript_Scientist2::
 	msgbox SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_Briney:: @ 8207FFF
+SlateportCity_SternsShipyard_1F_EventScript_Briney::
 	msgbox SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails: @ 8208008
+SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails:
 	.string "Umm… If this goes here, and that\n"
 	.string "goes over there…\p"
 	.string "Then where does this thing go?\n"
@@ -72,7 +72,7 @@ SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails: @ 8208008
 	.string "Aaargh! I can't make heads or tails\n"
 	.string "of this!$"
 
-SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern: @ 82080A5
+SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern:
 	.string "Hm?\n"
 	.string "Hi, I'm DOCK.\p"
 	.string "CAPT. STERN commissioned me to\n"
@@ -86,26 +86,26 @@ SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern: @ 82080A5
 	.string "Could I get you to go find CAPT.\n"
 	.string "STERN and deliver that to him?$"
 
-SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern: @ 82081A5
+SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern:
 	.string "DOCK: Where could CAPT. STERN have\n"
 	.string "gone off to?\p"
 	.string "Could you go find CAPT. STERN and\n"
 	.string "deliver that parcel to him?$"
 
-SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran: @ 8208213
+SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran:
 	.string "DOCK: Shipbuilding is an art.\p"
 	.string "A lot of things can't be figured out\n"
 	.string "just by calculating.\p"
 	.string "I really could use advice from a veteran\n"
 	.string "who knows the seas…$"
 
-SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs: @ 82082A8
+SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs:
 	.string "DOCK: Hi! MR. BRINEY's joined us to\n"
 	.string "lend us his help.\p"
 	.string "Thanks to the veteran sailor, the\n"
 	.string "ferry is steadily coming together.$"
 
-SlateportCity_SternsShipyard_1F_Text_FerryIsReady: @ 8208323
+SlateportCity_SternsShipyard_1F_Text_FerryIsReady:
 	.string "DOCK: The ferry is finally ready!\p"
 	.string "The new S.S. TIDAL is truly a marvel\n"
 	.string "of technology!\p"
@@ -114,7 +114,7 @@ SlateportCity_SternsShipyard_1F_Text_FerryIsReady: @ 8208323
 	.string "You know, there's never an end to\n"
 	.string "technology's march.$"
 
-SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock: @ 82083EE
+SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock:
 	.string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n"
 	.string "It's been too long!\p"
 	.string "Aye, since I met you, this old sea dog's\n"
@@ -129,7 +129,7 @@ SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock: @ 82083EE
 	.string "my experience, I'm sure that we can\l"
 	.string "build one great ship, aye!$"
 
-SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing: @ 8208558
+SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing:
 	.string "The seasons, the weather, where\n"
 	.string "the moon sits in the sky…\p"
 	.string "These and other conditions make\n"
@@ -137,7 +137,7 @@ SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing: @ 8208558
 	.string "That's right!\n"
 	.string "The sea is like a living thing!$"
 
-SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily: @ 82085FF
+SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily:
 	.string "I get seasick real easily.\n"
 	.string "So I get to help out here instead.$"
 
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
index fff96bc65..59e8a531a 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
@@ -1,20 +1,20 @@
-SlateportCity_SternsShipyard_2F_MapScripts:: @ 820863D
+SlateportCity_SternsShipyard_2F_MapScripts::
 	.byte 0
 
-SlateportCity_SternsShipyard_2F_EventScript_Scientist1:: @ 820863E
+SlateportCity_SternsShipyard_2F_EventScript_Scientist1::
 	msgbox SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_2F_EventScript_Scientist2:: @ 8208647
+SlateportCity_SternsShipyard_2F_EventScript_Scientist2::
 	msgbox SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding: @ 8208650
+SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding:
 	.string "Designing a large ship is more like\n"
 	.string "making a big building than putting\l"
 	.string "together a transportation vehicle.$"
 
-SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy: @ 82086BA
+SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy:
 	.string "Don't you think it's strange that\n"
 	.string "a ship made of heavy iron floats?\p"
 	.string "It floats because of a principle\n"
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 00fb6b541..efeae33d1 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -16,7 +16,7 @@
 .set LOCALID_ARCHIE, 17
 .set LOCALID_WALLACE, 18
 
-SootopolisCity_MapScripts:: @ 81E565C
+SootopolisCity_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_OnResume
@@ -24,16 +24,16 @@ SootopolisCity_MapScripts:: @ 81E565C
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_OnWarp
 	.byte 0
 
-SootopolisCity_OnLoad: @ 81E5676
+SootopolisCity_OnLoad:
 	call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_LockGymDoor
 	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_LegendariesNotArrived
 	call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_LockHouseDoors
 	end
 
-SootopolisCity_EventScript_LegendariesNotArrived:: @ 81E5692
+SootopolisCity_EventScript_LegendariesNotArrived::
 	end
 
-SootopolisCity_EventScript_LockHouseDoors:: @ 81E5693
+SootopolisCity_EventScript_LockHouseDoors::
 	setmetatile 9, 6, METATILE_Sootopolis_Door_Closed, 1
 	setmetatile 9, 17, METATILE_Sootopolis_Door_Closed, 1
 	setmetatile 9, 26, METATILE_Sootopolis_Door_Closed, 1
@@ -45,11 +45,11 @@ SootopolisCity_EventScript_LockHouseDoors:: @ 81E5693
 	setmetatile 51, 36, METATILE_Sootopolis_Door_Closed, 1
 	return
 
-SootopolisCity_EventScript_LockGymDoor:: @ 81E56E5
+SootopolisCity_EventScript_LockGymDoor::
 	setmetatile 31, 32, METATILE_Sootopolis_GymDoor_Closed, 1
 	return
 
-SootopolisCity_OnTransition: @ 81E56EF
+SootopolisCity_OnTransition:
 	setflag FLAG_VISITED_SOOTOPOLIS_CITY
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
 	call_if_eq SootopolisCity_EventScript_HideMapNamePopup
@@ -79,11 +79,11 @@ SootopolisCity_OnTransition: @ 81E56EF
 	call_if_eq SootopolisCity_EventScript_SetExpertBlockCaveEntrance
 	end
 
-SootopolisCity_EventScript_HideMapNamePopup:: @ 81E5781
+SootopolisCity_EventScript_HideMapNamePopup::
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-SootopolisCity_EventScript_SetBattleSpectators:: @ 81E5785
+SootopolisCity_EventScript_SetBattleSpectators::
 	setobjectxyperm LOCALID_KIRI, 13, 48
 	setobjectxyperm LOCALID_BOY_1, 46, 32
 	setobjectxyperm LOCALID_NINJA_BOY, 48, 41
@@ -94,7 +94,7 @@ SootopolisCity_EventScript_SetBattleSpectators:: @ 81E5785
 	setobjectmovementtype LOCALID_WOMAN_1, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-SootopolisCity_EventScript_SetLayout:: @ 81E57B2
+SootopolisCity_EventScript_SetLayout::
 	compare VAR_SOOTOPOLIS_CITY_STATE, 0
 	goto_if_eq SootopolisCity_EventScript_SetNormalLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
@@ -111,14 +111,14 @@ SootopolisCity_EventScript_SetLayout:: @ 81E57B2
 	goto_if_le SootopolisCity_EventScript_SetLegendariesLayout
 	return
 
-SootopolisCity_EventScript_SetNormalLayout:: @ 81E5800
+SootopolisCity_EventScript_SetNormalLayout::
 	return
 
-SootopolisCity_EventScript_SetLegendariesLayout:: @ 81E5801
+SootopolisCity_EventScript_SetLegendariesLayout::
 	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE
 	return
 
-SootopolisCity_EventScript_SetWeather:: @ 81E5805
+SootopolisCity_EventScript_SetWeather::
 	compare VAR_SOOTOPOLIS_CITY_STATE, 0
 	goto_if_eq SootopolisCity_EventScript_SetNormalWeather
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
@@ -131,29 +131,29 @@ SootopolisCity_EventScript_SetWeather:: @ 81E5805
 	goto_if_le Common_EventScript_SetAbnormalWeather
 	return
 
-SootopolisCity_EventScript_SetNormalWeather:: @ 81E583D
+SootopolisCity_EventScript_SetNormalWeather::
 	return
 
-SootopolisCity_EventScript_SetDownpour:: @ 81E583E
+SootopolisCity_EventScript_SetDownpour::
 	setweather WEATHER_DOWNPOUR
 	return
 
-SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos:: @ 81E5842
+SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos::
 	goto_if_set FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_SetEnterCaveOfOriginObjPos
 	return
 
-SootopolisCity_EventScript_SetEnterCaveOfOriginObjPos:: @ 81E584C
+SootopolisCity_EventScript_SetEnterCaveOfOriginObjPos::
 	setobjectxyperm LOCALID_EXPERT, 30, 18
 	setobjectxyperm LOCALID_STEVEN, 32, 18
 	return
 
-SootopolisCity_EventScript_SetExitCaveOfOriginObjPos:: @ 81E585B
+SootopolisCity_EventScript_SetExitCaveOfOriginObjPos::
 	setobjectxyperm LOCALID_EXPERT, 30, 18
 	setobjectxyperm LOCALID_WALLACE, 31, 18
 	setobjectxyperm LOCALID_STEVEN, 32, 18
 	end
 
-SootopolisCity_EventScript_SetOutsideGymObjPos:: @ 81E5871
+SootopolisCity_EventScript_SetOutsideGymObjPos::
 	setobjectxyperm LOCALID_EXPERT, 31, 18
 	setobjectxyperm LOCALID_STEVEN, 29, 33
 	setobjectxyperm LOCALID_MAXIE, 33, 35
@@ -166,56 +166,56 @@ SootopolisCity_EventScript_SetOutsideGymObjPos:: @ 81E5871
 	call_if_eq SootopolisCity_EventScript_SetWallaceLeft
 	return
 
-SootopolisCity_EventScript_SetWallaceMiddle:: @ 81E58AF
+SootopolisCity_EventScript_SetWallaceMiddle::
 	setobjectxyperm LOCALID_WALLACE, 31, 33
 	setobjectmovementtype LOCALID_WALLACE, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SootopolisCity_EventScript_SetWallaceRight:: @ 81E58BB
+SootopolisCity_EventScript_SetWallaceRight::
 	setobjectxyperm LOCALID_WALLACE, 32, 33
 	setobjectmovementtype LOCALID_WALLACE, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SootopolisCity_EventScript_SetWallaceLeft:: @ 81E58C7
+SootopolisCity_EventScript_SetWallaceLeft::
 	setobjectxyperm LOCALID_WALLACE, 30, 33
 	setobjectmovementtype LOCALID_WALLACE, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SootopolisCity_EventScript_SetExpertBlockCaveEntrance:: @ 81E58D3
+SootopolisCity_EventScript_SetExpertBlockCaveEntrance::
 	setobjectxyperm LOCALID_EXPERT, 31, 18
 	return
 
-SootopolisCity_OnWarp: @ 81E58DB
+SootopolisCity_OnWarp:
 	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_PlayerFaceLegendaries
 	.2byte 0
 
-SootopolisCity_EventScript_PlayerFaceLegendaries:: @ 81E58E5
+SootopolisCity_EventScript_PlayerFaceLegendaries::
 	compare VAR_SKY_PILLAR_STATE, 1
 	call_if_eq SootopolisCity_EventScript_PlayerFaceLegendaries1
 	compare VAR_SKY_PILLAR_STATE, 2
 	call_if_eq SootopolisCity_EventScript_PlayerFaceLegendaries2
 	end
 
-SootopolisCity_EventScript_PlayerFaceLegendaries1:: @ 81E58FC
+SootopolisCity_EventScript_PlayerFaceLegendaries1::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	return
 
-SootopolisCity_EventScript_PlayerFaceLegendaries2:: @ 81E5901
+SootopolisCity_EventScript_PlayerFaceLegendaries2::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	setvar VAR_SKY_PILLAR_STATE, 3
 	return
 
-SootopolisCity_OnResume: @ 81E590B
+SootopolisCity_OnResume:
 	setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6
 	end
 
-SootopolisCity_OnFrame: @ 81E5914
+SootopolisCity_OnFrame:
 	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_StartLegendariesScene
 	map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_StartRayquazaScene
 	.2byte 0
 
 @ If not at PokeCenter, assumed to have arrived via Dive
-SootopolisCity_EventScript_StartLegendariesScene:: @ 81E5926
+SootopolisCity_EventScript_StartLegendariesScene::
 	lockall
 	special StorePlayerCoordsInVars
 	compare VAR_0x8004, 43
@@ -225,7 +225,7 @@ SootopolisCity_EventScript_StartLegendariesScene:: @ 81E5926
 	goto SootopolisCity_EventScript_LegendariesSceneFromPokeCenter
 	end
 
-SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
+SootopolisCity_EventScript_LegendariesSceneFromPokeCenter::
 	delay 60
 	special SpawnCameraObject
 	applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter
@@ -295,7 +295,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
 	releaseall
 	end
 
-SootopolisCity_Movement_PanToActionFromPokeCenter: @ 81E5A68
+SootopolisCity_Movement_PanToActionFromPokeCenter:
 	walk_slow_diag_southwest
 	walk_slow_diag_southwest
 	walk_slow_diag_southwest
@@ -310,7 +310,7 @@ SootopolisCity_Movement_PanToActionFromPokeCenter: @ 81E5A68
 	walk_slow_diag_southwest
 	step_end
 
-SootopolisCity_Movement_PanBackToPokeCenter: @ 81E5A75
+SootopolisCity_Movement_PanBackToPokeCenter:
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
@@ -325,7 +325,7 @@ SootopolisCity_Movement_PanBackToPokeCenter: @ 81E5A75
 	walk_slow_diag_northeast
 	step_end
 
-SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
+SootopolisCity_EventScript_LegendariesSceneFromDive::
 	delay 60
 	special SpawnCameraObject
 	applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive
@@ -395,7 +395,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
 	releaseall
 	end
 
-SootopolisCity_Movement_PanToActionFromDive: @ 81E5BA4
+SootopolisCity_Movement_PanToActionFromDive:
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
 	walk_up
@@ -407,7 +407,7 @@ SootopolisCity_Movement_PanToActionFromDive: @ 81E5BA4
 	walk_up
 	step_end
 
-SootopolisCity_Movement_PanBackToDive: @ 81E5BAE
+SootopolisCity_Movement_PanBackToDive:
 	walk_down
 	walk_down
 	walk_down
@@ -419,7 +419,7 @@ SootopolisCity_Movement_PanBackToDive: @ 81E5BAE
 	walk_slow_diag_southwest
 	step_end
 
-SootopolisCity_Movement_KyogreAttack: @ 81E5BB8
+SootopolisCity_Movement_KyogreAttack:
 	walk_in_place_slow_left
 	walk_in_place_slow_left
 	walk_in_place_slow_left
@@ -431,7 +431,7 @@ SootopolisCity_Movement_KyogreAttack: @ 81E5BB8
 	clear_affine_anim
 	step_end
 
-SootopolisCity_Movement_KyogreDefend: @ 81E5BC2
+SootopolisCity_Movement_KyogreDefend:
 	delay_16
 	delay_16
 	delay_16
@@ -446,7 +446,7 @@ SootopolisCity_Movement_KyogreDefend: @ 81E5BC2
 	clear_affine_anim
 	step_end
 
-SootopolisCity_Movement_KyogreMoveBack: @ 81E5BCF
+SootopolisCity_Movement_KyogreMoveBack:
 	lock_facing_direction
 	walk_right
 	delay_16
@@ -455,7 +455,7 @@ SootopolisCity_Movement_KyogreMoveBack: @ 81E5BCF
 	unlock_facing_direction
 	step_end
 
-SootopolisCity_Movement_KyogreIdle: @ 81E5BD6
+SootopolisCity_Movement_KyogreIdle:
 	walk_in_place_slow_left
 	walk_in_place_slow_left
 	walk_in_place_slow_left
@@ -464,7 +464,7 @@ SootopolisCity_Movement_KyogreIdle: @ 81E5BD6
 	walk_in_place_slow_left
 	step_end
 
-SootopolisCity_Movement_GroudonAttack: @ 81E5BDD
+SootopolisCity_Movement_GroudonAttack:
 	walk_in_place_slow_right
 	walk_in_place_slow_right
 	walk_in_place_slow_right
@@ -474,7 +474,7 @@ SootopolisCity_Movement_GroudonAttack: @ 81E5BDD
 	walk_fast_right
 	step_end
 
-SootopolisCity_Movement_GroudonDefend: @ 81E5BE5
+SootopolisCity_Movement_GroudonDefend:
 	delay_16
 	delay_16
 	delay_16
@@ -487,7 +487,7 @@ SootopolisCity_Movement_GroudonDefend: @ 81E5BE5
 	walk_fast_right
 	step_end
 
-SootopolisCity_Movement_GroudonMoveBack: @ 81E5BF0
+SootopolisCity_Movement_GroudonMoveBack:
 	lock_facing_direction
 	walk_left
 	delay_16
@@ -496,7 +496,7 @@ SootopolisCity_Movement_GroudonMoveBack: @ 81E5BF0
 	unlock_facing_direction
 	step_end
 
-SootopolisCity_Movement_GroudonIdle: @ 81E5BF7
+SootopolisCity_Movement_GroudonIdle:
 	walk_in_place_slow_right
 	walk_in_place_slow_right
 	walk_in_place_slow_right
@@ -506,7 +506,7 @@ SootopolisCity_Movement_GroudonIdle: @ 81E5BF7
 	step_end
 
 @ If not at PokeCenter, assumed to have arrived via Dive
-SootopolisCity_EventScript_StartRayquazaScene:: @ 81E5BFE
+SootopolisCity_EventScript_StartRayquazaScene::
 	lockall
 	special StorePlayerCoordsInVars
 	compare VAR_0x8004, 43
@@ -516,7 +516,7 @@ SootopolisCity_EventScript_StartRayquazaScene:: @ 81E5BFE
 	goto SootopolisCity_EventScript_RayquazaSceneFromPokeCenter
 	end
 
-SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
+SootopolisCity_EventScript_RayquazaSceneFromPokeCenter::
 	delay 60
 	special SpawnCameraObject
 	applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter
@@ -569,7 +569,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
 	waitstate
 	end
 
-SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
+SootopolisCity_EventScript_RayquazaSceneFromDive::
 	delay 60
 	special SpawnCameraObject
 	applymovement OBJ_EVENT_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive
@@ -622,7 +622,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
 	waitstate
 	end
 
-SootopolisCity_EventScript_SetRoughWater:: @ 81E5D82
+SootopolisCity_EventScript_SetRoughWater::
 	setmetatile 27, 43, METATILE_Sootopolis_RoughWater, 0
 	setmetatile 28, 43, METATILE_Sootopolis_RoughWater, 0
 	setmetatile 29, 43, METATILE_Sootopolis_RoughWater, 0
@@ -649,7 +649,7 @@ SootopolisCity_EventScript_SetRoughWater:: @ 81E5D82
 	setmetatile 35, 45, METATILE_Sootopolis_RoughWater, 0
 	return
 
-SootopolisCity_Movement_RayquazaFlyOff: @ 81E5E5B
+SootopolisCity_Movement_RayquazaFlyOff:
 	walk_fast_up
 	walk_fastest_up
 	walk_fastest_up
@@ -659,14 +659,14 @@ SootopolisCity_Movement_RayquazaFlyOff: @ 81E5E5B
 	walk_fastest_up
 	step_end
 
-SootopolisCity_Movement_PanUp: @ 81E5E63
+SootopolisCity_Movement_PanUp:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_Movement_PlayerApproachLegendaries: @ 81E5E68
+SootopolisCity_Movement_PlayerApproachLegendaries:
 	walk_up
 	walk_up
 	walk_up
@@ -674,7 +674,7 @@ SootopolisCity_Movement_PlayerApproachLegendaries: @ 81E5E68
 	step_end
 
 @ Unused
-SootopolisCity_Movement_PlayerApproachLegendariesDown: @ 81E5E6D
+SootopolisCity_Movement_PlayerApproachLegendariesDown:
 	walk_down
 	walk_down
 	walk_down
@@ -682,7 +682,7 @@ SootopolisCity_Movement_PlayerApproachLegendariesDown: @ 81E5E6D
 	step_end
 
 @ Unused
-SootopolisCity_Movement_UnusedPanUp: @ 81E5E72
+SootopolisCity_Movement_UnusedPanUp:
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
@@ -698,7 +698,7 @@ SootopolisCity_Movement_UnusedPanUp: @ 81E5E72
 	step_end
 
 @ Unused
-SootopolisCity_Movement_UnusedPanBack: @ 81E5E7F
+SootopolisCity_Movement_UnusedPanBack:
 	walk_down
 	walk_down
 	walk_down
@@ -714,7 +714,7 @@ SootopolisCity_Movement_UnusedPanBack: @ 81E5E7F
 	walk_slow_diag_southwest
 	step_end
 
-SootopolisCity_EventScript_CaveOfOriginExpert:: @ 81E5E8D
+SootopolisCity_EventScript_CaveOfOriginExpert::
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
@@ -727,22 +727,22 @@ SootopolisCity_EventScript_CaveOfOriginExpert:: @ 81E5E8D
 	release
 	end
 
-SootopolisCity_EventScript_ExpertLeadToCave:: @ 81E5EBA
+SootopolisCity_EventScript_ExpertLeadToCave::
 	msgbox SootopolisCity_Text_LeadSuperiorTrainerToCave, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_ExpertPostLegendaries:: @ 81E5EC4
+SootopolisCity_EventScript_ExpertPostLegendaries::
 	msgbox SootopolisCity_Text_CaveOfOriginSleepsToo, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_ExpertLegendaries:: @ 81E5ECE
+SootopolisCity_EventScript_ExpertLegendaries::
 	msgbox SootopolisCity_Text_AwakenedPokemonClash, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_Kiri:: @ 81E5ED8
+SootopolisCity_EventScript_Kiri::
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
@@ -758,14 +758,14 @@ SootopolisCity_EventScript_Kiri:: @ 81E5ED8
 	release
 	end
 
-SootopolisCity_EventScript_KiriRayquaza:: @ 81E5F10
+SootopolisCity_EventScript_KiriRayquaza::
 	msgbox SootopolisCity_Text_PrettyMonCameFromSky, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
 
 @ Gives 2 berries daily. First ranges from FIRST_KIRI_BERRY to LAST_KIRI_BERRY, second is always Figy or Iapapa
-SootopolisCity_EventScript_KiriGiveBerry:: @ 81E5F1B
+SootopolisCity_EventScript_KiriGiveBerry::
 	dotimebasedevents
 	special GetPlayerBigGuyGirlString
 	goto_if_set FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY, SootopolisCity_EventScript_KiriReceivedBerry
@@ -785,7 +785,7 @@ SootopolisCity_EventScript_KiriGiveBerry:: @ 81E5F1B
 	goto_if_eq SootopolisCity_EventScript_GiveIapapaBerry
 	end
 
-SootopolisCity_EventScript_GiveFigyBerry:: @ 81E5F79
+SootopolisCity_EventScript_GiveFigyBerry::
 	giveitem ITEM_FIGY_BERRY
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -793,7 +793,7 @@ SootopolisCity_EventScript_GiveFigyBerry:: @ 81E5F79
 	release
 	end
 
-SootopolisCity_EventScript_GiveIapapaBerry:: @ 81E5F9A
+SootopolisCity_EventScript_GiveIapapaBerry::
 	giveitem ITEM_IAPAPA_BERRY
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -801,7 +801,7 @@ SootopolisCity_EventScript_GiveIapapaBerry:: @ 81E5F9A
 	release
 	end
 
-SootopolisCity_EventScript_KiriReceivedBerry:: @ 81E5FBB
+SootopolisCity_EventScript_KiriReceivedBerry::
 	msgbox SootopolisCity_Text_LikeSeasonBornIn, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq SootopolisCity_EventScript_KiriLikeSeasonBornIn
@@ -809,12 +809,12 @@ SootopolisCity_EventScript_KiriReceivedBerry:: @ 81E5FBB
 	release
 	end
 
-SootopolisCity_EventScript_KiriLikeSeasonBornIn:: @ 81E5FD8
+SootopolisCity_EventScript_KiriLikeSeasonBornIn::
 	msgbox SootopolisCity_Text_ThenILoveAutumn, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_Woman2:: @ 81E5FE2
+SootopolisCity_EventScript_Woman2::
 	lockall
 	applymovement LOCALID_WOMAN_2, Common_Movement_FacePlayer
 	waitmovement 0
@@ -827,12 +827,12 @@ SootopolisCity_EventScript_Woman2:: @ 81E5FE2
 	releaseall
 	end
 
-SootopolisCity_EventScript_Woman2Rayquaza:: @ 81E600D
+SootopolisCity_EventScript_Woman2Rayquaza::
 	msgbox SootopolisCity_Text_YouBroughtFlyingMon, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_Man:: @ 81E6017
+SootopolisCity_EventScript_Man::
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
@@ -841,12 +841,12 @@ SootopolisCity_EventScript_Man:: @ 81E6017
 	release
 	end
 
-SootopolisCity_EventScript_ManPostLegendaries:: @ 81E602E
+SootopolisCity_EventScript_ManPostLegendaries::
 	msgbox SootopolisCity_Text_CityRegainedCalm, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_Woman1:: @ 81E6038
+SootopolisCity_EventScript_Woman1::
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
@@ -859,7 +859,7 @@ SootopolisCity_EventScript_Woman1:: @ 81E6038
 	release
 	end
 
-SootopolisCity_EventScript_Woman1Legendaries:: @ 81E6065
+SootopolisCity_EventScript_Woman1Legendaries::
 	msgbox SootopolisCity_Text_GiganticPokemonFight, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_WOMAN_1, Common_Movement_FaceOriginalDirection
@@ -867,17 +867,17 @@ SootopolisCity_EventScript_Woman1Legendaries:: @ 81E6065
 	release
 	end
 
-SootopolisCity_EventScript_Woman1PostLegendaries:: @ 81E607A
+SootopolisCity_EventScript_Woman1PostLegendaries::
 	msgbox SootopolisCity_Text_NightSkyFavoriteScenery, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_Woman1Rayquaza:: @ 81E6084
+SootopolisCity_EventScript_Woman1Rayquaza::
 	msgbox SootopolisCity_Text_FearedWorstWhenPokemonFlewDown, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_NinjaBoy:: @ 81E608E
+SootopolisCity_EventScript_NinjaBoy::
 	lockall
 	applymovement LOCALID_NINJA_BOY, Common_Movement_FacePlayer
 	waitmovement 0
@@ -894,17 +894,17 @@ SootopolisCity_EventScript_NinjaBoy:: @ 81E608E
 	release
 	end
 
-SootopolisCity_EventScript_NinjaBoyNormal:: @ 81E60CF
+SootopolisCity_EventScript_NinjaBoyNormal::
 	msgbox SootopolisCity_Text_WonderWhatWorldIsLike, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_NinjaBoyRayquaza:: @ 81E60D9
+SootopolisCity_EventScript_NinjaBoyRayquaza::
 	msgbox SootopolisCity_Text_ThatWasWicked, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_Boy1:: @ 81E60E3
+SootopolisCity_EventScript_Boy1::
 	lockall
 	applymovement LOCALID_BOY_1, Common_Movement_FacePlayer
 	waitmovement 0
@@ -922,34 +922,34 @@ SootopolisCity_EventScript_Boy1:: @ 81E60E3
 	release
 	end
 
-SootopolisCity_EventScript_Boy1Rayquaza:: @ 81E612D
+SootopolisCity_EventScript_Boy1Rayquaza::
 	msgbox SootopolisCity_Text_WhatIsThatGreenPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_Boy1GameClear:: @ 81E6137
+SootopolisCity_EventScript_Boy1GameClear::
 	msgbox SootopolisCity_Text_WhereDidLegendariesGo, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_Boy1Normal:: @ 81E6141
+SootopolisCity_EventScript_Boy1Normal::
 	msgbox SootopolisCity_Text_PhysicallyFitLivingHere, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_GymSign:: @ 81E614B
+SootopolisCity_EventScript_GymSign::
 	msgbox SootopolisCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-SootopolisCity_EventScript_CitySign:: @ 81E6154
+SootopolisCity_EventScript_CitySign::
 	msgbox SootopolisCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-EventScript_ClosedSootopolisDoor:: @ 81E615D
+EventScript_ClosedSootopolisDoor::
 	msgbox SootopolisCity_Text_DoorIsClosed, MSGBOX_SIGN
 	end
 
-SootopolisCity_EventScript_Steven:: @ 81E6166
+SootopolisCity_EventScript_Steven::
 	lockall
 	applymovement LOCALID_STEVEN, Common_Movement_FacePlayer
 	waitmovement 0
@@ -965,22 +965,22 @@ SootopolisCity_EventScript_Steven:: @ 81E6166
 	releaseall
 	end
 
-SootopolisCity_EventScript_StevenHelpWallace:: @ 81E61AE
+SootopolisCity_EventScript_StevenHelpWallace::
 	msgbox SootopolisCity_Text_KnowWhatsNeededToHelpHim, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_StevenMaxieArchieLeft:: @ 81E61B8
+SootopolisCity_EventScript_StevenMaxieArchieLeft::
 	msgbox SootopolisCity_Text_MaxieArchieLeft, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_StevenHelpedWallace:: @ 81E61C2
+SootopolisCity_EventScript_StevenHelpedWallace::
 	msgbox SootopolisCity_Text_NeverBeenToSkyPillar, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: @ 81E61CC
+SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin::
 	msgbox SootopolisCity_Text_InvolvedWithCrisisComeWithMe, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_WEST
@@ -1007,19 +1007,19 @@ SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: @ 81E61CC
 	waitstate
 	end
 
-SootopolisCity_EventScript_StartWalkToCaveOfOriginWest:: @ 81E6243
+SootopolisCity_EventScript_StartWalkToCaveOfOriginWest::
 	applymovement LOCALID_STEVEN, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest
 	waitmovement 0
 	return
 
-SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth:: @ 81E6255
+SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth::
 	applymovement LOCALID_STEVEN, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth
 	waitmovement 0
 	return
 
-SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin: @ 81E6267
+SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin:
 	walk_up
 	walk_up
 	walk_up
@@ -1058,7 +1058,7 @@ SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin: @ 81E6267
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest: @ 81E628C
+SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest:
 	walk_left
 	walk_up
 	walk_up
@@ -1096,7 +1096,7 @@ SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest: @ 81E628C
 	walk_up
 	step_end
 
-SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth: @ 81E62B0
+SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth:
 	walk_up
 	walk_up
 	walk_up
@@ -1134,7 +1134,7 @@ SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth: @ 81E62B0
 	walk_up
 	step_end
 
-SootopolisCity_Movement_StevenWalkToCaveOfOrigin: @ 81E62D4
+SootopolisCity_Movement_StevenWalkToCaveOfOrigin:
 	walk_up
 	walk_up
 	walk_right
@@ -1194,7 +1194,7 @@ SootopolisCity_Movement_StevenWalkToCaveOfOrigin: @ 81E62D4
 	walk_up
 	step_end
 
-SootopolisCity_Movement_PlayerWalkToCaveOfOrigin: @ 81E630E
+SootopolisCity_Movement_PlayerWalkToCaveOfOrigin:
 	walk_up
 	walk_up
 	walk_up
@@ -1247,12 +1247,12 @@ SootopolisCity_Movement_PlayerWalkToCaveOfOrigin: @ 81E630E
 	walk_right
 	step_end
 
-SootopolisCity_Movement_ExpertMoveAside: @ 81E6341
+SootopolisCity_Movement_ExpertMoveAside:
 	walk_slow_left
 	walk_in_place_fastest_right
 	step_end
 
-SootopolisCity_Movement_StevenArriveCaveEntrance: @ 81E6344
+SootopolisCity_Movement_StevenArriveCaveEntrance:
 	walk_down
 	walk_down
 	walk_left
@@ -1265,7 +1265,7 @@ SootopolisCity_Movement_StevenArriveCaveEntrance: @ 81E6344
 	walk_in_place_fastest_left
 	step_end
 
-SootopolisCity_Movement_PlayerArriveCaveEntrance: @ 81E634F
+SootopolisCity_Movement_PlayerArriveCaveEntrance:
 	delay_16
 	delay_16
 	delay_16
@@ -1278,12 +1278,12 @@ SootopolisCity_Movement_PlayerArriveCaveEntrance: @ 81E634F
 	walk_in_place_fastest_right
 	step_end
 
-SootopolisCity_Movement_PlayerEnterCaveOfOrigin: @ 81E635A
+SootopolisCity_Movement_PlayerEnterCaveOfOrigin:
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_EventScript_Boy2:: @ 81E635D
+SootopolisCity_EventScript_Boy2::
 	lockall
 	applymovement LOCALID_BOY_2, Common_Movement_FacePlayer
 	waitmovement 0
@@ -1296,13 +1296,13 @@ SootopolisCity_EventScript_Boy2:: @ 81E635D
 	releaseall
 	end
 
-SootopolisCity_EventScript_Boy2Rayquaza:: @ 81E6388
+SootopolisCity_EventScript_Boy2Rayquaza::
 	msgbox SootopolisCity_Text_FlyingMonStoppedRampage, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-SootopolisCity_EventScript_BlackBelt:: @ 81E6393
+SootopolisCity_EventScript_BlackBelt::
 	lockall
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_BlackBeltRayquaza
@@ -1317,14 +1317,14 @@ SootopolisCity_EventScript_BlackBelt:: @ 81E6393
 	releaseall
 	end
 
-SootopolisCity_EventScript_BlackBeltRayquaza:: @ 81E63C7
+SootopolisCity_EventScript_BlackBeltRayquaza::
 	applymovement LOCALID_BLACK_BELT, Common_Movement_FacePlayer
 	waitmovement 0
 	msgbox SootopolisCity_Text_GreenOneSettlesThings, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_Girl:: @ 81E63DB
+SootopolisCity_EventScript_Girl::
 	lockall
 	applymovement LOCALID_GIRL, Common_Movement_FacePlayer
 	waitmovement 0
@@ -1337,13 +1337,13 @@ SootopolisCity_EventScript_Girl:: @ 81E63DB
 	releaseall
 	end
 
-SootopolisCity_EventScript_GirlRayquaza:: @ 81E6406
+SootopolisCity_EventScript_GirlRayquaza::
 	msgbox SootopolisCity_Text_SootopolisDidntGetWrecked, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-SootopolisCity_EventScript_Maniac:: @ 81E6411
+SootopolisCity_EventScript_Maniac::
 	lockall
 	applymovement LOCALID_MANIAC, Common_Movement_FacePlayer
 	waitmovement 0
@@ -1356,12 +1356,12 @@ SootopolisCity_EventScript_Maniac:: @ 81E6411
 	releaseall
 	end
 
-SootopolisCity_EventScript_ManiacRayquaza:: @ 81E643C
+SootopolisCity_EventScript_ManiacRayquaza::
 	msgbox SootopolisCity_Text_SawLegendWithOwnEyes, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_Wallace:: @ 81E6446
+SootopolisCity_EventScript_Wallace::
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
@@ -1372,7 +1372,7 @@ SootopolisCity_EventScript_Wallace:: @ 81E6446
 	release
 	end
 
-SootopolisCity_EventScript_GiveWaterfall:: @ 81E646F
+SootopolisCity_EventScript_GiveWaterfall::
 	msgbox SootopolisCity_Text_ThankYouForHelpAcceptThis, MSGBOX_DEFAULT
 	giveitem ITEM_HM07
 	setflag FLAG_RECEIVED_HM07
@@ -1387,41 +1387,41 @@ SootopolisCity_EventScript_GiveWaterfall:: @ 81E646F
 	release
 	end
 
-SootopolisCity_EventScript_WallaceMoveFromGym:: @ 81E64B2
+SootopolisCity_EventScript_WallaceMoveFromGym::
 	applymovement LOCALID_WALLACE, SootopolisCity_Movement_WallaceMoveFromGym
 	waitmovement 0
 	copyobjectxytoperm LOCALID_WALLACE
 	setvar VAR_SOOTOPOLIS_WALLACE_STATE, 1
 	return
 
-SootopolisCity_EventScript_WallaceMoveFromGymWest:: @ 81E64C5
+SootopolisCity_EventScript_WallaceMoveFromGymWest::
 	applymovement LOCALID_WALLACE, SootopolisCity_Movement_WallaceMoveFromGymWest
 	waitmovement 0
 	copyobjectxytoperm LOCALID_WALLACE
 	setvar VAR_SOOTOPOLIS_WALLACE_STATE, 2
 	return
 
-SootopolisCity_EventScript_GoToSkyPillar:: @ 81E64D8
+SootopolisCity_EventScript_GoToSkyPillar::
 	msgbox SootopolisCity_Text_HaventYouScaledSkyPillar, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_GoToGym:: @ 81E64E2
+SootopolisCity_EventScript_GoToGym::
 	msgbox SootopolisCity_Text_DazzledByMentor, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Movement_WallaceMoveFromGym: @ 81E64EC
+SootopolisCity_Movement_WallaceMoveFromGym:
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_Movement_WallaceMoveFromGymWest: @ 81E64EF
+SootopolisCity_Movement_WallaceMoveFromGymWest:
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_EventScript_Maxie:: @ 81E64F2
+SootopolisCity_EventScript_Maxie::
 	lockall
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_MaxieRayquaza
@@ -1430,14 +1430,14 @@ SootopolisCity_EventScript_Maxie:: @ 81E64F2
 	releaseall
 	end
 
-SootopolisCity_EventScript_MaxieRayquaza:: @ 81E6509
+SootopolisCity_EventScript_MaxieRayquaza::
 	msgbox SootopolisCity_Text_AfterAllOurScheming, MSGBOX_DEFAULT
 	setflag FLAG_MET_MAXIE_SOOTOPOLIS
 	goto_if_set FLAG_MET_ARCHIE_SOOTOPOLIS, SootopolisCity_EventScript_MaxieArchieLeave
 	releaseall
 	end
 
-SootopolisCity_EventScript_Archie:: @ 81E651F
+SootopolisCity_EventScript_Archie::
 	lockall
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
 	goto_if_eq SootopolisCity_EventScript_ArchieRayquaza
@@ -1446,14 +1446,14 @@ SootopolisCity_EventScript_Archie:: @ 81E651F
 	releaseall
 	end
 
-SootopolisCity_EventScript_ArchieRayquaza:: @ 81E6536
+SootopolisCity_EventScript_ArchieRayquaza::
 	msgbox SootopolisCity_Text_TryingMeaninglessToPokemon, MSGBOX_DEFAULT
 	setflag FLAG_MET_ARCHIE_SOOTOPOLIS
 	goto_if_set FLAG_MET_MAXIE_SOOTOPOLIS, SootopolisCity_EventScript_MaxieArchieLeave
 	releaseall
 	end
 
-SootopolisCity_EventScript_MaxieArchieLeave:: @ 81E654C
+SootopolisCity_EventScript_MaxieArchieLeave::
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
 	setflag FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE
@@ -1466,36 +1466,36 @@ SootopolisCity_EventScript_MaxieArchieLeave:: @ 81E654C
 	end
 
 @ Unused
-SootopolisCity_Movement_Levitate:: @ 81E656B
+SootopolisCity_Movement_Levitate::
 	levitate
 	step_end
 
 @ Unused
-SootopolisCity_Movement_DestroyTask:: @ 81E656D
+SootopolisCity_Movement_DestroyTask::
 	destroy_extra_task
 	step_end
 
-SootopolisCity_Text_GymSign: @ 81E656F
+SootopolisCity_Text_GymSign:
 	.string "SOOTOPOLIS CITY POKéMON GYM\n"
 	.string "LEADER: JUAN\p"
 	.string "“The GYM LEADER with the beauty\n"
 	.string "of pure water!”$"
 
-SootopolisCity_Text_CitySign: @ 81E65C8
+SootopolisCity_Text_CitySign:
 	.string "SOOTOPOLIS CITY\p"
 	.string "“The mystical city where history\n"
 	.string "slumbers.”$"
 
-SootopolisCity_Text_DoorIsClosed: @ 81E6604
+SootopolisCity_Text_DoorIsClosed:
 	.string "The door is closed.$"
 
-SootopolisCity_Text_PhysicallyFitLivingHere: @ 81E6618
+SootopolisCity_Text_PhysicallyFitLivingHere:
 	.string "Diving in the sea. Climbing up and\n"
 	.string "down stairs all the time…\p"
 	.string "If you live in this town, you end up\n"
 	.string "getting physically fit.$"
 
-SootopolisCity_Text_GiantPokemonSuddenlyAppeared: @ 81E6692
+SootopolisCity_Text_GiantPokemonSuddenlyAppeared:
 	.string "These giant POKéMON suddenly appeared\n"
 	.string "in the middle of the city!\p"
 	.string "And, I've never seen them before!\p"
@@ -1504,56 +1504,56 @@ SootopolisCity_Text_GiantPokemonSuddenlyAppeared: @ 81E6692
 	.string "Why can't they be friends, those\n"
 	.string "POKéMON?$"
 
-SootopolisCity_Text_WhatIsThatGreenPokemon: @ 81E6750
+SootopolisCity_Text_WhatIsThatGreenPokemon:
 	.string "What? What? What?\n"
 	.string "What is that green POKéMON?!$"
 
-SootopolisCity_Text_WhereDidLegendariesGo: @ 81E677F
+SootopolisCity_Text_WhereDidLegendariesGo:
 	.string "GROUDON and KYOGRE…\n"
 	.string "Where did they go?\p"
 	.string "Will they cause droughts or downpours\n"
 	.string "somewhere else?$"
 
-SootopolisCity_Text_TwoPokemonArentAngry: @ 81E67DC
+SootopolisCity_Text_TwoPokemonArentAngry:
 	.string "I just get this sense somehow that\n"
 	.string "the two POKéMON aren't angry.\p"
 	.string "I think… They probably can't control\n"
 	.string "their own power…$"
 
-SootopolisCity_Text_FlyingMonStoppedRampage: @ 81E6853
+SootopolisCity_Text_FlyingMonStoppedRampage:
 	.string "That flying POKéMON came down from\n"
 	.string "the sky and stopped the rampaging\l"
 	.string "POKéMON…$"
 
-SootopolisCity_Text_WonderWhatWorldIsLike: @ 81E68A1
+SootopolisCity_Text_WonderWhatWorldIsLike:
 	.string "I… I've never been out of this city.\p"
 	.string "I wonder what the world is like on\n"
 	.string "the other side of this round sky?$"
 
-SootopolisCity_Text_ThisIsWicked: @ 81E690B
+SootopolisCity_Text_ThisIsWicked:
 	.string "Wow!\n"
 	.string "This is wicked!$"
 
-SootopolisCity_Text_ThatWasWicked: @ 81E6920
+SootopolisCity_Text_ThatWasWicked:
 	.string "Wow!\n"
 	.string "That was wicked!$"
 
-SootopolisCity_Text_GoRedAndBlueMon: @ 81E6936
+SootopolisCity_Text_GoRedAndBlueMon:
 	.string "Go for it, red POKéMON!\n"
 	.string "Don't back off, blue POKéMON!$"
 
-SootopolisCity_Text_DoYouKnowMonNames: @ 81E696C
+SootopolisCity_Text_DoYouKnowMonNames:
 	.string "… … … … … …\p"
 	.string "Hi, do you know the names of those\n"
 	.string "POKéMON fighting over there?$"
 
-SootopolisCity_Text_GreenOneSettlesThings: @ 81E69B8
+SootopolisCity_Text_GreenOneSettlesThings:
 	.string "I was wondering which one would win,\n"
 	.string "the red one or the blue one, but, oh no,\l"
 	.string "it's the green one that settles things!\p"
 	.string "Talk about a huge turn of events!$"
 
-SootopolisCity_Text_SeeingLegendWithOwnEyes: @ 81E6A50
+SootopolisCity_Text_SeeingLegendWithOwnEyes:
 	.string "There's an ancient legend that claims\n"
 	.string "the land and sea were shaped by\l"
 	.string "a colossal battle between POKéMON.\p"
@@ -1562,7 +1562,7 @@ SootopolisCity_Text_SeeingLegendWithOwnEyes: @ 81E6A50
 	.string "Whoa! I never expected to be\n"
 	.string "witness to something this huge!$"
 
-SootopolisCity_Text_SawLegendWithOwnEyes: @ 81E6B2A
+SootopolisCity_Text_SawLegendWithOwnEyes:
 	.string "There's an ancient legend that claims\n"
 	.string "the land and sea were shaped by\l"
 	.string "a colossal battle between POKéMON.\p"
@@ -1571,40 +1571,40 @@ SootopolisCity_Text_SawLegendWithOwnEyes: @ 81E6B2A
 	.string "Whoa! I never expected to be\n"
 	.string "witness to something this huge!$"
 
-SootopolisCity_Text_BigPokemonFighting: @ 81E6BFF
+SootopolisCity_Text_BigPokemonFighting:
 	.string "A big POKéMON is fighting with\n"
 	.string "another big POKéMON!\p"
 	.string "Please, someone make them stop!$"
 
-SootopolisCity_Text_PrettyMonCameFromSky: @ 81E6C53
+SootopolisCity_Text_PrettyMonCameFromSky:
 	.string "A pretty POKéMON came down from\n"
 	.string "the sky…$"
 
-SootopolisCity_Text_SootopolisWillBeWrecked: @ 81E6C7C
+SootopolisCity_Text_SootopolisWillBeWrecked:
 	.string "Oh, no!\n"
 	.string "SOOTOPOLIS CITY will get wrecked!$"
 
-SootopolisCity_Text_SootopolisDidntGetWrecked: @ 81E6CA6
+SootopolisCity_Text_SootopolisDidntGetWrecked:
 	.string "SOOTOPOLIS CITY didn't get wrecked!$"
 
-SootopolisCity_Text_NoOrdinaryTourist: @ 81E6CCA
+SootopolisCity_Text_NoOrdinaryTourist:
 	.string "Hm!\n"
 	.string "You've come all the way to SOOTOPOLIS?\l"
 	.string "You're no ordinary tourist.\p"
 	.string "But I suppose that doesn't make you\n"
 	.string "an extraordinary tourist, either.$"
 
-SootopolisCity_Text_CityRegainedCalm: @ 81E6D57
+SootopolisCity_Text_CityRegainedCalm:
 	.string "The city has regained its calm…$"
 
-SootopolisCity_Text_CaveOfOriginPleaseLeave: @ 81E6D77
+SootopolisCity_Text_CaveOfOriginPleaseLeave:
 	.string "Who might you be?\p"
 	.string "This is the CAVE OF ORIGIN.\p"
 	.string "The spirits of POKéMON, becalmed at\n"
 	.string "MT. PYRE, are said to be revived here.\p"
 	.string "Please leave.$"
 
-SootopolisCity_Text_LeadSuperiorTrainerToCave: @ 81E6DFE
+SootopolisCity_Text_LeadSuperiorTrainerToCave:
 	.string "A person with a strong will and\n"
 	.string "superior talent…\p"
 	.string "A TRAINER who has knowledge and\n"
@@ -1613,18 +1613,18 @@ SootopolisCity_Text_LeadSuperiorTrainerToCave: @ 81E6DFE
 	.string "instructed by WALLACE to lead that\l"
 	.string "TRAINER to this CAVE.$"
 
-SootopolisCity_Text_AwakenedPokemonClash: @ 81E6ED4
+SootopolisCity_Text_AwakenedPokemonClash:
 	.string "Oh, my…\p"
 	.string "The clash between the two awakened\n"
 	.string "POKéMON was quelled by the awakening\l"
 	.string "of a third POKéMON…$"
 
-SootopolisCity_Text_CaveOfOriginSleepsToo: @ 81E6F38
+SootopolisCity_Text_CaveOfOriginSleepsToo:
 	.string "This is the CAVE OF ORIGIN…\p"
 	.string "With the passing of the crisis,\n"
 	.string "the cave, too, shall sleep…$"
 
-SootopolisCity_Text_SootopolisSkyBeautiful: @ 81E6F90
+SootopolisCity_Text_SootopolisSkyBeautiful:
 	.string "SOOTOPOLIS sprang up as a town in\n"
 	.string "the crater of a volcano.\p"
 	.string "If you look up at the sky, the lip of\n"
@@ -1633,23 +1633,23 @@ SootopolisCity_Text_SootopolisSkyBeautiful: @ 81E6F90
 	.string "But that's what makes the sky above\n"
 	.string "SOOTOPOLIS the most beautiful.$"
 
-SootopolisCity_Text_GiganticPokemonFight: @ 81E7078
+SootopolisCity_Text_GiganticPokemonFight:
 	.string "When two POKéMON that gigantic\n"
 	.string "are fighting that savagely, there's\l"
 	.string "not much that we can do.$"
 
-SootopolisCity_Text_FearedWorstWhenPokemonFlewDown: @ 81E70D4
+SootopolisCity_Text_FearedWorstWhenPokemonFlewDown:
 	.string "When that third POKéMON flew down,\n"
 	.string "I feared the worst.$"
 
-SootopolisCity_Text_NightSkyFavoriteScenery: @ 81E710B
+SootopolisCity_Text_NightSkyFavoriteScenery:
 	.string "A circle of a night sky framed by\n"
 	.string "the crater of a volcano…\p"
 	.string "And in that ring, stars flicker and\n"
 	.string "blink as if they were alive…\l"
 	.string "It's my favorite scenery.$"
 
-SootopolisCity_Text_WeatherWentWild: @ 81E71A1
+SootopolisCity_Text_WeatherWentWild:
 	.string "The weather was clear this morning,\n"
 	.string "but…\p"
 	.string "All of a sudden, dark clouds brewed up,\n"
@@ -1660,20 +1660,20 @@ SootopolisCity_Text_WeatherWentWild: @ 81E71A1
 	.string "Is all of this because of those\n"
 	.string "POKéMON?$"
 
-SootopolisCity_Text_YouBroughtFlyingMon: @ 81E728C
+SootopolisCity_Text_YouBroughtFlyingMon:
 	.string "Oh?\p"
 	.string "It was you who brought that flying\n"
 	.string "POKéMON here?\p"
 	.string "Well, aren't you amazing!$"
 
-SootopolisCity_Text_GroudonPleaseStop: @ 81E72DB
+SootopolisCity_Text_GroudonPleaseStop:
 	.string "MAXIE: G… GROUDON…\n"
 	.string "Please! Stop what you're doing!\p"
 	.string "I know the extent of your power now!\p"
 	.string "If you keep going, all HOENN, not just\n"
 	.string "SOOTOPOLIS, will be utterly ruined!$"
 
-SootopolisCity_Text_AfterAllOurScheming: @ 81E737E
+SootopolisCity_Text_AfterAllOurScheming:
 	.string "MAXIE: So the super-ancient POKéMON\n"
 	.string "weren't only GROUDON and KYOGRE…\p"
 	.string "After all our fruitless scheming and\n"
@@ -1683,7 +1683,7 @@ SootopolisCity_Text_AfterAllOurScheming: @ 81E737E
 	.string "Fu…\n"
 	.string "Fuhahaha…$"
 
-SootopolisCity_Text_KyogreCalmDown: @ 81E7460
+SootopolisCity_Text_KyogreCalmDown:
 	.string "ARCHIE: KYOGRE! What's wrong?!\n"
 	.string "Look over here! It's the RED ORB!\l"
 	.string "Calm down! KYOGRE!\p"
@@ -1692,7 +1692,7 @@ SootopolisCity_Text_KyogreCalmDown: @ 81E7460
 	.string "It's no good!\n"
 	.string "It's not responding at all!$"
 
-SootopolisCity_Text_TryingMeaninglessToPokemon: @ 81E74F6
+SootopolisCity_Text_TryingMeaninglessToPokemon:
 	.string "ARCHIE: KYOGRE and GROUDON both\n"
 	.string "flew off to who knows where.\p"
 	.string "The weather in HOENN has returned\n"
@@ -1703,7 +1703,7 @@ SootopolisCity_Text_TryingMeaninglessToPokemon: @ 81E74F6
 	.string "something small, even meaningless,\l"
 	.string "to POKéMON…$"
 
-SootopolisCity_Text_InvolvedWithCrisisComeWithMe: @ 81E75CB
+SootopolisCity_Text_InvolvedWithCrisisComeWithMe:
 	.string "STEVEN: Those POKéMON fighting…\n"
 	.string "GROUDON… And KYOGRE…\p"
 	.string "The two super-ancient POKéMON\n"
@@ -1718,7 +1718,7 @@ SootopolisCity_Text_InvolvedWithCrisisComeWithMe: @ 81E75CB
 	.string "I'd like you to meet.\p"
 	.string "Come with me, please.$"
 
-SootopolisCity_Text_DoesThisMakeYourFearPokemon: @ 81E7737
+SootopolisCity_Text_DoesThisMakeYourFearPokemon:
 	.string "STEVEN: Listen, {PLAYER}{KUN}.\p"
 	.string "Does seeing GROUDON and KYOGRE make\n"
 	.string "you think POKéMON are to be feared?\p"
@@ -1727,34 +1727,34 @@ SootopolisCity_Text_DoesThisMakeYourFearPokemon: @ 81E7737
 	.string "…Why am I asking you this?\n"
 	.string "You already know.$"
 
-SootopolisCity_Text_HereWereAreHelpWallace: @ 81E77F0
+SootopolisCity_Text_HereWereAreHelpWallace:
 	.string "STEVEN: Okay, here we are!\p"
 	.string "Inside here you'll find someone named\n"
 	.string "WALLACE.\p"
 	.string "I think you have what's needed to\n"
 	.string "help him…$"
 
-SootopolisCity_Text_KnowWhatsNeededToHelpHim: @ 81E7866
+SootopolisCity_Text_KnowWhatsNeededToHelpHim:
 	.string "STEVEN: I think you have what's\n"
 	.string "needed to help him…$"
 
-SootopolisCity_Text_NeverBeenToSkyPillar: @ 81E789A
+SootopolisCity_Text_NeverBeenToSkyPillar:
 	.string "STEVEN: The SKY PILLAR…\p"
 	.string "I've never been there.\n"
 	.string "I wonder where it could be?$"
 
-SootopolisCity_Text_SoThatsRayquaza: @ 81E78E5
+SootopolisCity_Text_SoThatsRayquaza:
 	.string "STEVEN: So that's RAYQUAZA…\p"
 	.string "It's incredible how the two rampaging\n"
 	.string "POKéMON would flee from it in fear…$"
 
-SootopolisCity_Text_MaxieArchieLeft: @ 81E794B
+SootopolisCity_Text_MaxieArchieLeft:
 	.string "STEVEN: It looks like both MAXIE and\n"
 	.string "ARCHIE have gone away somewhere.\p"
 	.string "Perhaps they've gone to MT. PYRE to\n"
 	.string "return those ORBS…$"
 
-SootopolisCity_Text_HaventYouScaledSkyPillar: @ 81E79C8
+SootopolisCity_Text_HaventYouScaledSkyPillar:
 	.string "WALLACE: Oh?\n"
 	.string "{PLAYER}{KUN}?\p"
 	.string "Haven't you scaled the SKY PILLAR\n"
@@ -1762,14 +1762,14 @@ SootopolisCity_Text_HaventYouScaledSkyPillar: @ 81E79C8
 	.string "I'm sure that you can make it to\n"
 	.string "the top of the SKY PILLAR…$"
 
-SootopolisCity_Text_AquaMagmaDidntMeanHarm: @ 81E7A3E
+SootopolisCity_Text_AquaMagmaDidntMeanHarm:
 	.string "WALLACE: {PLAYER}{KUN}…\p"
 	.string "The leaders of TEAM MAGMA and AQUA,\n"
 	.string "I don't think they meant harm.\p"
 	.string "It wouldn't hurt to hear what they\n"
 	.string "have to say for themselves.$"
 
-SootopolisCity_Text_ThankYouForHelpAcceptThis: @ 81E7ACF
+SootopolisCity_Text_ThankYouForHelpAcceptThis:
 	.string "WALLACE: {PLAYER}{KUN}…\n"
 	.string "My eyes didn't deceive me.\p"
 	.string "Thanks to your help, SOOTOPOLIS…\n"
@@ -1778,7 +1778,7 @@ SootopolisCity_Text_ThankYouForHelpAcceptThis: @ 81E7ACF
 	.string "This is a gift from me.\n"
 	.string "Please accept it.$"
 
-SootopolisCity_Text_ExplainWaterfallGoToGym: @ 81E7B86
+SootopolisCity_Text_ExplainWaterfallGoToGym:
 	.string "That HIDDEN MACHINE contains\n"
 	.string "WATERFALL.\p"
 	.string "If you have the RAIN BADGE, a POKéMON\n"
@@ -1791,7 +1791,7 @@ SootopolisCity_Text_ExplainWaterfallGoToGym: @ 81E7B86
 	.string "When you're all set to go, step through\n"
 	.string "that door.$"
 
-SootopolisCity_Text_DazzledByMentor: @ 81E7CBC
+SootopolisCity_Text_DazzledByMentor:
 	.string "WALLACE: I'm sure that you will be\n"
 	.string "dazzled by my mentor's breathtakingly\l"
 	.string "elegant battle style.$"
diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
index ae5bfd108..b20cf7888 100644
--- a/data/maps/SootopolisCity_Gym_1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -1,24 +1,24 @@
-SootopolisCity_Gym_1F_MapScripts:: @ 8224E4C
+SootopolisCity_Gym_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_Gym_1F_OnFrame
 	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_Gym_1F_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_Gym_1F_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_Gym_1F_OnTransition
 	.byte 0
 
-SootopolisCity_Gym_1F_OnTransition: @ 8224E61
+SootopolisCity_Gym_1F_OnTransition:
 	setvar VAR_ICE_STEP_COUNT, 1
 	end
 
-SootopolisCity_Gym_1F_OnResume: @ 8224E67
+SootopolisCity_Gym_1F_OnResume:
 	setstepcallback STEP_CB_SOOTOPOLIS_ICE
 	end
 
-SootopolisCity_Gym_1F_OnLoad: @ 8224E6A
+SootopolisCity_Gym_1F_OnLoad:
 	call SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles
 	special SetSootopolisGymCrackedIceMetatiles
 	end
 
-SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles:: @ 8224E73
+SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles::
 	compare VAR_ICE_STEP_COUNT, 8
 	goto_if_lt SootopolisCity_Gym_1F_EventScript_StopCheckingStairs  @ All stairs ice
 	compare VAR_ICE_STEP_COUNT, 28
@@ -27,23 +27,23 @@ SootopolisCity_Gym_1F_EventScript_CheckSetStairMetatiles:: @ 8224E73
 	goto_if_lt SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs
 	setmetatile 8, 4, METATILE_SootopolisGym_Stairs, 0
 	setmetatile 8, 5, METATILE_SootopolisGym_Stairs, 0
-SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs:: @ 8224EA6
+SootopolisCity_Gym_1F_EventScript_OpenFirstAndSecondStairs::
 	setmetatile 8, 10, METATILE_SootopolisGym_Stairs, 0
 	setmetatile 8, 11, METATILE_SootopolisGym_Stairs, 0
-SootopolisCity_Gym_1F_EventScript_OpenFirstStairs:: @ 8224EB8
+SootopolisCity_Gym_1F_EventScript_OpenFirstStairs::
 	setmetatile 8, 15, METATILE_SootopolisGym_Stairs, 0
 	setmetatile 8, 16, METATILE_SootopolisGym_Stairs, 0
-SootopolisCity_Gym_1F_EventScript_StopCheckingStairs:: @ 8224ECA
+SootopolisCity_Gym_1F_EventScript_StopCheckingStairs::
 	return
 
-SootopolisCity_Gym_1F_OnFrame: @ 8224ECB
+SootopolisCity_Gym_1F_OnFrame:
 	map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs
 	map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs
 	map_script_2 VAR_ICE_STEP_COUNT, 67, SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs
 	map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_FallThroughIce
 	.2byte 0
 
-SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED
+SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs::
 	addvar VAR_ICE_STEP_COUNT, 1
 	delay 40
 	playse SE_ICE_STAIRS
@@ -51,7 +51,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockFirstStairs:: @ 8224EED
 	special DrawWholeMapView
 	end
 
-SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01
+SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs::
 	addvar VAR_ICE_STEP_COUNT, 1
 	delay 40
 	playse SE_ICE_STAIRS
@@ -59,7 +59,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockSecondStairs:: @ 8224F01
 	special DrawWholeMapView
 	end
 
-SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15
+SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs::
 	addvar VAR_ICE_STEP_COUNT, 1
 	delay 40
 	playse SE_ICE_STAIRS
@@ -67,7 +67,7 @@ SootopolisCity_Gym_1F_EventScript_UnlockThirdStairs:: @ 8224F15
 	special DrawWholeMapView
 	end
 
-SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29
+SootopolisCity_Gym_1F_EventScript_FallThroughIce::
 	lockall
 	delay 20
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_Gym_1F_Movement_FallThroughIce
@@ -78,11 +78,11 @@ SootopolisCity_Gym_1F_EventScript_FallThroughIce:: @ 8224F29
 	waitstate
 	end
 
-SootopolisCity_Gym_1F_Movement_FallThroughIce: @ 8224F42
+SootopolisCity_Gym_1F_Movement_FallThroughIce:
 	set_invisible
 	step_end
 
-SootopolisCity_Gym_1F_EventScript_Juan:: @ 8224F44
+SootopolisCity_Gym_1F_EventScript_Juan::
 	trainerbattle_single TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_JuanIntro, SootopolisCity_Gym_1F_Text_JuanDefeat, SootopolisCity_Gym_1F_EventScript_JuanDefeated, NO_MUSIC
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -93,7 +93,7 @@ SootopolisCity_Gym_1F_EventScript_Juan:: @ 8224F44
 	release
 	end
 
-SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82
+SootopolisCity_Gym_1F_EventScript_JuanDefeated::
 	message SootopolisCity_Gym_1F_Text_ReceivedRainBadge
 	waitmessage
 	call Common_EventScript_PlayGymBadgeFanfare
@@ -119,7 +119,7 @@ SootopolisCity_Gym_1F_EventScript_JuanDefeated:: @ 8224F82
 	release
 	end
 
-SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4
+SootopolisCity_Gym_1F_EventScript_GiveWaterPulse::
 	giveitem ITEM_TM03
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_BagIsFull
@@ -127,7 +127,7 @@ SootopolisCity_Gym_1F_EventScript_GiveWaterPulse:: @ 8224FD4
 	setflag FLAG_RECEIVED_TM03
 	return
 
-SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 8224FF7
+SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2::
 	giveitem ITEM_TM03
 	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
@@ -136,17 +136,17 @@ SootopolisCity_Gym_1F_EventScript_GiveWaterPulse2:: @ 8224FF7
 	release
 	end
 
-SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge:: @ 822501B
+SootopolisCity_Gym_1F_EventScript_GoGetFortreeBadge::
 	msgbox SootopolisCity_Gym_1F_Text_GoGetFortreeBadge, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Gym_1F_EventScript_JuanRematch:: @ 8225025
+SootopolisCity_Gym_1F_EventScript_JuanRematch::
 	trainerbattle_rematch_double TRAINER_JUAN_1, SootopolisCity_Gym_1F_Text_JuanPreRematch, SootopolisCity_Gym_1F_Text_JuanRematchDefeat, SootopolisCity_Gym_1F_Text_JuanRematchNeedTwoMons
 	msgbox SootopolisCity_Gym_1F_Text_JuanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_1F_EventScript_GymGuide:: @ 8225040
+SootopolisCity_Gym_1F_EventScript_GymGuide::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory
@@ -154,34 +154,34 @@ SootopolisCity_Gym_1F_EventScript_GymGuide:: @ 8225040
 	release
 	end
 
-SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory:: @ 8225055
+SootopolisCity_Gym_1F_EventScript_GymGuidePostVictory::
 	msgbox SootopolisCity_Gym_1F_Text_GymGuidePostVictory, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Gym_1F_EventScript_LeftGymStatue:: @ 822505F
+SootopolisCity_Gym_1F_EventScript_LeftGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified
 	goto SootopolisCity_Gym_1F_EventScript_GymStatue
 	end
 
-SootopolisCity_Gym_1F_EventScript_RightGymStatue:: @ 822506F
+SootopolisCity_Gym_1F_EventScript_RightGymStatue::
 	lockall
 	goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_GymStatueCertified
 	goto SootopolisCity_Gym_1F_EventScript_GymStatue
 	end
 
-SootopolisCity_Gym_1F_EventScript_GymStatueCertified:: @ 822507F
+SootopolisCity_Gym_1F_EventScript_GymStatueCertified::
 	msgbox SootopolisCity_Gym_1F_Text_GymStatueCertified, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_Gym_1F_EventScript_GymStatue:: @ 8225089
+SootopolisCity_Gym_1F_EventScript_GymStatue::
 	msgbox SootopolisCity_Gym_1F_Text_GymStatue, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_Gym_1F_Text_GymGuideAdvice: @ 8225093
+SootopolisCity_Gym_1F_Text_GymGuideAdvice:
 	.string "Yo! How's it going, CHAMPION-\n"
 	.string "bound {PLAYER}?\p"
 	.string "SOOTOPOLIS's GYM LEADER JUAN is\n"
@@ -193,14 +193,14 @@ SootopolisCity_Gym_1F_Text_GymGuideAdvice: @ 8225093
 	.string "The rest of the way, you have to\n"
 	.string "go for it yourself!$"
 
-SootopolisCity_Gym_1F_Text_GymGuidePostVictory: @ 82251AF
+SootopolisCity_Gym_1F_Text_GymGuidePostVictory:
 	.string "Yow! You've beaten even JUAN, who\n"
 	.string "was supposedly the best in all HOENN!\p"
 	.string "Okay! Check out your TRAINER CARD.\p"
 	.string "If you've gotten all the BADGES, you're\n"
 	.string "set for the POKéMON LEAGUE challenge!$"
 
-SootopolisCity_Gym_1F_Text_JuanIntro: @ 8225268
+SootopolisCity_Gym_1F_Text_JuanIntro:
 	.string "Let me ask you.\n"
 	.string "Did you know?\l"
 	.string "Ah, I should not be so coy.\p"
@@ -223,7 +223,7 @@ SootopolisCity_Gym_1F_Text_JuanIntro: @ 8225268
 @ the gDisplayedStringBattle buffer that it's put into, and it stomps all over the gBattleTextBuffs
 @ after, as well as the otherwise unused array after that. One wonders if that's the reason for
 @ the existence of that unused array of ints.
-SootopolisCity_Gym_1F_Text_JuanDefeat: @ 8225432
+SootopolisCity_Gym_1F_Text_JuanDefeat:
 	.string "Ahahaha, excellent!\n"
 	.string "Very well, you are the winner.\p"
 	.string "From you, I sense the brilliant shine\n"
@@ -238,11 +238,11 @@ SootopolisCity_Gym_1F_Text_JuanDefeat: @ 8225432
 	.string "Rather than my clothes, I shall reward\n"
 	.string "you with this, the RAIN BADGE!$"
 
-SootopolisCity_Gym_1F_Text_ReceivedRainBadge: @ 8225598
+SootopolisCity_Gym_1F_Text_ReceivedRainBadge:
 	.string "{PLAYER} received the RAIN BADGE\n"
 	.string "from JUAN.$"
 
-SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis: @ 82255BE
+SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis:
 	.string "Having the RAIN BADGE shall assure you\n"
 	.string "the full obedience of all your POKéMON\l"
 	.string "to your every command.\p"
@@ -252,18 +252,18 @@ SootopolisCity_Gym_1F_Text_ExplainRainBadgeTakeThis: @ 82255BE
 	.string "And, so that you never forget the\n"
 	.string "battle we shared, take this…$"
 
-SootopolisCity_Gym_1F_Text_ExplainWaterPulse: @ 82256C1
+SootopolisCity_Gym_1F_Text_ExplainWaterPulse:
 	.string "The TECHNICAL MACHINE I handed you\n"
 	.string "contains WATER PULSE.\p"
 	.string "In use, it will occasionally confuse\n"
 	.string "the target with ultrasonic waves.\p"
 	.string "… … … … … …$"
 
-SootopolisCity_Gym_1F_Text_RegisteredJuan: @ 822574D
+SootopolisCity_Gym_1F_Text_RegisteredJuan:
 	.string "Registered GYM LEADER JUAN\n"
 	.string "in the POKéNAV.$"
 
-SootopolisCity_Gym_1F_Text_JuanPostBattle: @ 8225778
+SootopolisCity_Gym_1F_Text_JuanPostBattle:
 	.string "The TRAINERS who have gathered all\n"
 	.string "the GYM BADGES of HOENN should make\l"
 	.string "way to the ultimate destination.\p"
@@ -273,22 +273,22 @@ SootopolisCity_Gym_1F_Text_JuanPostBattle: @ 8225778
 	.string "There, you shall find the POKéMON\n"
 	.string "LEAGUE.$"
 
-SootopolisCity_Gym_1F_Text_GoGetFortreeBadge: @ 8225865
+SootopolisCity_Gym_1F_Text_GoGetFortreeBadge:
 	.string "There remains but one BADGE to\n"
 	.string "obtain in HOENN.\p"
 	.string "If you wish to challenge the POKéMON\n"
 	.string "LEAGUE, you must obtain the last\l"
 	.string "BADGE from the GYM in FORTREE.$"
 
-SootopolisCity_Gym_1F_Text_GymStatue: @ 82258FA
+SootopolisCity_Gym_1F_Text_GymStatue:
 	.string "SOOTOPOLIS CITY POKéMON GYM$"
 
-SootopolisCity_Gym_1F_Text_GymStatueCertified: @ 8225916
+SootopolisCity_Gym_1F_Text_GymStatueCertified:
 	.string "SOOTOPOLIS CITY POKéMON GYM\p"
 	.string "JUAN'S CERTIFIED TRAINERS:\n"
 	.string "{PLAYER}$"
 
-SootopolisCity_Gym_1F_Text_JuanPreRematch: @ 8225950
+SootopolisCity_Gym_1F_Text_JuanPreRematch:
 	.string "JUAN: Ah, this GYM had returned to its\n"
 	.string "usual state of serenity…\p"
 	.string "But our young typhoon has returned\n"
@@ -297,11 +297,11 @@ SootopolisCity_Gym_1F_Text_JuanPreRematch: @ 8225950
 	.string "I shall be delighted to dance with you\n"
 	.string "as often as you wish!$"
 
-SootopolisCity_Gym_1F_Text_JuanRematchDefeat: @ 8225A2E
+SootopolisCity_Gym_1F_Text_JuanRematchDefeat:
 	.string "Ahahaha, you are the winner!\n"
 	.string "You have defeated me again!$"
 
-SootopolisCity_Gym_1F_Text_JuanPostRematch: @ 8225A67
+SootopolisCity_Gym_1F_Text_JuanPostRematch:
 	.string "JUAN: If I told you to become my\n"
 	.string "apprentice, you will refuse, I am sure.\p"
 	.string "I would like to make a gift of my coat\n"
@@ -311,7 +311,7 @@ SootopolisCity_Gym_1F_Text_JuanPostRematch: @ 8225A67
 	.string "And that, my friend, is a certain sign\n"
 	.string "of nobility!$"
 
-SootopolisCity_Gym_1F_Text_JuanRematchNeedTwoMons: @ 8225B48
+SootopolisCity_Gym_1F_Text_JuanRematchNeedTwoMons:
 	.string "JUAN: Ah, this GYM had returned to its\n"
 	.string "usual state of serenity…\p"
 	.string "But our young typhoon has returned\n"
diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
index 735722db5..ae5a3ebc4 100644
--- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
@@ -1,183 +1,183 @@
-SootopolisCity_Gym_B1F_MapScripts:: @ 8225C8A
+SootopolisCity_Gym_B1F_MapScripts::
 	.byte 0
 
-SootopolisCity_Gym_B1F_EventScript_Andrea:: @ 8225C8B
+SootopolisCity_Gym_B1F_EventScript_Andrea::
 	trainerbattle_single TRAINER_ANDREA, SootopolisCity_Gym_B1F_Text_AndreaIntro, SootopolisCity_Gym_B1F_Text_AndreaDefeat
 	msgbox SootopolisCity_Gym_B1F_Text_AndreaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_B1F_EventScript_Crissy:: @ 8225CA2
+SootopolisCity_Gym_B1F_EventScript_Crissy::
 	trainerbattle_single TRAINER_CRISSY, SootopolisCity_Gym_B1F_Text_CrissyIntro, SootopolisCity_Gym_B1F_Text_CrissyDefeat
 	msgbox SootopolisCity_Gym_B1F_Text_CrissyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_B1F_EventScript_Brianna:: @ 8225CB9
+SootopolisCity_Gym_B1F_EventScript_Brianna::
 	trainerbattle_single TRAINER_BRIANNA, SootopolisCity_Gym_B1F_Text_BriannaIntro, SootopolisCity_Gym_B1F_Text_BriannaDefeat
 	msgbox SootopolisCity_Gym_B1F_Text_BriannaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_B1F_EventScript_Connie:: @ 8225CD0
+SootopolisCity_Gym_B1F_EventScript_Connie::
 	trainerbattle_single TRAINER_CONNIE, SootopolisCity_Gym_B1F_Text_ConnieIntro, SootopolisCity_Gym_B1F_Text_ConnieDefeat
 	msgbox SootopolisCity_Gym_B1F_Text_ConniePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_B1F_EventScript_Bridget:: @ 8225CE7
+SootopolisCity_Gym_B1F_EventScript_Bridget::
 	trainerbattle_single TRAINER_BRIDGET, SootopolisCity_Gym_B1F_Text_BridgetIntro, SootopolisCity_Gym_B1F_Text_BridgetDefeat
 	msgbox SootopolisCity_Gym_B1F_Text_BridgetPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_B1F_EventScript_Olivia:: @ 8225CFE
+SootopolisCity_Gym_B1F_EventScript_Olivia::
 	trainerbattle_single TRAINER_OLIVIA, SootopolisCity_Gym_B1F_Text_OliviaIntro, SootopolisCity_Gym_B1F_Text_OliviaDefeat
 	msgbox SootopolisCity_Gym_B1F_Text_OliviaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_B1F_EventScript_Tiffany:: @ 8225D15
+SootopolisCity_Gym_B1F_EventScript_Tiffany::
 	trainerbattle_single TRAINER_TIFFANY, SootopolisCity_Gym_B1F_Text_TiffanyIntro, SootopolisCity_Gym_B1F_Text_TiffanyDefeat
 	msgbox SootopolisCity_Gym_B1F_Text_TiffanyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_B1F_EventScript_Bethany:: @ 8225D2C
+SootopolisCity_Gym_B1F_EventScript_Bethany::
 	trainerbattle_single TRAINER_BETHANY, SootopolisCity_Gym_B1F_Text_BethanyIntro, SootopolisCity_Gym_B1F_Text_BethanyDefeat
 	msgbox SootopolisCity_Gym_B1F_Text_BethanyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_B1F_EventScript_Annika:: @ 8225D43
+SootopolisCity_Gym_B1F_EventScript_Annika::
 	trainerbattle_single TRAINER_ANNIKA, SootopolisCity_Gym_B1F_Text_AnnikaIntro, SootopolisCity_Gym_B1F_Text_AnnikaDefeat
 	msgbox SootopolisCity_Gym_B1F_Text_AnnikaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_B1F_EventScript_Daphne:: @ 8225D5A
+SootopolisCity_Gym_B1F_EventScript_Daphne::
 	trainerbattle_single TRAINER_DAPHNE, SootopolisCity_Gym_B1F_Text_DaphneIntro, SootopolisCity_Gym_B1F_Text_DaphneDefeat
 	msgbox SootopolisCity_Gym_B1F_Text_DaphnePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SootopolisCity_Gym_B1F_Text_AndreaIntro: @ 8225D71
+SootopolisCity_Gym_B1F_Text_AndreaIntro:
 	.string "I'll show you the sublime techniques\n"
 	.string "I learned from our LEADER JUAN!$"
 
-SootopolisCity_Gym_B1F_Text_AndreaDefeat: @ 8225DB6
+SootopolisCity_Gym_B1F_Text_AndreaDefeat:
 	.string "Please forgive me, JUAN…$"
 
-SootopolisCity_Gym_B1F_Text_AndreaPostBattle: @ 8225DCF
+SootopolisCity_Gym_B1F_Text_AndreaPostBattle:
 	.string "Watch what happens if you crack all\n"
 	.string "the floor tiles.$"
 
-SootopolisCity_Gym_B1F_Text_CrissyIntro: @ 8225E04
+SootopolisCity_Gym_B1F_Text_CrissyIntro:
 	.string "You came all the way here, but you won't\n"
 	.string "get to see JUAN.\p"
 	.string "Not if you lose to me, you won't!$"
 
-SootopolisCity_Gym_B1F_Text_CrissyDefeat: @ 8225E60
+SootopolisCity_Gym_B1F_Text_CrissyDefeat:
 	.string "You're strong!\n"
 	.string "I was fooled by your cute looks!$"
 
-SootopolisCity_Gym_B1F_Text_CrissyPostBattle: @ 8225E90
+SootopolisCity_Gym_B1F_Text_CrissyPostBattle:
 	.string "You might be good enough to avoid\n"
 	.string "being wiped out in one hit by JUAN.$"
 
-SootopolisCity_Gym_B1F_Text_DaphneIntro: @ 8225ED6
+SootopolisCity_Gym_B1F_Text_DaphneIntro:
 	.string "The sight of JUAN conducting\n"
 	.string "a battle…\p"
 	.string "The very beauty of it compelled me to\n"
 	.string "become a TRAINER.$"
 
-SootopolisCity_Gym_B1F_Text_DaphneDefeat: @ 8225F35
+SootopolisCity_Gym_B1F_Text_DaphneDefeat:
 	.string "You battled with more beauty than\n"
 	.string "I could muster…$"
 
-SootopolisCity_Gym_B1F_Text_DaphnePostBattle: @ 8225F67
+SootopolisCity_Gym_B1F_Text_DaphnePostBattle:
 	.string "The grace you bring to battle is\n"
 	.string "fabulous.\p"
 	.string "Oh… I'm so fortunate to have found\n"
 	.string "POKéMON.$"
 
-SootopolisCity_Gym_B1F_Text_ConnieIntro: @ 8225FBE
+SootopolisCity_Gym_B1F_Text_ConnieIntro:
 	.string "I should teach you how harsh battles\n"
 	.string "can be.$"
 
-SootopolisCity_Gym_B1F_Text_ConnieDefeat: @ 8225FEB
+SootopolisCity_Gym_B1F_Text_ConnieDefeat:
 	.string "Oh.\n"
 	.string "You're strong.$"
 
-SootopolisCity_Gym_B1F_Text_ConniePostBattle: @ 8225FFE
+SootopolisCity_Gym_B1F_Text_ConniePostBattle:
 	.string "I'll tell you something good.\p"
 	.string "If you want to reach JUAN, you\n"
 	.string "need to walk on each floor tile once.$"
 
-SootopolisCity_Gym_B1F_Text_BridgetIntro: @ 8226061
+SootopolisCity_Gym_B1F_Text_BridgetIntro:
 	.string "The POKéMON GYM of the highest level\n"
 	.string "in the HOENN region…\p"
 	.string "That's the SOOTOPOLIS GYM.$"
 
-SootopolisCity_Gym_B1F_Text_BridgetDefeat: @ 82260B6
+SootopolisCity_Gym_B1F_Text_BridgetDefeat:
 	.string "What a high level you are!$"
 
-SootopolisCity_Gym_B1F_Text_BridgetPostBattle: @ 82260D1
+SootopolisCity_Gym_B1F_Text_BridgetPostBattle:
 	.string "Rather than being satisfied by being\n"
 	.string "in a strong GYM, I imagine training in\l"
 	.string "other places will make you stronger.\l"
 	.string "But above all, it looks more fun.$"
 
-SootopolisCity_Gym_B1F_Text_OliviaIntro: @ 8226164
+SootopolisCity_Gym_B1F_Text_OliviaIntro:
 	.string "I train my POKéMON together with\n"
 	.string "JUAN.\p"
 	.string "Don't think I'm a pushover.$"
 
-SootopolisCity_Gym_B1F_Text_OliviaDefeat: @ 82261A7
+SootopolisCity_Gym_B1F_Text_OliviaDefeat:
 	.string "I was beaten…$"
 
-SootopolisCity_Gym_B1F_Text_OliviaPostBattle: @ 82261B5
+SootopolisCity_Gym_B1F_Text_OliviaPostBattle:
 	.string "I think you have potential.\n"
 	.string "Why don't you stay and train with us?$"
 
-SootopolisCity_Gym_B1F_Text_TiffanyIntro: @ 82261F7
+SootopolisCity_Gym_B1F_Text_TiffanyIntro:
 	.string "A graceful glide across the ice while\n"
 	.string "crossing no lines…\p"
 	.string "A TRAINER putting on that performance\n"
 	.string "would be elegantly beautiful!$"
 
-SootopolisCity_Gym_B1F_Text_TiffanyDefeat: @ 8226274
+SootopolisCity_Gym_B1F_Text_TiffanyDefeat:
 	.string "Well, excuse me?!$"
 
-SootopolisCity_Gym_B1F_Text_TiffanyPostBattle: @ 8226286
+SootopolisCity_Gym_B1F_Text_TiffanyPostBattle:
 	.string "This is really obvious, but how strong\n"
 	.string "you are as a TRAINER has nothing to do\l"
 	.string "with how young or old you are.$"
 
-SootopolisCity_Gym_B1F_Text_BethanyIntro: @ 82262F3
+SootopolisCity_Gym_B1F_Text_BethanyIntro:
 	.string "When I'm with my POKéMON, the time\n"
 	.string "flies by before you can say, “Oops!”$"
 
-SootopolisCity_Gym_B1F_Text_BethanyDefeat: @ 822633B
+SootopolisCity_Gym_B1F_Text_BethanyDefeat:
 	.string "Oops!$"
 
-SootopolisCity_Gym_B1F_Text_BethanyPostBattle: @ 8226341
+SootopolisCity_Gym_B1F_Text_BethanyPostBattle:
 	.string "I wish I could forget about lost causes\n"
 	.string "before I can manage an “Oops!”$"
 
-SootopolisCity_Gym_B1F_Text_AnnikaIntro: @ 8226388
+SootopolisCity_Gym_B1F_Text_AnnikaIntro:
 	.string "I can battle with really rare POKéMON\n"
 	.string "if you'd like.$"
 
-SootopolisCity_Gym_B1F_Text_AnnikaDefeat: @ 82263BD
+SootopolisCity_Gym_B1F_Text_AnnikaDefeat:
 	.string "Oh, there now! Did you have a good look\n"
 	.string "at my POKéMON?$"
 
-SootopolisCity_Gym_B1F_Text_AnnikaPostBattle: @ 82263F4
+SootopolisCity_Gym_B1F_Text_AnnikaPostBattle:
 	.string "I came to this GYM because JUAN\n"
 	.string "praised me for my darling POKéMON.\p"
 	.string "Oh, if only I'd met JUAN years ago\n"
 	.string "when I was younger…$"
 
-SootopolisCity_Gym_B1F_Text_BriannaIntro: @ 822646E
+SootopolisCity_Gym_B1F_Text_BriannaIntro:
 	.string "Giggle…\n"
 	.string "Your grim look is so charming.$"
 
-SootopolisCity_Gym_B1F_Text_BriannaDefeat: @ 8226495
+SootopolisCity_Gym_B1F_Text_BriannaDefeat:
 	.string "Oh, dear.\n"
 	.string "I went much too easy on you.$"
 
-SootopolisCity_Gym_B1F_Text_BriannaPostBattle: @ 82264BC
+SootopolisCity_Gym_B1F_Text_BriannaPostBattle:
 	.string "You couldn't lay a finger on JUAN,\n"
 	.string "I'm sure. Giggle…$"
 
diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc
index 90a429c2c..1cedf7c57 100644
--- a/data/maps/SootopolisCity_House1/scripts.inc
+++ b/data/maps/SootopolisCity_House1/scripts.inc
@@ -1,7 +1,7 @@
-SootopolisCity_House1_MapScripts:: @ 822694C
+SootopolisCity_House1_MapScripts::
 	.byte 0
 
-SootopolisCity_House1_EventScript_BrickBreakBlackBelt:: @ 822694D
+SootopolisCity_House1_EventScript_BrickBreakBlackBelt::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_ReceivedBrickBreak
@@ -14,12 +14,12 @@ SootopolisCity_House1_EventScript_BrickBreakBlackBelt:: @ 822694D
 	release
 	end
 
-SootopolisCity_House1_EventScript_ReceivedBrickBreak:: @ 8226984
+SootopolisCity_House1_EventScript_ReceivedBrickBreak::
 	msgbox SootopolisCity_House1_Text_ExplainBrickBreak, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House1_EventScript_Kecleon:: @ 822698E
+SootopolisCity_House1_EventScript_Kecleon::
 	lock
 	faceplayer
 	waitse
@@ -29,16 +29,16 @@ SootopolisCity_House1_EventScript_Kecleon:: @ 822698E
 	release
 	end
 
-SootopolisCity_House1_Text_DevelopedThisTM: @ 82269A1
+SootopolisCity_House1_Text_DevelopedThisTM:
 	.string "For thirty years I've remained in\n"
 	.string "SOOTOPOLIS honing my skills.\p"
 	.string "I developed a shattering TM.\n"
 	.string "I bequeath it to you!$"
 
-SootopolisCity_House1_Text_ExplainBrickBreak: @ 8226A13
+SootopolisCity_House1_Text_ExplainBrickBreak:
 	.string "TM31 contains BRICK BREAK! It's a move\n"
 	.string "so horrible that I can't describe it.$"
 
-SootopolisCity_House1_Text_Kecleon: @ 8226A60
+SootopolisCity_House1_Text_Kecleon:
 	.string "KECLEON: Puu puhyaah.$"
 
diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc
index 31388cbb4..a9c2ed255 100644
--- a/data/maps/SootopolisCity_House2/scripts.inc
+++ b/data/maps/SootopolisCity_House2/scripts.inc
@@ -1,7 +1,7 @@
-SootopolisCity_House2_MapScripts:: @ 8226A76
+SootopolisCity_House2_MapScripts::
 	.byte 0
 
-SootopolisCity_House2_EventScript_ExpertF:: @ 8226A77
+SootopolisCity_House2_EventScript_ExpertF::
 	lock
 	faceplayer
 	msgbox SootopolisCity_House2_Text_DidYouKnowAboutMtPyreOrbs, MSGBOX_YESNO
@@ -12,25 +12,25 @@ SootopolisCity_House2_EventScript_ExpertF:: @ 8226A77
 	release
 	end
 
-SootopolisCity_House2_EventScript_KnowAboutOrbs:: @ 8226A99
+SootopolisCity_House2_EventScript_KnowAboutOrbs::
 	msgbox SootopolisCity_House2_Text_YesTwoOrbsSideBySide, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_House2_EventScript_DontKnowAboutOrbs:: @ 8226AA2
+SootopolisCity_House2_EventScript_DontKnowAboutOrbs::
 	msgbox SootopolisCity_House2_Text_OughtToVisitAndSee, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_House2_Text_DidYouKnowAboutMtPyreOrbs: @ 8226AAB
+SootopolisCity_House2_Text_DidYouKnowAboutMtPyreOrbs:
 	.string "MT. PYRE…\p"
 	.string "At its peak are two orbs placed side\n"
 	.string "by side. Did you know?$"
 
-SootopolisCity_House2_Text_YesTwoOrbsSideBySide: @ 8226AF1
+SootopolisCity_House2_Text_YesTwoOrbsSideBySide:
 	.string "Yes, two orbs side by side…\p"
 	.string "The sight of them together…\n"
 	.string "It is somehow soothing…$"
 
-SootopolisCity_House2_Text_OughtToVisitAndSee: @ 8226B41
+SootopolisCity_House2_Text_OughtToVisitAndSee:
 	.string "Is that so?\n"
 	.string "Perhaps you ought to visit and see…$"
 
diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc
index c22a29a94..02546968b 100644
--- a/data/maps/SootopolisCity_House3/scripts.inc
+++ b/data/maps/SootopolisCity_House3/scripts.inc
@@ -1,7 +1,7 @@
-SootopolisCity_House3_MapScripts:: @ 8226B71
+SootopolisCity_House3_MapScripts::
 	.byte 0
 
-SootopolisCity_House3_EventScript_Woman:: @ 8226B72
+SootopolisCity_House3_EventScript_Woman::
 	lock
 	faceplayer
 	msgbox SootopolisCity_House3_Text_JuanHasManyFansDoYou, MSGBOX_YESNO
@@ -11,31 +11,31 @@ SootopolisCity_House3_EventScript_Woman:: @ 8226B72
 	release
 	end
 
-SootopolisCity_House3_EventScript_HaveFans:: @ 8226B91
+SootopolisCity_House3_EventScript_HaveFans::
 	msgbox SootopolisCity_House3_Text_YouMustBePrettyStrong, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House3_EventScript_Girl:: @ 8226B9B
+SootopolisCity_House3_EventScript_Girl::
 	msgbox SootopolisCity_House3_Text_TrainerFanClubWasWild, MSGBOX_NPC
 	end
 
-SootopolisCity_House3_Text_JuanHasManyFansDoYou: @ 8226BA4
+SootopolisCity_House3_Text_JuanHasManyFansDoYou:
 	.string "You're a POKéMON TRAINER, aren't you?\p"
 	.string "SOOTOPOLIS's JUAN has many fans.\n"
 	.string "Even more than his student WALLACE!\p"
 	.string "Do you have any?$"
 
-SootopolisCity_House3_Text_YouMustBePrettyStrong: @ 8226C20
+SootopolisCity_House3_Text_YouMustBePrettyStrong:
 	.string "Oh, then you must be pretty strong.$"
 
-SootopolisCity_House3_Text_LonesomeTryWorkingHarder: @ 8226C44
+SootopolisCity_House3_Text_LonesomeTryWorkingHarder:
 	.string "Oh, dear…\n"
 	.string "That's a little lonesome.\p"
 	.string "Try working a little harder to get\n"
 	.string "a fan following.$"
 
-SootopolisCity_House3_Text_TrainerFanClubWasWild: @ 8226C9C
+SootopolisCity_House3_Text_TrainerFanClubWasWild:
 	.string "Dedicated fans come over from even\n"
 	.string "outside of HOENN.\p"
 	.string "It was really wild when I went to the\n"
diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc
index 861da06d2..a1102bdd9 100644
--- a/data/maps/SootopolisCity_House4/scripts.inc
+++ b/data/maps/SootopolisCity_House4/scripts.inc
@@ -1,15 +1,15 @@
-SootopolisCity_House4_MapScripts:: @ 8226D15
+SootopolisCity_House4_MapScripts::
 	.byte 0
 
-SootopolisCity_House4_EventScript_Man:: @ 8226D16
+SootopolisCity_House4_EventScript_Man::
 	msgbox SootopolisCity_House4_Text_AncientTreasuresWaitingInSea, MSGBOX_NPC
 	end
 
-SootopolisCity_House4_EventScript_Woman:: @ 8226D1F
+SootopolisCity_House4_EventScript_Woman::
 	msgbox SootopolisCity_House4_Text_StrollUnderwaterWithPokemon, MSGBOX_NPC
 	end
 
-SootopolisCity_House4_EventScript_Azumarill:: @ 8226D28
+SootopolisCity_House4_EventScript_Azumarill::
 	lock
 	faceplayer
 	waitse
@@ -19,7 +19,7 @@ SootopolisCity_House4_EventScript_Azumarill:: @ 8226D28
 	release
 	end
 
-SootopolisCity_House4_Text_AncientTreasuresWaitingInSea: @ 8226D3B
+SootopolisCity_House4_Text_AncientTreasuresWaitingInSea:
 	.string "Listen up, and I'll tell you something\n"
 	.string "good.\p"
 	.string "There's supposed to be an ancient\n"
@@ -27,13 +27,13 @@ SootopolisCity_House4_Text_AncientTreasuresWaitingInSea: @ 8226D3B
 	.string "There could be treasures just waiting\n"
 	.string "to be discovered down there.$"
 
-SootopolisCity_House4_Text_StrollUnderwaterWithPokemon: @ 8226DEA
+SootopolisCity_House4_Text_StrollUnderwaterWithPokemon:
 	.string "Ancient treasures…\p"
 	.string "It would be nice if they existed, but\n"
 	.string "even if they didn't, it would be so\l"
 	.string "beautiful to take an underwater\l"
 	.string "stroll with my POKéMON.$"
 
-SootopolisCity_House4_Text_Azumarill: @ 8226E7F
+SootopolisCity_House4_Text_Azumarill:
 	.string "AZUMARILL: Marurii.$"
 
diff --git a/data/maps/SootopolisCity_House5/scripts.inc b/data/maps/SootopolisCity_House5/scripts.inc
index 027a35bcf..853fc1a1b 100644
--- a/data/maps/SootopolisCity_House5/scripts.inc
+++ b/data/maps/SootopolisCity_House5/scripts.inc
@@ -1,20 +1,20 @@
-SootopolisCity_House5_MapScripts:: @ 8226E93
+SootopolisCity_House5_MapScripts::
 	.byte 0
 
-SootopolisCity_House5_EventScript_Maniac:: @ 8226E94
+SootopolisCity_House5_EventScript_Maniac::
 	msgbox SootopolisCity_House5_Text_SootopolisMtPyreConnection, MSGBOX_NPC
 	end
 
-SootopolisCity_House5_EventScript_Girl:: @ 8226E9D
+SootopolisCity_House5_EventScript_Girl::
 	msgbox SootopolisCity_House5_Text_BrotherUsedToStudySea, MSGBOX_NPC
 	end
 
-SootopolisCity_House5_Text_SootopolisMtPyreConnection: @ 8226EA6
+SootopolisCity_House5_Text_SootopolisMtPyreConnection:
 	.string "There appears to be some connection\n"
 	.string "between SOOTOPOLIS and MT. PYRE.\p"
 	.string "My friends and I did some research on\n"
 	.string "it at the lab where I used to work.$"
 
-SootopolisCity_House5_Text_BrotherUsedToStudySea: @ 8226F35
+SootopolisCity_House5_Text_BrotherUsedToStudySea:
 	.string "My big brother used to study the sea.$"
 
diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc
index d62273864..be2dad11f 100644
--- a/data/maps/SootopolisCity_House6/scripts.inc
+++ b/data/maps/SootopolisCity_House6/scripts.inc
@@ -1,7 +1,7 @@
-SootopolisCity_House6_MapScripts:: @ 8226F5B
+SootopolisCity_House6_MapScripts::
 	.byte 0
 
-SootopolisCity_House6_EventScript_Woman:: @ 8226F5C
+SootopolisCity_House6_EventScript_Woman::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_ReceivedWailmerDoll
@@ -16,40 +16,40 @@ SootopolisCity_House6_EventScript_Woman:: @ 8226F5C
 	release
 	end
 
-SootopolisCity_House6_EventScript_DeclineWailmerDoll:: @ 8226F99
+SootopolisCity_House6_EventScript_DeclineWailmerDoll::
 	msgbox SootopolisCity_House6_Text_DontWantThisDoll, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House6_EventScript_ReceivedWailmerDoll:: @ 8226FA3
+SootopolisCity_House6_EventScript_ReceivedWailmerDoll::
 	msgbox SootopolisCity_House6_Text_LovePlushDolls, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House6_EventScript_NoRoomForWailmerDoll:: @ 8226FAD
+SootopolisCity_House6_EventScript_NoRoomForWailmerDoll::
 	bufferdecorationname 1, DECOR_WAILMER_DOLL
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	msgbox SootopolisCity_House6_Text_IllHoldItForYou, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House6_Text_FirstGuestInWhileTakeDoll: @ 8226FC3
+SootopolisCity_House6_Text_FirstGuestInWhileTakeDoll:
 	.string "Hello! You're our first guest in\n"
 	.string "a good while.\p"
 	.string "You've brightened up my day, so I'll\n"
 	.string "give you a big WAILMER DOLL.$"
 
-SootopolisCity_House6_Text_TakeGoodCareOfIt: @ 8227034
+SootopolisCity_House6_Text_TakeGoodCareOfIt:
 	.string "Take good care of it!$"
 
-SootopolisCity_House6_Text_IllHoldItForYou: @ 822704A
+SootopolisCity_House6_Text_IllHoldItForYou:
 	.string "Oh, you want it, but not right now?\n"
 	.string "Okay, then I'll hold it for you.$"
 
-SootopolisCity_House6_Text_DontWantThisDoll: @ 822708F
+SootopolisCity_House6_Text_DontWantThisDoll:
 	.string "Are you sure?\n"
 	.string "You don't want this DOLL?$"
 
-SootopolisCity_House6_Text_LovePlushDolls: @ 82270B7
+SootopolisCity_House6_Text_LovePlushDolls:
 	.string "I love plush DOLLS!$"
 
diff --git a/data/maps/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc
index b7b11208e..dd6081f24 100644
--- a/data/maps/SootopolisCity_House7/scripts.inc
+++ b/data/maps/SootopolisCity_House7/scripts.inc
@@ -1,15 +1,15 @@
-SootopolisCity_House7_MapScripts:: @ 82270CB
+SootopolisCity_House7_MapScripts::
 	.byte 0
 
-SootopolisCity_House7_EventScript_OldMan:: @ 82270CC
+SootopolisCity_House7_EventScript_OldMan::
 	msgbox SootopolisCity_House7_Text_CityFromEruptedVolcano, MSGBOX_NPC
 	end
 
-SootopolisCity_House7_EventScript_PokefanF:: @ 82270D5
+SootopolisCity_House7_EventScript_PokefanF::
 	msgbox SootopolisCity_House7_Text_CaveMadeToKeepSomething, MSGBOX_NPC
 	end
 
-SootopolisCity_House7_Text_CityFromEruptedVolcano: @ 82270DE
+SootopolisCity_House7_Text_CityFromEruptedVolcano:
 	.string "An underwater volcano erupted and\n"
 	.string "forced itself up from the depths.\p"
 	.string "Its crater emerged from the sea and\n"
@@ -17,7 +17,7 @@ SootopolisCity_House7_Text_CityFromEruptedVolcano: @ 82270DE
 	.string "That's how SOOTOPOLIS CITY came into\n"
 	.string "being.$"
 
-SootopolisCity_House7_Text_CaveMadeToKeepSomething: @ 8227190
+SootopolisCity_House7_Text_CaveMadeToKeepSomething:
 	.string "The cave that links SOOTOPOLIS and\n"
 	.string "the outside world…\p"
 	.string "It seems as if the cave was made to\n"
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
index 1951a33d5..ab087696e 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
@@ -1,7 +1,7 @@
-SootopolisCity_LotadAndSeedotHouse_MapScripts:: @ 822722A
+SootopolisCity_LotadAndSeedotHouse_MapScripts::
 	.byte 0
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotBrother:: @ 822722B
+SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotBrother::
 	special GetSeedotSizeRecordInfo
 	lock
 	faceplayer
@@ -21,22 +21,22 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotBrother:: @ 822722B
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowSeedot:: @ 8227272
+SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowSeedot::
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigSeedot, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_NotSeedot:: @ 822727C
+SootopolisCity_LotadAndSeedotHouse_EventScript_NotSeedot::
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotSeedot, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot:: @ 8227286
+SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot::
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerSeedot, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot:: @ 8227290
+SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot::
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad, MSGBOX_DEFAULT
 	giveitem ITEM_ELIXIR
 	compare VAR_RESULT, FALSE
@@ -45,12 +45,12 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot:: @ 8227290
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir1:: @ 82272B2
+SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir1::
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull1, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_LotadBrother:: @ 82272BC
+SootopolisCity_LotadAndSeedotHouse_EventScript_LotadBrother::
 	special GetLotadSizeRecordInfo
 	lock
 	faceplayer
@@ -70,22 +70,22 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_LotadBrother:: @ 82272BC
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowLotad:: @ 8227303
+SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowLotad::
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigLotad, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_NotLotad:: @ 822730D
+SootopolisCity_LotadAndSeedotHouse_EventScript_NotLotad::
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotLotad, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad:: @ 8227317
+SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad::
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerLotad, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad:: @ 8227321
+SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad::
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot, MSGBOX_DEFAULT
 	giveitem ITEM_ELIXIR
 	compare VAR_RESULT, FALSE
@@ -94,26 +94,26 @@ SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad:: @ 8227321
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir2:: @ 8227343
+SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir2::
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull2, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotSizeRecord:: @ 822734D
+SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotSizeRecord::
 	special GetSeedotSizeRecordInfo
 	lockall
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BiggestSeedotInHistory, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_LotadSizeRecord:: @ 822735B
+SootopolisCity_LotadAndSeedotHouse_EventScript_LotadSizeRecord::
 	special GetLotadSizeRecordInfo
 	lockall
 	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BiggestLotadInHistory, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigSeedot: @ 8227369
+SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigSeedot:
 	.string "Do you know the POKéMON SEEDOT?\n"
 	.string "It's hardly ever seen in SOOTOPOLIS.\p"
 	.string "Anyway, I love big SEEDOT.\n"
@@ -125,7 +125,7 @@ SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigSeedot: @ 8227369
 	.string "Huh? Do you have a SEEDOT with you?\n"
 	.string "P-p-please, show me!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad: @ 8227480
+SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad:
 	.string "{STR_VAR_2} inches!\n"
 	.string "Oh, my gosh, this is a big one!\p"
 	.string "It might even beat the big LOTAD\n"
@@ -134,35 +134,35 @@ SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad: @ 8227480
 	.string "This is my thanks!$"
 
 @ Unused
-SootopolisCity_LotadAndSeedotHouse_Text_ReceivedPotion1: @ 822750E
+SootopolisCity_LotadAndSeedotHouse_Text_ReceivedPotion1:
 	.string "{PLAYER} received a POTION.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull1: @ 8227524
+SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull1:
 	.string "Hunh?\n"
 	.string "Your BAG is crammed full.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerSeedot: @ 8227544
+SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerSeedot:
 	.string "{STR_VAR_2} inches, is it?\p"
 	.string "Hmm… I've seen a bigger SEEDOT\n"
 	.string "than this one.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotSeedot: @ 8227584
+SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotSeedot:
 	.string "Oh, now this is quite something…\n"
 	.string "But it's not a SEEDOT!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigSeedot: @ 82275BC
+SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigSeedot:
 	.string "You don't have a big SEEDOT?\n"
 	.string "That's too bad…\p"
 	.string "If you get a big SEEDOT, please\n"
 	.string "come show me.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_BiggestSeedotInHistory: @ 8227617
+SootopolisCity_LotadAndSeedotHouse_Text_BiggestSeedotInHistory:
 	.string "The biggest SEEDOT in history!\n"
 	.string "{STR_VAR_2}'s {STR_VAR_3}-inch giant!\p"
 	.string "A SEEDOT bigger than a LOTAD\n"
 	.string "always wanted!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigLotad: @ 8227676
+SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigLotad:
 	.string "Do you know the POKéMON LOTAD?\n"
 	.string "It's rarely seen in SOOTOPOLIS.\p"
 	.string "I love, I mean love, big LOTAD!\p"
@@ -173,7 +173,7 @@ SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigLotad: @ 8227676
 	.string "Hunh? Do you have a LOTAD?\n"
 	.string "P-p-please show me!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot: @ 822776C
+SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot:
 	.string "{STR_VAR_2} inches!\n"
 	.string "Wow, that is big!\p"
 	.string "It might be even bigger than the huge\n"
@@ -182,29 +182,29 @@ SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot: @ 822776C
 	.string "This is my thanks!$"
 
 @ Unused
-SootopolisCity_LotadAndSeedotHouse_Text_ReceivedPotion2: @ 82277F4
+SootopolisCity_LotadAndSeedotHouse_Text_ReceivedPotion2:
 	.string "{PLAYER} received a POTION.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull2: @ 822780A
+SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull2:
 	.string "Hunh?\n"
 	.string "Your BAG is crammed full.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerLotad: @ 822782A
+SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerLotad:
 	.string "{STR_VAR_2} inches?\p"
 	.string "Hmm… I've seen a bigger LOTAD\n"
 	.string "than this one here.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotLotad: @ 8227867
+SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotLotad:
 	.string "Well, isn't this something!\n"
 	.string "But it's no LOTAD!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigLotad: @ 8227896
+SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigLotad:
 	.string "Don't you have a big LOTAD?\n"
 	.string "How disappointing…\p"
 	.string "If you get a big LOTAD, please\n"
 	.string "come show me!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_BiggestLotadInHistory: @ 82278F2
+SootopolisCity_LotadAndSeedotHouse_Text_BiggestLotadInHistory:
 	.string "The biggest LOTAD in history!\n"
 	.string "{STR_VAR_2}'s {STR_VAR_3}-inch colossus!\p"
 	.string "A LOTAD bigger than a SEEDOT\n"
diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc
index f7856916c..0975abd2b 100644
--- a/data/maps/SootopolisCity_Mart/scripts.inc
+++ b/data/maps/SootopolisCity_Mart/scripts.inc
@@ -1,7 +1,7 @@
-SootopolisCity_Mart_MapScripts:: @ 8226794
+SootopolisCity_Mart_MapScripts::
 	.byte 0
 
-SootopolisCity_Mart_EventScript_Clerk:: @ 8226795
+SootopolisCity_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -11,7 +11,8 @@ SootopolisCity_Mart_EventScript_Clerk:: @ 8226795
 	release
 	end
 
-SootopolisCity_Mart_Pokemart: @ 82267AC
+	.align 2
+SootopolisCity_Mart_Pokemart:
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
@@ -25,7 +26,7 @@ SootopolisCity_Mart_Pokemart: @ 82267AC
 	release
 	end
 
-SootopolisCity_Mart_EventScript_FatMan:: @ 82267C2
+SootopolisCity_Mart_EventScript_FatMan::
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
@@ -35,12 +36,12 @@ SootopolisCity_Mart_EventScript_FatMan:: @ 82267C2
 	release
 	end
 
-SootopolisCity_Mart_EventScript_FatManNoLegendaries:: @ 82267E2
+SootopolisCity_Mart_EventScript_FatManNoLegendaries::
 	msgbox SootopolisCity_Mart_Text_PPUpIsGreat, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_EventScript_Gentleman:: @ 82267EC
+SootopolisCity_Mart_EventScript_Gentleman::
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
@@ -50,29 +51,29 @@ SootopolisCity_Mart_EventScript_Gentleman:: @ 82267EC
 	release
 	end
 
-SootopolisCity_Mart_EventScript_GentlemanNoLegendaries:: @ 822680C
+SootopolisCity_Mart_EventScript_GentlemanNoLegendaries::
 	msgbox SootopolisCity_Mart_Text_FullRestoreItemOfDreams, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Mart_Text_PPUpIsGreat: @ 8226816
+SootopolisCity_Mart_Text_PPUpIsGreat:
 	.string "PP UP is great!\p"
 	.string "It raises the POWER POINTS, the PP,\n"
 	.string "of a POKéMON move.$"
 
-SootopolisCity_Mart_Text_TooScaryOutside: @ 822685D
+SootopolisCity_Mart_Text_TooScaryOutside:
 	.string "What…\n"
 	.string "What is happening?\p"
 	.string "I really want to know, but it's too\n"
 	.string "scary to go outside.$"
 
-SootopolisCity_Mart_Text_FullRestoreItemOfDreams: @ 82268AF
+SootopolisCity_Mart_Text_FullRestoreItemOfDreams:
 	.string "Do you know FULL RESTORE?\p"
 	.string "Full restoration of HP!\n"
 	.string "Eradication of all status problems!\p"
 	.string "It's truly an item of your dreams!$"
 
-SootopolisCity_Mart_Text_DidSomethingAwaken: @ 8226928
+SootopolisCity_Mart_Text_DidSomethingAwaken:
 	.string "This weather…\n"
 	.string "Did something awaken?$"
 
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index 30a755a0f..6b1bc0eb5 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -1,11 +1,11 @@
 .set LOCALID_OLD_MAN, 1
 
-SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953
+SootopolisCity_MysteryEventsHouse_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_OnFrame
 	.byte 0
 
-SootopolisCity_MysteryEventsHouse_1F_OnTransition: @ 822795E
+SootopolisCity_MysteryEventsHouse_1F_OnTransition:
 	frontier_checkvisittrainer
 	compare VAR_RESULT, 0
 	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_SetTrainerVisitingLayout
@@ -13,25 +13,25 @@ SootopolisCity_MysteryEventsHouse_1F_OnTransition: @ 822795E
 	call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_MoveOldManToDoor
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_SetTrainerVisitingLayout:: @ 822797D
+SootopolisCity_MysteryEventsHouse_1F_EventScript_SetTrainerVisitingLayout::
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm LOCALID_OLD_MAN, 3, 2
 	setobjectmovementtype LOCALID_OLD_MAN, MOVEMENT_TYPE_FACE_DOWN
 	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_MoveOldManToDoor:: @ 8227991
+SootopolisCity_MysteryEventsHouse_1F_EventScript_MoveOldManToDoor::
 	setobjectxyperm LOCALID_OLD_MAN, 2, 2
 	setobjectmovementtype LOCALID_OLD_MAN, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_OnFrame: @ 822799D
+SootopolisCity_MysteryEventsHouse_1F_OnFrame:
 	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle
 	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle
 	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle
 	.2byte 0
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle:: @ 82279B7
+SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs
 	waitmovement 0
@@ -51,28 +51,28 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle:: @ 82279
 	releaseall
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleWonComment:: @ 8227A04
+SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleWonComment::
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_ThatWasSuperlative, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleLostComment:: @ 8227A0D
+SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleLostComment::
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_TooBadForYou, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleTiedComment:: @ 8227A16
+SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleTiedComment::
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_BrilliantStandoff, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs: @ 8227A1F
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs:
 	walk_down
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer: @ 8227A21
+SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer:
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_OldMan:: @ 8227A24
+SootopolisCity_MysteryEventsHouse_1F_EventScript_OldMan::
 	lock
 	faceplayer
 	frontier_checkvisittrainer
@@ -84,12 +84,12 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_OldMan:: @ 8227A24
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_InvalidVisitingTrainer:: @ 8227A4E
+SootopolisCity_MysteryEventsHouse_1F_EventScript_InvalidVisitingTrainer::
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_OnlyAmusementWatchingBattles, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_TrainerVisiting:: @ 8227A58
+SootopolisCity_MysteryEventsHouse_1F_EventScript_TrainerVisiting::
 	special SavePlayerParty
 	special BufferEReaderTrainerName
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_ChallengeVisitingTrainer, MSGBOX_YESNO
@@ -120,124 +120,124 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_TrainerVisiting:: @ 8227A58
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle:: @ 8227AE2
+SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle::
 	special LoadPlayerParty
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_YouWontBattle, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty:: @ 8227AEF
+SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty::
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3, MSGBOX_DEFAULT
 	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementNorth:: @ 8227AFE
+SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementNorth::
 	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth
 	waitmovement 0
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementEast:: @ 8227B10
+SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementEast::
 	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideRight
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast
 	waitmovement 0
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementWest:: @ 8227B22
+SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementWest::
 	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest
 	waitmovement 0
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth: @ 8227B34
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth:
 	delay_16
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast: @ 8227B38
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast:
 	delay_16
 	walk_right
 	walk_up
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest: @ 8227B3C
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest:
 	delay_16
 	walk_left
 	walk_up
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft: @ 8227B40
+SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft:
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideRight: @ 8227B43
+SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideRight:
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Text_OnlyAmusementWatchingBattles: @ 8227B46
+SootopolisCity_MysteryEventsHouse_1F_Text_OnlyAmusementWatchingBattles:
 	.string "When I was young, I traveled the world\n"
 	.string "as a POKéMON TRAINER.\p"
 	.string "Now that I've become an old buzzard,\n"
 	.string "my only amusement is watching young\l"
 	.string "TRAINERS battle.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_DoorAppearsToBeLocked: @ 8227BDD
+SootopolisCity_MysteryEventsHouse_1F_Text_DoorAppearsToBeLocked:
 	.string "The door appears to be locked.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_ChallengeVisitingTrainer: @ 8227BFC
+SootopolisCity_MysteryEventsHouse_1F_Text_ChallengeVisitingTrainer:
 	.string "A TRAINER named {STR_VAR_1}\n"
 	.string "is visiting my home.\p"
 	.string "Would you like to challenge\n"
 	.string "{STR_VAR_1}?$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_YouWontBattle: @ 8227C44
+SootopolisCity_MysteryEventsHouse_1F_Text_YouWontBattle:
 	.string "You won't battle? I'm disappointed\n"
 	.string "that I can't see you battle…$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3: @ 8227C84
+SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3:
 	.string "Oh, good, good!\p"
 	.string "But my house isn't all that sturdy.\p"
 	.string "Could I ask you to keep it down to\n"
 	.string "a 3-on-3 match?$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_SaveProgressBeforeBattle: @ 8227CEB
+SootopolisCity_MysteryEventsHouse_1F_Text_SaveProgressBeforeBattle:
 	.string "Before you two battle, you should\n"
 	.string "save your progress.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_HopeToSeeGoodMatch: @ 8227D21
+SootopolisCity_MysteryEventsHouse_1F_Text_HopeToSeeGoodMatch:
 	.string "I hope to see a good match!$"
 
 @ Unused
-SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Tie: @ 8227D3D
+SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Tie:
 	.string "{STR_VAR_1}$"
 
-SootopolisCity_MysteryEventsHouse_B1F_Text_MatchEndedUpDraw: @ 8227D40
+SootopolisCity_MysteryEventsHouse_B1F_Text_MatchEndedUpDraw:
 	.string "The match ended up a draw.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_BrilliantStandoff: @ 8227D5B
+SootopolisCity_MysteryEventsHouse_1F_Text_BrilliantStandoff:
 	.string "So, it became a standoff.\p"
 	.string "It was a brilliant match in which\n"
 	.string "neither side conceded a step!$"
 
 @ Unused
-SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Won: @ 8227DB5
+SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Won:
 	.string "{STR_VAR_1}$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_ThatWasSuperlative: @ 8227DB8
+SootopolisCity_MysteryEventsHouse_1F_Text_ThatWasSuperlative:
 	.string "That was superlative!\p"
 	.string "Why, it was like seeing myself in\n"
 	.string "my youth again!$"
 
 @ Unused
-SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Lost: @ 8227E00
+SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Lost:
 	.string "{STR_VAR_1}$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_TooBadForYou: @ 8227E03
+SootopolisCity_MysteryEventsHouse_1F_Text_TooBadForYou:
 	.string "Ah, too bad for you!\p"
 	.string "But it was a good match.\n"
 	.string "I hope you can win next time.$"
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
index 992cef5a3..f0ebbf516 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
@@ -1,17 +1,17 @@
-SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F
+SootopolisCity_MysteryEventsHouse_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_OnFrame
 	.byte 0
 
-SootopolisCity_MysteryEventsHouse_B1F_OnTransition: @ 8227E5A
+SootopolisCity_MysteryEventsHouse_B1F_OnTransition:
 	special SetEReaderTrainerGfxId
 	end
 
-SootopolisCity_MysteryEventsHouse_B1F_OnFrame: @ 8227E5E
+SootopolisCity_MysteryEventsHouse_B1F_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer
 	.2byte 0
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: @ 8227E68
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement
 	waitmovement 0
@@ -39,26 +39,26 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: @ 8227
 	releaseall
 	end
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleTie:: @ 8227ECF
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleTie::
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3
 	msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_MatchEndedUpDraw, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleWon:: @ 8227EDD
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleWon::
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
 	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleLost:: @ 8227EE8
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleLost::
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2
 	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
 
-SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement: @ 8227EF3
+SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement:
 	walk_down
 	walk_down
 	walk_down
@@ -66,7 +66,7 @@ SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement: @ 8227EF3
 	walk_right
 	step_end
 
-SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement: @ 8227EF9
+SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement:
 	walk_left
 	walk_left
 	walk_up
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index 712fd166b..9e017861b 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_NURSE, 1
 
-SootopolisCity_PokemonCenter_1F_MapScripts:: @ 82264F1
+SootopolisCity_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-SootopolisCity_PokemonCenter_1F_OnTransition: @ 82264FC
+SootopolisCity_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_Nurse:: @ 8226500
+SootopolisCity_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -17,7 +17,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_Nurse:: @ 8226500
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_Gentleman:: @ 822650E
+SootopolisCity_PokemonCenter_1F_EventScript_Gentleman::
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
@@ -27,12 +27,12 @@ SootopolisCity_PokemonCenter_1F_EventScript_Gentleman:: @ 822650E
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries:: @ 822652E
+SootopolisCity_PokemonCenter_1F_EventScript_GentlemanNoLegendaries::
 	msgbox SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_Woman:: @ 8226538
+SootopolisCity_PokemonCenter_1F_EventScript_Woman::
 	lock
 	faceplayer
 	compare VAR_SKY_PILLAR_STATE, 2
@@ -42,12 +42,12 @@ SootopolisCity_PokemonCenter_1F_EventScript_Woman:: @ 8226538
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries:: @ 8226558
+SootopolisCity_PokemonCenter_1F_EventScript_WomanNoLegendaries::
 	msgbox SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn: @ 8226562
+SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn:
 	.string "WALLACE is rumored to be the toughest\n"
 	.string "TRAINER in the whole HOENN region.\p"
 	.string "This town's GYM is led by the TRAINER\n"
@@ -56,19 +56,19 @@ SootopolisCity_PokemonCenter_1F_Text_WallaceToughestInHoenn: @ 8226562
 	.string "even stronger than WALLACE's mentor.\p"
 	.string "How strong could they be?$"
 
-SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge: @ 822664B
+SootopolisCity_PokemonCenter_1F_Text_EveryoneTakenRefuge:
 	.string "Everyone in town has taken refuge\n"
 	.string "and won't come out of their homes.\p"
 	.string "Even I would rather not venture\n"
 	.string "outside.$"
 
-SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon: @ 82266B9
+SootopolisCity_PokemonCenter_1F_Text_AlwaysBeFriendsWithPokemon:
 	.string "Whenever, wherever, and whatever\n"
 	.string "happens, I will always be friends with\l"
 	.string "POKéMON.\p"
 	.string "Because it's fun to be with POKéMON!$"
 
-SootopolisCity_PokemonCenter_1F_Text_ArentPokemonOurFriends: @ 822672F
+SootopolisCity_PokemonCenter_1F_Text_ArentPokemonOurFriends:
 	.string "Aren't POKéMON our friends?\p"
 	.string "Why are they going wild this way?$"
 
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
index 57d21cbb5..fb88a863c 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D
+SootopolisCity_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ SootopolisCity_PokemonCenter_2F_MapScripts:: @ 822676D
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-SootopolisCity_PokemonCenter_2F_EventScript_Colosseum:: @ 8226782
+SootopolisCity_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-SootopolisCity_PokemonCenter_2F_EventScript_TradeCenter:: @ 8226788
+SootopolisCity_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-SootopolisCity_PokemonCenter_2F_EventScript_RecordCorner:: @ 822678E
+SootopolisCity_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc
index 1ba417120..3769f164c 100644
--- a/data/maps/SouthernIsland_Exterior/scripts.inc
+++ b/data/maps/SouthernIsland_Exterior/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_SAILOR, 1
 .set LOCALID_SS_TIDAL, 2
 
-SouthernIsland_Exterior_MapScripts:: @ 82429C8
+SouthernIsland_Exterior_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Exterior_OnTransition
 	.byte 0
 
-SouthernIsland_Exterior_OnTransition: @ 82429CE
+SouthernIsland_Exterior_OnTransition:
 	setflag FLAG_LANDMARK_SOUTHERN_ISLAND
 	end
 
-SouthernIsland_Exterior_EventScript_Sailor:: @ 82429D2
+SouthernIsland_Exterior_EventScript_Sailor::
 	lock
 	faceplayer
 	msgbox EventTicket_Text_SouthernIslandSailBack, MSGBOX_YESNO
@@ -28,31 +28,31 @@ SouthernIsland_Exterior_EventScript_Sailor:: @ 82429D2
 	release
 	end
 
-SouthernIsland_Exterior_EventScript_AsYouLike:: @ 8242A17
+SouthernIsland_Exterior_EventScript_AsYouLike::
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end
 
-Ferry_EventScript_DepartIslandSouth:: @ 8242A21
+Ferry_EventScript_DepartIslandSouth::
 	applymovement OBJ_EVENT_ID_PLAYER, Ferry_EventScript_DepartIslandBoardSouth
 	waitmovement 0
 	return
 
-Ferry_EventScript_DepartIslandWest:: @ 8242A2C
+Ferry_EventScript_DepartIslandWest::
 	applymovement OBJ_EVENT_ID_PLAYER, Ferry_EventScript_DepartIslandBoardWest
 	waitmovement 0
 	return
 
-Ferry_EventScript_DepartIslandBoardSouth: @ 8242A37
+Ferry_EventScript_DepartIslandBoardSouth:
 	walk_down
 	step_end
 
-Ferry_EventScript_DepartIslandBoardWest: @ 8242A39
+Ferry_EventScript_DepartIslandBoardWest:
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-SouthernIsland_Exterior_EventScript_Sign:: @ 8242A3C
+SouthernIsland_Exterior_EventScript_Sign::
 	msgbox SouthernIsland_Exterior_Text_Sign, MSGBOX_SIGN
 	end
 
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
index 2c2e6e00d..20ed1e58d 100644
--- a/data/maps/SouthernIsland_Interior/scripts.inc
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -1,22 +1,22 @@
 .set LOCALID_LATI, 2
 
-SouthernIsland_Interior_MapScripts:: @ 8242A45
+SouthernIsland_Interior_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, SouthernIsland_Interior_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, SouthernIsland_Interior_OnTransition
 	.byte 0
 
-SouthernIsland_Interior_OnResume: @ 8242A50
+SouthernIsland_Interior_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_TryRemoveLati
 	end
 
-SouthernIsland_Interior_EventScript_TryRemoveLati:: @ 8242A5A
+SouthernIsland_Interior_EventScript_TryRemoveLati::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject LOCALID_LATI
 	return
 
-SouthernIsland_Interior_OnTransition: @ 8242A6E
+SouthernIsland_Interior_OnTransition:
 	compare VAR_ROAMER_POKEMON, 0
 	call_if_eq SouthernIsland_Interior_EventScript_SetUpLatios
 	compare VAR_ROAMER_POKEMON, 0
@@ -24,17 +24,17 @@ SouthernIsland_Interior_OnTransition: @ 8242A6E
 	call SouthernIsland_Interior_EventScript_SetUpPlayerGfx
 	end
 
-SouthernIsland_Interior_EventScript_SetUpLatios:: @ 8242A8A
+SouthernIsland_Interior_EventScript_SetUpLatios::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIOS
 	setvar VAR_TEMP_4, SPECIES_LATIOS
 	return
 
-SouthernIsland_Interior_EventScript_SetUpLatias:: @ 8242A95
+SouthernIsland_Interior_EventScript_SetUpLatias::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LATIAS
 	setvar VAR_TEMP_4, SPECIES_LATIAS
 	return
 
-SouthernIsland_Interior_EventScript_SetUpPlayerGfx:: @ 8242AA0
+SouthernIsland_Interior_EventScript_SetUpPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq SouthernIsland_Interior_EventScript_SetBrendanGfx
@@ -42,21 +42,21 @@ SouthernIsland_Interior_EventScript_SetUpPlayerGfx:: @ 8242AA0
 	goto_if_eq SouthernIsland_Interior_EventScript_SetMayGfx
 	end
 
-SouthernIsland_Interior_EventScript_SetBrendanGfx:: @ 8242AB8
+SouthernIsland_Interior_EventScript_SetBrendanGfx::
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-SouthernIsland_Interior_EventScript_SetMayGfx:: @ 8242ABE
+SouthernIsland_Interior_EventScript_SetMayGfx::
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-SouthernIsland_Interior_EventScript_TryLatiEncounter:: @ 8242AC4
+SouthernIsland_Interior_EventScript_TryLatiEncounter::
 	lockall
 	setvar VAR_0x8008, 12
 	goto SouthernIsland_Interior_EventScript_Lati
 	end
 
-SouthernIsland_Interior_EventScript_Lati:: @ 8242AD0
+SouthernIsland_Interior_EventScript_Lati::
 	goto_if_set FLAG_TEMP_2, SouthernIsland_Interior_EventScript_Sign
 	goto_if_set FLAG_DEFEATED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_Sign
 	goto_if_set FLAG_CAUGHT_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_Sign
@@ -98,43 +98,43 @@ SouthernIsland_Interior_EventScript_Lati:: @ 8242AD0
 	releaseall
 	end
 
-SouthernIsland_Interior_EventScript_LatiDefeated:: @ 8242B81
+SouthernIsland_Interior_EventScript_LatiDefeated::
 	setflag FLAG_DEFEATED_LATIAS_OR_LATIOS
 	copyvar VAR_0x8004, VAR_TEMP_4
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-SouthernIsland_Interior_EventScript_RanFromLati:: @ 8242B8F
+SouthernIsland_Interior_EventScript_RanFromLati::
 	copyvar VAR_0x8004, VAR_TEMP_4
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-SouthernIsland_Interior_EventScript_Sign:: @ 8242B9A
+SouthernIsland_Interior_EventScript_Sign::
 	msgbox SouthernIsland_Interior_Text_Sign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SouthernIsland_Interior_EventScript_SetLatiosBattleVars:: @ 8242BA4
+SouthernIsland_Interior_EventScript_SetLatiosBattleVars::
 	setvar VAR_0x8004, SPECIES_LATIOS
 	setvar VAR_0x8005, 50 @ level
 	setvar VAR_0x8006, ITEM_SOUL_DEW
 	special CreateEventLegalEnemyMon
 	return
 
-SouthernIsland_Interior_EventScript_SetLatiasBattleVars:: @ 8242BB7
+SouthernIsland_Interior_EventScript_SetLatiasBattleVars::
 	setvar VAR_0x8004, SPECIES_LATIAS
 	setvar VAR_0x8005, 50 @ level
 	setvar VAR_0x8006, ITEM_SOUL_DEW
 	special CreateEventLegalEnemyMon
 	return
 
-SouthernIsland_Interior_Movement_CameraPanUp: @ 8242BCA
+SouthernIsland_Interior_Movement_CameraPanUp:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SouthernIsland_Interior_Movement_CameraPanDown: @ 8242BCE
+SouthernIsland_Interior_Movement_CameraPanDown:
 	delay_16
 	delay_16
 	delay_16
@@ -148,7 +148,7 @@ SouthernIsland_Interior_Movement_CameraPanDown: @ 8242BCE
 	walk_in_place_fastest_up
 	step_end
 
-SouthernIsland_Interior_Movement_LatiApproach: @ 8242BDA
+SouthernIsland_Interior_Movement_LatiApproach:
 	walk_down
 	walk_down
 	walk_down
diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc
index 9683ca607..2b35b3c51 100644
--- a/data/maps/TerraCave_End/scripts.inc
+++ b/data/maps/TerraCave_End/scripts.inc
@@ -1,31 +1,31 @@
 .set LOCALID_GROUDON, 1
 
-TerraCave_End_MapScripts:: @ 823B0B0
+TerraCave_End_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, TerraCave_End_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_End_OnTransition
 	.byte 0
 
-TerraCave_End_OnResume: @ 823B0BB
+TerraCave_End_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, TerraCave_End_EventScript_TryRemoveGroudon
 	end
 
-TerraCave_End_EventScript_TryRemoveGroudon:: @ 823B0C5
+TerraCave_End_EventScript_TryRemoveGroudon::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject LOCALID_GROUDON
 	return
 
-TerraCave_End_OnTransition: @ 823B0D9
+TerraCave_End_OnTransition:
 	call_if_unset FLAG_DEFEATED_GROUDON, TerraCave_End_EventScript_ShowGroudon
 	end
 
-TerraCave_End_EventScript_ShowGroudon:: @ 823B0E3
+TerraCave_End_EventScript_ShowGroudon::
 	clearflag FLAG_HIDE_TERRA_CAVE_GROUDON
 	setvar VAR_TEMP_1, 1
 	return
 
-TerraCave_End_EventScript_Groudon:: @ 823B0EC
+TerraCave_End_EventScript_Groudon::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
@@ -54,18 +54,18 @@ TerraCave_End_EventScript_Groudon:: @ 823B0EC
 	releaseall
 	end
 
-TerraCave_End_EventScript_DefeatedGroudon:: @ 823B155
+TerraCave_End_EventScript_DefeatedGroudon::
 	setvar VAR_SHOULD_END_ABNORMAL_WEATHER, 1
 	setflag FLAG_DEFEATED_GROUDON
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-TerraCave_End_EventScript_RanFromGroudon:: @ 823B163
+TerraCave_End_EventScript_RanFromGroudon::
 	setvar VAR_0x8004, SPECIES_GROUDON
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-TerraCave_End_Movement_GroudonApproach: @ 823B16E
+TerraCave_End_Movement_GroudonApproach:
 	init_affine_anim
 	walk_down_start_affine
 	delay_16
diff --git a/data/maps/TerraCave_Entrance/scripts.inc b/data/maps/TerraCave_Entrance/scripts.inc
index 70aa9cdfa..203d5fc02 100644
--- a/data/maps/TerraCave_Entrance/scripts.inc
+++ b/data/maps/TerraCave_Entrance/scripts.inc
@@ -1,8 +1,8 @@
-TerraCave_Entrance_MapScripts:: @ 823B0A6
+TerraCave_Entrance_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, TerraCave_Entrance_OnTransition
 	.byte 0
 
-TerraCave_Entrance_OnTransition: @ 823B0AC
+TerraCave_Entrance_OnTransition:
 	setflag FLAG_ARRIVED_AT_TERRA_CAVE_ENTRANCE
 	end
 
diff --git a/data/maps/TradeCenter/scripts.inc b/data/maps/TradeCenter/scripts.inc
index e0e0e7d1e..972768219 100644
--- a/data/maps/TradeCenter/scripts.inc
+++ b/data/maps/TradeCenter/scripts.inc
@@ -1,3 +1,3 @@
-TradeCenter_MapScripts:: @ 823B77E
+TradeCenter_MapScripts::
 	.byte 0
 
diff --git a/data/maps/TrainerHill_1F/scripts.inc b/data/maps/TrainerHill_1F/scripts.inc
index 59f90b8bd..6fba7a3b8 100644
--- a/data/maps/TrainerHill_1F/scripts.inc
+++ b/data/maps/TrainerHill_1F/scripts.inc
@@ -1,4 +1,4 @@
-TrainerHill_1F_MapScripts:: @ 8268F71
+TrainerHill_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
diff --git a/data/maps/TrainerHill_2F/scripts.inc b/data/maps/TrainerHill_2F/scripts.inc
index 0e8775cd5..aa5e46db5 100644
--- a/data/maps/TrainerHill_2F/scripts.inc
+++ b/data/maps/TrainerHill_2F/scripts.inc
@@ -1,4 +1,4 @@
-TrainerHill_2F_MapScripts:: @ 8268F81
+TrainerHill_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
diff --git a/data/maps/TrainerHill_3F/scripts.inc b/data/maps/TrainerHill_3F/scripts.inc
index eee6bd99d..74d9da2f3 100644
--- a/data/maps/TrainerHill_3F/scripts.inc
+++ b/data/maps/TrainerHill_3F/scripts.inc
@@ -1,4 +1,4 @@
-TrainerHill_3F_MapScripts:: @ 8268F91
+TrainerHill_3F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
diff --git a/data/maps/TrainerHill_4F/scripts.inc b/data/maps/TrainerHill_4F/scripts.inc
index 74ce0bf08..74676e3b2 100644
--- a/data/maps/TrainerHill_4F/scripts.inc
+++ b/data/maps/TrainerHill_4F/scripts.inc
@@ -1,4 +1,4 @@
-TrainerHill_4F_MapScripts:: @ 8268F9C
+TrainerHill_4F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc
index 2b3400418..f4ebc7ea9 100644
--- a/data/maps/TrainerHill_Elevator/scripts.inc
+++ b/data/maps/TrainerHill_Elevator/scripts.inc
@@ -1,17 +1,17 @@
 .set LOCALID_ATTENDANT, 1
 
-TrainerHill_Elevator_MapScripts:: @ 826934F
+TrainerHill_Elevator_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_OnFrame
 	.byte 0
 
-TrainerHill_Elevator_OnFrame: @ 8269355
+TrainerHill_Elevator_OnFrame:
 	map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_EnterElevator
 	.2byte 0
 
-TrainerHill_Elevator_EventScript_Attendant:: @ 826935F
+TrainerHill_Elevator_EventScript_Attendant::
 	end
 
-TrainerHill_Elevator_EventScript_ExitToRoof:: @ 8269360
+TrainerHill_Elevator_EventScript_ExitToRoof::
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof
 	waitmovement 0
 	releaseall
@@ -19,7 +19,7 @@ TrainerHill_Elevator_EventScript_ExitToRoof:: @ 8269360
 	waitstate
 	end
 
-TrainerHill_Elevator_EventScript_EnterElevator:: @ 8269375
+TrainerHill_Elevator_EventScript_EnterElevator::
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant
 	waitmovement 0
 	applymovement LOCALID_ATTENDANT, TrainerHill_Elevator_Movement_AttendantFacePlayer
@@ -42,50 +42,50 @@ TrainerHill_Elevator_EventScript_EnterElevator:: @ 8269375
 	end
 
 @ Unused
-TrainerHill_Elevator_EventScript_ExitFloorSelect:: @ 82693CE
+TrainerHill_Elevator_EventScript_ExitFloorSelect::
 	goto TrainerHill_Elevator_EventScript_CloseFloorSelect
 	end
 
 @ Functionally unused
-TrainerHill_Elevator_EventScript_CloseFloorSelect:: @ 82693D4
+TrainerHill_Elevator_EventScript_CloseFloorSelect::
 	special CloseDeptStoreElevatorWindow
 	releaseall
 	end
 
-TrainerHill_Elevator_EventScript_MoveElevator:: @ 82693D9
+TrainerHill_Elevator_EventScript_MoveElevator::
 	waitse
 	special MoveElevator
 	waitstate
 	return
 
-TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator: @ 82693DF
+TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator:
 	walk_up
 	walk_up
 	walk_right
 	face_down
 	step_end
 
-TrainerHill_Elevator_Movement_PlayerApproachAttendant: @ 82693E4
+TrainerHill_Elevator_Movement_PlayerApproachAttendant:
 	delay_16
 	walk_left
 	step_end
 
-TrainerHill_Elevator_Movement_PlayerExitElevator: @ 82693E7
+TrainerHill_Elevator_Movement_PlayerExitElevator:
 	delay_16
 	walk_down
 	walk_down
 	step_end
 
-TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof: @ 82693EB
+TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof:
 	face_down
 	delay_16
 	step_end
 
-TrainerHill_Elevator_Movement_AttendantFacePlayer: @ 82693EE
+TrainerHill_Elevator_Movement_AttendantFacePlayer:
 	face_right
 	step_end
 
-TrainerHill_Elevator_Movement_AttendantFaceDown: @ 82693F0
+TrainerHill_Elevator_Movement_AttendantFaceDown:
 	face_down
 	step_end
 
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 7f8178d00..af4a4c123 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -3,7 +3,7 @@
 .set LOCALID_GIRL, 4
 .set LOCALID_MAN, 5
 
-TrainerHill_Entrance_MapScripts:: @ 82680AC
+TrainerHill_Entrance_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_OnResume
 	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_OnReturn
 	map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_OnTransition
@@ -11,16 +11,16 @@ TrainerHill_Entrance_MapScripts:: @ 82680AC
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_OnFrame
 	.byte 0
 
-TrainerHill_Entrance_OnTransition: @ 82680C6
+TrainerHill_Entrance_OnTransition:
 	setflag FLAG_LANDMARK_TRAINER_HILL
 	getplayerxy VAR_TEMP_D, VAR_RESULT
 	end
 
 @ Unused
-TrainerHill_Entrance_OnWarp: @ 82680CF
+TrainerHill_Entrance_OnWarp:
 	end
 
-TrainerHill_Entrance_OnResume: @ 82680D0
+TrainerHill_Entrance_OnResume:
 	trainerhill_resumetimer
 	setvar VAR_TEMP_0, 0
 	trainerhill_getusingereader
@@ -30,40 +30,40 @@ TrainerHill_Entrance_OnResume: @ 82680D0
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	end
 
-TrainerHill_Entrance_EventScript_TryFaceAttendant:: @ 82680FF
+TrainerHill_Entrance_EventScript_TryFaceAttendant::
 	trainerhill_getwon
 	compare VAR_RESULT, TRUE
 	goto_if_eq TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	end
 
-TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant:: @ 826811A
+TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant::
 	end
 
-TrainerHill_Entrance_OnReturn: @ 826811B
+TrainerHill_Entrance_OnReturn:
 	addobject LOCALID_NURSE
 	addobject LOCALID_ATTENDANT
 	addobject LOCALID_MAN
 	addobject LOCALID_GIRL
 	end
 
-TrainerHill_Entrance_OnLoad: @ 8268128
+TrainerHill_Entrance_OnLoad:
 	compare VAR_TEMP_D, 17
 	call_if_eq TrainerHill_Entrance_EventScript_OpenCounterDoor
 	end
 
-TrainerHill_Entrance_EventScript_OpenCounterDoor:: @ 8268134
+TrainerHill_Entrance_EventScript_OpenCounterDoor::
 	setmetatile 17, 10, METATILE_TrainerHill_GreenFloorTile, 0
 	return
 
-TrainerHill_Entrance_OnFrame: @ 826813E
+TrainerHill_Entrance_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_ExitChallenge
 	map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_ExitElevator
 	map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_EntryTrigger
 	map_script_2 VAR_TEMP_1, 1, TrainerHill_EventScript_WarpToEntranceCounter
 	.2byte 0
 
-TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160
+TrainerHill_Entrance_EventScript_ExitElevator::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator
 	waitmovement 0
@@ -75,7 +75,7 @@ TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182
+TrainerHill_Entrance_EventScript_ExitChallenge::
 	setvar VAR_TEMP_0, 1
 	trainerhill_getstatus
 	switch VAR_RESULT
@@ -83,27 +83,27 @@ TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182
 	case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_ExitChallengeECard
 	case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_EndExitChallenge
 
-TrainerHill_Entrance_EventScript_ExitChallengeLost:: @ 82681B5
+TrainerHill_Entrance_EventScript_ExitChallengeLost::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	msgbox TrainerHill_Entrance_Text_TooBadTremendousEffort, MSGBOX_DEFAULT
 	goto TrainerHill_Entrance_EventScript_PlayerExitChallenge
 
-TrainerHill_Entrance_EventScript_ExitChallengeECard:: @ 82681CA
+TrainerHill_Entrance_EventScript_ExitChallengeECard::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	msgbox TrainerHill_Entrance_Text_MovedReceptionHereForSwitch, MSGBOX_DEFAULT
-TrainerHill_Entrance_EventScript_PlayerExitChallenge:: @ 82681DA
+TrainerHill_Entrance_EventScript_PlayerExitChallenge::
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
 	special HealPlayerParty
 	releaseall
-TrainerHill_Entrance_EventScript_EndExitChallenge:: @ 82681EE
+TrainerHill_Entrance_EventScript_EndExitChallenge::
 	end
 
-TrainerHill_Entrance_EventScript_Nurse:: @ 82681EF
+TrainerHill_Entrance_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -111,7 +111,7 @@ TrainerHill_Entrance_EventScript_Nurse:: @ 82681EF
 	release
 	end
 
-TrainerHill_Entrance_EventScript_Attendant:: @ 82681FD
+TrainerHill_Entrance_EventScript_Attendant::
 	lock
 	faceplayer
 	trainerhill_inchallenge
@@ -120,13 +120,13 @@ TrainerHill_Entrance_EventScript_Attendant:: @ 82681FD
 	msgbox TrainerHill_Entrance_Text_HopeYouGiveItYourBest, MSGBOX_DEFAULT
 	goto TrainerHill_Entrance_EventScript_AttendantEnd
 
-TrainerHill_Entrance_EventScript_ThanksForPlaying:: @ 826821F
+TrainerHill_Entrance_EventScript_ThanksForPlaying::
 	msgbox TrainerHill_Entrance_Text_ThankYouForPlaying, MSGBOX_DEFAULT
-TrainerHill_Entrance_EventScript_AttendantEnd:: @ 8268227
+TrainerHill_Entrance_EventScript_AttendantEnd::
 	release
 	end
 
-TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229
+TrainerHill_Entrance_EventScript_EntryTrigger::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_Closed
@@ -140,9 +140,9 @@ TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229
 	msgbox TrainerHill_Entrance_Text_TrainersUpToFloorX, MSGBOX_DEFAULT
 	goto TrainerHill_Entrance_EventScript_AskChallengeTrainers
 
-TrainerHill_Entrance_EventScript_AllFloorsUsed:: @ 8268275
+TrainerHill_Entrance_EventScript_AllFloorsUsed::
 	msgbox TrainerHill_Entrance_Text_TrainersInEveryRoom, MSGBOX_DEFAULT
-TrainerHill_Entrance_EventScript_AskChallengeTrainers:: @ 826827D
+TrainerHill_Entrance_EventScript_AskChallengeTrainers::
 	message TrainerHill_Entrance_Text_LikeToChallengeTrainers
 	waitmessage
 	multichoice 15, 6, MULTI_YESNOINFO, FALSE
@@ -153,12 +153,12 @@ TrainerHill_Entrance_EventScript_AskChallengeTrainers:: @ 826827D
 	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
 	end
 
-TrainerHill_Entrance_EventScript_Info:: @ 82682BA
+TrainerHill_Entrance_EventScript_Info::
 	msgbox TrainerHill_Entrance_Text_ExplainTrainerHill, MSGBOX_DEFAULT
 	goto TrainerHill_Entrance_EventScript_AskChallengeTrainers
 	end
 
-TrainerHill_Entrance_EventScript_ChooseChallenge:: @ 82682C8
+TrainerHill_Entrance_EventScript_ChooseChallenge::
 	multichoice 13, 2, MULTI_TAG_MATCH_TYPE, FALSE
 	switch VAR_RESULT
 	case 4, TrainerHill_Entrance_EventScript_CancelEntry
@@ -172,7 +172,7 @@ TrainerHill_Entrance_EventScript_ChooseChallenge:: @ 82682C8
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314
+TrainerHill_Entrance_EventScript_CancelEntry::
 	setvar VAR_TEMP_5, 0
 	msgbox TrainerHill_Entrance_Text_PleaseVisitUsAgain, MSGBOX_DEFAULT
 	closemessage
@@ -181,7 +181,7 @@ TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_SaveGame:: @ 826832E
+TrainerHill_Entrance_EventScript_SaveGame::
 	msgbox TrainerHill_Entrance_Text_SaveGameBeforeEnter, MSGBOX_DEFAULT
 	trainerhill_setsaved
 	setvar VAR_TEMP_5, 1
@@ -191,12 +191,12 @@ TrainerHill_Entrance_EventScript_SaveGame:: @ 826832E
 	trainerhill_setsaved
 	return
 
-TrainerHill_Entrance_EventScript_SaveFailed:: @ 826835C
+TrainerHill_Entrance_EventScript_SaveFailed::
 	trainerhill_clearsaved
 	goto TrainerHill_Entrance_EventScript_CancelEntry
 	end
 
-TrainerHill_Entrance_EventScript_Closed:: @ 826836A
+TrainerHill_Entrance_EventScript_Closed::
 	msgbox TrainerHill_Entrance_Text_StillGettingReady, MSGBOX_DEFAULT
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
@@ -204,25 +204,25 @@ TrainerHill_Entrance_EventScript_Closed:: @ 826836A
 	releaseall
 	end
 
-TrainerHill_Entrance_Movement_PlayerFaceAttendant: @ 826837F
+TrainerHill_Entrance_Movement_PlayerFaceAttendant:
 	face_right
 	step_end
 
-TrainerHill_Entrance_Movement_PushPlayerBackFromCounter: @ 8268381
+TrainerHill_Entrance_Movement_PushPlayerBackFromCounter:
 	walk_down
 	step_end
 
 @ Unused
-TrainerHill_Entrance_Movement_FaceUp: @ 8268383
+TrainerHill_Entrance_Movement_FaceUp:
 	face_up
 	step_end
 
-TrainerHill_Entrance_Movement_PlayerExitElevator: @ 8268385
+TrainerHill_Entrance_Movement_PlayerExitElevator:
 	walk_down
 	walk_down
 	step_end
 
-TrainerHill_Entrance_EventScript_Records:: @ 8268388
+TrainerHill_Entrance_EventScript_Records::
 	lockall
 	fadescreen FADE_TO_BLACK
 	special ShowTrainerHillRecords
@@ -230,25 +230,25 @@ TrainerHill_Entrance_EventScript_Records:: @ 8268388
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_Man:: @ 8268391
+TrainerHill_Entrance_EventScript_Man::
 	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_ManTrainerHillClosed
 	msgbox TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_ManTrainerHillClosed:: @ 82683A3
+TrainerHill_Entrance_EventScript_ManTrainerHillClosed::
 	msgbox TrainerHill_Entrance_Text_CantWaitToTestTheWaters, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_Girl:: @ 82683AC
+TrainerHill_Entrance_EventScript_Girl::
 	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_GirlTrainerHillClosed
 	msgbox TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_GirlTrainerHillClosed:: @ 82683BE
+TrainerHill_Entrance_EventScript_GirlTrainerHillClosed::
 	msgbox TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_Clerk:: @ 82683C7
+TrainerHill_Entrance_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -260,7 +260,7 @@ TrainerHill_Entrance_EventScript_Clerk:: @ 82683C7
 	end
 
 	.align 2
-TrainerHill_Entrance_Pokemart_Basic: @ 82683E8
+TrainerHill_Entrance_Pokemart_Basic:
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
 	.2byte ITEM_PARALYZE_HEAL
@@ -276,14 +276,14 @@ TrainerHill_Entrance_Pokemart_Basic: @ 82683E8
 	release
 	end
 
-TrainerHill_Entrance_EventScript_ExpandedPokemart:: @ 8268402
+TrainerHill_Entrance_EventScript_ExpandedPokemart::
 	pokemart TrainerHill_Entrance_Pokemart_Expanded
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-TrainerHill_Entrance_Pokemart_Expanded: @ 8268414
+TrainerHill_Entrance_Pokemart_Expanded:
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
 	.2byte ITEM_FULL_RESTORE
@@ -300,69 +300,69 @@ TrainerHill_Entrance_Pokemart_Expanded: @ 8268414
 	release
 	end
 
-TrainerHill_Entrance_Text_StillGettingReady: @ 8268430
+TrainerHill_Entrance_Text_StillGettingReady:
 	.string "This is the TRAINER HILL where\n"
 	.string "you may enjoy tag battles with many\l"
 	.string "TRAINERS.\p"
 	.string "Unfortunately, we're still getting\n"
 	.string "things ready. Please come back later!$"
 
-TrainerHill_Entrance_Text_WelcomeToTrainerHill: @ 82684C6
+TrainerHill_Entrance_Text_WelcomeToTrainerHill:
 	.string "Welcome!\p"
 	.string "This is the TRAINER HILL where\n"
 	.string "you may enjoy tag battles with many\l"
 	.string "TRAINERS!$"
 
-TrainerHill_Entrance_Text_SaveGameBeforeEnter: @ 826851C
+TrainerHill_Entrance_Text_SaveGameBeforeEnter:
 	.string "Is this your first visit here?\p"
 	.string "Before you enter, please save\n"
 	.string "your game.$"
 
-TrainerHill_Entrance_Text_TrainersUpToFloorX: @ 8268564
+TrainerHill_Entrance_Text_TrainersUpToFloorX:
 	.string "Let's see…\n"
 	.string "The TRAINERS here now are…\p"
 	.string "Up to floor no. {STR_VAR_1}.$"
 
-TrainerHill_Entrance_Text_TrainersInEveryRoom: @ 826859E
+TrainerHill_Entrance_Text_TrainersInEveryRoom:
 	.string "Let's see…\n"
 	.string "The TRAINERS here now are…\p"
 	.string "There appear to be TRAINERS gathered\n"
 	.string "in every room.$"
 
-TrainerHill_Entrance_Text_LikeToChallengeTrainers: @ 82685F8
+TrainerHill_Entrance_Text_LikeToChallengeTrainers:
 	.string "Would you like to challenge the\n"
 	.string "waiting TRAINERS?$"
 
-TrainerHill_Entrance_Text_TimeProgessGetSetGo: @ 826862A
+TrainerHill_Entrance_Text_TimeProgessGetSetGo:
 	.string "I will time your progress.\n"
 	.string "Best of luck!\p"
 	.string "On your marks…\p"
 	.string "Get set…\p"
 	.string "Go!$"
 
-TrainerHill_Entrance_Text_PleaseVisitUsAgain: @ 826866F
+TrainerHill_Entrance_Text_PleaseVisitUsAgain:
 	.string "Please do visit us again!$"
 
-TrainerHill_Entrance_Text_TooBadTremendousEffort: @ 8268689
+TrainerHill_Entrance_Text_TooBadTremendousEffort:
 	.string "That was too bad.\p"
 	.string "I think you put in a tremendous\n"
 	.string "effort in your battling.\p"
 	.string "Please come back and try again!$"
 
-TrainerHill_Entrance_Text_HopeYouGiveItYourBest: @ 82686F4
+TrainerHill_Entrance_Text_HopeYouGiveItYourBest:
 	.string "I hope you give it your best.$"
 
-TrainerHill_Entrance_Text_MovedReceptionHereForSwitch: @ 8268712
+TrainerHill_Entrance_Text_MovedReceptionHereForSwitch:
 	.string "When the TRAINERS switch places,\n"
 	.string "the movement can be hectic.\p"
 	.string "To avoid the stampede, we moved\n"
 	.string "the reception counter here.\p"
 	.string "I'm sorry for the inconvenience.$"
 
-TrainerHill_Entrance_Text_ThankYouForPlaying: @ 82687AC
+TrainerHill_Entrance_Text_ThankYouForPlaying:
 	.string "Thank you for playing!$"
 
-TrainerHill_Entrance_Text_ExplainTrainerHill: @ 82687C3
+TrainerHill_Entrance_Text_ExplainTrainerHill:
 	.string "Here at the TRAINER HILL, we conduct\n"
 	.string "an event called the Time Attack.\p"
 	.string "It is a race that measures how long\n"
@@ -376,13 +376,13 @@ TrainerHill_Entrance_Text_ExplainTrainerHill: @ 82687C3
 	.string "be awarded.$"
 
 @ Unused
-TrainerHill_Entrance_Text_NeedAtLeastTwoPokemon: @ 826890D
+TrainerHill_Entrance_Text_NeedAtLeastTwoPokemon:
 	.string "Oh, I'm sorry, but you appear to have\n"
 	.string "only one POKéMON with you.\p"
 	.string "You will need at least two POKéMON\n"
 	.string "to enter this event.$"
 
-TrainerHill_Roof_Text_YouFinallyCameBravo: @ 8268986
+TrainerHill_Roof_Text_YouFinallyCameBravo:
 	.string "Hm! Hm!\p"
 	.string "You finally came!\n"
 	.string "Yes, you have arrived!\p"
@@ -398,15 +398,15 @@ TrainerHill_Roof_Text_YouFinallyCameBravo: @ 8268986
 	.string "Anyway, I watched you on your way up.\n"
 	.string "Marvelous battling! Bravo, indeed!$"
 
-TrainerHill_Roof_Text_HaveTheMostMarvelousGift: @ 8268AC5
+TrainerHill_Roof_Text_HaveTheMostMarvelousGift:
 	.string "For a marvelous someone like you,\n"
 	.string "I have the most marvelous gift!$"
 
-TrainerHill_Roof_Text_FullUpBeBackLaterForThis: @ 8268B07
+TrainerHill_Roof_Text_FullUpBeBackLaterForThis:
 	.string "Oh, no, full up with things!\n"
 	.string "You'll be back later for this!$"
 
-TrainerHill_Roof_Text_GotHereMarvelouslyQuickly: @ 8268B43
+TrainerHill_Roof_Text_GotHereMarvelouslyQuickly:
 	.string "Oh, hold on here! Did you possibly get\n"
 	.string "here marvelously quickly?\p"
 	.string "How splendid! You needn't have\n"
@@ -414,11 +414,11 @@ TrainerHill_Roof_Text_GotHereMarvelouslyQuickly: @ 8268B43
 	.string "That is so delightful. I'll have the Time\n"
 	.string "Board at the reception updated!$"
 
-TrainerHill_Roof_Text_YouWerentVeryQuick: @ 8268C03
+TrainerHill_Roof_Text_YouWerentVeryQuick:
 	.string "But, oh…\n"
 	.string "You weren't very quick getting here.$"
 
-TrainerHill_Roof_Text_ArriveZippierNextTime: @ 8268C31
+TrainerHill_Roof_Text_ArriveZippierNextTime:
 	.string "Perhaps it would please me more if you\n"
 	.string "arrived zippier next time.\p"
 	.string "Then, I should be pleased to form\n"
@@ -426,39 +426,39 @@ TrainerHill_Roof_Text_ArriveZippierNextTime: @ 8268C31
 	.string "Until we meet again, amigo!$"
 
 @ Unused
-TrainerHill_Roof_Text_BuiltTrainerHillToFindPartner: @ 8268CC6
+TrainerHill_Roof_Text_BuiltTrainerHillToFindPartner:
 	.string "I had the TRAINER HILL built for but\n"
 	.string "one reason and one only!\p"
 	.string "To find the most suitable partner\n"
 	.string "with whom I may form a tag team!$"
 
-TrainerHill_Entrance_Text_ChallengeTime: @ 8268D47
+TrainerHill_Entrance_Text_ChallengeTime:
 	.string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
 
-TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead: @ 8268D5A
+TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead:
 	.string "Who knows what sort of TRAINERS\n"
 	.string "and POKéMON combos are ahead?\p"
 	.string "All I know is that I'll knock aside\n"
 	.string "anyone that stands in my way!$"
 
-TrainerHill_Entrance_Text_CantWaitToTestTheWaters: @ 8268DDA
+TrainerHill_Entrance_Text_CantWaitToTestTheWaters:
 	.string "I heard tough TRAINERS come to this\n"
 	.string "TRAINER HILL from all over.\p"
 	.string "I can't wait to test the waters!\p"
 	.string "I'll knock aside anyone that stands\n"
 	.string "in my way!$"
 
-TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop: @ 8268E6A
+TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop:
 	.string "Do you see the Time Board over there?\p"
 	.string "My friends and I are trying to see who\n"
 	.string "can reach the top in the least time.$"
 
-TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen: @ 8268EDC
+TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen:
 	.string "Do you know when they're opening\n"
 	.string "this place up?\p"
 	.string "I'm waiting here to be the first\n"
 	.string "challenger ever!$"
 
-TrainerHill_Elevator_Text_ReturnToReception: @ 8268F3E
+TrainerHill_Elevator_Text_ReturnToReception:
 	.string "Would you like to return to\n"
 	.string "the reception counter?$"
diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc
index e239ed010..d0e63c38a 100644
--- a/data/maps/TrainerHill_Roof/scripts.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
@@ -1,9 +1,9 @@
-TrainerHill_Roof_MapScripts:: @ 8268FA7
+TrainerHill_Roof_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
-TrainerHill_Roof_EventScript_Owner:: @ 8268FB2
+TrainerHill_Roof_EventScript_Owner::
 	trainerhill_settrainerflags
 	lock
 	faceplayer
@@ -12,15 +12,15 @@ TrainerHill_Roof_EventScript_Owner:: @ 8268FB2
 	case 0, TrainerHill_Roof_EventScript_Arrived
 	case 1, TrainerHill_Roof_EventScript_GivePrize
 	case 2, TrainerHill_Roof_EventScript_AlreadyReceivedPrize
-TrainerHill_Roof_EventScript_Arrived:: @ 8268FEA
+TrainerHill_Roof_EventScript_Arrived::
 	msgbox TrainerHill_Roof_Text_YouFinallyCameBravo, MSGBOX_DEFAULT
-TrainerHill_Roof_EventScript_GivePrize:: @ 8268FF2
+TrainerHill_Roof_EventScript_GivePrize::
 	trainerhill_giveprize
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_ReceivePrize
 	case 1, TrainerHill_Roof_EventScript_NoRoomForPrize
 	case 2, TrainerHill_Roof_EventScript_CheckFinalTime
-TrainerHill_Roof_EventScript_ReceivePrize:: @ 8269020
+TrainerHill_Roof_EventScript_ReceivePrize::
 	msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT
 	playfanfare MUS_LEVEL_UP
 	message gText_ObtainedTheItem
@@ -28,34 +28,34 @@ TrainerHill_Roof_EventScript_ReceivePrize:: @ 8269020
 	waitmessage
 	goto TrainerHill_Roof_EventScript_CheckFinalTime
 
-TrainerHill_Roof_EventScript_NoRoomForPrize:: @ 8269037
+TrainerHill_Roof_EventScript_NoRoomForPrize::
 	msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT
 	msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
 	msgbox TrainerHill_Roof_Text_FullUpBeBackLaterForThis, MSGBOX_DEFAULT
 	goto TrainerHill_Roof_EventScript_CheckFinalTime
 
-TrainerHill_Roof_EventScript_CheckFinalTime:: @ 8269054
+TrainerHill_Roof_EventScript_CheckFinalTime::
 	trainerhill_finaltime
 	switch VAR_RESULT
 	case 0, TrainerHill_Roof_EventScript_NewRecord
 	case 1, TrainerHill_Roof_EventScript_NoNewRecord
 	case 2, TrainerHill_Roof_EventScript_EndSpeakToOwner
-TrainerHill_Roof_EventScript_NewRecord:: @ 8269082
+TrainerHill_Roof_EventScript_NewRecord::
 	msgbox TrainerHill_Roof_Text_GotHereMarvelouslyQuickly, MSGBOX_DEFAULT
 	goto TrainerHill_Roof_EventScript_EndSpeakToOwner
 	end
 
-TrainerHill_Roof_EventScript_NoNewRecord:: @ 8269090
+TrainerHill_Roof_EventScript_NoNewRecord::
 	msgbox TrainerHill_Roof_Text_YouWerentVeryQuick, MSGBOX_DEFAULT
 	goto TrainerHill_Roof_EventScript_EndSpeakToOwner
 	end
 
-TrainerHill_Roof_EventScript_EndSpeakToOwner:: @ 826909E
+TrainerHill_Roof_EventScript_EndSpeakToOwner::
 	msgbox TrainerHill_Roof_Text_ArriveZippierNextTime, MSGBOX_DEFAULT
 	release
 	end
 
-TrainerHill_Roof_EventScript_AlreadyReceivedPrize:: @ 82690A8
+TrainerHill_Roof_EventScript_AlreadyReceivedPrize::
 	msgbox TrainerHill_Roof_Text_ArriveZippierNextTime, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc
index b1cc353f0..cbd158e27 100644
--- a/data/maps/Underwater_MarineCave/scripts.inc
+++ b/data/maps/Underwater_MarineCave/scripts.inc
@@ -1,13 +1,13 @@
-Underwater_MarineCave_MapScripts:: @ 823AFB8
+Underwater_MarineCave_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Underwater_MarineCave_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Underwater_MarineCave_OnTransition
 	.byte 0
 
-Underwater_MarineCave_OnTransition: @ 823AFC3
+Underwater_MarineCave_OnTransition:
 	setflag FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT
 	end
 
-Underwater_MarineCave_OnResume: @ 823AFC7
+Underwater_MarineCave_OnResume:
 	setdivewarp MAP_MARINE_CAVE_ENTRANCE, 255, 10, 17
 	end
 
diff --git a/data/maps/Underwater_Route105/scripts.inc b/data/maps/Underwater_Route105/scripts.inc
index 41cd8bfbe..af3f6769e 100644
--- a/data/maps/Underwater_Route105/scripts.inc
+++ b/data/maps/Underwater_Route105/scripts.inc
@@ -1,8 +1,8 @@
-Underwater_Route105_MapScripts:: @ 81F773D
+Underwater_Route105_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Underwater_Route105_OnResume
 	.byte 0
 
-Underwater_Route105_OnResume: @ 81F7743
+Underwater_Route105_OnResume:
 	call AbnormalWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater_Route124/scripts.inc b/data/maps/Underwater_Route124/scripts.inc
index 2a72dfb11..f14d5824b 100644
--- a/data/maps/Underwater_Route124/scripts.inc
+++ b/data/maps/Underwater_Route124/scripts.inc
@@ -1,3 +1,3 @@
-Underwater_Route124_MapScripts:: @ 81F7722
+Underwater_Route124_MapScripts::
 	.byte 0
 
diff --git a/data/maps/Underwater_Route125/scripts.inc b/data/maps/Underwater_Route125/scripts.inc
index 662120e5e..cc16edf7b 100644
--- a/data/maps/Underwater_Route125/scripts.inc
+++ b/data/maps/Underwater_Route125/scripts.inc
@@ -1,8 +1,8 @@
-Underwater_Route125_MapScripts:: @ 81F7749
+Underwater_Route125_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Underwater_Route125_OnResume
 	.byte 0
 
-Underwater_Route125_OnResume: @ 81F774F
+Underwater_Route125_OnResume:
 	call AbnormalWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater_Route126/scripts.inc b/data/maps/Underwater_Route126/scripts.inc
index 71d43e141..6721e8a0f 100644
--- a/data/maps/Underwater_Route126/scripts.inc
+++ b/data/maps/Underwater_Route126/scripts.inc
@@ -1,3 +1,3 @@
-Underwater_Route126_MapScripts:: @ 81F7723
+Underwater_Route126_MapScripts::
 	.byte 0
 
diff --git a/data/maps/Underwater_Route127/scripts.inc b/data/maps/Underwater_Route127/scripts.inc
index 552b9aab8..b6e21b030 100644
--- a/data/maps/Underwater_Route127/scripts.inc
+++ b/data/maps/Underwater_Route127/scripts.inc
@@ -1,8 +1,8 @@
-Underwater_Route127_MapScripts:: @ 81F7724
+Underwater_Route127_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Underwater_Route127_OnResume
 	.byte 0
 
-Underwater_Route127_OnResume: @ 81F772A
+Underwater_Route127_OnResume:
 	call AbnormalWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater_Route128/scripts.inc b/data/maps/Underwater_Route128/scripts.inc
index a050afd93..215268cf5 100644
--- a/data/maps/Underwater_Route128/scripts.inc
+++ b/data/maps/Underwater_Route128/scripts.inc
@@ -1,3 +1,3 @@
-Underwater_Route128_MapScripts:: @ 81F7730
+Underwater_Route128_MapScripts::
 	.byte 0
 
diff --git a/data/maps/Underwater_Route129/scripts.inc b/data/maps/Underwater_Route129/scripts.inc
index f9f84841e..3e2813d4d 100644
--- a/data/maps/Underwater_Route129/scripts.inc
+++ b/data/maps/Underwater_Route129/scripts.inc
@@ -1,8 +1,8 @@
-Underwater_Route129_MapScripts:: @ 81F7731
+Underwater_Route129_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Underwater_Route129_OnResume
 	.byte 0
 
-Underwater_Route129_OnResume: @ 81F7737
+Underwater_Route129_OnResume:
 	call AbnormalWeather_Underwater_SetupEscapeWarp
 	end
 
diff --git a/data/maps/Underwater_Route134/scripts.inc b/data/maps/Underwater_Route134/scripts.inc
index ef62997de..909b2f8b1 100644
--- a/data/maps/Underwater_Route134/scripts.inc
+++ b/data/maps/Underwater_Route134/scripts.inc
@@ -1,8 +1,8 @@
-Underwater_Route134_MapScripts:: @ 82390B5
+Underwater_Route134_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Underwater_Route134_OnResume
 	.byte 0
 
-Underwater_Route134_OnResume: @ 82390BB
+Underwater_Route134_OnResume:
 	setdivewarp MAP_ROUTE134, 255, 60, 31
 	end
 
diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
index 118632461..2e0613c04 100644
--- a/data/maps/Underwater_SeafloorCavern/scripts.inc
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
@@ -1,23 +1,23 @@
-Underwater_SeafloorCavern_MapScripts:: @ 823433B
+Underwater_SeafloorCavern_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Underwater_SeafloorCavern_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Underwater_SeafloorCavern_OnTransition
 	map_script MAP_SCRIPT_ON_LOAD, Underwater_SeafloorCavern_OnLoad
 	.byte 0
 
-Underwater_SeafloorCavern_OnTransition: @ 823434B
+Underwater_SeafloorCavern_OnTransition:
 	setflag FLAG_LANDMARK_SEAFLOOR_CAVERN
 	goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_HideSubmarine
 	end
 
-Underwater_SeafloorCavern_EventScript_HideSubmarine:: @ 8234358
+Underwater_SeafloorCavern_EventScript_HideSubmarine::
 	setflag FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE
 	end
 
-Underwater_SeafloorCavern_OnLoad: @ 823435C
+Underwater_SeafloorCavern_OnLoad:
 	call_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles
 	end
 
-Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles:: @ 8234366
+Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles::
 	setmetatile 5, 3, METATILE_Underwater_RockWall, 1
 	setmetatile 6, 3, METATILE_Underwater_RockWall, 1
 	setmetatile 7, 3, METATILE_Underwater_RockWall, 1
@@ -32,15 +32,15 @@ Underwater_SeafloorCavern_EventScript_SetSubmarineGoneMetatiles:: @ 8234366
 	setmetatile 8, 5, METATILE_Underwater_FloorShadow, 0
 	return
 
-Underwater_SeafloorCavern_OnResume: @ 82343D3
+Underwater_SeafloorCavern_OnResume:
 	setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17
 	end
 
-Underwater_SeafloorCavern_EventScript_CheckStolenSub:: @ 82343DC
+Underwater_SeafloorCavern_EventScript_CheckStolenSub::
 	msgbox Underwater_SeafloorCavern_Text_SubExplorer1, MSGBOX_SIGN
 	end
 
-Underwater_SeafloorCavern_Text_SubExplorer1: @ 82343E5
+Underwater_SeafloorCavern_Text_SubExplorer1:
 	.string "“SUBMARINE EXPLORER 1” is painted\n"
 	.string "on the hull.\p"
 	.string "This is the submarine TEAM AQUA\n"
diff --git a/data/maps/Underwater_SealedChamber/scripts.inc b/data/maps/Underwater_SealedChamber/scripts.inc
index b1fb5e71a..3d8aaf979 100644
--- a/data/maps/Underwater_SealedChamber/scripts.inc
+++ b/data/maps/Underwater_SealedChamber/scripts.inc
@@ -1,8 +1,8 @@
-Underwater_SealedChamber_MapScripts:: @ 82390C4
+Underwater_SealedChamber_MapScripts::
 	map_script MAP_SCRIPT_ON_DIVE_WARP, Underwater_SealedChamber_OnDive
 	.byte 0
 
-Underwater_SealedChamber_OnDive: @ 82390CA
+Underwater_SealedChamber_OnDive:
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 12
 	goto_if_ne Underwater_SealedChamber_EventScript_SurfaceRoute134
@@ -10,15 +10,15 @@ Underwater_SealedChamber_OnDive: @ 82390CA
 	goto_if_ne Underwater_SealedChamber_EventScript_SurfaceRoute134
 	goto Underwater_SealedChamber_EventScript_SurfaceSealedChamber
 
-Underwater_SealedChamber_EventScript_SurfaceRoute134:: @ 82390EA
+Underwater_SealedChamber_EventScript_SurfaceRoute134::
 	setdivewarp MAP_ROUTE134, 255, 60, 31
 	end
 
-Underwater_SealedChamber_EventScript_SurfaceSealedChamber:: @ 82390F3
+Underwater_SealedChamber_EventScript_SurfaceSealedChamber::
 	setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19
 	end
 
-Underwater_SealedChamber_EventScript_Braille:: @ 82390FC
+Underwater_SealedChamber_EventScript_Braille::
 	lockall
 	braillemessage Underwater_SealedChamber_Braille_GoUpHere
 	waitbuttonpress
diff --git a/data/maps/Underwater_SootopolisCity/scripts.inc b/data/maps/Underwater_SootopolisCity/scripts.inc
index ec639604b..4346c284f 100644
--- a/data/maps/Underwater_SootopolisCity/scripts.inc
+++ b/data/maps/Underwater_SootopolisCity/scripts.inc
@@ -1,8 +1,8 @@
-Underwater_SootopolisCity_MapScripts:: @ 822D94C
+Underwater_SootopolisCity_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, Underwater_SootopolisCity_OnResume
 	.byte 0
 
-Underwater_SootopolisCity_OnResume: @ 822D952
+Underwater_SootopolisCity_OnResume:
 	setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53
 	end
 
diff --git a/data/maps/UnionRoom/scripts.inc b/data/maps/UnionRoom/scripts.inc
index 13d7e1007..8a9e7682a 100644
--- a/data/maps/UnionRoom/scripts.inc
+++ b/data/maps/UnionRoom/scripts.inc
@@ -1,11 +1,11 @@
 @ Note: LOCALID_UNION_ROOM_PLAYER_# are local ids for this map used elsewhere. They're defined in event_objects.h
 
-UnionRoom_MapScripts:: @ 823D1A6
+UnionRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, UnionRoom_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, UnionRoom_OnTransition
 	.byte 0
 
-UnionRoom_OnResume: @ 823D1B1
+UnionRoom_OnResume:
 	setflag FLAG_HIDE_UNION_ROOM_PLAYER_1
 	setflag FLAG_HIDE_UNION_ROOM_PLAYER_2
 	setflag FLAG_HIDE_UNION_ROOM_PLAYER_3
@@ -25,10 +25,10 @@ UnionRoom_OnResume: @ 823D1B1
 	special RunUnionRoom
 	end
 
-UnionRoom_OnTransition: @ 823D1E5
+UnionRoom_OnTransition:
 	end
 
-UnionRoom_EventScript_Player1:: @ 823D1E6
+UnionRoom_EventScript_Player1::
 	lock
 	faceplayer
 	setvar VAR_RESULT, UR_INTERACT_PLAYER_1
@@ -36,7 +36,7 @@ UnionRoom_EventScript_Player1:: @ 823D1E6
 	release
 	end
 
-UnionRoom_EventScript_Player2:: @ 823D1F0
+UnionRoom_EventScript_Player2::
 	lock
 	faceplayer
 	setvar VAR_RESULT, UR_INTERACT_PLAYER_2
@@ -44,7 +44,7 @@ UnionRoom_EventScript_Player2:: @ 823D1F0
 	release
 	end
 
-UnionRoom_EventScript_Player3:: @ 823D1FA
+UnionRoom_EventScript_Player3::
 	lock
 	faceplayer
 	setvar VAR_RESULT, UR_INTERACT_PLAYER_3
@@ -52,7 +52,7 @@ UnionRoom_EventScript_Player3:: @ 823D1FA
 	release
 	end
 
-UnionRoom_EventScript_Player4:: @ 823D204
+UnionRoom_EventScript_Player4::
 	lock
 	faceplayer
 	setvar VAR_RESULT, UR_INTERACT_PLAYER_4
@@ -60,7 +60,7 @@ UnionRoom_EventScript_Player4:: @ 823D204
 	release
 	end
 
-UnionRoom_EventScript_Player5:: @ 823D20E
+UnionRoom_EventScript_Player5::
 	lock
 	faceplayer
 	setvar VAR_RESULT, UR_INTERACT_PLAYER_5
@@ -68,7 +68,7 @@ UnionRoom_EventScript_Player5:: @ 823D20E
 	release
 	end
 
-UnionRoom_EventScript_Player6:: @ 823D218
+UnionRoom_EventScript_Player6::
 	lock
 	faceplayer
 	setvar VAR_RESULT, UR_INTERACT_PLAYER_6
@@ -76,7 +76,7 @@ UnionRoom_EventScript_Player6:: @ 823D218
 	release
 	end
 
-UnionRoom_EventScript_Player7:: @ 823D222
+UnionRoom_EventScript_Player7::
 	lock
 	faceplayer
 	setvar VAR_RESULT, UR_INTERACT_PLAYER_7
@@ -84,7 +84,7 @@ UnionRoom_EventScript_Player7:: @ 823D222
 	release
 	end
 
-UnionRoom_EventScript_Player8:: @ 823D22C
+UnionRoom_EventScript_Player8::
 	lock
 	faceplayer
 	setvar VAR_RESULT, UR_INTERACT_PLAYER_8
@@ -92,7 +92,7 @@ UnionRoom_EventScript_Player8:: @ 823D22C
 	release
 	end
 
-UnionRoom_EventScript_Attendant:: @ 823D236
+UnionRoom_EventScript_Attendant::
 	lock
 	faceplayer
 	setvar VAR_RESULT, UR_INTERACT_ATTENDANT
@@ -100,7 +100,7 @@ UnionRoom_EventScript_Attendant:: @ 823D236
 	release
 	end
 
-UnionRoom_EventScript_Unused:: @ 823D240
+UnionRoom_EventScript_Unused::
 	lockall
 	setvar VAR_RESULT, UR_INTERACT_UNUSED
 	waitstate
diff --git a/data/maps/VerdanturfTown/scripts.inc b/data/maps/VerdanturfTown/scripts.inc
index a419c3319..133fd6286 100644
--- a/data/maps/VerdanturfTown/scripts.inc
+++ b/data/maps/VerdanturfTown/scripts.inc
@@ -1,15 +1,15 @@
 .set LOCALID_TWIN, 2
 
-VerdanturfTown_MapScripts:: @ 81EB566
+VerdanturfTown_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_OnTransition
 	.byte 0
 
-VerdanturfTown_OnTransition: @ 81EB56C
+VerdanturfTown_OnTransition:
 	setflag FLAG_VISITED_VERDANTURF_TOWN
 	setvar VAR_CONTEST_HALL_STATE, 0
 	end
 
-VerdanturfTown_EventScript_Twin:: @ 81EB575
+VerdanturfTown_EventScript_Twin::
 	lock
 	faceplayer
 	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_TwinTunnelOpen
@@ -19,22 +19,22 @@ VerdanturfTown_EventScript_Twin:: @ 81EB575
 	release
 	end
 
-VerdanturfTown_EventScript_TwinTunnelOpen:: @ 81EB594
+VerdanturfTown_EventScript_TwinTunnelOpen::
 	msgbox VerdanturfTown_Text_ManDugTunnelForLove, MSGBOX_DEFAULT
 	applymovement LOCALID_TWIN, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-VerdanturfTown_EventScript_Man:: @ 81EB5A8
+VerdanturfTown_EventScript_Man::
 	msgbox VerdanturfTown_Text_AirCleanHere, MSGBOX_NPC
 	end
 
-VerdanturfTown_EventScript_Camper:: @ 81EB5B1
+VerdanturfTown_EventScript_Camper::
 	msgbox VerdanturfTown_Text_MakeBattleTentDebut, MSGBOX_NPC
 	end
 
-VerdanturfTown_EventScript_Boy:: @ 81EB5BA
+VerdanturfTown_EventScript_Boy::
 	lock
 	faceplayer
 	goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_BoyTunnelOpen
@@ -42,28 +42,28 @@ VerdanturfTown_EventScript_Boy:: @ 81EB5BA
 	release
 	end
 
-VerdanturfTown_EventScript_BoyTunnelOpen:: @ 81EB5CF
+VerdanturfTown_EventScript_BoyTunnelOpen::
 	msgbox VerdanturfTown_Text_EasyToGetToRustboroNow, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_EventScript_TownSign:: @ 81EB5D9
+VerdanturfTown_EventScript_TownSign::
 	msgbox VerdanturfTown_Text_TownSign, MSGBOX_SIGN
 	end
 
-VerdanturfTown_EventScript_WandasHouseSign:: @ 81EB5E2
+VerdanturfTown_EventScript_WandasHouseSign::
 	msgbox VerdanturfTown_Text_WandasHouse, MSGBOX_SIGN
 	end
 
-VerdanturfTown_EventScript_BattleTentSign:: @ 81EB5EB
+VerdanturfTown_EventScript_BattleTentSign::
 	msgbox VerdanturfTown_Text_BattleTentSign, MSGBOX_SIGN
 	end
 
-VerdanturfTown_EventScript_RusturfTunnelSign:: @ 81EB5F4
+VerdanturfTown_EventScript_RusturfTunnelSign::
 	msgbox VerdanturfTown_Text_RusturfTunnelSign, MSGBOX_SIGN
 	end
 
-VerdanturfTown_Text_ManTryingToDigTunnel: @ 81EB5FD
+VerdanturfTown_Text_ManTryingToDigTunnel:
 	.string "My papa told me.\p"
 	.string "He says this tunnel is full of\n"
 	.string "timid POKéMON.\p"
@@ -74,25 +74,25 @@ VerdanturfTown_Text_ManTryingToDigTunnel: @ 81EB5FD
 	.string "But there's one man. He's trying to dig\n"
 	.string "the tunnel by himself!$"
 
-VerdanturfTown_Text_ManDugTunnelForLove: @ 81EB6E0
+VerdanturfTown_Text_ManDugTunnelForLove:
 	.string "There was a man who dug a tunnel for\n"
 	.string "a lady he loved.\p"
 	.string "I don't really get it, but hey!$"
 
-VerdanturfTown_Text_AirCleanHere: @ 81EB736
+VerdanturfTown_Text_AirCleanHere:
 	.string "The way the winds blow, volcanic ash\n"
 	.string "is never blown in this direction.\p"
 	.string "The air is clean and delicious here.\n"
 	.string "Living here should do wonders for even\l"
 	.string "frail and sickly people.$"
 
-VerdanturfTown_Text_MakeBattleTentDebut: @ 81EB7E2
+VerdanturfTown_Text_MakeBattleTentDebut:
 	.string "My POKéMON and I, we've been riding\n"
 	.string "a hot winning streak.\p"
 	.string "So I decided to make my BATTLE TENT\n"
 	.string "debut in this town.$"
 
-VerdanturfTown_Text_GuyTryingToBustThroughCave: @ 81EB854
+VerdanturfTown_Text_GuyTryingToBustThroughCave:
 	.string "Did you see the cave next to the\n"
 	.string "POKéMON MART?\p"
 	.string "There's a guy in there who's trying to\n"
@@ -101,25 +101,25 @@ VerdanturfTown_Text_GuyTryingToBustThroughCave: @ 81EB854
 	.string "It'd be great if we could go through…\n"
 	.string "It'll make it easy to visit RUSTBORO.$"
 
-VerdanturfTown_Text_EasyToGetToRustboroNow: @ 81EB935
+VerdanturfTown_Text_EasyToGetToRustboroNow:
 	.string "That cave next to the POKéMON MART\n"
 	.string "is now a tunnel to the other side.\p"
 	.string "It's great--it's easy to go shop for\n"
 	.string "new DEVON products in RUSTBORO now.$"
 
-VerdanturfTown_Text_TownSign: @ 81EB9C4
+VerdanturfTown_Text_TownSign:
 	.string "VERDANTURF TOWN\p"
 	.string "“The windswept highlands with the\n"
 	.string "sweet fragrance of grass.”$"
 
-VerdanturfTown_Text_WandasHouse: @ 81EBA11
+VerdanturfTown_Text_WandasHouse:
 	.string "WANDA'S HOUSE$"
 
-VerdanturfTown_Text_BattleTentSign: @ 81EBA1F
+VerdanturfTown_Text_BattleTentSign:
 	.string "BATTLE TENT VERDANTURF SITE\n"
 	.string "“Feast Your Eyes on Battles!”$"
 
-VerdanturfTown_Text_RusturfTunnelSign: @ 81EBA59
+VerdanturfTown_Text_RusturfTunnelSign:
 	.string "RUSTURF TUNNEL\n"
 	.string "“Linking RUSTBORO and VERDANTURF\p"
 	.string "“The tunnel project has been\n"
diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
index f917db9ed..755e6d8be 100644
--- a/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/scripts.inc
@@ -2,7 +2,7 @@
 .set LOCALID_OPPONENT, 2
 .set LOCALID_ATTENDANT, 3
 
-VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA
+VerdanturfTown_BattleTentBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_BattleTentBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentBattleRoom_OnWarp
@@ -12,11 +12,11 @@ VerdanturfTown_BattleTentBattleRoom_MapScripts:: @ 82022FA
 	@ The player is represented instead by object event 1, which has the gfx id VAR_OBJ_GFX_ID_1
 	@ The opponent is represented by object event 2, which has the gfx id VAR_OBJ_GFX_ID_0
 
-VerdanturfTown_BattleTentBattleRoom_OnTransition: @ 820230A
+VerdanturfTown_BattleTentBattleRoom_OnTransition:
 	call VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx
 	end
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 8202310
+VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale
@@ -24,28 +24,28 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx:: @ 8202310
 	goto_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale:: @ 8202328
+VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8202333
+VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-VerdanturfTown_BattleTentBattleRoom_OnFrame: @ 820233E
+VerdanturfTown_BattleTentBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_EnterRoom:: @ 8202348
+VerdanturfTown_BattleTentBattleRoom_EventScript_EnterRoom::
 	showobjectat LOCALID_PLAYER, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
 	applymovement LOCALID_PLAYER, VerdanturfTown_BattleTentBattleRoom_Movement_PlayerEnter
 	waitmovement 0
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
 	goto_if_ne VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
-VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820236F
+VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter::
 	tower_setopponent
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter
@@ -56,13 +56,13 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter:: @ 820236F
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	switch VAR_RESULT
 	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent
-VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost:: @ 82023AA
+VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	special LoadPlayerParty
 	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 82023C8
+VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
@@ -82,7 +82,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_DefeatedOpponent:: @ 82023C8
 	waitfanfare
 	special HealPlayerParty
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 820243C
+VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent
@@ -94,14 +94,14 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge:: @ 820243C
 	case 1, VerdanturfTown_BattleTentBattleRoom_EventScript_AskPauseChallenge
 	case 2, VerdanturfTown_BattleTentBattleRoom_EventScript_AskRetireChallenge
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_AskPauseChallenge:: @ 820248A
+VerdanturfTown_BattleTentBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 	case YES, VerdanturfTown_BattleTentBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: @ 82024B8
+VerdanturfTown_BattleTentBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -110,20 +110,20 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_AskRetireChallenge:: @ 82024B8
 	case 0, VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, VerdanturfTown_BattleTentBattleRoom_EventScript_AskContinueChallenge
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_ContinueChallenge:: @ 82024EA
+VerdanturfTown_BattleTentBattleRoom_EventScript_ContinueChallenge::
 	applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFastestRight
 	applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	closemessage
 	goto VerdanturfTown_BattleTentBattleRoom_EventScript_NextOpponentEnter
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon:: @ 8202501
+VerdanturfTown_BattleTentBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	special LoadPlayerParty
 	warp MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_PauseChallenge:: @ 820251F
+VerdanturfTown_BattleTentBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_SavingData
 	waitmessage
 	verdanturftent_save CHALLENGE_STATUS_PAUSED
@@ -133,11 +133,11 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_PauseChallenge:: @ 820251F
 	frontier_reset
 	end
 
-VerdanturfTown_BattleTentBattleRoom_OnWarp: @ 8202541
+VerdanturfTown_BattleTentBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 820254B
+VerdanturfTown_BattleTentBattleRoom_EventScript_SetUpObjects::
 	hideobjectat LOCALID_PLAYER, MAP_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM
 	call VerdanturfTown_BattleTentBattleRoom_EventScript_SetPlayerGfx
 	setvar VAR_TEMP_1, 1
@@ -145,21 +145,21 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_SetUpObjects:: @ 820254B
 	removeobject LOCALID_OPPONENT
 	end
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8202565
+VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent
 	waitmessage
 	return
 
-VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 820256C
+VerdanturfTown_BattleTentBattleRoom_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent
 	waitmessage
 	return
 
-VerdanturfTown_BattleTentBattleRoom_Movement_SetInvisible: @ 8202573
+VerdanturfTown_BattleTentBattleRoom_Movement_SetInvisible:
 	set_invisible
 	step_end
 
-VerdanturfTown_BattleTentBattleRoom_Movement_PlayerEnter: @ 8202575
+VerdanturfTown_BattleTentBattleRoom_Movement_PlayerEnter:
 	set_visible
 	walk_up
 	walk_up
@@ -167,7 +167,7 @@ VerdanturfTown_BattleTentBattleRoom_Movement_PlayerEnter: @ 8202575
 	face_right
 	step_end
 
-VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter: @ 820257B
+VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -175,7 +175,7 @@ VerdanturfTown_BattleTentBattleRoom_Movement_OpponentEnter: @ 820257B
 	face_left
 	step_end
 
-VerdanturfTown_BattleTentBattleRoom_Movement_OpponentExit: @ 8202581
+VerdanturfTown_BattleTentBattleRoom_Movement_OpponentExit:
 	walk_up
 	walk_up
 	walk_up
diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
index 24d047a2a..c2e9dbd6a 100644
--- a/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentCorridor/scripts.inc
@@ -1,14 +1,14 @@
 .set LOCALID_ATTENDANT, 1
 
-VerdanturfTown_BattleTentCorridor_MapScripts:: @ 820208A
+VerdanturfTown_BattleTentCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentCorridor_OnFrame
 	.byte 0
 
-VerdanturfTown_BattleTentCorridor_OnFrame: @ 8202090
+VerdanturfTown_BattleTentCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-VerdanturfTown_BattleTentCorridor_EventScript_EnterCorridor:: @ 820209A
+VerdanturfTown_BattleTentCorridor_EventScript_EnterCorridor::
 	lockall
 	setvar VAR_TEMP_0, 1
 	applymovement LOCALID_ATTENDANT, VerdanturfTown_BattleTentCorridor_Movement_WalkToDoor
@@ -27,16 +27,16 @@ VerdanturfTown_BattleTentCorridor_EventScript_EnterCorridor:: @ 820209A
 	releaseall
 	end
 
-VerdanturfTown_BattleTentCorridor_Movement_WalkToDoor: @ 82020DE
+VerdanturfTown_BattleTentCorridor_Movement_WalkToDoor:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-VerdanturfTown_BattleTentCorridor_Movement_PlayerEnterDoor: @ 82020E3
+VerdanturfTown_BattleTentCorridor_Movement_PlayerEnterDoor:
 	walk_up
-VerdanturfTown_BattleTentCorridor_Movement_AttendantEnterDoor: @ 82020E4
+VerdanturfTown_BattleTentCorridor_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
@@ -44,7 +44,7 @@ VerdanturfTown_BattleTentCorridor_Movement_AttendantEnterDoor: @ 82020E4
 
 @ Leftover text from when this was a Contest Hall in R/S
 @ Unused
-VerdanturfTown_ContestHall_Text_WhichContestYouEntering: @ 82020E7
+VerdanturfTown_ContestHall_Text_WhichContestYouEntering:
 	.string "Which CONTEST are you entering?\n"
 	.string "Want a piece of advice?\p"
 	.string "In any CONTEST, for example, a CUTE\n"
@@ -54,7 +54,7 @@ VerdanturfTown_ContestHall_Text_WhichContestYouEntering: @ 82020E7
 	.string "POKéMON better.$"
 
 @ Unused
-VerdanturfTown_ContestHall_Text_RaisedMonToBeCute: @ 82021C4
+VerdanturfTown_ContestHall_Text_RaisedMonToBeCute:
 	.string "I raised my POKéMON to be cute.\p"
 	.string "I found out you can put POKéMON in\n"
 	.string "a CONTEST for cuteness!\p"
@@ -62,7 +62,7 @@ VerdanturfTown_ContestHall_Text_RaisedMonToBeCute: @ 82021C4
 	.string "loving care…$"
 
 @ Unused
-VerdanturfTown_ContestHall_Text_MyMonRules: @ 8202251
+VerdanturfTown_ContestHall_Text_MyMonRules:
 	.string "My POKéMON rules!\p"
 	.string "It's cool, tough yet beautiful, cute,\n"
 	.string "and smart. It's complete!\p"
@@ -70,7 +70,7 @@ VerdanturfTown_ContestHall_Text_MyMonRules: @ 8202251
 	.string "single CONTEST.$"
 
 @ Unused
-VerdanturfTown_ContestHall_Text_NormalRankStage: @ 82022D6
+VerdanturfTown_ContestHall_Text_NormalRankStage:
 	.string "POKéMON CONTESTS\n"
 	.string "NORMAL RANK STAGE!$"
 
diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
index ff2e6b124..dd8f0eaa4 100644
--- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
+++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc
@@ -1,20 +1,20 @@
 .set LOCALID_ATTENDANT, 1
 
-VerdanturfTown_BattleTentLobby_MapScripts:: @ 82016D0
+VerdanturfTown_BattleTentLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, VerdanturfTown_BattleTentLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, VerdanturfTown_BattleTentLobby_OnWarp
 	.byte 0
 
-VerdanturfTown_BattleTentLobby_OnWarp: @ 82016DB
+VerdanturfTown_BattleTentLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, VerdanturfTown_BattleTentLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-VerdanturfTown_BattleTentLobby_EventScript_TurnPlayerNorth:: @ 82016E5
+VerdanturfTown_BattleTentLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-VerdanturfTown_BattleTentLobby_OnFrame: @ 82016EF
+VerdanturfTown_BattleTentLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, VerdanturfTown_BattleTentLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, VerdanturfTown_BattleTentLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, VerdanturfTown_BattleTentLobby_EventScript_ResumeChallenge
@@ -22,11 +22,11 @@ VerdanturfTown_BattleTentLobby_OnFrame: @ 82016EF
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, VerdanturfTown_BattleTentLobby_EventScript_LostChallenge
 	.2byte 0
 
-VerdanturfTown_BattleTentLobby_EventScript_GetChallengeStatus:: @ 8201719
+VerdanturfTown_BattleTentLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 8201722
+VerdanturfTown_BattleTentLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge, MSGBOX_DEFAULT
 	closemessage
@@ -36,7 +36,7 @@ VerdanturfTown_BattleTentLobby_EventScript_QuitWithoutSaving:: @ 8201722
 	releaseall
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_WonChallenge:: @ 8201757
+VerdanturfTown_BattleTentLobby_EventScript_WonChallenge::
 	lockall
 	msgbox VerdanturfTown_BattleTentLobby_Text_AchievedThreeWinStreak, MSGBOX_DEFAULT
 	message VerdanturfTown_BattleTentLobby_Text_FeatWillBeRecorded
@@ -47,7 +47,7 @@ VerdanturfTown_BattleTentLobby_EventScript_WonChallenge:: @ 8201757
 	playse SE_SAVE
 	waitse
 
-VerdanturfTown_BattleTentLobby_EventScript_GivePrize:: @ 8201791
+VerdanturfTown_BattleTentLobby_EventScript_GivePrize::
 	msgbox VerdanturfTown_BattleTentLobby_Text_PresentYouWithPrize, MSGBOX_DEFAULT
 	verdanturftent_giveprize
 	switch VAR_RESULT
@@ -63,7 +63,7 @@ VerdanturfTown_BattleTentLobby_EventScript_GivePrize:: @ 8201791
 	releaseall
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_NoRoomForPrize:: @ 82017DD
+VerdanturfTown_BattleTentLobby_EventScript_NoRoomForPrize::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize, MSGBOX_DEFAULT
 	waitmessage
 	closemessage
@@ -71,13 +71,13 @@ VerdanturfTown_BattleTentLobby_EventScript_NoRoomForPrize:: @ 82017DD
 	releaseall
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_PrizeWaiting:: @ 82017EE
+VerdanturfTown_BattleTentLobby_EventScript_PrizeWaiting::
 	lockall
 	msgbox VerdanturfTown_BattleTentLobby_Text_AchievedThreeWinStreak, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_GivePrize
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_LostChallenge:: @ 82017FD
+VerdanturfTown_BattleTentLobby_EventScript_LostChallenge::
 	lockall
 	message VerdanturfTown_BattleTentLobby_Text_ResultsWillBeRecorded
 	waitmessage
@@ -91,7 +91,7 @@ VerdanturfTown_BattleTentLobby_EventScript_LostChallenge:: @ 82017FD
 	releaseall
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_ResumeChallenge:: @ 8201837
+VerdanturfTown_BattleTentLobby_EventScript_ResumeChallenge::
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting, MSGBOX_DEFAULT
 	message BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge
@@ -103,7 +103,7 @@ VerdanturfTown_BattleTentLobby_EventScript_ResumeChallenge:: @ 8201837
 	setvar VAR_TEMP_0, 255
 	goto VerdanturfTown_BattleTentLobby_EventScript_EnterChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_Attendant:: @ 8201873
+VerdanturfTown_BattleTentLobby_EventScript_Attendant::
 	lock
 	faceplayer
 	verdanturftent_getprize
@@ -111,7 +111,7 @@ VerdanturfTown_BattleTentLobby_EventScript_Attendant:: @ 8201873
 	goto_if_ne VerdanturfTown_BattleTentLobby_EventScript_PrizeWaiting
 	special SavePlayerParty
 	msgbox VerdanturfTown_BattleTentLobby_Text_WelcomeToBattleTent, MSGBOX_DEFAULT
-VerdanturfTown_BattleTentLobby_EventScript_AskEnterChallenge:: @ 8201893
+VerdanturfTown_BattleTentLobby_EventScript_AskEnterChallenge::
 	message VerdanturfTown_BattleTentLobby_Text_TakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -121,7 +121,7 @@ VerdanturfTown_BattleTentLobby_EventScript_AskEnterChallenge:: @ 8201893
 	case 2, VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_TryEnterChallenge:: @ 82018CF
+VerdanturfTown_BattleTentLobby_EventScript_TryEnterChallenge::
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	setvar VAR_RESULT, 2
@@ -143,7 +143,7 @@ VerdanturfTown_BattleTentLobby_EventScript_TryEnterChallenge:: @ 82018CF
 	case YES, VerdanturfTown_BattleTentLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 8201954
+VerdanturfTown_BattleTentLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	verdanturftent_init
@@ -156,7 +156,7 @@ VerdanturfTown_BattleTentLobby_EventScript_SaveBeforeChallenge:: @ 8201954
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed
-VerdanturfTown_BattleTentLobby_EventScript_EnterChallenge:: @ 82019AE
+VerdanturfTown_BattleTentLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox VerdanturfTown_BattleTentLobby_Text_NowFollowMe, MSGBOX_DEFAULT
@@ -167,36 +167,36 @@ VerdanturfTown_BattleTentLobby_EventScript_EnterChallenge:: @ 82019AE
 	waitstate
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_ExplainChallenge:: @ 82019DB
+VerdanturfTown_BattleTentLobby_EventScript_ExplainChallenge::
 	msgbox VerdanturfTown_BattleTentLobby_Text_ExplainVerdanturfTent, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_AskEnterChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMons:: @ 82019E8
+VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen
 
-VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50:: @ 8201A03
+VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_EndCancelChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8201A10
+VerdanturfTown_BattleTentLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_EndCancelChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed:: @ 8201A1D
+VerdanturfTown_BattleTentLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge
 
-VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge:: @ 8201A34
+VerdanturfTown_BattleTentLobby_EventScript_LoadPartyCancelChallenge::
 	special LoadPlayerParty
-VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge:: @ 8201A37
+VerdanturfTown_BattleTentLobby_EventScript_CancelChallenge::
 	msgbox VerdanturfTown_BattleTentLobby_Text_ReturnFortified, MSGBOX_DEFAULT
-VerdanturfTown_BattleTentLobby_EventScript_EndCancelChallenge:: @ 8201A3F
+VerdanturfTown_BattleTentLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_WalkToDoor:: @ 8201A41
+VerdanturfTown_BattleTentLobby_EventScript_WalkToDoor::
 	applymovement LOCALID_ATTENDANT, VerdanturfTown_BattleTentLobby_Movement_WalkToDoor
 	applymovement OBJ_EVENT_ID_PLAYER, VerdanturfTown_BattleTentLobby_Movement_WalkToDoor
 	waitmovement 0
@@ -209,24 +209,24 @@ VerdanturfTown_BattleTentLobby_EventScript_WalkToDoor:: @ 8201A41
 	waitdooranim
 	return
 
-VerdanturfTown_BattleTentLobby_Movement_WalkToDoor: @ 8201A70
+VerdanturfTown_BattleTentLobby_Movement_WalkToDoor:
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-VerdanturfTown_BattleTentLobby_Movement_AttendantEnterDoor: @ 8201A74
+VerdanturfTown_BattleTentLobby_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-VerdanturfTown_BattleTentLobby_Movement_PlayerEnterDoor: @ 8201A77
+VerdanturfTown_BattleTentLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-VerdanturfTown_BattleTentLobby_EventScript_AttractGiver:: @ 8201A7B
+VerdanturfTown_BattleTentLobby_EventScript_AttractGiver::
 	lock
 	faceplayer
 	goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_BattleTentLobby_EventScript_ReceivedAttract
@@ -239,22 +239,22 @@ VerdanturfTown_BattleTentLobby_EventScript_AttractGiver:: @ 8201A7B
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_ReceivedAttract:: @ 8201AB2
+VerdanturfTown_BattleTentLobby_EventScript_ReceivedAttract::
 	msgbox VerdanturfTown_BattleTentLobby_Text_AttractionMutual, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_Boy1:: @ 8201ABC
+VerdanturfTown_BattleTentLobby_EventScript_Boy1::
 	msgbox VerdanturfTown_BattleTentLobby_Text_TaughtWhatKindsOfMoves, MSGBOX_NPC
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_Boy2:: @ 8201AC5
+VerdanturfTown_BattleTentLobby_EventScript_Boy2::
 	lock
 	msgbox VerdanturfTown_BattleTentLobby_Text_MonsReluctantToUseDislikedMoves, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_Scott:: @ 8201AD0
+VerdanturfTown_BattleTentLobby_EventScript_Scott::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo
@@ -264,24 +264,24 @@ VerdanturfTown_BattleTentLobby_EventScript_Scott:: @ 8201AD0
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo:: @ 8201AED
+VerdanturfTown_BattleTentLobby_EventScript_ScottAlreadySpokenTo::
 	msgbox VerdanturfTown_BattleTentLobby_Text_ScottVisitRegularly, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_LittleBoy:: @ 8201AF7
+VerdanturfTown_BattleTentLobby_EventScript_LittleBoy::
 	lock
 	msgbox VerdanturfTown_BattleTentLobby_Text_GentleMonsScaryIfAngry, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_RulesBoard:: @ 8201B02
+VerdanturfTown_BattleTentLobby_EventScript_RulesBoard::
 	lockall
 	msgbox VerdanturfTown_BattleTentLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard:: @ 8201B11
+VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_BATTLE_TENT_RULES
@@ -298,41 +298,41 @@ VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard:: @ 8201B11
 	case MULTI_B_PRESSED, VerdanturfTown_BattleTentLobby_EventScript_ExitRules
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_RulesLevel:: @ 8201B7E
+VerdanturfTown_BattleTentLobby_EventScript_RulesLevel::
 	msgbox BattleTentLobby_Text_ExplainLevelRules, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_RulesBasics:: @ 8201B8C
+VerdanturfTown_BattleTentLobby_EventScript_RulesBasics::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_RulesNature:: @ 8201B9A
+VerdanturfTown_BattleTentLobby_EventScript_RulesNature::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_RulesMoves:: @ 8201BA8
+VerdanturfTown_BattleTentLobby_EventScript_RulesMoves::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_RulesUnderpowered:: @ 8201BB6
+VerdanturfTown_BattleTentLobby_EventScript_RulesUnderpowered::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_RulesWhenInDanger:: @ 8201BC4
+VerdanturfTown_BattleTentLobby_EventScript_RulesWhenInDanger::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger, MSGBOX_DEFAULT
 	goto VerdanturfTown_BattleTentLobby_EventScript_ReadRulesBoard
 	end
 
-VerdanturfTown_BattleTentLobby_EventScript_ExitRules:: @ 8201BD2
+VerdanturfTown_BattleTentLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-VerdanturfTown_BattleTentLobby_Text_MonsReluctantToUseDislikedMoves: @ 8201BD4
+VerdanturfTown_BattleTentLobby_Text_MonsReluctantToUseDislikedMoves:
 	.string "If it doesn't like a certain move,\n"
 	.string "a POKéMON will be reluctant to use it.\p"
 	.string "It doesn't matter how strong it is,\n"
@@ -344,14 +344,14 @@ VerdanturfTown_BattleTentLobby_Text_MonsReluctantToUseDislikedMoves: @ 8201BD4
 	.string "potential, it's probably failing at\l"
 	.string "using a disliked move against its will.$"
 
-VerdanturfTown_BattleTentLobby_Text_GentleMonsScaryIfAngry: @ 8201D11
+VerdanturfTown_BattleTentLobby_Text_GentleMonsScaryIfAngry:
 	.string "My big sister is gentle usually.\n"
 	.string "But when she gets angry,\l"
 	.string "she's really, really scary!\p"
 	.string "I bet a gentle POKéMON will be scary\n"
 	.string "if it gets angry!$"
 
-VerdanturfTown_BattleTentLobby_Text_AttractionRunsDeep: @ 8201D9E
+VerdanturfTown_BattleTentLobby_Text_AttractionRunsDeep:
 	.string "My feelings toward my POKéMON…\n"
 	.string "The attraction runs deep…\p"
 	.string "Oh, hi, you didn't see that, did you?\n"
@@ -359,20 +359,20 @@ VerdanturfTown_BattleTentLobby_Text_AttractionRunsDeep: @ 8201D9E
 	.string "How would you like this TM for\n"
 	.string "your POKéMON?$"
 
-VerdanturfTown_BattleTentLobby_Text_AttractionMutual: @ 8201E43
+VerdanturfTown_BattleTentLobby_Text_AttractionMutual:
 	.string "My feelings toward my POKéMON…\n"
 	.string "I'm sure the attraction is mutual!\p"
 	.string "They battle exactly the way I want\n"
 	.string "them to!$"
 
-VerdanturfTown_BattleTentLobby_Text_TaughtWhatKindsOfMoves: @ 8201EB1
+VerdanturfTown_BattleTentLobby_Text_TaughtWhatKindsOfMoves:
 	.string "What kind of moves have you taught\n"
 	.string "your POKéMON?\p"
 	.string "I think you would give yourself\n"
 	.string "an advantage if they knew how to\l"
 	.string "heal or protect themselves.$"
 
-VerdanturfTown_BattleTentLobby_Text_ScottCanMeetToughTrainers: @ 8201F3F
+VerdanturfTown_BattleTentLobby_Text_ScottCanMeetToughTrainers:
 	.string "SCOTT: Hey there, {PLAYER}{KUN}!\n"
 	.string "I thought I might see you here.\p"
 	.string "A BATTLE TENT's a place where\n"
@@ -382,7 +382,7 @@ VerdanturfTown_BattleTentLobby_Text_ScottCanMeetToughTrainers: @ 8201F3F
 	.string "{PLAYER}{KUN}, I expect you to do\n"
 	.string "the best you can!$"
 
-VerdanturfTown_BattleTentLobby_Text_ScottVisitRegularly: @ 8202025
+VerdanturfTown_BattleTentLobby_Text_ScottVisitRegularly:
 	.string "SCOTT: I visit here regularly in hopes\n"
 	.string "of seeing tough TRAINERS in action\l"
 	.string "in whatever the situation.$"
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
index 993188cb2..9d0485a77 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
@@ -1,7 +1,7 @@
-VerdanturfTown_FriendshipRatersHouse_MapScripts:: @ 8203030
+VerdanturfTown_FriendshipRatersHouse_MapScripts::
 	.byte 0
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater:: @ 8203031
+VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater::
 	lock
 	faceplayer
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou, MSGBOX_DEFAULT
@@ -17,42 +17,42 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_FriendshipRater:: @ 8203031
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou:: @ 8203094
+VerdanturfTown_FriendshipRatersHouse_EventScript_DetestsYou::
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary:: @ 820309E
+VerdanturfTown_FriendshipRatersHouse_EventScript_VeryWary::
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_VeryWary, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou:: @ 82030A8
+VerdanturfTown_FriendshipRatersHouse_EventScript_NotUsedToYou::
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou:: @ 82030B2
+VerdanturfTown_FriendshipRatersHouse_EventScript_GettingUsedToYou::
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot:: @ 82030BC
+VerdanturfTown_FriendshipRatersHouse_EventScript_LikesYouQuiteALot::
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy:: @ 82030C6
+VerdanturfTown_FriendshipRatersHouse_EventScript_VeryHappy::
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou:: @ 82030D0
+VerdanturfTown_FriendshipRatersHouse_EventScript_AdoresYou::
 	msgbox VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu:: @ 82030DA
+VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu::
 	lock
 	faceplayer
 	waitse
@@ -62,43 +62,43 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_Pikachu:: @ 82030DA
 	release
 	end
 
-VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou: @ 82030ED
+VerdanturfTown_FriendshipRatersHouse_Text_SeeHowMuchPokemonLikesYou:
 	.string "Let me see your POKéMON.\n"
 	.string "I'll check to see how much it likes you.\p"
 	.string "Oh.\n"
 	.string "Your POKéMON…$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou: @ 8203141
+VerdanturfTown_FriendshipRatersHouse_Text_AdoresYou:
 	.string "It adores you.\n"
 	.string "It can't possibly love you any more.\l"
 	.string "I even feel happy seeing it.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy: @ 8203192
+VerdanturfTown_FriendshipRatersHouse_Text_VeryHappy:
 	.string "It seems to be very happy.\n"
 	.string "It obviously likes you a whole lot.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot: @ 82031D1
+VerdanturfTown_FriendshipRatersHouse_Text_LikesYouQuiteALot:
 	.string "It likes you quite a lot.\n"
 	.string "It seems to want to be babied a little.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou: @ 8203213
+VerdanturfTown_FriendshipRatersHouse_Text_GettingUsedToYou:
 	.string "It's getting used to you.\n"
 	.string "It seems to believe in you.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou: @ 8203249
+VerdanturfTown_FriendshipRatersHouse_Text_NotUsedToYou:
 	.string "It's not very used to you yet.\n"
 	.string "It neither loves nor hates you.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_VeryWary: @ 8203288
+VerdanturfTown_FriendshipRatersHouse_Text_VeryWary:
 	.string "It's very wary.\n"
 	.string "It has scary viciousness in its eyes.\l"
 	.string "It doesn't like you much at all.$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou: @ 82032DF
+VerdanturfTown_FriendshipRatersHouse_Text_DetestsYou:
 	.string "This is a little hard for me to say…\p"
 	.string "Your POKéMON simply detests you.\n"
 	.string "Doesn't that make you uncomfortable?$"
 
-VerdanturfTown_FriendshipRatersHouse_Text_Pikachu: @ 820334A
+VerdanturfTown_FriendshipRatersHouse_Text_Pikachu:
 	.string "PIKACHU: Pika pika!$"
 
diff --git a/data/maps/VerdanturfTown_House/scripts.inc b/data/maps/VerdanturfTown_House/scripts.inc
index 5f47e52fa..c4dc922de 100644
--- a/data/maps/VerdanturfTown_House/scripts.inc
+++ b/data/maps/VerdanturfTown_House/scripts.inc
@@ -1,21 +1,21 @@
-VerdanturfTown_House_MapScripts:: @ 820335E
+VerdanturfTown_House_MapScripts::
 	.byte 0
 
-VerdanturfTown_House_EventScript_Woman1:: @ 820335F
+VerdanturfTown_House_EventScript_Woman1::
 	msgbox VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague, MSGBOX_NPC
 	end
 
-VerdanturfTown_House_EventScript_Woman2:: @ 8203368
+VerdanturfTown_House_EventScript_Woman2::
 	msgbox VerdanturfTown_House_Text_DefeatEliteFourInARow, MSGBOX_NPC
 	end
 
-VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague: @ 8203371
+VerdanturfTown_House_Text_TrainersGatherAtPokemonLeague:
 	.string "Far away, deep in EVER GRANDE CITY,\n"
 	.string "is the POKéMON LEAGUE.\p"
 	.string "The TRAINERS who gather there are\n"
 	.string "all frighteningly well skilled.$"
 
-VerdanturfTown_House_Text_DefeatEliteFourInARow: @ 82033EE
+VerdanturfTown_House_Text_DefeatEliteFourInARow:
 	.string "In the POKéMON LEAGUE, I think the\n"
 	.string "rules say that you have to battle the\l"
 	.string "ELITE FOUR all in a row.\p"
diff --git a/data/maps/VerdanturfTown_Mart/scripts.inc b/data/maps/VerdanturfTown_Mart/scripts.inc
index cc4694fe1..7eb340df2 100644
--- a/data/maps/VerdanturfTown_Mart/scripts.inc
+++ b/data/maps/VerdanturfTown_Mart/scripts.inc
@@ -1,7 +1,7 @@
-VerdanturfTown_Mart_MapScripts:: @ 8202586
+VerdanturfTown_Mart_MapScripts::
 	.byte 0
 
-VerdanturfTown_Mart_EventScript_Clerk:: @ 8202587
+VerdanturfTown_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -12,7 +12,7 @@ VerdanturfTown_Mart_EventScript_Clerk:: @ 8202587
 	end
 
 	.align 2
-VerdanturfTown_Mart_Pokemart: @ 82025A0
+VerdanturfTown_Mart_Pokemart:
 	.2byte ITEM_GREAT_BALL
 	.2byte ITEM_NEST_BALL
 	.2byte ITEM_SUPER_POTION
@@ -28,31 +28,31 @@ VerdanturfTown_Mart_Pokemart: @ 82025A0
 	release
 	end
 
-VerdanturfTown_Mart_EventScript_Boy:: @ 82025BA
+VerdanturfTown_Mart_EventScript_Boy::
 	msgbox VerdanturfTown_Mart_Text_XSpecialIsCrucial, MSGBOX_NPC
 	end
 
-VerdanturfTown_Mart_EventScript_ExpertF:: @ 82025C3
+VerdanturfTown_Mart_EventScript_ExpertF::
 	msgbox VerdanturfTown_Mart_Text_NoStrategyGuidesForBattleTent, MSGBOX_NPC
 	end
 
-VerdanturfTown_Mart_EventScript_Lass:: @ 82025CC
+VerdanturfTown_Mart_EventScript_Lass::
 	msgbox VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon, MSGBOX_NPC
 	end
 
-VerdanturfTown_Mart_Text_XSpecialIsCrucial: @ 82025D5
+VerdanturfTown_Mart_Text_XSpecialIsCrucial:
 	.string "For any POKéMON match, X SPECIAL\n"
 	.string "is crucial.\p"
 	.string "It jacks up the power of some moves\n"
 	.string "even though it's only for one battle.$"
 
-VerdanturfTown_Mart_Text_NoStrategyGuidesForBattleTent: @ 820264C
+VerdanturfTown_Mart_Text_NoStrategyGuidesForBattleTent:
 	.string "They don't seem to sell any winning\n"
 	.string "strategy guides for the BATTLE TENT…\p"
 	.string "It seems one must rely on one's\n"
 	.string "own wits after all…$"
 
-VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon: @ 82026C9
+VerdanturfTown_Mart_Text_NestBallOnWeakenedPokemon:
 	.string "The NEST BALL works better on\n"
 	.string "weakened POKéMON.\p"
 	.string "VERDANTURF is the only place you can\n"
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index f59d40456..5fbdba42f 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
@@ -1,16 +1,16 @@
 .set LOCALID_NURSE, 1
 
-VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8202726
+VerdanturfTown_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, VerdanturfTown_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-VerdanturfTown_PokemonCenter_1F_OnTransition: @ 8202731
+VerdanturfTown_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_VERDANTURF_TOWN
 	call Common_EventScript_UpdateBrineyLocation
 	end
 
-VerdanturfTown_PokemonCenter_1F_EventScript_Nurse:: @ 820273A
+VerdanturfTown_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -18,15 +18,15 @@ VerdanturfTown_PokemonCenter_1F_EventScript_Nurse:: @ 820273A
 	release
 	end
 
-VerdanturfTown_PokemonCenter_1F_EventScript_Gentleman:: @ 8202748
+VerdanturfTown_PokemonCenter_1F_EventScript_Gentleman::
 	msgbox VerdanturfTown_PokemonCenter_1F_Text_FaithInYourPokemon, MSGBOX_NPC
 	end
 
-VerdanturfTown_PokemonCenter_1F_EventScript_ExpertM:: @ 8202751
+VerdanturfTown_PokemonCenter_1F_EventScript_ExpertM::
 	msgbox VerdanturfTown_PokemonCenter_1F_Text_VisitForBattleTent, MSGBOX_NPC
 	end
 
-VerdanturfTown_PokemonCenter_1F_Text_FaithInYourPokemon: @ 820275A
+VerdanturfTown_PokemonCenter_1F_Text_FaithInYourPokemon:
 	.string "You can't consider yourself a real\n"
 	.string "TRAINER if you don't have faith\l"
 	.string "in your POKéMON.\p"
@@ -34,7 +34,7 @@ VerdanturfTown_PokemonCenter_1F_Text_FaithInYourPokemon: @ 820275A
 	.string "in their battling POKéMON can win\l"
 	.string "through to the very end.$"
 
-VerdanturfTown_PokemonCenter_1F_Text_VisitForBattleTent: @ 820280B
+VerdanturfTown_PokemonCenter_1F_Text_VisitForBattleTent:
 	.string "The reason why anyone would visit\n"
 	.string "VERDANTURF…\p"
 	.string "It's the BATTLE TENT. It goes without\n"
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
index 7802f5b03..4a6971ed1 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
@@ -1,4 +1,4 @@
-VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897
+VerdanturfTown_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ VerdanturfTown_PokemonCenter_2F_MapScripts:: @ 8202897
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-VerdanturfTown_PokemonCenter_2F_EventScript_Colosseum:: @ 82028AC
+VerdanturfTown_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-VerdanturfTown_PokemonCenter_2F_EventScript_TradeCenter:: @ 82028B2
+VerdanturfTown_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-VerdanturfTown_PokemonCenter_2F_EventScript_RecordCorner:: @ 82028B8
+VerdanturfTown_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 
diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
index 25d37a762..e9f5a6ae0 100644
--- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
@@ -1,7 +1,7 @@
-VerdanturfTown_WandasHouse_MapScripts:: @ 82028BE
+VerdanturfTown_WandasHouse_MapScripts::
 	.byte 0
 
-VerdanturfTown_WandasHouse_EventScript_Wally:: @ 82028BF
+VerdanturfTown_WandasHouse_EventScript_Wally::
 	lock
 	faceplayer
 	goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech
@@ -10,12 +10,12 @@ VerdanturfTown_WandasHouse_EventScript_Wally:: @ 82028BF
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech:: @ 82028D7
+VerdanturfTown_WandasHouse_EventScript_WallyShortSpeech::
 	msgbox VerdanturfTown_WandasHouse_Text_StrongerSpeechShort, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_WallysUncle:: @ 82028E1
+VerdanturfTown_WandasHouse_EventScript_WallysUncle::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande
@@ -24,21 +24,21 @@ VerdanturfTown_WandasHouse_EventScript_WallysUncle:: @ 82028E1
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_WallysUncleSlippedOff:: @ 82028FF
+VerdanturfTown_WandasHouse_EventScript_WallysUncleSlippedOff::
 	msgbox VerdanturfTown_WandasHouse_Text_WallySlippedOff, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande:: @ 8202909
+VerdanturfTown_WandasHouse_EventScript_WallysUncleEverGrande::
 	msgbox VerdanturfTown_WandasHouse_Text_WallyGoneThatFar, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_WandasBoyfriend:: @ 8202913
+VerdanturfTown_WandasHouse_EventScript_WandasBoyfriend::
 	msgbox VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay, MSGBOX_NPC
 	end
 
-VerdanturfTown_WandasHouse_EventScript_Wanda:: @ 820291C
+VerdanturfTown_WandasHouse_EventScript_Wanda::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_WandaDontWorry
@@ -47,17 +47,17 @@ VerdanturfTown_WandasHouse_EventScript_Wanda:: @ 820291C
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_MeetWanda:: @ 820293A
+VerdanturfTown_WandasHouse_EventScript_MeetWanda::
 	msgbox VerdanturfTown_WandasHouse_Text_MeetWanda, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_WandaDontWorry:: @ 8202944
+VerdanturfTown_WandasHouse_EventScript_WandaDontWorry::
 	msgbox VerdanturfTown_WandasHouse_Text_DontWorryAboutWally, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_WallysAunt:: @ 820294E
+VerdanturfTown_WandasHouse_EventScript_WallysAunt::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande
@@ -67,22 +67,22 @@ VerdanturfTown_WandasHouse_EventScript_WallysAunt:: @ 820294E
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_WallysAuntTunnelOpen:: @ 8202975
+VerdanturfTown_WandasHouse_EventScript_WallysAuntTunnelOpen::
 	msgbox VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_WallysAuntAnythingHappened:: @ 820297F
+VerdanturfTown_WandasHouse_EventScript_WallysAuntAnythingHappened::
 	msgbox VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande:: @ 8202989
+VerdanturfTown_WandasHouse_EventScript_WallysAuntEverGrande::
 	msgbox VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_WandasHouse_Text_StrongerSpeech: @ 8202993
+VerdanturfTown_WandasHouse_Text_StrongerSpeech:
 	.string "WALLY: I lost to you, {PLAYER}, but I'm\n"
 	.string "not feeling down anymore.\p"
 	.string "Because I have a new purpose in life.\n"
@@ -94,13 +94,13 @@ VerdanturfTown_WandasHouse_Text_StrongerSpeech: @ 8202993
 	.string "When I do, I'm going to challenge you\n"
 	.string "to another battle.$"
 
-VerdanturfTown_WandasHouse_Text_StrongerSpeechShort: @ 8202ABE
+VerdanturfTown_WandasHouse_Text_StrongerSpeechShort:
 	.string "WALLY: Please watch me, {PLAYER}.\n"
 	.string "I'm going to get stronger than you.\p"
 	.string "When I do, I'm going to challenge you\n"
 	.string "to another battle.$"
 
-VerdanturfTown_WandasHouse_Text_WallysNextDoor: @ 8202B37
+VerdanturfTown_WandasHouse_Text_WallysNextDoor:
 	.string "UNCLE: Oh! {PLAYER}{KUN}!\n"
 	.string "WALLY's next door.\p"
 	.string "But, boy, there's something I have to\n"
@@ -111,18 +111,18 @@ VerdanturfTown_WandasHouse_Text_WallysNextDoor: @ 8202B37
 	.string "It could be POKéMON that are giving\l"
 	.string "the boy hope.$"
 
-VerdanturfTown_WandasHouse_Text_WallySlippedOff: @ 8202C20
+VerdanturfTown_WandasHouse_Text_WallySlippedOff:
 	.string "WALLY's gone away…\n"
 	.string "He slipped off on his own…$"
 
-VerdanturfTown_WandasHouse_Text_WallyGoneThatFar: @ 8202C4E
+VerdanturfTown_WandasHouse_Text_WallyGoneThatFar:
 	.string "UNCLE: Is that right?\n"
 	.string "WALLY's gone away that far all by\l"
 	.string "himself…\p"
 	.string "Well, I have to give him credit--he is\n"
 	.string "my little brother's son.$"
 
-VerdanturfTown_WandasHouse_Text_MeetWanda: @ 8202CCF
+VerdanturfTown_WandasHouse_Text_MeetWanda:
 	.string "WANDA: You are?\n"
 	.string "Oh, right, I get it!\p"
 	.string "You're the {PLAYER} who WALLY was\n"
@@ -132,18 +132,18 @@ VerdanturfTown_WandasHouse_Text_MeetWanda: @ 8202CCF
 	.string "I think WALLY's become a lot more lively\n"
 	.string "and healthy since he came here.$"
 
-VerdanturfTown_WandasHouse_Text_DontWorryAboutWally: @ 8202D91
+VerdanturfTown_WandasHouse_Text_DontWorryAboutWally:
 	.string "WANDA: Don't worry about WALLY.\n"
 	.string "He'll be just fine.\p"
 	.string "I know my little cousin, and he has\n"
 	.string "POKéMON with him, too.$"
 
-VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay: @ 8202E00
+VerdanturfTown_WandasHouse_Text_CanSeeGirlfriendEveryDay:
 	.string "Thanks to you, I can see my girlfriend\n"
 	.string "every day.\l"
 	.string "Happy? You bet I am!$"
 
-VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven: @ 8202E47
+VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven:
 	.string "My daughter's boyfriend is a very\n"
 	.string "driven and passionate sort of person.\p"
 	.string "He's been digging a tunnel nonstop\n"
@@ -151,17 +151,17 @@ VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendDriven: @ 8202E47
 	.string "My daughter's a little concerned,\n"
 	.string "so she goes out to the tunnel a lot.$"
 
-VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging: @ 8202F19
+VerdanturfTown_WandasHouse_Text_DaughtersBoyfriendWasDigging:
 	.string "It's amazing. My daughter's boyfriend\n"
 	.string "was digging the tunnel by hand!\p"
 	.string "It's so incredible!$"
 
-VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally: @ 8202F73
+VerdanturfTown_WandasHouse_Text_IfAnythingHappenedToWally:
 	.string "If anything were to happen to WALLY,\n"
 	.string "I would never be able to look his\l"
 	.string "parents in PETALBURG in the eye…$"
 
-VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande: @ 8202FDB
+VerdanturfTown_WandasHouse_Text_WallyWasInEverGrande:
 	.string "WALLY was in EVER GRANDE?\p"
 	.string "His parents in PETALBURG would be\n"
 	.string "astonished to hear that!$"
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
index f7668d4a5..7f6669f7b 100644
--- a/data/maps/VictoryRoad_1F/scripts.inc
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -1,27 +1,27 @@
 .set LOCALID_WALLY_ENTRANCE, 4
 
-VictoryRoad_1F_MapScripts:: @ 8235D7A
+VictoryRoad_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, VictoryRoad_1F_OnTransition
 	.byte 0
 
-VictoryRoad_1F_OnTransition: @ 8235D80
+VictoryRoad_1F_OnTransition:
 	compare VAR_VICTORY_ROAD_1F_STATE, 1
 	call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos1
 	compare VAR_VICTORY_ROAD_1F_STATE, 2
 	call_if_eq VictoryRoad_1F_EventScript_SetEntranceWallyPos2
 	end
 
-VictoryRoad_1F_EventScript_SetEntranceWallyPos1:: @ 8235D97
+VictoryRoad_1F_EventScript_SetEntranceWallyPos1::
 	setobjectxyperm LOCALID_WALLY_ENTRANCE, 2, 24
 	setobjectmovementtype LOCALID_WALLY_ENTRANCE, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-VictoryRoad_1F_EventScript_SetEntranceWallyPos2:: @ 8235DA3
+VictoryRoad_1F_EventScript_SetEntranceWallyPos2::
 	setobjectxyperm LOCALID_WALLY_ENTRANCE, 3, 24
 	setobjectmovementtype LOCALID_WALLY_ENTRANCE, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-VictoryRoad_1F_EventScript_WallyBattleTrigger1:: @ 8235DAF
+VictoryRoad_1F_EventScript_WallyBattleTrigger1::
 	lockall
 	setvar VAR_0x8008, 1
 	addobject LOCALID_WALLY_ENTRANCE
@@ -30,7 +30,7 @@ VictoryRoad_1F_EventScript_WallyBattleTrigger1:: @ 8235DAF
 	goto VictoryRoad_1F_EventScript_WallyEntranceBattle
 	end
 
-VictoryRoad_1F_EventScript_WallyBattleTrigger2:: @ 8235DC8
+VictoryRoad_1F_EventScript_WallyBattleTrigger2::
 	lockall
 	setvar VAR_0x8008, 2
 	addobject LOCALID_WALLY_ENTRANCE
@@ -39,7 +39,7 @@ VictoryRoad_1F_EventScript_WallyBattleTrigger2:: @ 8235DC8
 	goto VictoryRoad_1F_EventScript_WallyEntranceBattle
 	end
 
-VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1
+VictoryRoad_1F_EventScript_WallyEntranceBattle::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	msgbox VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore, MSGBOX_DEFAULT
@@ -52,7 +52,7 @@ VictoryRoad_1F_EventScript_WallyEntranceBattle:: @ 8235DE1
 	releaseall
 	end
 
-VictoryRoad_1F_Movement_WallyApproachPlayer1: @ 8235E15
+VictoryRoad_1F_Movement_WallyApproachPlayer1:
 	walk_left
 	walk_left
 	walk_left
@@ -66,7 +66,7 @@ VictoryRoad_1F_Movement_WallyApproachPlayer1: @ 8235E15
 	walk_up
 	step_end
 
-VictoryRoad_1F_Movement_WallyApproachPlayer2: @ 8235E21
+VictoryRoad_1F_Movement_WallyApproachPlayer2:
 	walk_left
 	walk_left
 	walk_left
@@ -80,12 +80,12 @@ VictoryRoad_1F_Movement_WallyApproachPlayer2: @ 8235E21
 	step_end
 
 @ This Wally appears near the entrance once his battle is triggered and remains there until the Hall of Fame is entered
-VictoryRoad_1F_EventScript_EntranceWally:: @ 8235E2C
+VictoryRoad_1F_EventScript_EntranceWally::
 	msgbox VictoryRoad_1F_Text_WallyPostEntranceBattle, MSGBOX_NPC
 	end
 
-@ This Wally appears and remains at the exit after the Hall of Fame is entered 
-VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35
+@ This Wally appears and remains at the exit after the Hall of Fame is entered
+VictoryRoad_1F_EventScript_ExitWally::
 	trainerbattle_single TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -93,37 +93,37 @@ VictoryRoad_1F_EventScript_ExitWally:: @ 8235E35
 	msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_RematchWally:: @ 8235E5C
+VictoryRoad_1F_EventScript_RematchWally::
 	trainerbattle_rematch TRAINER_WALLY_VR_2, VictoryRoad_1F_Text_WallyIntro, VictoryRoad_1F_Text_WallyDefeat
 	msgbox VictoryRoad_1F_Text_WallyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_Edgar:: @ 8235E73
+VictoryRoad_1F_EventScript_Edgar::
 	trainerbattle_single TRAINER_EDGAR, VictoryRoad_1F_Text_EdgarIntro, VictoryRoad_1F_Text_EdgarDefeat
 	msgbox VictoryRoad_1F_Text_EdgarPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_Albert:: @ 8235E8A
+VictoryRoad_1F_EventScript_Albert::
 	trainerbattle_single TRAINER_ALBERT, VictoryRoad_1F_Text_AlbertIntro, VictoryRoad_1F_Text_AlbertDefeat
 	msgbox VictoryRoad_1F_Text_AlbertPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_Hope:: @ 8235EA1
+VictoryRoad_1F_EventScript_Hope::
 	trainerbattle_single TRAINER_HOPE, VictoryRoad_1F_Text_HopeIntro, VictoryRoad_1F_Text_HopeDefeat
 	msgbox VictoryRoad_1F_Text_HopePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_Quincy:: @ 8235EB8
+VictoryRoad_1F_EventScript_Quincy::
 	trainerbattle_single TRAINER_QUINCY, VictoryRoad_1F_Text_QuincyIntro, VictoryRoad_1F_Text_QuincyDefeat
 	msgbox VictoryRoad_1F_Text_QuincyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_EventScript_Katelynn:: @ 8235ECF
+VictoryRoad_1F_EventScript_Katelynn::
 	trainerbattle_single TRAINER_KATELYNN, VictoryRoad_1F_Text_KatelynnIntro, VictoryRoad_1F_Text_KatelynnDefeat
 	msgbox VictoryRoad_1F_Text_KatelynnPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore: @ 8235EE6
+VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore:
 	.string "WALLY: Hi! {PLAYER}!\p"
 	.string "I bet you're surprised to see me here!\p"
 	.string "I made it all the way here, and it's\n"
@@ -135,89 +135,89 @@ VictoryRoad_1F_Text_WallyNotGoingToLoseAnymore: @ 8235EE6
 	.string "gave me courage and strength!\p"
 	.string "Okay… Here I come!$"
 
-VictoryRoad_1F_Text_WallyEntranceDefeat: @ 8235FFC
+VictoryRoad_1F_Text_WallyEntranceDefeat:
 	.string "Wow!\n"
 	.string "{PLAYER}, you are strong, after all!$"
 
-VictoryRoad_1F_Text_WallyPostEntranceBattle: @ 8236020
+VictoryRoad_1F_Text_WallyPostEntranceBattle:
 	.string "WALLY: I couldn't beat you today,\n"
 	.string "{PLAYER}, but one of these days, I'll\l"
 	.string "catch up to you!$"
 
-VictoryRoad_1F_Text_WallyIntro: @ 8236073
+VictoryRoad_1F_Text_WallyIntro:
 	.string "WALLY: Hi! {PLAYER}!\p"
 	.string "I've gotten stronger since that last\n"
 	.string "time! I wanted to show you, {PLAYER}!\p"
 	.string "Okay… Here I come!$"
 
-VictoryRoad_1F_Text_WallyDefeat: @ 82360DA
+VictoryRoad_1F_Text_WallyDefeat:
 	.string "Wow!\n"
 	.string "{PLAYER}, you are strong, after all!$"
 
-VictoryRoad_1F_Text_WallyPostBattle: @ 82360FE
+VictoryRoad_1F_Text_WallyPostBattle:
 	.string "WALLY: I couldn't beat you this time,\n"
 	.string "too… But one of these days, {PLAYER},\l"
 	.string "I'm going to catch up to you…\p"
 	.string "And challenge the POKéMON LEAGUE!$"
 
-VictoryRoad_1F_Text_EdgarIntro: @ 8236184
+VictoryRoad_1F_Text_EdgarIntro:
 	.string "I've made it this far a couple times,\n"
 	.string "but the last stretch is so long…$"
 
-VictoryRoad_1F_Text_EdgarDefeat: @ 82361CB
+VictoryRoad_1F_Text_EdgarDefeat:
 	.string "My dream ends here again…$"
 
-VictoryRoad_1F_Text_EdgarPostBattle: @ 82361E5
+VictoryRoad_1F_Text_EdgarPostBattle:
 	.string "You've made it this far. Keep the\n"
 	.string "momentum going and become the\l"
 	.string "CHAMPION! If anyone can, it's you!$"
 
-VictoryRoad_1F_Text_AlbertIntro: @ 8236248
+VictoryRoad_1F_Text_AlbertIntro:
 	.string "I didn't come all this way to lose now.\n"
 	.string "That possibility doesn't exist!$"
 
-VictoryRoad_1F_Text_AlbertDefeat: @ 8236290
+VictoryRoad_1F_Text_AlbertDefeat:
 	.string "Impossible…\n"
 	.string "I lost?$"
 
-VictoryRoad_1F_Text_AlbertPostBattle: @ 82362A4
+VictoryRoad_1F_Text_AlbertPostBattle:
 	.string "I lost here…\p"
 	.string "That means I lack the qualifications\n"
 	.string "to become the CHAMPION…$"
 
-VictoryRoad_1F_Text_HopeIntro: @ 82362EE
+VictoryRoad_1F_Text_HopeIntro:
 	.string "This seemingly infinite and harsh road\n"
 	.string "lives up to its name of VICTORY.$"
 
-VictoryRoad_1F_Text_HopeDefeat: @ 8236336
+VictoryRoad_1F_Text_HopeDefeat:
 	.string "Your battle style is fantastic…$"
 
-VictoryRoad_1F_Text_HopePostBattle: @ 8236356
+VictoryRoad_1F_Text_HopePostBattle:
 	.string "You seem to have the potential for\n"
 	.string "becoming the CHAMPION.$"
 
-VictoryRoad_1F_Text_QuincyIntro: @ 8236390
+VictoryRoad_1F_Text_QuincyIntro:
 	.string "What is the VICTORY ROAD?\n"
 	.string "I'll tell you if you win!$"
 
-VictoryRoad_1F_Text_QuincyDefeat: @ 82363C4
+VictoryRoad_1F_Text_QuincyDefeat:
 	.string "Okay!\n"
 	.string "Well done!$"
 
-VictoryRoad_1F_Text_QuincyPostBattle: @ 82363D5
+VictoryRoad_1F_Text_QuincyPostBattle:
 	.string "Getting through here safely--that's\n"
 	.string "the final test for any TRAINER aiming\l"
 	.string "to become the POKéMON CHAMPION.\p"
 	.string "That's why it's called the VICTORY\n"
 	.string "ROAD.$"
 
-VictoryRoad_1F_Text_KatelynnIntro: @ 8236468
+VictoryRoad_1F_Text_KatelynnIntro:
 	.string "I have nothing to say to anyone\n"
 	.string "that's come this far. Come on!$"
 
-VictoryRoad_1F_Text_KatelynnDefeat: @ 82364A7
+VictoryRoad_1F_Text_KatelynnDefeat:
 	.string "This is a disgrace…$"
 
-VictoryRoad_1F_Text_KatelynnPostBattle: @ 82364BB
+VictoryRoad_1F_Text_KatelynnPostBattle:
 	.string "Humph, go right on ahead.\n"
 	.string "See if I care.$"
diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc
index fd175599c..b8ec69935 100644
--- a/data/maps/VictoryRoad_B1F/scripts.inc
+++ b/data/maps/VictoryRoad_B1F/scripts.inc
@@ -1,88 +1,88 @@
-VictoryRoad_B1F_MapScripts:: @ 82364E4
+VictoryRoad_B1F_MapScripts::
 	.byte 0
 
-VictoryRoad_B1F_EventScript_Samuel:: @ 82364E5
+VictoryRoad_B1F_EventScript_Samuel::
 	trainerbattle_single TRAINER_SAMUEL, VictoryRoad_B1F_Text_SamuelIntro, VictoryRoad_B1F_Text_SamuelDefeat
 	msgbox VictoryRoad_B1F_Text_SamuelPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_Shannon:: @ 82364FC
+VictoryRoad_B1F_EventScript_Shannon::
 	trainerbattle_single TRAINER_SHANNON, VictoryRoad_B1F_Text_ShannonIntro, VictoryRoad_B1F_Text_ShannonDefeat
 	msgbox VictoryRoad_B1F_Text_ShannonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_Michelle:: @ 8236513
+VictoryRoad_B1F_EventScript_Michelle::
 	trainerbattle_single TRAINER_MICHELLE, VictoryRoad_B1F_Text_MichelleIntro, VictoryRoad_B1F_Text_MichelleDefeat
 	msgbox VictoryRoad_B1F_Text_MichellePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_Mitchell:: @ 823652A
+VictoryRoad_B1F_EventScript_Mitchell::
 	trainerbattle_single TRAINER_MITCHELL, VictoryRoad_B1F_Text_MitchellIntro, VictoryRoad_B1F_Text_MitchellDefeat
 	msgbox VictoryRoad_B1F_Text_MitchellPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_EventScript_Halle:: @ 8236541
+VictoryRoad_B1F_EventScript_Halle::
 	trainerbattle_single TRAINER_HALLE, VictoryRoad_B1F_Text_HalleIntro, VictoryRoad_B1F_Text_HalleDefeat
 	msgbox VictoryRoad_B1F_Text_HallePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B1F_Text_SamuelIntro: @ 8236558
+VictoryRoad_B1F_Text_SamuelIntro:
 	.string "The thought that I'm getting closer to\n"
 	.string "the POKéMON LEAGUE…\p"
 	.string "I'm getting stage fright…$"
 
-VictoryRoad_B1F_Text_SamuelDefeat: @ 82365AD
+VictoryRoad_B1F_Text_SamuelDefeat:
 	.string "I couldn't do a thing…$"
 
-VictoryRoad_B1F_Text_SamuelPostBattle: @ 82365C4
+VictoryRoad_B1F_Text_SamuelPostBattle:
 	.string "The POKéMON LEAGUE became distant\n"
 	.string "again… What a letdown…$"
 
-VictoryRoad_B1F_Text_ShannonIntro: @ 82365FD
+VictoryRoad_B1F_Text_ShannonIntro:
 	.string "To win your way through the POKéMON\n"
 	.string "LEAGUE, you need the trust of your\l"
 	.string "POKéMON.$"
 
-VictoryRoad_B1F_Text_ShannonDefeat: @ 823664D
+VictoryRoad_B1F_Text_ShannonDefeat:
 	.string "Your relationship is based on\n"
 	.string "solid trust.$"
 
-VictoryRoad_B1F_Text_ShannonPostBattle: @ 8236678
+VictoryRoad_B1F_Text_ShannonPostBattle:
 	.string "By being together all the time, trust\n"
 	.string "grows between POKéMON and TRAINERS.$"
 
-VictoryRoad_B1F_Text_MichelleIntro: @ 82366C2
+VictoryRoad_B1F_Text_MichelleIntro:
 	.string "This isn't the goal. It's only a place\n"
 	.string "on the way to the POKéMON LEAGUE.$"
 
-VictoryRoad_B1F_Text_MichelleDefeat: @ 823670B
+VictoryRoad_B1F_Text_MichelleDefeat:
 	.string "That's the way!$"
 
-VictoryRoad_B1F_Text_MichellePostBattle: @ 823671B
+VictoryRoad_B1F_Text_MichellePostBattle:
 	.string "You'll do fine, for sure!\n"
 	.string "Your POKéMON are all eager to go!$"
 
-VictoryRoad_B1F_Text_MitchellIntro: @ 8236757
+VictoryRoad_B1F_Text_MitchellIntro:
 	.string "My POKéMON are cosmically\n"
 	.string "awe inspiring!$"
 
-VictoryRoad_B1F_Text_MitchellDefeat: @ 8236780
+VictoryRoad_B1F_Text_MitchellDefeat:
 	.string "I've never met anyone like you before.$"
 
-VictoryRoad_B1F_Text_MitchellPostBattle: @ 82367A7
+VictoryRoad_B1F_Text_MitchellPostBattle:
 	.string "Even outside of battle, I sense\n"
 	.string "incredible power emanating from you\l"
 	.string "and your POKéMON.$"
 
-VictoryRoad_B1F_Text_HalleIntro: @ 82367FD
+VictoryRoad_B1F_Text_HalleIntro:
 	.string "Okay, no need to get your back up!\n"
 	.string "Relax, let's take it easy!$"
 
-VictoryRoad_B1F_Text_HalleDefeat: @ 823683B
+VictoryRoad_B1F_Text_HalleDefeat:
 	.string "Whoa!\n"
 	.string "Wonderful!$"
 
-VictoryRoad_B1F_Text_HallePostBattle: @ 823684C
+VictoryRoad_B1F_Text_HallePostBattle:
 	.string "Sure, this is VICTORY ROAD.\p"
 	.string "But it's not all that different from\n"
 	.string "the path you've taken so far.\p"
diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc
index 9db635a85..8b64157d3 100644
--- a/data/maps/VictoryRoad_B2F/scripts.inc
+++ b/data/maps/VictoryRoad_B2F/scripts.inc
@@ -1,108 +1,108 @@
-VictoryRoad_B2F_MapScripts:: @ 82368D4
+VictoryRoad_B2F_MapScripts::
 	.byte 0
 
-VictoryRoad_B2F_EventScript_Vito:: @ 82368D5
+VictoryRoad_B2F_EventScript_Vito::
 	trainerbattle_single TRAINER_VITO, VictoryRoad_B2F_Text_VitoIntro, VictoryRoad_B2F_Text_VitoDefeat
 	msgbox VictoryRoad_B2F_Text_VitoPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_Owen:: @ 82368EC
+VictoryRoad_B2F_EventScript_Owen::
 	trainerbattle_single TRAINER_OWEN, VictoryRoad_B2F_Text_OwenIntro, VictoryRoad_B2F_Text_OwenDefeat
 	msgbox VictoryRoad_B2F_Text_OwenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_Caroline:: @ 8236903
+VictoryRoad_B2F_EventScript_Caroline::
 	trainerbattle_single TRAINER_CAROLINE, VictoryRoad_B2F_Text_CarolineIntro, VictoryRoad_B2F_Text_CarolineDefeat
 	msgbox VictoryRoad_B2F_Text_CarolinePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_Julie:: @ 823691A
+VictoryRoad_B2F_EventScript_Julie::
 	trainerbattle_single TRAINER_JULIE, VictoryRoad_B2F_Text_JulieIntro, VictoryRoad_B2F_Text_JulieDefeat
 	msgbox VictoryRoad_B2F_Text_JuliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_Felix:: @ 8236931
+VictoryRoad_B2F_EventScript_Felix::
 	trainerbattle_single TRAINER_FELIX, VictoryRoad_B2F_Text_FelixIntro, VictoryRoad_B2F_Text_FelixDefeat
 	msgbox VictoryRoad_B2F_Text_FelixPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_EventScript_Dianne:: @ 8236948
+VictoryRoad_B2F_EventScript_Dianne::
 	trainerbattle_single TRAINER_DIANNE, VictoryRoad_B2F_Text_DianneIntro, VictoryRoad_B2F_Text_DianneDefeat
 	msgbox VictoryRoad_B2F_Text_DiannePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-VictoryRoad_B2F_Text_VitoIntro: @ 823695F
+VictoryRoad_B2F_Text_VitoIntro:
 	.string "I trained together with my whole family,\n"
 	.string "every one of us!\l"
 	.string "I'm not losing to anyone!$"
 
-VictoryRoad_B2F_Text_VitoDefeat: @ 82369B3
+VictoryRoad_B2F_Text_VitoDefeat:
 	.string "Better than my family?!\n"
 	.string "Is that possible?!$"
 
-VictoryRoad_B2F_Text_VitoPostBattle: @ 82369DE
+VictoryRoad_B2F_Text_VitoPostBattle:
 	.string "I was better than everyone in my\n"
 	.string "family. I've never lost before…\p"
 	.string "I've lost my confidence…\n"
 	.string "Maybe I'll go home…$"
 
-VictoryRoad_B2F_Text_OwenIntro: @ 8236A4C
+VictoryRoad_B2F_Text_OwenIntro:
 	.string "I'd heard that there was a tough\n"
 	.string "little kid around. Do they mean you?$"
 
-VictoryRoad_B2F_Text_OwenDefeat: @ 8236A92
+VictoryRoad_B2F_Text_OwenDefeat:
 	.string "The little shrimp is tough!$"
 
-VictoryRoad_B2F_Text_OwenPostBattle: @ 8236AAE
+VictoryRoad_B2F_Text_OwenPostBattle:
 	.string "The rumors I heard, that tough little\n"
 	.string "kid is from PETALBURG CITY.$"
 
-VictoryRoad_B2F_Text_CarolineIntro: @ 8236AF0
+VictoryRoad_B2F_Text_CarolineIntro:
 	.string "You must be getting a little tired.$"
 
-VictoryRoad_B2F_Text_CarolineDefeat: @ 8236B14
+VictoryRoad_B2F_Text_CarolineDefeat:
 	.string "No signs of tiring at all!$"
 
-VictoryRoad_B2F_Text_CarolinePostBattle: @ 8236B2F
+VictoryRoad_B2F_Text_CarolinePostBattle:
 	.string "VICTORY ROAD and the POKéMON LEAGUE\n"
 	.string "are long and grueling challenges.\l"
 	.string "Beware of fatigue!$"
 
-VictoryRoad_B2F_Text_JulieIntro: @ 8236B88
+VictoryRoad_B2F_Text_JulieIntro:
 	.string "You shouldn't get complacent just\n"
 	.string "because you have a lot of GYM BADGES.\p"
 	.string "There's always going to be someone\n"
 	.string "who's better than you!$"
 
-VictoryRoad_B2F_Text_JulieDefeat: @ 8236C0A
+VictoryRoad_B2F_Text_JulieDefeat:
 	.string "You're better than me!$"
 
-VictoryRoad_B2F_Text_JuliePostBattle: @ 8236C21
+VictoryRoad_B2F_Text_JuliePostBattle:
 	.string "Gaze on your collected BADGES and\n"
 	.string "remember the TRAINERS you've faced.$"
 
-VictoryRoad_B2F_Text_FelixIntro: @ 8236C67
+VictoryRoad_B2F_Text_FelixIntro:
 	.string "I've come this far, but the tension's\n"
 	.string "giving me awful stomach pain…$"
 
-VictoryRoad_B2F_Text_FelixDefeat: @ 8236CAB
+VictoryRoad_B2F_Text_FelixDefeat:
 	.string "Ooh…\n"
 	.string "It hurts…$"
 
-VictoryRoad_B2F_Text_FelixPostBattle: @ 8236CBA
+VictoryRoad_B2F_Text_FelixPostBattle:
 	.string "I can't help getting all tense knowing\n"
 	.string "that I'm nearing the POKéMON LEAGUE.\p"
 	.string "It's all I can do to feign calm.$"
 
-VictoryRoad_B2F_Text_DianneIntro: @ 8236D27
+VictoryRoad_B2F_Text_DianneIntro:
 	.string "The elite among the elite gather in\n"
 	.string "this cave.\p"
 	.string "How are you finding it?$"
 
-VictoryRoad_B2F_Text_DianneDefeat: @ 8236D6E
+VictoryRoad_B2F_Text_DianneDefeat:
 	.string "Not rattled in the least bit!$"
 
-VictoryRoad_B2F_Text_DiannePostBattle: @ 8236D8C
+VictoryRoad_B2F_Text_DiannePostBattle:
 	.string "You do have guts! I like that!\n"
 	.string "Keep it going!$"
 
diff --git a/data/multiboot_berry_glitch_fix.s b/data/multiboot_berry_glitch_fix.s
index 57757090a..7d65c0d4d 100644
--- a/data/multiboot_berry_glitch_fix.s
+++ b/data/multiboot_berry_glitch_fix.s
@@ -1,5 +1,5 @@
 	.section .rodata
 
-gMultiBootProgram_BerryGlitchFix_Start:: @ 89A6550
+gMultiBootProgram_BerryGlitchFix_Start::
 	.incbin "berry_fix/berry_fix.gba"
-gMultiBootProgram_BerryGlitchFix_End:: @ 89AA144
+gMultiBootProgram_BerryGlitchFix_End::
diff --git a/data/multiboot_pokemon_colosseum.s b/data/multiboot_pokemon_colosseum.s
index 59d0b430d..179f8a067 100644
--- a/data/multiboot_pokemon_colosseum.s
+++ b/data/multiboot_pokemon_colosseum.s
@@ -1,5 +1,5 @@
 	.section .rodata
 
-gMultiBootProgram_PokemonColosseum_Start:: @ 89AA144
+gMultiBootProgram_PokemonColosseum_Start::
 	.incbin "data/pokemon_colosseum.mb"
 gMultiBootProgram_PokemonColosseum_End::
diff --git a/data/mystery_event_script_cmd_table.s b/data/mystery_event_script_cmd_table.s
index 6ebc7e962..d0ab80c5c 100644
--- a/data/mystery_event_script_cmd_table.s
+++ b/data/mystery_event_script_cmd_table.s
@@ -1,7 +1,7 @@
 	.section script_data, "aw", %progbits
 
 	.align 2
-gMysteryEventScriptCmdTable:: @ 82DED2C
+gMysteryEventScriptCmdTable::
 	.4byte MEScrCmd_nop                 @ 0x00
 	.4byte MEScrCmd_checkcompat         @ 0x01
 	.4byte MEScrCmd_end                 @ 0x02
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 9e54ad52b..dcc0da9f7 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -1,5 +1,5 @@
 	.align 2
-gScriptCmdTable:: @ 81DB67C
+gScriptCmdTable::
 	.4byte ScrCmd_nop      	                @ 0x00
 	.4byte ScrCmd_nop1                      @ 0x01
 	.4byte ScrCmd_end      	                @ 0x02
@@ -228,5 +228,5 @@ gScriptCmdTable:: @ 81DB67C
 	.4byte ScrCmd_buffercontesttype         @ 0xe1
 	.4byte ScrCmd_bufferitemnameplural      @ 0xe2
 
-gScriptCmdTableEnd:: @ 81DBA08
+gScriptCmdTableEnd::
 	.4byte ScrCmd_nop
diff --git a/data/scripts/abnormal_weather.inc b/data/scripts/abnormal_weather.inc
index 16f8af41f..9af24c45d 100644
--- a/data/scripts/abnormal_weather.inc
+++ b/data/scripts/abnormal_weather.inc
@@ -1,44 +1,44 @@
-AbnormalWeather_EventScript_PlaceTilesRoute114North:: @ 8273913
+AbnormalWeather_EventScript_PlaceTilesRoute114North::
 	setmetatile 7, 3, METATILE_Fallarbor_RedCaveEntrance_Top, 1
 	setmetatile 7, 4, METATILE_Fallarbor_RedCaveEntrance_Bottom, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute114South:: @ 8273926
+AbnormalWeather_EventScript_PlaceTilesRoute114South::
 	setmetatile 6, 45, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
 	setmetatile 6, 46, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute115West:: @ 8273939
+AbnormalWeather_EventScript_PlaceTilesRoute115West::
 	setmetatile 21, 5, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
 	setmetatile 21, 6, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute115East:: @ 827394C
+AbnormalWeather_EventScript_PlaceTilesRoute115East::
 	setmetatile 36, 9, METATILE_Fallarbor_BrownCaveEntrance_Top, 1
 	setmetatile 36, 10, METATILE_Fallarbor_BrownCaveEntrance_Bottom, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute116North:: @ 827395F
+AbnormalWeather_EventScript_PlaceTilesRoute116North::
 	setmetatile 59, 12, METATILE_General_CaveEntrance_Top, 1
 	setmetatile 59, 13, METATILE_General_CaveEntrance_Bottom, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute116South:: @ 8273972
+AbnormalWeather_EventScript_PlaceTilesRoute116South::
 	setmetatile 79, 5, METATILE_General_CaveEntrance_Top, 1
 	setmetatile 79, 6, METATILE_General_CaveEntrance_Bottom, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute118East:: @ 8273985
+AbnormalWeather_EventScript_PlaceTilesRoute118East::
 	setmetatile 42, 5, METATILE_General_CaveEntrance_Top, 1
 	setmetatile 42, 6, METATILE_General_CaveEntrance_Bottom, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute118West:: @ 8273998
+AbnormalWeather_EventScript_PlaceTilesRoute118West::
 	setmetatile 9, 5, METATILE_General_CaveEntrance_Top, 1
 	setmetatile 9, 6, METATILE_General_CaveEntrance_Bottom, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
+AbnormalWeather_EventScript_PlaceTilesRoute105North::
 	setmetatile 10, 28, METATILE_General_RoughWater, 0
 	setmetatile 11, 28, METATILE_General_RoughWater, 0
 	setmetatile 9, 29, METATILE_General_RoughWater, 0
@@ -53,7 +53,7 @@ AbnormalWeather_EventScript_PlaceTilesRoute105North:: @ 82739AB
 	setmetatile 11, 31, METATILE_General_RoughWater, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
+AbnormalWeather_EventScript_PlaceTilesRoute105South::
 	setmetatile 20, 53, METATILE_General_RoughWater, 0
 	setmetatile 21, 53, METATILE_General_RoughWater, 0
 	setmetatile 19, 54, METATILE_General_RoughWater, 0
@@ -68,7 +68,7 @@ AbnormalWeather_EventScript_PlaceTilesRoute105South:: @ 8273A18
 	setmetatile 21, 56, METATILE_General_RoughWater, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
+AbnormalWeather_EventScript_PlaceTilesRoute125West::
 	setmetatile 8, 16, METATILE_General_RoughWater, 0
 	setmetatile 9, 16, METATILE_General_RoughWater, 0
 	setmetatile 7, 17, METATILE_General_RoughWater, 0
@@ -83,7 +83,7 @@ AbnormalWeather_EventScript_PlaceTilesRoute125West:: @ 8273A85
 	setmetatile 9, 19, METATILE_General_RoughWater, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
+AbnormalWeather_EventScript_PlaceTilesRoute125East::
 	setmetatile 53, 18, METATILE_General_RoughWater, 0
 	setmetatile 54, 18, METATILE_General_RoughWater, 0
 	setmetatile 52, 19, METATILE_General_RoughWater, 0
@@ -98,7 +98,7 @@ AbnormalWeather_EventScript_PlaceTilesRoute125East:: @ 8273AF2
 	setmetatile 54, 21, METATILE_General_RoughWater, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
+AbnormalWeather_EventScript_PlaceTilesRoute127North::
 	setmetatile 57, 9, METATILE_General_RoughWater, 0
 	setmetatile 58, 9, METATILE_General_RoughWater, 0
 	setmetatile 56, 10, METATILE_General_RoughWater, 0
@@ -113,7 +113,7 @@ AbnormalWeather_EventScript_PlaceTilesRoute127North:: @ 8273B5F
 	setmetatile 58, 12, METATILE_General_RoughWater, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
+AbnormalWeather_EventScript_PlaceTilesRoute127South::
 	setmetatile 61, 30, METATILE_General_RoughWater, 0
 	setmetatile 62, 30, METATILE_General_RoughWater, 0
 	setmetatile 60, 31, METATILE_General_RoughWater, 0
@@ -128,7 +128,7 @@ AbnormalWeather_EventScript_PlaceTilesRoute127South:: @ 8273BCC
 	setmetatile 62, 33, METATILE_General_RoughWater, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
+AbnormalWeather_EventScript_PlaceTilesRoute129West::
 	setmetatile 16, 14, METATILE_General_RoughWater, 0
 	setmetatile 17, 14, METATILE_General_RoughWater, 0
 	setmetatile 15, 15, METATILE_General_RoughWater, 0
@@ -143,7 +143,7 @@ AbnormalWeather_EventScript_PlaceTilesRoute129West:: @ 8273C39
 	setmetatile 17, 17, METATILE_General_RoughWater, 0
 	return
 
-AbnormalWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
+AbnormalWeather_EventScript_PlaceTilesRoute129East::
 	setmetatile 42, 19, METATILE_General_RoughWater, 0
 	setmetatile 43, 19, METATILE_General_RoughWater, 0
 	setmetatile 41, 20, METATILE_General_RoughWater, 0
@@ -158,26 +158,26 @@ AbnormalWeather_EventScript_PlaceTilesRoute129East:: @ 8273CA6
 	setmetatile 43, 22, METATILE_General_RoughWater, 0
 	return
 
-AbnormalWeather_EventScript_HideMapNamePopup:: @ 8273D13
+AbnormalWeather_EventScript_HideMapNamePopup::
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-AbnormalWeather_StartKyogreWeather:: @ 8273D17
+AbnormalWeather_StartKyogreWeather::
 	setweather WEATHER_DOWNPOUR
 	return
 
-AbnormalWeather_StartGroudonWeather:: @ 8273D1B
+AbnormalWeather_StartGroudonWeather::
 	setweather WEATHER_DROUGHT
 	return
 
-AbnormalWeather_EventScript_EndEventAndCleanup_1:: @ 8273D1F
+AbnormalWeather_EventScript_EndEventAndCleanup_1::
 	lockall
 	compare VAR_ABNORMAL_WEATHER_LOCATION, MARINE_CAVE_LOCATIONS_START
 	goto_if_ge AbnormalWeather_EventScript_ShowRainEndedMessage
 	goto AbnormalWeather_EventScript_ShowSunEndedMessage
 	end
 
-AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
+AbnormalWeather_EventScript_EndEventAndCleanup_2::
 	closemessage
 	fadescreenswapbuffers FADE_TO_BLACK
 	setweather WEATHER_SUNNY
@@ -191,17 +191,17 @@ AbnormalWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
 	releaseall
 	end
 
-AbnormalWeather_EventScript_ShowRainEndedMessage:: @ 8273D51
+AbnormalWeather_EventScript_ShowRainEndedMessage::
 	msgbox gText_AbnormalWeatherEnded_Rain, MSGBOX_DEFAULT
 	goto AbnormalWeather_EventScript_EndEventAndCleanup_2
 	end
 
-AbnormalWeather_EventScript_ShowSunEndedMessage:: @ 8273D5F
+AbnormalWeather_EventScript_ShowSunEndedMessage::
 	msgbox gText_AbnormalWeatherEnded_Sun, MSGBOX_DEFAULT
 	goto AbnormalWeather_EventScript_EndEventAndCleanup_2
 	end
 
-AbnormalWeather_EventScript_CleanupMapTiles:: @ 8273D6D
+AbnormalWeather_EventScript_CleanupMapTiles::
 	switch VAR_ABNORMAL_WEATHER_LOCATION
 	case ABNORMAL_WEATHER_ROUTE_114_NORTH, AbnormalWeather_EventScript_CleanupRoute114North
 	case ABNORMAL_WEATHER_ROUTE_114_SOUTH, AbnormalWeather_EventScript_CleanupRoute114South
@@ -221,47 +221,47 @@ AbnormalWeather_EventScript_CleanupMapTiles:: @ 8273D6D
 	case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_EventScript_CleanupRoute129East
 	return
 
-AbnormalWeather_EventScript_CleanupRoute114North:: @ 8273E23
+AbnormalWeather_EventScript_CleanupRoute114North::
 	setmetatile 7, 3, METATILE_Fallarbor_RedRockWall, 1
 	setmetatile 7, 4, METATILE_Fallarbor_RedRockWall, 1
 	return
 
-AbnormalWeather_EventScript_CleanupRoute114South:: @ 8273E36
+AbnormalWeather_EventScript_CleanupRoute114South::
 	setmetatile 6, 45, METATILE_Fallarbor_BrownRockWall, 1
 	setmetatile 6, 46, METATILE_Fallarbor_BrownRockWall, 1
 	return
 
-AbnormalWeather_EventScript_CleanupRoute115West:: @ 8273E49
+AbnormalWeather_EventScript_CleanupRoute115West::
 	setmetatile 21, 5, METATILE_Fallarbor_BrownRockWall, 1
 	setmetatile 21, 6, METATILE_Fallarbor_BrownRockWall, 1
 	return
 
-AbnormalWeather_EventScript_CleanupRoute115East:: @ 8273E5C
+AbnormalWeather_EventScript_CleanupRoute115East::
 	setmetatile 36, 9, METATILE_Fallarbor_BrownRockWall, 1
 	setmetatile 36, 10, METATILE_Fallarbor_BrownRockWall, 1
 	return
 
-AbnormalWeather_EventScript_CleanupRoute116North:: @ 8273E6F
+AbnormalWeather_EventScript_CleanupRoute116North::
 	setmetatile 59, 12, METATILE_General_RockWall_RockBase, 1
 	setmetatile 59, 13, METATILE_General_RockWall_RockBase, 1
 	return
 
-AbnormalWeather_EventScript_CleanupRoute116South:: @ 8273E82
+AbnormalWeather_EventScript_CleanupRoute116South::
 	setmetatile 79, 5, METATILE_General_RockWall_RockBase, 1
 	setmetatile 79, 6, METATILE_General_RockWall_RockBase, 1
 	return
 
-AbnormalWeather_EventScript_CleanupRoute118East:: @ 8273E95
+AbnormalWeather_EventScript_CleanupRoute118East::
 	setmetatile 42, 5, METATILE_General_RockWall_RockBase, 1
 	setmetatile 42, 6, METATILE_General_RockWall_GrassBase, 1
 	return
 
-AbnormalWeather_EventScript_CleanupRoute118West:: @ 8273EA8
+AbnormalWeather_EventScript_CleanupRoute118West::
 	setmetatile 9, 5, METATILE_General_RockWall_RockBase, 1
 	setmetatile 9, 6, METATILE_General_RockWall_GrassBase, 1
 	return
 
-AbnormalWeather_EventScript_CleanupRoute105North:: @ 8273EBB
+AbnormalWeather_EventScript_CleanupRoute105North::
 	setmetatile 10, 28, METATILE_General_CalmWater, 0
 	setmetatile 11, 28, METATILE_General_CalmWater, 0
 	setmetatile 9, 29, METATILE_General_CalmWater, 0
@@ -276,7 +276,7 @@ AbnormalWeather_EventScript_CleanupRoute105North:: @ 8273EBB
 	setmetatile 11, 31, METATILE_General_CalmWater, 0
 	return
 
-AbnormalWeather_EventScript_CleanupRoute105South:: @ 8273F28
+AbnormalWeather_EventScript_CleanupRoute105South::
 	setmetatile 20, 53, METATILE_General_CalmWater, 0
 	setmetatile 21, 53, METATILE_General_CalmWater, 0
 	setmetatile 19, 54, METATILE_General_CalmWater, 0
@@ -291,7 +291,7 @@ AbnormalWeather_EventScript_CleanupRoute105South:: @ 8273F28
 	setmetatile 21, 56, METATILE_General_CalmWater, 0
 	return
 
-AbnormalWeather_EventScript_CleanupRoute125West:: @ 8273F95
+AbnormalWeather_EventScript_CleanupRoute125West::
 	setmetatile 8, 16, METATILE_General_CalmWater, 0
 	setmetatile 9, 16, METATILE_General_CalmWater, 0
 	setmetatile 7, 17, METATILE_General_CalmWater, 0
@@ -306,7 +306,7 @@ AbnormalWeather_EventScript_CleanupRoute125West:: @ 8273F95
 	setmetatile 9, 19, METATILE_General_CalmWater, 0
 	return
 
-AbnormalWeather_EventScript_CleanupRoute125East:: @ 8274002
+AbnormalWeather_EventScript_CleanupRoute125East::
 	setmetatile 53, 18, METATILE_General_CalmWater, 0
 	setmetatile 54, 18, METATILE_General_CalmWater, 0
 	setmetatile 52, 19, METATILE_General_CalmWater, 0
@@ -321,7 +321,7 @@ AbnormalWeather_EventScript_CleanupRoute125East:: @ 8274002
 	setmetatile 54, 21, METATILE_General_CalmWater, 0
 	return
 
-AbnormalWeather_EventScript_CleanupRoute127North:: @ 827406F
+AbnormalWeather_EventScript_CleanupRoute127North::
 	setmetatile 57, 9, METATILE_General_CalmWater, 0
 	setmetatile 58, 9, METATILE_General_CalmWater, 0
 	setmetatile 56, 10, METATILE_General_CalmWater, 0
@@ -336,7 +336,7 @@ AbnormalWeather_EventScript_CleanupRoute127North:: @ 827406F
 	setmetatile 58, 12, METATILE_General_CalmWater, 0
 	return
 
-AbnormalWeather_EventScript_CleanupRoute127South:: @ 82740DC
+AbnormalWeather_EventScript_CleanupRoute127South::
 	setmetatile 61, 30, METATILE_General_CalmWater, 0
 	setmetatile 62, 30, METATILE_General_CalmWater, 0
 	setmetatile 60, 31, METATILE_General_CalmWater, 0
@@ -351,7 +351,7 @@ AbnormalWeather_EventScript_CleanupRoute127South:: @ 82740DC
 	setmetatile 62, 33, METATILE_General_CalmWater, 0
 	return
 
-AbnormalWeather_EventScript_CleanupRoute129West:: @ 8274149
+AbnormalWeather_EventScript_CleanupRoute129West::
 	setmetatile 16, 14, METATILE_General_CalmWater, 0
 	setmetatile 17, 14, METATILE_General_CalmWater, 0
 	setmetatile 15, 15, METATILE_General_CalmWater, 0
@@ -366,7 +366,7 @@ AbnormalWeather_EventScript_CleanupRoute129West:: @ 8274149
 	setmetatile 17, 17, METATILE_General_CalmWater, 0
 	return
 
-AbnormalWeather_EventScript_CleanupRoute129East:: @ 82741B6
+AbnormalWeather_EventScript_CleanupRoute129East::
 	setmetatile 42, 19, METATILE_General_CalmWater, 0
 	setmetatile 43, 19, METATILE_General_CalmWater, 0
 	setmetatile 41, 20, METATILE_General_CalmWater, 0
@@ -381,7 +381,7 @@ AbnormalWeather_EventScript_CleanupRoute129East:: @ 82741B6
 	setmetatile 43, 22, METATILE_General_CalmWater, 0
 	return
 
-AbnormalWeather_Underwater_SetupEscapeWarp:: @ 8274223
+AbnormalWeather_Underwater_SetupEscapeWarp::
 	switch VAR_ABNORMAL_WEATHER_LOCATION
 	case ABNORMAL_WEATHER_ROUTE_105_NORTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105North
 	case ABNORMAL_WEATHER_ROUTE_105_SOUTH, AbnormalWeather_Underwater_SetupEscapeWarpRoute105South
@@ -393,34 +393,34 @@ AbnormalWeather_Underwater_SetupEscapeWarp:: @ 8274223
 	case ABNORMAL_WEATHER_ROUTE_129_EAST, AbnormalWeather_Underwater_SetupEscapeWarpRoute129East
 	return
 
-AbnormalWeather_Underwater_SetupEscapeWarpRoute105North:: @ 8274281
+AbnormalWeather_Underwater_SetupEscapeWarpRoute105North::
 	setescapewarp MAP_ROUTE105, 255, 11, 29
 	return
 
-AbnormalWeather_Underwater_SetupEscapeWarpRoute105South:: @ 827428A
+AbnormalWeather_Underwater_SetupEscapeWarpRoute105South::
 	setescapewarp MAP_ROUTE105, 255, 21, 54
 	return
 
-AbnormalWeather_Underwater_SetupEscapeWarpRoute125West:: @ 8274293
+AbnormalWeather_Underwater_SetupEscapeWarpRoute125West::
 	setescapewarp MAP_ROUTE125, 255, 9, 17
 	return
 
-AbnormalWeather_Underwater_SetupEscapeWarpRoute125East:: @ 827429C
+AbnormalWeather_Underwater_SetupEscapeWarpRoute125East::
 	setescapewarp MAP_ROUTE125, 255, 54, 19
 	return
 
-AbnormalWeather_Underwater_SetupEscapeWarpRoute127North:: @ 82742A5
+AbnormalWeather_Underwater_SetupEscapeWarpRoute127North::
 	setescapewarp MAP_ROUTE127, 255, 58, 10
 	return
 
-AbnormalWeather_Underwater_SetupEscapeWarpRoute127South:: @ 82742AE
+AbnormalWeather_Underwater_SetupEscapeWarpRoute127South::
 	setescapewarp MAP_ROUTE127, 255, 62, 31
 	return
 
-AbnormalWeather_Underwater_SetupEscapeWarpRoute129West:: @ 82742B7
+AbnormalWeather_Underwater_SetupEscapeWarpRoute129West::
 	setescapewarp MAP_ROUTE129, 255, 17, 15
 	return
 
-AbnormalWeather_Underwater_SetupEscapeWarpRoute129East:: @ 82742C0
+AbnormalWeather_Underwater_SetupEscapeWarpRoute129East::
 	setescapewarp MAP_ROUTE129, 255, 43, 20
 	return
diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc
index f5fa3aeeb..2a6772a5d 100644
--- a/data/scripts/apprentice.inc
+++ b/data/scripts/apprentice.inc
@@ -1,6 +1,6 @@
 .set LOCALID_APPRENTICE, 6
 
-BattleFrontier_BattleTowerLobby_EventScript_Apprentice:: @ 82B688D
+BattleFrontier_BattleTowerLobby_EventScript_Apprentice::
 	lock
 	faceplayer
 	apprentice_gavelvlmode
@@ -10,7 +10,7 @@ BattleFrontier_BattleTowerLobby_EventScript_Apprentice:: @ 82B688D
 	compare VAR_0x8004, FALSE  @ Always TRUE here
 	goto_if_eq Apprentice_EventScript_AskQuestion
 	goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Apprentice_EventScript_Gone
-Apprentice_EventScript_AskQuestion: @ 82B68BE
+Apprentice_EventScript_AskQuestion:
 	apprentice_getquestion
 	compare VAR_RESULT, APPRENTICE_QUESTION_WHICH_MON
 	goto_if_eq Apprentice_EventScript_UseWhichMon
@@ -26,10 +26,10 @@ Apprentice_EventScript_AskQuestion: @ 82B68BE
 	releaseall
 	end
 
-Apprentice_EventScript_FirstMeeting: @ 82B6900
+Apprentice_EventScript_FirstMeeting:
 	apprentice_buff 0, APPRENTICE_BUFF_NAME
 	apprentice_msg FALSE, APPRENTICE_MSG_PLEASE_TEACH
-Apprentice_EventScript_WhichLvlMode: @ 82B6925
+Apprentice_EventScript_WhichLvlMode:
 	apprentice_menu APPRENTICE_ASK_YES_NO
 	compare VAR_RESULT, 1
 	goto_if_eq Apprentice_EventScript_RejectTeach
@@ -48,11 +48,11 @@ Apprentice_EventScript_WhichLvlMode: @ 82B6925
 	end
 
 @ Its impossible to fully reject an Apprentice, they just keep asking for you to teach them
-Apprentice_EventScript_RejectTeach: @ 82B69BB
+Apprentice_EventScript_RejectTeach:
 	apprentice_msg FALSE, APPRENTICE_MSG_REJECT
 	goto Apprentice_EventScript_WhichLvlMode
 
-Apprentice_EventScript_UseWhichMon: @ 82B69D3
+Apprentice_EventScript_UseWhichMon:
 	apprentice_initquestion APPRENTICE_QUESTION_WHICH_MON
 	apprentice_buff 0, APPRENTICE_BUFF_SPECIES1
 	apprentice_buff 1, APPRENTICE_BUFF_SPECIES2
@@ -80,24 +80,24 @@ Apprentice_EventScript_UseWhichMon: @ 82B69D3
 	goto Apprentice_EventScript_Leave
 	end
 
-Apprentice_EventScript_ChoseFirstMon: @ 82B6ABA
+Apprentice_EventScript_ChoseFirstMon:
 	setvar VAR_0x8007, APPRENTICE_BUFF_SPECIES1
 	return
 
-Apprentice_EventScript_ChoseSecondMon: @ 82B6AC0
+Apprentice_EventScript_ChoseSecondMon:
 	setvar VAR_0x8007, APPRENTICE_BUFF_SPECIES2
 	return
 
-Apprentice_EventScript_LastMonSelected: @ 82B6AC6
+Apprentice_EventScript_LastMonSelected:
 	apprentice_randomizequestions
 	return
 
-Apprentice_EventScript_UseWhatHeldItem: @ 82B6ACF
+Apprentice_EventScript_UseWhatHeldItem:
 	apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM
 	apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
 	apprentice_msg TRUE, APPRENTICE_MSG_WHAT_HELD_ITEM
 	apprentice_freequestion
-Apprentice_EventScript_ChooseHoldItem: @ 82B6B09
+Apprentice_EventScript_ChooseHoldItem:
 	fadescreen FADE_TO_BLACK
 	setvar VAR_RESULT, 0
 	apprentice_openbag
@@ -117,7 +117,7 @@ Apprentice_EventScript_ChooseHoldItem: @ 82B6B09
 	goto Apprentice_EventScript_Leave
 	end
 
-Apprentice_EventScript_ConfirmHoldNothing: @ 82B6B81
+Apprentice_EventScript_ConfirmHoldNothing:
 	apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM
 	apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
 	apprentice_msg FALSE, APPRENTICE_MSG_HOLD_NOTHING
@@ -125,7 +125,7 @@ Apprentice_EventScript_ConfirmHoldNothing: @ 82B6B81
 	apprentice_freequestion
 	compare VAR_RESULT, 0
 	goto_if_eq Apprentice_EventScript_ChooseHoldItem
-Apprentice_EventScript_HoldNothing: @ 82B6BD4
+Apprentice_EventScript_HoldNothing:
 	apprentice_msg TRUE, APPRENTICE_MSG_THANKS_NO_HELD_ITEM
 	apprentice_answeredquestion
 	call Apprentice_EventScript_SetHideFlags
@@ -138,7 +138,7 @@ Apprentice_EventScript_HoldNothing: @ 82B6BD4
 
 @ Because Battle Tower mons may not hold the same item, the player must suggest a
 @ different item if theyve already told the Apprentice to use it for another mon
-Apprentice_EventScript_AlreadySuggestedItem: @ 82B6C0C
+Apprentice_EventScript_AlreadySuggestedItem:
 	apprentice_initquestion APPRENTICE_QUESTION_WHAT_ITEM
 	apprentice_buff 0, APPRENTICE_BUFF_ITEM
 	apprentice_buff 1, APPRENTICE_BUFF_SPECIES3
@@ -150,7 +150,7 @@ Apprentice_EventScript_AlreadySuggestedItem: @ 82B6C0C
 	goto Apprentice_EventScript_HoldNothing
 	end
 
-Apprentice_EventScript_UseWhichMove: @ 82B6C77
+Apprentice_EventScript_UseWhichMove:
 	apprentice_initquestion APPRENTICE_QUESTION_WHICH_MOVE
 	apprentice_buff 0, APPRENTICE_BUFF_SPECIES3
 	apprentice_buff 1, APPRENTICE_BUFF_MOVE1
@@ -175,15 +175,15 @@ Apprentice_EventScript_UseWhichMove: @ 82B6C77
 	goto Apprentice_EventScript_Leave
 	end
 
-Apprentice_EventScript_ChoseMove1: @ 82B6D50
+Apprentice_EventScript_ChoseMove1:
 	setvar VAR_0x8007, APPRENTICE_BUFF_MOVE1
 	return
 
-Apprentice_EventScript_ChoseMove2: @ 82B6D56
+Apprentice_EventScript_ChoseMove2:
 	setvar VAR_0x8007, APPRENTICE_BUFF_MOVE2
 	return
 
-Apprentice_EventScript_PutWhichMonFirst: @ 82B6D5C
+Apprentice_EventScript_PutWhichMonFirst:
 	apprentice_msg FALSE, APPRENTICE_MSG_WHICH_MON_FIRST
 	apprentice_menu APPRENTICE_ASK_3SPECIES
 	apprentice_setleadmon VAR_RESULT
@@ -199,7 +199,7 @@ Apprentice_EventScript_PutWhichMonFirst: @ 82B6D5C
 	end
 
 @ Last question, after which the Apprentice leaves (and is saved) to be replaced by another
-Apprentice_EventScript_PickWinSpeech: @ 82B6DD4
+Apprentice_EventScript_PickWinSpeech:
 	apprentice_msg TRUE, APPRENTICE_MSG_PICK_WIN_SPEECH
 	apprentice_shiftsaved
 	setvar VAR_0x8004, EASY_CHAT_TYPE_APPRENTICE
@@ -218,12 +218,12 @@ Apprentice_EventScript_PickWinSpeech: @ 82B6DD4
 	goto Apprentice_EventScript_Leave
 	end
 
-Apprentice_EventScript_SetHideFlags: @ 82B6E4D
+Apprentice_EventScript_SetHideFlags:
 	setflag FLAG_HIDE_APPRENTICE
 	setflag FLAG_DAILY_APPRENTICE_LEAVES
 	return
 
-Apprentice_EventScript_LeaveNorth: @ 82B6E54
+Apprentice_EventScript_LeaveNorth:
 	apprentice_shouldleave
 	compare VAR_0x8004, FALSE  @ Always TRUE here
 	goto_if_eq Apprentice_EventScript_DontMove
@@ -231,7 +231,7 @@ Apprentice_EventScript_LeaveNorth: @ 82B6E54
 	waitmovement 0
 	end
 
-Apprentice_EventScript_Leave: @ 82B6E72
+Apprentice_EventScript_Leave:
 	apprentice_shouldleave
 	compare VAR_0x8004, FALSE  @ Always TRUE here
 	goto_if_eq Apprentice_EventScript_DontMove
@@ -239,17 +239,17 @@ Apprentice_EventScript_Leave: @ 82B6E72
 	waitmovement 0
 	end
 
-Apprentice_EventScript_Gone: @ 82B6E90
+Apprentice_EventScript_Gone:
 	release
 	releaseall
 	end
 
-Apprentice_EventScript_DontMove: @ 82B6E93
+Apprentice_EventScript_DontMove:
 	end
 
-Apprentice_Movement_LeaveNorth: @ 82B6E94
+Apprentice_Movement_LeaveNorth:
 	walk_fast_right
-Apprentice_Movement_Leave: @ 82B6E95
+Apprentice_Movement_Leave:
 	walk_fast_down
 	walk_fast_down
 	walk_fast_right
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index 7ba25321d..3260bcfd8 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -1,9 +1,9 @@
 @ Note: LOCALIDs shared with BattleFrontier_BattlePikeRoomNormal
-BattleFrontier_BattlePikeRoom_MapScripts: @ 82C3E1B
+BattleFrontier_BattlePikeRoom_MapScripts:
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
 
-BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25
+BattleFrontier_BattlePikeRoom_OnTransition:
 	pike_setroomobjects
 	pike_getroomtype
 	switch VAR_RESULT
@@ -17,36 +17,36 @@ BattleFrontier_BattlePikeRoom_OnTransition: @ 82C3E25
 	case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos:: @ 82C3E93
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetDoubleBattleObjPos::
 	setobjectxyperm LOCALID_OBJ_0, 2, 5
 	setobjectxyperm LOCALID_OBJ_1, 6, 5
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos:: @ 82C3EA2
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetTwoObjectRoomPos::
 	setobjectxyperm LOCALID_OBJ_0, 4, 4
 	setobjectxyperm LOCALID_OBJ_1, 3, 4
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos:: @ 82C3EB1
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetOneObjectRoomPos::
 	setobjectxyperm LOCALID_OBJ_0, 4, 4
 	setobjectxyperm LOCALID_OBJ_1, 0, 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos:: @ 82C3EC0
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetNPCRoomObjPos::
 	setobjectxyperm LOCALID_OBJ_0, 5, 5
 	setobjectxyperm LOCALID_OBJ_1, 0, 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos:: @ 82C3ECF
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetBrainRoomObjPos::
 	setobjectxyperm LOCALID_OBJ_0, 4, 3
 	setobjectxyperm LOCALID_OBJ_1, 4, 4
 	end
 
-BattleFrontier_BattlePikeRoom_OnWarp: @ 82C3EDE
+BattleFrontier_BattlePikeRoom_OnWarp:
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects:: @ 82C3EE8
+BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_LINK_RECEPTIONIST
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_LINK_RECEPTIONIST
 	pike_getroomtype
@@ -63,33 +63,33 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_InitRoomObjects:: @ 82C3EE8
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom:: @ 82C3F35
+BattleFrontier_BattlePikeRoomNormal_EventScript_InitTwoObjectRoom::
 	setvar VAR_TEMP_4, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects:: @ 82C3F3F
+BattleFrontier_BattlePikeRoomNormal_EventScript_InitBrainRoomObjects::
 	setvar VAR_TEMP_4, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	hideobjectat LOCALID_OBJ_0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_NORMAL  @ Pike Queen hidden initially
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp:: @ 82C3F4E
+BattleFrontier_BattlePikeThreePathRoom_EventScript_LeftRoomWarp::
 	setvar VAR_0x8007, PIKE_ROOM_LEFT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_CenterRoomWarp:: @ 82C3F59
+BattleFrontier_BattlePikeThreePathRoom_EventScript_CenterRoomWarp::
 	setvar VAR_0x8007, PIKE_ROOM_CENTER
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp:: @ 82C3F64
+BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp::
 	setvar VAR_0x8007, PIKE_ROOM_RIGHT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F
+BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp::
 	pike_get PIKE_DATA_WIN_STREAK
 	addvar VAR_RESULT, 1
 	pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
@@ -110,7 +110,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp:: @ 82C3F6F
 	case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: @ 82C4030
+BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
 	waitmovement 0
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
@@ -118,7 +118,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpNPCRoom:: @ 82C4030
 	waitstate
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049
+BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
 	waitmovement 0
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
@@ -126,12 +126,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpWildMonRoom:: @ 82C4049
 	waitstate
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom:: @ 82C4062
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetEnteredRoom::
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_2, 1
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack:: @ 82C406D
+BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack::
 	setvar VAR_TEMP_3, 0
 	setvar VAR_TEMP_2, 0
 	lockall
@@ -139,12 +139,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_NoTurningBack:: @ 82C406D
 	closemessage
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom:: @ 82C4082
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetEnteredRoom::
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_2, 1
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack:: @ 82C408D
+BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack::
 	setvar VAR_TEMP_3, 0
 	setvar VAR_TEMP_2, 0
 	lockall
@@ -152,7 +152,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_NoTurningBack:: @ 82C408D
 	closemessage
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2
+BattleFrontier_BattlePikeRoomNormal_EventScript_Exit::
 	pike_ispartyfullhealth
 	compare VAR_RESULT, TRUE
 	call_if_eq BattleFrontier_BattlePikeRoom_EventScript_DisableHealing
@@ -172,29 +172,29 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_Exit:: @ 82C40A2
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoom_EventScript_DisableHealing:: @ 82C4128
+BattleFrontier_BattlePikeRoom_EventScript_DisableHealing::
 	pike_nohealing TRUE
 	return
 
-BattleFrontier_BattlePikeRoom_EventScript_EnableHealing:: @ 82C4136
+BattleFrontier_BattlePikeRoom_EventScript_EnableHealing::
 	pike_nohealing FALSE
 	return
 
-BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom:: @ 82C4144
+BattleFrontier_BattlePikeRoom_EventScript_WarpToFinalRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
 	waitmovement 0
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL, 255, 2, 7
 	return
 
-BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom:: @ 82C415C
+BattleFrontier_BattlePikeRoom_EventScript_WarpToThreePathRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoom_Movement_HidePlayer
 	waitmovement 0
 	call BattleFrontier_BattlePike_EventScript_CloseCurtain
 	warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10
 	return
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit:: @ 82C4174
+BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit::
 	pike_exitwildmonroom
 	pike_ispartyfullhealth
 	compare VAR_RESULT, TRUE
@@ -215,12 +215,12 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_Exit:: @ 82C4174
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom:: @ 82C4202
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetEnteredRoom::
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_2, 1
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack:: @ 82C420D
+BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack::
 	setvar VAR_TEMP_3, 0
 	setvar VAR_TEMP_2, 0
 	lockall
@@ -228,13 +228,13 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_NoTurningBack:: @ 82C420D
 	closemessage
 	end
 
-BattleFrontier_BattlePike_EventScript_Retire:: @ 82C4222
+BattleFrontier_BattlePike_EventScript_Retire::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoom_OnResume: @ 82C423E
+BattleFrontier_BattlePikeRoom_OnResume:
 	setorcopyvar VAR_0x8006, VAR_RESULT  @ Save VAR_RESULT from being overwritten
 	frontier_get FRONTIER_DATA_CHALLENGE_STATUS
 	compare VAR_RESULT, CHALLENGE_STATUS_PAUSED
@@ -242,14 +242,14 @@ BattleFrontier_BattlePikeRoom_OnResume: @ 82C423E
 	compare VAR_RESULT, CHALLENGE_STATUS_SAVING
 	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume
 	call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves
-BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume:: @ 82C426B
+BattleFrontier_BattlePikeThreePathRoom_EventScript_EndOnResume::
 	setorcopyvar VAR_RESULT, VAR_0x8006
 	end
 
-BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves:: @ 82C4271
+BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves::
 	frontier_resetsketch
 	return
 
-BattleFrontier_BattlePikeRoom_Movement_HidePlayer: @ 82C427A
+BattleFrontier_BattlePikeRoom_Movement_HidePlayer:
 	set_invisible
 	step_end
diff --git a/data/scripts/berry_blender.inc b/data/scripts/berry_blender.inc
index d8dbe80bd..1e4f55169 100644
--- a/data/scripts/berry_blender.inc
+++ b/data/scripts/berry_blender.inc
@@ -8,25 +8,25 @@
 
 .set NUM_OPPONENTS, VAR_0x8009
 
-BerryBlender_Text_WantToMakePokeblocks: @ 8292DEE
+BerryBlender_Text_WantToMakePokeblocks:
 	.string "Oh? Did you want to make some {POKEBLOCK}S\n"
 	.string "with this old-timer?$"
 
-BerryBlender_Text_Excellent: @ 8292E28
+BerryBlender_Text_Excellent:
 	.string "Excellent!$"
 
-BerryBlender_Text_MadeOldTimerSad: @ 8292E33
+BerryBlender_Text_MadeOldTimerSad:
 	.string "Oh…\n"
 	.string "You've made this old-timer sad…$"
 
-BerryBlender_Text_KnowHowToMakePokeblocks: @ 8292E57
+BerryBlender_Text_KnowHowToMakePokeblocks:
 	.string "Do you know how to make a {POKEBLOCK}?$"
 
-BerryBlender_Text_LetsBerryBlender: @ 8292E78
+BerryBlender_Text_LetsBerryBlender:
 	.string "Let's get started, then!\p"
 	.string "Let's BERRY BLENDER!$"
 
-BerryBlender_Text_ExplainBerryBlending: @ 8292EA6
+BerryBlender_Text_ExplainBerryBlending:
 	.string "Okay, a little explanation, then.\p"
 	.string "Oh, don't worry, it's quite simple.\p"
 	.string "When the BLENDER's arrow comes to\n"
@@ -34,63 +34,63 @@ BerryBlender_Text_ExplainBerryBlending: @ 8292EA6
 	.string "That's all you have to do.\n"
 	.string "You'll see how easy it is when you try.$"
 
-BerryBlender_Text_DontHaveAnyBerries: @ 8292F77
+BerryBlender_Text_DontHaveAnyBerries:
 	.string "Oh?\n"
 	.string "You don't have any BERRIES?\p"
 	.string "If you don't have any BERRIES,\n"
 	.string "you can't make any {POKEBLOCK}S.$"
 
-BerryBlender_Text_CanHaveOneOfMyBerries: @ 8292FD1
+BerryBlender_Text_CanHaveOneOfMyBerries:
 	.string "Well, that won't do at all now, will it?\p"
 	.string "If you don't mind leftovers, you can\n"
 	.string "have one of my BERRIES.\p"
 	.string "That way, we could make some {POKEBLOCK}S\n"
 	.string "together using the BERRY BLENDER.$"
 
-BerryBlender_Text_DontHaveAnyBerriesToSpare: @ 829307D
+BerryBlender_Text_DontHaveAnyBerriesToSpare:
 	.string "If I had some BERRIES left over,\n"
 	.string "I'd gladly give you one…\p"
 	.string "But, I don't have any to spare today.\n"
 	.string "We'll have to do this another time.$"
 
-BerryBlender_Text_PokeblockCaseIsFull: @ 8293101
+BerryBlender_Text_PokeblockCaseIsFull:
 	.string "But your {POKEBLOCK} CASE is full.\p"
 	.string "You should use some {POKEBLOCK}S before\n"
 	.string "you come see me again.$"
 
-BerryBlender_Text_DontHavePokeblockCase: @ 8293157
+BerryBlender_Text_DontHavePokeblockCase:
 	.string "But you don't have a {POKEBLOCK} CASE.\p"
 	.string "You should get a {POKEBLOCK} CASE and then\n"
 	.string "come see me.$"
 
-BerryBlender_Text_LetsGetBlendingAlready: @ 82931AA
+BerryBlender_Text_LetsGetBlendingAlready:
 	.string "Let's get blending already!$"
 
-BerryBlender_Text_WhatKindOfPokeblockWillIGet: @ 82931C6
+BerryBlender_Text_WhatKindOfPokeblockWillIGet:
 	.string "I wonder what kind of {POKEBLOCK} I'll get?\n"
 	.string "This is so exciting!$"
 
-BerryBlender_Text_WantToBlendPokeblocksWithUs: @ 8293201
+BerryBlender_Text_WantToBlendPokeblocksWithUs:
 	.string "Hi, there! Did you want to blend some\n"
 	.string "{POKEBLOCK}S with us?$"
 
-BerryBlender_Text_Okay: @ 8293237
+BerryBlender_Text_Okay:
 	.string "Okay!$"
 
-BerryBlender_Text_ThatsTooBad: @ 829323D
+BerryBlender_Text_ThatsTooBad:
 	.string "That's too bad…\p"
 	.string "But we'll always be around whenever\n"
 	.string "you get the urge to blend!$"
 
-BerryBlender_Text_KnowHowToMakePokeblocks2: @ 829328C
+BerryBlender_Text_KnowHowToMakePokeblocks2:
 	.string "Of course, you do know how to\n"
 	.string "blend {POKEBLOCK}S, don't you?$"
 
-BerryBlender_Text_LetsBerryBlender2: @ 82932C3
+BerryBlender_Text_LetsBerryBlender2:
 	.string "Let's get started, then!\p"
 	.string "Let's BERRY BLENDER!$"
 
-BerryBlender_Text_ExplainBerryBlending2: @ 82932F1
+BerryBlender_Text_ExplainBerryBlending2:
 	.string "Okay!\n"
 	.string "Let me explain it to you!\p"
 	.string "When the spinning BLENDER's arrow\n"
@@ -99,7 +99,7 @@ BerryBlender_Text_ExplainBerryBlending2: @ 82932F1
 	.string "That's all it takes.\n"
 	.string "Pretty easy, don't you think?$"
 
-BerryBlender_Text_DontHaveAnyBerries2: @ 8293394
+BerryBlender_Text_DontHaveAnyBerries2:
 	.string "Oh, but wait a second here…\n"
 	.string "You don't have any BERRIES.\p"
 	.string "You can't make any {POKEBLOCK}S without\n"
@@ -107,40 +107,40 @@ BerryBlender_Text_DontHaveAnyBerries2: @ 8293394
 	.string "We'll always be around whenever you\n"
 	.string "get hold of some BERRIES to blend.$"
 
-BerryBlender_Text_PokeblockCaseIsFull2: @ 829343E
+BerryBlender_Text_PokeblockCaseIsFull2:
 	.string "Oh, but wait a second here…\n"
 	.string "Your {POKEBLOCK} CASE is full.\p"
 	.string "You should use some {POKEBLOCK}S and\n"
 	.string "then come back.$"
 
-BerryBlender_Text_DontHavePokeblockCase2: @ 82934A2
+BerryBlender_Text_DontHavePokeblockCase2:
 	.string "Oh, but wait a second here…\n"
 	.string "You don't have a {POKEBLOCK} CASE.\p"
 	.string "You should get a {POKEBLOCK} CASE and\n"
 	.string "then come back.$"
 
 @ Unused
-BerryBlender_Text_MakePokeblocksWithOurGroup: @ 829350B
+BerryBlender_Text_MakePokeblocksWithOurGroup:
 	.string "Oh, hello! Did you want to make some\n"
 	.string "{POKEBLOCK}S with our little group?$"
 
-BerryBlender_Text_OhDear: @ 829354E
+BerryBlender_Text_OhDear:
 	.string "Oh, dear!$"
 
-BerryBlender_Text_LeftUsInShock: @ 8293558
+BerryBlender_Text_LeftUsInShock:
 	.string "Oh, dear me…\p"
 	.string "You've left us in shock!$"
 
-BerryBlender_Text_KnowHowToMakePokeblocks3: @ 829357E
+BerryBlender_Text_KnowHowToMakePokeblocks3:
 	.string "Naturally, you know how to make\n"
 	.string "{POKEBLOCK}S, don't you?$"
 
-BerryBlender_Text_LetsBerryBlender3: @ 82935B1
+BerryBlender_Text_LetsBerryBlender3:
 	.string "Okay, dear!\n"
 	.string "Let's get started!\p"
 	.string "Let's BERRY BLENDER!$"
 
-BerryBlender_Text_ExplainBerryBlending3: @ 82935E5
+BerryBlender_Text_ExplainBerryBlending3:
 	.string "Oh, dear!\p"
 	.string "Then, I'll explain it to you nicely.\p"
 	.string "When the BLENDER's arrow spins to\n"
@@ -148,7 +148,7 @@ BerryBlender_Text_ExplainBerryBlending3: @ 82935E5
 	.string "That's all it takes.\n"
 	.string "Isn't it simple?$"
 
-BerryBlender_Text_DontHaveAnyBerries3: @ 829367D
+BerryBlender_Text_DontHaveAnyBerries3:
 	.string "You don't have any BERRIES,\n"
 	.string "do you?\p"
 	.string "If you don't have any BERRIES,\n"
@@ -157,84 +157,84 @@ BerryBlender_Text_DontHaveAnyBerries3: @ 829367D
 	.string "so let's make some together when\l"
 	.string "you get a BERRY or two.$"
 
-BerryBlender_Text_PokeblockCaseIsFull3: @ 8293738
+BerryBlender_Text_PokeblockCaseIsFull3:
 	.string "Your {POKEBLOCK} CASE is full,\n"
 	.string "it looks like.\p"
 	.string "You should use some {POKEBLOCK}S up\n"
 	.string "and then come back.$"
 
-BerryBlender_Text_DontHavePokeblockCase3: @ 8293792
+BerryBlender_Text_DontHavePokeblockCase3:
 	.string "You haven't gotten a {POKEBLOCK} CASE\n"
 	.string "yet, it looks like.\p"
 	.string "You need to get a {POKEBLOCK} CASE before\n"
 	.string "you come back.$"
 
-BerryBlender_Text_SetNewBlenderRecord: @ 82937F9
+BerryBlender_Text_SetNewBlenderRecord:
 	.string "Okay! Today's going to be the day that\n"
 	.string "I set a new BLENDER speed record!$"
 
-BerryBlender_Text_LookGoodAtBlendingJoinUs: @ 8293842
+BerryBlender_Text_LookGoodAtBlendingJoinUs:
 	.string "Oh, dear!\n"
 	.string "You look as if you're good at blending.\l"
 	.string "Would you like to join us?$"
 
-BerryBlender_Text_MakeDeliciousPokeblocks: @ 829388F
+BerryBlender_Text_MakeDeliciousPokeblocks:
 	.string "I'm going to make delicious {POKEBLOCK}S\n"
 	.string "and make my POKéMON cuter.$"
 
-BerryBlender_Text_SaveGameBeforeBerryBlenderLink: @ 82938CD
+BerryBlender_Text_SaveGameBeforeBerryBlenderLink:
 	.string "{POKEBLOCK}S will be made with your friends \n"
 	.string "from BERRIES in the BERRY BLENDER.\p"
 	.string "Is it okay to save the game before\n"
 	.string "linking with your friends?$"
 
-BerryBlender_Text_SearchingForFriends: @ 8293955
+BerryBlender_Text_SearchingForFriends:
 	.string "Searching for your friends…\n"
 	.string "… … B Button: Cancel$"
 
-BerryBlender_Text_Player1Arrived: @ 8293986
+BerryBlender_Text_Player1Arrived:
 	.string "{STR_VAR_1} arrived.$"
 
-BerryBlender_Text_Player1And2Arrived: @ 8293992
+BerryBlender_Text_Player1And2Arrived:
 	.string "{STR_VAR_1} and {STR_VAR_2} arrived.$"
 
-BerryBlender_Text_AllPlayersArrived: @ 82939A5
+BerryBlender_Text_AllPlayersArrived:
 	.string "{STR_VAR_1}, {STR_VAR_2}, and\n"
 	.string "{STR_VAR_3} arrived.$"
 
-BerryBlender_Text_NoBerriesLink: @ 82939BD
+BerryBlender_Text_NoBerriesLink:
 	.string "You have no BERRIES.\n"
 	.string "The BERRY BLENDER can't be used.$"
 
-BerryBlender_Text_PokeblockCaseIsFullLink: @ 82939F3
+BerryBlender_Text_PokeblockCaseIsFullLink:
 	.string "Your {POKEBLOCK} CASE is full.\n"
 	.string "The BERRY BLENDER can't be used.$"
 
-BerryBlender_Text_DontHavePokeblockCaseLink: @ 8293A2D
+BerryBlender_Text_DontHavePokeblockCaseLink:
 	.string "You don't have a {POKEBLOCK} CASE.\n"
 	.string "The BERRY BLENDER can't be used.$"
 
-BerryBlender_Text_LoveMakingPokeblocks: @ 8293A6B
+BerryBlender_Text_LoveMakingPokeblocks:
 	.string "I love making {POKEBLOCK}S.\p"
 	.string "I always have some BERRIES with me.$"
 
-BerryBlender_Text_MakePokeblocksUsingBerryBlender: @ 8293AA5
+BerryBlender_Text_MakePokeblocksUsingBerryBlender:
 	.string "If you'd like, we could make some\n"
 	.string "{POKEBLOCK}S together using the\l"
 	.string "BERRY BLENDER.$"
 
-BerryBlender_Text_DontHaveAnyBerriesHaveOne: @ 8293AF0
+BerryBlender_Text_DontHaveAnyBerriesHaveOne:
 	.string "Oh?\n"
 	.string "You don't have any BERRIES?\p"
 	.string "Well, that won't do at all now, will it?\p"
 	.string "If you don't mind leftovers, you can\n"
 	.string "have one of my BERRIES.$"
 
-BerryBlender_Text_UseItToMakePokeblocksTogether: @ 8293B76
+BerryBlender_Text_UseItToMakePokeblocksTogether:
 	.string "We'll use it to make {POKEBLOCK}S together\n"
 	.string "using the BERRY BLENDER.$"
 
-BerryBlender_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4
+BerryBlender_Text_DontHaveAnyBerriesNoneToSpare:
 	.string "Oh?\n"
 	.string "You don't have any BERRIES?\p"
 	.string "If I had some left over, I'd gladly\n"
@@ -242,7 +242,7 @@ BerryBlender_Text_DontHaveAnyBerriesNoneToSpare: @ 8293BB4
 	.string "But, I don't have any to spare today.\n"
 	.string "Sorry about that.$"
 
-BerryBlender_EventScript_BerryBlender1:: @ 8293C3E
+BerryBlender_EventScript_BerryBlender1::
 	lockall
 	goto_if_unset FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER, BerryBlender_EventScript_BlendMasterPresent
 	setvar NUM_OPPONENTS, 1
@@ -254,48 +254,48 @@ BerryBlender_EventScript_BerryBlender1:: @ 8293C3E
 	goto BerryBlender_EventScript_DeclineBlender1
 	end
 
-BerryBlender_EventScript_DeclineBlender1: @ 8293C70
+BerryBlender_EventScript_DeclineBlender1:
 	msgbox BerryBlender_Text_MadeOldTimerSad, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_Blender1NoBerries: @ 8293C7A
+BerryBlender_EventScript_Blender1NoBerries:
 	msgbox BerryBlender_Text_DontHaveAnyBerries, MSGBOX_DEFAULT
 	dotimebasedevents
 	goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY, BerryBlender_EventScript_Blender1NoSpareBerries
 	goto BerryBlender_EventScript_Blender1GiveSpareBerry
 	end
 
-BerryBlender_EventScript_Blender1NoSpareBerries: @ 8293C92
+BerryBlender_EventScript_Blender1NoSpareBerries:
 	msgbox BerryBlender_Text_DontHaveAnyBerriesToSpare, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_Blender1GiveSpareBerry: @ 8293C9C
+BerryBlender_EventScript_Blender1GiveSpareBerry:
 	msgbox BerryBlender_Text_CanHaveOneOfMyBerries, MSGBOX_DEFAULT
 	giveitem ITEM_PECHA_BERRY
 	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
 	goto BerryBlender_EventScript_UseBerryBlender1
 	end
 
-BerryBlender_EventScript_UseBerryBlender1: @ 8293CB9
+BerryBlender_EventScript_UseBerryBlender1:
 	msgbox BerryBlender_Text_KnowHowToMakePokeblocks, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq BerryBlender_EventScript_StartBlender1
 	goto BerryBlender_EventScript_ExplainBlending1
 	end
 
-BerryBlender_EventScript_StartBlender1: @ 8293CD2
+BerryBlender_EventScript_StartBlender1:
 	msgbox BerryBlender_Text_LetsBerryBlender, MSGBOX_DEFAULT
 	goto BerryBlender_EventScript_DoBerryBlending
 	end
 
-BerryBlender_EventScript_ExplainBlending1: @ 8293CE0
+BerryBlender_EventScript_ExplainBlending1:
 	msgbox BerryBlender_Text_ExplainBerryBlending, MSGBOX_DEFAULT
 	goto BerryBlender_EventScript_StartBlender1
 	end
 
-BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE
+BerryBlender_EventScript_TryUseBerryBlender1:
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq BerryBlender_EventScript_Blender1NoCase
@@ -309,7 +309,7 @@ BerryBlender_EventScript_TryUseBerryBlender1: @ 8293CEE
 	goto BerryBlender_EventScript_UseBerryBlender1
 	end
 
-BerryBlender_EventScript_DoBerryBlending: @ 8293D2C
+BerryBlender_EventScript_DoBerryBlending:
 	copyvar VAR_0x8004, NUM_OPPONENTS
 	fadescreen FADE_TO_BLACK
 	special DoBerryBlending
@@ -317,17 +317,17 @@ BerryBlender_EventScript_DoBerryBlending: @ 8293D2C
 	releaseall
 	end
 
-BerryBlender_EventScript_Blender1CaseFull: @ 8293D39
+BerryBlender_EventScript_Blender1CaseFull:
 	msgbox BerryBlender_Text_PokeblockCaseIsFull, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_Blender1NoCase: @ 8293D43
+BerryBlender_EventScript_Blender1NoCase:
 	msgbox BerryBlender_Text_DontHavePokeblockCase, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_BerryBlender2:: @ 8293D4D
+BerryBlender_EventScript_BerryBlender2::
 	lockall
 	setvar NUM_OPPONENTS, 2
 	applymovement LOCALID_TWIN, Common_Movement_FaceOriginalDirection
@@ -339,34 +339,34 @@ BerryBlender_EventScript_BerryBlender2:: @ 8293D4D
 	goto BerryBlender_EventScript_DeclineBlender2
 	end
 
-BerryBlender_EventScript_DeclineBlender2: @ 8293D7D
+BerryBlender_EventScript_DeclineBlender2:
 	msgbox BerryBlender_Text_ThatsTooBad, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_Blender2NoBerries: @ 8293D87
+BerryBlender_EventScript_Blender2NoBerries:
 	msgbox BerryBlender_Text_DontHaveAnyBerries2, MSGBOX_DEFAULT
 	release
 	end
 
-BerryBlender_EventScript_UseBerryBlender2: @ 8293D91
+BerryBlender_EventScript_UseBerryBlender2:
 	msgbox BerryBlender_Text_KnowHowToMakePokeblocks2, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq BerryBlender_EventScript_StartBlender2
 	goto BerryBlender_EventScript_ExplainBlending2
 	end
 
-BerryBlender_EventScript_StartBlender2: @ 8293DAA
+BerryBlender_EventScript_StartBlender2:
 	msgbox BerryBlender_Text_LetsBerryBlender2, MSGBOX_DEFAULT
 	goto BerryBlender_EventScript_DoBerryBlending
 	end
 
-BerryBlender_EventScript_ExplainBlending2: @ 8293DB8
+BerryBlender_EventScript_ExplainBlending2:
 	msgbox BerryBlender_Text_ExplainBerryBlending2, MSGBOX_DEFAULT
 	goto BerryBlender_EventScript_StartBlender2
 	end
 
-BerryBlender_EventScript_TryUseBerryBlender2: @ 8293DC6
+BerryBlender_EventScript_TryUseBerryBlender2:
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, FALSE
 	goto_if_eq BerryBlender_EventScript_Blender2NoBerries
@@ -381,17 +381,17 @@ BerryBlender_EventScript_TryUseBerryBlender2: @ 8293DC6
 	goto_if_eq BerryBlender_EventScript_Blender2CaseFull
 	end
 
-BerryBlender_EventScript_Blender2CaseFull: @ 8293E0A
+BerryBlender_EventScript_Blender2CaseFull:
 	msgbox BerryBlender_Text_PokeblockCaseIsFull2, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_Blender2NoCase: @ 8293E14
+BerryBlender_EventScript_Blender2NoCase:
 	msgbox BerryBlender_Text_DontHavePokeblockCase2, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_BerryBlender3:: @ 8293E1E
+BerryBlender_EventScript_BerryBlender3::
 	lockall
 	setvar VAR_0x8008, LOCALID_POKEFAN_F
 	setvar NUM_OPPONENTS, 3
@@ -405,34 +405,34 @@ BerryBlender_EventScript_BerryBlender3:: @ 8293E1E
 	goto BerryBlender_EventScript_DeclineBlender3
 	end
 
-BerryBlender_EventScript_DeclineBlender3: @ 8293E5A
+BerryBlender_EventScript_DeclineBlender3:
 	msgbox BerryBlender_Text_LeftUsInShock, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_Blender3NoBerries: @ 8293E64
+BerryBlender_EventScript_Blender3NoBerries:
 	msgbox BerryBlender_Text_DontHaveAnyBerries3, MSGBOX_DEFAULT
 	release
 	end
 
-BerryBlender_EventScript_UseBerryBlender3: @ 8293E6E
+BerryBlender_EventScript_UseBerryBlender3:
 	msgbox BerryBlender_Text_KnowHowToMakePokeblocks3, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq BerryBlender_EventScript_StartBlender3
 	goto BerryBlender_EventScript_ExplainBlending3
 	end
 
-BerryBlender_EventScript_StartBlender3: @ 8293E87
+BerryBlender_EventScript_StartBlender3:
 	msgbox BerryBlender_Text_LetsBerryBlender3, MSGBOX_DEFAULT
 	goto BerryBlender_EventScript_DoBerryBlending
 	end
 
-BerryBlender_EventScript_ExplainBlending3: @ 8293E95
+BerryBlender_EventScript_ExplainBlending3:
 	msgbox BerryBlender_Text_ExplainBerryBlending3, MSGBOX_DEFAULT
 	goto BerryBlender_EventScript_StartBlender3
 	end
 
-BerryBlender_EventScript_TryUseBlender3: @ 8293EA3
+BerryBlender_EventScript_TryUseBlender3:
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, FALSE
 	goto_if_eq BerryBlender_EventScript_Blender3NoBerries
@@ -447,17 +447,17 @@ BerryBlender_EventScript_TryUseBlender3: @ 8293EA3
 	goto_if_eq BerryBlender_EventScript_Blender3CaseFull
 	end
 
-BerryBlender_EventScript_Blender3CaseFull: @ 8293EE7
+BerryBlender_EventScript_Blender3CaseFull:
 	msgbox BerryBlender_Text_PokeblockCaseIsFull3, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_Blender3NoCase: @ 8293EF1
+BerryBlender_EventScript_Blender3NoCase:
 	msgbox BerryBlender_Text_DontHavePokeblockCase3, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_BlendMasterPresent: @ 8293EFB
+BerryBlender_EventScript_BlendMasterPresent:
 	lockall
 	setvar NUM_OPPONENTS, 1
 	msgbox BerryBlender_Text_SeeMyMasteryInAction, MSGBOX_YESNO
@@ -467,12 +467,12 @@ BerryBlender_EventScript_BlendMasterPresent: @ 8293EFB
 	releaseall
 	end
 
-BerryBlender_EventScript_BlendMasterNoBerries: @ 8293F1E
+BerryBlender_EventScript_BlendMasterNoBerries:
 	msgbox BerryBlender_Text_BlendMasterNoBerries, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_TryBlendWithBlendMaster: @ 8293F28
+BerryBlender_EventScript_TryBlendWithBlendMaster:
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq BerryBlender_EventScript_BlendMasterNoCase
@@ -486,7 +486,7 @@ BerryBlender_EventScript_TryBlendWithBlendMaster: @ 8293F28
 	goto_if_eq BerryBlender_EventScript_BlendMasterCaseFull
 	end
 
-BerryBlender_EventScript_BlendWithBlendMaster: @ 8293F64
+BerryBlender_EventScript_BlendWithBlendMaster:
 	msgbox BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	call_if_eq BerryBlender_EventScript_BlendMasterExplainBlending
@@ -494,38 +494,38 @@ BerryBlender_EventScript_BlendWithBlendMaster: @ 8293F64
 	goto BerryBlender_EventScript_DoBerryBlending
 	end
 
-BerryBlender_EventScript_BlendMasterExplainBlending: @ 8293F85
+BerryBlender_EventScript_BlendMasterExplainBlending:
 	msgbox BerryBlender_Text_BlendMasterExplainBerryBlending, MSGBOX_DEFAULT
 	return
 
-BerryBlender_EventScript_BlendMasterNoCase: @ 8293F8E
+BerryBlender_EventScript_BlendMasterNoCase:
 	msgbox BerryBlender_Text_BlendMasterNoPokeblockCase, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_BlendMasterCaseFull: @ 8293F98
+BerryBlender_EventScript_BlendMasterCaseFull:
 	msgbox BerryBlender_Text_BlendMasterPokeblockCaseFull, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_Blender2Man:: @ 8293FA2
+BerryBlender_EventScript_Blender2Man::
 	msgbox BerryBlender_Text_SetNewBlenderRecord, MSGBOX_NPC
 	end
 
-BerryBlender_EventScript_Blender3PokefanF:: @ 8293FAB
+BerryBlender_EventScript_Blender3PokefanF::
 	msgbox BerryBlender_Text_LookGoodAtBlendingJoinUs, MSGBOX_NPC
 	end
 
-BerryBlender_EventScript_Blender2Twin:: @ 8293FB4
+BerryBlender_EventScript_Blender2Twin::
 	msgbox BerryBlender_Text_MakeDeliciousPokeblocks, MSGBOX_NPC
 	end
 
-BerryBlender_EventScript_Blender1ExpertM:: @ 8293FBD
+BerryBlender_EventScript_Blender1ExpertM::
 	setvar VAR_0x8008, 15
 	goto BerryBlender_EventScript_ExpertMCheckGiveBerry
 	end
 
-BerryBlender_EventScript_ExpertMCheckGiveBerry: @ 8293FC8
+BerryBlender_EventScript_ExpertMCheckGiveBerry:
 	lock
 	faceplayer
 	msgbox BerryBlender_Text_LoveMakingPokeblocks, MSGBOX_DEFAULT
@@ -536,12 +536,12 @@ BerryBlender_EventScript_ExpertMCheckGiveBerry: @ 8293FC8
 	goto_if_eq BerryBlender_EventScript_ExpertMNoBerries
 	end
 
-BerryBlender_EventScript_ExpertMPlayerHasBerries: @ 8293FEE
+BerryBlender_EventScript_ExpertMPlayerHasBerries:
 	msgbox BerryBlender_Text_MakePokeblocksUsingBerryBlender, MSGBOX_DEFAULT
 	release
 	end
 
-BerryBlender_EventScript_ExpertMNoBerries: @ 8293FF8
+BerryBlender_EventScript_ExpertMNoBerries:
 	checkitem ITEM_POKEBLOCK_CASE, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq BerryBlender_EventScript_ExpertMNoSpareBerries
@@ -553,12 +553,12 @@ BerryBlender_EventScript_ExpertMNoBerries: @ 8293FF8
 	goto BerryBlender_EventScript_ExpertMGiveBerry
 	end
 
-BerryBlender_EventScript_ExpertMNoSpareBerries: @ 8294028
+BerryBlender_EventScript_ExpertMNoSpareBerries:
 	msgbox BerryBlender_Text_DontHaveAnyBerriesNoneToSpare, MSGBOX_DEFAULT
 	release
 	end
 
-BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032
+BerryBlender_EventScript_ExpertMGiveBerry:
 	msgbox BerryBlender_Text_DontHaveAnyBerriesHaveOne, MSGBOX_DEFAULT
 	giveitem ITEM_PECHA_BERRY
 	setflag FLAG_DAILY_CONTEST_LOBBY_RECEIVED_BERRY
@@ -566,11 +566,11 @@ BerryBlender_EventScript_ExpertMGiveBerry: @ 8294032
 	release
 	end
 
-BerryBlender_Movement_BlendLeaderWalkInPlace: @ 8294053
+BerryBlender_Movement_BlendLeaderWalkInPlace:
 	walk_in_place_fastest_right
 	step_end
 
-BerryBlender_EventScript_BerryBlenderLink:: @ 8294055
+BerryBlender_EventScript_BerryBlenderLink::
 	lockall
 	specialvar VAR_RESULT, PlayerHasBerries
 	compare VAR_RESULT, FALSE
@@ -585,7 +585,7 @@ BerryBlender_EventScript_BerryBlenderLink:: @ 8294055
 	goto_if_eq BerryBlender_EventScript_LinkBlenderCaseFull
 	end
 
-BerryBlender_EventScript_LinkBlenderSaveGame: @ 8294092
+BerryBlender_EventScript_LinkBlenderSaveGame:
 	msgbox BerryBlender_Text_SaveGameBeforeBerryBlenderLink, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq BerryBlender_EventScript_TryDoLinkBlender
@@ -593,12 +593,12 @@ BerryBlender_EventScript_LinkBlenderSaveGame: @ 8294092
 	goto_if_eq BerryBlender_EventScript_CancelLinkBlender
 	end
 
-BerryBlender_EventScript_LinkBlenderNoBerries: @ 82940B1
+BerryBlender_EventScript_LinkBlenderNoBerries:
 	msgbox BerryBlender_Text_NoBerriesLink, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_TryDoLinkBlender: @ 82940BB
+BerryBlender_EventScript_TryDoLinkBlender:
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, FALSE
 	goto_if_eq BerryBlender_EventScript_CancelLinkBlender
@@ -621,72 +621,72 @@ BerryBlender_EventScript_TryDoLinkBlender: @ 82940BB
 	goto_if_eq BerryBlender_EventScript_LinkError
 	end
 
-BerryBlender_EventScript_TwoPlayerLink: @ 829411D
+BerryBlender_EventScript_TwoPlayerLink:
 	msgbox BerryBlender_Text_Player1Arrived, MSGBOX_DEFAULT
 	goto BerryBlender_EventScript_DoLinkBerryBlending
 	end
 
-BerryBlender_EventScript_ThreePlayerLink: @ 829412B
+BerryBlender_EventScript_ThreePlayerLink:
 	msgbox BerryBlender_Text_Player1And2Arrived, MSGBOX_DEFAULT
 	goto BerryBlender_EventScript_DoLinkBerryBlending
 	end
 
-BerryBlender_EventScript_FourPlayerLink: @ 8294139
+BerryBlender_EventScript_FourPlayerLink:
 	msgbox BerryBlender_Text_AllPlayersArrived, MSGBOX_DEFAULT
 	goto BerryBlender_EventScript_DoLinkBerryBlending
 	end
 
-BerryBlender_EventScript_DoLinkBerryBlending: @ 8294147
+BerryBlender_EventScript_DoLinkBerryBlending:
 	setvar VAR_0x8004, 0  @ number of opponents, 0 indicates Link
 	fadescreen FADE_TO_BLACK
 	removeobject 240 @ Unclear where these local IDs come from,
 	removeobject 239 @ but presumably they'd be the 4 link players
-	removeobject 238 
+	removeobject 238
 	removeobject 237
 	special DoBerryBlending
 	waitstate
 	releaseall
 	end
 
-BerryBlender_EventScript_CancelLinkBlender: @ 8294160
+BerryBlender_EventScript_CancelLinkBlender:
 	releaseall
 	end
 
-BerryBlender_EventScript_LinkBlenderCaseFull: @ 8294162
+BerryBlender_EventScript_LinkBlenderCaseFull:
 	msgbox BerryBlender_Text_PokeblockCaseIsFullLink, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_LinkBlenderNoCase: @ 829416C
+BerryBlender_EventScript_LinkBlenderNoCase:
 	msgbox BerryBlender_Text_DontHavePokeblockCaseLink, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_CloseLinkNotReady: @ 8294176
+BerryBlender_EventScript_CloseLinkNotReady:
 	special CloseLink
 	msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_CloseLinkDifferentSelections: @ 8294183
+BerryBlender_EventScript_CloseLinkDifferentSelections:
 	special CloseLink
 	msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_CloseLink: @ 8294190
+BerryBlender_EventScript_CloseLink:
 	special CloseLink
 	msgbox gText_PokeblockLinkCanceled, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_LinkError: @ 829419D
+BerryBlender_EventScript_LinkError:
 	special CloseLink
 	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
 	releaseall
 	end
 
-BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
+BerryBlender_EventScript_SpawnLinkPartners:
 	fadescreen FADE_TO_BLACK
 	specialvar VAR_RESULT, GetLinkPartnerNames
 	copyvar VAR_0x8008, VAR_RESULT
@@ -695,7 +695,7 @@ BerryBlender_EventScript_SpawnLinkPartners: @ 82941AA
 	goto BerryBlender_EventScript_LinkPlayersArrived
 	end
 
-BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4
+BerryBlender_EventScript_LinkPlayersArrived:
 	fadescreen FADE_FROM_BLACK
 	switch VAR_0x8008
 	case 2, BerryBlender_EventScript_TwoPlayerLink
@@ -703,12 +703,12 @@ BerryBlender_EventScript_LinkPlayersArrived: @ 82941C4
 	case 4, BerryBlender_EventScript_FourPlayerLink
 	end
 
-BerryBlender_EventScript_StartDecideLinkLeader: @ 82941ED
+BerryBlender_EventScript_StartDecideLinkLeader:
 	setvar VAR_0x8004, LINK_GROUP_BERRY_BLENDER
 	goto BerryBlender_EventScript_DecideLinkLeader
 	end
 
-BerryBlender_EventScript_DecideLinkLeader: @ 82941F8
+BerryBlender_EventScript_DecideLinkLeader:
 	message LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, FALSE
@@ -719,7 +719,7 @@ BerryBlender_EventScript_DecideLinkLeader: @ 82941F8
 	case MULTI_B_PRESSED, BerryBlender_EventScript_CloseLink
 	end
 
-BerryBlender_EventScript_TryLeadGroup: @ 8294235
+BerryBlender_EventScript_TryLeadGroup:
 	call BerryBlender_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
@@ -730,7 +730,7 @@ BerryBlender_EventScript_TryLeadGroup: @ 8294235
 	release
 	end
 
-BerryBlender_EventScript_TryJoinGroup: @ 829425D
+BerryBlender_EventScript_TryJoinGroup:
 	call BerryBlender_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq BerryBlender_EventScript_LinkLeaderDecided
@@ -741,16 +741,16 @@ BerryBlender_EventScript_TryJoinGroup: @ 829425D
 	release
 	end
 
-BerryBlender_EventScript_TryBecomeLinkLeader: @ 8294285
+BerryBlender_EventScript_TryBecomeLinkLeader:
 	special TryBecomeLinkLeader
 	waitstate
 	return
 
-BerryBlender_EventScript_TryJoinLinkGroup: @ 829428A
+BerryBlender_EventScript_TryJoinLinkGroup:
 	special TryJoinLinkGroup
 	waitstate
 	return
 
-BerryBlender_EventScript_LinkLeaderDecided: @ 829428F
+BerryBlender_EventScript_LinkLeaderDecided:
 	goto BerryBlender_EventScript_SpawnLinkPartners
 	end
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index fe10af4b3..e415d0c65 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,4 +1,4 @@
-BerryTreeScript:: @ 82742F9
+BerryTreeScript::
 	special ObjectEventInteractionGetBerryTreeData
 	switch VAR_0x8004
 	case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling
@@ -10,7 +10,7 @@ BerryTreeScript:: @ 82742F9
 	case BERRY_STAGE_BERRIES, BerryTree_EventScript_CheckBerryFullyGrown
 	end
 
-BerryTree_EventScript_Sparkling:: @ 827434F
+BerryTree_EventScript_Sparkling::
 	lockall
 	message BerryTree_Text_ExclamationPoint
 	waitmessage
@@ -18,7 +18,7 @@ BerryTree_EventScript_Sparkling:: @ 827434F
 	releaseall
 	end
 
-BerryTree_EventScript_CheckSoil:: @ 8274359
+BerryTree_EventScript_CheckSoil::
 	lock
 	faceplayer
 	specialvar VAR_RESULT, PlayerHasBerries
@@ -30,7 +30,7 @@ BerryTree_EventScript_CheckSoil:: @ 8274359
 	release
 	end
 
-BerryTree_EventScript_WantToPlant:: @ 8274374
+BerryTree_EventScript_WantToPlant::
 	msgbox BerryTree_Text_WantToPlant, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq BerryTree_EventScript_ChooseBerryToPlant
@@ -38,7 +38,7 @@ BerryTree_EventScript_WantToPlant:: @ 8274374
 	goto_if_eq BerryTree_EventScript_CancelPlanting
 	end
 
-BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393
+BerryTree_EventScript_ChooseBerryToPlant::
 	fadescreen FADE_TO_BLACK
 	closemessage
 	special Bag_ChooseBerry
@@ -48,11 +48,11 @@ BerryTree_EventScript_ChooseBerryToPlant:: @ 8274393
 	removeitem VAR_ITEM_ID
 	call BerryTree_EventScript_PlantBerry
 
-BerryTree_EventScript_CancelPlanting:: @ 82743AF
+BerryTree_EventScript_CancelPlanting::
 	release
 	end
 
-BerryTree_EventScript_CheckBerryStage1:: @ 82743B1
+BerryTree_EventScript_CheckBerryStage1::
 	lockall
 	special ObjectEventInteractionGetBerryCountString
 	message BerryTree_Text_BerryGrowthStage1
@@ -60,7 +60,7 @@ BerryTree_EventScript_CheckBerryStage1:: @ 82743B1
 	waitbuttonpress
 	goto BerryTree_EventScript_WantToWater
 
-BerryTree_EventScript_CheckBerryStage2:: @ 82743C1
+BerryTree_EventScript_CheckBerryStage2::
 	lockall
 	special ObjectEventInteractionGetBerryName
 	message BerryTree_Text_BerryGrowthStage2
@@ -68,7 +68,7 @@ BerryTree_EventScript_CheckBerryStage2:: @ 82743C1
 	waitbuttonpress
 	goto BerryTree_EventScript_WantToWater
 
-BerryTree_EventScript_CheckBerryStage3:: @ 82743D1
+BerryTree_EventScript_CheckBerryStage3::
 	lockall
 	special ObjectEventInteractionGetBerryName
 	message BerryTree_Text_BerryGrowthStage3
@@ -76,7 +76,7 @@ BerryTree_EventScript_CheckBerryStage3:: @ 82743D1
 	waitbuttonpress
 	goto BerryTree_EventScript_WantToWater
 
-BerryTree_EventScript_CheckBerryStage4:: @ 82743E1
+BerryTree_EventScript_CheckBerryStage4::
 	call BerryTree_EventScript_GetCareAdverb
 	lockall
 	special ObjectEventInteractionGetBerryName
@@ -87,7 +87,7 @@ BerryTree_EventScript_CheckBerryStage4:: @ 82743E1
 
 @ VAR_0x8005 here is the number of times watered
 @ Buffered by ObjectEventInteractionGetBerryTreeData
-BerryTree_EventScript_GetCareAdverb:: @ 82743F6
+BerryTree_EventScript_GetCareAdverb::
 	compare VAR_0x8005, 0
 	goto_if_eq BerryTree_EventScript_SetAdverbPoor
 	compare VAR_0x8005, 4
@@ -95,16 +95,16 @@ BerryTree_EventScript_GetCareAdverb:: @ 82743F6
 	bufferstring 1, BerryTree_Text_CareAdverbGood
 	return
 
-BerryTree_EventScript_SetAdverbGreat:: @ 8274413
+BerryTree_EventScript_SetAdverbGreat::
 	bufferstring 1, BerryTree_Text_CareAdverbGreat
 	return
 
-BerryTree_EventScript_SetAdverbPoor:: @ 827441A
+BerryTree_EventScript_SetAdverbPoor::
 	bufferstring 1, BerryTree_Text_CareAdverbPoor
 	return
 
 @ VAR_0x8006 here is the number of berries
-BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
+BerryTree_EventScript_CheckBerryFullyGrown::
 	buffernumberstring 1, VAR_0x8006
 	lock
 	faceplayer
@@ -115,7 +115,7 @@ BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
 	compare VAR_RESULT, NO
 	goto_if_eq BerryTree_EventScript_CancelPickingBerry
 
-BerryTree_EventScript_PickBerry:: @ 8274448
+BerryTree_EventScript_PickBerry::
 	special ObjectEventInteractionPickBerryTree
 	compare VAR_0x8004, 0
 	goto_if_eq BerryTree_EventScript_BerryPocketFull
@@ -132,28 +132,28 @@ BerryTree_EventScript_PickBerry:: @ 8274448
 	release
 	end
 
-BerryTree_EventScript_BerryPocketFull:: @ 8274470
+BerryTree_EventScript_BerryPocketFull::
 	message BerryTree_Text_BerryPocketFull
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-BerryTree_EventScript_CancelPickingBerry:: @ 8274479
+BerryTree_EventScript_CancelPickingBerry::
 	message BerryTree_Text_BerryLeftUnpicked
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482
+BerryTree_EventScript_ItemUsePlantBerry::
 	lockall
 	special ObjectEventInteractionGetBerryTreeData
 	call BerryTree_EventScript_PlantBerry
 	releaseall
 	end
 
-BerryTree_EventScript_WantToWater:: @ 827448D
+BerryTree_EventScript_WantToWater::
 	checkitem ITEM_WAILMER_PAIL, 1
 	compare VAR_RESULT, 0
 	goto_if_eq BerryTree_EventScript_DontWater
@@ -164,14 +164,14 @@ BerryTree_EventScript_WantToWater:: @ 827448D
 	compare VAR_RESULT, NO
 	goto_if_eq BerryTree_EventScript_DontWater
 
-BerryTree_EventScript_DontWater:: @ 82744BE
+BerryTree_EventScript_DontWater::
 	releaseall
 	end
 
-BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0
+BerryTree_EventScript_ItemUseWailmerPail::
 	special ObjectEventInteractionGetBerryTreeData
 	lockall
-BerryTree_EventScript_WaterBerry:: @ 82744C4
+BerryTree_EventScript_WaterBerry::
 	special ObjectEventInteractionGetBerryName
 	message BerryTree_Text_WateredTheBerry
 	waitmessage
@@ -184,7 +184,7 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4
 	releaseall
 	end
 
-BerryTree_EventScript_PlantBerry:: @ 82744DD
+BerryTree_EventScript_PlantBerry::
 	special ObjectEventInteractionPlantBerryTree
 	incrementgamestat GAME_STAT_PLANTED_BERRIES
 	special IncrementDailyPlantedBerries
@@ -194,70 +194,70 @@ BerryTree_EventScript_PlantBerry:: @ 82744DD
 	waitbuttonpress
 	return
 
-BerryTree_Text_ItsSoftLoamySoil: @ 82744F0
+BerryTree_Text_ItsSoftLoamySoil:
 	.string "It's soft, loamy soil.$"
 
-BerryTree_Text_WantToPlant: @ 8274507
+BerryTree_Text_WantToPlant:
 	.string "It's soft, loamy soil.\n"
 	.string "Want to plant a BERRY?$"
 
-BerryTree_Text_PlantedOneBerry: @ 8274535
+BerryTree_Text_PlantedOneBerry:
 	.string "{PLAYER} planted one {STR_VAR_1} in\n"
 	.string "the soft, loamy soil.$"
 
-BerryTree_Text_BerryGrowthStage1: @ 8274560
+BerryTree_Text_BerryGrowthStage1:
 	.string "One {STR_VAR_1} was planted here.$"
 
-BerryTree_Text_BerryGrowthStage2: @ 8274579
+BerryTree_Text_BerryGrowthStage2:
 	.string "{STR_VAR_1} has sprouted.$"
 
-BerryTree_Text_BerryGrowthStage3: @ 827458A
+BerryTree_Text_BerryGrowthStage3:
 	.string "This {STR_VAR_1} plant is growing taller.$"
 
-BerryTree_Text_BerryGrowthStage4: @ 82745AB
+BerryTree_Text_BerryGrowthStage4:
 	.string "These {STR_VAR_1} flowers are blooming\n"
 	.string "{STR_VAR_2}.$"
 
-BerryTree_Text_CareAdverbGreat: @ 82745CD
+BerryTree_Text_CareAdverbGreat:
 	.string "very beautifully$"
 
-BerryTree_Text_CareAdverbPoor: @ 82745DE
+BerryTree_Text_CareAdverbPoor:
 	.string "cutely$"
 
-BerryTree_Text_CareAdverbGood: @ 82745E5
+BerryTree_Text_CareAdverbGood:
 	.string "prettily$"
 
-BerryTree_Text_WantToPick: @ 82745EE
+BerryTree_Text_WantToPick:
 	.string "You found {STR_VAR_2} {STR_VAR_1}!\p"
 	.string "Do you want to pick the\n"
 	.string "{STR_VAR_1}?$"
 
-BerryTree_Text_PickedTheBerry: @ 827461B
+BerryTree_Text_PickedTheBerry:
 	.string "{PLAYER} picked the {STR_VAR_2} {STR_VAR_1}.$"
 
-BerryTree_Text_PutAwayBerry: @ 8274630
+BerryTree_Text_PutAwayBerry:
 	.string "{PLAYER} put away the {STR_VAR_1}\n"
 	.string "in the BAG's BERRIES POCKET.\p"
 	.string "The soil returned to its soft and\n"
 	.string "loamy state.$"
 
-BerryTree_Text_BerryPocketFull: @ 827468F
+BerryTree_Text_BerryPocketFull:
 	.string "The BAG's BERRIES POCKET is full.\p"
 	.string "The {STR_VAR_1} couldn't be taken.$"
 
-BerryTree_Text_BerryLeftUnpicked: @ 82746CB
+BerryTree_Text_BerryLeftUnpicked:
 	.string "{PLAYER} left the {STR_VAR_1}\n"
 	.string "unpicked.$"
 
-BerryTree_Text_WantToWater: @ 82746E4
+BerryTree_Text_WantToWater:
 	.string "Want to water the {STR_VAR_1} with the\n"
 	.string "WAILMER PAIL?$"
 
-BerryTree_Text_WateredTheBerry: @ 8274710
+BerryTree_Text_WateredTheBerry:
 	.string "{PLAYER} watered the {STR_VAR_1}.$"
 
-BerryTree_Text_PlantIsDelighted: @ 8274723
+BerryTree_Text_PlantIsDelighted:
 	.string "The plant seems to be delighted.$"
 
-BerryTree_Text_ExclamationPoint: @ 8274744
+BerryTree_Text_ExclamationPoint:
 	.string "!$"
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index c17f77c0a..5cecb60d8 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -1,8 +1,8 @@
-CableClub_OnTransition: @ 8276ACF
+CableClub_OnTransition:
 	call CableClub_EventScript_HideOrShowMysteryGiftMan
 	end
 
-CableClub_EventScript_HideOrShowMysteryGiftMan:: @ 8276AD5
+CableClub_EventScript_HideOrShowMysteryGiftMan::
 	specialvar VAR_RESULT, ShouldDistributeEonTicket
 	compare VAR_RESULT, TRUE
 	goto_if_eq CableClub_EventScript_ShowMysteryGiftMan
@@ -12,30 +12,30 @@ CableClub_EventScript_HideOrShowMysteryGiftMan:: @ 8276AD5
 	goto CableClub_EventScript_ShowMysteryGiftMan
 	end
 
-CableClub_EventScript_ShowMysteryGiftMan:: @ 8276AFB
+CableClub_EventScript_ShowMysteryGiftMan::
 	clearflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 	return
 
-CableClub_EventScript_HideMysteryGiftMan:: @ 8276AFF
+CableClub_EventScript_HideMysteryGiftMan::
 	setflag FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN
 	return
 
-CableClub_EventScript_MysteryGiftMan:: @ 8276B03
+CableClub_EventScript_MysteryGiftMan::
 	specialvar VAR_RESULT, ShouldDistributeEonTicket
 	compare VAR_RESULT, TRUE
 	goto_if_eq CableClub_EventScript_DistributeEonTicket
 	goto CableClub_EventScript_AlreadyGotEonTicket
 	end
 
-CableClub_EventScript_AlreadyGotEonTicket:: @ 8276B19
+CableClub_EventScript_AlreadyGotEonTicket::
 	gotoram
 
 @ Unused?
-CableClub_EventScript_MysteryGiftThankYou:: @ 8276B1A
+CableClub_EventScript_MysteryGiftThankYou::
 	msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_NPC
 	end
 
-CableClub_EventScript_DistributeEonTicket:: @ 8276B23
+CableClub_EventScript_DistributeEonTicket::
 	checkitem ITEM_EON_TICKET, 1
 	compare VAR_RESULT, TRUE
 	goto_if_eq CableClub_EventScript_AlreadyGotEonTicket
@@ -49,12 +49,12 @@ CableClub_EventScript_DistributeEonTicket:: @ 8276B23
 	end
 
 @ Unused?
-CableClub_EventScript_MysteryGiftThankYou2:: @ 8276B62
+CableClub_EventScript_MysteryGiftThankYou2::
 	msgbox gText_ThankYouForAccessingMysteryGift, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_OnWarp: @ 8276B6C
+CableClub_OnWarp:
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_CheckTurnAttendant
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_CheckTurnAttendant
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MULTI_BATTLE, CableClub_EventScript_CheckTurnAttendant
@@ -65,14 +65,14 @@ CableClub_OnWarp: @ 8276B6C
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_CheckTurnAttendant
 	.2byte 0
 
-CableClub_EventScript_CheckTurnAttendant:: @ 8276BAE
+CableClub_EventScript_CheckTurnAttendant::
 	compare VAR_0x8007, 0
 	goto_if_eq CableClub_EventScript_DontTurnAttendant
 	turnobject VAR_0x8007, DIR_WEST
-CableClub_EventScript_DontTurnAttendant:: @ 8276BBD
+CableClub_EventScript_DontTurnAttendant::
 	end
 
-CableClub_OnLoad: @ 8276BBE
+CableClub_OnLoad:
 	compare VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE
 	goto_if_eq CableClub_EventScript_OnLoadFromColosseum
 	compare VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE
@@ -91,31 +91,31 @@ CableClub_OnLoad: @ 8276BBE
 	goto_if_eq CableClub_EventScript_OnLoadFromGameCorner
 	end
 
-CableClub_EventScript_OnLoadFromColosseum:: @ 8276C17
+CableClub_EventScript_OnLoadFromColosseum::
 	call CableClub_EventScript_OpenDirectCornerBarrier
 	end
 
-CableClub_EventScript_OnLoadFromTradeCenter:: @ 8276C1D
+CableClub_EventScript_OnLoadFromTradeCenter::
 	call CableClub_EventScript_OpenDirectCornerBarrier
 	end
 
-CableClub_EventScript_OnLoadFromRecordCorner:: @ 8276C23
+CableClub_EventScript_OnLoadFromRecordCorner::
 	call CableClub_EventScript_OpenDirectCornerBarrier
 	end
 
-CableClub_EventScript_OnLoadFromUnionRoom:: @ 8276C29
+CableClub_EventScript_OnLoadFromUnionRoom::
 	call CableClub_EventScript_OpenUnionRoomBarrier
 	end
 
-CableClub_EventScript_OnLoadFromBerryCrush:: @ 8276C2F
+CableClub_EventScript_OnLoadFromBerryCrush::
 	call CableClub_EventScript_OpenDirectCornerBarrier
 	end
 
-CableClub_EventScript_OnLoadFromGameCorner:: @ 8276C35
+CableClub_EventScript_OnLoadFromGameCorner::
 	call EventScript_OpenMossdeepGameCornerBarrier
 	end
 
-CableClub_OnFrame: @ 8276C3B
+CableClub_OnFrame:
 	map_script_2 VAR_CABLE_CLUB_TUTORIAL_STATE, 1, CableClub_EventScript_Tutorial
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_SINGLE_BATTLE, CableClub_EventScript_ExitLinkRoom
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_DOUBLE_BATTLE, CableClub_EventScript_ExitLinkRoom
@@ -127,7 +127,7 @@ CableClub_OnFrame: @ 8276C3B
 	map_script_2 VAR_CABLE_CLUB_STATE, USING_MINIGAME, CableClub_EventScript_ExitMinigameRoom
 	.2byte 0
 
-CableClub_EventScript_ExitLinkRoom:: @ 8276C85
+CableClub_EventScript_ExitLinkRoom::
 	lockall
 	call CableClub_EventScript_CloseLinkAndExitLinkRoom
 	call CableClub_EventScript_CloseDirectCornerBarrier
@@ -137,7 +137,7 @@ CableClub_EventScript_ExitLinkRoom:: @ 8276C85
 	releaseall
 	end
 
-CableClub_EventScript_ExitMinigameRoom:: @ 8276C9D
+CableClub_EventScript_ExitMinigameRoom::
 	lockall
 	call CableClub_EventScript_CloseLinkAndExitLinkRoom
 	call EventScript_CloseMossdeepGameCornerBarrier
@@ -147,7 +147,7 @@ CableClub_EventScript_ExitMinigameRoom:: @ 8276C9D
 	releaseall
 	end
 
-CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 8276CB5
+CableClub_EventScript_CloseLinkAndExitLinkRoom::
 	special CloseLink
 	setvar VAR_CABLE_CLUB_STATE, 0
 	compare VAR_0x8007, 0
@@ -160,7 +160,7 @@ CableClub_EventScript_CloseLinkAndExitLinkRoom:: @ 8276CB5
 	waitmovement 0
 	return
 
-CableClub_EventScript_ExitTradeCenter:: @ 8276CE7
+CableClub_EventScript_ExitTradeCenter::
 	lockall
 	call CableClub_EventScript_PlayerExitTradeCenter
 	call CableClub_EventScript_CloseDirectCornerBarrier
@@ -170,7 +170,7 @@ CableClub_EventScript_ExitTradeCenter:: @ 8276CE7
 	releaseall
 	end
 
-CableClub_EventScript_PlayerExitTradeCenter:: @ 8276CFF
+CableClub_EventScript_PlayerExitTradeCenter::
 	special CloseLink
 	setvar VAR_CABLE_CLUB_STATE, 0
 	compare VAR_0x8007, 0
@@ -182,7 +182,7 @@ CableClub_EventScript_PlayerExitTradeCenter:: @ 8276CFF
 	call CableClub_EventScript_TrainerCardDataOverwritten
 	return
 
-CableClub_EventScript_ExitRecordCorner:: @ 8276D2C
+CableClub_EventScript_ExitRecordCorner::
 	lockall
 	call CableClub_EventScript_PlayerExitRecordCorner
 	call CableClub_EventScript_CloseDirectCornerBarrier
@@ -192,7 +192,7 @@ CableClub_EventScript_ExitRecordCorner:: @ 8276D2C
 	releaseall
 	end
 
-CableClub_EventScript_PlayerExitRecordCorner:: @ 8276D44
+CableClub_EventScript_PlayerExitRecordCorner::
 	special CloseLink
 	setvar VAR_CABLE_CLUB_STATE, 0
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
@@ -201,10 +201,10 @@ CableClub_EventScript_PlayerExitRecordCorner:: @ 8276D44
 	goto_if_eq CableClub_EventScript_ExitRecordCornerRet
 	applymovement VAR_0x8007, Movement_AttendantFaceDown
 	waitmovement 0
-CableClub_EventScript_ExitRecordCornerRet:: @ 8276D6B
+CableClub_EventScript_ExitRecordCornerRet::
 	return
 
-CableClub_EventScript_ExitUnionRoom:: @ 8276D6C
+CableClub_EventScript_ExitUnionRoom::
 	lockall
 	call CableClub_EventScript_PlayerExitUnionRoom
 	call CableClub_EventScript_CloseUnionRoomBarrier
@@ -214,7 +214,7 @@ CableClub_EventScript_ExitUnionRoom:: @ 8276D6C
 	releaseall
 	end
 
-CableClub_EventScript_PlayerExitUnionRoom:: @ 8276D84
+CableClub_EventScript_PlayerExitUnionRoom::
 	setvar VAR_CABLE_CLUB_STATE, 0
 	compare VAR_0x8007, 0
 	goto_if_eq CableClub_EventScript_PlayerExitLinkRoom
@@ -225,7 +225,7 @@ CableClub_EventScript_PlayerExitUnionRoom:: @ 8276D84
 	call CableClub_EventScript_TrainerCardDataOverwritten
 	return
 
-CableClub_EventScript_TrainerCardDataOverwritten:: @ 8276DAE
+CableClub_EventScript_TrainerCardDataOverwritten::
 	message CableClub_Text_TrainerCardDataOverwritten
 	waitmessage
 	playse SE_PIN
@@ -238,12 +238,12 @@ CableClub_EventScript_TrainerCardDataOverwritten:: @ 8276DAE
 	waitmovement 0
 	return
 
-CableClub_EventScript_PlayerExitLinkRoom:: @ 8276DD5
+CableClub_EventScript_PlayerExitLinkRoom::
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerExitLinkRoom
 	waitmovement 0
 	return
 
-CableClub_EventScript_Tutorial:: @ 8276DE0
+CableClub_EventScript_Tutorial::
 	lockall
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
@@ -257,24 +257,24 @@ CableClub_EventScript_Tutorial:: @ 8276DE0
 	releaseall
 	end
 
-CableClub_Movement_PlayerApproachCounter: @ 8276E10
+CableClub_Movement_PlayerApproachCounter:
 	walk_up
 	walk_up
 	step_end
 
-CableClub_EventScript_WelcomeToCableClub:: @ 8276E13
+CableClub_EventScript_WelcomeToCableClub::
 	message CableClub_Text_WelcomeWhichCableClubService
 	waitmessage
 	delay 28
 	goto CableClub_EventScript_SelectCableClubRoom
 	end
 
-CableClub_EventScript_UnusedWelcomeToCableClub:: @ 8276E22
+CableClub_EventScript_UnusedWelcomeToCableClub::
 	msgbox CableClub_Text_WhichService, MSGBOX_DEFAULT
 	goto CableClub_EventScript_SelectCableClubRoom
 	end
 
-CableClub_EventScript_SelectCableClubRoom:: @ 8276E30
+CableClub_EventScript_SelectCableClubRoom::
 	setvar VAR_0x8004, 0
 	goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_CableClubUnlockedRecordCorner
 	multichoice 0, 0, MULTI_CABLE_CLUB_NO_RECORD_MIX, FALSE
@@ -285,7 +285,7 @@ CableClub_EventScript_SelectCableClubRoom:: @ 8276E30
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_CableClubUnlockedRecordCorner:: @ 8276E75
+CableClub_EventScript_CableClubUnlockedRecordCorner::
 	multichoice 0, 0, MULTI_CABLE_CLUB_WITH_RECORD_MIX, FALSE
 	switch VAR_RESULT
 	case 0, CableClub_EventScript_TradeCenter
@@ -295,12 +295,12 @@ CableClub_EventScript_CableClubUnlockedRecordCorner:: @ 8276E75
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_Colosseum:: @ 8276EB7
+CableClub_EventScript_Colosseum::
 	copyvar VAR_0x8007, VAR_LAST_TALKED
 	goto CableClub_EventScript_SelectBattleMode
 	end
 
-CableClub_EventScript_SelectBattleMode:: @ 8276EC2
+CableClub_EventScript_SelectBattleMode::
 	message CableClub_Text_PlayWhichBattleMode
 	waitmessage
 	multichoice 0, 0, MULTI_BATTLE_MODE, FALSE
@@ -313,17 +313,17 @@ CableClub_EventScript_SelectBattleMode:: @ 8276EC2
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_BattleModeInfo:: @ 8276F15
+CableClub_EventScript_BattleModeInfo::
 	msgbox CableClub_Text_ExplainBattleModes, MSGBOX_DEFAULT
 	goto CableClub_EventScript_SelectBattleMode
 	end
 
-CableClub_EventScript_SingleBattleMode:: @ 8276F23
+CableClub_EventScript_SingleBattleMode::
 	setvar VAR_0x8004, USING_SINGLE_BATTLE
 	goto CableClub_EventScript_TryEnterColosseum
 	end
 
-CableClub_EventScript_DoubleBattleMode:: @ 8276F2E
+CableClub_EventScript_DoubleBattleMode::
 	special HasEnoughMonsForDoubleBattle
 	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
 	goto_if_ne CableClub_EventScript_NeedTwoMonsForDoubleBattle
@@ -331,17 +331,17 @@ CableClub_EventScript_DoubleBattleMode:: @ 8276F2E
 	goto CableClub_EventScript_TryEnterColosseum
 	end
 
-CableClub_EventScript_NeedTwoMonsForDoubleBattle:: @ 8276F47
+CableClub_EventScript_NeedTwoMonsForDoubleBattle::
 	msgbox CableClub_Text_NeedTwoMonsForDoubleBattle, MSGBOX_DEFAULT
 	goto CableClub_EventScript_SelectBattleMode
 	end
 
-CableClub_EventScript_MultiBattleMode:: @ 8276F55
+CableClub_EventScript_MultiBattleMode::
 	setvar VAR_0x8004, USING_MULTI_BATTLE
 	goto CableClub_EventScript_TryEnterColosseum
 	end
 
-CableClub_EventScript_TryEnterColosseum:: @ 8276F60
+CableClub_EventScript_TryEnterColosseum::
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq CableClub_EventScript_AbortLink
@@ -363,7 +363,7 @@ CableClub_EventScript_TryEnterColosseum:: @ 8276F60
 	goto_if_eq CableClub_EventScript_AbortLinkConnectionError
 	end
 
-CableClub_EventScript_EnterColosseum:: @ 8276FBD
+CableClub_EventScript_EnterColosseum::
 	special HealPlayerParty
 	special SavePlayerParty
 	special LoadPlayerBag
@@ -396,19 +396,19 @@ CableClub_EventScript_EnterColosseum:: @ 8276FBD
 	end
 
 @ Unused
-CableClub_EventScript_PlayerApproachLinkRoomRight:: @ 827702B
+CableClub_EventScript_PlayerApproachLinkRoomRight::
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_PlayerApproachLinkRoomRight
 	waitmovement 0
 	return
 
-CableClub_EventScript_WarpTo4PColosseum:: @ 8277036
+CableClub_EventScript_WarpTo4PColosseum::
 	special SetCableClubWarp
 	warp MAP_BATTLE_COLOSSEUM_4P, 255, 5, 8
 	special DoCableClubWarp
 	waitstate
 	end
 
-CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers:: @ 8277046
+CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers::
 	switch VAR_0x8004
 	case USING_SINGLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForSingleBattle
 	case USING_DOUBLE_BATTLE, CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle
@@ -416,31 +416,31 @@ CableClub_EventScript_AbortLinkIncorrectNumberOfBattlers:: @ 8277046
 	goto CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants
 	end
 
-CableClub_EventScript_AbortLinkNeedFourPlayers:: @ 8277072
+CableClub_EventScript_AbortLinkNeedFourPlayers::
 	special CloseLink
 	msgbox CableClub_Text_NeedFourPlayers, MSGBOX_DEFAULT
 	goto CableClub_EventScript_ConfirmNumberAndRestart
 	end
 
-CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle:: @ 8277083
+CableClub_EventScript_AbortLinkWrongNumberForDoubleBattle::
 	special CloseLink
 	msgbox CableClub_Text_CantDoubleBattleWithXPlayers, MSGBOX_DEFAULT
 	goto CableClub_EventScript_ConfirmNumberAndRestart
 	end
 
-CableClub_EventScript_AbortLinkWrongNumberForSingleBattle:: @ 8277094
+CableClub_EventScript_AbortLinkWrongNumberForSingleBattle::
 	special CloseLink
 	msgbox CableClub_Text_CantSingleBattleWithXPlayers, MSGBOX_DEFAULT
 	goto CableClub_EventScript_ConfirmNumberAndRestart
 	end
 
-CableClub_EventScript_ConfirmNumberAndRestart:: @ 82770A5
+CableClub_EventScript_ConfirmNumberAndRestart::
 	special CloseLink  @ Redundant
 	msgbox CableClub_Text_PleaseConfirmNumberAndRestart, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_EventScript_TradeCenter:: @ 82770B2
+CableClub_EventScript_TradeCenter::
 	copyvar VAR_0x8007, VAR_LAST_TALKED
 	call CableClub_EventScript_CheckPartyTradeRequirements
 	compare VAR_RESULT, 0
@@ -470,7 +470,7 @@ CableClub_EventScript_TradeCenter:: @ 82770B2
 	goto_if_eq CableClub_EventScript_AbortLinkOtherTrainerNotReady
 	end
 
-CableClub_EventScript_EnterTradeCenter:: @ 827713A
+CableClub_EventScript_EnterTradeCenter::
 	setvar VAR_0x8004, USING_TRADE_CENTER
 	copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
 	messageautoscroll CableClub_Text_PleaseEnter
@@ -498,7 +498,7 @@ CableClub_EventScript_EnterTradeCenter:: @ 827713A
 	waitstate
 	end
 
-CableClub_EventScript_CheckPartyTradeRequirements:: @ 8277199
+CableClub_EventScript_CheckPartyTradeRequirements::
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
 	compare VAR_RESULT, 2
 	goto_if_lt CableClub_EventScript_NeedTwoMonsToTrade
@@ -508,17 +508,17 @@ CableClub_EventScript_CheckPartyTradeRequirements:: @ 8277199
 	setvar VAR_RESULT, 1
 	return
 
-CableClub_EventScript_NeedTwoMonsToTrade:: @ 82771BF
+CableClub_EventScript_NeedTwoMonsToTrade::
 	msgbox CableClub_Text_NeedTwoMonsToTrade, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
 	return
 
-CableClub_EventScript_CantTradeEnigmaBerry:: @ 82771CD
+CableClub_EventScript_CantTradeEnigmaBerry::
 	msgbox CableClub_Text_CantTradeEnigmaBerry, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
 	return
 
-CableClub_EventScript_RecordCorner:: @ 82771DB
+CableClub_EventScript_RecordCorner::
 	copyvar VAR_0x8007, VAR_LAST_TALKED
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
@@ -545,7 +545,7 @@ CableClub_EventScript_RecordCorner:: @ 82771DB
 	goto_if_eq CableClub_EventScript_AbortLinkConnectionError
 	end
 
-CableClub_EventScript_EnterRecordCorner:: @ 827724C
+CableClub_EventScript_EnterRecordCorner::
 	setvar VAR_0x8004, USING_RECORD_CORNER
 	copyvar VAR_CABLE_CLUB_STATE, VAR_0x8004
 	messageautoscroll CableClub_Text_PleaseEnter
@@ -573,135 +573,135 @@ CableClub_EventScript_EnterRecordCorner:: @ 827724C
 	waitstate
 	end
 
-CableClub_EventScript_AbortLinkPlayerNotReady:: @ 82772AB
+CableClub_EventScript_AbortLinkPlayerNotReady::
 	special CloseLink
 	msgbox CableClub_Text_NotSetUpForFarAwayRegion, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_EventScript_AbortLinkOtherTrainerNotReady:: @ 82772B8
+CableClub_EventScript_AbortLinkOtherTrainerNotReady::
 	special CloseLink
 	msgbox CableClub_Text_OtherTrainerNotReady, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_EventScript_AbortLinkConnectionError:: @ 82772C5
+CableClub_EventScript_AbortLinkConnectionError::
 	special CloseLink
 	msgbox Text_LinkErrorPleaseReset, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_EventScript_AbortLinkSomeoneNotReady:: @ 82772D2
+CableClub_EventScript_AbortLinkSomeoneNotReady::
 	special CloseLink
 	msgbox Text_SomeoneIsNotReadyToLink, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_EventScript_AbortLinkDifferentSelections:: @ 82772DF
+CableClub_EventScript_AbortLinkDifferentSelections::
 	special CloseLink
 	msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_EventScript_AbortLink:: @ 82772EC
+CableClub_EventScript_AbortLink::
 	special CloseLink
 	msgbox CableClub_Text_PleaseVisitAgain, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_AbortMinigame:: @ 82772F9
+MossdeepCity_GameCorner_1F_EventScript_AbortMinigame::
 	special CloseLink
 	msgbox MossdeepCity_GameCorner_1F_Text_ComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 @ Unused
-CableClub_EventScript_CableClubWarp:: @ 8277306
+CableClub_EventScript_CableClubWarp::
 	special SetCableClubWarp
 	special DoCableClubWarp
 	waitstate
 	end
 
-CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants:: @ 827730E
+CableClub_EventScript_AbortLinkIncorrectNumberOfParticipants::
 	special CloseLink
 	msgbox CableClub_Text_IncorrectNumberOfParticipants, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_EventScript_AbortLinkPlayerHasBadEgg:: @ 827731B
+CableClub_EventScript_AbortLinkPlayerHasBadEgg::
 	special CloseLink
 	msgbox CableClub_Text_YouHaveAMonThatCantBeTaken, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_EventScript_AbortLinkForeignGame:: @ 8277328
+CableClub_EventScript_AbortLinkForeignGame::
 	special CloseLink
 	msgbox CableClub_Text_CantMixWithJapaneseGame, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_EventScript_WirelessClubAdjustements:: @ 8277335
+CableClub_EventScript_WirelessClubAdjustements::
 	msgbox gText_SorryWirelessClubAdjustments, MSGBOX_DEFAULT
 	release
 	end
 
-CableClub_EventScript_NotReadyYet:: @ 827733F
+CableClub_EventScript_NotReadyYet::
 	msgbox gText_UndergoingAdjustments, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Movement_AttendantFaceDown: @ 8277349
+Movement_AttendantFaceDown:
 	face_down
 	step_end
 
 @ Unused
-Movement_AttendantFaceRight: @ 827734B
+Movement_AttendantFaceRight:
 	face_right
 	step_end
 
-Movement_AttendantFaceLeft: @ 827734D
+Movement_AttendantFaceLeft:
 	face_left
 	step_end
 
-Movement_PlayerExitLinkRoom: @ 827734F
+Movement_PlayerExitLinkRoom:
 	walk_down
 	walk_down
 	step_end
 
 @ Functionally unused
-Movement_PlayerApproachLinkRoomRight: @ 8277352
+Movement_PlayerApproachLinkRoomRight:
 	walk_right
 	walk_up
 	walk_up
 	step_end
 
-Movement_PlayerApproachLinkRoomLeft: @ 8277356
+Movement_PlayerApproachLinkRoomLeft:
 	walk_left
 	walk_up
 	walk_up
 	step_end
 
-Movement_PlayerEnterLinkRoom: @ 827735A
+Movement_PlayerEnterLinkRoom:
 	walk_up
 	step_end
 
 @ Unused
-Movement_PlayerFaceAttendantLeft: @ 827735C
+Movement_PlayerFaceAttendantLeft:
 	face_left
 	step_end
 
-Movement_PlayerFaceAttendantRight: @ 827735E
+Movement_PlayerFaceAttendantRight:
 	face_right
 	step_end
 
-Movement_PlayerEnterMinigameRoom: @ 8277360
+Movement_PlayerEnterMinigameRoom:
 	walk_left
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-EventScript_CableBoxResults:: @ 8277365
+EventScript_CableBoxResults::
 	lockall
 	setvar VAR_0x8004, 0
 	special ShowLinkBattleRecords
@@ -710,19 +710,19 @@ EventScript_CableBoxResults:: @ 8277365
 	releaseall
 	end
 
-EventScript_BattleColosseum_2P_PlayerSpot0:: @ 8277374
+EventScript_BattleColosseum_2P_PlayerSpot0::
 	setvar VAR_0x8005, 0
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_BattleColosseum_2P_PlayerSpot1:: @ 827737E
+EventScript_BattleColosseum_2P_PlayerSpot1::
 	setvar VAR_0x8005, 1
 	special ColosseumPlayerSpotTriggered
 	waitstate
 	end
 
-EventScript_BattleColosseum_4P_PlayerSpot0:: @ 8277388
+EventScript_BattleColosseum_4P_PlayerSpot0::
 	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
@@ -733,7 +733,7 @@ EventScript_BattleColosseum_4P_PlayerSpot0:: @ 8277388
 	waitstate
 	end
 
-EventScript_BattleColosseum_4P_PlayerSpot1:: @ 82773A3
+EventScript_BattleColosseum_4P_PlayerSpot1::
 	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
@@ -744,7 +744,7 @@ EventScript_BattleColosseum_4P_PlayerSpot1:: @ 82773A3
 	waitstate
 	end
 
-EventScript_BattleColosseum_4P_PlayerSpot2:: @ 82773BE
+EventScript_BattleColosseum_4P_PlayerSpot2::
 	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
@@ -755,7 +755,7 @@ EventScript_BattleColosseum_4P_PlayerSpot2:: @ 82773BE
 	waitstate
 	end
 
-EventScript_BattleColosseum_4P_PlayerSpot3:: @ 82773D9
+EventScript_BattleColosseum_4P_PlayerSpot3::
 	fadescreen FADE_TO_BLACK
 	special ChooseHalfPartyForBattle
 	waitstate
@@ -766,37 +766,37 @@ EventScript_BattleColosseum_4P_PlayerSpot3:: @ 82773D9
 	waitstate
 	end
 
-EventScript_BattleColosseum_4P_CancelSpotTrigger:: @ 82773F4
+EventScript_BattleColosseum_4P_CancelSpotTrigger::
 	end
 
-EventScript_TradeCenter_Chair0:: @ 82773F5
+EventScript_TradeCenter_Chair0::
 	setvar VAR_0x8005, 0
 	special PlayerEnteredTradeSeat
 	waitstate
 	end
 
-EventScript_TradeCenter_Chair1:: @ 82773FF
+EventScript_TradeCenter_Chair1::
 	setvar VAR_0x8005, 1
 	special PlayerEnteredTradeSeat
 	waitstate
 	end
 
 /* Never used */
-EventScript_TradeCenter_Chair2:: @ 8277409
+EventScript_TradeCenter_Chair2::
 	setvar VAR_0x8005, 2
 	special PlayerEnteredTradeSeat
 	waitstate
 	end
 
 /* Never used */
-EventScript_TradeCenter_Chair3:: @ 8277413
+EventScript_TradeCenter_Chair3::
 	setvar VAR_0x8005, 3
 	special PlayerEnteredTradeSeat
 	waitstate
 	end
 
 @ VAR_TEMP_1 for below scripts set by ReceiveGiftItem
-EventScript_RecordCenter_Spot0:: @ 827741D
+EventScript_RecordCenter_Spot0::
 	setvar VAR_0x8005, 0
 	special RecordMixingPlayerSpotTriggered
 	waitstate
@@ -804,7 +804,7 @@ EventScript_RecordCenter_Spot0:: @ 827741D
 	goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
 	end
 
-EventScript_RecordCenter_Spot1:: @ 8277432
+EventScript_RecordCenter_Spot1::
 	setvar VAR_0x8005, 1
 	special RecordMixingPlayerSpotTriggered
 	waitstate
@@ -812,7 +812,7 @@ EventScript_RecordCenter_Spot1:: @ 8277432
 	goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
 	end
 
-EventScript_RecordCenter_Spot2:: @ 8277447
+EventScript_RecordCenter_Spot2::
 	setvar VAR_0x8005, 2
 	special RecordMixingPlayerSpotTriggered
 	waitstate
@@ -820,7 +820,7 @@ EventScript_RecordCenter_Spot2:: @ 8277447
 	goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
 	end
 
-EventScript_RecordCenter_Spot3:: @ 827745C
+EventScript_RecordCenter_Spot3::
 	setvar VAR_0x8005, 3
 	special RecordMixingPlayerSpotTriggered
 	waitstate
@@ -828,7 +828,7 @@ EventScript_RecordCenter_Spot3:: @ 827745C
 	goto_if_ne RecordCorner_EventScript_ReceivedGiftItem
 	end
 
-RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471
+RecordCorner_EventScript_ReceivedGiftItem::
 	bufferitemname 1, VAR_TEMP_1
 	message RecordCorner_Text_PlayerSentOverOneX
 	waitmessage
@@ -836,40 +836,40 @@ RecordCorner_EventScript_ReceivedGiftItem:: @ 8277471
 	releaseall
 	end
 
-CableClub_EventScript_ReadTrainerCard:: @ 827747E
+CableClub_EventScript_ReadTrainerCard::
 	msgbox CableClub_Text_GotToLookAtTrainerCard, MSGBOX_DEFAULT
 	fadescreen FADE_TO_BLACK
 	special Script_ShowLinkTrainerCard
 	waitstate
 	end
 
-CableClub_EventScript_ReadTrainerCardColored:: @ 827748D
+CableClub_EventScript_ReadTrainerCardColored::
 	msgbox CableClub_Text_GotToLookAtColoredTrainerCard, MSGBOX_DEFAULT
 	fadescreen FADE_TO_BLACK
 	special Script_ShowLinkTrainerCard
 	waitstate
 	end
 
-CableClub_EventScript_TooBusyToNotice:: @ 827749C
+CableClub_EventScript_TooBusyToNotice::
 	msgbox CableClub_Text_TooBusyToNotice, MSGBOX_DEFAULT
 	closemessage
 	end
 
-BattleColosseum_2P_EventScript_Attendant:: @ 82774A6
+BattleColosseum_2P_EventScript_Attendant::
 	special Script_FacePlayer
 	msgbox BattleColosseum_2P_Text_TakePlaceStartBattle, MSGBOX_DEFAULT
 	special Script_ClearHeldMovement
 	closemessage
 	end
 
-TradeCenter_EventScript_Attendant:: @ 82774B6
+TradeCenter_EventScript_Attendant::
 	special Script_FacePlayer
 	msgbox TradeCenter_Text_TakeSeatStartTrade, MSGBOX_DEFAULT
 	special Script_ClearHeldMovement
 	closemessage
 	end
 
-RecordCorner_EventScript_Attendant:: @ 82774C6
+RecordCorner_EventScript_Attendant::
 	compare VAR_TEMP_0, 0
 	goto_if_ne RecordCorner_EventScript_AlreadyMixed
 	special Script_FacePlayer
@@ -880,7 +880,7 @@ RecordCorner_EventScript_Attendant:: @ 82774C6
 	closemessage
 	end
 
-RecordCorner_EventScript_AlreadyMixed:: @ 82774E0
+RecordCorner_EventScript_AlreadyMixed::
 	special Script_FacePlayer
 	message RecordCorner_Text_ThanksForComing
 	waitmessage
@@ -889,7 +889,7 @@ RecordCorner_EventScript_AlreadyMixed:: @ 82774E0
 	closemessage
 	end
 
-EventScript_ConfirmLeaveCableClubRoom:: @ 82774EF
+EventScript_ConfirmLeaveCableClubRoom::
 	msgbox Text_TerminateLinkConfirmation, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq EventScript_TerminateLink
@@ -897,19 +897,19 @@ EventScript_ConfirmLeaveCableClubRoom:: @ 82774EF
 	releaseall
 	end
 
-EventScript_TerminateLink:: @ 8277509
+EventScript_TerminateLink::
 	messageautoscroll Text_TerminateLinkPleaseWait
 	waitmessage
 	special ExitLinkRoom
 	end
 
-EventScript_DoLinkRoomExit:: @ 8277513
+EventScript_DoLinkRoomExit::
 	special CleanupLinkRoomState
 	special ReturnFromLinkRoom
 	waitstate
 	end
 
-CableClub_EventScript_UnionRoomAttendant:: @ 827751B
+CableClub_EventScript_UnionRoomAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FACILITY_UNION_ROOM
@@ -926,7 +926,7 @@ CableClub_EventScript_UnionRoomAttendant:: @ 827751B
 	goto CableClub_EventScript_UnionRoomSelect
 	end
 
-CableClub_EventScript_UnionRoomSelect:: @ 827755C
+CableClub_EventScript_UnionRoomSelect::
 	multichoice 17, 6, MULTI_YESNOINFO, FALSE
 	switch VAR_RESULT
 	case 0, CableClub_EventScript_EnterUnionRoom
@@ -935,13 +935,13 @@ CableClub_EventScript_UnionRoomSelect:: @ 827755C
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_UnionRoomInfo:: @ 8277593
+CableClub_EventScript_UnionRoomInfo::
 	message CableClub_Text_UnionRoomInfo
 	waitmessage
 	goto CableClub_EventScript_UnionRoomSelect
 	end
 
-CableClub_EventScript_EnterUnionRoom:: @ 827759F
+CableClub_EventScript_EnterUnionRoom::
 	call CableClub_EventScript_CheckPartyUnionRoomRequirements
 	compare VAR_RESULT, 0
 	goto_if_eq CableClub_EventScript_AbortLink
@@ -976,7 +976,7 @@ CableClub_EventScript_EnterUnionRoom:: @ 827759F
 	waitstate
 	end
 
-CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 8277626
+CableClub_EventScript_CheckPartyUnionRoomRequirements::
 	specialvar VAR_RESULT, CountPartyNonEggMons
 	compare VAR_RESULT, 2
 	goto_if_lt CableClub_EventScript_NeedTwoMonsForUnionRoom
@@ -986,22 +986,22 @@ CableClub_EventScript_CheckPartyUnionRoomRequirements:: @ 8277626
 	setvar VAR_RESULT, 1
 	return
 
-CableClub_EventScript_NeedTwoMonsForUnionRoom:: @ 827764C
+CableClub_EventScript_NeedTwoMonsForUnionRoom::
 	msgbox CableClub_Text_NeedTwoMonsForUnionRoom, MSGBOX_DEFAULT
 	goto EventScript_CableClub_SetVarResult0
 	end
 
-CableClub_EventScript_NoEnigmaBerryInUnionRoom:: @ 827765A
+CableClub_EventScript_NoEnigmaBerryInUnionRoom::
 	msgbox CableClub_Text_NoEnigmaBerryInUnionRoom, MSGBOX_DEFAULT
 	goto EventScript_CableClub_SetVarResult0
 	end
 
-CableClub_EventScript_UnionRoomAdapterNotConnected:: @ 8277668
+CableClub_EventScript_UnionRoomAdapterNotConnected::
 	msgbox CableClub_Text_UnionRoomAdapterNotConnected, MSGBOX_DEFAULT
 	release
 	return
 
-CableClub_EventScript_WirelessClubAttendant:: @ 8277672
+CableClub_EventScript_WirelessClubAttendant::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_WirelessClubAdjustements
@@ -1012,12 +1012,12 @@ CableClub_EventScript_WirelessClubAttendant:: @ 8277672
 	release
 	return
 
-CableClub_EventScript_DontAskAboutLinking:: @ 827769A
+CableClub_EventScript_DontAskAboutLinking::
 	msgbox CableClub_Text_HopeYouEnjoyWirelessSystem, MSGBOX_DEFAULT
 	release
 	return
 
-CableClub_EventScript_DirectCornerAttendant:: @ 82776A4
+CableClub_EventScript_DirectCornerAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FACILITY_MULTI_OR_EREADER  @ Set preemptively for multi battles, ignored otherwise
@@ -1034,7 +1034,7 @@ CableClub_EventScript_DirectCornerAttendant:: @ 82776A4
 	goto CableClub_EventScript_DirectCornerSelectService
 	end
 
-CableClub_EventScript_DirectCornerSelectService:: @ 82776E3
+CableClub_EventScript_DirectCornerSelectService::
 	checkitem ITEM_POWDER_JAR, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq CableClub_EventScript_DirectCornerNoBerry
@@ -1048,7 +1048,7 @@ CableClub_EventScript_DirectCornerSelectService:: @ 82776E3
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_DirectCornerSelectAllServices:: @ 827773E
+CableClub_EventScript_DirectCornerSelectAllServices::
 	multichoice 0, 0, MULTI_WIRELESS_ALL_SERVICES, FALSE
 	switch VAR_RESULT
 	case 0, CableClub_EventScript_WirelessTrade
@@ -1059,7 +1059,7 @@ CableClub_EventScript_DirectCornerSelectAllServices:: @ 827773E
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_DirectCornerNoBerry:: @ 827778B
+CableClub_EventScript_DirectCornerNoBerry::
 	goto_if_set FLAG_VISITED_MAUVILLE_CITY, CableClub_EventScript_DirectCornerHasRecordMix
 	multichoice 0, 0, MULTI_WIRELESS_NO_RECORD_BERRY, FALSE
 	switch VAR_RESULT
@@ -1069,7 +1069,7 @@ CableClub_EventScript_DirectCornerNoBerry:: @ 827778B
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_DirectCornerHasRecordMix:: @ 82777CB
+CableClub_EventScript_DirectCornerHasRecordMix::
 	multichoice 0, 0, MULTI_WIRELESS_NO_BERRY, FALSE
 	switch VAR_RESULT
 	case 0, CableClub_EventScript_WirelessTrade
@@ -1079,7 +1079,7 @@ CableClub_EventScript_DirectCornerHasRecordMix:: @ 82777CB
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_WirelessTrade:: @ 827780D
+CableClub_EventScript_WirelessTrade::
 	msgbox CableClub_Text_TradePokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
@@ -1090,7 +1090,7 @@ CableClub_EventScript_WirelessTrade:: @ 827780D
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
-CableClub_EventScript_WirelessBattleSelect:: @ 827783B
+CableClub_EventScript_WirelessBattleSelect::
 	message CableClub_Text_PlayWhichBattleMode
 	waitmessage
 	multichoice 0, 0, MULTI_BATTLE_MODE, FALSE
@@ -1103,12 +1103,12 @@ CableClub_EventScript_WirelessBattleSelect:: @ 827783B
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_WirelessSingleBattle:: @ 827788E
+CableClub_EventScript_WirelessSingleBattle::
 	setvar VAR_0x8004, LINK_GROUP_SINGLE_BATTLE
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
-CableClub_EventScript_WirelessDoubleBattle:: @ 8277899
+CableClub_EventScript_WirelessDoubleBattle::
 	special HasEnoughMonsForDoubleBattle
 	compare VAR_RESULT, PLAYER_HAS_TWO_USABLE_MONS
 	goto_if_ne CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle
@@ -1116,22 +1116,22 @@ CableClub_EventScript_WirelessDoubleBattle:: @ 8277899
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
-CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle:: @ 82778B2
+CableClub_EventScript_TwoMonsNeededForWirelessDoubleBattle::
 	msgbox CableClub_Text_NeedTwoMonsForDoubleBattle, MSGBOX_DEFAULT
 	goto CableClub_EventScript_WirelessBattleSelect
 	end
 
-CableClub_EventScript_WirelessMultiBattle:: @ 82778C0
+CableClub_EventScript_WirelessMultiBattle::
 	setvar VAR_0x8004, LINK_GROUP_MULTI_BATTLE
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
-CableClub_EventScript_WirelessBattleInfo:: @ 82778CB
+CableClub_EventScript_WirelessBattleInfo::
 	msgbox CableClub_Text_ExplainBattleModes, MSGBOX_DEFAULT
 	goto CableClub_EventScript_WirelessBattleSelect
 	end
 
-CableClub_EventScript_WirelessRecordMix:: @ 82778D9
+CableClub_EventScript_WirelessRecordMix::
 	msgbox CableClub_Text_AccessRecordCorner, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
@@ -1139,7 +1139,7 @@ CableClub_EventScript_WirelessRecordMix:: @ 82778D9
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
-CableClub_EventScript_WirelessBerryCrush:: @ 82778F7
+CableClub_EventScript_WirelessBerryCrush::
 	msgbox CableClub_Text_UseBerryCrush, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq CableClub_EventScript_AbortLink
@@ -1150,12 +1150,12 @@ CableClub_EventScript_WirelessBerryCrush:: @ 82778F7
 	goto CableClub_EventScript_SaveAndChooseLinkLeader
 	end
 
-CableClub_EventScript_NeedBerryForBerryCrush:: @ 8277923
+CableClub_EventScript_NeedBerryForBerryCrush::
 	msgbox CableClub_Text_NeedBerryForBerryCrush, MSGBOX_DEFAULT
 	goto CableClub_EventScript_DirectCornerSelectService
 	end
 
-CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931
+CableClub_EventScript_SaveAndChooseLinkLeader::
 	call Common_EventScript_SaveGame
 	compare VAR_RESULT, 0
 	goto_if_eq CableClub_EventScript_AbortLink
@@ -1168,7 +1168,7 @@ CableClub_EventScript_SaveAndChooseLinkLeader:: @ 8277931
 	case LINK_GROUP_RECORD_CORNER, CableClub_EventScript_ChooseLinkLeader
 	end
 
-CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989
+CableClub_EventScript_ChooseLinkLeaderFrom2::
 	message CableClub_Text_ChooseGroupLeaderOfTwo
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, FALSE
@@ -1179,7 +1179,7 @@ CableClub_EventScript_ChooseLinkLeaderFrom2:: @ 8277989
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_TryLeadGroup2Players:: @ 82779C6
+CableClub_EventScript_TryLeadGroup2Players::
 	call CableClub_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom
@@ -1190,7 +1190,7 @@ CableClub_EventScript_TryLeadGroup2Players:: @ 82779C6
 	release
 	return
 
-CableClub_EventScript_TryJoinGroup2Players:: @ 82779EE
+CableClub_EventScript_TryJoinGroup2Players::
 	call CableClub_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom
@@ -1201,7 +1201,7 @@ CableClub_EventScript_TryJoinGroup2Players:: @ 82779EE
 	release
 	return
 
-CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 8277A16
+CableClub_EventScript_ChooseLinkLeaderFrom4::
 	message CableClub_Text_ChooseGroupLeaderOfFour
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, FALSE
@@ -1212,7 +1212,7 @@ CableClub_EventScript_ChooseLinkLeaderFrom4:: @ 8277A16
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_TryLeadGroup4Players:: @ 8277A53
+CableClub_EventScript_TryLeadGroup4Players::
 	call CableClub_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom
@@ -1223,7 +1223,7 @@ CableClub_EventScript_TryLeadGroup4Players:: @ 8277A53
 	release
 	return
 
-CableClub_EventScript_TryJoinGroup4Players:: @ 8277A7B
+CableClub_EventScript_TryJoinGroup4Players::
 	call CableClub_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom
@@ -1234,7 +1234,7 @@ CableClub_EventScript_TryJoinGroup4Players:: @ 8277A7B
 	release
 	return
 
-CableClub_EventScript_ChooseLinkLeader:: @ 8277AA3
+CableClub_EventScript_ChooseLinkLeader::
 	message CableClub_Text_ChooseGroupLeader
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, FALSE
@@ -1245,7 +1245,7 @@ CableClub_EventScript_ChooseLinkLeader:: @ 8277AA3
 	case MULTI_B_PRESSED, CableClub_EventScript_AbortLink
 	end
 
-CableClub_EventScript_TryLeadGroupXPlayers:: @ 8277AE0
+CableClub_EventScript_TryLeadGroupXPlayers::
 	call CableClub_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom
@@ -1256,7 +1256,7 @@ CableClub_EventScript_TryLeadGroupXPlayers:: @ 8277AE0
 	release
 	return
 
-CableClub_EventScript_TryJoinGroupXPlayers:: @ 8277B08
+CableClub_EventScript_TryJoinGroupXPlayers::
 	call CableClub_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq CableClub_EventScript_EnterWirelessLinkRoom
@@ -1267,17 +1267,17 @@ CableClub_EventScript_TryJoinGroupXPlayers:: @ 8277B08
 	release
 	return
 
-CableClub_EventScript_TryBecomeLinkLeader:: @ 8277B30
+CableClub_EventScript_TryBecomeLinkLeader::
 	special TryBecomeLinkLeader
 	waitstate
 	return
 
-CableClub_EventScript_TryJoinLinkGroup:: @ 8277B35
+CableClub_EventScript_TryJoinLinkGroup::
 	special TryJoinLinkGroup
 	waitstate
 	return
 
-CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A
+CableClub_EventScript_EnterWirelessLinkRoom::
 	messageautoscroll CableClub_Text_DirectYouToYourRoom
 	waitmessage
 	delay 60
@@ -1303,7 +1303,7 @@ CableClub_EventScript_EnterWirelessLinkRoom:: @ 8277B3A
 	waitstate
 	end
 
-EventScript_WirelessBoxResults:: @ 8277B8A
+EventScript_WirelessBoxResults::
 	lockall
 	goto_if_unset FLAG_SYS_POKEDEX_GET, CableClub_EventScript_NotReadyYet
 	specialvar VAR_RESULT, IsWirelessAdapterConnected
@@ -1316,46 +1316,46 @@ EventScript_WirelessBoxResults:: @ 8277B8A
 	releaseall
 	end
 
-CableClub_EventScript_AdapterNotConnected:: @ 8277BB4
+CableClub_EventScript_AdapterNotConnected::
 	msgbox CableClub_Text_AdapterNotConnected, MSGBOX_DEFAULT
 	releaseall
 	end
 
-CableClub_EventScript_OpenUnionRoomBarrier:: @ 8277BBE
+CableClub_EventScript_OpenUnionRoomBarrier::
 	setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0
 	setmetatile 5, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0
 	return
 
-CableClub_EventScript_CloseUnionRoomBarrier:: @ 8277BD1
+CableClub_EventScript_CloseUnionRoomBarrier::
 	setmetatile 5, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1
 	setmetatile 5, 3, METATILE_PokemonCenter_CounterBarrier, 1
 	return
 
-CableClub_EventScript_OpenDirectCornerBarrier:: @ 8277BE4
+CableClub_EventScript_OpenDirectCornerBarrier::
 	setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop_Alt, 0
 	setmetatile 9, 3, METATILE_PokemonCenter_Floor_Plain_Alt, 0
 	return
 
-CableClub_EventScript_CloseDirectCornerBarrier:: @ 8277BF7
+CableClub_EventScript_CloseDirectCornerBarrier::
 	setmetatile 9, 2, METATILE_PokemonCenter_Floor_ShadowTop, 1
 	setmetatile 9, 3, METATILE_PokemonCenter_CounterBarrier, 1
 	return
 
-EventScript_OpenMossdeepGameCornerBarrier:: @ 8277C0A
+EventScript_OpenMossdeepGameCornerBarrier::
 	setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterOpen_Top, 0
 	setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterOpen_Bottom, 0
 	return
 
-EventScript_CloseMossdeepGameCornerBarrier:: @ 8277C1D
+EventScript_CloseMossdeepGameCornerBarrier::
 	setmetatile 5, 2, METATILE_MossdeepGameCorner_CounterClosed_Top, 1
 	setmetatile 5, 3, METATILE_MossdeepGameCorner_CounterClosed_Bottom, 1
 	return
 
-CableClub_OnResume: @ 8277C30
+CableClub_OnResume:
 	special InitUnionRoom
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_InfoMan2:: @ 8277C34
+MossdeepCity_GameCorner_1F_EventScript_InfoMan2::
 	lock
 	faceplayer
 	message MossdeepCity_GameCorner_1F_Text_DescribeWhichGame
@@ -1368,22 +1368,22 @@ MossdeepCity_GameCorner_1F_EventScript_InfoMan2:: @ 8277C34
 	case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_PokemonJumpInfo:: @ 8277C73
+MossdeepCity_GameCorner_1F_EventScript_PokemonJumpInfo::
 	msgbox MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingInfo:: @ 8277C7D
+MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingInfo::
 	msgbox MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit:: @ 8277C87
+MossdeepCity_GameCorner_1F_EventScript_MinigameInfoExit::
 	msgbox MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_OldMan2:: @ 8277C91
+MossdeepCity_GameCorner_1F_EventScript_OldMan2::
 	lock
 	faceplayer
 	message MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait
@@ -1402,7 +1402,7 @@ MossdeepCity_GameCorner_1F_EventScript_OldMan2:: @ 8277C91
 	case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
+MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump::
 	setvar VAR_0x8005, 0
 	special IsPokemonJumpSpeciesInParty
 	compare VAR_RESULT, FALSE
@@ -1421,7 +1421,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayPokemonJump:: @ 8277CE9
 	goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
+MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking::
 	setvar VAR_0x8005, 1
 	special IsDodrioInParty
 	compare VAR_RESULT, FALSE
@@ -1440,7 +1440,7 @@ MossdeepCity_GameCorner_1F_EventScript_PlayDodrioBerryPicking:: @ 8277D35
 	goto MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader:: @ 8277D81
+MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader::
 	message CableClub_Text_ChooseGroupLeader
 	waitmessage
 	multichoice 16, 6, MULTI_LINK_LEADER, FALSE
@@ -1451,7 +1451,7 @@ MossdeepCity_GameCorner_1F_EventScript_ChooseLinkLeader:: @ 8277D81
 	case MULTI_B_PRESSED, MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader:: @ 8277DBE
+MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader::
 	call CableClub_EventScript_TryBecomeLinkLeader
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom
@@ -1462,7 +1462,7 @@ MossdeepCity_GameCorner_1F_EventScript_TryBecomeLinkLeader:: @ 8277DBE
 	release
 	return
 
-MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup:: @ 8277DE6
+MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup::
 	call CableClub_EventScript_TryJoinLinkGroup
 	compare VAR_RESULT, LINKUP_SUCCESS
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom
@@ -1473,7 +1473,7 @@ MossdeepCity_GameCorner_1F_EventScript_TryJoinLinkGroup:: @ 8277DE6
 	release
 	return
 
-MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E
+MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom::
 	messageautoscroll MossdeepCity_GameCorner_1F_Text_AllGoodToGo
 	waitmessage
 	delay 60
@@ -1493,13 +1493,13 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom:: @ 8277E0E
 	waitstate
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected:: @ 8277E48
+MossdeepCity_GameCorner_1F_EventScript_AdapterNotConnected::
 	delay 60
 	msgbox MossdeepCity_GameCorner_1F_Text_AdapterNotConnected, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon:: @ 8277E55
+MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon::
 	msgbox MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
@@ -1510,22 +1510,22 @@ MossdeepCity_GameCorner_1F_EventScript_DontHaveRequiredMon:: @ 8277E55
 	goto MossdeepCity_GameCorner_1F_EventScript_AbortMinigame
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements:: @ 8277E84
+MossdeepCity_GameCorner_1F_EventScript_ExplainPokemonJumpRequirements::
 	msgbox MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed, MSGBOX_DEFAULT
 	return
 
-MossdeepCity_GameCorner_1F_EventScript_ExplainDodrioBerryPickingRequirements:: @ 8277E8D
+MossdeepCity_GameCorner_1F_EventScript_ExplainDodrioBerryPickingRequirements::
 	msgbox MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed, MSGBOX_DEFAULT
 	return
 
-MossdeepCity_GameCorner_1F_EventScript_PokemonJumpRecords:: @ 8277E96
+MossdeepCity_GameCorner_1F_EventScript_PokemonJumpRecords::
 	lockall
 	special ShowPokemonJumpRecords
 	waitstate
 	releaseall
 	end
 
-MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords:: @ 8277E9D
+MossdeepCity_GameCorner_1F_EventScript_DodrioBerryPickingRecords::
 	lockall
 	special ShowDodrioBerryPickingRecords
 	waitstate
diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc
index 1cc334004..d7acf29d9 100644
--- a/data/scripts/cave_hole.inc
+++ b/data/scripts/cave_hole.inc
@@ -1,12 +1,12 @@
-CaveHole_CheckFallDownHole: @ 82A8327
+CaveHole_CheckFallDownHole:
 	map_script_2 VAR_ICE_STEP_COUNT, 0, EventScript_FallDownHole
 	.2byte 0
 
-CaveHole_FixCrackedGround: @ 82A8331
+CaveHole_FixCrackedGround:
 	copyvar VAR_ICE_STEP_COUNT, 1
 	end
 
-EventScript_FallDownHole:: @ 82A8337
+EventScript_FallDownHole::
 	lockall
 	delay 20
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
@@ -17,7 +17,7 @@ EventScript_FallDownHole:: @ 82A8337
 	waitstate
 	end
 
-EventScript_FallDownHoleMtPyre:: @ 82A8350
+EventScript_FallDownHoleMtPyre::
 	lockall
 	delay 20
 	applymovement OBJ_EVENT_ID_PLAYER, Movement_SetInvisible
@@ -28,6 +28,6 @@ EventScript_FallDownHoleMtPyre:: @ 82A8350
 	waitstate
 	end
 
-Movement_SetInvisible: @ 82A8369
+Movement_SetInvisible:
 	set_invisible
 	step_end
diff --git a/data/scripts/cave_of_origin.inc b/data/scripts/cave_of_origin.inc
index 579efdb89..abffd07ff 100644
--- a/data/scripts/cave_of_origin.inc
+++ b/data/scripts/cave_of_origin.inc
@@ -1,5 +1,5 @@
 @ All unused / leftover scripts from RS
-CaveOfOrigin_EventScript_LegendaryCry:: @ 8272274
+CaveOfOrigin_EventScript_LegendaryCry::
 	lockall
 	waitse
 	playmoncry SPECIES_KYOGRE, 2  @ SPECIES_GROUDON in Ruby
@@ -8,25 +8,25 @@ CaveOfOrigin_EventScript_LegendaryCry:: @ 8272274
 	releaseall
 	end
 
-CaveOfOrigin_EventScript_Shake1:: @ 8272283
+CaveOfOrigin_EventScript_Shake1::
 	lockall
 	setvar VAR_TEMP_1, 1
 	goto CaveOfOrigin_EventScript_Shake
 	end
 
-CaveOfOrigin_EventScript_Shake2:: @ 827228F
+CaveOfOrigin_EventScript_Shake2::
 	lockall
 	setvar VAR_TEMP_2, 1
 	goto CaveOfOrigin_EventScript_Shake
 	end
 
-CaveOfOrigin_EventScript_Shake3:: @ 827229B
+CaveOfOrigin_EventScript_Shake3::
 	lockall
 	setvar VAR_TEMP_3, 1
 	goto CaveOfOrigin_EventScript_Shake
 	end
 
-CaveOfOrigin_EventScript_Shake:: @ 82722A7
+CaveOfOrigin_EventScript_Shake::
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
 	setvar VAR_0x8006, 8  @ num shakes
@@ -36,7 +36,7 @@ CaveOfOrigin_EventScript_Shake:: @ 82722A7
 	releaseall
 	end
 
-CaveOfOrigin_EventScript_DisableTriggers:: @ 82722C1
+CaveOfOrigin_EventScript_DisableTriggers::
 	setvar VAR_TEMP_1, 1
 	setvar VAR_TEMP_2, 1
 	setvar VAR_TEMP_3, 1
diff --git a/data/scripts/check_furniture.inc b/data/scripts/check_furniture.inc
index 0a952f3c3..920e88287 100644
--- a/data/scripts/check_furniture.inc
+++ b/data/scripts/check_furniture.inc
@@ -1,27 +1,27 @@
-EventScript_PictureBookShelf:: @ 82725CE
+EventScript_PictureBookShelf::
 	msgbox Text_PictureBookShelf, MSGBOX_SIGN
 	end
 
-EventScript_BookShelf:: @ 82725D7
+EventScript_BookShelf::
 	msgbox Text_BookShelf, MSGBOX_SIGN
 	end
 
-EventScript_PokemonCenterBookShelf:: @ 82725E0
+EventScript_PokemonCenterBookShelf::
 	msgbox Text_PokemonCenterBookShelf, MSGBOX_SIGN
 	end
 
-EventScript_Vase:: @ 82725E9
+EventScript_Vase::
 	msgbox Text_Vase, MSGBOX_SIGN
 	end
 
-EventScript_EmptyTrashCan:: @ 82725F2
+EventScript_EmptyTrashCan::
 	msgbox Text_EmptyTrashCan, MSGBOX_SIGN
 	end
 
-EventScript_ShopShelf:: @ 82725FB
+EventScript_ShopShelf::
 	msgbox Text_ShopShelf, MSGBOX_SIGN
 	end
 
-EventScript_Blueprint:: @ 8272604
+EventScript_Blueprint::
 	msgbox Text_Blueprint, MSGBOX_SIGN
 	end
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index db43dfdd0..0d9e02337 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -15,7 +15,7 @@
 .set LOCALID_ARTIST, 15
 
 @ Either ends or returns to EventScript_ContestReceptionist after submitting a contest entry
-LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist:: @ 8279CC5
+LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist::
 	lock
 	faceplayer
 	compare VAR_CONTEST_PRIZE_PICKUP, 0
@@ -25,24 +25,24 @@ LilycoveCity_ContestLobby_EventScript_SpeakToContestReceptionist:: @ 8279CC5
 	goto LilycoveCity_ContestLobby_EventScript_AskEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_ReceptionWelcome:: @ 8279CEA
+LilycoveCity_ContestLobby_EventScript_ReceptionWelcome::
 	msgbox LilycoveCity_ContestLobby_Text_ContestReception, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_ContestLobby_EventScript_GivePokeblockCase:: @ 8279CF3
+LilycoveCity_ContestLobby_EventScript_GivePokeblockCase::
 	msgbox LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase, MSGBOX_DEFAULT
 	giveitem ITEM_POKEBLOCK_CASE
 	setflag FLAG_RECEIVED_POKEBLOCK_CASE
 	msgbox LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp, MSGBOX_DEFAULT
 	return
 
-LilycoveCity_ContestLobby_EventScript_PickUpPrize:: @ 8279D13
+LilycoveCity_ContestLobby_EventScript_PickUpPrize::
 	msgbox LilycoveCity_ContestLobby_Text_PokemonWonWeHavePrize, MSGBOX_DEFAULT
 	switch VAR_CONTEST_PRIZE_PICKUP
 	case 4, LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter
 	end
 
-LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter:: @ 8279D2C
+LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter::
 	giveitem ITEM_LUXURY_BALL
 	compare VAR_RESULT, FALSE
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter
@@ -51,13 +51,13 @@ LilycoveCity_ContestLobby_EventScript_GiveLuxuryBallAtCounter:: @ 8279D2C
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter:: @ 8279D4B
+LilycoveCity_ContestLobby_EventScript_NoRoomForLuxuryBallAtCounter::
 	call Common_EventScript_BagIsFull
 	msgbox LilycoveCity_ContestLobby_Text_ComeBackForPrizeLater, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A
+LilycoveCity_ContestLobby_EventScript_AskEnterContest::
 	message LilycoveCity_ContestLobby_Text_EnterContest1
 	waitmessage
 	multichoice 0, 0, MULTI_ENTERINFO, FALSE
@@ -68,7 +68,7 @@ LilycoveCity_ContestLobby_EventScript_AskEnterContest:: @ 8279D5A
 	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_ContestInfo:: @ 8279D97
+LilycoveCity_ContestLobby_EventScript_ContestInfo::
 	message LilycoveCity_ContestLobby_Text_WhichTopic1
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_INFO, FALSE
@@ -80,27 +80,27 @@ LilycoveCity_ContestLobby_EventScript_ContestInfo:: @ 8279D97
 	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_AskEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExplainContests:: @ 8279DDF
+LilycoveCity_ContestLobby_EventScript_ExplainContests::
 	msgbox LilycoveCity_ContestLobby_Text_ExplainContests, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_ContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExplainContestTypes:: @ 8279DED
+LilycoveCity_ContestLobby_EventScript_ExplainContestTypes::
 	msgbox LilycoveCity_ContestLobby_Text_ExplainContestTypes, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_ContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_ExplainContestRanks:: @ 8279DFB
+LilycoveCity_ContestLobby_EventScript_ExplainContestRanks::
 	msgbox LilycoveCity_ContestLobby_Text_ExplainContestRanks, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_ContestInfo
 	end
 
-LilycoveCity_ContestLobby_EventScript_CancelEnterContest:: @ 8279E09
+LilycoveCity_ContestLobby_EventScript_CancelEnterContest::
 	msgbox LilycoveCity_ContestLobby_Text_ParticipateAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_ChooseContestMon:: @ 8279E13
+LilycoveCity_ContestLobby_EventScript_ChooseContestMon::
 	msgbox LilycoveCity_ContestLobby_Text_EnterWhichPokemon1, MSGBOX_DEFAULT
 	choosecontestmon
 	compare VAR_0x8004, 255
@@ -118,7 +118,7 @@ LilycoveCity_ContestLobby_EventScript_ChooseContestMon:: @ 8279E13
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_CantEnterFainted
 	end
 
-LilycoveCity_ContestLobby_EventScript_ChooseContestRank:: @ 8279E62
+LilycoveCity_ContestLobby_EventScript_ChooseContestRank::
 	message LilycoveCity_ContestLobby_Text_EnterWhichRank
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_RANK, FALSE
@@ -131,29 +131,29 @@ LilycoveCity_ContestLobby_EventScript_ChooseContestRank:: @ 8279E62
 	case MULTI_B_PRESSED, LilycoveCity_ContestLobby_EventScript_CancelEnterContest
 	end
 
-LilycoveCity_ContestLobby_EventScript_EnterNormalRank:: @ 8279EB5
+LilycoveCity_ContestLobby_EventScript_EnterNormalRank::
 	setvar VAR_CONTEST_RANK, CONTEST_RANK_NORMAL
 	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_EnterSuperRank:: @ 8279EC0
+LilycoveCity_ContestLobby_EventScript_EnterSuperRank::
 	setvar VAR_CONTEST_RANK, CONTEST_RANK_SUPER
 	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_EnterHyperRank:: @ 8279ECB
+LilycoveCity_ContestLobby_EventScript_EnterHyperRank::
 	setvar VAR_CONTEST_RANK, CONTEST_RANK_HYPER
 	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
-LilycoveCity_ContestLobby_EventScript_EnterMasterRank:: @ 8279ED6
+LilycoveCity_ContestLobby_EventScript_EnterMasterRank::
 	setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER
 	goto LilycoveCity_ContestLobby_EventScript_ChooseContestType
 	end
 
 @ The multichoice selection IDs are equal to the CATEGORY values
 @ So rather than list the cases they just copy VAR_RESULT for a valid selection into VAR_CONTEST_CATEGORY
-LilycoveCity_ContestLobby_EventScript_ChooseContestType:: @ 8279EE1
+LilycoveCity_ContestLobby_EventScript_ChooseContestType::
 	message LilycoveCity_ContestLobby_Text_EnterWhichContest1
 	waitmessage
 	multichoice 0, 0, MULTI_CONTEST_TYPE, FALSE
@@ -164,48 +164,48 @@ LilycoveCity_ContestLobby_EventScript_ChooseContestType:: @ 8279EE1
 	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_CantEnterLowRank:: @ 8279F12
+LilycoveCity_ContestLobby_EventScript_CantEnterLowRank::
 	msgbox LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	release
 	end
 
 @ Unused
-LilycoveCity_ContestLobby_EventScript_ConfirmEntry:: @ 8279F21
+LilycoveCity_ContestLobby_EventScript_ConfirmEntry::
 	msgbox LilycoveCity_ContestLobby_Text_ConfirmContestMon, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	case YES, LilycoveCity_ContestLobby_EventScript_EnterMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_ConfirmEntryAlreadyWon:: @ 8279F45
+LilycoveCity_ContestLobby_EventScript_ConfirmEntryAlreadyWon::
 	msgbox LilycoveCity_ContestLobby_Text_AlreadyWonEnterAnyway, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	case YES, LilycoveCity_ContestLobby_EventScript_EnterMon
 	end
 
-LilycoveCity_ContestLobby_EventScript_CantEnterEgg:: @ 8279F69
+LilycoveCity_ContestLobby_EventScript_CantEnterEgg::
 	msgbox LilycoveCity_ContestLobby_Text_EggCannotTakePart, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_CantEnterFainted:: @ 8279F78
+LilycoveCity_ContestLobby_EventScript_CantEnterFainted::
 	msgbox LilycoveCity_ContestLobby_Text_MonInNoConditionForContest, MSGBOX_DEFAULT
 	goto LilycoveCity_ContestLobby_EventScript_ChooseContestMon
 	release
 	end
 
 @ The return here is back to LilycoveCity_ContestLobby_EventScript_ContestReceptionist
-LilycoveCity_ContestLobby_EventScript_EnterMon:: @ 8279F87
+LilycoveCity_ContestLobby_EventScript_EnterMon::
 	msgbox LilycoveCity_ContestLobby_Text_YourMonIsEntryNum4, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	setvar VAR_CONTEST_HALL_STATE, 1
 	return
 
-ContestHall_EventScript_DoContest:: @ 8279F97
+ContestHall_EventScript_DoContest::
 	special LinkContestTryShowWirelessIndicator
 	setvar VAR_0x8006, 0
 	lockall
@@ -228,7 +228,7 @@ ContestHall_EventScript_DoContest:: @ 8279F97
 	setvar VAR_CONTEST_HALL_STATE, 2
 	return
 
-ContestHall_EventScript_GetContestRankStringId:: @ 8279FF2
+ContestHall_EventScript_GetContestRankStringId::
 	switch VAR_CONTEST_RANK
 	case CONTEST_RANK_NORMAL, ContestHall_EventScript_GetNormalStringId
 	case CONTEST_RANK_SUPER, ContestHall_EventScript_GetSuperStringId
@@ -236,24 +236,24 @@ ContestHall_EventScript_GetContestRankStringId:: @ 8279FF2
 	case CONTEST_RANK_MASTER, ContestHall_EventScript_GetMasterStringId
 	return
 
-ContestHall_EventScript_GetNormalStringId:: @ 827A024
+ContestHall_EventScript_GetNormalStringId::
 	setvar VAR_0x8009, STDSTRING_NORMAL
 	return
 
-ContestHall_EventScript_GetSuperStringId:: @ 827A02A
+ContestHall_EventScript_GetSuperStringId::
 	setvar VAR_0x8009, STDSTRING_SUPER
 	return
 
-ContestHall_EventScript_GetHyperStringId:: @ 827A030
+ContestHall_EventScript_GetHyperStringId::
 	setvar VAR_0x8009, STDSTRING_HYPER
 	return
 
-ContestHall_EventScript_GetMasterStringId:: @ 827A036
+ContestHall_EventScript_GetMasterStringId::
 	setvar VAR_0x8009, STDSTRING_MASTER
 	return
 
 @ This whole switch is equivalent to copyvar VAR_0x8008, VAR_CONTEST_CATEGORY
-ContestHall_EventScript_GetContestCategory:: @ 827A03C
+ContestHall_EventScript_GetContestCategory::
 	switch VAR_CONTEST_CATEGORY
 	case CONTEST_CATEGORY_COOL, ContestHall_EventScript_GetCategoryCool
 	case CONTEST_CATEGORY_BEAUTY, ContestHall_EventScript_GetCategoryBeauty
@@ -262,27 +262,27 @@ ContestHall_EventScript_GetContestCategory:: @ 827A03C
 	case CONTEST_CATEGORY_TOUGH, ContestHall_EventScript_GetCategoryTough
 	return
 
-ContestHall_EventScript_GetCategoryCool:: @ 827A079
+ContestHall_EventScript_GetCategoryCool::
 	setvar VAR_0x8008, CONTEST_CATEGORY_COOL
 	return
 
-ContestHall_EventScript_GetCategoryBeauty:: @ 827A07F
+ContestHall_EventScript_GetCategoryBeauty::
 	setvar VAR_0x8008, CONTEST_CATEGORY_BEAUTY
 	return
 
-ContestHall_EventScript_GetCategoryCute:: @ 827A085
+ContestHall_EventScript_GetCategoryCute::
 	setvar VAR_0x8008, CONTEST_CATEGORY_CUTE
 	return
 
-ContestHall_EventScript_GetCategorySmart:: @ 827A08B
+ContestHall_EventScript_GetCategorySmart::
 	setvar VAR_0x8008, CONTEST_CATEGORY_SMART
 	return
 
-ContestHall_EventScript_GetCategoryTough:: @ 827A091
+ContestHall_EventScript_GetCategoryTough::
 	setvar VAR_0x8008, CONTEST_CATEGORY_TOUGH
 	return
 
-ContestHall_EventScript_ContestGettingStarted:: @ 827A097
+ContestHall_EventScript_ContestGettingStarted::
 	buffercontesttypestring 1, VAR_0x8008
 	bufferstdstring 2, VAR_0x8009
 	call ContestHall_EventScript_GettingStarted
@@ -292,7 +292,7 @@ ContestHall_EventScript_ContestGettingStarted:: @ 827A097
 	releaseall
 	return
 
-ContestHall_EventScript_GettingStarted:: @ 827A0B1
+ContestHall_EventScript_GettingStarted::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_GettingStartedLink
 	lockall
@@ -300,7 +300,7 @@ ContestHall_EventScript_GettingStarted:: @ 827A0B1
 	releaseall
 	return
 
-ContestHall_EventScript_GettingStartedLink:: @ 827A0C7
+ContestHall_EventScript_GettingStartedLink::
 	specialvar VAR_RESULT, IsWirelessContest
 	compare VAR_RESULT, TRUE
 	goto_if_eq ContestHall_EventScript_GettingStartedWireless
@@ -308,7 +308,7 @@ ContestHall_EventScript_GettingStartedLink:: @ 827A0C7
 	waitmessage
 	return
 
-ContestHall_EventScript_GettingStartedWireless:: @ 827A0DE
+ContestHall_EventScript_GettingStartedWireless::
 	messageautoscroll ContestHall_Text_GettingStartedWireless
 	waitmessage
 	call ContestHall_EventScript_TryWaitForLink
@@ -317,7 +317,7 @@ ContestHall_EventScript_GettingStartedWireless:: @ 827A0DE
 	call ContestHall_EventScript_TryWaitForLink
 	return
 
-ContestHall_EventScript_ShowContestMons:: @ 827A0F5
+ContestHall_EventScript_ShowContestMons::
 	call ContestHall_EventScript_ContestantWalkToCenter
 	call ContestHall_EventScript_ShowContestMonPic
 	call ContestHall_EventScript_AudienceHeartEmotes
@@ -332,18 +332,18 @@ ContestHall_EventScript_ShowContestMons:: @ 827A0F5
 	setvar VAR_TEMP_1, 6
 	return
 
-ContestHall_EventScript_TryWaitForLink:: @ 827A133
+ContestHall_EventScript_TryWaitForLink::
 	specialvar VAR_RESULT, IsWirelessContest
 	compare VAR_RESULT, TRUE
 	goto_if_eq ContestHall_EventScript_WaitForLink
 	return
 
-ContestHall_EventScript_WaitForLink:: @ 827A144
+ContestHall_EventScript_WaitForLink::
 	special LinkContestWaitForConnection
 	waitstate
 	return
 
-ContestHall_EventScript_ContestantWalkToCenter:: @ 827A149
+ContestHall_EventScript_ContestantWalkToCenter::
 	compare VAR_0x8006, 0
 	goto_if_eq ContestHall_EventScript_Player1WalkToCenter
 	compare VAR_0x8006, 1
@@ -354,7 +354,7 @@ ContestHall_EventScript_ContestantWalkToCenter:: @ 827A149
 	goto_if_eq ContestHall_EventScript_Player4WalkToCenter
 	return
 
-ContestHall_EventScript_Player1WalkToCenter:: @ 827A176
+ContestHall_EventScript_Player1WalkToCenter::
 	call ContestHall_EventScript_TryWaitForLink
 	lockall
 	applymovement LOCALID_CONTESTANT_1, ContestHall_Movement_Player1WalkToCenter
@@ -363,7 +363,7 @@ ContestHall_EventScript_Player1WalkToCenter:: @ 827A176
 	setvar VAR_0x800B, LOCALID_CONTESTANT_1
 	return
 
-ContestHall_EventScript_Player2WalkToCenter:: @ 827A18D
+ContestHall_EventScript_Player2WalkToCenter::
 	call ContestHall_EventScript_TryWaitForLink
 	lockall
 	applymovement LOCALID_CONTESTANT_2, ContestHall_Movement_Player2WalkToCenter
@@ -372,7 +372,7 @@ ContestHall_EventScript_Player2WalkToCenter:: @ 827A18D
 	setvar VAR_0x800B, LOCALID_CONTESTANT_2
 	return
 
-ContestHall_EventScript_Player3WalkToCenter:: @ 827A1A4
+ContestHall_EventScript_Player3WalkToCenter::
 	call ContestHall_EventScript_TryWaitForLink
 	lockall
 	applymovement LOCALID_CONTESTANT_3, ContestHall_Movement_Player3WalkToCenter
@@ -381,7 +381,7 @@ ContestHall_EventScript_Player3WalkToCenter:: @ 827A1A4
 	setvar VAR_0x800B, LOCALID_CONTESTANT_3
 	return
 
-ContestHall_EventScript_Player4WalkToCenter:: @ 827A1BB
+ContestHall_EventScript_Player4WalkToCenter::
 	call ContestHall_EventScript_TryWaitForLink
 	lockall
 	applymovement LOCALID_CONTESTANT_4, ContestHall_Movement_Player4WalkToCenter
@@ -390,7 +390,7 @@ ContestHall_EventScript_Player4WalkToCenter:: @ 827A1BB
 	setvar VAR_0x800B, LOCALID_CONTESTANT_4
 	return
 
-ContestHall_EventScript_ShowContestMonPic:: @ 827A1D2
+ContestHall_EventScript_ShowContestMonPic::
 	special BufferContestTrainerAndMonNames
 	addvar VAR_0x8006, 1
 	buffernumberstring 1, VAR_0x8006
@@ -412,19 +412,19 @@ ContestHall_EventScript_ShowContestMonPic:: @ 827A1D2
 	call ContestHall_EventScript_EntryXTrainersMon
 	return
 
-ContestHall_EventScript_EntryXTrainersMon:: @ 827A217
+ContestHall_EventScript_EntryXTrainersMon::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_EntryXTrainersMonLink
 	message ContestHall_Text_EntryXTrainersMon
 	waitmessage
 	return
 
-ContestHall_EventScript_EntryXTrainersMonLink:: @ 827A229
+ContestHall_EventScript_EntryXTrainersMonLink::
 	messageautoscroll ContestHall_Text_EntryXTrainersMon
 	waitmessage
 	return
 
-ContestHall_EventScript_AudienceVote:: @ 827A230
+ContestHall_EventScript_AudienceVote::
 	call ContestHall_EventScript_AudienceWillVote
 	call ContestHall_EventScript_VotingUnderWay
 	playse SE_M_ENCORE2
@@ -440,13 +440,13 @@ ContestHall_EventScript_AudienceVote:: @ 827A230
 	waitmovement 0
 	return
 
-ContestHall_EventScript_AudienceWillVote:: @ 827A26C
+ContestHall_EventScript_AudienceWillVote::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_AudienceWillVoteLink
 	msgbox ContestHall_Text_SeenContestantsAudienceWillVote, MSGBOX_DEFAULT
 	return
 
-ContestHall_EventScript_AudienceWillVoteLink:: @ 827A280
+ContestHall_EventScript_AudienceWillVoteLink::
 	specialvar VAR_RESULT, IsWirelessContest
 	compare VAR_RESULT, TRUE
 	goto_if_eq ContestHall_EventScript_AudienceWillVoteWireless
@@ -454,7 +454,7 @@ ContestHall_EventScript_AudienceWillVoteLink:: @ 827A280
 	waitmessage
 	return
 
-ContestHall_EventScript_AudienceWillVoteWireless:: @ 827A297
+ContestHall_EventScript_AudienceWillVoteWireless::
 	messageautoscroll ContestHall_Text_WeveSeenContestants
 	waitmessage
 	call ContestHall_EventScript_TryWaitForLink
@@ -466,18 +466,18 @@ ContestHall_EventScript_AudienceWillVoteWireless:: @ 827A297
 	call ContestHall_EventScript_TryWaitForLink
 	return
 
-ContestHall_EventScript_VotingUnderWay:: @ 827A2B9
+ContestHall_EventScript_VotingUnderWay::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_VotingUnderWayLink
 	message ContestHall_Text_VotingUnderWay
 	return
 
-ContestHall_EventScript_VotingUnderWayLink:: @ 827A2CA
+ContestHall_EventScript_VotingUnderWayLink::
 	messageautoscroll ContestHall_Text_VotingUnderWay
 	call ContestHall_EventScript_TryWaitForLink
 	return
 
-ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5
+ContestHall_EventScript_AudienceReactToContestant::
 	call ContestHall_EventScript_TryWaitForLink
 	applymovement LOCALID_MC, ContestHall_Movement_AudienceMemberLookLeft
 	waitmovement 0
@@ -508,7 +508,7 @@ ContestHall_EventScript_AudienceReactToContestant:: @ 827A2D5
 @ For each heart to display a random audience member is chosen, and a new one chosen if they already displayed a heart
 @ VAR_TEMP_1 through VAR_TEMP_8 represent each of the 8 audience members that are actual object events
 @    and are set to 9 if they havent displayed a heart yet, and 1 if they have
-ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F
+ContestHall_EventScript_AudienceHeartEmotes::
 	special GetContestMonCondition
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL
 	call_if_eq ContestHall_EventScript_GetNumberOfHeartsNormal
@@ -540,7 +540,7 @@ ContestHall_EventScript_AudienceHeartEmotes:: @ 827A34F
 	setvar VAR_TEMP_8, 0
 	return
 
-ContestHall_EventScript_DisplayHearts:: @ 827A3E5
+ContestHall_EventScript_DisplayHearts::
 	setvar VAR_RESULT, 8
 	special GenerateContestRand
 	compare VAR_RESULT, 0
@@ -564,7 +564,7 @@ ContestHall_EventScript_DisplayHearts:: @ 827A3E5
 	waitmovement 0
 	return
 
-ContestHall_EventScript_GetNumberOfHeartsNormal:: @ 827A454
+ContestHall_EventScript_GetNumberOfHeartsNormal::
 	compare VAR_0x8004, 80
 	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 70
@@ -584,7 +584,7 @@ ContestHall_EventScript_GetNumberOfHeartsNormal:: @ 827A454
 	setvar VAR_TEMP_0, 0
 	return
 
-ContestHall_EventScript_GetNumberOfHeartsSuper:: @ 827A4B2
+ContestHall_EventScript_GetNumberOfHeartsSuper::
 	compare VAR_0x8004, 230
 	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 210
@@ -604,7 +604,7 @@ ContestHall_EventScript_GetNumberOfHeartsSuper:: @ 827A4B2
 	setvar VAR_TEMP_0, 0
 	return
 
-ContestHall_EventScript_GetNumberOfHeartsHyper:: @ 827A510
+ContestHall_EventScript_GetNumberOfHeartsHyper::
 	compare VAR_0x8004, 380
 	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 350
@@ -624,7 +624,7 @@ ContestHall_EventScript_GetNumberOfHeartsHyper:: @ 827A510
 	setvar VAR_TEMP_0, 0
 	return
 
-ContestHall_EventScript_GetNumberOfHeartsMaster:: @ 827A56E
+ContestHall_EventScript_GetNumberOfHeartsMaster::
 	compare VAR_0x8004, 600
 	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 560
@@ -644,7 +644,7 @@ ContestHall_EventScript_GetNumberOfHeartsMaster:: @ 827A56E
 	setvar VAR_TEMP_0, 0
 	return
 
-ContestHall_EventScript_GetNumberOfHeartsLink:: @ 827A5CC
+ContestHall_EventScript_GetNumberOfHeartsLink::
 	compare VAR_0x8004, 600
 	goto_if_gt ContestHall_EventScript_Set8Hearts
 	compare VAR_0x8004, 550
@@ -664,39 +664,39 @@ ContestHall_EventScript_GetNumberOfHeartsLink:: @ 827A5CC
 	setvar VAR_TEMP_0, 0
 	return
 
-ContestHall_EventScript_Set1Heart:: @ 827A62A
+ContestHall_EventScript_Set1Heart::
 	setvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_Set2Hearts:: @ 827A630
+ContestHall_EventScript_Set2Hearts::
 	setvar VAR_TEMP_0, 2
 	return
 
-ContestHall_EventScript_Set3Hearts:: @ 827A636
+ContestHall_EventScript_Set3Hearts::
 	setvar VAR_TEMP_0, 3
 	return
 
-ContestHall_EventScript_Set4Hearts:: @ 827A63C
+ContestHall_EventScript_Set4Hearts::
 	setvar VAR_TEMP_0, 4
 	return
 
-ContestHall_EventScript_Set5Hearts:: @ 827A642
+ContestHall_EventScript_Set5Hearts::
 	setvar VAR_TEMP_0, 5
 	return
 
-ContestHall_EventScript_Set6Hearts:: @ 827A648
+ContestHall_EventScript_Set6Hearts::
 	setvar VAR_TEMP_0, 6
 	return
 
-ContestHall_EventScript_Set7Hearts:: @ 827A64E
+ContestHall_EventScript_Set7Hearts::
 	setvar VAR_TEMP_0, 7
 	return
 
-ContestHall_EventScript_Set8Hearts:: @ 827A654
+ContestHall_EventScript_Set8Hearts::
 	setvar VAR_TEMP_0, 8
 	return
 
-ContestHall_EventScript_TryDisplayHeartAudienceMember1:: @ 827A65A
+ContestHall_EventScript_TryDisplayHeartAudienceMember1::
 	compare VAR_TEMP_1, 1
 	goto_if_eq ContestHall_EventScript_AudienceMember1AlreadyEmoted
 	applymovement LOCALID_AUDIENCE_1, ContestHall_Movement_Heart
@@ -706,10 +706,10 @@ ContestHall_EventScript_TryDisplayHeartAudienceMember1:: @ 827A65A
 	addvar VAR_TEMP_0, -1
 	return
 
-ContestHall_EventScript_AudienceMember1AlreadyEmoted:: @ 827A67D
+ContestHall_EventScript_AudienceMember1AlreadyEmoted::
 	return
 
-ContestHall_EventScript_TryDisplayHeartAudienceMember2:: @ 827A67E
+ContestHall_EventScript_TryDisplayHeartAudienceMember2::
 	compare VAR_TEMP_2, 1
 	goto_if_eq ContestHall_EventScript_AudienceMember2AlreadyEmoted
 	applymovement LOCALID_AUDIENCE_2, ContestHall_Movement_Heart
@@ -719,10 +719,10 @@ ContestHall_EventScript_TryDisplayHeartAudienceMember2:: @ 827A67E
 	addvar VAR_TEMP_0, -1
 	return
 
-ContestHall_EventScript_AudienceMember2AlreadyEmoted:: @ 827A6A1
+ContestHall_EventScript_AudienceMember2AlreadyEmoted::
 	return
 
-ContestHall_EventScript_TryDisplayHeartAudienceMember3:: @ 827A6A2
+ContestHall_EventScript_TryDisplayHeartAudienceMember3::
 	compare VAR_TEMP_3, 1
 	goto_if_eq ContestHall_EventScript_AudienceMember3AlreadyEmoted
 	applymovement LOCALID_AUDIENCE_3, ContestHall_Movement_Heart
@@ -732,10 +732,10 @@ ContestHall_EventScript_TryDisplayHeartAudienceMember3:: @ 827A6A2
 	addvar VAR_TEMP_0, -1
 	return
 
-ContestHall_EventScript_AudienceMember3AlreadyEmoted:: @ 827A6C5
+ContestHall_EventScript_AudienceMember3AlreadyEmoted::
 	return
 
-ContestHall_EventScript_TryDisplayHeartAudienceMember4:: @ 827A6C6
+ContestHall_EventScript_TryDisplayHeartAudienceMember4::
 	compare VAR_TEMP_4, 1
 	goto_if_eq ContestHall_EventScript_Audience4MemberAlreadyEmoted
 	applymovement LOCALID_AUDIENCE_4, ContestHall_Movement_Heart
@@ -745,10 +745,10 @@ ContestHall_EventScript_TryDisplayHeartAudienceMember4:: @ 827A6C6
 	addvar VAR_TEMP_0, -1
 	return
 
-ContestHall_EventScript_Audience4MemberAlreadyEmoted:: @ 827A6E9
+ContestHall_EventScript_Audience4MemberAlreadyEmoted::
 	return
 
-ContestHall_EventScript_TryDisplayHeartAudienceMember5:: @ 827A6EA
+ContestHall_EventScript_TryDisplayHeartAudienceMember5::
 	compare VAR_TEMP_5, 1
 	goto_if_eq ContestHall_EventScript_AudienceMember5AlreadyEmoted
 	applymovement LOCALID_AUDIENCE_5, ContestHall_Movement_Heart
@@ -758,10 +758,10 @@ ContestHall_EventScript_TryDisplayHeartAudienceMember5:: @ 827A6EA
 	addvar VAR_TEMP_0, -1
 	return
 
-ContestHall_EventScript_AudienceMember5AlreadyEmoted:: @ 827A70D
+ContestHall_EventScript_AudienceMember5AlreadyEmoted::
 	return
 
-ContestHall_EventScript_TryDisplayHeartAudienceMember6:: @ 827A70E
+ContestHall_EventScript_TryDisplayHeartAudienceMember6::
 	compare VAR_TEMP_6, 1
 	goto_if_eq ContestHall_EventScript_AudienceMember6AlreadyEmoted
 	applymovement LOCALID_AUDIENCE_6, ContestHall_Movement_Heart
@@ -771,10 +771,10 @@ ContestHall_EventScript_TryDisplayHeartAudienceMember6:: @ 827A70E
 	addvar VAR_TEMP_0, -1
 	return
 
-ContestHall_EventScript_AudienceMember6AlreadyEmoted:: @ 827A731
+ContestHall_EventScript_AudienceMember6AlreadyEmoted::
 	return
 
-ContestHall_EventScript_TryDisplayHeartAudienceMember7:: @ 827A732
+ContestHall_EventScript_TryDisplayHeartAudienceMember7::
 	compare VAR_TEMP_7, 1
 	goto_if_eq ContestHall_EventScript_AudienceMember7AlreadyEmoted
 	applymovement LOCALID_AUDIENCE_7, ContestHall_Movement_Heart
@@ -784,10 +784,10 @@ ContestHall_EventScript_TryDisplayHeartAudienceMember7:: @ 827A732
 	addvar VAR_TEMP_0, -1
 	return
 
-ContestHall_EventScript_AudienceMember7AlreadyEmoted:: @ 827A755
+ContestHall_EventScript_AudienceMember7AlreadyEmoted::
 	return
 
-ContestHall_EventScript_TryDisplayHeartAudienceMember8:: @ 827A756
+ContestHall_EventScript_TryDisplayHeartAudienceMember8::
 	compare VAR_TEMP_8, 1
 	goto_if_eq ContestHall_EventScript_AudienceMember8AlreadyEmoted
 	applymovement LOCALID_ARTIST, ContestHall_Movement_Heart
@@ -797,10 +797,10 @@ ContestHall_EventScript_TryDisplayHeartAudienceMember8:: @ 827A756
 	addvar VAR_TEMP_0, -1
 	return
 
-ContestHall_EventScript_AudienceMember8AlreadyEmoted:: @ 827A779
+ContestHall_EventScript_AudienceMember8AlreadyEmoted::
 	return
 
-ContestHall_EventScript_ContestantReturn:: @ 827A77A
+ContestHall_EventScript_ContestantReturn::
 	closemessage
 	release
 	removeobject LOCALID_POKEBALL
@@ -813,7 +813,7 @@ ContestHall_EventScript_ContestantReturn:: @ 827A77A
 	case 3, ContestHall_EventScript_Player4WalkBack
 	return
 
-ContestHall_EventScript_Player1WalkBack:: @ 827A7B9
+ContestHall_EventScript_Player1WalkBack::
 	call ContestHall_EventScript_TryWaitForLink
 	lockall
 	applymovement VAR_0x800B, ContestHall_Movement_Player1WalkBack
@@ -821,7 +821,7 @@ ContestHall_EventScript_Player1WalkBack:: @ 827A7B9
 	releaseall
 	return
 
-ContestHall_EventScript_Player2WalkBack:: @ 827A7CB
+ContestHall_EventScript_Player2WalkBack::
 	call ContestHall_EventScript_TryWaitForLink
 	lockall
 	applymovement VAR_0x800B, ContestHall_Movement_Player2WalkBack
@@ -829,7 +829,7 @@ ContestHall_EventScript_Player2WalkBack:: @ 827A7CB
 	releaseall
 	return
 
-ContestHall_EventScript_Player3WalkBack:: @ 827A7DD
+ContestHall_EventScript_Player3WalkBack::
 	call ContestHall_EventScript_TryWaitForLink
 	lockall
 	applymovement VAR_0x800B, ContestHall_Movement_Player3WalkBack
@@ -837,7 +837,7 @@ ContestHall_EventScript_Player3WalkBack:: @ 827A7DD
 	releaseall
 	return
 
-ContestHall_EventScript_Player4WalkBack:: @ 827A7EF
+ContestHall_EventScript_Player4WalkBack::
 	call ContestHall_EventScript_TryWaitForLink
 	lockall
 	applymovement VAR_0x800B, ContestHall_Movement_Player4WalkBack
@@ -845,7 +845,7 @@ ContestHall_EventScript_Player4WalkBack:: @ 827A7EF
 	releaseall
 	return
 
-ContestHall_EventScript_DoContestAppeals:: @ 827A801
+ContestHall_EventScript_DoContestAppeals::
 	lockall
 	applymovement LOCALID_MC, ContestHall_Movement_FaceContestants2
 	waitmovement 0
@@ -869,13 +869,13 @@ ContestHall_EventScript_DoContestAppeals:: @ 827A801
 	releaseall
 	return
 
-ContestHall_EventScript_LetsAppeal:: @ 827A853
+ContestHall_EventScript_LetsAppeal::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_LetsAppealLink
 	msgbox ContestHall_Text_VotingCompleteLetsAppeal, MSGBOX_DEFAULT
 	return
 
-ContestHall_EventScript_LetsAppealLink:: @ 827A867
+ContestHall_EventScript_LetsAppealLink::
 	specialvar VAR_RESULT, IsWirelessContest
 	compare VAR_RESULT, TRUE
 	goto_if_eq ContestHall_EventScript_LetsAppealWireless
@@ -883,7 +883,7 @@ ContestHall_EventScript_LetsAppealLink:: @ 827A867
 	waitmessage
 	return
 
-ContestHall_EventScript_LetsAppealWireless:: @ 827A87E
+ContestHall_EventScript_LetsAppealWireless::
 	call ContestHall_EventScript_TryWaitForLink
 	messageautoscroll ContestHall_Text_VotingComplete
 	waitmessage
@@ -896,7 +896,7 @@ ContestHall_EventScript_LetsAppealWireless:: @ 827A87E
 	call ContestHall_EventScript_TryWaitForLink
 	return
 
-ContestHall_EventScript_ContestResults:: @ 827A8A5
+ContestHall_EventScript_ContestResults::
 	call ContestHall_EventScript_TryWaitForLink
 	call ContestHall_EventScript_ThatsItForJudging
 	call ContestHall_EventScript_TryWaitForLink
@@ -919,59 +919,59 @@ ContestHall_EventScript_ContestResults:: @ 827A8A5
 	playbgm MUS_CONTEST_WINNER, FALSE
 	return
 
-ContestHall_EventScript_ThatsItForJudging:: @ 827A8FB
+ContestHall_EventScript_ThatsItForJudging::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_ThatsItForJudgingLink
 	msgbox ContestHall_Text_ThatsItForJudging, MSGBOX_DEFAULT
 	return
 
-ContestHall_EventScript_ThatsItForJudgingLink:: @ 827A90F
+ContestHall_EventScript_ThatsItForJudgingLink::
 	call ContestHall_EventScript_TryWaitForLink
 	messageautoscroll ContestHall_Text_ThatsItForJudging
 	waitmessage
 	delay 30
 	return
 
-ContestHall_EventScript_ThankYouForAppeals:: @ 827A91E
+ContestHall_EventScript_ThankYouForAppeals::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_ThankYouForAppealsLink
 	msgbox ContestHall_Text_ThankYouForAppeals, MSGBOX_DEFAULT
 	return
 
-ContestHall_EventScript_ThankYouForAppealsLink:: @ 827A932
+ContestHall_EventScript_ThankYouForAppealsLink::
 	call ContestHall_EventScript_TryWaitForLink
 	messageautoscroll ContestHall_Text_ThankYouForAppeals
 	waitmessage
 	delay 30
 	return
 
-ContestHall_EventScript_JudgeLooksReady:: @ 827A941
+ContestHall_EventScript_JudgeLooksReady::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_JudgeLooksReadyLink
 	msgbox ContestHall_Text_JudgeLooksReady, MSGBOX_DEFAULT
 	return
 
-ContestHall_EventScript_JudgeLooksReadyLink:: @ 827A955
+ContestHall_EventScript_JudgeLooksReadyLink::
 	call ContestHall_EventScript_TryWaitForLink
 	messageautoscroll ContestHall_Text_JudgeLooksReady
 	waitmessage
 	delay 30
 	return
 
-ContestHall_EventScript_WeWillDeclareWinner:: @ 827A964
+ContestHall_EventScript_WeWillDeclareWinner::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_WeWillDeclareWinnerLink
 	msgbox ContestHall_Text_WeWillNowDeclareWinner, MSGBOX_DEFAULT
 	return
 
-ContestHall_EventScript_WeWillDeclareWinnerLink:: @ 827A978
+ContestHall_EventScript_WeWillDeclareWinnerLink::
 	call ContestHall_EventScript_TryWaitForLink
 	messageautoscroll ContestHall_Text_WeWillNowDeclareWinner
 	waitmessage
 	delay 30
 	return
 
-ContestHall_EventScript_GetWinnerObjEventId:: @ 827A987
+ContestHall_EventScript_GetWinnerObjEventId::
 	special GetContestWinnerId
 	switch VAR_0x8005
 	case 0, ContestHall_EventScript_GetPlayer1ObjEventId
@@ -980,23 +980,23 @@ ContestHall_EventScript_GetWinnerObjEventId:: @ 827A987
 	case 3, ContestHall_EventScript_GetPlayer4ObjEventId
 	return
 
-ContestHall_EventScript_GetPlayer1ObjEventId:: @ 827A9BC
+ContestHall_EventScript_GetPlayer1ObjEventId::
 	setvar VAR_TEMP_3, LOCALID_CONTESTANT_1
 	return
 
-ContestHall_EventScript_GetPlayer2ObjEventId:: @ 827A9C2
+ContestHall_EventScript_GetPlayer2ObjEventId::
 	setvar VAR_TEMP_3, LOCALID_CONTESTANT_2
 	return
 
-ContestHall_EventScript_GetPlayer3ObjEventId:: @ 827A9C8
+ContestHall_EventScript_GetPlayer3ObjEventId::
 	setvar VAR_TEMP_3, LOCALID_CONTESTANT_3
 	return
 
-ContestHall_EventScript_GetPlayer4ObjEventId:: @ 827A9CE
+ContestHall_EventScript_GetPlayer4ObjEventId::
 	setvar VAR_TEMP_3, LOCALID_CONTESTANT_4
 	return
 
-ContestHall_EventScript_CongratulateWinner:: @ 827A9D4
+ContestHall_EventScript_CongratulateWinner::
 	special BufferContestWinnerTrainerName
 	special BufferContestWinnerMonName
 	addvar VAR_0x8005, 1
@@ -1009,18 +1009,18 @@ ContestHall_EventScript_CongratulateWinner:: @ 827A9D4
 	setvar VAR_TEMP_1, 0
 	return
 
-ContestHall_EventScript_CongratsWinner:: @ 827AA00
+ContestHall_EventScript_CongratsWinner::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_CongratsWinnerLink
 	msgbox ContestHall_Text_CongratsTrainerXandMon, MSGBOX_DEFAULT
 	return
 
-ContestHall_EventScript_CongratsWinnerLink:: @ 827AA14
+ContestHall_EventScript_CongratsWinnerLink::
 	messageautoscroll ContestHall_Text_CongratsTrainerXandMon
 	waitmessage
 	return
 
-ContestHall_EventScript_AudienceLookAround:: @ 827AA1B
+ContestHall_EventScript_AudienceLookAround::
 	addvar VAR_TEMP_1, 1
 	lockall
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_NORMAL
@@ -1038,7 +1038,7 @@ ContestHall_EventScript_AudienceLookAround:: @ 827AA1B
 	delay 30
 	return
 
-ContestHall_EventScript_VObjectAudienceLookAround:: @ 827AA6F
+ContestHall_EventScript_VObjectAudienceLookAround::
 	turnvobject 0, DIR_SOUTH
 	turnvobject 2, DIR_SOUTH
 	turnvobject 4, DIR_EAST
@@ -1107,7 +1107,7 @@ ContestHall_EventScript_VObjectAudienceLookAround:: @ 827AA6F
 	delay 10
 	return
 
-ContestHall_EventScript_GiveWinnerPrize:: @ 827AB36
+ContestHall_EventScript_GiveWinnerPrize::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_LINK
 	goto_if_eq ContestHall_EventScript_EndLinkContest
 	call ContestHall_EventScript_CheckShouldSkipPrize
@@ -1126,7 +1126,7 @@ ContestHall_EventScript_GiveWinnerPrize:: @ 827AB36
 	goto_if_eq ContestHall_EventScript_SetReadyForContestArtist
 	return
 
-ContestHall_EventScript_SkipPrize:: @ 827AB82
+ContestHall_EventScript_SkipPrize::
 	lockall
 	msgbox ContestHall_Text_CongratsPleaseCompeteAgain, MSGBOX_DEFAULT
 	releaseall
@@ -1136,37 +1136,37 @@ ContestHall_EventScript_SkipPrize:: @ 827AB82
 	goto_if_eq ContestHall_EventScript_SetReadyForContestArtist
 	return
 
-ContestHall_EventScript_CheckShouldSkipPrize:: @ 827AB9E
+ContestHall_EventScript_CheckShouldSkipPrize::
 	specialvar VAR_RESULT, HasMonWonThisContestBefore
 	compare VAR_RESULT, TRUE
 	goto_if_eq ContestHall_EventScript_CheckPlayerWon
 	return
 
-ContestHall_EventScript_CheckPlayerWon:: @ 827ABAF
+ContestHall_EventScript_CheckPlayerWon::
 	special GetContestWinnerId
 	compare VAR_0x8005, 3
 	goto_if_eq ContestHall_EventScript_CheckRankIsMaster
 	return
 
-ContestHall_EventScript_CheckRankIsMaster:: @ 827ABBE
+ContestHall_EventScript_CheckRankIsMaster::
 	compare VAR_CONTEST_RANK, CONTEST_RANK_MASTER
 	goto_if_eq ContestHall_EventScript_DontSkipPrize
 	setflag FLAG_TEMP_2
 	return
 
-ContestHall_EventScript_DontSkipPrize:: @ 827ABCD
+ContestHall_EventScript_DontSkipPrize::
 	return
 
 @ This flag is never read
-ContestHall_EventScript_SetSketchFlag:: @ 827ABCE
+ContestHall_EventScript_SetSketchFlag::
 	setflag FLAG_CONTEST_SKETCH_CREATED
 	return
 
-ContestHall_EventScript_SetReadyForContestArtist:: @ 827ABD2
+ContestHall_EventScript_SetReadyForContestArtist::
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
 	return
 
-ContestHall_EventScript_EndLinkContest:: @ 827ABD8
+ContestHall_EventScript_EndLinkContest::
 	delay 60
 	special GetContestPlayerId
 	special GetContestWinnerId
@@ -1176,15 +1176,15 @@ ContestHall_EventScript_EndLinkContest:: @ 827ABD8
 	closemessage
 	return
 
-ContestHall_EventScript_SetReadyForLinkContestArtist:: @ 827ABF1
+ContestHall_EventScript_SetReadyForLinkContestArtist::
 	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2
 	return
 
 @ Unused
-ContestHall_EventScript_Ret:: @ 827ABF7
+ContestHall_EventScript_Ret::
 	return
 
-ContestHall_EventScript_WinnerApproachForPrize:: @ 827ABF8
+ContestHall_EventScript_WinnerApproachForPrize::
 	switch VAR_0x8005
 	case 0, ContestHall_EventScript_Player1ApproachForPrize
 	case 1, ContestHall_EventScript_Player2ApproachForPrize
@@ -1192,28 +1192,28 @@ ContestHall_EventScript_WinnerApproachForPrize:: @ 827ABF8
 	case 3, ContestHall_EventScript_Player4ApproachForPrize
 	return
 
-ContestHall_EventScript_Player1ApproachForPrize:: @ 827AC2A
+ContestHall_EventScript_Player1ApproachForPrize::
 	lockall
 	applymovement VAR_TEMP_3, ContestHall_Movement_Player1ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-ContestHall_EventScript_Player2ApproachForPrize:: @ 827AC37
+ContestHall_EventScript_Player2ApproachForPrize::
 	lockall
 	applymovement VAR_TEMP_3, ContestHall_Movement_Player2ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-ContestHall_EventScript_Player3ApproachForPrize:: @ 827AC44
+ContestHall_EventScript_Player3ApproachForPrize::
 	lockall
 	applymovement VAR_TEMP_3, ContestHall_Movement_Player3ApproachForPrize
 	waitmovement 0
 	releaseall
 	return
 
-ContestHall_EventScript_Player4ApproachForPrize:: @ 827AC51
+ContestHall_EventScript_Player4ApproachForPrize::
 	lockall
 	applymovement VAR_TEMP_3, ContestHall_Movement_Player4ApproachForPrize
 	waitmovement 0
@@ -1221,7 +1221,7 @@ ContestHall_EventScript_Player4ApproachForPrize:: @ 827AC51
 	return
 
 @ In NPC Contests, the player is always entry 4 (id number 3)
-ContestHall_EventScript_GivePrizeIfWinner:: @ 827AC5E
+ContestHall_EventScript_GivePrizeIfWinner::
 	special GetContestWinnerId
 	compare VAR_0x8005, 3
 	goto_if_eq ContestHall_EventScript_GiveContestPrizes
@@ -1230,7 +1230,7 @@ ContestHall_EventScript_GivePrizeIfWinner:: @ 827AC5E
 	releaseall
 	return
 
-ContestHall_EventScript_GiveContestPrizes:: @ 827AC77
+ContestHall_EventScript_GiveContestPrizes::
 	compare VAR_CONTEST_TYPE, CONTEST_TYPE_NPC_SUPER
 	call_if_eq ContestHall_EventScript_SetSketchFlag
 	specialvar VAR_RESULT, HasMonWonThisContestBefore
@@ -1243,7 +1243,7 @@ ContestHall_EventScript_GiveContestPrizes:: @ 827AC77
 	releaseall
 	return
 
-ContestHall_EventScript_NoRoomForLuxuryBall:: @ 827ACA8
+ContestHall_EventScript_NoRoomForLuxuryBall::
 	lockall
 	call Common_EventScript_BagIsFull
 	msgbox ContestHall_Text_PickUpPrizeAtCounterLater, MSGBOX_DEFAULT
@@ -1251,7 +1251,7 @@ ContestHall_EventScript_NoRoomForLuxuryBall:: @ 827ACA8
 	setvar VAR_CONTEST_PRIZE_PICKUP, 4
 	return
 
-ContestHall_EventScript_GiveLuxuryBall:: @ 827ACBD
+ContestHall_EventScript_GiveLuxuryBall::
 	giveitem ITEM_LUXURY_BALL
 	compare VAR_RESULT, FALSE
 	goto_if_eq ContestHall_EventScript_NoRoomForLuxuryBall
@@ -1260,7 +1260,7 @@ ContestHall_EventScript_GiveLuxuryBall:: @ 827ACBD
 	releaseall
 	return
 
-ContestHall_EventScript_ReceiveContestRibbon:: @ 827ACDF
+ContestHall_EventScript_ReceiveContestRibbon::
 	special GiveMonContestRibbon
 	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
 	setflag FLAG_SYS_RIBBON_GET
@@ -1274,69 +1274,69 @@ ContestHall_EventScript_ReceiveContestRibbon:: @ 827ACDF
 	releaseall
 	return
 
-ContestHall_Movement_MCWalkDown: @ 827AD09
+ContestHall_Movement_MCWalkDown:
 	walk_down
 	step_end
 
-ContestHall_Movement_MCBackUp: @ 827AD0B
+ContestHall_Movement_MCBackUp:
 	lock_facing_direction
 	walk_up
 	unlock_facing_direction
 	step_end
 
-ContestHall_Movement_MCFaceJudge: @ 827AD0F
+ContestHall_Movement_MCFaceJudge:
 	walk_in_place_fastest_right
 	step_end
 
-ContestHall_Movement_Heart: @ 827AD11
+ContestHall_Movement_Heart:
 	emote_heart
 	step_end
 
-ContestHall_Movement_FaceContestants: @ 827AD13
+ContestHall_Movement_FaceContestants:
 	walk_in_place_fastest_down
 	step_end
 
-ContestHall_Movement_WalkStageLeft: @ 827AD15
+ContestHall_Movement_WalkStageLeft:
 	walk_left
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-ContestHall_Movement_WalkStageRight: @ 827AD19
+ContestHall_Movement_WalkStageRight:
 	walk_right
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-ContestHall_Movement_WinningPlayerWalkUp: @ 827AD1D
+ContestHall_Movement_WinningPlayerWalkUp:
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-ContestHall_Movement_ContestantDelay32: @ 827AD20
+ContestHall_Movement_ContestantDelay32:
 	delay_16
 	delay_16
 	step_end
 
-ContestHall_Movement_MCFaceJudge2: @ 827AD23
+ContestHall_Movement_MCFaceJudge2:
 	walk_in_place_fastest_right
 	step_end
 
-ContestHall_Movement_JudgeFaceMC: @ 827AD25
+ContestHall_Movement_JudgeFaceMC:
 	walk_in_place_fastest_left
 	step_end
 
-ContestHall_Movement_FaceContestants2: @ 827AD27
+ContestHall_Movement_FaceContestants2:
 	walk_in_place_fastest_down
 	step_end
 
-ContestHall_Movement_Player3ApproachForPrize: @ 827AD29
+ContestHall_Movement_Player3ApproachForPrize:
 	walk_left
 	walk_left
 	walk_up
 	step_end
 
-ContestHall_Movement_Player4ApproachForPrize: @ 827AD2D
+ContestHall_Movement_Player4ApproachForPrize:
 	walk_left
 	walk_left
 	walk_left
@@ -1344,54 +1344,54 @@ ContestHall_Movement_Player4ApproachForPrize: @ 827AD2D
 	walk_up
 	step_end
 
-ContestHall_Movement_AudienceMemberLookLeft: @ 827AD33
+ContestHall_Movement_AudienceMemberLookLeft:
 	face_left
 	delay_16
 	face_original_direction
 	step_end
 
-ContestHall_Movement_AudienceMemberLookUp: @ 827AD37
+ContestHall_Movement_AudienceMemberLookUp:
 	face_up
 	delay_16
 	face_original_direction
 	step_end
 
-ContestHall_Movement_AudienceMemberLookRight: @ 827AD3B
+ContestHall_Movement_AudienceMemberLookRight:
 	face_right
 	delay_16
 	face_original_direction
 	step_end
 
-ContestHall_Movement_AudienceMemberLookDown: @ 827AD3F
+ContestHall_Movement_AudienceMemberLookDown:
 	face_down
 	delay_16
 	face_original_direction
 	step_end
 
-ContestHall_Movement_Player4FaceUp: @ 827AD43
+ContestHall_Movement_Player4FaceUp:
 	face_up
 	step_end
 
-ContestHall_Movement_MCLookAtJudge: @ 827AD45
+ContestHall_Movement_MCLookAtJudge:
 	face_up
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-ContestHall_Movement_JudgeLookAtMC: @ 827AD49
+ContestHall_Movement_JudgeLookAtMC:
 	walk_in_place_fastest_left
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-ContestHall_Movement_MCWalkInPlaceDown: @ 827AD4E
+ContestHall_Movement_MCWalkInPlaceDown:
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-ContestHall_Movement_Player1WalkToCenter: @ 827AD52
+ContestHall_Movement_Player1WalkToCenter:
 	walk_up
 	walk_right
 	walk_right
@@ -1399,7 +1399,7 @@ ContestHall_Movement_Player1WalkToCenter: @ 827AD52
 	walk_in_place_fastest_up
 	step_end
 
-ContestHall_Movement_Player1WalkBack: @ 827AD58
+ContestHall_Movement_Player1WalkBack:
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -1407,31 +1407,31 @@ ContestHall_Movement_Player1WalkBack: @ 827AD58
 	walk_in_place_fastest_up
 	step_end
 
-ContestHall_Movement_Player2WalkToCenter: @ 827AD5E
+ContestHall_Movement_Player2WalkToCenter:
 	walk_up
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-ContestHall_Movement_Player2WalkBack: @ 827AD62
+ContestHall_Movement_Player2WalkBack:
 	walk_fast_left
 	walk_fast_down
 	walk_in_place_fastest_up
 	step_end
 
-ContestHall_Movement_Player3WalkToCenter: @ 827AD66
+ContestHall_Movement_Player3WalkToCenter:
 	walk_up
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-ContestHall_Movement_Player3WalkBack: @ 827AD6A
+ContestHall_Movement_Player3WalkBack:
 	walk_fast_right
 	walk_fast_down
 	walk_in_place_fastest_up
 	step_end
 
-ContestHall_Movement_Player4WalkToCenter: @ 827AD6E
+ContestHall_Movement_Player4WalkToCenter:
 	walk_up
 	walk_left
 	walk_left
@@ -1439,7 +1439,7 @@ ContestHall_Movement_Player4WalkToCenter: @ 827AD6E
 	walk_in_place_fastest_up
 	step_end
 
-ContestHall_Movement_Player4WalkBack: @ 827AD74
+ContestHall_Movement_Player4WalkBack:
 	walk_fast_right
 	walk_fast_right
 	walk_fast_right
@@ -1447,37 +1447,37 @@ ContestHall_Movement_Player4WalkBack: @ 827AD74
 	walk_in_place_fastest_up
 	step_end
 
-ContestHall_Movement_Player1ApproachForPrize: @ 827AD7A
+ContestHall_Movement_Player1ApproachForPrize:
 	walk_right
 	walk_right
 	walk_up
 	step_end
 
-ContestHall_Movement_Player2ApproachForPrize: @ 827AD7E
+ContestHall_Movement_Player2ApproachForPrize:
 	walk_up
 	step_end
 
 @ IsContestWithRSPlayer has no side effect, so this is nop
-ContestHall_EventScript_CheckIfContestWithRSPlayer:: @ 827AD80
+ContestHall_EventScript_CheckIfContestWithRSPlayer::
 	specialvar VAR_RESULT, IsContestWithRSPlayer
 	compare VAR_RESULT, TRUE
 	goto_if_eq ContestHall_EventScript_RetRSPlayer
 	return
 
-ContestHall_EventScript_RetRSPlayer:: @ 827AD91
+ContestHall_EventScript_RetRSPlayer::
 	return
 
-LilycoveCity_ContestLobby_EventScript_DelayIfContestWithRSPlayer:: @ 827AD92
+LilycoveCity_ContestLobby_EventScript_DelayIfContestWithRSPlayer::
 	specialvar VAR_RESULT, IsContestWithRSPlayer
 	compare VAR_RESULT, TRUE
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_DelayForRSPlayer
 	return
 
-LilycoveCity_ContestLobby_EventScript_DelayForRSPlayer:: @ 827ADA3
+LilycoveCity_ContestLobby_EventScript_DelayForRSPlayer::
 	delay 9
 	return
 
-LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase: @ 827ADA7
+LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase:
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
 	.string "POKéMON CONTESTS.\p"
@@ -1486,32 +1486,32 @@ LilycoveCity_ContestLobby_Text_ReceptionDontHavePokeblockCase: @ 827ADA7
 	.string "In that case, we need to provide you\n"
 	.string "with this!$"
 
-LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp: @ 827AE47
+LilycoveCity_ContestLobby_Text_NowThatWeveClearedThatUp:
 	.string "Okay, now that we've cleared that\n"
 	.string "up…\p"
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
 	.string "POKéMON CONTESTS.$"
 
-LilycoveCity_ContestLobby_Text_ContestReception: @ 827AEA8
+LilycoveCity_ContestLobby_Text_ContestReception:
 	.string "Hello!\p"
 	.string "This is the reception counter for\n"
 	.string "POKéMON CONTESTS.$"
 
 @ Unused
-LilycoveCity_ContestLobby_Text_CounterOnlyFor4PlayerContests: @ 827AEE3
+LilycoveCity_ContestLobby_Text_CounterOnlyFor4PlayerContests:
 	.string "Hello!\p"
 	.string "This reception counter is only\n"
 	.string "for 4-player POKéMON CONTESTS.$"
 
-LilycoveCity_ContestLobby_Text_EnterContest1: @ 827AF28
+LilycoveCity_ContestLobby_Text_EnterContest1:
 	.string "Would you like to enter your POKéMON\n"
 	.string "in our CONTESTS?$"
 
-LilycoveCity_ContestLobby_Text_WhichTopic1: @ 827AF5E
+LilycoveCity_ContestLobby_Text_WhichTopic1:
 	.string "Which topic would you like?$"
 
-LilycoveCity_ContestLobby_Text_ExplainContests: @ 827AF7A
+LilycoveCity_ContestLobby_Text_ExplainContests:
 	.string "A POKéMON CONTEST involves four\n"
 	.string "TRAINERS entering one POKéMON each\l"
 	.string "in competitive judging.\p"
@@ -1530,14 +1530,14 @@ LilycoveCity_ContestLobby_Text_ExplainContests: @ 827AF7A
 	.string "The POKéMON garnering the highest\n"
 	.string "score is declared the winner.$"
 
-LilycoveCity_ContestLobby_Text_ExplainContestTypes: @ 827B17D
+LilycoveCity_ContestLobby_Text_ExplainContestTypes:
 	.string "There are five kinds of CONTESTS.\p"
 	.string "COOL, BEAUTY, CUTE, SMART, and\n"
 	.string "TOUGH are the five categories.\p"
 	.string "Choose the CONTEST that is right for\n"
 	.string "the POKéMON you plan to enter.$"
 
-LilycoveCity_ContestLobby_Text_ExplainContestRanks: @ 827B221
+LilycoveCity_ContestLobby_Text_ExplainContestRanks:
 	.string "There are four ranks of POKéMON\n"
 	.string "CONTESTS.\p"
 	.string "NORMAL, SUPER, HYPER, and MASTER\n"
@@ -1555,77 +1555,77 @@ LilycoveCity_ContestLobby_Text_ExplainContestRanks: @ 827B221
 	.string "may compete in the MASTER Rank as\l"
 	.string "often as its TRAINER wants.$"
 
-LilycoveCity_ContestLobby_Text_EnterWhichRank: @ 827B3FF
+LilycoveCity_ContestLobby_Text_EnterWhichRank:
 	.string "Which Rank would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_EnterWhichContest1: @ 827B423
+LilycoveCity_ContestLobby_Text_EnterWhichContest1:
 	.string "Which CONTEST would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_EnterWhichPokemon1: @ 827B44A
+LilycoveCity_ContestLobby_Text_EnterWhichPokemon1:
 	.string "Which POKéMON would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank: @ 827B471
+LilycoveCity_ContestLobby_Text_MonNotQualifiedForRank:
 	.string "I'm terribly sorry, but your POKéMON\n"
 	.string "is not qualified to compete at this\l"
 	.string "Rank yet…$"
 
-LilycoveCity_ContestLobby_Text_EggCannotTakePart: @ 827B4C4
+LilycoveCity_ContestLobby_Text_EggCannotTakePart:
 	.string "I'm sorry, but an EGG cannot take part\n"
 	.string "in a POKéMON CONTEST.$"
 
-LilycoveCity_ContestLobby_Text_MonInNoConditionForContest: @ 827B501
+LilycoveCity_ContestLobby_Text_MonInNoConditionForContest:
 	.string "Your POKéMON appears to be in no\n"
 	.string "condition to take part in a CONTEST…$"
 
-LilycoveCity_ContestLobby_Text_AlreadyWonEnterAnyway: @ 827B547
+LilycoveCity_ContestLobby_Text_AlreadyWonEnterAnyway:
 	.string "Oh, but that RIBBON…\p"
 	.string "Your POKéMON has won this CONTEST\n"
 	.string "before, hasn't it?\p"
 	.string "Would you like to enter it in this\n"
 	.string "CONTEST anyway?$"
 
-LilycoveCity_ContestLobby_Text_ConfirmContestMon: @ 827B5C4
+LilycoveCity_ContestLobby_Text_ConfirmContestMon:
 	.string "Is that your CONTEST POKéMON?$"
 
-LilycoveCity_ContestLobby_Text_YourMonIsEntryNum4: @ 827B5E2
+LilycoveCity_ContestLobby_Text_YourMonIsEntryNum4:
 	.string "Okay, your POKéMON will be entered\n"
 	.string "in this CONTEST.\p"
 	.string "Your POKéMON is Entry No. 4.\n"
 	.string "The CONTEST will begin shortly.$"
 
-LilycoveCity_ContestLobby_Text_ComeThroughHere: @ 827B653
+LilycoveCity_ContestLobby_Text_ComeThroughHere:
 	.string "Please come in through here.\n"
 	.string "Good luck!$"
 
-LilycoveCity_ContestLobby_Text_PokemonWonWeHavePrize: @ 827B67B
+LilycoveCity_ContestLobby_Text_PokemonWonWeHavePrize:
 	.string "Congratulations! Your POKéMON is the\n"
 	.string "CONTEST winner!\p"
 	.string "We have your prize right here.\n"
 	.string "Please, right this way!$"
 
-LilycoveCity_ContestLobby_Text_ComeBackForPrizeLater: @ 827B6E7
+LilycoveCity_ContestLobby_Text_ComeBackForPrizeLater:
 	.string "Please come back for your prize\n"
 	.string "later on.$"
 
-ContestHall_Text_GettingStartedParticipantsAsFollows: @ 827B711
+ContestHall_Text_GettingStartedParticipantsAsFollows:
 	.string "MC: Hello! We're just getting started\n"
 	.string "with a {STR_VAR_3} Rank POKéMON\l"
 	.string "{STR_VAR_2}!\p"
 	.string "The participating TRAINERS and their\n"
 	.string "POKéMON are as follows:$"
 
-ContestHall_Text_GettingStartedParticipantsAsFollowsLink: @ 827B78F
+ContestHall_Text_GettingStartedParticipantsAsFollowsLink:
 	.string "MC: Hello! We're just getting started\n"
 	.string "with a 4-player linked POKéMON\l"
 	.string "{STR_VAR_2}!\p"
 	.string "The participating TRAINERS and their\n"
 	.string "POKéMON are as follows:$"
 
-ContestHall_Text_EntryXTrainersMon: @ 827B815
+ContestHall_Text_EntryXTrainersMon:
 	.string "MC: Entry No. {STR_VAR_2}!\n"
 	.string "{STR_VAR_1}'s {STR_VAR_3}!$"
 
-ContestHall_Text_SeenContestantsAudienceWillVote: @ 827B830
+ContestHall_Text_SeenContestantsAudienceWillVote:
 	.string "MC: We've just seen the four POKéMON\n"
 	.string "contestants.\p"
 	.string "Now it's time for primary judging!\p"
@@ -1634,10 +1634,10 @@ ContestHall_Text_SeenContestantsAudienceWillVote: @ 827B830
 	.string "Without any further ado, let the\n"
 	.string "voting begin!$"
 
-ContestHall_Text_VotingUnderWay: @ 827B8F2
+ContestHall_Text_VotingUnderWay:
 	.string "Voting under way…$"
 
-ContestHall_Text_VotingCompleteLetsAppeal: @ 827B904
+ContestHall_Text_VotingCompleteLetsAppeal:
 	.string "Voting is now complete!\p"
 	.string "While the votes are being tallied,\n"
 	.string "let's move on to secondary judging!\p"
@@ -1648,75 +1648,75 @@ ContestHall_Text_VotingCompleteLetsAppeal: @ 827B904
 	.string "Let's see a little enthusiasm!\n"
 	.string "Let's appeal!$"
 
-ContestHall_Text_ThatsItForJudging: @ 827BA15
+ContestHall_Text_ThatsItForJudging:
 	.string "MC: That's it for judging!$"
 
-ContestHall_Text_ThankYouForAppeals: @ 827BA30
+ContestHall_Text_ThankYouForAppeals:
 	.string "Thank you all for a most wonderful\n"
 	.string "display of quality appeals!\p"
 	.string "This concludes all judging!\n"
 	.string "Thank you for your fine efforts!$"
 
-ContestHall_Text_JudgeLooksReady: @ 827BAAC
+ContestHall_Text_JudgeLooksReady:
 	.string "Now, all that remains is the pulse-\n"
 	.string "pounding proclamation of the winner.\p"
 	.string "The JUDGE looks ready to make\n"
 	.string "the announcement!$"
 
-ContestHall_Text_WeWillNowDeclareWinner: @ 827BB25
+ContestHall_Text_WeWillNowDeclareWinner:
 	.string "JUDGE: We will now declare the winner!$"
 
-ContestHall_Text_CongratsTrainerXandMon: @ 827BB4C
+ContestHall_Text_CongratsTrainerXandMon:
 	.string "MC: Entry No. {STR_VAR_2}!\p"
 	.string "{STR_VAR_3} and {STR_VAR_1},\n"
 	.string "congratulations!$"
 
-ContestHall_Text_CongratsPleaseCompeteAgain: @ 827BB7A
+ContestHall_Text_CongratsPleaseCompeteAgain:
 	.string "MC: Congratulations!\n"
 	.string "Please do compete again!$"
 
-ContestHall_Text_AcceptYourPrize: @ 827BBA8
+ContestHall_Text_AcceptYourPrize:
 	.string "MC: Here you are!\n"
 	.string "Please accept your prize!$"
 
-ContestHall_Text_ConferRibbonAsPrize: @ 827BBD4
+ContestHall_Text_ConferRibbonAsPrize:
 	.string "We confer on you this RIBBON\n"
 	.string "as your prize!$"
 
-ContestHall_Text_ReceivedRibbon: @ 827BC00
+ContestHall_Text_ReceivedRibbon:
 	.string "{PLAYER} received a RIBBON.$"
 
-ContestHall_Text_PutRibbonOnMon: @ 827BC16
+ContestHall_Text_PutRibbonOnMon:
 	.string "{PLAYER} put the RIBBON on\n"
 	.string "{STR_VAR_1}.$"
 
-ContestHall_Text_PickUpPrizeAtCounterLater: @ 827BC2F
+ContestHall_Text_PickUpPrizeAtCounterLater:
 	.string "Please pick up your prize at\n"
 	.string "the reception counter later.\l"
 	.string "Please do compete again!$"
 
 @ Unused
-ContestHall_Text_OnlyRegister4Players: @ 827BC82
+ContestHall_Text_OnlyRegister4Players:
 	.string "I only register four players for\n"
 	.string "POKéMON CONTESTS.\p"
 	.string "If three other players link up, all\n"
 	.string "four may enter the same CONTEST.\p"
 	.string "Would you like to take part?$"
 
-LilycoveCity_ContestLobby_Text_ProgressWillBeSaved: @ 827BD17
+LilycoveCity_ContestLobby_Text_ProgressWillBeSaved:
 	.string "Before entering a CONTEST, your\n"
 	.string "progress will be saved.$"
 
-LilycoveCity_ContestLobby_Text_ParticipateAnotherTime: @ 827BD4F
+LilycoveCity_ContestLobby_Text_ParticipateAnotherTime:
 	.string "We hope you will participate another\n"
 	.string "time.$"
 
 @ Unused
-LilycoveCity_ContestLobby_Text_EnterContest2: @ 827BD7A
+LilycoveCity_ContestLobby_Text_EnterContest2:
 	.string "Would you like to enter a CONTEST?$"
 
 @ Unused
-LilycoveCity_ContestLobby_Text_Explain4PlayerContest: @ 827BD9D
+LilycoveCity_ContestLobby_Text_Explain4PlayerContest:
 	.string "When four players are ready, connect\n"
 	.string "over a Game Link cable, and register\l"
 	.string "with me, please.\p"
@@ -1728,82 +1728,82 @@ LilycoveCity_ContestLobby_Text_Explain4PlayerContest: @ 827BD9D
 	.string "apply.$"
 
 @ Unused
-LilycoveCity_ContestLobby_Text_EnterWhichContest2: @ 827BE9E
+LilycoveCity_ContestLobby_Text_EnterWhichContest2:
 	.string "Which CONTEST would you like to enter?$"
 
 @ Unused
-LilycoveCity_ContestLobby_Text_EnterWhichPokemon2: @ 827BEC5
+LilycoveCity_ContestLobby_Text_EnterWhichPokemon2:
 	.string "Which POKéMON would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_Transmitting: @ 827BEEC
+LilycoveCity_ContestLobby_Text_Transmitting:
 	.string "Transmitting…$"
 
-LilycoveCity_ContestLobby_Text_TransmissionError: @ 827BEFA
+LilycoveCity_ContestLobby_Text_TransmissionError:
 	.string "Transmission error…$"
 
-LilycoveCity_ContestLobby_Text_PlayersChoseDifferentContest: @ 827BF0E
+LilycoveCity_ContestLobby_Text_PlayersChoseDifferentContest:
 	.string "You may have chosen a different\n"
 	.string "CONTEST than another player.$"
 
-LilycoveCity_ContestLobby_Text_PlayersMadeDifferentChoice: @ 827BF4B
+LilycoveCity_ContestLobby_Text_PlayersMadeDifferentChoice:
 	.string "You may have made a different\n"
 	.string "choice than another player.$"
 
-LilycoveCity_ContestLobby_Text_PleaseWaitBButtonCancel: @ 827BF85
+LilycoveCity_ContestLobby_Text_PleaseWaitBButtonCancel:
 	.string "Please wait.\n"
 	.string "… … B Button: Cancel$"
 
 @ Unused
-LilycoveCity_ContestLobby_Text_ParticipateAnotherTime2: @ 827BFA7
+LilycoveCity_ContestLobby_Text_ParticipateAnotherTime2:
 	.string "We hope you will participate another\n"
 	.string "time.$"
 
 @ Unused
-LilycoveCity_ContestLobby_Text_TransmissionErrorTryAgain: @ 827BFD2
+LilycoveCity_ContestLobby_Text_TransmissionErrorTryAgain:
 	.string "Transmission error.\n"
 	.string "Please try again.$"
 
-LilycoveCity_ContestLobby_Text_YourMonIsEntryNumX: @ 827BFF8
+LilycoveCity_ContestLobby_Text_YourMonIsEntryNumX:
 	.string "Your POKéMON will be entered in\n"
 	.string "the CONTEST.\p"
 	.string "Your POKéMON is Entry No. {STR_VAR_2}.$"
 
-LilycoveCity_ContestLobby_Text_ContestBeginShortly: @ 827C043
+LilycoveCity_ContestLobby_Text_ContestBeginShortly:
 	.string "The CONTEST will begin shortly.$"
 
-LilycoveCity_ContestLobby_Text_LinkContestReception: @ 827C063
+LilycoveCity_ContestLobby_Text_LinkContestReception:
 	.string "Welcome! This is the POKéMON CONTEST\n"
 	.string "link reception counter.\p"
 	.string "You may enter CONTESTS together with\n"
 	.string "one or more friends.$"
 
-LilycoveCity_ContestLobby_Text_WhichTopic2: @ 827C0DA
+LilycoveCity_ContestLobby_Text_WhichTopic2:
 	.string "Which topic would you like?$"
 
-LilycoveCity_ContestLobby_Text_EnterContest3: @ 827C0F6
+LilycoveCity_ContestLobby_Text_EnterContest3:
 	.string "Would you like to enter a CONTEST?$"
 
-LilycoveCity_ContestLobby_Text_EnterWhichContest3: @ 827C119
+LilycoveCity_ContestLobby_Text_EnterWhichContest3:
 	.string "Which CONTEST would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_MonInNoCondition2: @ 827C140
+LilycoveCity_ContestLobby_Text_MonInNoCondition2:
 	.string "Your POKéMON appears to be in no\n"
 	.string "condition to take part in a CONTEST…$"
 
-LilycoveCity_ContestLobby_Text_EggCannotTakePart2: @ 827C186
+LilycoveCity_ContestLobby_Text_EggCannotTakePart2:
 	.string "I'm sorry, but an EGG cannot take part\n"
 	.string "in a POKéMON CONTEST.$"
 
-LilycoveCity_ContestLobby_Text_EnterWhichPokemon3: @ 827C1C3
+LilycoveCity_ContestLobby_Text_EnterWhichPokemon3:
 	.string "Which POKéMON would you like to enter?$"
 
-LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader: @ 827C1EA
+LilycoveCity_ContestLobby_Text_PleaseDecideLinkLeader:
 	.string "Please decide which of you will\n"
 	.string "become the GROUP LEADER.\p"
 	.string "The other players must then choose\n"
 	.string "“JOIN GROUP.”$"
 
-LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode: @ 827C254
+LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode:
 	.string "At least one player has entered using\n"
 	.string "the 4-player reception counter.\p"
 	.string "There must be four players connected\n"
@@ -1812,7 +1812,7 @@ LilycoveCity_ContestLobby_Text_PlayerAt4PCounterUseGMode: @ 827C254
 	.string "select G-MODE (GLOBAL MODE),\l"
 	.string "then register to enter again, please.$"
 
-LilycoveCity_ContestLobby_Text_ExplainLinkContest: @ 827C340
+LilycoveCity_ContestLobby_Text_ExplainLinkContest:
 	.string "This is a CONTEST for two to four\n"
 	.string "players linked using a Wireless\l"
 	.string "Adapter or a GBA Game Link cable.\p"
@@ -1833,7 +1833,7 @@ LilycoveCity_ContestLobby_Text_ExplainLinkContest: @ 827C340
 	.string "After that, a CONTEST will start in\n"
 	.string "the usual manner.$"
 
-LilycoveCity_ContestLobby_Text_ExplainEMode: @ 827C5B1
+LilycoveCity_ContestLobby_Text_ExplainEMode:
 	.string "In E-MODE (EMERALD MODE),\n"
 	.string "a LINK CONTEST can be held with\l"
 	.string "two to four players. Each player must\l"
@@ -1847,7 +1847,7 @@ LilycoveCity_ContestLobby_Text_ExplainEMode: @ 827C5B1
 	.string "Please be aware that E-MODE is not\n"
 	.string "available in POKéMON Ruby or Sapphire.$"
 
-LilycoveCity_ContestLobby_Text_ExplainGMode: @ 827C742
+LilycoveCity_ContestLobby_Text_ExplainGMode:
 	.string "G-MODE (GLOBAL MODE) is specifically\n"
 	.string "for four players who are linked using\l"
 	.string "GBA Game Link cables.\p"
@@ -1858,50 +1858,50 @@ LilycoveCity_ContestLobby_Text_ExplainGMode: @ 827C742
 	.string "enter through the 4-player reception\l"
 	.string "counter (POKéMON Ruby or Sapphire).$"
 
-LilycoveCity_ContestLobby_Text_NoWirelessAdapterInGMode: @ 827C879
+LilycoveCity_ContestLobby_Text_NoWirelessAdapterInGMode:
 	.string "I'm terribly sorry.\p"
 	.string "G-MODE does not function\n"
 	.string "with Wireless Adapters.\p"
 	.string "Please select E-MODE or try\n"
 	.string "again using a GBA Game Link cable.$"
 
-LilycoveCity_ContestLobby_Text_WhichContestMode: @ 827C8FD
+LilycoveCity_ContestLobby_Text_WhichContestMode:
 	.string "Which CONTEST MODE would you like\n"
 	.string "to enter?$"
 
-ContestHall_Text_GettingStartedWireless: @ 827C929
+ContestHall_Text_GettingStartedWireless:
 	.string "MC: Hello! We're just getting started\n"
 	.string "with a 4-player linked POKéMON\l"
 	.string "{STR_VAR_2}!$"
 
-ContestHall_Text_ParticipantsAsFollows: @ 827C972
+ContestHall_Text_ParticipantsAsFollows:
 	.string "The participating TRAINERS and their\n"
 	.string "POKéMON are as follows:$"
 
-ContestHall_Text_WeveSeenContestants: @ 827C9AF
+ContestHall_Text_WeveSeenContestants:
 	.string "MC: We've just seen the four POKéMON\n"
 	.string "contestants.\p"
 	.string "Now it's time for primary judging!$"
 
-ContestHall_Text_AudienceWillVote: @ 827CA04
+ContestHall_Text_AudienceWillVote:
 	.string "The audience will vote on their\n"
 	.string "favorite POKéMON contestants.$"
 
-ContestHall_Text_LetVotingBegin: @ 827CA42
+ContestHall_Text_LetVotingBegin:
 	.string "Without any further ado,\n"
 	.string "let the voting begin!$"
 
-ContestHall_Text_VotingComplete: @ 827CA71
+ContestHall_Text_VotingComplete:
 	.string "Voting is now complete!\p"
 	.string "While the votes are being tallied,\n"
 	.string "let's move on to secondary judging!$"
 
-ContestHall_Text_SecondStageOfJudging: @ 827CAD0
+ContestHall_Text_SecondStageOfJudging:
 	.string "The second stage of judging is\n"
 	.string "the much-anticipated appeal time!\p"
 	.string "May the contestants amaze us with\n"
 	.string "superb appeals of dazzling moves!$"
 
-ContestHall_Text_LetsAppeal: @ 827CB55
+ContestHall_Text_LetsAppeal:
 	.string "Let's see a little enthusiasm!\n"
 	.string "Let's appeal!$"
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index ea8552510..f5c023147 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -1,6 +1,6 @@
 .set LOCALID_DAYCARE_LADY, 1
 
-Route117_EventScript_DaycareMan:: @ 8291C18
+Route117_EventScript_DaycareMan::
 	lock
 	faceplayer
 	special GetDaycareMonNicknames
@@ -15,7 +15,7 @@ Route117_EventScript_DaycareMan:: @ 8291C18
 	release
 	end
 
-Route117_EventScript_DaycareEggWaiting:: @ 8291C4D
+Route117_EventScript_DaycareEggWaiting::
 	msgbox Route117_Text_DoYouWantEgg, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route117_EventScript_DaycareAcceptEgg
@@ -28,7 +28,7 @@ Route117_EventScript_DaycareEggWaiting:: @ 8291C4D
 	release
 	end
 
-Route117_EventScript_DaycareAcceptEgg:: @ 8291C83
+Route117_EventScript_DaycareAcceptEgg::
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_ne Route117_EventScript_DaycareReceiveEgg
@@ -36,7 +36,7 @@ Route117_EventScript_DaycareAcceptEgg:: @ 8291C83
 	release
 	end
 
-Route117_EventScript_DaycareReceiveEgg:: @ 8291C9D
+Route117_EventScript_DaycareReceiveEgg::
 	message Route117_Text_ReceivedEgg
 	playfanfare MUS_LEVEL_UP
 	waitfanfare
@@ -47,17 +47,17 @@ Route117_EventScript_DaycareReceiveEgg:: @ 8291C9D
 	release
 	end
 
-Route117_EventScript_CheckMonReceivedMail:: @ 8291CB7
+Route117_EventScript_CheckMonReceivedMail::
 	specialvar VAR_RESULT, CheckDaycareMonReceivedMail
 	compare VAR_RESULT, 1
 	call_if_eq Route117_EventScript_MonReceivedMail
 	return
 
-Route117_EventScript_MonReceivedMail:: @ 8291CC8
+Route117_EventScript_MonReceivedMail::
 	msgbox Route117_Text_FriendlyWithOtherTrainersMon, MSGBOX_DEFAULT
 	return
 
-Route117_EventScript_CheckOnOneMon:: @ 8291CD1
+Route117_EventScript_CheckOnOneMon::
 	special GetDaycareMonNicknames
 	msgbox Route117_Text_YourMonIsDoingFine, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 0
@@ -65,7 +65,7 @@ Route117_EventScript_CheckOnOneMon:: @ 8291CD1
 	release
 	end
 
-Route117_EventScript_CheckOnTwoMons:: @ 8291CE8
+Route117_EventScript_CheckOnTwoMons::
 	special GetDaycareMonNicknames
 	msgbox Route117_Text_YourMonsAreDoingFine, MSGBOX_DEFAULT
 	special SetDaycareCompatibilityString
@@ -79,7 +79,7 @@ Route117_EventScript_CheckOnTwoMons:: @ 8291CE8
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11
+Route117_PokemonDayCare_EventScript_DaycareWoman::
 	lock
 	faceplayer
 	specialvar VAR_RESULT, GetDaycareState
@@ -96,7 +96,7 @@ Route117_PokemonDayCare_EventScript_DaycareWoman:: @ 8291D11
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_GiveMonToRaise:: @ 8291D56
+Route117_PokemonDayCare_EventScript_GiveMonToRaise::
 	specialvar VAR_RESULT, CountPartyNonEggMons
 	compare VAR_RESULT, 1
 	goto_if_eq Route117_PokemonDayCare_EventScript_OnlyOneMon
@@ -125,49 +125,49 @@ Route117_PokemonDayCare_EventScript_GiveMonToRaise:: @ 8291D56
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_ComeAgain:: @ 8291DCA
+Route117_PokemonDayCare_EventScript_ComeAgain::
 	msgbox Route117_PokemonDayCare_Text_ComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_CanRaiseOneMore:: @ 8291DD4
+Route117_PokemonDayCare_EventScript_CanRaiseOneMore::
 	msgbox Route117_PokemonDayCare_Text_WeCanRaiseOneMore, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_GiveMonToRaise
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
 
-Route117_PokemonDayCare_EventScript_OnlyOneMon:: @ 8291DED
+Route117_PokemonDayCare_EventScript_OnlyOneMon::
 	msgbox Route117_PokemonDayCare_Text_YouHaveJustOneMon, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_OnlyOneAliveMon:: @ 8291DF7
+Route117_PokemonDayCare_EventScript_OnlyOneAliveMon::
 	msgbox Route117_PokemonDayCare_Text_WhatWillYouBattleWith, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons:: @ 8291E01
+Route117_PokemonDayCare_EventScript_OnlyTwoAliveMons::
 	msgbox Route117_PokemonDayCare_Text_YoullBeLeftWithJustOne, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_EggWaiting:: @ 8291E0B
+Route117_PokemonDayCare_EventScript_EggWaiting::
 	msgbox Route117_PokemonDayCare_Text_HusbandWasLookingForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_YourMonHasGrownXLevels:: @ 8291E15
+Route117_PokemonDayCare_EventScript_YourMonHasGrownXLevels::
 	msgbox Route117_PokemonDayCare_Text_YourMonHasGrownXLevels, MSGBOX_DEFAULT
 	return
 
-Route117_PokemonDayCare_EventScript_DisplayLevelsGained:: @ 8291E1E
+Route117_PokemonDayCare_EventScript_DisplayLevelsGained::
 	specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
 	compare VAR_RESULT, 0
 	call_if_ne Route117_PokemonDayCare_EventScript_YourMonHasGrownXLevels
 	return
 
-Route117_PokemonDayCare_EventScript_OneMonInDaycare:: @ 8291E2F
+Route117_PokemonDayCare_EventScript_OneMonInDaycare::
 	msgbox Route117_PokemonDayCare_Text_GoodToSeeYou, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 0
 	call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
@@ -180,7 +180,7 @@ Route117_PokemonDayCare_EventScript_OneMonInDaycare:: @ 8291E2F
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
 
-Route117_PokemonDayCare_EventScript_TryRetrieveMon:: @ 8291E6D
+Route117_PokemonDayCare_EventScript_TryRetrieveMon::
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq Route117_PokemonDayCare_EventScript_NoRoom
@@ -196,7 +196,7 @@ Route117_PokemonDayCare_EventScript_TryRetrieveMon:: @ 8291E6D
 	goto Route117_PokemonDayCare_EventScript_CostPrompt
 	end
 
-Route117_PokemonDayCare_EventScript_CostPrompt:: @ 8291EAC
+Route117_PokemonDayCare_EventScript_CostPrompt::
 	special GetDaycareCost
 	msgbox Route117_PokemonDayCare_Text_ItWillCostX, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -204,7 +204,7 @@ Route117_PokemonDayCare_EventScript_CostPrompt:: @ 8291EAC
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
 
-Route117_PokemonDayCare_EventScript_CheckEnoughMoney:: @ 8291EC8
+Route117_PokemonDayCare_EventScript_CheckEnoughMoney::
 	specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
 	compare VAR_RESULT, 1
 	goto_if_eq Route117_PokemonDayCare_EventScript_RetrieveMon
@@ -212,7 +212,7 @@ Route117_PokemonDayCare_EventScript_CheckEnoughMoney:: @ 8291EC8
 	release
 	end
 
-Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2
+Route117_PokemonDayCare_EventScript_RetrieveMon::
 	applymovement LOCALID_DAYCARE_LADY, Route117_PokemonDayCare_Movement_RetrieveDaycareMon
 	waitmovement 0
 	specialvar VAR_RESULT, TakePokemonFromDaycare
@@ -229,19 +229,19 @@ Route117_PokemonDayCare_EventScript_RetrieveMon:: @ 8291EE2
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
 
-Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon:: @ 8291F24
+Route117_PokemonDayCare_EventScript_AskRetrieveOtherMon::
 	msgbox Route117_PokemonDayCare_Text_TakeOtherOneBackToo, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq Route117_PokemonDayCare_EventScript_TryRetrieveMon
 	goto Route117_PokemonDayCare_EventScript_ComeAgain
 	end
 
-Route117_PokemonDayCare_EventScript_NoRoom:: @ 8291F3D
+Route117_PokemonDayCare_EventScript_NoRoom::
 	msgbox Route117_PokemonDayCare_Text_YourTeamIsFull, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_PokemonDayCare_Movement_RetrieveDaycareMon: @ 8291F47
+Route117_PokemonDayCare_Movement_RetrieveDaycareMon:
 	delay_16
 	delay_16
 	face_left
@@ -264,10 +264,10 @@ Route117_PokemonDayCare_Movement_RetrieveDaycareMon: @ 8291F47
 	step_end
 
 @ Unused. Possibly a commented script, or a typo end added to the above Movement script
-Route117_PokemonDayCare_EventScript_UnusedEnd:: @ 8291F5B
+Route117_PokemonDayCare_EventScript_UnusedEnd::
 	end
 
-Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
+Route117_PokemonDayCare_EventScript_TwoMonsInDaycare::
 	msgbox Route117_PokemonDayCare_Text_GoodToSeeYou, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 0
 	call Route117_PokemonDayCare_EventScript_DisplayLevelsGained
@@ -281,7 +281,7 @@ Route117_PokemonDayCare_EventScript_TwoMonsInDaycare:: @ 8291F5C
 	end
 
 @ Unused
-Route117_PokemonDayCare_EventScript_UnusedRetrieveMon:: @ 8291F95
+Route117_PokemonDayCare_EventScript_UnusedRetrieveMon::
 	special ShowDaycareLevelMenu
 	waitstate
 	compare VAR_RESULT, 2
@@ -293,7 +293,7 @@ Route117_PokemonDayCare_EventScript_UnusedRetrieveMon:: @ 8291F95
 	release
 	end
 
-EventScript_EggHatch:: @ 8291FC0
+EventScript_EggHatch::
 	lockall
 	msgbox Text_EggHatchHuh, MSGBOX_DEFAULT
 	special EggHatch
@@ -301,14 +301,14 @@ EventScript_EggHatch:: @ 8291FC0
 	releaseall
 	end
 
-Route117_Text_SeeWifeIfYoudLikeMeToRaiseMon: @ 8291FCF
+Route117_Text_SeeWifeIfYoudLikeMeToRaiseMon:
 	.string "I'm the DAY-CARE MAN.\p"
 	.string "I help take care of the precious\n"
 	.string "POKéMON of TRAINERS.\p"
 	.string "If you'd like me to raise your POKéMON,\n"
 	.string "have a word with my wife.$"
 
-Route117_Text_DoYouWantEgg: @ 829205D
+Route117_Text_DoYouWantEgg:
 	.string "Ah, it's you!\p"
 	.string "We were raising your POKéMON,\n"
 	.string "and my goodness, were we surprised!\p"
@@ -317,26 +317,26 @@ Route117_Text_DoYouWantEgg: @ 829205D
 	.string "but your POKéMON had it.\p"
 	.string "You do want it, yes?$"
 
-Route117_Text_YourMonIsDoingFine: @ 8292114
+Route117_Text_YourMonIsDoingFine:
 	.string "Ah, it's you! Good to see you.\n"
 	.string "Your {STR_VAR_1}'s doing fine.$"
 
-Route117_Text_IllKeepIt: @ 8292149
+Route117_Text_IllKeepIt:
 	.string "Well then, I'll keep it.\n"
 	.string "Thanks!$"
 
-Route117_Text_YouHaveNoRoomForIt: @ 829216A
+Route117_Text_YouHaveNoRoomForIt:
 	.string "You have no room for it…\n"
 	.string "Come back when you've made room.$"
 
-Route117_Text_ReceivedEgg: @ 82921A4
+Route117_Text_ReceivedEgg:
 	.string "{PLAYER} received the EGG from\n"
 	.string "the DAY-CARE MAN.$"
 
-Route117_Text_TakeGoodCareOfIt: @ 82921CF
+Route117_Text_TakeGoodCareOfIt:
 	.string "Take good care of it.$"
 
-Route117_Text_FriendlyWithOtherTrainersMon: @ 82921E5
+Route117_Text_FriendlyWithOtherTrainersMon:
 	.string "By the way, about your {STR_VAR_1},\n"
 	.string "it seemed to be friendly with\l"
 	.string "{STR_VAR_2}'s {STR_VAR_3}.\p"
@@ -344,99 +344,99 @@ Route117_Text_FriendlyWithOtherTrainersMon: @ 82921E5
 	.string "a piece of MAIL.$"
 
 @ Unused
-Route117_Text_SeeWifeIfYouWantToPickUpMon: @ 829225A
+Route117_Text_SeeWifeIfYouWantToPickUpMon:
 	.string "If you want to pick up your POKéMON,\n"
 	.string "have a word with my wife.$"
 
-Route117_Text_YourMonsAreDoingFine: @ 8292299
+Route117_Text_YourMonsAreDoingFine:
 	.string "Ah, it's you! Your {STR_VAR_1} and\n"
 	.string "{STR_VAR_2} are doing fine.$"
 
-Route117_Text_IWillKeepDoYouWantIt: @ 82922C6
+Route117_Text_IWillKeepDoYouWantIt:
 	.string "I really will keep it.\n"
 	.string "You do want this, yes?$"
 
-Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon: @ 82922F4
+Route117_PokemonDayCare_Text_WouldYouLikeUsToRaiseAMon:
 	.string "I'm the DAY-CARE LADY.\p"
 	.string "We can raise POKéMON for you.\p"
 	.string "Would you like us to raise one?$"
 
-Route117_PokemonDayCare_Text_WhichMonShouldWeRaise: @ 8292349
+Route117_PokemonDayCare_Text_WhichMonShouldWeRaise:
 	.string "Which POKéMON should we raise for\n"
 	.string "you?$"
 
-Route117_PokemonDayCare_Text_WellRaiseYourMon: @ 8292370
+Route117_PokemonDayCare_Text_WellRaiseYourMon:
 	.string "Fine, we'll raise your {STR_VAR_1}\n"
 	.string "for a while.\p"
 	.string "Come back for it later.$"
 
-Route117_PokemonDayCare_Text_WeCanRaiseOneMore: @ 82923AF
+Route117_PokemonDayCare_Text_WeCanRaiseOneMore:
 	.string "We can raise two of your POKéMON.\n"
 	.string "Would you like us to raise one more?$"
 
-Route117_PokemonDayCare_Text_HusbandWasLookingForYou: @ 82923F6
+Route117_PokemonDayCare_Text_HusbandWasLookingForYou:
 	.string "My husband was looking for you.$"
 
-Route117_PokemonDayCare_Text_FineThenComeAgain: @ 8292416
+Route117_PokemonDayCare_Text_FineThenComeAgain:
 	.string "Oh, fine, then.\n"
 	.string "Come again.$"
 
-Route117_PokemonDayCare_Text_NotEnoughMoney: @ 8292432
+Route117_PokemonDayCare_Text_NotEnoughMoney:
 	.string "You don't have enough money…$"
 
-Route117_PokemonDayCare_Text_TakeOtherOneBackToo: @ 829244F
+Route117_PokemonDayCare_Text_TakeOtherOneBackToo:
 	.string "Will you take back the other one,\n"
 	.string "too?$"
 
-Route117_PokemonDayCare_Text_ComeAgain: @ 8292476
+Route117_PokemonDayCare_Text_ComeAgain:
 	.string "Fine.\n"
 	.string "Come again.$"
 
-Route117_PokemonDayCare_Text_GoodToSeeYou: @ 8292488
+Route117_PokemonDayCare_Text_GoodToSeeYou:
 	.string "Ah, it's you! Good to see you.\n"
 	.string "Your POKéMON can only be doing good!$"
 
-Route117_PokemonDayCare_Text_YourMonHasGrownXLevels: @ 82924CC
+Route117_PokemonDayCare_Text_YourMonHasGrownXLevels:
 	.string "By level, your {STR_VAR_1} has\n"
 	.string "grown by {STR_VAR_2}.$"
 
-Route117_PokemonDayCare_Text_YourTeamIsFull: @ 82924EF
+Route117_PokemonDayCare_Text_YourTeamIsFull:
 	.string "Your POKéMON team is full.\n"
 	.string "Make room, then come see me.$"
 
 @ Unused
-Route117_PokemonDayCare_Text_TakeBackWhichMon: @ 8292527
+Route117_PokemonDayCare_Text_TakeBackWhichMon:
 	.string "Which POKéMON will you take back?$"
 
-Route117_PokemonDayCare_Text_ItWillCostX: @ 8292549
+Route117_PokemonDayCare_Text_ItWillCostX:
 	.string "If you want your {STR_VAR_1} back,\n"
 	.string "it will cost ¥{STR_VAR_2}.$"
 
-Route117_PokemonDayCare_Text_HeresYourMon: @ 8292575
+Route117_PokemonDayCare_Text_HeresYourMon:
 	.string "Perfect!\n"
 	.string "Here's your POKéMON.$"
 
-Route117_PokemonDayCare_Text_TookBackMon: @ 8292593
+Route117_PokemonDayCare_Text_TookBackMon:
 	.string "{PLAYER} took back {STR_VAR_1} from\n"
 	.string "the DAY-CARE LADY.$"
 
-Route117_PokemonDayCare_Text_YouHaveJustOneMon: @ 82925BB
+Route117_PokemonDayCare_Text_YouHaveJustOneMon:
 	.string "Oh? But you have just one\n"
 	.string "POKéMON.\p"
 	.string "Come back another time.$"
 
-Route117_PokemonDayCare_Text_TakeYourMonBack: @ 82925F6
+Route117_PokemonDayCare_Text_TakeYourMonBack:
 	.string "Will you take your POKéMON back?$"
 
-Route117_PokemonDayCare_Text_WhatWillYouBattleWith: @ 8292617
+Route117_PokemonDayCare_Text_WhatWillYouBattleWith:
 	.string "If you leave me that POKéMON,\n"
 	.string "what will you battle with?\p"
 	.string "Come back another time.$"
 
-Text_EggHatchHuh: @ 8292668
+Text_EggHatchHuh:
 	.string "Huh?$"
 
-Route117_PokemonDayCare_Text_YoullBeLeftWithJustOne: @ 829266D
+Route117_PokemonDayCare_Text_YoullBeLeftWithJustOne:
 	.string "Huh?\n"
 	.string "Now, now.\p"
 	.string "If you leave that POKéMON with\n"
diff --git a/data/scripts/elite_four.inc b/data/scripts/elite_four.inc
index f4eb6393b..0ae319061 100644
--- a/data/scripts/elite_four.inc
+++ b/data/scripts/elite_four.inc
@@ -1,4 +1,4 @@
-PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
+PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_Delay32
 	waitmovement 0
 	playse SE_DOOR
@@ -17,7 +17,7 @@ PokemonLeague_EliteFour_SetAdvanceToNextRoomMetatiles:: @ 82723F8
 	special DrawWholeMapView
 	return
 
-PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
+PokemonLeague_EliteFour_EventScript_WalkInCloseDoor::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkUp6
 	waitmovement 0
 	playse SE_TRUCK_DOOR
@@ -31,7 +31,7 @@ PokemonLeague_EliteFour_EventScript_WalkInCloseDoor:: @ 8272475
 	return
 
 @ Essentially unused, only necessary when re-entering an Elite Four room after defeating the member, which isnt normally possible
-PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 82724BC
+PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom::
 	setmetatile 6, 1, METATILE_EliteFour_OpenDoor_Frame, 0
 	setmetatile 6, 2, METATILE_EliteFour_OpenDoor_Opening, 0
 	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
@@ -52,7 +52,7 @@ PokemonLeague_EliteFour_EventScript_ResetAdvanceToNextRoom:: @ 82724BC
 	setmetatile 12, 2, METATILE_EliteFour_LeftSpotlightOff, 1
 	return
 
-PokemonLeague_EliteFour_EventScript_CloseDoor:: @ 827255F
+PokemonLeague_EliteFour_EventScript_CloseDoor::
 	setmetatile 5, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
 	setmetatile 6, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
 	setmetatile 7, 12, METATILE_EliteFour_EntryDoor_ClosedTop, 1
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 2d689348b..b81ca21dd 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -1,5 +1,5 @@
 @ Interact with cuttable tree
-EventScript_CutTree:: @ 82906BB
+EventScript_CutTree::
 	lockall
 	goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
 	checkpartymove MOVE_CUT
@@ -19,48 +19,48 @@ EventScript_CutTree:: @ 82906BB
 	end
 
 @ Use cut from party menu
-EventScript_UseCut:: @ 8290705
+EventScript_UseCut::
 	lockall
 	dofieldeffect FLDEFF_USE_CUT_ON_TREE
 	waitstate
 	goto EventScript_CutTreeDown
 	end
 
-EventScript_CutTreeDown:: @ 8290710
+EventScript_CutTreeDown::
 	applymovement VAR_LAST_TALKED, Movement_CutTreeDown
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
 	releaseall
 	end
 
-Movement_CutTreeDown: @ 829071F
+Movement_CutTreeDown:
 	cut_tree
 	step_end
 
-EventScript_CheckTreeCantCut:: @ 8290721
+EventScript_CheckTreeCantCut::
 	msgbox Text_CantCut, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_CancelCut:: @ 829072B
+EventScript_CancelCut::
 	closemessage
 	releaseall
 	end
 
-Text_WantToCut: @ 829072E
+Text_WantToCut:
 	.string "This tree looks like it can be\n"
 	.string "CUT down!\p"
 	.string "Would you like to CUT it?$"
 
-Text_MonUsedFieldMove: @ 8290771
+Text_MonUsedFieldMove:
 	.string "{STR_VAR_1} used {STR_VAR_2}!$"
 
-Text_CantCut: @ 829077D
+Text_CantCut:
 	.string "This tree looks like it can be\n"
 	.string "CUT down!$"
 
 @ Interact with smashable rock
-EventScript_RockSmash:: @ 82907A6
+EventScript_RockSmash::
 	lockall
 	goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
 	checkpartymove MOVE_ROCK_SMASH
@@ -80,14 +80,14 @@ EventScript_RockSmash:: @ 82907A6
 	end
 
 @ Use rock smash from party menu
-EventScript_UseRockSmash:: @ 82907F0
+EventScript_UseRockSmash::
 	lockall
 	dofieldeffect FLDEFF_USE_ROCK_SMASH
 	waitstate
 	goto EventScript_SmashRock
 	end
 
-EventScript_SmashRock:: @ 82907FB
+EventScript_SmashRock::
 	applymovement VAR_LAST_TALKED, Movement_SmashRock
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
@@ -101,33 +101,33 @@ EventScript_SmashRock:: @ 82907FB
 	releaseall
 	end
 
-EventScript_EndSmash:: @ 8290829
+EventScript_EndSmash::
 	releaseall
 	end
 
-Movement_SmashRock: @ 829082B
+Movement_SmashRock:
 	rock_smash_break
 	step_end
 
-EventScript_CantSmashRock:: @ 829082D
+EventScript_CantSmashRock::
 	msgbox Text_CantSmash, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_CancelSmash:: @ 8290837
+EventScript_CancelSmash::
 	closemessage
 	releaseall
 	end
 
-Text_WantToSmash: @ 829083A
+Text_WantToSmash:
 	.string "This rock appears to be breakable.\n"
 	.string "Would you like to use ROCK SMASH?$"
 
-Text_CantSmash: @ 829087F
+Text_CantSmash:
 	.string "It's a rugged rock, but a POKéMON\n"
 	.string "may be able to smash it.$"
 
-EventScript_StrengthBoulder:: @ 82908BA
+EventScript_StrengthBoulder::
 	lockall
 	goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
 	goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
@@ -144,53 +144,53 @@ EventScript_StrengthBoulder:: @ 82908BA
 	goto EventScript_ActivateStrength
 	end
 
-EventScript_UseStrength:: @ 82908FD
+EventScript_UseStrength::
 	lockall
 	dofieldeffect FLDEFF_USE_STRENGTH
 	waitstate
 	goto EventScript_ActivateStrength
 	end
 
-EventScript_ActivateStrength:: @ 8290908
+EventScript_ActivateStrength::
 	setflag FLAG_SYS_USE_STRENGTH
 	msgbox Text_MonUsedStrength, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_CantStrength:: @ 8290915
+EventScript_CantStrength::
 	msgbox Text_CantStrength, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_CheckActivatedBoulder:: @ 829091F
+EventScript_CheckActivatedBoulder::
 	msgbox Text_StrengthActivated, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_CancelStrength:: @ 8290929
+EventScript_CancelStrength::
 	closemessage
 	releaseall
 	end
 
-Text_WantToStrength: @ 829092C
+Text_WantToStrength:
 	.string "It's a big boulder, but a POKéMON\n"
 	.string "may be able to push it aside.\p"
 	.string "Would you like to use STRENGTH?$"
 
-Text_MonUsedStrength: @ 829098C
+Text_MonUsedStrength:
 	.string "{STR_VAR_1} used STRENGTH!\p"
 	.string "{STR_VAR_1}'s STRENGTH made it\n"
 	.string "possible to move boulders around!$"
 
-Text_CantStrength: @ 82909D6
+Text_CantStrength:
 	.string "It's a big boulder, but a POKéMON\n"
 	.string "may be able to push it aside.$"
 
-Text_StrengthActivated: @ 8290A16
+Text_StrengthActivated:
 	.string "STRENGTH made it possible to move\n"
 	.string "boulders around.$"
 
-EventScript_UseWaterfall:: @ 8290A49
+EventScript_UseWaterfall::
 	lockall
 	checkpartymove MOVE_WATERFALL
 	compare VAR_RESULT, PARTY_SIZE
@@ -204,28 +204,28 @@ EventScript_UseWaterfall:: @ 8290A49
 	dofieldeffect FLDEFF_USE_WATERFALL
 	goto EventScript_EndWaterfall
 
-EventScript_CannotUseWaterfall:: @ 8290A83
+EventScript_CannotUseWaterfall::
 	lockall
 
-EventScript_CantWaterfall:: @ 8290A84
+EventScript_CantWaterfall::
 	msgbox Text_CantWaterfall, MSGBOX_DEFAULT
 
-EventScript_EndWaterfall:: @ 8290A8C
+EventScript_EndWaterfall::
 	releaseall
 	end
 
-Text_CantWaterfall: @ 8290A8E
+Text_CantWaterfall:
 	.string "A wall of water is crashing down with\n"
 	.string "a mighty roar.$"
 
-Text_WantToWaterfall: @ 8290AC3
+Text_WantToWaterfall:
 	.string "It's a large waterfall.\n"
 	.string "Would you like to use WATERFALL?$"
 
-Text_MonUsedWaterfall: @ 8290AFC
+Text_MonUsedWaterfall:
 	.string "{STR_VAR_1} used WATERFALL.$"
 
-EventScript_UseDive:: @ 8290B0F
+EventScript_UseDive::
 	lockall
 	checkpartymove MOVE_DIVE
 	compare VAR_RESULT, PARTY_SIZE
@@ -241,16 +241,16 @@ EventScript_UseDive:: @ 8290B0F
 	goto EventScript_EndDive
 	end
 
-EventScript_CantDive:: @ 8290B4E
+EventScript_CantDive::
 	msgbox Text_CantDive, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_EndDive:: @ 8290B58
+EventScript_EndDive::
 	releaseall
 	end
 
-EventScript_UseDiveUnderwater:: @ 8290B5A
+EventScript_UseDiveUnderwater::
 	lockall
 	checkpartymove MOVE_DIVE
 	compare VAR_RESULT, PARTY_SIZE
@@ -266,38 +266,38 @@ EventScript_UseDiveUnderwater:: @ 8290B5A
 	goto EventScript_EndSurface
 	end
 
-EventScript_CantSurface:: @ 8290B99
+EventScript_CantSurface::
 	lockall
 	msgbox Text_CantSurface, MSGBOX_DEFAULT
 	goto EventScript_EndSurface
 	end
 
-EventScript_EndSurface:: @ 8290BA8
+EventScript_EndSurface::
 	releaseall
 	end
 
-Text_CantDive: @ 8290BAA
+Text_CantDive:
 	.string "The sea is deep here. A POKéMON\n"
 	.string "may be able to go underwater.$"
 
-Text_WantToDive: @ 8290BE8
+Text_WantToDive:
 	.string "The sea is deep here.\n"
 	.string "Would you like to use DIVE?$"
 
-Text_MonUsedDive: @ 8290C1A
+Text_MonUsedDive:
 	.string "{STR_VAR_1} used DIVE.$"
 
-Text_CantSurface: @ 8290C28
+Text_CantSurface:
 	.string "Light is filtering down from above.\n"
 	.string "A POKéMON may be able to surface.$"
 
-Text_WantToSurface: @ 8290C6E
+Text_WantToSurface:
 	.string "Light is filtering down from above.\n"
 	.string "Would you like to use DIVE?$"
 
-EventScript_FailSweetScent:: @ 8290CAE
+EventScript_FailSweetScent::
 	msgbox Text_FailSweetScent, MSGBOX_SIGN
 	end
 
-Text_FailSweetScent: @ 8290CB7
+Text_FailSweetScent:
 	.string "Looks like there's nothing here…$"
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index 3ce36b384..a4f9b90b6 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -1,4 +1,4 @@
-EventScript_FieldPoison:: @ 82736BC
+EventScript_FieldPoison::
 	lockall
 	special TryFieldPoisonWhiteOut
 	waitstate
@@ -9,7 +9,7 @@ EventScript_FieldPoison:: @ 82736BC
 	releaseall
 	end
 
-EventScript_FieldWhiteOut:: @ 82736D9
+EventScript_FieldWhiteOut::
 	message gText_PlayerWhitedOut
 	waitmessage
 	waitbuttonpress
@@ -21,11 +21,11 @@ EventScript_FieldWhiteOut:: @ 82736D9
 	waitstate
 	end
 
-EventScript_SetRespawnLavaridgePkmnCenter:: @ 82736F4
+EventScript_SetRespawnLavaridgePkmnCenter::
 	setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
 	return
 
-EventScript_FrontierFieldWhiteOut:: @ 82736F8
+EventScript_FrontierFieldWhiteOut::
 	message gText_PlayerWhitedOut
 	waitmessage
 	waitbuttonpress
diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc
index bb4ae84eb..a69975a16 100644
--- a/data/scripts/flash.inc
+++ b/data/scripts/flash.inc
@@ -1,4 +1,4 @@
-EventScript_UseFlash:: @ 82926F8
+EventScript_UseFlash::
 	animateflash 1
 	setflashradius 1
 	end
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 60854a801..baee6c96f 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -1,7 +1,7 @@
 @ Gabby and Ty always move to the same spots for the first 5 battles
 @ From the 6th battle onwards, they move randomly between locations 6-8
 @ Note: The local IDs of Gabby and Ty are hard-coded in GetGabbyAndTyLocalIds
-GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7
+GabbyAndTy_EventScript_UpdateLocation::
 	cleartrainerflag TRAINER_GABBY_AND_TY_6
 	specialvar VAR_RESULT, GabbyAndTyGetBattleNum
 	switch VAR_RESULT
@@ -16,187 +16,187 @@ GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7
 	case 8, GabbyAndTy_EventScript_MoveForBattle9
 	end
 
-GabbyAndTy_EventScript_MoveForBattle1:: @ 828CD38
+GabbyAndTy_EventScript_MoveForBattle1::
 	call GabbyAndTy_EventScript_ShowAtRoute111_1
 	return
 
-GabbyAndTy_EventScript_MoveForBattle2:: @ 828CD3E
+GabbyAndTy_EventScript_MoveForBattle2::
 	call GabbyAndTy_EventScript_ShowAtRoute118_1
 	call GabbyAndTy_EventScript_HideAtRoute111_1
 	return
 
-GabbyAndTy_EventScript_MoveForBattle3:: @ 828CD49
+GabbyAndTy_EventScript_MoveForBattle3::
 	call GabbyAndTy_EventScript_ShowAtRoute120_1
 	call GabbyAndTy_EventScript_HideAtRoute118_1
 	return
 
-GabbyAndTy_EventScript_MoveForBattle4:: @ 828CD54
+GabbyAndTy_EventScript_MoveForBattle4::
 	call GabbyAndTy_EventScript_ShowAtRoute111_3
 	call GabbyAndTy_EventScript_HideAtRoute120_1
 	return
 
-GabbyAndTy_EventScript_MoveForBattle5:: @ 828CD5F
+GabbyAndTy_EventScript_MoveForBattle5::
 	call GabbyAndTy_EventScript_ShowAtRoute118_2
 	call GabbyAndTy_EventScript_HideAtRoute111_3
 	return
 
-GabbyAndTy_EventScript_MoveForBattle6:: @ 828CD6A
+GabbyAndTy_EventScript_MoveForBattle6::
 	call GabbyAndTy_EventScript_ShowAtRoute120_2
 	call GabbyAndTy_EventScript_HideAtRoute118_2
 	return
 
-GabbyAndTy_EventScript_MoveForBattle7:: @ 828CD75
+GabbyAndTy_EventScript_MoveForBattle7::
 	call GabbyAndTy_EventScript_ShowAtRoute111_2
 	call GabbyAndTy_EventScript_HideAtRoute120_2
 	return
 
-GabbyAndTy_EventScript_MoveForBattle8:: @ 828CD80
+GabbyAndTy_EventScript_MoveForBattle8::
 	call GabbyAndTy_EventScript_ShowAtRoute118_3
 	call GabbyAndTy_EventScript_HideAtRoute111_2
 	return
 
-GabbyAndTy_EventScript_MoveForBattle9:: @ 828CD8B
+GabbyAndTy_EventScript_MoveForBattle9::
 	call GabbyAndTy_EventScript_ShowAtRoute120_2
 	call GabbyAndTy_EventScript_HideAtRoute118_3
 	return
 
-GabbyAndTy_EventScript_HideAtRoute111_1:: @ 828CD96
+GabbyAndTy_EventScript_HideAtRoute111_1::
 	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
 	return
 
-GabbyAndTy_EventScript_ShowAtRoute111_1:: @ 828CD9A
+GabbyAndTy_EventScript_ShowAtRoute111_1::
 	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
 	return
 
-GabbyAndTy_EventScript_HideAtRoute118_1:: @ 828CD9E
+GabbyAndTy_EventScript_HideAtRoute118_1::
 	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	return
 
-GabbyAndTy_EventScript_ShowAtRoute118_1:: @ 828CDA2
+GabbyAndTy_EventScript_ShowAtRoute118_1::
 	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	return
 
-GabbyAndTy_EventScript_HideAtRoute120_1:: @ 828CDA6
+GabbyAndTy_EventScript_HideAtRoute120_1::
 	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
 	return
 
-GabbyAndTy_EventScript_ShowAtRoute120_1:: @ 828CDAA
+GabbyAndTy_EventScript_ShowAtRoute120_1::
 	clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
 	return
 
-GabbyAndTy_EventScript_HideAtRoute111_3:: @ 828CDAE
+GabbyAndTy_EventScript_HideAtRoute111_3::
 	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
 	return
 
-GabbyAndTy_EventScript_ShowAtRoute111_3:: @ 828CDB2
+GabbyAndTy_EventScript_ShowAtRoute111_3::
 	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
 	return
 
-GabbyAndTy_EventScript_HideAtRoute118_2:: @ 828CDB6
+GabbyAndTy_EventScript_HideAtRoute118_2::
 	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
 	return
 
-GabbyAndTy_EventScript_ShowAtRoute118_2:: @ 828CDBA
+GabbyAndTy_EventScript_ShowAtRoute118_2::
 	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
 	return
 
-GabbyAndTy_EventScript_HideAtRoute120_2:: @ 828CDBE
+GabbyAndTy_EventScript_HideAtRoute120_2::
 	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
 	return
 
-GabbyAndTy_EventScript_ShowAtRoute120_2:: @ 828CDC2
+GabbyAndTy_EventScript_ShowAtRoute120_2::
 	clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
 	return
 
-GabbyAndTy_EventScript_HideAtRoute111_2:: @ 828CDC6
+GabbyAndTy_EventScript_HideAtRoute111_2::
 	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
 	return
 
-GabbyAndTy_EventScript_ShowAtRoute111_2:: @ 828CDCA
+GabbyAndTy_EventScript_ShowAtRoute111_2::
 	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
 	return
 
-GabbyAndTy_EventScript_HideAtRoute118_3:: @ 828CDCE
+GabbyAndTy_EventScript_HideAtRoute118_3::
 	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	return
 
-GabbyAndTy_EventScript_ShowAtRoute118_3:: @ 828CDD2
+GabbyAndTy_EventScript_ShowAtRoute118_3::
 	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	return
 
-GabbyAndTy_EventScript_GabbyBattle1:: @ 828CDD6
+GabbyAndTy_EventScript_GabbyBattle1::
 	trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_GabbyPreFirstBattle, GabbyAndTy_Text_GabbyDefeatFirstTime, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview
 	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_TyBattle1:: @ 828CDF6
+GabbyAndTy_EventScript_TyBattle1::
 	trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_TyPreFirstBattle, GabbyAndTy_Text_TyDefeatFirstTime, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview
 	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_GabbyBattle2:: @ 828CE16
+GabbyAndTy_EventScript_GabbyBattle2::
 	trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_TyBattle2:: @ 828CE36
+GabbyAndTy_EventScript_TyBattle2::
 	trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_GabbyBattle3:: @ 828CE56
+GabbyAndTy_EventScript_GabbyBattle3::
 	trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_TyBattle3:: @ 828CE76
+GabbyAndTy_EventScript_TyBattle3::
 	trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_GabbyBattle4:: @ 828CE96
+GabbyAndTy_EventScript_GabbyBattle4::
 	trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6
+GabbyAndTy_EventScript_TyBattle4::
 	trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_GabbyBattle5:: @ 828CED6
+GabbyAndTy_EventScript_GabbyBattle5::
 	trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_TyBattle5:: @ 828CEF6
+GabbyAndTy_EventScript_TyBattle5::
 	trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_GabbyBattle6:: @ 828CF16
+GabbyAndTy_EventScript_GabbyBattle6::
 	trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyIntro, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
+GabbyAndTy_EventScript_TyBattle6::
 	trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyIntro, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
+GabbyAndTy_EventScript_FirstInterview::
 	special GabbyAndTyBeforeInterview
 	special GetGabbyAndTyLocalIds
 	compare VAR_FACING, DIR_NORTH
@@ -210,24 +210,24 @@ GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
 	goto GabbyAndTy_EventScript_Interview
 	end
 
-GabbyAndTy_EventScript_FacePlayerNorth:: @ 828CF94
+GabbyAndTy_EventScript_FacePlayerNorth::
 	applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
-GabbyAndTy_EventScript_FacePlayerSouth:: @ 828CF9F
+GabbyAndTy_EventScript_FacePlayerSouth::
 	applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceUp
 	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1
+GabbyAndTy_EventScript_FacePlayerEast::
 	applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceLeft
 	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
+GabbyAndTy_EventScript_RequestInterview::
 	special GabbyAndTyBeforeInterview
 	special GetGabbyAndTyLocalIds
 	compare VAR_FACING, DIR_NORTH
@@ -250,49 +250,49 @@ GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
 	case 4, GabbyAndTy_EventScript_RequestInterviewLostAMon
 	end
 
-GabbyAndTy_Movement_WalkInPlaceDown: @ 828D04D
+GabbyAndTy_Movement_WalkInPlaceDown:
 	walk_in_place_down
 	step_end
 
-GabbyAndTy_Movement_WalkInPlaceUp: @ 828D04F
+GabbyAndTy_Movement_WalkInPlaceUp:
 	walk_in_place_up
 	step_end
 
-GabbyAndTy_Movement_WalkInPlaceLeft: @ 828D051
+GabbyAndTy_Movement_WalkInPlaceLeft:
 	walk_in_place_left
 	step_end
 
-GabbyAndTy_EventScript_DidntInterviewLastTime:: @ 828D053
+GabbyAndTy_EventScript_DidntInterviewLastTime::
 	msgbox GabbyAndTy_Text_GiveUsAnInterviewThisTime, MSGBOX_YESNO
 	goto GabbyAndTy_EventScript_Interview
 	end
 
-GabbyAndTy_EventScript_RequestInterviewNoTrivia:: @ 828D061
+GabbyAndTy_EventScript_RequestInterviewNoTrivia::
 	msgbox GabbyAndTy_Text_InterviewAgain, MSGBOX_YESNO
 	goto GabbyAndTy_EventScript_Interview
 	end
 
-GabbyAndTy_EventScript_RequestInterviewShortBattle:: @ 828D06F
+GabbyAndTy_EventScript_RequestInterviewShortBattle::
 	msgbox GabbyAndTy_Text_YouStompedUsInterviewAgain, MSGBOX_YESNO
 	goto GabbyAndTy_EventScript_Interview
 	end
 
-GabbyAndTy_EventScript_RequestInterviewThrewBall:: @ 828D07D
+GabbyAndTy_EventScript_RequestInterviewThrewBall::
 	msgbox GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain, MSGBOX_YESNO
 	goto GabbyAndTy_EventScript_Interview
 	end
 
-GabbyAndTy_EventScript_RequestInterviewUsedItems:: @ 828D08B
+GabbyAndTy_EventScript_RequestInterviewUsedItems::
 	msgbox GabbyAndTy_Text_CleverItemSkillsInterviewAgain, MSGBOX_YESNO
 	goto GabbyAndTy_EventScript_Interview
 	end
 
-GabbyAndTy_EventScript_RequestInterviewLostAMon:: @ 828D099
+GabbyAndTy_EventScript_RequestInterviewLostAMon::
 	msgbox GabbyAndTy_Text_WeLookedRespectableInterviewAgain, MSGBOX_YESNO
 	goto GabbyAndTy_EventScript_Interview
 	end
 
-GabbyAndTy_EventScript_Interview:: @ 828D0A7
+GabbyAndTy_EventScript_Interview::
 	compare VAR_RESULT, NO
 	goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut
 	msgbox GabbyAndTy_Text_DescribeYourFeelings, MSGBOX_DEFAULT
@@ -308,13 +308,13 @@ GabbyAndTy_EventScript_Interview:: @ 828D0A7
 	release
 	end
 
-GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut:: @ 828D0E1
+GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut::
 	msgbox GabbyAndTy_Text_DontGiveUpKeepingEyeOut, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	release
 	end
 
-GabbyAndTy_EventScript_KeepingAnEyeOutForYou:: @ 828D0EE
+GabbyAndTy_EventScript_KeepingAnEyeOutForYou::
 	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/scripts/hall_of_fame.inc b/data/scripts/hall_of_fame.inc
index 021784f81..9b730de31 100644
--- a/data/scripts/hall_of_fame.inc
+++ b/data/scripts/hall_of_fame.inc
@@ -1,4 +1,4 @@
-EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1
+EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags::
 	special SetChampionSaveWarp
 	setflag FLAG_IS_CHAMPION
 	call EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries
@@ -26,7 +26,7 @@ EverGrandeCity_HallOfFame_EventScript_SetGameClearFlags:: @ 82717C1
 	call_if_eq EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent
 	return
 
-EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829
+EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries::
 	clearflag FLAG_DEFEATED_MEW
 	clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS
 	clearflag FLAG_DEFEATED_DEOXYS
@@ -34,20 +34,20 @@ EverGrandeCity_HallOfFame_EventScript_ResetDefeatedEventLegendaries:: @ 8271829
 	clearflag FLAG_DEFEATED_HO_OH
 	return
 
-EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady:: @ 8271839
+EverGrandeCity_HallOfFame_EventScript_SetDesertUnderpassCommentReady::
 	setvar VAR_FOSSIL_MANIAC_STATE, 1
 	return
 
-EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum:: @ 827183F
+EverGrandeCity_HallOfFame_EventScript_ShowStevensHouseBeldum::
 	clearflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
 	return
 
-EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent:: @ 8271843
+EverGrandeCity_HallOfFame_EventScript_ReadyReceiveSSTicketEvent::
 	setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 3
 	setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 3
 	clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
 	return
 
-EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent:: @ 8271851
+EverGrandeCity_HallOfFame_EventScript_ReadyDexUpgradeEvent::
 	setvar VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 1
 	return
diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc
index 2d1c08196..90fceb9d1 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -1,11 +1,11 @@
-Interview_EventScript_EndInterview:: @ 828C7E9
+Interview_EventScript_EndInterview::
 	special InterviewAfter
 	incrementgamestat GAME_STAT_GOT_INTERVIEWED
 	release
 	end
 
 @ Shares reporter object with TVSHOW_PKMN_FAN_CLUB_OPINIONS
-SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname:: @ 828C7F0
+SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname::
 	setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER
 	special InterviewBefore
 	compare VAR_RESULT, TRUE
@@ -18,7 +18,7 @@ SlateportCity_PokemonFanClub_EventScript_ReporterNoNickname:: @ 828C7F0
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2
 	end
 
-SlateportCity_PokemonFanClub_EventScript_AcceptInterview2:: @ 828C827
+SlateportCity_PokemonFanClub_EventScript_AcceptInterview2::
 	msgbox SlateportCity_PokemonFanClub_Text_TellMeAnythingAboutYourMon, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
@@ -32,23 +32,23 @@ SlateportCity_PokemonFanClub_EventScript_AcceptInterview2:: @ 828C827
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview2
 	end
 
-SlateportCity_PokemonFanClub_EventScript_DeclineInterview2:: @ 828C85C
+SlateportCity_PokemonFanClub_EventScript_DeclineInterview2::
 	msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_SubmitResponse2:: @ 828C866
+SlateportCity_PokemonFanClub_EventScript_SubmitResponse2::
 	msgbox SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TVSHOW_FAN_CLUB_LETTER
 	goto Interview_EventScript_EndInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2:: @ 828C879
+SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed2::
 	msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883
+SlateportCity_OceanicMuseum_1F_EventScript_Reporter::
 	lock
 	faceplayer
 	setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS
@@ -65,7 +65,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_Reporter:: @ 828C883
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort:: @ 828C8C8
+SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_InterviewRequestShort, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview
@@ -73,7 +73,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_RequestInterviewShort:: @ 828C8C8
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview:: @ 828C8E7
+SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_TellMeExperienceInvolvingPokemon, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
@@ -87,23 +87,23 @@ SlateportCity_OceanicMuseum_1F_EventScript_AcceptInterview:: @ 828C8E7
 	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview:: @ 828C91C
+SlateportCity_OceanicMuseum_1F_EventScript_DeclineInterview::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_LetMeKnowIfYouHaveStory, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse:: @ 828C926
+SlateportCity_OceanicMuseum_1F_EventScript_SubmitResponse::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_ThatsAllForInterview, MSGBOX_DEFAULT
 	setvar VAR_0x8005, TVSHOW_RECENT_HAPPENINGS
 	goto Interview_EventScript_EndInterview
 	end
 
-SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed:: @ 828C939
+SlateportCity_OceanicMuseum_1F_EventScript_AlreadyInterviewed::
 	msgbox SlateportCity_OceanicMuseum_1F_Text_BetterWriteUpStory, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943
+SlateportCity_PokemonFanClub_EventScript_Reporter::
 	lock
 	faceplayer
 	specialvar VAR_RESULT, IsLeadMonNicknamedOrNotEnglish
@@ -121,7 +121,7 @@ SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943
 	goto_if_eq SlateportCity_PokemonFanClub_EventScript_DeclineInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_AcceptInterview:: @ 828C98C
+SlateportCity_PokemonFanClub_EventScript_AcceptInterview::
 	msgbox SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers, MSGBOX_DEFAULT
 	random 3
 	copyvar VAR_0x800A, VAR_RESULT
@@ -131,22 +131,22 @@ SlateportCity_PokemonFanClub_EventScript_AcceptInterview:: @ 828C98C
 	case 2, SlateportCity_PokemonFanClub_EventScript_RandomQuestion3
 	end
 
-SlateportCity_PokemonFanClub_EventScript_RandomQuestion1:: @ 828C9C3
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion1::
 	msgbox SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_RandomQuestion2:: @ 828C9D1
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion2::
 	msgbox SlateportCity_PokemonFanClub_Text_LikenMonToSomethingYouLike, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_RandomQuestion3:: @ 828C9DF
+SlateportCity_PokemonFanClub_EventScript_RandomQuestion3::
 	msgbox SlateportCity_PokemonFanClub_Text_WhatAttractedYouAboutMon, MSGBOX_DEFAULT
 	goto SlateportCity_PokemonFanClub_EventScript_ContinueInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_ContinueInterview:: @ 828C9ED
+SlateportCity_PokemonFanClub_EventScript_ContinueInterview::
 	setvar VAR_0x8004, EASY_CHAT_TYPE_FAN_CLUB
 	copyvar VAR_0x8005, VAR_0x8009
 	setvar VAR_0x8006, 0
@@ -168,17 +168,17 @@ SlateportCity_PokemonFanClub_EventScript_ContinueInterview:: @ 828C9ED
 	goto Interview_EventScript_EndInterview
 	end
 
-SlateportCity_PokemonFanClub_EventScript_DeclineInterview:: @ 828CA45
+SlateportCity_PokemonFanClub_EventScript_DeclineInterview::
 	msgbox SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed:: @ 828CA4F
+SlateportCity_PokemonFanClub_EventScript_AlreadyInterviewed::
 	msgbox SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_Reporter:: @ 828CA59
+LilycoveCity_ContestLobby_EventScript_Reporter::
 	lock
 	faceplayer
 	goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed
@@ -194,7 +194,7 @@ LilycoveCity_ContestLobby_EventScript_Reporter:: @ 828CA59
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
 	end
 
-LilycoveCity_ContestLobby_EventScript_AcceptInterview:: @ 828CA9B
+LilycoveCity_ContestLobby_EventScript_AcceptInterview::
 	msgbox LilycoveCity_ContestLobby_Text_DescribeContest, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_CONTEST_INTERVIEW
 	copyvar VAR_0x8005, VAR_0x8009
@@ -208,12 +208,12 @@ LilycoveCity_ContestLobby_EventScript_AcceptInterview:: @ 828CA9B
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_DeclineInterview
 	end
 
-LilycoveCity_ContestLobby_EventScript_DeclineInterview:: @ 828CAD0
+LilycoveCity_ContestLobby_EventScript_DeclineInterview::
 	msgbox LilycoveCity_ContestLobby_Text_PleaseDoShareStoryWithMe, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_SubmitResponse:: @ 828CADA
+LilycoveCity_ContestLobby_EventScript_SubmitResponse::
 	setvar VAR_0x8004, 24
 	special SetContestCategoryStringVarForInterview
 	msgbox LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX, MSGBOX_DEFAULT
@@ -231,12 +231,12 @@ LilycoveCity_ContestLobby_EventScript_SubmitResponse:: @ 828CADA
 	goto Interview_EventScript_EndInterview
 	end
 
-LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed:: @ 828CB21
+LilycoveCity_ContestLobby_EventScript_AlreadyInterviewed::
 	msgbox LilycoveCity_ContestLobby_Text_LookingForwardToNextContest, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B
+LilycoveCity_ContestLobby_EventScript_TryShowContestReporter::
 	compare VAR_CONTEST_HALL_STATE, 2
 	goto_if_ne LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
 	setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE
@@ -252,14 +252,14 @@ LilycoveCity_ContestLobby_EventScript_TryShowContestReporter:: @ 828CB2B
 	case 5, LilycoveCity_ContestLobby_EventScript_DontShowContestReporter
 	end
 
-LilycoveCity_ContestLobby_EventScript_ShowContestReporter:: @ 828CB91
+LilycoveCity_ContestLobby_EventScript_ShowContestReporter::
 	clearflag FLAG_HIDE_LILYCOVE_CONTEST_HALL_REPORTER
 	return
 
-LilycoveCity_ContestLobby_EventScript_DontShowContestReporter:: @ 828CB95
+LilycoveCity_ContestLobby_EventScript_DontShowContestReporter::
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_Reporter:: @ 828CB96
+BattleFrontier_BattleTowerLobby_EventScript_Reporter::
 	lock
 	faceplayer
 	goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed
@@ -275,7 +275,7 @@ BattleFrontier_BattleTowerLobby_EventScript_Reporter:: @ 828CB96
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview:: @ 828CBD8
+BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview::
 	message BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut
 	waitmessage
 	multichoice 20, 8, MULTI_SATISFACTION, TRUE
@@ -296,20 +296,20 @@ BattleFrontier_BattleTowerLobby_EventScript_AcceptInterview:: @ 828CBD8
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview:: @ 828CC2E
+BattleFrontier_BattleTowerLobby_EventScript_DeclineInterview::
 	msgbox BattleFrontier_BattleTowerLobby_Text_SorryWeDisturbedYou, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_Satisfied:: @ 828CC38
+BattleFrontier_BattleTowerLobby_EventScript_Satisfied::
 	msgbox BattleFrontier_BattleTowerLobby_Text_ObviousYouHadGreatBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied:: @ 828CC41
+BattleFrontier_BattleTowerLobby_EventScript_Dissatisfied::
 	msgbox BattleFrontier_BattleTowerLobby_Text_DifficultToMakeBattleTurnOutAsPlanned, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse:: @ 828CC4A
+BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse::
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelInterview
 	msgbox BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine, MSGBOX_DEFAULT
@@ -319,17 +319,17 @@ BattleFrontier_BattleTowerLobby_EventScript_SubmitResponse:: @ 828CC4A
 	goto Interview_EventScript_EndInterview
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_CancelInterview:: @ 828CC70
+BattleFrontier_BattleTowerLobby_EventScript_CancelInterview::
 	msgbox BattleFrontier_BattleTowerLobby_Text_SilentType, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed:: @ 828CC7A
+BattleFrontier_BattleTowerLobby_EventScript_AlreadyInterviewed::
 	msgbox BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84
+BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter::
 	compare VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_HideReporter
 	setvar VAR_0x8005, TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE
@@ -339,12 +339,12 @@ BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter:: @ 828CC84
 	clearflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	return
 
-BattleFrontier_BattleTowerLobby_EventScript_HideReporter:: @ 828CCA6
+BattleFrontier_BattleTowerLobby_EventScript_HideReporter::
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	return
 
 @ Unused
-EventScript_ContestLiveInterview:: @ 828CCAA
+EventScript_ContestLiveInterview::
 	setvar VAR_0x8005, TVSHOW_CONTEST_LIVE_UPDATES
 	special InterviewBefore
 	compare VAR_RESULT, TRUE
@@ -353,5 +353,5 @@ EventScript_ContestLiveInterview:: @ 828CCAA
 	special InterviewAfter
 	return
 
-EventScript_ContestLiveInterviewEnd:: @ 828CCC6
+EventScript_ContestLiveInterviewEnd::
 	return
diff --git a/data/scripts/item_ball_scripts.inc b/data/scripts/item_ball_scripts.inc
index f9228134c..683c383df 100644
--- a/data/scripts/item_ball_scripts.inc
+++ b/data/scripts/item_ball_scripts.inc
@@ -1,659 +1,659 @@
-Route102_EventScript_ItemPotion:: @ 8290CD8
+Route102_EventScript_ItemPotion::
 	finditem ITEM_POTION
 	end
 
-Route103_EventScript_ItemGuardSpec:: @ 8290CE5
+Route103_EventScript_ItemGuardSpec::
 	finditem ITEM_GUARD_SPEC
 	end
 
-Route103_EventScript_ItemPPUp:: @ 8290CF2
+Route103_EventScript_ItemPPUp::
 	finditem ITEM_PP_UP
 	end
 
-Route104_EventScript_ItemPPUp:: @ 8290CFF
+Route104_EventScript_ItemPPUp::
 	finditem ITEM_PP_UP
 	end
 
-Route104_EventScript_ItemPokeBall:: @ 8290D0C
+Route104_EventScript_ItemPokeBall::
 	finditem ITEM_POKE_BALL
 	end
 
-Route104_EventScript_ItemXAccuracy:: @ 8290D19
+Route104_EventScript_ItemXAccuracy::
 	finditem ITEM_X_ACCURACY
 	end
 
-Route104_EventScript_ItemPotion:: @ 8290D26
+Route104_EventScript_ItemPotion::
 	finditem ITEM_POTION
 	end
 
-Route105_EventScript_ItemIron:: @ 8290D33
+Route105_EventScript_ItemIron::
 	finditem ITEM_IRON
 	end
 
-Route106_EventScript_ItemProtein:: @ 8290D40
+Route106_EventScript_ItemProtein::
 	finditem ITEM_PROTEIN
 	end
 
-Route108_EventScript_ItemStarPiece:: @ 8290D4D
+Route108_EventScript_ItemStarPiece::
 	finditem ITEM_STAR_PIECE
 	end
 
-Route109_EventScript_ItemPPUp:: @ 8290D5A
+Route109_EventScript_ItemPPUp::
 	finditem ITEM_PP_UP
 	end
 
-Route109_EventScript_ItemPotion:: @ 8290D67
+Route109_EventScript_ItemPotion::
 	finditem ITEM_POTION
 	end
 
-Route110_EventScript_ItemRareCandy:: @ 8290D74
+Route110_EventScript_ItemRareCandy::
 	finditem ITEM_RARE_CANDY
 	end
 
-Route110_EventScript_ItemDireHit:: @ 8290D81
+Route110_EventScript_ItemDireHit::
 	finditem ITEM_DIRE_HIT
 	end
 
-Route110_EventScript_ItemElixir:: @ 8290D8E
+Route110_EventScript_ItemElixir::
 	finditem ITEM_ELIXIR
 	end
 
-Route111_EventScript_ItemTM37:: @ 8290D9B
+Route111_EventScript_ItemTM37::
 	finditem ITEM_TM37
 	end
 
-Route111_EventScript_ItemStardust:: @ 8290DA8
+Route111_EventScript_ItemStardust::
 	finditem ITEM_STARDUST
 	end
 
-Route111_EventScript_ItemHPUp:: @ 8290DB5
+Route111_EventScript_ItemHPUp::
 	finditem ITEM_HP_UP
 	end
 
-Route111_EventScript_ItemElixir:: @ 8290DC2
+Route111_EventScript_ItemElixir::
 	finditem ITEM_ELIXIR
 	end
 
-Route112_EventScript_ItemNugget:: @ 8290DCF
+Route112_EventScript_ItemNugget::
 	finditem ITEM_NUGGET
 	end
 
-Route113_EventScript_ItemMaxEther:: @ 8290DDC
+Route113_EventScript_ItemMaxEther::
 	finditem ITEM_MAX_ETHER
 	end
 
-Route113_EventScript_ItemSuperRepel:: @ 8290DE9
+Route113_EventScript_ItemSuperRepel::
 	finditem ITEM_SUPER_REPEL
 	end
 
-Route113_EventScript_ItemHyperPotion:: @ 8290DF6
+Route113_EventScript_ItemHyperPotion::
 	finditem ITEM_HYPER_POTION
 	end
 
-Route114_EventScript_ItemRareCandy:: @ 8290E03
+Route114_EventScript_ItemRareCandy::
 	finditem ITEM_RARE_CANDY
 	end
 
-Route114_EventScript_ItemProtein:: @ 8290E10
+Route114_EventScript_ItemProtein::
 	finditem ITEM_PROTEIN
 	end
 
-Route114_EventScript_ItemEnergyPowder:: @ 8290E1D
+Route114_EventScript_ItemEnergyPowder::
 	finditem ITEM_ENERGY_POWDER
 	end
 
-Route115_EventScript_ItemSuperPotion:: @ 8290E2A
+Route115_EventScript_ItemSuperPotion::
 	finditem ITEM_SUPER_POTION
 	end
 
-Route115_EventScript_ItemTM01:: @ 8290E37
+Route115_EventScript_ItemTM01::
 	finditem ITEM_TM01
 	end
 
-Route115_EventScript_ItemIron:: @ 8290E44
+Route115_EventScript_ItemIron::
 	finditem ITEM_IRON
 	end
 
-Route115_EventScript_ItemGreatBall:: @ 8290E51
+Route115_EventScript_ItemGreatBall::
 	finditem ITEM_GREAT_BALL
 	end
 
-Route115_EventScript_ItemHealPowder:: @ 8290E5E
+Route115_EventScript_ItemHealPowder::
 	finditem ITEM_HEAL_POWDER
 	end
 
-Route115_EventScript_ItemPPUp:: @ 8290E6B
+Route115_EventScript_ItemPPUp::
 	finditem ITEM_PP_UP
 	end
 
-Route116_EventScript_ItemXSpecial:: @ 8290E78
+Route116_EventScript_ItemXSpecial::
 	finditem ITEM_X_SPECIAL
 	end
 
-Route116_EventScript_ItemEther:: @ 8290E85
+Route116_EventScript_ItemEther::
 	finditem ITEM_ETHER
 	end
 
-Route116_EventScript_ItemRepel:: @ 8290E92
+Route116_EventScript_ItemRepel::
 	finditem ITEM_REPEL
 	end
 
-Route116_EventScript_ItemHPUp:: @ 8290E9F
+Route116_EventScript_ItemHPUp::
 	finditem ITEM_HP_UP
 	end
 
-Route116_EventScript_ItemPotion:: @ 8290EAC
+Route116_EventScript_ItemPotion::
 	finditem ITEM_POTION
 	end
 
-Route117_EventScript_ItemGreatBall:: @ 8290EB9
+Route117_EventScript_ItemGreatBall::
 	finditem ITEM_GREAT_BALL
 	end
 
-Route117_EventScript_ItemRevive:: @ 8290EC6
+Route117_EventScript_ItemRevive::
 	finditem ITEM_REVIVE
 	end
 
-Route118_EventScript_ItemHyperPotion:: @ 8290ED3
+Route118_EventScript_ItemHyperPotion::
 	finditem ITEM_HYPER_POTION
 	end
 
-Route119_EventScript_ItemSuperRepel:: @ 8290EE0
+Route119_EventScript_ItemSuperRepel::
 	finditem ITEM_SUPER_REPEL
 	end
 
-Route119_EventScript_ItemZinc:: @ 8290EED
+Route119_EventScript_ItemZinc::
 	finditem ITEM_ZINC
 	end
 
-Route119_EventScript_ItemElixir:: @ 8290EFA
+Route119_EventScript_ItemElixir::
 	finditem ITEM_ELIXIR
 	end
 
-Route119_EventScript_ItemLeafStone:: @ 8290F07
+Route119_EventScript_ItemLeafStone::
 	finditem ITEM_LEAF_STONE
 	end
 
-Route119_EventScript_ItemRareCandy:: @ 8290F14
+Route119_EventScript_ItemRareCandy::
 	finditem ITEM_RARE_CANDY
 	end
 
-Route119_EventScript_ItemHyperPotion:: @ 8290F21
+Route119_EventScript_ItemHyperPotion::
 	finditem ITEM_HYPER_POTION
 	end
 
-Route119_EventScript_ItemHyperPotion2:: @ 8290F2E
+Route119_EventScript_ItemHyperPotion2::
 	finditem ITEM_HYPER_POTION
 	end
 
-Route119_EventScript_ItemElixir2:: @ 8290F3B
+Route119_EventScript_ItemElixir2::
 	finditem ITEM_ELIXIR
 	end
 
-Route120_EventScript_ItemNugget:: @ 8290F48
+Route120_EventScript_ItemNugget::
 	finditem ITEM_NUGGET
 	end
 
-Route120_EventScript_ItemFullHeal:: @ 8290F55
+Route120_EventScript_ItemFullHeal::
 	finditem ITEM_FULL_HEAL
 	end
 
-Route120_EventScript_ItemHyperPotion:: @ 8290F62
+Route120_EventScript_ItemHyperPotion::
 	finditem ITEM_HYPER_POTION
 	end
 
-Route120_EventScript_ItemNestBall:: @ 8290F6F
+Route120_EventScript_ItemNestBall::
 	finditem ITEM_NEST_BALL
 	end
 
-Route120_EventScript_ItemRevive:: @ 8290F7C
+Route120_EventScript_ItemRevive::
 	finditem ITEM_REVIVE
 	end
 
-Route121_EventScript_ItemCarbos:: @ 8290F89
+Route121_EventScript_ItemCarbos::
 	finditem ITEM_CARBOS
 	end
 
-Route121_EventScript_ItemRevive:: @ 8290F96
+Route121_EventScript_ItemRevive::
 	finditem ITEM_REVIVE
 	end
 
-Route121_EventScript_ItemZinc:: @ 8290FA3
+Route121_EventScript_ItemZinc::
 	finditem ITEM_ZINC
 	end
 
-Route123_EventScript_ItemCalcium:: @ 8290FB0
+Route123_EventScript_ItemCalcium::
 	finditem ITEM_CALCIUM
 	end
 
-Route123_EventScript_ItemUltraBall:: @ 8290FBD
+Route123_EventScript_ItemUltraBall::
 	finditem ITEM_ULTRA_BALL
 	end
 
-Route123_EventScript_ItemElixir:: @ 8290FCA
+Route123_EventScript_ItemElixir::
 	finditem ITEM_ELIXIR
 	end
 
-Route123_EventScript_ItemPPUp:: @ 8290FD7
+Route123_EventScript_ItemPPUp::
 	finditem ITEM_PP_UP
 	end
 
-Route123_EventScript_ItemRevivalHerb:: @ 8290FE4
+Route123_EventScript_ItemRevivalHerb::
 	finditem ITEM_REVIVAL_HERB
 	end
 
-Route124_EventScript_ItemRedShard:: @ 8290FF1
+Route124_EventScript_ItemRedShard::
 	finditem ITEM_RED_SHARD
 	end
 
-Route124_EventScript_ItemBlueShard:: @ 8290FFE
+Route124_EventScript_ItemBlueShard::
 	finditem ITEM_BLUE_SHARD
 	end
 
-Route124_EventScript_ItemYellowShard:: @ 829100B
+Route124_EventScript_ItemYellowShard::
 	finditem ITEM_YELLOW_SHARD
 	end
 
-Route125_EventScript_ItemBigPearl:: @ 8291018
+Route125_EventScript_ItemBigPearl::
 	finditem ITEM_BIG_PEARL
 	end
 
-Route126_EventScript_ItemGreenShard:: @ 8291025
+Route126_EventScript_ItemGreenShard::
 	finditem ITEM_GREEN_SHARD
 	end
 
-Route127_EventScript_ItemZinc:: @ 8291032
+Route127_EventScript_ItemZinc::
 	finditem ITEM_ZINC
 	end
 
-Route127_EventScript_ItemCarbos:: @ 829103F
+Route127_EventScript_ItemCarbos::
 	finditem ITEM_CARBOS
 	end
 
-Route127_EventScript_ItemRareCandy:: @ 829104C
+Route127_EventScript_ItemRareCandy::
 	finditem ITEM_RARE_CANDY
 	end
 
-Route132_EventScript_ItemRareCandy:: @ 8291059
+Route132_EventScript_ItemRareCandy::
 	finditem ITEM_RARE_CANDY
 	end
 
-Route132_EventScript_ItemProtein:: @ 8291066
+Route132_EventScript_ItemProtein::
 	finditem ITEM_PROTEIN
 	end
 
-Route133_EventScript_ItemBigPearl:: @ 8291073
+Route133_EventScript_ItemBigPearl::
 	finditem ITEM_BIG_PEARL
 	end
 
-Route133_EventScript_ItemStarPiece:: @ 8291080
+Route133_EventScript_ItemStarPiece::
 	finditem ITEM_STAR_PIECE
 	end
 
-Route133_EventScript_ItemMaxRevive:: @ 829108D
+Route133_EventScript_ItemMaxRevive::
 	finditem ITEM_MAX_REVIVE
 	end
 
-Route134_EventScript_ItemCarbos:: @ 829109A
+Route134_EventScript_ItemCarbos::
 	finditem ITEM_CARBOS
 	end
 
-Route134_EventScript_ItemStarPiece:: @ 82910A7
+Route134_EventScript_ItemStarPiece::
 	finditem ITEM_STAR_PIECE
 	end
 
-PetalburgCity_EventScript_ItemMaxRevive:: @ 82910B4
+PetalburgCity_EventScript_ItemMaxRevive::
 	finditem ITEM_MAX_REVIVE
 	end
 
-PetalburgCity_EventScript_ItemEther:: @ 82910C1
+PetalburgCity_EventScript_ItemEther::
 	finditem ITEM_ETHER
 	end
 
-MauvilleCity_EventScript_ItemXSpeed:: @ 82910CE
+MauvilleCity_EventScript_ItemXSpeed::
 	finditem ITEM_X_SPEED
 	end
 
-RustboroCity_EventScript_ItemXDefend:: @ 82910DB
+RustboroCity_EventScript_ItemXDefend::
 	finditem ITEM_X_DEFEND
 	end
 
-LilycoveCity_EventScript_ItemMaxRepel:: @ 82910E8
+LilycoveCity_EventScript_ItemMaxRepel::
 	finditem ITEM_MAX_REPEL
 	end
 
-MossdeepCity_EventScript_ItemNetBall:: @ 82910F5
+MossdeepCity_EventScript_ItemNetBall::
 	finditem ITEM_NET_BALL
 	end
 
-PetalburgWoods_EventScript_ItemXAttack:: @ 8291102
+PetalburgWoods_EventScript_ItemXAttack::
 	finditem ITEM_X_ATTACK
 	end
 
-PetalburgWoods_EventScript_ItemGreatBall:: @ 829110F
+PetalburgWoods_EventScript_ItemGreatBall::
 	finditem ITEM_GREAT_BALL
 	end
 
-PetalburgWoods_EventScript_ItemEther:: @ 829111C
+PetalburgWoods_EventScript_ItemEther::
 	finditem ITEM_ETHER
 	end
 
-PetalburgWoods_EventScript_ItemParalyzeHeal:: @ 8291129
+PetalburgWoods_EventScript_ItemParalyzeHeal::
 	finditem ITEM_PARALYZE_HEAL
 	end
 
-RusturfTunnel_EventScript_ItemPokeBall:: @ 8291136
+RusturfTunnel_EventScript_ItemPokeBall::
 	finditem ITEM_POKE_BALL
 	end
 
-RusturfTunnel_EventScript_ItemMaxEther:: @ 8291143
+RusturfTunnel_EventScript_ItemMaxEther::
 	finditem ITEM_MAX_ETHER
 	end
 
-GraniteCave_1F_EventScript_ItemEscapeRope:: @ 8291150
+GraniteCave_1F_EventScript_ItemEscapeRope::
 	finditem ITEM_ESCAPE_ROPE
 	end
 
-GraniteCave_B1F_EventScript_ItemPokeBall:: @ 829115D
+GraniteCave_B1F_EventScript_ItemPokeBall::
 	finditem ITEM_POKE_BALL
 	end
 
-GraniteCave_B2F_EventScript_ItemRepel:: @ 829116A
+GraniteCave_B2F_EventScript_ItemRepel::
 	finditem ITEM_REPEL
 	end
 
-GraniteCave_B2F_EventScript_ItemRareCandy:: @ 8291177
+GraniteCave_B2F_EventScript_ItemRareCandy::
 	finditem ITEM_RARE_CANDY
 	end
 
-JaggedPass_EventScript_ItemBurnHeal:: @ 8291184
+JaggedPass_EventScript_ItemBurnHeal::
 	finditem ITEM_BURN_HEAL
 	end
 
-FieryPath_EventScript_ItemFireStone:: @ 8291191
+FieryPath_EventScript_ItemFireStone::
 	finditem ITEM_FIRE_STONE
 	end
 
-FieryPath_EventScript_ItemTM06:: @ 829119E
+FieryPath_EventScript_ItemTM06::
 	finditem ITEM_TM06
 	end
 
-MeteorFalls_1F_1R_EventScript_ItemTM23:: @ 82911AB
+MeteorFalls_1F_1R_EventScript_ItemTM23::
 	finditem ITEM_TM23
 	end
 
-MeteorFalls_1F_1R_EventScript_ItemFullHeal:: @ 82911B8
+MeteorFalls_1F_1R_EventScript_ItemFullHeal::
 	finditem ITEM_FULL_HEAL
 	end
 
-MeteorFalls_1F_1R_EventScript_ItemMoonStone:: @ 82911C5
+MeteorFalls_1F_1R_EventScript_ItemMoonStone::
 	finditem ITEM_MOON_STONE
 	end
 
-MeteorFalls_1F_1R_EventScript_ItemPPUP:: @ 82911D2
+MeteorFalls_1F_1R_EventScript_ItemPPUP::
 	finditem ITEM_PP_UP
 	end
 
-MeteorFalls_B1F_2R_EventScript_ItemTM02:: @ 82911DF
+MeteorFalls_B1F_2R_EventScript_ItemTM02::
 	finditem ITEM_TM02
 	end
 
-NewMauville_Inside_EventScript_ItemUltraBall:: @ 82911EC
+NewMauville_Inside_EventScript_ItemUltraBall::
 	finditem ITEM_ULTRA_BALL
 	end
 
-NewMauville_Inside_EventScript_ItemEscapeRope:: @ 82911F9
+NewMauville_Inside_EventScript_ItemEscapeRope::
 	finditem ITEM_ESCAPE_ROPE
 	end
 
-NewMauville_Inside_EventScript_ItemThunderStone:: @ 8291206
+NewMauville_Inside_EventScript_ItemThunderStone::
 	finditem ITEM_THUNDER_STONE
 	end
 
-NewMauville_Inside_EventScript_ItemFullHeal:: @ 8291213
+NewMauville_Inside_EventScript_ItemFullHeal::
 	finditem ITEM_FULL_HEAL
 	end
 
-NewMauville_Inside_EventScript_ItemParalyzeHeal:: @ 8291220
+NewMauville_Inside_EventScript_ItemParalyzeHeal::
 	finditem ITEM_PARALYZE_HEAL
 	end
 
-AbandonedShip_Rooms_1F_EventScript_ItemHarborMail:: @ 829122D
+AbandonedShip_Rooms_1F_EventScript_ItemHarborMail::
 	finditem ITEM_HARBOR_MAIL
 	end
 
-AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope:: @ 829123A
+AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope::
 	finditem ITEM_ESCAPE_ROPE
 	end
 
-AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall:: @ 8291247
+AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall::
 	finditem ITEM_DIVE_BALL
 	end
 
-AbandonedShip_Room_B1F_EventScript_ItemTM13:: @ 8291254
+AbandonedShip_Room_B1F_EventScript_ItemTM13::
 	finditem ITEM_TM13
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_ItemRevive:: @ 8291261
+AbandonedShip_Rooms2_1F_EventScript_ItemRevive::
 	finditem ITEM_REVIVE
 	end
 
-AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey:: @ 829126E
+AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey::
 	finditem ITEM_STORAGE_KEY
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall:: @ 829127B
+AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall::
 	finditem ITEM_LUXURY_BALL
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner:: @ 8291288
+AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner::
 	finditem ITEM_SCANNER
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone:: @ 8291295
+AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone::
 	finditem ITEM_WATER_STONE
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18:: @ 82912A2
+AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18::
 	finditem ITEM_TM18
 	end
 
-ScorchedSlab_EventScript_ItemTM11:: @ 82912AF
+ScorchedSlab_EventScript_ItemTM11::
 	finditem ITEM_TM11
 	end
 
-SafariZone_Northwest_EventScript_ItemTM22:: @ 82912BC
+SafariZone_Northwest_EventScript_ItemTM22::
 	finditem ITEM_TM22
 	end
 
-SafariZone_North_EventScript_ItemCalcium:: @ 82912C9
+SafariZone_North_EventScript_ItemCalcium::
 	finditem ITEM_CALCIUM
 	end
 
-SafariZone_Southwest_EventScript_ItemMaxRevive:: @ 82912D6
+SafariZone_Southwest_EventScript_ItemMaxRevive::
 	finditem ITEM_MAX_REVIVE
 	end
 
-SafariZone_Northeast_EventScript_ItemNugget:: @ 82912E3
+SafariZone_Northeast_EventScript_ItemNugget::
 	finditem ITEM_NUGGET
 	end
 
-SafariZone_Southeast_EventScript_ItemBigPearl:: @ 82912F0
+SafariZone_Southeast_EventScript_ItemBigPearl::
 	finditem ITEM_BIG_PEARL
 	end
 
-MtPyre_2F_EventScript_ItemUltraBall:: @ 82912FD
+MtPyre_2F_EventScript_ItemUltraBall::
 	finditem ITEM_ULTRA_BALL
 	end
 
-MtPyre_3F_EventScript_ItemSuperRepel:: @ 829130A
+MtPyre_3F_EventScript_ItemSuperRepel::
 	finditem ITEM_SUPER_REPEL
 	end
 
-MtPyre_4F_EventScript_ItemSeaIncense:: @ 8291317
+MtPyre_4F_EventScript_ItemSeaIncense::
 	finditem ITEM_SEA_INCENSE
 	end
 
-MtPyre_5F_EventScript_ItemLaxIncense:: @ 8291324
+MtPyre_5F_EventScript_ItemLaxIncense::
 	finditem ITEM_LAX_INCENSE
 	end
 
-MtPyre_6F_EventScript_ItemTM30:: @ 8291331
+MtPyre_6F_EventScript_ItemTM30::
 	finditem ITEM_TM30
 	end
 
-MtPyre_Exterior_EventScript_ItemMaxPotion:: @ 829133E
+MtPyre_Exterior_EventScript_ItemMaxPotion::
 	finditem ITEM_MAX_POTION
 	end
 
-MtPyre_Exterior_EventScript_ItemTM48:: @ 829134B
+MtPyre_Exterior_EventScript_ItemTM48::
 	finditem ITEM_TM48
 	end
 
-AquaHideout_B1F_EventScript_ItemMasterBall:: @ 8291358
+AquaHideout_B1F_EventScript_ItemMasterBall::
 	finditem ITEM_MASTER_BALL
 	end
 
-AquaHideout_B1F_EventScript_ItemNugget:: @ 8291365
+AquaHideout_B1F_EventScript_ItemNugget::
 	finditem ITEM_NUGGET
 	end
 
-AquaHideout_B1F_EventScript_ItemMaxElixir:: @ 8291372
+AquaHideout_B1F_EventScript_ItemMaxElixir::
 	finditem ITEM_MAX_ELIXIR
 	end
 
-AquaHideout_B2F_EventScript_ItemNestBall:: @ 829137F
+AquaHideout_B2F_EventScript_ItemNestBall::
 	finditem ITEM_NEST_BALL
 	end
 
-AquaHideout_B2F_EventScript_ItemMasterBall:: @ 829138C
+AquaHideout_B2F_EventScript_ItemMasterBall::
 	finditem ITEM_MASTER_BALL      // Unused
 	end
 
-Route119_EventScript_ItemNugget:: @ 8291399
+Route119_EventScript_ItemNugget::
 	finditem ITEM_NUGGET
 	end
 
-Route119_EventScript_ItemMaxElixir:: @ 82913A6
+Route119_EventScript_ItemMaxElixir::
 	finditem ITEM_MAX_ELIXIR
 	end
 
-Route119_EventScript_ItemNestBall:: @ 82913B3
+Route119_EventScript_ItemNestBall::
 	finditem ITEM_NEST_BALL
 	end
 
-ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl:: @ 82913C0
+ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl::
 	finditem ITEM_BIG_PEARL
 	end
 
-ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy:: @ 82913CD
+ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy::
 	finditem ITEM_RARE_CANDY
 	end
 
-ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal:: @ 82913DA
+ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal::
 	finditem ITEM_ICE_HEAL
 	end
 
-ShoalCave_LowTideIceRoom_EventScript_ItemTM07:: @ 82913E7
+ShoalCave_LowTideIceRoom_EventScript_ItemTM07::
 	finditem ITEM_TM07
 	end
 
-ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce:: @ 82913F4
+ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce::
 	finditem ITEM_NEVER_MELT_ICE
 	end
 
-SeafloorCavern_Room9_EventScript_ItemTM26:: @ 8291401
+SeafloorCavern_Room9_EventScript_ItemTM26::
 	finditem ITEM_TM26
 	end
 
-Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail:: @ 829140E
+Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail::
 	finditem ITEM_ORANGE_MAIL
 	end
 
-Route110_TrickHousePuzzle2_EventScript_ItemHarborMail:: @ 829141B
+Route110_TrickHousePuzzle2_EventScript_ItemHarborMail::
 	finditem ITEM_HARBOR_MAIL
 	end
 
-Route110_TrickHousePuzzle2_EventScript_ItemWaveMail:: @ 8291428
+Route110_TrickHousePuzzle2_EventScript_ItemWaveMail::
 	finditem ITEM_WAVE_MAIL
 	end
 
-Route110_TrickHousePuzzle3_EventScript_ItemShadowMail:: @ 8291435
+Route110_TrickHousePuzzle3_EventScript_ItemShadowMail::
 	finditem ITEM_SHADOW_MAIL
 	end
 
-Route110_TrickHousePuzzle3_EventScript_ItemWoodMail:: @ 8291442
+Route110_TrickHousePuzzle3_EventScript_ItemWoodMail::
 	finditem ITEM_WOOD_MAIL
 	end
 
-Route110_TrickHousePuzzle4_EventScript_ItemMechMail:: @ 829144F
+Route110_TrickHousePuzzle4_EventScript_ItemMechMail::
 	finditem ITEM_MECH_MAIL
 	end
 
-Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail:: @ 829145C
+Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail::
 	finditem ITEM_GLITTER_MAIL
 	end
 
-Route110_TrickHousePuzzle7_EventScript_ItemTropicMail:: @ 8291469
+Route110_TrickHousePuzzle7_EventScript_ItemTropicMail::
 	finditem ITEM_TROPIC_MAIL
 	end
 
-Route110_TrickHousePuzzle8_EventScript_ItemBeadMail:: @ 8291476
+Route110_TrickHousePuzzle8_EventScript_ItemBeadMail::
 	finditem ITEM_BEAD_MAIL
 	end
 
-VictoryRoad_1F_EventScript_ItemMaxElixir:: @ 8291483
+VictoryRoad_1F_EventScript_ItemMaxElixir::
 	finditem ITEM_MAX_ELIXIR
 	end
 
-VictoryRoad_1F_EventScript_ItemPPUp:: @ 8291490
+VictoryRoad_1F_EventScript_ItemPPUp::
 	finditem ITEM_PP_UP
 	end
 
-VictoryRoad_B1F_EventScript_ItemTM29:: @ 829149D
+VictoryRoad_B1F_EventScript_ItemTM29::
 	finditem ITEM_TM29
 	end
 
-VictoryRoad_B1F_EventScript_ItemFullRestore:: @ 82914AA
+VictoryRoad_B1F_EventScript_ItemFullRestore::
 	finditem ITEM_FULL_RESTORE
 	end
 
-VictoryRoad_B2F_EventScript_ItemFullHeal:: @ 82914B7
+VictoryRoad_B2F_EventScript_ItemFullHeal::
 	finditem ITEM_FULL_HEAL
 	end
 
-ArtisanCave_B1F_EventScript_ItemHPUp:: @ 82914C4
+ArtisanCave_B1F_EventScript_ItemHPUp::
 	finditem ITEM_HP_UP
 	end
 
-ArtisanCave_1F_EventScript_ItemCarbos:: @ 82914D1
+ArtisanCave_1F_EventScript_ItemCarbos::
 	finditem ITEM_CARBOS
 	end
 
-MagmaHideout_1F_EventScript_ItemRareCandy:: @ 82914DE
+MagmaHideout_1F_EventScript_ItemRareCandy::
 	finditem ITEM_RARE_CANDY
 	end
 
-MagmaHideout_2F_2R_EventScript_ItemMaxElixir:: @ 82914EB
+MagmaHideout_2F_2R_EventScript_ItemMaxElixir::
 	finditem ITEM_MAX_ELIXIR
 	end
 
-MagmaHideout_2F_2R_EventScript_ItemFullRestore:: @ 82914F8
+MagmaHideout_2F_2R_EventScript_ItemFullRestore::
 	finditem ITEM_FULL_RESTORE
 	end
 
-MagmaHideout_3F_1R_EventScript_ItemNugget:: @ 8291505
+MagmaHideout_3F_1R_EventScript_ItemNugget::
 	finditem ITEM_NUGGET
 	end
 
-MagmaHideout_3F_2R_EventScript_ItemPPMax:: @ 8291512
+MagmaHideout_3F_2R_EventScript_ItemPPMax::
 	finditem ITEM_PP_MAX
 	end
 
-MagmaHideout_4F_EventScript_ItemMaxRevive:: @ 829151F
+MagmaHideout_4F_EventScript_ItemMaxRevive::
 	finditem ITEM_MAX_REVIVE
 	end
 
-MagmaHideout_3F_3R_EventScript_ItemEscapeRope:: @ 829152C
+MagmaHideout_3F_3R_EventScript_ItemEscapeRope::
 	finditem ITEM_ESCAPE_ROPE
 	end
diff --git a/data/scripts/kecleon.inc b/data/scripts/kecleon.inc
index 659cd027b..414217499 100644
--- a/data/scripts/kecleon.inc
+++ b/data/scripts/kecleon.inc
@@ -1,53 +1,53 @@
-Route120_EventScript_Kecleon1:: @ 82722DB
+Route120_EventScript_Kecleon1::
 	lock
 	faceplayer
 	setvar VAR_0x8009, 1
 	goto EventScript_Kecleon
 	end
 
-Route120_EventScript_Kecleon2:: @ 82722E8
+Route120_EventScript_Kecleon2::
 	lock
 	faceplayer
 	setvar VAR_0x8009, 2
 	goto EventScript_Kecleon
 	end
 
-Route120_EventScript_Kecleon3:: @ 82722F5
+Route120_EventScript_Kecleon3::
 	lock
 	faceplayer
 	setvar VAR_0x8009, 3
 	goto EventScript_Kecleon
 	end
 
-Route120_EventScript_Kecleon4:: @ 8272302
+Route120_EventScript_Kecleon4::
 	lock
 	faceplayer
 	setvar VAR_0x8009, 4
 	goto EventScript_Kecleon
 	end
 
-Route120_EventScript_Kecleon5:: @ 827230F
+Route120_EventScript_Kecleon5::
 	lock
 	faceplayer
 	setvar VAR_0x8009, 5
 	goto EventScript_Kecleon
 	end
 
-Route119_EventScript_Kecleon1:: @ 827231C
+Route119_EventScript_Kecleon1::
 	lock
 	faceplayer
 	setvar VAR_0x8009, 6
 	goto EventScript_Kecleon
 	end
 
-Route119_EventScript_Kecleon2:: @ 8272329
+Route119_EventScript_Kecleon2::
 	lock
 	faceplayer
 	setvar VAR_0x8009, 7
 	goto EventScript_Kecleon
 	end
 
-EventScript_Kecleon:: @ 8272336
+EventScript_Kecleon::
 	checkitem ITEM_DEVON_SCOPE, 1
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_AskUseDevonScope
@@ -55,14 +55,14 @@ EventScript_Kecleon:: @ 8272336
 	release
 	end
 
-EventScript_AskUseDevonScope:: @ 8272350
+EventScript_AskUseDevonScope::
 	msgbox Kecleon_Text_WantToUseDevonScope, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq EventScript_BattleKecleon
 	release
 	end
 
-EventScript_BattleKecleon:: @ 8272365
+EventScript_BattleKecleon::
 	msgbox Kecleon_Text_UseDevonScopeMonAttacked, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FacePlayer
@@ -87,11 +87,11 @@ EventScript_BattleKecleon:: @ 8272365
 	release
 	end
 
-EventScript_RemoveKecleon:: @ 82723C1
+EventScript_RemoveKecleon::
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-Movement_KecleonAppears: @ 82723C7
+Movement_KecleonAppears:
 	set_visible
 	delay_4
 	set_invisible
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index 40ead8e58..137af8752 100644
--- a/data/scripts/lilycove_lady.inc
+++ b/data/scripts/lilycove_lady.inc
@@ -1,7 +1,7 @@
 .set LOCALID_LILYCOVE_LADY, 4
 .set LOCALID_LADYS_MON, 5
 
-LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady:: @ 82A836B
+LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady::
     special Script_GetLilycoveLadyId
     switch VAR_RESULT
     case LILYCOVE_LADY_QUIZ, LilycoveCity_PokemonCenter_1F_EventScript_QuizLady
@@ -9,7 +9,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady:: @ 82A836B
     case LILYCOVE_LADY_CONTEST, LilycoveCity_PokemonCenter_1F_EventScript_ContestLady
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_FavorLady:: @ 82A8395
+LilycoveCity_PokemonCenter_1F_EventScript_FavorLady::
     lock
     faceplayer
     msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheFavorLady, MSGBOX_DEFAULT
@@ -22,12 +22,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_FavorLady:: @ 82A8395
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyCompleted:: @ 82A83C6
+LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyCompleted::
     msgbox LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady:: @ 82A83D0
+LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady::
     special BufferFavorLadyRequest
     msgbox LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing, MSGBOX_DEFAULT
     specialvar VAR_RESULT, HasAnotherPlayerGivenFavorLadyItem
@@ -37,7 +37,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady:: @ 82A83D0
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem:: @ 82A83F7
+LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem::
     special BufferFavorLadyItemName
     special BufferFavorLadyPlayerName
     specialvar VAR_RESULT, DidFavorLadyLikeItem
@@ -47,17 +47,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem:: @ 82A83F7
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveBadThing:: @ 82A8419
+LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveBadThing::
     msgbox LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeBadThing, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_RequestItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing:: @ 82A8427
+LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing::
     msgbox LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeGreatThing, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_RequestItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_RequestItem:: @ 82A8435
+LilycoveCity_PokemonCenter_1F_EventScript_RequestItem::
     msgbox LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing, MSGBOX_YESNO
     compare VAR_RESULT, NO
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor
@@ -65,17 +65,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_RequestItem:: @ 82A8435
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor:: @ 82A8454
+LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor::
     msgbox LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor:: @ 82A845E
+LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor::
     msgbox LilycoveCity_PokemonCenter_1F_Text_WhatWillYouGiveMe, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C
+LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem::
     fadescreen FADE_TO_BLACK
     setvar VAR_RESULT, 0
     special Script_FavorLadyOpenBagMenu
@@ -86,7 +86,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem:: @ 82A848E
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem::
     msgbox LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare, MSGBOX_YESNO
     compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor
@@ -94,7 +94,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem:: @ 82A848E
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem:: @ 82A84AD
+LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem::
     specialvar VAR_RESULT, Script_DoesFavorLadyLikeItem
     compare VAR_RESULT, FALSE
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DidntLikeFavorItem
@@ -102,13 +102,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem:: @ 82A84AD
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_DidntLikeFavorItem:: @ 82A84C9
+LilycoveCity_PokemonCenter_1F_EventScript_DidntLikeFavorItem::
     special BufferFavorLadyRequest
     msgbox LilycoveCity_PokemonCenter_1F_Text_IllTryToCherishIt, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem:: @ 82A84D6
+LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem::
     specialvar VAR_RESULT, IsFavorLadyThresholdMet
     compare VAR_RESULT, FALSE
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LikedFavorItem
@@ -116,19 +116,19 @@ LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem:: @ 82A84D6
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LovedFavorItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_LikedFavorItem:: @ 82A84F2
+LilycoveCity_PokemonCenter_1F_EventScript_LikedFavorItem::
     special BufferFavorLadyRequest
     msgbox LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_LovedFavorItem:: @ 82A84FF
+LilycoveCity_PokemonCenter_1F_EventScript_LovedFavorItem::
     special BufferFavorLadyRequest
     msgbox LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize:: @ 82A8510
+LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize::
     setvar VAR_0x8004, 0
     specialvar VAR_0x8004, FavorLadyGetPrize
     msgbox LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn, MSGBOX_DEFAULT
@@ -139,17 +139,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize:: @ 82A8510
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize:: @ 82A8545
+LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize::
     msgbox LilycoveCity_PokemonCenter_1F_Text_YouDontHaveSpaceForIt, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize:: @ 82A854F
+LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize::
     special SetFavorLadyState_Complete
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_QuizLady:: @ 82A8554
+LilycoveCity_PokemonCenter_1F_EventScript_QuizLady::
     lock
     faceplayer
     msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheQuizLady, MSGBOX_DEFAULT
@@ -162,7 +162,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_QuizLady:: @ 82A8554
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz:: @ 82A8585
+LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz::
     specialvar VAR_RESULT, GetQuizAuthor
     compare VAR_RESULT, QUIZ_AUTHOR_PLAYER
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz
@@ -172,7 +172,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz:: @ 82A8585
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz:: @ 82A85AC
+LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz::
     specialvar VAR_RESULT, IsQuizLadyWaitingForChallenger
     compare VAR_RESULT, FALSE
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz
@@ -180,22 +180,22 @@ LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz:: @ 82A85AC
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz:: @ 82A85C8
+LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz::
     msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingToTakeYourQuiz, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_PlayerQuizReady:: @ 82A85D2
+LilycoveCity_PokemonCenter_1F_EventScript_PlayerQuizReady::
     msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady:: @ 82A85E0
+LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady::
     msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz:: @ 82A85EE
+LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz::
     setvar VAR_0x8004, 0
     msgbox LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge, MSGBOX_YESNO
     compare VAR_RESULT, YES
@@ -204,38 +204,38 @@ LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz:: @ 82A85EE
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz:: @ 82A8612
+LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz::
     msgbox LilycoveCity_PokemonCenter_1F_Text_HowBoringBye, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz:: @ 82A861C
+LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz::
     special ClearQuizLadyPlayerAnswer
     compare VAR_0x8004, 0
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion
     compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer
 
-LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState:: @ 82A8635
+LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState::
     compare VAR_RESULT, 0
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz
     compare VAR_RESULT, 1
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion:: @ 82A864C
+LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion::
     special QuizLadyShowQuizQuestion
     waitstate
     goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer:: @ 82A8656
+LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer::
     special QuizLadyGetPlayerAnswer
     waitstate
     goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz:: @ 82A8660
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz::
     msgbox LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit, MSGBOX_YESNO
     compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz
@@ -243,12 +243,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz:: @ 82A8660
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz:: @ 82A867F
+LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz::
     msgbox LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689
+LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse::
     special SetQuizLadyState_Complete
     msgbox LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer, MSGBOX_DEFAULT
     specialvar VAR_RESULT, IsQuizAnswerCorrect
@@ -258,7 +258,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0
+LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse::
     playse SE_SUCCESS
     delay 10
     playse SE_SUCCESS
@@ -266,7 +266,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0
     goto LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 82A86C7
+LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse::
     special BufferQuizCorrectAnswer
     special BufferQuizPrizeName
     playse SE_FAILURE
@@ -278,7 +278,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 82A86C7
     end
 
 @ VAR_RESULT is essentially ignored, both jumps are identical
-LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize:: @ 82A86EC
+LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize::
     specialvar VAR_RESULT, BufferQuizAuthorNameAndCheckIfLady
     compare VAR_RESULT, 1
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivePrize1
@@ -286,17 +286,17 @@ LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize:: @ 82A86EC
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivePrize0
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_GivePrize1:: @ 82A8708
+LilycoveCity_PokemonCenter_1F_EventScript_GivePrize1::
     msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_GivePrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_GivePrize0:: @ 82A8716
+LilycoveCity_PokemonCenter_1F_EventScript_GivePrize0::
     msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_GivePrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724
+LilycoveCity_PokemonCenter_1F_EventScript_GivePrize::
     setvar VAR_0x8005, 0
     special BufferQuizPrizeItem
     special SetQuizLadyState_Complete
@@ -306,13 +306,13 @@ LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724
     goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize:: @ 82A874C
+LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize::
     msgbox LilycoveCity_PokemonCenter_1F_Text_YourBagIsFilledUp, MSGBOX_DEFAULT
     special SetQuizLadyState_GivePrize
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz:: @ 82A8759
+LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz::
     msgbox LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz, MSGBOX_YESNO
     compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz
@@ -320,15 +320,15 @@ LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz:: @ 82A8759
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz:: @ 82A8778
+LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz::
     special QuizLadyPickNewQuestion
     msgbox LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz:: @ 82A8785
+LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz::
     msgbox LilycoveCity_PokemonCenter_1F_Text_PickYourPrize, MSGBOX_DEFAULT
-LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D
+LilycoveCity_PokemonCenter_1F_EventScript_PickPrize::
     fadescreen FADE_TO_BLACK
     setvar VAR_RESULT, 0
     special Script_QuizLadyOpenBagMenu
@@ -339,7 +339,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize:: @ 82A87AF
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize::
     msgbox LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize, MSGBOX_YESNO
     compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
@@ -347,12 +347,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize:: @ 82A87AF
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PickPrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz:: @ 82A87CE
+LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz::
     msgbox LilycoveCity_PokemonCenter_1F_Text_WriteYourQuiz, MSGBOX_DEFAULT
     special ClearQuizLadyQuestionAndAnswer
     special ClearQuizLadyPlayerAnswer
     setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION
-LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1
+LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion::
     fadescreen FADE_TO_BLACK
     special QuizLadySetCustomQuestion
     waitstate
@@ -361,7 +361,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1
     goto LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion:: @ 82A87F8
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion::
     msgbox LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion, MSGBOX_YESNO
     compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
@@ -369,7 +369,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion:: @ 82A87F8
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz:: @ 82A8817
+LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz::
     special QuizLadyTakePrizeForCustomQuiz
     special QuizLadyRecordCustomQuizData
     special QuizLadySetWaitingForChallenger
@@ -377,7 +377,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz:: @ 82A8817
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_ContestLady:: @ 82A882A
+LilycoveCity_PokemonCenter_1F_EventScript_ContestLady::
     lock
     faceplayer
     msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady, MSGBOX_DEFAULT
@@ -389,7 +389,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_ContestLady:: @ 82A882A
     end
 
 @ Redundant with above script, VAR_RESULT will always be FALSE here
-LilycoveCity_PokemonCenter_1F_EventScript_NotGivenPokeblock:: @ 82A8850
+LilycoveCity_PokemonCenter_1F_EventScript_NotGivenPokeblock::
     specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir
     compare VAR_RESULT, FALSE
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock
@@ -397,12 +397,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_NotGivenPokeblock:: @ 82A8850
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock:: @ 82A886C
+LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock::
     msgbox LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock:: @ 82A8876
+LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock::
     special Script_BufferContestLadyCategoryAndMonName
     msgbox LilycoveCity_PokemonCenter_1F_Text_MyFriendDisplaysQuality, MSGBOX_DEFAULT
     checkitem ITEM_POKEBLOCK_CASE, 1
@@ -415,12 +415,12 @@ LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock:: @ 82A8876
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock:: @ 82A88B0
+LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock::
     msgbox LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA
+LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock::
     fadescreen FADE_TO_BLACK
     special OpenPokeblockCaseForContestLady
     waitstate
@@ -430,7 +430,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA
     goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock:: @ 82A88D7
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock::
     msgbox LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock, MSGBOX_YESNO
     compare VAR_RESULT, YES
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock
@@ -438,7 +438,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock:: @ 82A88D7
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock:: @ 82A88F6
+LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock::
     msgbox LilycoveCity_PokemonCenter_1F_Text_IllUseYourPokeblock, MSGBOX_DEFAULT
     special SetContestLadyGivenPokeblock
     special GetContestLadyMonSpecies
@@ -446,7 +446,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock:: @ 82A88F6
     end
 
 @ VAR_0x8004 here is the return value from GivePokeblockToContestLady
-LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock:: @ 82A890A
+LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock::
     applymovement LOCALID_LILYCOVE_LADY, LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon
     waitmovement 0
     delay 60
@@ -463,11 +463,11 @@ LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock:: @ 82A890A
     end
 
 @ VAR_0x8004 here is the return value from GivePokeblockToContestLady
-LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock:: @ 82A893F
+LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock::
     applymovement LOCALID_LADYS_MON, LilycoveCity_PokemonCenter_1F_Movement_MonJump
     waitmovement 0
     delay 60
-LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock:: @ 82A894C
+LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock::
     applymovement LOCALID_LILYCOVE_LADY, LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer
     waitmovement 0
     delay 60
@@ -477,62 +477,62 @@ LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock:: @ 82A894C
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_MonDislikedPokeblock:: @ 82A8970
+LilycoveCity_PokemonCenter_1F_EventScript_MonDislikedPokeblock::
     msgbox LilycoveCity_PokemonCenter_1F_Text_NoChangeThanks, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock:: @ 82A897E
+LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock::
     special Script_BufferContestLadyCategoryAndMonName
     msgbox LilycoveCity_PokemonCenter_1F_Text_ReallyImprovedThanks, MSGBOX_DEFAULT
     goto LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow:: @ 82A898F
+LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow::
     specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir
     compare VAR_RESULT, 1
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow:: @ 82A89A1
+LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow::
     msgbox LilycoveCity_PokemonCenter_1F_Text_ReadyToEnterContests, MSGBOX_DEFAULT
     special PutLilycoveContestLadyShowOnTheAir
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase:: @ 82A89AE
+LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase::
     msgbox LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon: @ 82A89B8
+LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon:
     face_right
     delay_8
     step_end
 
-LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady: @ 82A89BB
+LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady:
     face_left
     delay_8
     step_end
 
 @ Unused
-LilycoveCity_PokemonCenter_1F_Movement_MonFaceDown: @ 82A89BE
+LilycoveCity_PokemonCenter_1F_Movement_MonFaceDown:
     face_down
     step_end
 
-LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer: @ 82A89C0
+LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer:
     face_player
     step_end
 
-LilycoveCity_PokemonCenter_1F_Movement_MonJump: @ 82A89C2
+LilycoveCity_PokemonCenter_1F_Movement_MonJump:
     disable_jump_landing_ground_effect
     jump_in_place_left
     disable_jump_landing_ground_effect
     jump_in_place_left
     step_end
 
-LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon:: @ 82A89C7
+LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon::
     specialvar VAR_RESULT, GetContestLadyCategory
     special Script_BufferContestLadyCategoryAndMonName
     special GetContestLadyMonSpecies
@@ -548,7 +548,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon:: @ 82A89C7
     goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Pikachu
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon:: @ 82A8A0A
+LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon::
     lock
     faceplayer
     waitse
@@ -558,7 +558,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon:: @ 82A8A0A
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_Skitty:: @ 82A8A1D
+LilycoveCity_PokemonCenter_1F_EventScript_Skitty::
     lock
     faceplayer
     waitse
@@ -568,7 +568,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Skitty:: @ 82A8A1D
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_Poochyena:: @ 82A8A30
+LilycoveCity_PokemonCenter_1F_EventScript_Poochyena::
     lock
     faceplayer
     waitse
@@ -578,7 +578,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Poochyena:: @ 82A8A30
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_Kecleon:: @ 82A8A43
+LilycoveCity_PokemonCenter_1F_EventScript_Kecleon::
     lock
     faceplayer
     waitse
@@ -588,7 +588,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_Kecleon:: @ 82A8A43
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_Pikachu:: @ 82A8A56
+LilycoveCity_PokemonCenter_1F_EventScript_Pikachu::
     lock
     faceplayer
     waitse
@@ -598,54 +598,54 @@ LilycoveCity_PokemonCenter_1F_EventScript_Pikachu:: @ 82A8A56
     release
     end
 
-LilycoveCity_PokemonCenter_1F_Text_ImTheFavorLady: @ 82A8A69
+LilycoveCity_PokemonCenter_1F_Text_ImTheFavorLady:
     .string "I'm the FAVOR LADY…$"
 
-LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing: @ 82A8A7D
+LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing:
     .string "I've recently developed an obsession\n"
     .string "for {STR_VAR_1} things…$"
 
-LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime: @ 82A8AB1
+LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime:
     .string "Oh…\n"
     .string "Thank you for last time…$"
 
-LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeBadThing: @ 82A8ACE
+LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeBadThing:
     .string "Before, I think it was {STR_VAR_3}…\p"
     .string "{STR_VAR_3} gave me one {STR_VAR_2},\n"
     .string "saying it was {STR_VAR_1}.\p"
     .string "But it wasn't {STR_VAR_1}.\n"
     .string "Not in the least bit.$"
 
-LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeGreatThing: @ 82A8B36
+LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeGreatThing:
     .string "Before, {STR_VAR_3} gave me a very\n"
     .string "{STR_VAR_1} {STR_VAR_2}.\p"
     .string "I cherish it now.$"
 
-LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing: @ 82A8B69
+LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing:
     .string "Listen, if you have anything that\n"
     .string "is {STR_VAR_1}, will you share it\l"
     .string "with me?$"
 
-LilycoveCity_PokemonCenter_1F_Text_WhatWillYouGiveMe: @ 82A8BAD
+LilycoveCity_PokemonCenter_1F_Text_WhatWillYouGiveMe:
     .string "…Really?\n"
     .string "What will you give me?$"
 
-LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye: @ 82A8BCD
+LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye:
     .string "Is that so?\n"
     .string "Then, it's good-bye…$"
 
-LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare: @ 82A8BEE
+LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare:
     .string "Oh…\n"
     .string "You're not willing to share?$"
 
-LilycoveCity_PokemonCenter_1F_Text_IllTryToCherishIt: @ 82A8C0F
+LilycoveCity_PokemonCenter_1F_Text_IllTryToCherishIt:
     .string "Oh?\n"
     .string "That {STR_VAR_2} is {STR_VAR_1}?\p"
     .string "…Oh, is that right?\p"
     .string "Well, I owe you a thanks anyway.\n"
     .string "I'll try to cherish it…$"
 
-LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis: @ 82A8C6F
+LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis:
     .string "Oh…\p"
     .string "That's a quite {STR_VAR_1}\n"
     .string "{STR_VAR_2}…\p"
@@ -654,7 +654,7 @@ LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis: @ 82A8C6F
     .string "Thank you…\n"
     .string "I will cherish this…$"
 
-LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis: @ 82A8CC8
+LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis:
     .string "…Oh, oh, oh…\p"
     .string "This is amazing!\n"
     .string "This really is {STR_VAR_1}!\p"
@@ -664,90 +664,90 @@ LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis: @ 82A8CC8
     .string "I will treasure this for the rest\n"
     .string "of my life!$"
 
-LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn: @ 82A8D5D
+LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn:
     .string "I'll give you this wonderful item in\n"
     .string "return for your fabulous gift.\p"
     .string "I hope you will cherish it…$"
 
-LilycoveCity_PokemonCenter_1F_Text_YouDontHaveSpaceForIt: @ 82A8DBD
+LilycoveCity_PokemonCenter_1F_Text_YouDontHaveSpaceForIt:
     .string "Oh, you can't have it if you don't have\n"
     .string "the space for it.\p"
     .string "Please come see me when you get\n"
     .string "your BAG organized…$"
 
-LilycoveCity_PokemonCenter_1F_Text_ImTheQuizLady: @ 82A8E2B
+LilycoveCity_PokemonCenter_1F_Text_ImTheQuizLady:
     .string "I'm the QUIZ LADY!\n"
     .string "I love quizzes!$"
 
-LilycoveCity_PokemonCenter_1F_Text_WaitingToTakeYourQuiz: @ 82A8E4E
+LilycoveCity_PokemonCenter_1F_Text_WaitingToTakeYourQuiz:
     .string "Oh?\p"
     .string "I'm waiting for a challenger to answer\n"
     .string "the quiz you made.\p"
     .string "We can chat another time, okay?$"
 
-LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger: @ 82A8EAC
+LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger:
     .string "I'm waiting for someone to challenge\n"
     .string "a quiz this {STR_VAR_1} thought up!$"
 
-LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge: @ 82A8EEC
+LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge:
     .string "If you answer correctly, you can win\n"
     .string "fabulous prizes!\p"
     .string "Would you like to take the quiz\n"
     .string "challenge?$"
 
-LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer: @ 82A8F4D
+LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer:
     .string "… … … … … …\n"
     .string "… … … … … …$"
 
-LilycoveCity_PokemonCenter_1F_Text_HowBoringBye: @ 82A8F65
+LilycoveCity_PokemonCenter_1F_Text_HowBoringBye:
     .string "Oh, how boring!\n"
     .string "Bye-bye!$"
 
-LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit: @ 82A8F7E
+LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit:
     .string "Awww!\n"
     .string "You're going to quit?$"
 
-LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime: @ 82A8F9A
+LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime:
     .string "Please take the quiz challenge\n"
     .string "another time!$"
 
-LilycoveCity_PokemonCenter_1F_Text_YouGotItRight: @ 82A8FC7
+LilycoveCity_PokemonCenter_1F_Text_YouGotItRight:
     .string "You're amazing! You've got it right!\n"
     .string "You're one sharp customer!$"
 
-LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize: @ 82A9007
+LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize:
     .string "Congratulations!\n"
     .string "You've got the quiz right!\p"
     .string "You've won a prize provided by\n"
     .string "{STR_VAR_1}!$"
 
 @ Unused
-LilycoveCity_PokemonCenter_1F_Text_XReceivedOneY: @ 82A9056
+LilycoveCity_PokemonCenter_1F_Text_XReceivedOneY:
     .string "{STR_VAR_1} received\n"
     .string "one {STR_VAR_2}!$"
 
-LilycoveCity_PokemonCenter_1F_Text_YourBagIsFilledUp: @ 82A906A
+LilycoveCity_PokemonCenter_1F_Text_YourBagIsFilledUp:
     .string "Oh? Your BAG is filled up!\n"
     .string "Come see me when you have room.$"
 
-LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs: @ 82A90A5
+LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs:
     .string "Hmm… Wrong!\n"
     .string "The correct answer is “{STR_VAR_3}”!$"
 
-LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize: @ 82A90CD
+LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize:
     .string "Too bad!\p"
     .string "I get to keep the quiz prize\n"
     .string "{STR_VAR_1} now!$"
 
-LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz: @ 82A90FB
+LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz:
     .string "Listen, listen!\n"
     .string "Would you like to make your own quiz?$"
 
-LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime: @ 82A9131
+LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime:
     .string "Oh, I see…\n"
     .string "Well, maybe next time!$"
 
-LilycoveCity_PokemonCenter_1F_Text_PickYourPrize: @ 82A9153
+LilycoveCity_PokemonCenter_1F_Text_PickYourPrize:
     .string "Okay, the first thing you have to do\n"
     .string "is pick the prize for the person that\l"
     .string "answers your quiz correctly.\p"
@@ -755,47 +755,47 @@ LilycoveCity_PokemonCenter_1F_Text_PickYourPrize: @ 82A9153
     .string "the quiz can't get it right, I get to\l"
     .string "keep the prize!$"
 
-LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize: @ 82A9212
+LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize:
     .string "If you don't choose a prize,\n"
     .string "your quiz can't be made.\p"
     .string "Are you going to quit making\n"
     .string "your quiz?$"
 
-LilycoveCity_PokemonCenter_1F_Text_WriteYourQuiz: @ 82A9270
+LilycoveCity_PokemonCenter_1F_Text_WriteYourQuiz:
     .string "Oh, how nice!\n"
     .string "That's a wonderful prize!\p"
     .string "Next, you need to write your quiz\n"
     .string "question and its answer.$"
 
-LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion: @ 82A92D3
+LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion:
     .string "Are you going to quit writing\n"
     .string "your quiz question?$"
 
 @ Unused
-LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizAnswer: @ 82A9305
+LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizAnswer:
     .string "Are you going to quit choosing\n"
     .string "your quiz answer?$"
 
-LilycoveCity_PokemonCenter_1F_Text_IllLookForAChallenger: @ 82A9336
+LilycoveCity_PokemonCenter_1F_Text_IllLookForAChallenger:
     .string "Thank you!\n"
     .string "You've put together a nice quiz.\p"
     .string "I'll go look for someone who'll take\n"
     .string "your quiz challenge right away.$"
 
-LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady: @ 82A93A7
+LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady:
     .string "I'm the CONTEST LADY!\n"
     .string "I sure do love CONTESTS!$"
 
-LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock: @ 82A93D6
+LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock:
     .string "Thanks for your {POKEBLOCK} before!$"
 
-LilycoveCity_PokemonCenter_1F_Text_MyFriendDisplaysQuality: @ 82A93F4
+LilycoveCity_PokemonCenter_1F_Text_MyFriendDisplaysQuality:
     .string "This is my friend {STR_VAR_1}!\n"
     .string "It's the epitome of {STR_VAR_2}!\p"
     .string "But I think that it will display\n"
     .string "even more {STR_VAR_2}!$"
 
-LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase: @ 82A9451
+LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase:
     .string "So, I need your help!\p"
     .string "Please, may I have one {POKEBLOCK}?\n"
     .string "All I'm asking for is one!\p"
@@ -803,57 +803,57 @@ LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase: @ 82A9451
     .string "Don't you have a {POKEBLOCK} CASE?\l"
     .string "That's no good. Next time, then!$"
 
-LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock: @ 82A94E8
+LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock:
     .string "So, I need your help!\p"
     .string "Please, may I have one {POKEBLOCK}?\n"
     .string "All I'm asking for is one!$"
 
-LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock: @ 82A9537
+LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock:
     .string "Awww!\n"
     .string "I can't have one {POKEBLOCK}?!$"
 
-LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate: @ 82A9556
+LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate:
     .string "Sheesh!\n"
     .string "What a cheapskate!$"
 
-LilycoveCity_PokemonCenter_1F_Text_IllUseYourPokeblock: @ 82A9571
+LilycoveCity_PokemonCenter_1F_Text_IllUseYourPokeblock:
     .string "Yay!\n"
     .string "Thank you!\p"
     .string "I'll feed my POKéMON your {POKEBLOCK}\n"
     .string "right away.$"
 
-LilycoveCity_PokemonCenter_1F_Text_NoChangeThanks: @ 82A95AD
+LilycoveCity_PokemonCenter_1F_Text_NoChangeThanks:
     .string "…It doesn't seem to have changed\n"
     .string "in any way at all…\p"
     .string "Hmm…\p"
     .string "Oh, well!\n"
     .string "Thank you very much!$"
 
-LilycoveCity_PokemonCenter_1F_Text_ReallyImprovedThanks: @ 82A9605
+LilycoveCity_PokemonCenter_1F_Text_ReallyImprovedThanks:
     .string "Oh, yay!\n"
     .string "It's really delighted!\p"
     .string "I think it really improved {STR_VAR_1}'s\n"
     .string "{STR_VAR_2} quality, too.\p"
     .string "Thank you so much!$"
 
-LilycoveCity_PokemonCenter_1F_Text_ReadyToEnterContests: @ 82A9669
+LilycoveCity_PokemonCenter_1F_Text_ReadyToEnterContests:
     .string "Hmm…\p"
     .string "I think we may be ready to enter\n"
     .string "some CONTESTS.\p"
     .string "If you see us in one somewhere,\n"
     .string "I hope you'll cheer for us.$"
 
-LilycoveCity_PokemonCenter_1F_Text_Zigzagoon: @ 82A96DA
+LilycoveCity_PokemonCenter_1F_Text_Zigzagoon:
     .string "{STR_VAR_1}: Guguuh!$"
 
-LilycoveCity_PokemonCenter_1F_Text_Kecleon: @ 82A96E6
+LilycoveCity_PokemonCenter_1F_Text_Kecleon:
     .string "{STR_VAR_1}: Igigigiiih!$"
 
-LilycoveCity_PokemonCenter_1F_Text_Poochyena: @ 82A96F6
+LilycoveCity_PokemonCenter_1F_Text_Poochyena:
     .string "{STR_VAR_1}: Baaarun…$"
 
-LilycoveCity_PokemonCenter_1F_Text_Pikachu: @ 82A9703
+LilycoveCity_PokemonCenter_1F_Text_Pikachu:
     .string "{STR_VAR_1}: Pikka!$"
 
-LilycoveCity_PokemonCenter_1F_Text_Skitty: @ 82A970E
+LilycoveCity_PokemonCenter_1F_Text_Skitty:
     .string "{STR_VAR_1}: Umyaaaan!$"
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index a6585ca4d..a9c008e5e 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -1,4 +1,4 @@
-MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan:: @ 828E066
+MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan::
 	special ScrSpecial_GetCurrentMauvilleMan
 	switch VAR_RESULT
 	case MAUVILLE_MAN_BARD, MauvilleCity_PokemonCenter_1F_EventScript_Bard
@@ -9,7 +9,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan:: @ 828E066
 	end
 
 @ Bard
-MauvilleCity_PokemonCenter_1F_EventScript_Bard:: @ 828E0A6
+MauvilleCity_PokemonCenter_1F_EventScript_Bard::
 	lock
 	faceplayer
 	msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong, MSGBOX_YESNO
@@ -19,7 +19,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Bard:: @ 828E0A6
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_PlaySong:: @ 828E0C7
+MauvilleCity_PokemonCenter_1F_EventScript_PlaySong::
 	setvar VAR_0x8004, 0
 	special ScrSpecial_PlayBardSong
 	delay 60
@@ -30,12 +30,12 @@ MauvilleCity_PokemonCenter_1F_EventScript_PlaySong:: @ 828E0C7
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong:: @ 828E0EA
+MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues1, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics:: @ 828E0F4
+MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics, MSGBOX_YESNO
 	compare VAR_RESULT, YES
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics
@@ -43,7 +43,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics:: @ 828E0F4
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics:: @ 828E113
+MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics::
 	setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG
 	call Common_ShowEasyChatScreen
 	lock
@@ -62,13 +62,13 @@ MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics:: @ 828E113
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics:: @ 828E15D
+MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues2, MSGBOX_DEFAULT
 	release
 	end
 
 @ Hipster
-MauvilleCity_PokemonCenter_1F_EventScript_Hipster:: @ 828E167
+MauvilleCity_PokemonCenter_1F_EventScript_Hipster::
 	lock
 	faceplayer
 	setflag FLAG_SYS_HIPSTER_MEET
@@ -80,7 +80,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Hipster:: @ 828E167
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord:: @ 828E18C
+MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord::
 	special ScrSpecial_HipsterTeachWord
 	compare VAR_RESULT, TRUE
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TeachWord
@@ -88,73 +88,73 @@ MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord:: @ 828E18C
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_TeachWord:: @ 828E1A4
+MauvilleCity_PokemonCenter_1F_EventScript_TeachWord::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase, MSGBOX_DEFAULT
 	special ScrSpecial_SetHipsterSpokenFlag
 	release
 	end
 
 @ Trader
-MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor: @ 828E1B1
+MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor:
 	.string "Hi, I'm the TRADER.\n"
 	.string "Want to trade decorations with me?$"
 
-MauvilleCity_PokemonCenter_1F_Text_TraderFeelingTheBlues: @ 828E1E8
+MauvilleCity_PokemonCenter_1F_Text_TraderFeelingTheBlues:
 	.string "Oh…\n"
 	.string "You've left me feeling the blues…$"
 
-MauvilleCity_PokemonCenter_1F_Text_WeveAlreadyTraded: @ 828E20E
+MauvilleCity_PokemonCenter_1F_Text_WeveAlreadyTraded:
 	.string "But we've traded decorations already,\n"
 	.string "you and I.$"
 
-MauvilleCity_PokemonCenter_1F_Text_PickADecorItem: @ 828E23F
+MauvilleCity_PokemonCenter_1F_Text_PickADecorItem:
 	.string "If you see any decorative item that\n"
 	.string "you want of mine, speak up.$"
 
-MauvilleCity_PokemonCenter_1F_Text_YouDontWantAnything: @ 828E27F
+MauvilleCity_PokemonCenter_1F_Text_YouDontWantAnything:
 	.string "You don't want anything?\n"
 	.string "I feel unwanted…$"
 
-MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt: @ 828E2A9
+MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt:
 	.string "That decorative item once belonged\n"
 	.string "to {STR_VAR_1}.\p"
 	.string "Do you want it?$"
 
-MauvilleCity_PokemonCenter_1F_Text_YouDontHaveAnyDecor: @ 828E2E3
+MauvilleCity_PokemonCenter_1F_Text_YouDontHaveAnyDecor:
 	.string "Uh… Wait a second. You don't have a\n"
 	.string "single piece of decoration!$"
 
-MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade: @ 828E323
+MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade:
 	.string "Okay, pick the decoration that you'll\n"
 	.string "trade to me.$"
 
-MauvilleCity_PokemonCenter_1F_Text_YouDontWantToTrade: @ 828E356
+MauvilleCity_PokemonCenter_1F_Text_YouDontWantToTrade:
 	.string "You won't trade with me?\n"
 	.string "I feel unwanted…$"
 
-MauvilleCity_PokemonCenter_1F_Text_YouveNoRoomForThis: @ 828E380
+MauvilleCity_PokemonCenter_1F_Text_YouveNoRoomForThis:
 	.string "You've got all the {STR_VAR_2}S that can\n"
 	.string "be stored. You've no room for this.$"
 
-MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor: @ 828E3C4
+MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor:
 	.string "Okay, so we'll trade my {STR_VAR_3}\n"
 	.string "for your {STR_VAR_2}?$"
 
-MauvilleCity_PokemonCenter_1F_Text_ThatDecorIsInUse: @ 828E3EC
+MauvilleCity_PokemonCenter_1F_Text_ThatDecorIsInUse:
 	.string "That piece of decoration is in use.\n"
 	.string "You can't trade it.$"
 
-MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC: @ 828E424
+MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC:
 	.string "Then we'll trade!\n"
 	.string "I'll send my decoration to your PC.$"
 
-MauvilleCity_PokemonCenter_1F_Text_CantTradeThatOne: @ 828E45A
+MauvilleCity_PokemonCenter_1F_Text_CantTradeThatOne:
 	.string "Oops! Sorry! That's a really rare\n"
 	.string "piece of decoration.\l"
 	.string "I can't trade that one away!\p"
 	.string "Can I interest you in something else?$"
 
-MauvilleCity_PokemonCenter_1F_EventScript_Trader:: @ 828E4D4
+MauvilleCity_PokemonCenter_1F_EventScript_Trader::
 	lock
 	faceplayer
 	msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO
@@ -168,17 +168,17 @@ MauvilleCity_PokemonCenter_1F_EventScript_Trader:: @ 828E4D4
 	goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade:: @ 828E503
+MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_TraderFeelingTheBlues, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded:: @ 828E50D
+MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_WeveAlreadyTraded, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive:: @ 828E517
+MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive::
 	special ScrSpecial_TraderMenuGetDecoration
 	waitstate
 	compare VAR_0x8004, 0
@@ -194,29 +194,29 @@ MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive:: @ 828E517
 	goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor:: @ 828E558
+MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontWantAnything, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor:: @ 828E562
+MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor::
 	message MauvilleCity_PokemonCenter_1F_Text_CantTradeThatOne
 	waitmessage
 	goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor:: @ 828E56E
+MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor::
 	message MauvilleCity_PokemonCenter_1F_Text_PickADecorItem
 	waitmessage
 	goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor:: @ 828E57A
+MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontHaveAnyDecor, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive:: @ 828E584
+MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade, MSGBOX_DEFAULT
 	special ScrSpecial_TraderMenuGiveDecoration
 	waitstate
@@ -235,43 +235,43 @@ MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive:: @ 828E584
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor:: @ 828E5D4
+MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontWantToTrade, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse:: @ 828E5DE
+MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_ThatDecorIsInUse, MSGBOX_DEFAULT
 	goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor:: @ 828E5EC
+MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_YouveNoRoomForThis, MSGBOX_DEFAULT
 	release
 	end
 
 @ Storyteller
-MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale: @ 828E5F6
+MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale:
 	.string "I'm the STORYTELLER.\n"
 	.string "I'll tell you tales of legendary\l"
 	.string "TRAINERS.\p"
 	.string "Will you hear my tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_StorytellerFeelingTheBlues: @ 828E64D
+MauvilleCity_PokemonCenter_1F_Text_StorytellerFeelingTheBlues:
 	.string "Oh…\n"
 	.string "You've left me feeling the blues…$"
 
-MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell: @ 828E673
+MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell:
 	.string "I know of these legends.\n"
 	.string "Which tale will you have me tell?$"
 
-MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales: @ 828E6AE
+MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales:
 	.string "But, I know of no legendary TRAINERS.\n"
 	.string "Hence, I know no tales.\p"
 	.string "Where does one find a TRAINER worthy\n"
 	.string "of a legendary tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_YouDidStatXTimes: @ 828E726
+MauvilleCity_PokemonCenter_1F_Text_YouDidStatXTimes:
 	.string "What's that?!\n"
 	.string "You… You…\p"
 	.string "{STR_VAR_2}\n"
@@ -279,39 +279,39 @@ MauvilleCity_PokemonCenter_1F_Text_YouDidStatXTimes: @ 828E726
 	.string "That is indeed magnificent!\n"
 	.string "It's the birth of a new legend!$"
 
-MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends: @ 828E78A
+MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends:
 	.string "It gets me thinking, could there be\n"
 	.string "other TRAINERS with more impressive\l"
 	.string "legends awaiting discovery?$"
 
-MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales: @ 828E7EE
+MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales:
 	.string "Are you a TRAINER?\p"
 	.string "Then tell me, have you any tales that\n"
 	.string "are even remotely legendary?$"
 
 @ Unused
-MauvilleCity_PokemonCenter_1F_Text_HearAnotherLegendaryTale: @ 828E844
+MauvilleCity_PokemonCenter_1F_Text_HearAnotherLegendaryTale:
 	.string "Incidentally… Would you care to hear\n"
 	.string "another legendary tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend: @ 828E881
+MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend:
 	.string "Hmm…\n"
 	.string "I'm not satisfied…\p"
 	.string "I wish you would bring me news worthy\n"
 	.string "of being called a legend.$"
 
-MauvilleCity_PokemonCenter_1F_Text_IWishMorePeopleWereInterested: @ 828E8D9
+MauvilleCity_PokemonCenter_1F_Text_IWishMorePeopleWereInterested:
 	.string "I wish more people would be interested\n"
 	.string "in hearing my epic tales of legendary\l"
 	.string "TRAINERS.$"
 
-MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle:: @ 828E930
+MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle::
 	.string "The Save-Happy TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_SavedGameAction:: @ 828E947
+MauvilleCity_PokemonCenter_1F_Text_SavedGameAction::
 	.string "Saved the game$"
 
-MauvilleCity_PokemonCenter_1F_Text_SavedGameStory:: @ 828E956
+MauvilleCity_PokemonCenter_1F_Text_SavedGameStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER saved the game\n"
@@ -319,13 +319,13 @@ MauvilleCity_PokemonCenter_1F_Text_SavedGameStory:: @ 828E956
 	.string "A more cautious TRAINER than\n"
 	.string "{STR_VAR_3} one will never find!$"
 
-MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle:: @ 828E9D7
+MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle::
 	.string "The Trendsetter TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction:: @ 828E9EF
+MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction::
 	.string "Started trends$"
 
-MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory:: @ 828E9FE
+MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER started new trends\n"
@@ -333,13 +333,13 @@ MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory:: @ 828E9FE
 	.string "{STR_VAR_3} is setting trends for all\n"
 	.string "the HOENN region!$"
 
-MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle:: @ 828EA7D
+MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle::
     .string "The BERRY-Planting TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction:: @ 828EA98
+MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction::
 	.string "Planted BERRIES$"
 
-MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory:: @ 828EAA8
+MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER planted BERRIES\n"
@@ -347,13 +347,13 @@ MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory:: @ 828EAA8
 	.string "{STR_VAR_3} is a legendary lover of\n"
 	.string "BERRIES!$"
 
-MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle:: @ 828EB19
+MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle::
 	.string "The BIKE-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction:: @ 828EB31
+MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction::
 	.string "Traded BIKES$"
 
-MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory:: @ 828EB3E
+MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER swapped BIKES\n"
@@ -361,13 +361,13 @@ MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory:: @ 828EB3E
 	.string "{STR_VAR_3} must love BIKES deeply\n"
 	.string "and passionately!$"
 
-MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle:: @ 828EBB5
+MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle::
 	.string "The Interviewed TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_InterviewsAction:: @ 828EBCD
+MauvilleCity_PokemonCenter_1F_Text_InterviewsAction::
 	.string "Got interviewed$"
 
-MauvilleCity_PokemonCenter_1F_Text_InterviewsStory:: @ 828EBDD
+MauvilleCity_PokemonCenter_1F_Text_InterviewsStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got interviewed\n"
@@ -375,26 +375,26 @@ MauvilleCity_PokemonCenter_1F_Text_InterviewsStory:: @ 828EBDD
 	.string "{STR_VAR_3} must be a TRAINER who's\n"
 	.string "attracting much attention!$"
 
-MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle:: @ 828EC60
+MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle::
 	.string "The Battle-Happy TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction:: @ 828EC79
+MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction::
 	.string "Battled$"
 
-MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesStory:: @ 828EC81
+MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER battled {STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must be a TRAINER who can\n"
 	.string "never refuse a chance to battle!$"
 
-MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle:: @ 828ED04
+MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle::
 	.string "The POKéMON-Catching TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction:: @ 828ED21
+MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction::
 	.string "Caught POKéMON$"
 
-MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory:: @ 828ED30
+MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -402,13 +402,13 @@ MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory:: @ 828ED30
 	.string "{STR_VAR_3} is a legendary catcher of\n"
 	.string "wild POKéMON!$"
 
-MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle:: @ 828EDA1
+MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle::
 	.string "The Fishing TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction:: @ 828EDB5
+MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction::
 	.string "Caught POKéMON with a ROD$"
 
-MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory:: @ 828EDCF
+MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -416,13 +416,13 @@ MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory:: @ 828EDCF
 	.string "{STR_VAR_3} is a legendary fishing\n"
 	.string "expert!$"
 
-MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle:: @ 828EE45
+MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle::
 	.string "The EGG-Warming TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction:: @ 828EE5D
+MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction::
 	.string "Hatched EGGS$"
 
-MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory:: @ 828EE6A
+MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER hatched {STR_VAR_1} POKéMON\n"
@@ -430,13 +430,13 @@ MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory:: @ 828EE6A
 	.string "{STR_VAR_3} is a legendary warmer\n"
 	.string "of EGGS!$"
 
-MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle:: @ 828EEDD
+MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle::
 	.string "The Evolver TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction:: @ 828EEF1
+MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction::
 	.string "Evolved POKéMON$"
 
-MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory:: @ 828EF01
+MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {STR_VAR_1} POKéMON\n"
@@ -444,13 +444,13 @@ MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory:: @ 828EF01
 	.string "{STR_VAR_3} is the ultimate evolver\n"
 	.string "of POKéMON!$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle:: @ 828EF73
+MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle::
 	.string "The POKéMON CENTER-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction:: @ 828EF95
+MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction::
 	.string "Used POKéMON CENTERS$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory:: @ 828EFAA
+MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -458,13 +458,13 @@ MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory:: @ 828EFAA
 	.string "There could be no greater lover of\n"
 	.string "POKéMON CENTERS than {STR_VAR_3}!$"
 
-MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle:: @ 828F045
+MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle::
 	.string "The Homebody TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction:: @ 828F05A
+MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction::
 	.string "Rested POKéMON at home$"
 
-MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory:: @ 828F071
+MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -472,13 +472,13 @@ MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory:: @ 828F071
 	.string "There could be no more of a homebody\n"
 	.string "than {STR_VAR_3}!$"
 
-MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle:: @ 828F0F3
+MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle::
 	.string "The SAFARI-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction:: @ 828F10D
+MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction::
 	.string "Entered the SAFARI ZONE$"
 
-MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory:: @ 828F125
+MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER went into the SAFARI ZONE\n"
@@ -486,13 +486,13 @@ MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory:: @ 828F125
 	.string "{STR_VAR_3} is a TRAINER whose wild side\n"
 	.string "must come out in the SAFARI ZONE!$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle:: @ 828F1BE
+MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle::
 	.string "The CUT-Frenzy TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedCutAction:: @ 828F1D5
+MauvilleCity_PokemonCenter_1F_Text_UsedCutAction::
 	.string "Used CUT$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedCutStory:: @ 828F1DE
+MauvilleCity_PokemonCenter_1F_Text_UsedCutStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used CUT\n"
@@ -500,13 +500,13 @@ MauvilleCity_PokemonCenter_1F_Text_UsedCutStory:: @ 828F1DE
 	.string "{STR_VAR_3} is a TRAINER who just must\n"
 	.string "love to CUT!$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle:: @ 828F24F
+MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle::
 	.string "The ROCK-SMASHING TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction:: @ 828F269
+MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction::
 	.string "Smashed rocks$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory:: @ 828F277
+MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used ROCK SMASH\n"
@@ -514,13 +514,13 @@ MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory:: @ 828F277
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "can't leave a stone unsmashed!$"
 
-MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle:: @ 828F2FC
+MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle::
 	.string "The Move-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction:: @ 828F314
+MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction::
 	.string "Moved the SECRET BASE$"
 
-MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory:: @ 828F32A
+MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER moved the SECRET BASE\n"
@@ -528,13 +528,13 @@ MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory:: @ 828F32A
 	.string "{STR_VAR_3} is a TRAINER who loves\n"
 	.string "to move houses often!$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle:: @ 828F3AD
+MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle::
 	.string "The SPLASH-Happy TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction:: @ 828F3C6
+MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction::
 	.string "Used SPLASH$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory:: @ 828F3D2
+MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used SPLASH\n"
@@ -542,13 +542,13 @@ MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory:: @ 828F3D2
 	.string "{STR_VAR_3} is a TRAINER who must love\n"
 	.string "SPLASHING around!$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle:: @ 828F44B
+MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle::
 	.string "The Tenacious TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction:: @ 828F461
+MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction::
 	.string "Resorted to using STRUGGLE$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory:: @ 828F47C
+MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER had to rely on STRUGGLE\n"
@@ -556,13 +556,13 @@ MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory:: @ 828F47C
 	.string "{STR_VAR_3} is a tenacious TRAINER\n"
 	.string "who never gives in to adversity!$"
 
-MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle:: @ 828F50C
+MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle::
 	.string "The SLOT Champ$"
 
-MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction:: @ 828F51B
+MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction::
 	.string "Won the jackpot on the SLOTS$"
 
-MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory:: @ 828F538
+MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won the jackpot on\n"
@@ -570,13 +570,13 @@ MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory:: @ 828F538
 	.string "{STR_VAR_3} is a TRAINER who was lucky\n"
 	.string "on the SLOTS!$"
 
-MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle:: @ 828F5BE
+MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle::
 	.string "The ROULETTE Champ$"
 
-MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction:: @ 828F5D1
+MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction::
 	.string "Had consecutive ROULETTE wins of$"
 
-MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory:: @ 828F5F2
+MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won in ROULETTE\n"
@@ -584,13 +584,13 @@ MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory:: @ 828F5F2
 	.string "{STR_VAR_3} was lucky when the ball\n"
 	.string "bounced in ROULETTE!$"
 
-MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle:: @ 828F678
+MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle::
 	.string "The BATTLE TOWER Challenger$"
 
-MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction:: @ 828F694
+MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction::
 	.string "Took the BATTLE TOWER challenge$"
 
-MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory:: @ 828F6B4
+MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER took the BATTLE TOWER\n"
@@ -598,13 +598,13 @@ MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory:: @ 828F6B4
 	.string "{STR_VAR_3} is a TRAINER who aspires\n"
 	.string "for excellence in the BATTLE TOWER!$"
 
-MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle:: @ 828F751
+MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle::
 	.string "The Blend-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction:: @ 828F76A
+MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction::
 	.string "Made {POKEBLOCK}S$"
 
-MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory:: @ 828F776
+MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {POKEBLOCK}S\n"
@@ -612,13 +612,13 @@ MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory:: @ 828F776
 	.string "There is none better at using a BERRY\n"
 	.string "BLENDER than {STR_VAR_3}!$"
 
-MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle:: @ 828F7F6
+MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle::
 	.string "The CONTEST-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction:: @ 828F811
+MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction::
 	.string "Entered CONTESTS$"
 
-MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory:: @ 828F822
+MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER entered CONTESTS\n"
@@ -626,13 +626,13 @@ MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory:: @ 828F822
 	.string "{STR_VAR_3} must love showing off\n"
 	.string "POKéMON to others!$"
 
-MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle:: @ 828F89C
+MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle::
 	.string "The CONTEST Master$"
 
-MauvilleCity_PokemonCenter_1F_Text_WonContestsAction:: @ 828F8AF
+MauvilleCity_PokemonCenter_1F_Text_WonContestsAction::
 	.string "Won CONTESTS$"
 
-MauvilleCity_PokemonCenter_1F_Text_WonContestsStory:: @ 828F8BC
+MauvilleCity_PokemonCenter_1F_Text_WonContestsStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won CONTESTS\n"
@@ -640,13 +640,13 @@ MauvilleCity_PokemonCenter_1F_Text_WonContestsStory:: @ 828F8BC
 	.string "{STR_VAR_3} must be an incredible\n"
 	.string "CONTEST master!$"
 
-MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle:: @ 828F92F
+MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle::
 	.string "The Happy Shopper$"
 
-MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction:: @ 828F941
+MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction::
 	.string "Shopped$"
 
-MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory:: @ 828F949
+MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bought items in shops\n"
@@ -654,13 +654,13 @@ MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory:: @ 828F949
 	.string "{STR_VAR_3} must be one of those\n"
 	.string "people who are born to shop.$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle:: @ 828F9D1
+MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle::
 	.string "The Item-Finding TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction:: @ 828F9EA
+MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction::
 	.string "Used an ITEMFINDER$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory:: @ 828F9FD
+MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used an ITEMFINDER\n"
@@ -668,13 +668,13 @@ MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory:: @ 828F9FD
 	.string "{STR_VAR_3} must enjoy scouring the\n"
 	.string "ground for hidden items!$"
 
-MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle:: @ 828FA81
+MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle::
 	.string "The Rain-Soaked TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction:: @ 828FA99
+MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction::
 	.string "Got rained on$"
 
-MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory:: @ 828FAA7
+MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got soaked by rain\n"
@@ -682,13 +682,13 @@ MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory:: @ 828FAA7
 	.string "{STR_VAR_3}'s charisma must even\n"
 	.string "attract rain!$"
 
-MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle:: @ 828FB1D
+MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle::
 	.string "The Avid POKéDEX Reader$"
 
-MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction:: @ 828FB35
+MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction::
 	.string "Checked a POKéDEX$"
 
-MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory:: @ 828FB47
+MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked a POKéDEX\n"
@@ -696,13 +696,13 @@ MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory:: @ 828FB47
 	.string "{STR_VAR_3} must love inspecting\n"
 	.string "POKéMON in a POKéDEX!$"
 
-MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle:: @ 828FBC4
+MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle::
 	.string "The RIBBON Collector$"
 
-MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction:: @ 828FBD9
+MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction::
 	.string "Received RIBBONS$"
 
-MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory:: @ 828FBEA
+MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER received RIBBONS\n"
@@ -710,13 +710,13 @@ MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory:: @ 828FBEA
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "loves to collect RIBBONS!$"
 
-MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle:: @ 828FC6B
+MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle::
 	.string "The Ledge-Jumping TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction:: @ 828FC85
+MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction::
 	.string "Jumped down ledges$"
 
-MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory:: @ 828FC98
+MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER jumped down ledges\n"
@@ -724,26 +724,26 @@ MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory:: @ 828FC98
 	.string "If there's a ledge to be jumped,\n"
 	.string "{STR_VAR_3} can't ignore it!$"
 
-MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle:: @ 828FD1D
+MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle::
 	.string "The Legendary TV Viewer$"
 
-MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction:: @ 828FD35
+MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction::
 	.string "Watched TV$"
 
-MauvilleCity_PokemonCenter_1F_Text_TVWatchedStory:: @ 828FD40
+MauvilleCity_PokemonCenter_1F_Text_TVWatchedStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER watched TV\n"
 	.string "{STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must love watching TV!$"
 
-MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle:: @ 828FDA2
+MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle::
 	.string "The Time-Conscious TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction:: @ 828FDBD
+MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction::
 	.string "Checked the time$"
 
-MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory:: @ 828FDCE
+MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked the time\n"
@@ -751,13 +751,13 @@ MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory:: @ 828FDCE
 	.string "{STR_VAR_3} must be a punctual TRAINER\n"
 	.string "who's conscious of the time.$"
 
-MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle:: @ 828FE57
+MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle::
 	.string "The POKéMON LOTTERY Wizard$"
 
-MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction:: @ 828FE72
+MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction::
 	.string "Won POKéMON LOTTERIES$"
 
-MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory:: @ 828FE88
+MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won POKéMON LOTTERIES\n"
@@ -765,13 +765,13 @@ MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory:: @ 828FE88
 	.string "{STR_VAR_3} must have many friends\n"
 	.string "to trade POKéMON with!$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle:: @ 828FF0C
+MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle::
 	.string "The DAY CARE-Using Trainer$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction:: @ 828FF27
+MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction::
 	.string "Left POKéMON at the DAY CARE$"
 
-MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory:: @ 828FF44
+MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER left POKéMON with the\n"
@@ -779,13 +779,13 @@ MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory:: @ 828FF44
 	.string "{STR_VAR_3} must be a real go-getter\n"
 	.string "who raises POKéMON aggressively!$"
 
-MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle:: @ 828FFDD
+MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle::
 	.string "The CABLE CAR-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction:: @ 828FFFA
+MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction::
 	.string "Rode the CABLE CAR$"
 
-MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory:: @ 829000D
+MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER rode the CABLE CAR\n"
@@ -793,13 +793,13 @@ MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory:: @ 829000D
 	.string "{STR_VAR_3} must be a busy TRAINER\n"
 	.string "who's up and down all the time!$"
 
-MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle:: @ 8290097
+MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle::
 	.string "The Hot Spring-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction:: @ 82900B5
+MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction::
 	.string "Bathed in hot springs$"
 
-MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory:: @ 82900CB
+MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory::
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bathed in hot springs\n"
@@ -808,7 +808,7 @@ MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory:: @ 82900CB
 	.string "baby-smooth skin!$"
 
 
-MauvilleCity_PokemonCenter_1F_EventScript_Storyteller:: @ 829014A
+MauvilleCity_PokemonCenter_1F_EventScript_Storyteller::
 	lock
 	faceplayer
 	setvar VAR_0x8008, 0
@@ -836,20 +836,20 @@ MauvilleCity_PokemonCenter_1F_EventScript_Storyteller:: @ 829014A
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales
 	goto MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale
 
-MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection:: @ 82901B7
+MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection::
 	goto MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales:: @ 82901BD
+MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded
 	compare VAR_RESULT, TRUE
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd
 	goto MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales
 
-MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales:: @ 82901DA
+MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales, MSGBOX_DEFAULT
-MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales:: @ 82901E2
+MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
@@ -860,45 +860,45 @@ MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales:: @ 82901E2
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale:: @ 829020F
+MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_YouDidStatXTimes, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller:: @ 8290219
+MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_StorytellerFeelingTheBlues, MSGBOX_DEFAULT
 	release
 	end
 
 @ Unused
-MauvilleCity_PokemonCenter_1F_EventScript_WaitingForRecordMix:: @ 8290223
+MauvilleCity_PokemonCenter_1F_EventScript_WaitingForRecordMix::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_IWishMorePeopleWereInterested, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd:: @ 829022D
+MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd::
 	release
 	end
 
 @ Giddy
-MauvilleCity_PokemonCenter_1F_Text_HearMyStory: @ 829022F
+MauvilleCity_PokemonCenter_1F_Text_HearMyStory:
 	.string "I'm GIDDY!\n"
 	.string "I have a scintillating story for you!\p"
 	.string "Would you like to hear my story?$"
 
-MauvilleCity_PokemonCenter_1F_Text_GiddyFeelingTheBlues: @ 8290281
+MauvilleCity_PokemonCenter_1F_Text_GiddyFeelingTheBlues:
 	.string "Oh…\n"
 	.string "You've left me feeling the blues…$"
 
-MauvilleCity_PokemonCenter_1F_Text_AlsoIWasThinking: @ 82902A7
+MauvilleCity_PokemonCenter_1F_Text_AlsoIWasThinking:
 	.string "Also, I was thinking…$"
 
-MauvilleCity_PokemonCenter_1F_Text_WeShouldChatAgain: @ 82902BD
+MauvilleCity_PokemonCenter_1F_Text_WeShouldChatAgain:
 	.string "That's about it, I think…\p"
 	.string "We should chat again!\n"
 	.string "Bye-bye!$"
 
-MauvilleCity_PokemonCenter_1F_EventScript_Giddy:: @ 82902F6
+MauvilleCity_PokemonCenter_1F_EventScript_Giddy::
 	lock
 	faceplayer
 	msgbox MauvilleCity_PokemonCenter_1F_Text_HearMyStory, MSGBOX_YESNO
@@ -908,7 +908,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_Giddy:: @ 82902F6
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale:: @ 8290317
+MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale::
 	special ScrSpecial_GiddyShouldTellAnotherTale
 	compare VAR_RESULT, TRUE
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale
@@ -916,7 +916,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale:: @ 8290317
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale:: @ 8290331
+MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale::
 	special ScrSpecial_GiddyShouldTellAnotherTale
 	compare VAR_RESULT, TRUE
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale
@@ -924,13 +924,13 @@ MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale:: @ 8290331
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale:: @ 829034B
+MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_AlsoIWasThinking, MSGBOX_DEFAULT
 	goto MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale
 	end
 
 @ Regardless of whether yes or no is selected below, Giddy will continue to tell stories until he's told 10
-MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale:: @ 8290359
+MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale::
 	special ScrSpecial_GenerateGiddyLine
 	special ShowFieldMessageStringVar4
 	waitmessage
@@ -941,29 +941,29 @@ MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale:: @ 8290359
 	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy:: @ 829037A
+MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_GiddyFeelingTheBlues, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales:: @ 8290384
+MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales::
 	msgbox MauvilleCity_PokemonCenter_1F_Text_WeShouldChatAgain, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong: @ 829038E
+MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong:
 	.string "Hi, I'm the BARD.\n"
 	.string "Would you like to hear my song?$"
 
-MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues1: @ 82903C0
+MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues1:
 	.string "Oh…\n"
 	.string "You've left me feeling the blues…$"
 
-MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers: @ 82903E6
+MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers:
 	.string "Oh, what a moving song…\n"
 	.string "I wish I could play it for others…$"
 
-MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics: @ 8290421
+MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics:
 	.string "So?\n"
 	.string "How do you like my song?\p"
 	.string "But I'm none too happy about\n"
@@ -971,38 +971,38 @@ MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics: @ 8290421
 	.string "How would you like to write some\n"
 	.string "new lyrics for me?$"
 
-MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues2: @ 829049B
+MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues2:
 	.string "Oh…\n"
 	.string "You've left me feeling the blues…$"
 
-MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou: @ 82904C1
+MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou:
 	.string "Thank you kindly!\n"
 	.string "Let me sing it for you.$"
 
-MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo: @ 82904EB
+MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo:
 	.string "Was that how you wanted your song\n"
 	.string "to go?$"
 
-MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile: @ 8290514
+MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile:
 	.string "Okay! That's it, then.\n"
 	.string "I'll sing this song for a while.$"
 
-MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening: @ 829054C
+MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening:
 	.string "Hey, yo! They call me the HIPSTER.\n"
 	.string "I'll teach you what's hip and happening.$"
 
-MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou: @ 8290598
+MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou:
 	.string "But, hey, I taught you what's hip and\n"
 	.string "happening already.\p"
 	.string "I'd like to spread the good word to\n"
 	.string "other folks.$"
 
-MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach: @ 8290602
+MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach:
 	.string "But, hey, you already know a lot about\n"
 	.string "what's hip and happening.\p"
 	.string "I've got nothing new to teach you!$"
 
-MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase: @ 8290666
+MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase:
 	.string "Hey, have you heard about\n"
 	.string "“{STR_VAR_1}”?\p"
 	.string "What's it mean? Well…\n"
diff --git a/data/scripts/mevent.inc b/data/scripts/mevent.inc
index 731154315..b33a33270 100644
--- a/data/scripts/mevent.inc
+++ b/data/scripts/mevent.inc
@@ -1,4 +1,4 @@
-EventScript_Questionnaire:: @ 827381B
+EventScript_Questionnaire::
 	lockall
 	msgbox Mevent_Text_FillOutQuestionnaire, MSGBOX_YESNO
 	compare VAR_RESULT, NO
@@ -18,7 +18,7 @@ EventScript_Questionnaire:: @ 827381B
 	goto_if_eq Mevent_EventScript_QuestionnaireThankYou
 	end
 
-Mevent_EventScript_PlayerInputMysteryEventPhrase:: @ 827386D
+Mevent_EventScript_PlayerInputMysteryEventPhrase::
 	goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou
 	goto_if_set FLAG_SYS_MYSTERY_EVENT_ENABLE, Mevent_EventScript_QuestionnaireThankYou
 	applymovement VAR_0x8008, Common_Movement_FaceDown
@@ -34,7 +34,7 @@ Mevent_EventScript_PlayerInputMysteryEventPhrase:: @ 827386D
 	releaseall
 	end
 
-Mevent_EventScript_PlayerInputMysteryGiftPhrase:: @ 82738B5
+Mevent_EventScript_PlayerInputMysteryGiftPhrase::
 	goto_if_unset FLAG_SYS_POKEDEX_GET, Mevent_EventScript_QuestionnaireThankYou
 	goto_if_set FLAG_SYS_MYSTERY_GIFT_ENABLE, Mevent_EventScript_QuestionnaireThankYou
 	applymovement VAR_0x8008, Common_Movement_FaceDown
@@ -50,11 +50,11 @@ Mevent_EventScript_PlayerInputMysteryGiftPhrase:: @ 82738B5
 	releaseall
 	end
 
-Mevent_EventScript_Release:: @ 82738FD
+Mevent_EventScript_Release::
 	releaseall
 	end
 
-Mevent_EventScript_QuestionnaireThankYou:: @ 82738FF
+Mevent_EventScript_QuestionnaireThankYou::
 	applymovement VAR_0x8008, Common_Movement_FaceDown
 	waitmovement 0
 	msgbox Mevent_Text_QuestionnaireThankYou, MSGBOX_DEFAULT
diff --git a/data/scripts/mevent_altering_cave.inc b/data/scripts/mevent_altering_cave.inc
index 499907edd..7e9b0a758 100644
--- a/data/scripts/mevent_altering_cave.inc
+++ b/data/scripts/mevent_altering_cave.inc
@@ -1,10 +1,10 @@
-MysteryEventScript_AlteringCave:: @ 86756E3
+MysteryEventScript_AlteringCave::
 	setvaddress MysteryEventScript_AlteringCave
 	addvar VAR_ALTERING_CAVE_WILD_SET, 1
 	compare VAR_ALTERING_CAVE_WILD_SET, 10
 	vgoto_if_ne MysteryEventScript_AlteringCave_
 	setvar VAR_ALTERING_CAVE_WILD_SET, 0
-MysteryEventScript_AlteringCave_: @ 86756FD
+MysteryEventScript_AlteringCave_:
 	lock
 	faceplayer
 	vmessage sText_MysteryGiftAlteringCave
diff --git a/data/scripts/mevent_aurora_ticket.inc b/data/scripts/mevent_aurora_ticket.inc
index f26be068f..9d7334638 100644
--- a/data/scripts/mevent_aurora_ticket.inc
+++ b/data/scripts/mevent_aurora_ticket.inc
@@ -1,4 +1,4 @@
-MysteryEventScript_AuroraTicket:: @ 867533C
+MysteryEventScript_AuroraTicket::
 	setvaddress MysteryEventScript_AuroraTicket
 	lock
 	faceplayer
@@ -22,14 +22,14 @@ MysteryEventScript_AuroraTicket:: @ 867533C
 	release
 	end
 
-AuroraTicket_NoBagSpace: @ 8675397
+AuroraTicket_NoBagSpace:
 	vmessage sText_AuroraTicketBagFull
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-AuroraTicket_Obtained: @ 86753A0
+AuroraTicket_Obtained:
 	vmessage sText_AuroraTicketThankYou
 	waitmessage
 	waitbuttonpress
diff --git a/data/scripts/mevent_battle_card.inc b/data/scripts/mevent_battle_card.inc
index 70462bdd9..3a66297e1 100644
--- a/data/scripts/mevent_battle_card.inc
+++ b/data/scripts/mevent_battle_card.inc
@@ -1,4 +1,4 @@
-MysteryEventScript_BattleCard:: @ 867513C
+MysteryEventScript_BattleCard::
 	setvaddress MysteryEventScript_BattleCard
 	vgoto_if_set FLAG_MYSTERY_EVENT_DONE, MysteryEventScript_BattleCardInfo
 	setorcopyvar VAR_RESULT, GET_CARD_BATTLES_WON
@@ -15,7 +15,7 @@ MysteryEventScript_BattleCard:: @ 867513C
 	setflag FLAG_MYSTERY_EVENT_DONE
 	end
 
-MysteryEventScript_BattleCardInfo: @ 8675179
+MysteryEventScript_BattleCardInfo:
 	lock
 	faceplayer
 	vmessage sText_MysteryGiftBattleCountCard
diff --git a/data/scripts/mevent_mystic_ticket.inc b/data/scripts/mevent_mystic_ticket.inc
index 8f938dc33..e085c5a59 100644
--- a/data/scripts/mevent_mystic_ticket.inc
+++ b/data/scripts/mevent_mystic_ticket.inc
@@ -1,4 +1,4 @@
-MysteryEventScript_MysticTicket:: @ 867550B
+MysteryEventScript_MysticTicket::
 	setvaddress MysteryEventScript_MysticTicket
 	lock
 	faceplayer
@@ -23,14 +23,14 @@ MysteryEventScript_MysticTicket:: @ 867550B
 	release
 	end
 
-MysticTicket_NoBagSpace: @ 867556F
+MysticTicket_NoBagSpace:
 	vmessage sText_MysticTicketBagFull
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-MysticTicket_Obtained: @ 8675578
+MysticTicket_Obtained:
 	vmessage sText_MysticTicketThankYou
 	waitmessage
 	waitbuttonpress
diff --git a/data/scripts/mevent_old_sea_map.inc b/data/scripts/mevent_old_sea_map.inc
index 0fb3c1002..68714117b 100644
--- a/data/scripts/mevent_old_sea_map.inc
+++ b/data/scripts/mevent_old_sea_map.inc
@@ -1,4 +1,4 @@
-MysteryEventScript_OldSeaMap:: @ 86757F4
+MysteryEventScript_OldSeaMap::
 	setvaddress MysteryEventScript_OldSeaMap
 	lock
 	faceplayer
@@ -22,14 +22,14 @@ MysteryEventScript_OldSeaMap:: @ 86757F4
 	release
 	end
 
-OldSeaMap_NoBagSpace: @ 867584F
+OldSeaMap_NoBagSpace:
 	vmessage sText_MysteryGiftOldSeaMapBagFull
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-OldSeaMap_Obtained: @ 8675858
+OldSeaMap_Obtained:
 	vmessage sText_MysteryGiftOldSeaMapThankYou
 	waitmessage
 	waitbuttonpress
diff --git a/data/scripts/mevent_pichu.inc b/data/scripts/mevent_pichu.inc
index 2b9e09df9..02b47b41f 100644
--- a/data/scripts/mevent_pichu.inc
+++ b/data/scripts/mevent_pichu.inc
@@ -1,9 +1,9 @@
-MysteryEventScript_SurfPichu:: @ 8674D3D
+MysteryEventScript_SurfPichu::
 	setvaddress MysteryEventScript_SurfPichu
 	vgoto_if_unset FLAG_MYSTERY_EVENT_DONE, SurfPichu_GiveIfPossible
 	returnram
 
-SurfPichu_GiveIfPossible: @ 8674D4C
+SurfPichu_GiveIfPossible:
 	specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
 	compare VAR_EVENT_PICHU_SLOT, PARTY_SIZE
 	vgoto_if_eq SurfPichu_FullParty
@@ -19,7 +19,7 @@ SurfPichu_GiveIfPossible: @ 8674D4C
 	release
 	end
 
-SurfPichu_FullParty: @ 8674D73
+SurfPichu_FullParty:
 	lock
 	faceplayer
 	vmessage sText_FullParty
@@ -28,7 +28,7 @@ SurfPichu_FullParty: @ 8674D73
 	release
 	end
 
-SurfPichu_GiveEgg: @ 8674D7E
+SurfPichu_GiveEgg:
 	giveegg SPECIES_PICHU
 	setmoneventlegal VAR_EVENT_PICHU_SLOT
 	setmonmetlocation VAR_EVENT_PICHU_SLOT, METLOC_FATEFUL_ENCOUNTER
@@ -44,23 +44,23 @@ SurfPichu_GiveEgg: @ 8674D7E
 	vgoto_if_eq SurfPichu_Slot5
 	return
 
-SurfPichu_Slot1: @ 8674DC0
+SurfPichu_Slot1:
 	setmonmove 1, 2, MOVE_SURF
 	return
 
-SurfPichu_Slot2:: @ 8674DC6
+SurfPichu_Slot2::
 	setmonmove 2, 2, MOVE_SURF
 	return
 
-SurfPichu_Slot3: @ 8674DCC
+SurfPichu_Slot3:
 	setmonmove 3, 2, MOVE_SURF
 	return
 
-SurfPichu_Slot4: @ 8674DD2
+SurfPichu_Slot4:
 	setmonmove 4, 2, MOVE_SURF
 	return
 
-SurfPichu_Slot5: @ 8674DD8
+SurfPichu_Slot5:
 	setmonmove 5, 2, MOVE_SURF
 	return
 
diff --git a/data/scripts/mevent_stamp_card.inc b/data/scripts/mevent_stamp_card.inc
index dcef80a50..eeb361854 100644
--- a/data/scripts/mevent_stamp_card.inc
+++ b/data/scripts/mevent_stamp_card.inc
@@ -1,4 +1,4 @@
-MysteryEventScript_StampCard:: @ 8674CB0
+MysteryEventScript_StampCard::
 	setvaddress MysteryEventScript_StampCard
 	setorcopyvar VAR_RESULT, GET_MAX_STAMPS
 	specialvar VAR_0x8008, GetMysteryEventCardVal
diff --git a/data/scripts/mevent_trainer.inc b/data/scripts/mevent_trainer.inc
index 4114750d8..f4318408d 100644
--- a/data/scripts/mevent_trainer.inc
+++ b/data/scripts/mevent_trainer.inc
@@ -1,4 +1,4 @@
-MysteryEventScript_VisitingTrainer:: @ 8674EC1
+MysteryEventScript_VisitingTrainer::
 	setvaddress MysteryEventScript_VisitingTrainer
 	special ValidateEReaderTrainer
 	compare VAR_RESULT, 0
@@ -11,7 +11,7 @@ MysteryEventScript_VisitingTrainer:: @ 8674EC1
 	release
 	end
 
-MysteryEventScript_VisitingTrainerArrived: @ 8674EDF
+MysteryEventScript_VisitingTrainerArrived:
 	lock
 	faceplayer
 	vmessage sText_MysteryGiftVisitingTrainerArrived
diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc
index a7807ce51..cc952749d 100644
--- a/data/scripts/move_tutors.inc
+++ b/data/scripts/move_tutors.inc
@@ -1,4 +1,4 @@
-SlateportCity_PokemonFanClub_EventScript_SwaggerTutor:: @ 82C7F16
+SlateportCity_PokemonFanClub_EventScript_SwaggerTutor::
 	lock
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, MoveTutor_EventScript_SwaggerTaught
@@ -17,17 +17,17 @@ SlateportCity_PokemonFanClub_EventScript_SwaggerTutor:: @ 82C7F16
 	goto MoveTutor_EventScript_SwaggerTaught
 	end
 
-MoveTutor_EventScript_SwaggerDeclined:: @ 82C7F6A
+MoveTutor_EventScript_SwaggerDeclined::
 	msgbox MoveTutor_Text_SwaggerDeclined, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_SwaggerTaught:: @ 82C7F74
+MoveTutor_EventScript_SwaggerTaught::
 	msgbox MoveTutor_Text_SwaggerTaught, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_EventScript_RolloutTutor:: @ 82C7F7E
+MauvilleCity_EventScript_RolloutTutor::
 	lock
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MoveTutor_EventScript_RolloutTaught
@@ -46,17 +46,17 @@ MauvilleCity_EventScript_RolloutTutor:: @ 82C7F7E
 	goto MoveTutor_EventScript_RolloutTaught
 	end
 
-MoveTutor_EventScript_RolloutDeclined:: @ 82C7FD2
+MoveTutor_EventScript_RolloutDeclined::
 	msgbox MoveTutor_Text_RolloutDeclined, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_RolloutTaught:: @ 82C7FDC
+MoveTutor_EventScript_RolloutTaught::
 	msgbox MoveTutor_Text_RolloutTaught, MSGBOX_DEFAULT
 	release
 	end
 
-VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor:: @ 82C7FE6
+VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor::
 	lock
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, MoveTutor_EventScript_FuryCutterTaught
@@ -75,17 +75,17 @@ VerdanturfTown_PokemonCenter_1F_EventScript_FuryCutterTutor:: @ 82C7FE6
 	goto MoveTutor_EventScript_FuryCutterTaught
 	end
 
-MoveTutor_EventScript_FuryCutterDeclined:: @ 82C803A
+MoveTutor_EventScript_FuryCutterDeclined::
 	msgbox MoveTutor_Text_FuryCutterDeclined, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_FuryCutterTaught:: @ 82C8044
+MoveTutor_EventScript_FuryCutterTaught::
 	msgbox MoveTutor_Text_FuryCutterTaught, MSGBOX_DEFAULT
 	release
 	end
 
-LavaridgeTown_House_EventScript_MimicTutor:: @ 82C804E
+LavaridgeTown_House_EventScript_MimicTutor::
 	lock
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, MoveTutor_EventScript_MimicTaught
@@ -104,17 +104,17 @@ LavaridgeTown_House_EventScript_MimicTutor:: @ 82C804E
 	goto MoveTutor_EventScript_MimicTaught
 	end
 
-MoveTutor_EventScript_MimicDeclined:: @ 82C80A2
+MoveTutor_EventScript_MimicDeclined::
 	msgbox MoveTutor_MimicDeclined, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_MimicTaught:: @ 82C80AC
+MoveTutor_EventScript_MimicTaught::
 	msgbox MoveTutor_Text_MimicTaught, MSGBOX_DEFAULT
 	release
 	end
 
-FallarborTown_Mart_EventScript_MetronomeTutor:: @ 82C80B6
+FallarborTown_Mart_EventScript_MetronomeTutor::
 	lock
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, MoveTutor_EventScript_MetronomeTaught
@@ -133,17 +133,17 @@ FallarborTown_Mart_EventScript_MetronomeTutor:: @ 82C80B6
 	goto MoveTutor_EventScript_MetronomeTaught
 	end
 
-MoveTutor_EventScript_MetronomeDeclined:: @ 82C810A
+MoveTutor_EventScript_MetronomeDeclined::
 	msgbox MoveTutor_Text_MetronomeDeclined, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_MetronomeTaught:: @ 82C8114
+MoveTutor_EventScript_MetronomeTaught::
 	msgbox MoveTutor_Text_MetronomeTaught, MSGBOX_DEFAULT
 	release
 	end
 
-FortreeCity_House2_EventScript_SleepTalkTutor:: @ 82C811E
+FortreeCity_House2_EventScript_SleepTalkTutor::
 	lock
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, MoveTutor_EventScript_SleepTalkTaught
@@ -162,17 +162,17 @@ FortreeCity_House2_EventScript_SleepTalkTutor:: @ 82C811E
 	goto MoveTutor_EventScript_SleepTalkTaught
 	end
 
-MoveTutor_EventScript_SleepTalkDeclined:: @ 82C8172
+MoveTutor_EventScript_SleepTalkDeclined::
 	msgbox MoveTutor_Text_SleepTalkDeclined, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_SleepTalkTaught:: @ 82C817C
+MoveTutor_EventScript_SleepTalkTaught::
 	msgbox MoveTutor_Text_SleepTalkTaught, MSGBOX_DEFAULT
 	release
 	end
 
-LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor:: @ 82C8186
+LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor::
 	lock
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, MoveTutor_EventScript_SubstituteTaught
@@ -191,17 +191,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor:: @ 82C8186
 	goto MoveTutor_EventScript_SubstituteTaught
 	end
 
-MoveTutor_EventScript_SubstituteDeclined:: @ 82C81DA
+MoveTutor_EventScript_SubstituteDeclined::
 	msgbox MoveTutor_Text_SubstituteDeclined, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_SubstituteTaught:: @ 82C81E4
+MoveTutor_EventScript_SubstituteTaught::
 	msgbox MoveTutor_Text_SubstituteTaught, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_DynamicPunchTutor:: @ 82C81EE
+MossdeepCity_EventScript_DynamicPunchTutor::
 	lock
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MoveTutor_EventScript_DynamicPunchTaught
@@ -220,17 +220,17 @@ MossdeepCity_EventScript_DynamicPunchTutor:: @ 82C81EE
 	goto MoveTutor_EventScript_DynamicPunchTaught
 	end
 
-MoveTutor_EventScript_DynamicPunchDeclined:: @ 82C8242
+MoveTutor_EventScript_DynamicPunchDeclined::
 	msgbox MoveTutor_Text_DynamicPunchDeclined, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_DynamicPunchTaught:: @ 82C824C
+MoveTutor_EventScript_DynamicPunchTaught::
 	msgbox MoveTutor_Text_DynamicPunchTaught, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor:: @ 82C8256
+SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor::
 	lock
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, MoveTutor_EventScript_DoubleEdgeTaught
@@ -249,17 +249,17 @@ SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor:: @ 82C8256
 	goto MoveTutor_EventScript_DoubleEdgeTaught
 	end
 
-MoveTutor_EventScript_DoubleEdgeDeclined:: @ 82C82AA
+MoveTutor_EventScript_DoubleEdgeDeclined::
 	msgbox MoveTutor_Text_DoubleEdgeDeclined, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_DoubleEdgeTaught:: @ 82C82B4
+MoveTutor_EventScript_DoubleEdgeTaught::
 	msgbox MoveTutor_Text_DoubleEdgeTaught, MSGBOX_DEFAULT
 	release
 	end
 
-PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor:: @ 82C82BE
+PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor::
 	lock
 	faceplayer
 	goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, MoveTutor_EventScript_ExplosionTaught
@@ -278,23 +278,23 @@ PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor:: @ 82C82BE
 	goto MoveTutor_EventScript_ExplosionTaught
 	end
 
-MoveTutor_EventScript_ExplosionDeclined:: @ 82C8312
+MoveTutor_EventScript_ExplosionDeclined::
 	msgbox MoveTutor_Text_ExplosionDeclined, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_ExplosionTaught:: @ 82C831C
+MoveTutor_EventScript_ExplosionTaught::
 	msgbox MoveTutor_Text_ExplosionTaught, MSGBOX_DEFAULT
 	release
 	end
 
-MoveTutor_EventScript_OpenPartyMenu:: @ 82C8326
+MoveTutor_EventScript_OpenPartyMenu::
 	special ChooseMonForMoveTutor
 	waitstate
 	lock
 	faceplayer
 	return
 
-MoveTutor_EventScript_CanOnlyBeLearnedOnce:: @ 82C832D
+MoveTutor_EventScript_CanOnlyBeLearnedOnce::
 	msgbox MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce, MSGBOX_YESNO
 	return
diff --git a/data/scripts/movement.inc b/data/scripts/movement.inc
index 3dd1a8144..3f75d30dd 100644
--- a/data/scripts/movement.inc
+++ b/data/scripts/movement.inc
@@ -1,74 +1,74 @@
-Common_Movement_QuestionMark: @ 8272596
+Common_Movement_QuestionMark:
 	emote_question_mark
 	step_end
 
-Common_Movement_ExclamationMark: @ 8272598
+Common_Movement_ExclamationMark:
 	emote_exclamation_mark
 	step_end
 
-Common_Movement_Delay48: @ 827259A
+Common_Movement_Delay48:
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-Common_Movement_FacePlayer: @ 827259E
+Common_Movement_FacePlayer:
 	face_player
 	step_end
 
-Common_Movement_FaceAwayPlayer: @ 82725A0
+Common_Movement_FaceAwayPlayer:
 	face_away_player
 	step_end
 
-Common_Movement_FaceOriginalDirection: @ 82725A2
+Common_Movement_FaceOriginalDirection:
 	face_original_direction
 	step_end
 
-Common_Movement_WalkInPlaceFastestLeft: @ 82725A4
+Common_Movement_WalkInPlaceFastestLeft:
 	walk_in_place_fastest_left
 	step_end
 
-Common_Movement_WalkInPlaceFastestUp: @ 82725A6
+Common_Movement_WalkInPlaceFastestUp:
 	walk_in_place_fastest_up
 	step_end
 
-Common_Movement_WalkInPlaceFastestRight: @ 82725A8
+Common_Movement_WalkInPlaceFastestRight:
 	walk_in_place_fastest_right
 	step_end
 
-Common_Movement_WalkInPlaceFastestDown: @ 82725AA
+Common_Movement_WalkInPlaceFastestDown:
 	walk_in_place_fastest_down
 	step_end
 
-Common_Movement_FaceRight: @ 82725AC
+Common_Movement_FaceRight:
 	face_right
 	step_end
 
-Common_Movement_FaceLeft: @ 82725AE
+Common_Movement_FaceLeft:
 	face_left
 	step_end
 
-Common_Movement_FaceDown: @ 82725B0
+Common_Movement_FaceDown:
 	face_down
 	step_end
 
-Common_Movement_FaceUp: @ 82725B2
+Common_Movement_FaceUp:
 	face_up
 	step_end
 
-Common_Movement_WalkInPlaceDown: @ 82725B4
+Common_Movement_WalkInPlaceDown:
 	walk_in_place_down
 	step_end
 
-Common_Movement_WalkInPlaceLeft: @ 82725B6
+Common_Movement_WalkInPlaceLeft:
 	walk_in_place_left
 	step_end
 
-Common_Movement_WalkInPlaceRight: @ 82725B8
+Common_Movement_WalkInPlaceRight:
 	walk_in_place_right
 	step_end
 
-Common_Movement_WalkUp6: @ 82725BA
+Common_Movement_WalkUp6:
 	walk_up
 	walk_up
 	walk_up
@@ -77,24 +77,24 @@ Common_Movement_WalkUp6: @ 82725BA
 	walk_up
 	step_end
 
-Common_Movement_WalkUp4: @ 82725C1
+Common_Movement_WalkUp4:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-Common_Movement_Delay32: @ 82725C6
+Common_Movement_Delay32:
 	delay_16
 	delay_16
 	step_end
 
-Common_Movement_WalkUp: @ 82725C9
+Common_Movement_WalkUp:
 	walk_up
 	step_end
 
 @ Unused
-Common_Movement_WalkUp2:: @ 82725CB
+Common_Movement_WalkUp2::
 	walk_up
 	walk_up
 	step_end
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index 77d24adf6..f0cb55998 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -1,4 +1,4 @@
-MysteryEventClub_EventScript_Man:: @ 8291539
+MysteryEventClub_EventScript_Man::
 	lock
 	faceplayer
 	goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_GivenProfileBefore
@@ -6,7 +6,7 @@ MysteryEventClub_EventScript_Man:: @ 8291539
 	goto MysteryEventClub_EventScript_AskToSeeProfile
 	end
 
-MysteryEventClub_EventScript_AskToSeeProfile:: @ 8291552
+MysteryEventClub_EventScript_AskToSeeProfile::
 	msgbox MysteryEventClub_Text_MayISeeYourProfile, MSGBOX_DEFAULT
 	multichoice 17, 6, MULTI_YESNOINFO_2, FALSE
 	switch VAR_RESULT
@@ -16,12 +16,12 @@ MysteryEventClub_EventScript_AskToSeeProfile:: @ 8291552
 	case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineShowProfile
 	end
 
-MysteryEventClub_EventScript_Info:: @ 8291591
+MysteryEventClub_EventScript_Info::
 	msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT
 	goto MysteryEventClub_EventScript_AskToSeeProfile
 	end
 
-MysteryEventClub_EventScript_CreateProfile:: @ 829159F
+MysteryEventClub_EventScript_CreateProfile::
 	msgbox MysteryEventClub_Text_LetsSeeItThen, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
@@ -34,12 +34,12 @@ MysteryEventClub_EventScript_CreateProfile:: @ 829159F
 	goto_if_eq MysteryEventClub_EventScript_ShowProfile
 	end
 
-MysteryEventClub_EventScript_CancelShowProfile:: @ 82915CB
+MysteryEventClub_EventScript_CancelShowProfile::
 	msgbox MysteryEventClub_Text_NotIntoItRightNow, MSGBOX_DEFAULT
 	release
 	end
 
-MysteryEventClub_EventScript_ShowProfile:: @ 82915D5
+MysteryEventClub_EventScript_ShowProfile::
 	setvar VAR_0x8004, 0
 	special ShowEasyChatProfile
 	waitmessage
@@ -48,17 +48,17 @@ MysteryEventClub_EventScript_ShowProfile:: @ 82915D5
 	release
 	end
 
-MysteryEventClub_EventScript_DeclineShowProfile:: @ 82915EB
+MysteryEventClub_EventScript_DeclineShowProfile::
 	msgbox MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile, MSGBOX_DEFAULT
 	release
 	end
 
-MysteryEventClub_EventScript_GivenProfileBefore:: @ 82915F5
+MysteryEventClub_EventScript_GivenProfileBefore::
 	msgbox MysteryEventClub_Text_YouHaveWonderfulSmile, MSGBOX_DEFAULT
 	goto MysteryEventClub_EventScript_AskToSeeNewProfile
 	end
 
-MysteryEventClub_EventScript_AskToSeeNewProfile:: @ 8291603
+MysteryEventClub_EventScript_AskToSeeNewProfile::
 	msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT
 	multichoice 17, 6, MULTI_YESNOINFO_2, FALSE
 	switch VAR_RESULT
@@ -68,12 +68,12 @@ MysteryEventClub_EventScript_AskToSeeNewProfile:: @ 8291603
 	case MULTI_B_PRESSED, MysteryEventClub_EventScript_DeclineNewProfile
 	end
 
-MysteryEventClub_EventScript_InfoNewProfile:: @ 8291642
+MysteryEventClub_EventScript_InfoNewProfile::
 	msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT
 	goto MysteryEventClub_EventScript_AskToSeeNewProfile
 	end
 
-MysteryEventClub_EventScript_CreateNewProfile:: @ 8291650
+MysteryEventClub_EventScript_CreateNewProfile::
 	msgbox MysteryEventClub_Text_EvenBetterThanLastProfile, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
@@ -86,26 +86,26 @@ MysteryEventClub_EventScript_CreateNewProfile:: @ 8291650
 	goto_if_eq MysteryEventClub_EventScript_ShowProfile
 	end
 
-MysteryEventClub_EventScript_DeclineNewProfile:: @ 829167C
+MysteryEventClub_EventScript_DeclineNewProfile::
 	msgbox MysteryEventClub_Text_LikeProfileWayItIs, MSGBOX_DEFAULT
 	release
 	end
 
 @ Unused
-MysteryEventClub_EventScript_Ret:: @ 8291686
+MysteryEventClub_EventScript_Ret::
 	return
 
-MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687
+MysteryEventClub_Text_CollectTrainerProfiles:
 	.string "Hello there, TRAINER!\n"
 	.string "You've got a wonderful smile, there.\p"
 	.string "I have a hobby--collecting the profiles\n"
 	.string "of POKéMON TRAINERS.$"
 
-MysteryEventClub_Text_MayISeeYourProfile: @ 82916FF
+MysteryEventClub_Text_MayISeeYourProfile:
 	.string "So, how about it?\n"
 	.string "May I see your profile?$"
 
-MysteryEventClub_Text_EasyChatExplanation: @ 8291729
+MysteryEventClub_Text_EasyChatExplanation:
 	.string "You make your own profile by putting\n"
 	.string "together four words or phrases.\p"
 	.string "Here, I'll show you an example of a\n"
@@ -124,37 +124,37 @@ MysteryEventClub_Text_EasyChatExplanation: @ 8291729
 	.string "Repeat for the remaining text choices,\n"
 	.string "and you'll have your very own profile.$"
 
-MysteryEventClub_Text_LetsSeeItThen: @ 8291969
+MysteryEventClub_Text_LetsSeeItThen:
 	.string "Yes! Thank you!\n"
 	.string "So, let's see it, then.$"
 
-MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile: @ 8291991
+MysteryEventClub_Text_ImagineYouWouldHaveWonderfulProfile:
 	.string "Oh, no, really?\p"
 	.string "I imagine someone like you would have\n"
 	.string "a wonderful profile…$"
 
-MysteryEventClub_Text_NotIntoItRightNow: @ 82919DC
+MysteryEventClub_Text_NotIntoItRightNow:
 	.string "Oh? You're not into it right now?\p"
 	.string "Well, anytime is good by me!$"
 
-MysteryEventClub_Text_YouHaveWonderfulSmile: @ 8291A1B
+MysteryEventClub_Text_YouHaveWonderfulSmile:
 	.string "Hello there, TRAINER!\n"
 	.string "You've got a wonderful smile.$"
 
-MysteryEventClub_Text_MayISeeYourNewProfile: @ 8291A4F
+MysteryEventClub_Text_MayISeeYourNewProfile:
 	.string "May I see your new profile?$"
 
-MysteryEventClub_Text_EvenBetterThanLastProfile: @ 8291A6B
+MysteryEventClub_Text_EvenBetterThanLastProfile:
 	.string "Yes! Thank you!\p"
 	.string "I hope it's even better than the profile\n"
 	.string "you showed me before.$"
 
-MysteryEventClub_Text_LikeProfileWayItIs: @ 8291ABA
+MysteryEventClub_Text_LikeProfileWayItIs:
 	.string "Oh, you like your profile the way it is.\p"
 	.string "I don't blame you--it's a wonderful\n"
 	.string "profile the way it is now.$"
 
-MysteryEventClub_Text_FantasticProfile: @ 8291B22
+MysteryEventClub_Text_FantasticProfile:
 	.string "F-fantastic!\p"
 	.string "Your profile, it's wonderful!\n"
 	.string "It really says what you're about.\p"
@@ -163,7 +163,7 @@ MysteryEventClub_Text_FantasticProfile: @ 8291B22
 	.string "Thank you!$"
 
 @ Unused
-MysteryEventClub_Text_YouKnowSecretSaying: @ 8291BB7
+MysteryEventClub_Text_YouKnowSecretSaying:
 	.string "Oh?\n"
 	.string "You know the secret saying!\p"
 	.string "That means you're now a fellow member\n"
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index 2a314b3d1..7c5c3fc7d 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -1,4 +1,4 @@
-EventScript_ResetAllBerries:: @ 827149D
+EventScript_ResetAllBerries::
 	@ Route 102
 	setberrytree BERRY_TREE_ROUTE_102_ORAN,  ITEM_TO_BERRY(ITEM_ORAN_BERRY),  BERRY_STAGE_BERRIES
 	setberrytree BERRY_TREE_ROUTE_102_PECHA, ITEM_TO_BERRY(ITEM_PECHA_BERRY), BERRY_STAGE_BERRIES
@@ -112,7 +112,7 @@ EventScript_ResetAllBerries:: @ 827149D
 	setberrytree BERRY_TREE_ROUTE_130_LIECHI, ITEM_TO_BERRY(ITEM_LIECHI_BERRY), BERRY_STAGE_BERRIES
 	return
 
-EventScript_ResetAllMapFlags:: @ 82715DE
+EventScript_ResetAllMapFlags::
 	setflag FLAG_HIDE_CONTEST_POKE_BALL
 	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
@@ -209,7 +209,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION
 	setflag FLAG_HIDE_BATTLE_TOWER_OPPONENT
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
-	setflag FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 	setflag FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index 19f57d9d5..382f5ce32 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -1,10 +1,10 @@
-Std_ObtainItem:: @ 8271AD3
+Std_ObtainItem::
 	additem VAR_0x8000, VAR_0x8001
 	copyvar VAR_0x8007, VAR_RESULT
 	call EventScript_ObtainItemMessage
 	return
 
-EventScript_ObtainItemMessage:: @ 8271AE3
+EventScript_ObtainItemMessage::
 	bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
 	checkitemtype VAR_0x8000
 	call EventScript_BufferPocketNameAndTryFanfare
@@ -14,7 +14,7 @@ EventScript_ObtainItemMessage:: @ 8271AE3
 	call_if_eq EventScript_NoRoomForItem
 	return
 
-EventScript_BufferPocketNameAndTryFanfare:: @ 8271B08
+EventScript_BufferPocketNameAndTryFanfare::
 	switch VAR_RESULT
 	case POCKET_ITEMS, EventScript_BufferItemsPocket
 	case POCKET_KEY_ITEMS, EventScript_BufferKeyItemsPocket
@@ -23,62 +23,62 @@ EventScript_BufferPocketNameAndTryFanfare:: @ 8271B08
 	case POCKET_BERRIES, EventScript_BufferBerriesPocket
 	end
 
-EventScript_BufferItemsPocket:: @ 8271B45
+EventScript_BufferItemsPocket::
 	bufferstdstring 2, STDSTRING_ITEMS
 	compare VAR_0x8007, 1
 	call_if_eq EventScript_PlayFanfareObtainedItem
 	return
 
-EventScript_BufferKeyItemsPocket:: @ 8271B55
+EventScript_BufferKeyItemsPocket::
 	bufferstdstring 2, STDSTRING_KEYITEMS
 	compare VAR_0x8007, 1
 	call_if_eq EventScript_PlayFanfareObtainedItem
 	return
 
-EventScript_BufferPokeballsPocket:: @ 8271B65
+EventScript_BufferPokeballsPocket::
 	bufferstdstring 2, STDSTRING_POKEBALLS
 	compare VAR_0x8007, 1
 	call_if_eq EventScript_PlayFanfareObtainedItem
 	return
 
-EventScript_BufferTMHMsPocket:: @ 8271B75
+EventScript_BufferTMHMsPocket::
 	bufferstdstring 2, STDSTRING_TMHMS
 	compare VAR_0x8007, 1
 	call_if_eq EventScript_PlayFanfareObtainedTMHM
 	return
 
-EventScript_BufferBerriesPocket:: @ 8271B85
+EventScript_BufferBerriesPocket::
 	bufferstdstring 2, STDSTRING_BERRIES
 	compare VAR_0x8007, 1
 	call_if_eq EventScript_PlayFanfareObtainedItem
 	return
 
-EventScript_ObtainedItem:: @ 8271B95
+EventScript_ObtainedItem::
 	message gText_ObtainedTheItem
 	waitfanfare
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 1
 	return
 
-EventScript_NoRoomForItem:: @ 8271BA9
+EventScript_NoRoomForItem::
 	setvar VAR_RESULT, 0
 	return
 
-EventScript_PlayFanfareObtainedItem:: @ 8271BAF
+EventScript_PlayFanfareObtainedItem::
 	playfanfare MUS_OBTAIN_ITEM
 	return
 
-EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3
+EventScript_PlayFanfareObtainedTMHM::
 	playfanfare MUS_OBTAIN_TMHM
 	return
 
-Std_ObtainDecoration:: @ 8271BB7
+Std_ObtainDecoration::
 	adddecoration VAR_0x8000
 	copyvar VAR_0x8007, VAR_RESULT
 	call EventScript_ObtainDecorationMessage
 	return
 
-EventScript_ObtainDecorationMessage:: @ 8271BC5
+EventScript_ObtainDecorationMessage::
 	bufferdecorationname 1, VAR_0x8000
 	compare VAR_0x8007, 1
 	call_if_eq EventScript_ObtainedDecor
@@ -86,7 +86,7 @@ EventScript_ObtainDecorationMessage:: @ 8271BC5
 	call_if_eq EventScript_NoRoomForDecor
 	return
 
-EventScript_ObtainedDecor:: @ 8271BE0
+EventScript_ObtainedDecor::
 	playfanfare MUS_OBTAIN_ITEM
 	message gText_ObtainedTheDecor
 	waitfanfare
@@ -94,11 +94,11 @@ EventScript_ObtainedDecor:: @ 8271BE0
 	setvar VAR_RESULT, 1
 	return
 
-EventScript_NoRoomForDecor:: @ 8271BF7
+EventScript_NoRoomForDecor::
 	setvar VAR_RESULT, 0
 	return
 
-Std_FindItem:: @ 8271BFD
+Std_FindItem::
 	lock
 	faceplayer
 	waitse
@@ -116,7 +116,7 @@ Std_FindItem:: @ 8271BFD
 	release
 	return
 
-EventScript_PickUpItem:: @ 8271C3A
+EventScript_PickUpItem::
 	removeobject VAR_LAST_TALKED
 	additem VAR_0x8004, VAR_0x8005
 	specialvar VAR_RESULT, BufferTMHMMoveName
@@ -134,26 +134,26 @@ EventScript_PickUpItem:: @ 8271C3A
 	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
 	return
 
-EventScript_PutBattlePyramidItemInBag:: @ 8271C86
+EventScript_PutBattlePyramidItemInBag::
 	msgbox gText_PlayerPutItemInBag, MSGBOX_DEFAULT
 	return
 
-EventScript_FoundTMHM:: @ 8271C8F
+EventScript_FoundTMHM::
 	bufferitemnameplural 0, VAR_0x8004, VAR_0x8005
 	message gText_PlayerFoundOneTMHM
 	return
 
-EventScript_FoundItem:: @ 8271C9B
+EventScript_FoundItem::
 	message gText_PlayerFoundOneItem
 	return
 
-EventScript_NoRoomToPickUpItem:: @ 8271CA1
+EventScript_NoRoomToPickUpItem::
 	msgbox gText_ObtainedTheItem, MSGBOX_DEFAULT
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
 	return
 
-EventScript_HiddenItemScript:: @ 8271CB7
+EventScript_HiddenItemScript::
 	lockall
 	waitse
 	additem VAR_0x8005
@@ -167,7 +167,7 @@ EventScript_HiddenItemScript:: @ 8271CB7
 	goto_if_eq EventScript_NoRoomForHiddenItem
 	end
 
-EventScript_PickUpHiddenItem:: @ 8271CE8
+EventScript_PickUpHiddenItem::
 	copyvar VAR_0x8008, VAR_0x8004
 	copyvar VAR_0x8004, VAR_0x8005
 	specialvar VAR_RESULT, BufferTMHMMoveName
@@ -177,18 +177,18 @@ EventScript_PickUpHiddenItem:: @ 8271CE8
 	goto_if_eq EventScript_FoundHiddenItem
 	end
 
-EventScript_FoundHiddenTMHM:: @ 8271D0E
+EventScript_FoundHiddenTMHM::
 	bufferitemnameplural 0, VAR_0x8004, 1
 	message gText_PlayerFoundOneTMHM
 	goto EventScript_PutHiddenItemInPocket
 	end
 
-EventScript_FoundHiddenItem:: @ 8271D1F
+EventScript_FoundHiddenItem::
 	message gText_PlayerFoundOneItem
 	goto EventScript_PutHiddenItemInPocket
 	end
 
-EventScript_PutHiddenItemInPocket:: @ 8271D2A
+EventScript_PutHiddenItemInPocket::
 	waitmessage
 	waitfanfare
 	bufferitemnameplural 1, VAR_0x8004, 1
@@ -199,7 +199,7 @@ EventScript_PutHiddenItemInPocket:: @ 8271D2A
 	releaseall
 	end
 
-EventScript_NoRoomForHiddenItem:: @ 8271D47
+EventScript_NoRoomForHiddenItem::
 	msgbox gText_PlayerFoundOneItem, MSGBOX_DEFAULT
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	setvar VAR_RESULT, 0
diff --git a/data/scripts/pc.inc b/data/scripts/pc.inc
index b3602ee6f..43c0bca0d 100644
--- a/data/scripts/pc.inc
+++ b/data/scripts/pc.inc
@@ -1,4 +1,4 @@
-EventScript_PC:: @ 8271D92
+EventScript_PC::
 	lockall
 	setvar VAR_0x8004, 0
 	special DoPCTurnOnEffect
@@ -7,7 +7,7 @@ EventScript_PC:: @ 8271D92
 	goto EventScript_PCMainMenu
 	end
 
-EventScript_PCMainMenu:: @ 8271DAC
+EventScript_PCMainMenu::
 	message gText_WhichPCShouldBeAccessed
 	waitmessage
 	special ScriptMenu_CreatePCMultichoice
@@ -15,7 +15,7 @@ EventScript_PCMainMenu:: @ 8271DAC
 	goto EventScript_AccessPC
 	end
 
-EventScript_AccessPC:: @ 8271DBC
+EventScript_AccessPC::
 	switch VAR_RESULT
 	case 0, EventScript_AccessPokemonStorage
 	case 1, EventScript_AccessPlayersPC
@@ -24,7 +24,7 @@ EventScript_AccessPC:: @ 8271DBC
 	case MULTI_B_PRESSED, EventScript_TurnOffPC
 	end
 
-EventScript_AccessPlayersPC:: @ 8271DF9
+EventScript_AccessPlayersPC::
 	playse SE_PC_LOGIN
 	msgbox gText_AccessedPlayersPC, MSGBOX_DEFAULT
 	special PlayerPC
@@ -32,7 +32,7 @@ EventScript_AccessPlayersPC:: @ 8271DF9
 	goto EventScript_PCMainMenu
 	end
 
-EventScript_AccessPokemonStorage:: @ 8271E0E
+EventScript_AccessPokemonStorage::
 	playse SE_PC_LOGIN
 	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_AccessSomeonesPC
 	call_if_set FLAG_SYS_PC_LANETTE, EventScript_AccessLanettesPC
@@ -42,22 +42,22 @@ EventScript_AccessPokemonStorage:: @ 8271E0E
 	goto EventScript_PCMainMenu
 	end
 
-EventScript_AccessSomeonesPC:: @ 8271E35
+EventScript_AccessSomeonesPC::
 	msgbox gText_AccessedSomeonesPC, MSGBOX_DEFAULT
 	return
 
-EventScript_AccessLanettesPC:: @ 8271E3E
+EventScript_AccessLanettesPC::
 	msgbox gText_AccessedLanettesPC, MSGBOX_DEFAULT
 	return
 
-EventScript_TurnOffPC:: @ 8271E47
+EventScript_TurnOffPC::
 	setvar VAR_0x8004, 0
 	playse SE_PC_OFF
 	special DoPCTurnOffEffect
 	releaseall
 	end
 
-EventScript_AccessHallOfFame:: @ 8271E54
+EventScript_AccessHallOfFame::
 	goto_if_unset FLAG_SYS_GAME_CLEAR, EventScript_TurnOffPC
 	playse SE_PC_LOGIN
 	special AccessHallOfFamePC
diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc
index ec58b26f1..1fe575d55 100644
--- a/data/scripts/pc_transfer.inc
+++ b/data/scripts/pc_transfer.inc
@@ -1,11 +1,11 @@
 @ VAR_0x8004 here is used by ChangePokemonNickname
-Common_EventScript_GetGiftMonPartySlot:: @ 827378B
+Common_EventScript_GetGiftMonPartySlot::
 	getpartysize
 	subvar VAR_RESULT, 1
 	copyvar VAR_0x8004, VAR_RESULT
 	return
 
-Common_EventScript_NameReceivedBoxMon:: @ 8273797
+Common_EventScript_NameReceivedBoxMon::
 	fadescreen FADE_TO_BLACK
 	special ChangeBoxPokemonNickname
 	waitstate
@@ -13,40 +13,40 @@ Common_EventScript_NameReceivedBoxMon:: @ 8273797
 	faceplayer
 	return
 
-Common_EventScript_TransferredToPC:: @ 82737A0
+Common_EventScript_TransferredToPC::
 	bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
 	bufferspeciesname 1, VAR_TEMP_1
 	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_TransferredSomeonesPC
 	call_if_set FLAG_SYS_PC_LANETTE, EventScript_TransferredLanettesPC
 	return
 
-EventScript_TransferredSomeonesPC:: @ 82737BB
+EventScript_TransferredSomeonesPC::
 	specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_SomeonesPCBoxFull
 	msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT
 	return
 
-EventScript_SomeonesPCBoxFull:: @ 82737D4
+EventScript_SomeonesPCBoxFull::
 	specialvar VAR_RESULT, GetPCBoxToSendMon
 	bufferboxname 2, VAR_RESULT
 	msgbox gText_PkmnTransferredSomeonesPCBoxFull, MSGBOX_DEFAULT
 	return
 
-EventScript_TransferredLanettesPC:: @ 82737E6
+EventScript_TransferredLanettesPC::
 	specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
 	compare VAR_RESULT, TRUE
 	goto_if_eq EventScript_LanettesPCBoxFull
 	msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT
 	return
 
-EventScript_LanettesPCBoxFull:: @ 82737FF
+EventScript_LanettesPCBoxFull::
 	specialvar VAR_RESULT, GetPCBoxToSendMon
 	bufferboxname 2, VAR_RESULT
 	msgbox gText_PkmnTransferredLanettesPCBoxFull, MSGBOX_DEFAULT
 	return
 
-Common_EventScript_NoMoreRoomForPokemon:: @ 8273811
+Common_EventScript_NoMoreRoomForPokemon::
 	msgbox gText_NoMoreRoomForPokemon, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/scripts/pkmn_center_nurse.inc b/data/scripts/pkmn_center_nurse.inc
index 6b4bbe2ef..7797b3061 100644
--- a/data/scripts/pkmn_center_nurse.inc
+++ b/data/scripts/pkmn_center_nurse.inc
@@ -1,4 +1,4 @@
-Common_EventScript_PkmnCenterNurse:: @ 827191E
+Common_EventScript_PkmnCenterNurse::
     lock
     faceplayer
     setvar VAR_0x8004, 0
@@ -12,12 +12,12 @@ Common_EventScript_PkmnCenterNurse:: @ 827191E
     goto_if_eq EventScript_PkmnCenterNurse_Goodbye
     end
 
-EventScript_PkmnCenterNurse_Goodbye:: @ 8271954
+EventScript_PkmnCenterNurse_Goodbye::
     message gText_WeHopeToSeeYouAgain
     return
 
 @ VAR_0x8004 is 1 when player has Gold Card; jumps are identical
-EventScript_PkmnCenterNurse_HealPkmn:: @ 827195A
+EventScript_PkmnCenterNurse_HealPkmn::
     incrementgamestat GAME_STAT_USED_POKECENTER
     compare VAR_0x8004, 0
     call_if_eq EventScript_PkmnCenterNurse_IllTakeYourPkmn
@@ -29,15 +29,15 @@ EventScript_PkmnCenterNurse_HealPkmn:: @ 827195A
     goto EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom
     end
 
-EventScript_PkmnCenterNurse_IllTakeYourPkmn:: @ 8271987
+EventScript_PkmnCenterNurse_IllTakeYourPkmn::
     message gText_IllTakeYourPkmn
     return
 
-EventScript_PkmnCenterNurse_IllTakeYourPkmn2:: @ 827198D
+EventScript_PkmnCenterNurse_IllTakeYourPkmn2::
     message gText_IllTakeYourPkmn2
     return
 
-EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993
+EventScript_PkmnCenterNurse_TakeAndHealPkmn::
     applymovement VAR_0x800B, Common_Movement_WalkInPlaceFastestLeft
     waitmovement 0
     dofieldeffect FLDEFF_POKECENTER_HEAL
@@ -47,7 +47,7 @@ EventScript_PkmnCenterNurse_TakeAndHealPkmn:: @ 8271993
     special HealPlayerParty
     return
 
-EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom:: @ 82719B1
+EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom::
     specialvar VAR_RESULT, PlayerNotAtTrainerHillEntrance
     compare VAR_RESULT, 0
     goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn
@@ -60,7 +60,7 @@ EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom:: @ 82719B1
     end
 
 @ VAR_0x8004 is 1 when player has Gold Card
-EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2
+EventScript_PkmnCenterNurse_ReturnPkmn::
     compare VAR_0x8004, 1
     goto_if_eq EventScript_PkmnCenterNurse_ReturnPkmn2
     message gText_RestoredPkmnToFullHealth
@@ -70,7 +70,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn:: @ 82719E2
     message gText_WeHopeToSeeYouAgain
     return
 
-EventScript_PkmnCenterNurse_ReturnPkmn2:: @ 8271A03
+EventScript_PkmnCenterNurse_ReturnPkmn2::
     message gText_ThankYouForWaiting
     waitmessage
     applymovement VAR_0x800B, Movement_PkmnCenterNurse_Bow
@@ -78,7 +78,7 @@ EventScript_PkmnCenterNurse_ReturnPkmn2:: @ 8271A03
     message gText_WeHopeToSeeYouAgain2
     return
 
-EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19
+EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom::
     goto_if_set FLAG_NURSE_UNION_ROOM_REMINDER, EventScript_PkmnCenterNurse_ReturnPkmn
     msgbox gText_RestoredPkmnToFullHealth, MSGBOX_DEFAULT
     setflag FLAG_NURSE_UNION_ROOM_REMINDER
@@ -89,7 +89,7 @@ EventScript_PkmnCenterNurse_PlayerWaitingInUnionRoom:: @ 8271A19
     message gText_WeHopeToSeeYouAgain
     return
 
-EventScript_PkmnCenterNurse_CheckPokerus:: @ 8271A43
+EventScript_PkmnCenterNurse_CheckPokerus::
     specialvar VAR_RESULT, IsPokerusInParty
     compare VAR_RESULT, TRUE
     goto_if_eq EventScript_PkmnCenterNurse_ExplainPokerus
@@ -97,12 +97,12 @@ EventScript_PkmnCenterNurse_CheckPokerus:: @ 8271A43
     goto_if_eq EventScript_PkmnCenterNurse_CheckTrainerHillAndUnionRoom
     end
 
-EventScript_PkmnCenterNurse_ExplainPokerus:: @ 8271A5F
+EventScript_PkmnCenterNurse_ExplainPokerus::
     message gText_PokerusExplanation
     setflag FLAG_POKERUS_EXPLAINED
     return
 
-EventScript_PkmnCenterNurse_GoldCard:: @ 8271A68
+EventScript_PkmnCenterNurse_GoldCard::
     goto_if_set FLAG_NURSE_MENTIONS_GOLD_CARD, EventScript_PkmnCenterNurse_AskForUsual
     setflag FLAG_NURSE_MENTIONS_GOLD_CARD
     msgbox gText_WelcomeCutShort, MSGBOX_DEFAULT
@@ -117,19 +117,19 @@ EventScript_PkmnCenterNurse_GoldCard:: @ 8271A68
     message gText_WeHopeToSeeYouAgain2
     return
 
-EventScript_PkmnCenterNurse_AskForUsual:: @ 8271AAC
+EventScript_PkmnCenterNurse_AskForUsual::
     msgbox gText_YouWantTheUsual, MSGBOX_YESNO
     compare VAR_RESULT, YES
     goto_if_eq EventScript_PkmnCenterNurse_GoldCardHealPkmn
     message gText_WeHopeToSeeYouAgain2
     return
 
-EventScript_PkmnCenterNurse_GoldCardHealPkmn:: @ 8271AC5
+EventScript_PkmnCenterNurse_GoldCardHealPkmn::
     setvar VAR_0x8004, 1
     goto EventScript_PkmnCenterNurse_HealPkmn
     end
 
-Movement_PkmnCenterNurse_Bow: @ 8271AD0
+Movement_PkmnCenterNurse_Bow:
     nurse_joy_bow
     delay_4
     step_end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 427355332..e7e862039 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -3,11 +3,11 @@
 .set LOCALID_DAD, 5
 .set LOCALID_MOM_2F, 14
 
-PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet:: @ 82926FE
+PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet::
 	setvar VAR_LITTLEROOT_INTRO_STATE, 5
 	return
 
-PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 8292704
+PlayersHouse_1F_EventScript_EnterHouseMovingIn::
 	msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT
 	applymovement VAR_0x8004, Common_Movement_FacePlayer
 	waitmovement 0
@@ -24,21 +24,21 @@ PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 8292704
 	releaseall
 	end
 
-PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 829274D
+PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 8292758
+PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-PlayersHouse_1F_Movement_PlayerWalkIn: @ 8292763
+PlayersHouse_1F_Movement_PlayerWalkIn:
 	walk_up
 	step_end
 
-PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 8292765
+PlayersHouse_1F_EventScript_MomGoSeeRoom::
 	msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
@@ -47,19 +47,19 @@ PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 8292765
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_WallClock:: @ 8292781
+LittlerootTown_BrendansHouse_2F_EventScript_WallClock::
 	lockall
 	setvar VAR_0x8004, MALE
 	goto PlayersHouse_2F_EventScript_WallClock
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_WallClock:: @ 829278D
+LittlerootTown_MaysHouse_2F_EventScript_WallClock::
 	lockall
 	setvar VAR_0x8004, FEMALE
 	goto PlayersHouse_2F_EventScript_WallClock
 	end
 
-PlayersHouse_2F_EventScript_WallClock:: @ 8292799
+PlayersHouse_2F_EventScript_WallClock::
 	goto_if_set FLAG_SET_WALL_CLOCK, PlayersHouse_2F_EventScript_CheckWallClock
 	msgbox PlayersHouse_2F_Text_ClockIsStopped, MSGBOX_DEFAULT
 	call PlayersHouse_2F_EventScript_SetWallClock
@@ -78,7 +78,7 @@ PlayersHouse_2F_EventScript_WallClock:: @ 8292799
 	releaseall
 	end
 
-PlayersHouse_2F_EventScript_MomComesUpstairsMale:: @ 82927DF
+PlayersHouse_2F_EventScript_MomComesUpstairsMale::
 	setvar VAR_0x8008, LOCALID_MOM_2F
 	addobject VAR_0x8008
 	applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale
@@ -91,7 +91,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsMale:: @ 82927DF
 	waitmovement 0
 	return
 
-PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F
+PlayersHouse_2F_EventScript_MomComesUpstairsFemale::
 	setvar VAR_0x8008, LOCALID_MOM_2F
 	addobject VAR_0x8008
 	applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale
@@ -104,7 +104,7 @@ PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F
 	waitmovement 0
 	return
 
-PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F
+PlayersHouse_2F_EventScript_CheckWallClock::
 	incrementgamestat GAME_STAT_CHECKED_CLOCK
 	fadescreen FADE_TO_BLACK
 	special Special_ViewWallClock
@@ -112,13 +112,13 @@ PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F
 	releaseall
 	end
 
-PlayersHouse_2F_EventScript_SetWallClock:: @ 8292849
+PlayersHouse_2F_EventScript_SetWallClock::
 	fadescreen FADE_TO_BLACK
 	special StartWallClock
 	waitstate
 	return
 
-PlayersHouse_2F_Movement_MomEntersMale: @ 8292850
+PlayersHouse_2F_Movement_MomEntersMale:
 	delay_8
 	walk_down
 	walk_in_place_fastest_left
@@ -127,13 +127,13 @@ PlayersHouse_2F_Movement_MomEntersMale: @ 8292850
 	walk_left
 	step_end
 
-PlayersHouse_2F_Movement_MomExitsMale: @ 8292857
+PlayersHouse_2F_Movement_MomExitsMale:
 	walk_right
 	walk_up
 	delay_8
 	step_end
 
-PlayersHouse_2F_Movement_MomEntersFemale: @ 829285B
+PlayersHouse_2F_Movement_MomEntersFemale:
 	delay_8
 	walk_down
 	walk_in_place_fastest_right
@@ -142,18 +142,18 @@ PlayersHouse_2F_Movement_MomEntersFemale: @ 829285B
 	walk_right
 	step_end
 
-PlayersHouse_2F_Movement_MomExitsFemale: @ 8292862
+PlayersHouse_2F_Movement_MomExitsFemale:
 	walk_left
 	walk_up
 	delay_8
 	step_end
 
-PlayersHouse_1F_EventScript_SetWatchedBroadcast:: @ 8292866
+PlayersHouse_1F_EventScript_SetWatchedBroadcast::
 	setvar VAR_LITTLEROOT_INTRO_STATE, 7
 	releaseall
 	end
 
-PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D
+PlayersHouse_1F_EventScript_PetalburgGymReportMale::
 	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
@@ -178,7 +178,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D
 	goto PlayersHouse_1F_EventScript_SetWatchedBroadcast
 	end
 
-PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC
+PlayersHouse_1F_EventScript_PetalburgGymReportFemale::
 	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
@@ -203,7 +203,7 @@ PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC
 	goto PlayersHouse_1F_EventScript_SetWatchedBroadcast
 	end
 
-PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: @ 829294B
+PlayersHouse_1F_EventScript_MomNoticeGymBroadcast::
 	playse SE_PIN
 	applymovement VAR_0x8005, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -213,7 +213,7 @@ PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: @ 829294B
 	closemessage
 	return
 
-PlayersHouse_1F_EventScript_WatchGymBroadcast:: @ 829296C
+PlayersHouse_1F_EventScript_WatchGymBroadcast::
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT
@@ -223,7 +223,7 @@ PlayersHouse_1F_EventScript_WatchGymBroadcast:: @ 829296C
 	delay 35
 	return
 
-PlayersHouse_1F_Movement_MomApproachDadMale: @ 8292989
+PlayersHouse_1F_Movement_MomApproachDadMale:
 	walk_up
 	walk_right
 	walk_right
@@ -233,7 +233,7 @@ PlayersHouse_1F_Movement_MomApproachDadMale: @ 8292989
 	walk_in_place_fastest_right
 	step_end
 
-PlayersHouse_1F_Movement_MomApproachDadFemale: @ 8292991
+PlayersHouse_1F_Movement_MomApproachDadFemale:
 	walk_up
 	walk_left
 	walk_left
@@ -243,15 +243,15 @@ PlayersHouse_1F_Movement_MomApproachDadFemale: @ 8292991
 	walk_in_place_fastest_left
 	step_end
 
-PlayersHouse_1F_Movement_MomApproachPlayerMale: @ 8292999
+PlayersHouse_1F_Movement_MomApproachPlayerMale:
 	walk_right
 	step_end
 
-PlayersHouse_1F_Movement_MomApproachPlayerFemale: @ 829299B
+PlayersHouse_1F_Movement_MomApproachPlayerFemale:
 	walk_left
 	step_end
 
-PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale: @ 829299D
+PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale:
 	walk_in_place_fastest_left
 	delay_16
 	delay_16
@@ -262,7 +262,7 @@ PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale: @ 829299D
 	delay_16
 	step_end
 
-PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale: @ 82929A6
+PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale:
 	walk_in_place_fastest_right
 	delay_16
 	delay_16
@@ -273,41 +273,41 @@ PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale: @ 82929A6
 	delay_16
 	step_end
 
-PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale: @ 82929AF
+PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale:
 	walk_up
 	walk_left
 	walk_left
 	step_end
 
-PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale: @ 82929B3
+PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale:
 	walk_up
 	walk_right
 	walk_right
 	step_end
 
-PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale: @ 82929B7
+PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale:
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale: @ 82929BA
+PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale:
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-PlayersHouse_1F_Movement_MomReturnToSeatMale: @ 82929BD
+PlayersHouse_1F_Movement_MomReturnToSeatMale:
 	walk_left
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1
+PlayersHouse_1F_Movement_MomReturnToSeatFemale:
 	walk_right
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-PlayersHouse_1F_EventScript_Mom:: @ 82929C5
+PlayersHouse_1F_EventScript_Mom::
 	lock
 	faceplayer
 	compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4
@@ -324,12 +324,12 @@ PlayersHouse_1F_EventScript_Mom:: @ 82929C5
 	release
 	end
 
-PlayersHouse_1F_EventScript_DontPushYourselfTooHard:: @ 8292A0F
+PlayersHouse_1F_EventScript_DontPushYourselfTooHard::
 	msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT
 	release
 	end
 
-PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19
+PlayersHouse_1F_EventScript_TryRegisterMom::
 	goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, PlayersHouse_1F_EventScript_CheckGiveAmuletCoin
 	msgbox PlayersHouse_1F_Text_IsThatAPokenav, MSGBOX_DEFAULT
 	closemessage
@@ -343,11 +343,11 @@ PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19
 	release
 	end
 
-PlayersHouse_1F_EventScript_CheckGiveAmuletCoin:: @ 8292A43
+PlayersHouse_1F_EventScript_CheckGiveAmuletCoin::
 	goto_if_set FLAG_BADGE05_GET, PlayersHouse_1F_EventScript_TryGiveAmuletCoin
 	goto PlayersHouse_1F_EventScript_MomHealsParty
 
-PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51
+PlayersHouse_1F_EventScript_TryGiveAmuletCoin::
 	goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty
 	msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT
 	giveitem ITEM_AMULET_COIN
@@ -358,17 +358,17 @@ PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51
 	release
 	end
 
-PlayersHouse_1F_EventScript_MomHealsParty:: @ 8292A86
+PlayersHouse_1F_EventScript_MomHealsParty::
 	msgbox PlayersHouse_1F_Text_YouShouldRestABit, MSGBOX_DEFAULT
 	goto PlayersHouse_1F_EventScript_HealParty
 	end
 
-PlayersHouse_1F_EventScript_SeeYouHoney:: @ 8292A94
+PlayersHouse_1F_EventScript_SeeYouHoney::
 	msgbox PlayersHouse_1F_Text_SeeYouHoney, MSGBOX_DEFAULT
 	release
 	end
 
-PlayersHouse_1F_EventScript_HealParty:: @ 8292A9E
+PlayersHouse_1F_EventScript_HealParty::
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
 	incrementgamestat GAME_STAT_RESTED_AT_HOME
@@ -376,12 +376,12 @@ PlayersHouse_1F_EventScript_HealParty:: @ 8292A9E
 	release
 	end
 
-PlayersHouse_1F_EventScript_DidYouMeetProfBirch:: @ 8292AB0
+PlayersHouse_1F_EventScript_DidYouMeetProfBirch::
 	msgbox PlayersHouse_1F_Text_DidYouMeetProfBirch, MSGBOX_DEFAULT
 	release
 	end
 
-PlayersHouse_1F_EventScript_Vigoroth1:: @ 8292ABA
+PlayersHouse_1F_EventScript_Vigoroth1::
 	lock
 	faceplayer
 	waitse
@@ -391,7 +391,7 @@ PlayersHouse_1F_EventScript_Vigoroth1:: @ 8292ABA
 	release
 	end
 
-PlayersHouse_1F_EventScript_Vigoroth2:: @ 8292ACD
+PlayersHouse_1F_EventScript_Vigoroth2::
 	lock
 	faceplayer
 	waitse
@@ -401,7 +401,7 @@ PlayersHouse_1F_EventScript_Vigoroth2:: @ 8292ACD
 	release
 	end
 
-PlayersHouse_1F_Movement_PlayerApproachTVForGymMale: @ 8292AE0
+PlayersHouse_1F_Movement_PlayerApproachTVForGymMale:
 	walk_down
 	walk_down
 	walk_left
@@ -409,11 +409,11 @@ PlayersHouse_1F_Movement_PlayerApproachTVForGymMale: @ 8292AE0
 	walk_left
 	step_end
 
-PlayersHouse_1F_Movement_PlayerMoveToTVMale: @ 8292AE6
+PlayersHouse_1F_Movement_PlayerMoveToTVMale:
 	walk_left
 	step_end
 
-PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale: @ 8292AE8
+PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale:
 	walk_down
 	walk_down
 	walk_right
@@ -421,15 +421,15 @@ PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale: @ 8292AE8
 	walk_right
 	step_end
 
-PlayersHouse_1F_Movement_PlayerMoveToTVFemale: @ 8292AEE
+PlayersHouse_1F_Movement_PlayerMoveToTVFemale:
 	walk_right
 	step_end
 
-PlayersHouse_1F_Movement_MovePlayerAwayFromDoor: @ 8292AF0
+PlayersHouse_1F_Movement_MovePlayerAwayFromDoor:
 	walk_up
 	step_end
 
-PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2
+PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV::
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -513,155 +513,155 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2
 	end
 
 @ Never called.
-PlayersHouse_1F_EventScript_AirLatiBroadcast:: @ 8292C72
+PlayersHouse_1F_EventScript_AirLatiBroadcast::
 	setflag FLAG_SYS_TV_LATIAS_LATIOS
 	return
 
-PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale:: @ 8292C76
+PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale::
 	setvar VAR_0x8008, MALE
 	setvar VAR_0x8009, LOCALID_DAD
 	setvar VAR_0x800A, LOCALID_MOM
 	return
 
-PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale:: @ 8292C86
+PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale::
 	setvar VAR_0x8008, FEMALE
 	setvar VAR_0x8009, LOCALID_DAD
 	setvar VAR_0x800A, LOCALID_MOM
 	return
 
-PlayersHouse_1F_EventScript_DadApproachPlayerMale:: @ 8292C96
+PlayersHouse_1F_EventScript_DadApproachPlayerMale::
 	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerMale
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_DadApproachPlayerFemale:: @ 8292CA1
+PlayersHouse_1F_EventScript_DadApproachPlayerFemale::
 	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerFemale
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_MomApproachDadMale:: @ 8292CAC
+PlayersHouse_1F_EventScript_MomApproachDadMale::
 	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadMale
 	waitmovement 0
 	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomMale
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_MomApproachDadFemale:: @ 8292CC1
+PlayersHouse_1F_EventScript_MomApproachDadFemale::
 	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadFemale
 	waitmovement 0
 	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomFemale
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_DadExitsMale:: @ 8292CD6
+PlayersHouse_1F_EventScript_DadExitsMale::
 	applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
 	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
 	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsMale
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_DadExitsFemale:: @ 8292CEF
+PlayersHouse_1F_EventScript_DadExitsFemale::
 	applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
 	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
 	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsFemale
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_PlayerEnterRoomMale:: @ 8292D08
+PlayersHouse_1F_EventScript_PlayerEnterRoomMale::
 	applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_PlayerEnterRoomFemale:: @ 8292D13
+PlayersHouse_1F_EventScript_PlayerEnterRoomFemale::
 	applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale:: @ 8292D1E
+PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale::
 	applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale
 	waitmovement 0
 	applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33
+PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale::
 	applymovement OBJ_EVENT_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale
 	waitmovement 0
 	applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_MomApproachPlayerMale:: @ 8292D48
+PlayersHouse_1F_EventScript_MomApproachPlayerMale::
 	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_MomApproachPlayerFemale:: @ 8292D5D
+PlayersHouse_1F_EventScript_MomApproachPlayerFemale::
 	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale:: @ 8292D72
+PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale::
 	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale:: @ 8292D7D
+PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale::
 	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale:: @ 8292D88
+PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale::
 	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale:: @ 8292D9D
+PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale::
 	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-PlayersHouse_1F_Movement_DadApproachPlayerMale: @ 8292DB2
+PlayersHouse_1F_Movement_DadApproachPlayerMale:
 	walk_right
 	walk_right
 	step_end
 
-PlayersHouse_1F_Movement_DadApproachPlayerFemale: @ 8292DB5
+PlayersHouse_1F_Movement_DadApproachPlayerFemale:
 	walk_left
 	walk_left
 	step_end
 
-PlayersHouse_1F_Movement_DadFaceMomMale: @ 8292DB8
+PlayersHouse_1F_Movement_DadFaceMomMale:
 	face_left
 	step_end
 
-PlayersHouse_1F_Movement_DadFaceMomFemale: @ 8292DBA
+PlayersHouse_1F_Movement_DadFaceMomFemale:
 	face_right
 	step_end
 
-PlayersHouse_1F_Movement_DadExitsMale: @ 8292DBC
+PlayersHouse_1F_Movement_DadExitsMale:
 	walk_down
 	walk_right
 	walk_down
 	delay_8
 	step_end
 
-PlayersHouse_1F_Movement_DadExitsFemale: @ 8292DC1
+PlayersHouse_1F_Movement_DadExitsFemale:
 	walk_down
 	walk_left
 	walk_down
 	delay_8
 	step_end
 
-PlayersHouse_1F_Movement_PlayerEnterRoomMale: @ 8292DC6
+PlayersHouse_1F_Movement_PlayerEnterRoomMale:
 	delay_16
 	walk_down
 	walk_down
@@ -669,14 +669,14 @@ PlayersHouse_1F_Movement_PlayerEnterRoomMale: @ 8292DC6
 	walk_in_place_fastest_left
 	step_end
 
-PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit: @ 8292DCC
+PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit:
 	delay_8
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-PlayersHouse_1F_Movement_PlayerEnterRoomFemale: @ 8292DD1
+PlayersHouse_1F_Movement_PlayerEnterRoomFemale:
 	delay_16
 	walk_down
 	walk_down
@@ -684,7 +684,7 @@ PlayersHouse_1F_Movement_PlayerEnterRoomFemale: @ 8292DD1
 	walk_in_place_fastest_right
 	step_end
 
-PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale: @ 8292DD7
+PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale:
 	walk_up
 	walk_left
 	walk_left
@@ -693,7 +693,7 @@ PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale: @ 8292DD7
 	walk_in_place_fastest_up
 	step_end
 
-PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale: @ 8292DDE
+PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale:
 	walk_up
 	walk_right
 	walk_right
@@ -702,6 +702,6 @@ PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale: @ 8292DDE
 	walk_in_place_fastest_up
 	step_end
 
-EventScript_RunningShoesManual:: @ 8292DE5
+EventScript_RunningShoesManual::
 	msgbox PlayersHouse_1F_Text_RunningShoesManual, MSGBOX_SIGN
 	end
diff --git a/data/scripts/prof_birch.inc b/data/scripts/prof_birch.inc
index b89d2fbd0..7eb1730fc 100644
--- a/data/scripts/prof_birch.inc
+++ b/data/scripts/prof_birch.inc
@@ -1,4 +1,4 @@
-ProfBirch_EventScript_UpdateLocation:: @ 82720AD
+ProfBirch_EventScript_UpdateLocation::
 	compare VAR_PETALBURG_GYM_STATE, 0
 	goto_if_eq Common_EventScript_NopReturn
 	goto_if_set FLAG_SYS_GAME_CLEAR, ProfBirch_EventScript_MoveToLab
@@ -20,34 +20,34 @@ ProfBirch_EventScript_UpdateLocation:: @ 82720AD
 	call_if_eq ProfBirch_EventScript_MoveToLab
 	return
 
-ProfBirch_EventScript_MoveToLab:: @ 827211A
+ProfBirch_EventScript_MoveToLab::
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	setflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	return
 
-ProfBirch_EventScript_MoveToRoute101:: @ 8272127
+ProfBirch_EventScript_MoveToRoute101::
 	clearflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	setflag FLAG_HIDE_ROUTE_103_BIRCH
 	return
 
-ProfBirch_EventScript_MoveToRoute103:: @ 8272134
+ProfBirch_EventScript_MoveToRoute103::
 	clearflag FLAG_HIDE_ROUTE_103_BIRCH
 	setflag FLAG_HIDE_ROUTE_101_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380
 	return
 
-ProfBirch_EventScript_RatePokedexOrRegister:: @ 8272141
+ProfBirch_EventScript_RatePokedexOrRegister::
 	lock
 	faceplayer
 	goto_if_unset FLAG_HAS_MATCH_CALL, ProfBirch_EventScript_AskRatePokedex
 	goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, EventScript_RegisterProfBirch
 
-ProfBirch_EventScript_AskRatePokedex:: @ 8272155
+ProfBirch_EventScript_AskRatePokedex::
 	msgbox gBirchDexRatingText_AreYouCurious, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq ProfBirch_EventScript_DeclineRating
@@ -55,19 +55,19 @@ ProfBirch_EventScript_AskRatePokedex:: @ 8272155
 	release
 	end
 
-ProfBirch_EventScript_DeclineRating:: @ 827216F
+ProfBirch_EventScript_DeclineRating::
 	msgbox gBirchDexRatingText_Cancel, MSGBOX_DEFAULT
 	release
 	end
 
-ProfBirch_EventScript_ShowRatingMessage:: @ 8272179
+ProfBirch_EventScript_ShowRatingMessage::
 	copyvar VAR_0x8004, VAR_0x8009
 	special ShowPokedexRatingMessage
 	waitmessage
 	waitbuttonpress
 	return
 
-ProfBirch_EventScript_RatePokedex:: @ 8272184
+ProfBirch_EventScript_RatePokedex::
 	setvar VAR_0x8004, 0
 	specialvar VAR_RESULT, ScriptGetPokedexInfo
 	copyvar VAR_0x8008, VAR_0x8005
diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc
index e058816ab..d1ad84d3a 100644
--- a/data/scripts/record_mix.inc
+++ b/data/scripts/record_mix.inc
@@ -1,5 +1,5 @@
 @ Seems this was superseded by the Record Center, and the below scripts are now unused
-EventScript_MixRecordsPrompt:: @ 8271D5E
+EventScript_MixRecordsPrompt::
 	lock
 	faceplayer
 	msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO
@@ -9,12 +9,12 @@ EventScript_MixRecordsPrompt:: @ 8271D5E
 	goto_if_eq EventScript_EndMixRecords
 	goto EventScript_EndMixRecords
 
-EventScript_MixRecords:: @ 8271D83
+EventScript_MixRecords::
 	special RecordMixingPlayerSpotTriggered
 	waitstate
 	lock
 	faceplayer
-EventScript_EndMixRecords:: @ 8271D89
+EventScript_EndMixRecords::
 	message Text_WeHopeToSeeYouAgain
 	waitmessage
 	waitbuttonpress
diff --git a/data/scripts/repel.inc b/data/scripts/repel.inc
index 5deda5762..fc178603c 100644
--- a/data/scripts/repel.inc
+++ b/data/scripts/repel.inc
@@ -1,6 +1,6 @@
-EventScript_RepelWoreOff:: @ 82A4B2A
+EventScript_RepelWoreOff::
 	msgbox Text_RepelWoreOff, MSGBOX_SIGN
 	end
 
-Text_RepelWoreOff: @ 82A4B33
+Text_RepelWoreOff:
 	.string "REPEL's effect wore off…$"
diff --git a/data/scripts/rival_graphics.inc b/data/scripts/rival_graphics.inc
index a8ead6497..a0fb15f0e 100644
--- a/data/scripts/rival_graphics.inc
+++ b/data/scripts/rival_graphics.inc
@@ -1,4 +1,4 @@
-Common_EventScript_SetupRivalGfxId:: @ 8271ED7
+Common_EventScript_SetupRivalGfxId::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq EventScript_SetupRivalGfxIdFemale
@@ -6,15 +6,15 @@ Common_EventScript_SetupRivalGfxId:: @ 8271ED7
 	goto_if_eq EventScript_SetupRivalGfxIdMale
 	end
 
-EventScript_SetupRivalGfxIdFemale:: @ 8271EEF
+EventScript_SetupRivalGfxIdFemale::
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-EventScript_SetupRivalGfxIdMale:: @ 8271EF5
+EventScript_SetupRivalGfxIdMale::
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB
+Common_EventScript_SetupRivalOnBikeGfxId::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq EventScript_SetupRivalOnBikeGfxIdFemale
@@ -22,16 +22,16 @@ Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB
 	goto_if_eq EventScript_SetupRivalOnBikeGfxIdMale
 	end
 
-EventScript_SetupRivalOnBikeGfxIdFemale:: @ 8271F13
+EventScript_SetupRivalOnBikeGfxIdFemale::
 	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_MACH_BIKE
 	return
 
-EventScript_SetupRivalOnBikeGfxIdMale:: @ 8271F19
+EventScript_SetupRivalOnBikeGfxIdMale::
 	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_MACH_BIKE
 	return
 
 @ Unused
-Common_EventScript_SetupRivalGfxIdSameGender:: @ 8271F1F
+Common_EventScript_SetupRivalGfxIdSameGender::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq EventScript_SetupRivalGfxIdMale2
@@ -39,10 +39,10 @@ Common_EventScript_SetupRivalGfxIdSameGender:: @ 8271F1F
 	goto_if_eq EventScript_SetupRivalGfxIdFemale2
 	end
 
-EventScript_SetupRivalGfxIdMale2:: @ 8271F37
+EventScript_SetupRivalGfxIdMale2::
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-EventScript_SetupRivalGfxIdFemale2:: @ 8271F3D
+EventScript_SetupRivalGfxIdFemale2::
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
diff --git a/data/scripts/roulette.inc b/data/scripts/roulette.inc
index f590ca358..1167a765b 100644
--- a/data/scripts/roulette.inc
+++ b/data/scripts/roulette.inc
@@ -1,4 +1,4 @@
-Roulette_EventScript_Table1:: @ 82A5AB1
+Roulette_EventScript_Table1::
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
@@ -10,7 +10,7 @@ Roulette_EventScript_Table1:: @ 82A5AB1
 	goto Roulette_EventScript_Play
 	end
 
-Roulette_EventScript_Table2:: @ 82A5ADF
+Roulette_EventScript_Table2::
 	checkitem ITEM_COIN_CASE, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq MauvilleCity_GameCorner_EventScript_NoCoinCase
@@ -22,50 +22,50 @@ Roulette_EventScript_Table2:: @ 82A5ADF
 	goto Roulette_EventScript_Play
 	end
 
-Roulette_EventScript_Play:: @ 82A5B0D
+Roulette_EventScript_Play::
 	special PlayRoulette
 	waitstate
 	end
 	
-Roulette_Text_PlayMinimumWagerIsX:: @ 82A5B12
+Roulette_Text_PlayMinimumWagerIsX::
 	.string "The minimum wager at this table\n"
 	.string "is {STR_VAR_1}. Do you want to play?$"
 
-Roulette_Text_NotEnoughCoins:: @ 82A5B4E
+Roulette_Text_NotEnoughCoins::
 	.string "You don't have enough COINS.$"
 
-Roulette_Text_SpecialRateTable:: @ 82A5B6B
+Roulette_Text_SpecialRateTable::
 	.string "Special rate table right now!$"
 
-Roulette_Text_ControlsInstruction:: @ 82A5B89
+Roulette_Text_ControlsInstruction::
 	.string "Place your wager with the + Control\n"
 	.string "Pad, then press the A Button.$"
 
-Roulette_Text_ItsAHit:: @ 82A5BCB
+Roulette_Text_ItsAHit::
 	.string "It's a hit!$"
 
-Roulette_Text_Jackpot:: @ 82A5BD7
+Roulette_Text_Jackpot::
 	.string "Jackpot!$"
 
-Roulette_Text_NothingDoing:: @ 82A5BE0
+Roulette_Text_NothingDoing::
 	.string "Nothing doing!$"
 
-Roulette_Text_YouveWonXCoins:: @ 82A5BEF
+Roulette_Text_YouveWonXCoins::
 	.string "You've won {STR_VAR_1} COINS!$"
 
-Roulette_Text_NoCoinsLeft:: @ 82A5C04
+Roulette_Text_NoCoinsLeft::
 	.string "No COINS left…$"
 
-Roulette_Text_KeepPlaying:: @ 82A5C13
+Roulette_Text_KeepPlaying::
 	.string "Keep playing?$"
 
-Roulette_Text_BoardWillBeCleared:: @ 82A5C21
+Roulette_Text_BoardWillBeCleared::
 	.string "The ROULETTE board will be cleared.$"
 
 @ Unused
-Roulette_Text_YouDontHaveACoinCase:: @ 82A5C45
+Roulette_Text_YouDontHaveACoinCase::
 	.string "You don't have a COIN CASE.$"
 
-Roulette_Text_CoinCaseIsFull:: @ 82A5C61
+Roulette_Text_CoinCaseIsFull::
 	.string "Your COIN CASE is full!\n"
 	.string "Coins can be exchanged for prizes.$"
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index d04a16b58..6dd0767f0 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -1,17 +1,17 @@
-SafariZone_EventScript_OutOfBallsMidBattle:: @ 82A4B4C
+SafariZone_EventScript_OutOfBallsMidBattle::
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	end
 
-SafariZone_EventScript_Exit:: @ 82A4B5D
+SafariZone_EventScript_Exit::
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate
 	end
 
-SafariZone_EventScript_RetirePrompt:: @ 82A4B6F
+SafariZone_EventScript_RetirePrompt::
 	lockall
 	msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO
 	compare VAR_RESULT, YES
@@ -19,10 +19,10 @@ SafariZone_EventScript_RetirePrompt:: @ 82A4B6F
 	releaseall
 	end
 
-SafariZone_EventScript_Retire:: @ 82A4B85
+SafariZone_EventScript_Retire::
 	goto SafariZone_EventScript_Exit
 
-SafariZone_EventScript_TimesUp:: @ 82A4B8A
+SafariZone_EventScript_TimesUp::
 	lockall
 	playse SE_DING_DONG
 	message SafariZone_Text_TimesUp
@@ -31,7 +31,7 @@ SafariZone_EventScript_TimesUp:: @ 82A4B8A
 	releaseall
 	goto SafariZone_EventScript_Exit
 
-SafariZone_EventScript_OutOfBalls:: @ 82A4B9B
+SafariZone_EventScript_OutOfBalls::
 	lockall
 	playse SE_DING_DONG
 	message SafariZone_Text_OutOfBalls
@@ -40,7 +40,7 @@ SafariZone_EventScript_OutOfBalls:: @ 82A4B9B
 	releaseall
 	goto SafariZone_EventScript_Exit
 
-EventScript_PokeBlockFeeder:: @ 82A4BAC
+EventScript_PokeBlockFeeder::
 	lockall
 	special GetPokeblockFeederInFront
 	compare VAR_RESULT, 0xFFFF
@@ -51,7 +51,7 @@ EventScript_PokeBlockFeeder:: @ 82A4BAC
 	releaseall
 	end
 
-SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0
+SafariZone_EventScript_ChoosePokeblock::
 	fadescreen FADE_TO_BLACK
 	special OpenPokeblockCaseOnFeeder
 	waitstate
@@ -59,45 +59,45 @@ SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0
 	goto_if_ne SafariZone_EventScript_PokeblockPlaced
 	end
 
-SafariZone_EventScript_PokeblockPlaced:: @ 82A4BE2
+SafariZone_EventScript_PokeblockPlaced::
 	message SafariZone_Text_PokeblockWasPlaced
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-SafariZone_EventScript_PokeblockPresent:: @ 82A4BEB
+SafariZone_EventScript_PokeblockPresent::
 	message SafariZone_Text_PokeblockStillHere
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-SafariZone_Text_WouldYouLikeToExit: @ 82A4BF4
+SafariZone_Text_WouldYouLikeToExit:
 	.string "Would you like to exit the SAFARI\n"
 	.string "ZONE right now?$"
 
-SafariZone_Text_TimesUp: @ 82A4C26
+SafariZone_Text_TimesUp:
 	.string "Ding-dong! Time's up!\n"
 	.string "Your SAFARI Game is over.$"
 
-SafariZone_Text_OutOfBalls: @ 82A4C56
+SafariZone_Text_OutOfBalls:
 	.string "You've run out of SAFARI BALLS.\n"
 	.string "Your SAFARI Game is over.$"
 
-SafariZone_Text_PlacePokeblockOnFeeder: @ 82A4C90
+SafariZone_Text_PlacePokeblockOnFeeder:
 	.string "Would you like to place a {POKEBLOCK}\n"
 	.string "on the {POKEBLOCK} FEEDER?$"
 
-SafariZone_Text_PokeblockStillHere: @ 82A4CC5
+SafariZone_Text_PokeblockStillHere:
 	.string "The {STR_VAR_1} you left\n"
 	.string "before is still here.$"
 
-SafariZone_Text_PokeblockWasPlaced: @ 82A4CEB
+SafariZone_Text_PokeblockWasPlaced:
 	.string "The {STR_VAR_1} was placed\n"
 	.string "on the {POKEBLOCK} FEEDER.$"
 
-Route121_SafariZoneEntrance_Text_WelcomeToSafariZone: @ 82A4D12
+Route121_SafariZoneEntrance_Text_WelcomeToSafariZone:
 	.string "Welcome to the SAFARI ZONE!\p"
 	.string "Here, you may witness many kinds of\n"
 	.string "POKéMON rarely seen in HOENN.\p"
@@ -109,14 +109,14 @@ Route121_SafariZoneEntrance_Text_WelcomeToSafariZone: @ 82A4D12
 	.string "for keeps!\p"
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_WelcomeFirstTime: @ 82A4E46
+Route121_SafariZoneEntrance_Text_WelcomeFirstTime:
 	.string "Welcome to the SAFARI ZONE!\n"
 	.string "Is it your first time here?$"
 
-Route121_SafariZoneEntrance_Text_ComeInAndEnjoy: @ 82A4E7E
+Route121_SafariZoneEntrance_Text_ComeInAndEnjoy:
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_FirstTimeInfo: @ 82A4EA1
+Route121_SafariZoneEntrance_Text_FirstTimeInfo:
 	.string "When you enter the SAFARI ZONE, you\n"
 	.string "start with 30 SAFARI BALLS for\l"
 	.string "catching POKéMON.\p"
@@ -125,39 +125,39 @@ Route121_SafariZoneEntrance_Text_FirstTimeInfo: @ 82A4EA1
 	.string "walked 500 steps.\p"
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay: @ 82A4F74
+Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay:
 	.string "Welcome to the SAFARI ZONE!\p"
 	.string "All you can catch for just ¥500!\n"
 	.string "Would you like to play a SAFARI Game?$"
 
-Route121_SafariZoneEntrance_Text_PlayAnotherTime: @ 82A4FD7
+Route121_SafariZoneEntrance_Text_PlayAnotherTime:
 	.string "Okay.\n"
 	.string "Please play another time!$"
 
-Route121_SafariZoneEntrance_Text_NotEnoughMoney: @ 82A4FF7
+Route121_SafariZoneEntrance_Text_NotEnoughMoney:
 	.string "You don't have enough money.\n"
 	.string "Sorry.$"
 
-Route121_SafariZoneEntrance_Text_ThatWillBe500Please: @ 82A501B
+Route121_SafariZoneEntrance_Text_ThatWillBe500Please:
 	.string "That will be ¥500, please.$"
 
-Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls: @ 82A5036
+Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls:
 	.string "Here are your SAFARI BALLS.$"
 
-Route121_SafariZoneEntrance_Text_Received30SafariBalls: @ 82A5052
+Route121_SafariZoneEntrance_Text_Received30SafariBalls:
 	.string "{PLAYER} received 30 SAFARI BALLS.$"
 
-Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself: @ 82A506F
+Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself:
 	.string "We'll let you know when your game\n"
 	.string "is over.\p"
 	.string "So, until then, enjoy yourself, please!\n"
 	.string "Off you go on your wild excursion!$"
 
-Route121_SafariZoneEntrance_Text_PCIsFull: @ 82A50E5
+Route121_SafariZoneEntrance_Text_PCIsFull:
 	.string "Excuse me!\n"
 	.string "Your PC BOX is full.$"
 
-Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase: @ 82A5105
+Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase:
 	.string "Excuse me!\n"
 	.string "You seem to be without a {POKEBLOCK} CASE.\p"
 	.string "Your SAFARI Game will be much more\n"
@@ -166,129 +166,129 @@ Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase: @ 82A5105
 	.string "You may obtain a {POKEBLOCK} CASE from\n"
 	.string "the LILYCOVE CONTEST HALL.$"
 
-SafariZone_South_Text_StillHaveTimeExit: @ 82A51D4
+SafariZone_South_Text_StillHaveTimeExit:
 	.string "You still have time left. Would you like\n"
 	.string "to exit the SAFARI ZONE now?$"
 
-SafariZone_South_Text_EnjoyTheRestOfYourAdventure: @ 82A521A
+SafariZone_South_Text_EnjoyTheRestOfYourAdventure:
 	.string "Please enjoy the rest of your wild\n"
 	.string "adventure!$"
 
-SafariZone_South_Text_ExitEarlyThankYouForPlaying: @ 82A5248
+SafariZone_South_Text_ExitEarlyThankYouForPlaying:
 	.string "Okay.\p"
 	.string "I'll take back your remaining SAFARI\n"
 	.string "BALLS.\p"
 	.string "Thank you for playing.\n"
 	.string "We hope to see you again.$"
 
-SafariZone_South_Text_GoodLuck: @ 82A52AB
+SafariZone_South_Text_GoodLuck:
 	.string "Good luck!\p"
 	.string "If you need anything, don't hesitate\n"
 	.string "to tell me, please!$"
 
-SafariZone_South_Text_Boy: @ 82A52EF
+SafariZone_South_Text_Boy:
 	.string "Did you know?\p"
 	.string "If you put a {POKEBLOCK} in that square box,\n"
 	.string "POKéMON gather around.$"
 
-SafariZone_South_Text_Man: @ 82A533B
+SafariZone_South_Text_Man:
 	.string "I want to keep going deeper, but I\n"
 	.string "forgot to bring a BIKE.\p"
 	.string "Something tells me that rare POKéMON\n"
 	.string "live in the outlying areas.$"
 
-SafariZone_Southwest_Text_Woman: @ 82A53B7
+SafariZone_Southwest_Text_Woman:
 	.string "Sometimes, when I toss a {POKEBLOCK} at \n"
 	.string "POKéMON, it gets ignored.\p"
 	.string "Do POKéMON have likes and dislikes\n"
 	.string "about what they eat?$"
 
-SafariZone_Northwest_Text_Man: @ 82A542C
+SafariZone_Northwest_Text_Man:
 	.string "Gasp… Gasp…\n"
 	.string "I…made it out here…but…\p"
 	.string "I'm exhausted… I don't have the\n"
 	.string "energy to catch POKéMON…$"
 
-SafariZone_North_Text_Fisherman: @ 82A5489
+SafariZone_North_Text_Fisherman:
 	.string "I'm on a mission to find WATER POKéMON\n"
 	.string "you don't see in HOENN.\p"
 	.string "Do you have any idea where the lake is?$"
 
-SafariZone_North_Text_Man: @ 82A54F0
+SafariZone_North_Text_Man:
 	.string "I'm going to catch a lot of rare POKéMON\n"
 	.string "here and trade them with my friends!$"
 
-SafariZone_South_Text_Youngster: @ 82A553E
+SafariZone_South_Text_Youngster:
 	.string "I put a {POKEBLOCK} on the {POKEBLOCK} FEEDER.\n"
 	.string "But it seems to have disappeared.\p"
 	.string "I guess POKéMON must have eaten it\n"
 	.string "without me noticing.$"
 
-Route121_SafariZoneEntrance_Text_TrainerTip: @ 82A55BB
+Route121_SafariZoneEntrance_Text_TrainerTip:
 	.string "SAFARI ZONE TRAINER TIP!\p"
 	.string "Throw {POKEBLOCK}S at wild POKéMON to make\n"
 	.string "them less likely to flee.$"
 
-SafariZone_Southwest_Text_RestHouseSign: @ 82A5613
+SafariZone_Southwest_Text_RestHouseSign:
 	.string "“Relieve your tired feet.”\n"
 	.string "REST HOUSE$"
 
-SafariZone_RestHouse_Text_Youngster: @ 82A5639
+SafariZone_RestHouse_Text_Youngster:
 	.string "I don't have any {POKEBLOCK}S, but I caught\n"
 	.string "a good number of POKéMON.\p"
 	.string "You can improve your chances of making\n"
 	.string "a catch by getting closer to them\l"
 	.string "before throwing a SAFARI BALL.$"
 
-SafariZone_RestHouse_Text_PsychicM: @ 82A56E1
+SafariZone_RestHouse_Text_PsychicM:
 	.string "If you use {POKEBLOCK}S, wild POKéMON won't\n"
 	.string "be so quick to run away.\p"
 	.string "It's not much use to give {POKEBLOCK}S to\n"
 	.string "POKéMON that don't flee easily.$"
 
-SafariZone_RestHouse_Text_FatMan: @ 82A5764
+SafariZone_RestHouse_Text_FatMan:
 	.string "If you put a {POKEBLOCK} on the FEEDER,\n"
 	.string "POKéMON are attracted to it.\p"
 	.string "I think POKéMON with the same sort of\n"
 	.string "nature are drawn by a certain {POKEBLOCK}.$"
 
-SafariZone_South_Text_AreaOffLimits1: @ 82A57EE
+SafariZone_South_Text_AreaOffLimits1:
 	.string "This area is still under construction.\n"
 	.string "It's off-limits, sorry!$"
 
-SafariZone_Southeast_Text_ExpansionIsFinished: @ 82A582D
+SafariZone_Southeast_Text_ExpansionIsFinished:
 	.string "The SAFARI ZONE's expansion project\n"
 	.string "is finished now.\p"
 	.string "We hope you will enjoy the new area.$"
 
-SafariZone_South_Text_AreaOffLimits2: @ 82A5887
+SafariZone_South_Text_AreaOffLimits2:
 	.string "This area is still under construction.\n"
 	.string "It's off-limits, sorry!$"
 
-SafariZone_Southeast_Text_LittleGirl: @ 82A58C6
+SafariZone_Southeast_Text_LittleGirl:
 	.string "Wow! Whee! I haven't seen any of\n"
 	.string "these POKéMON before!$"
 
-SafariZone_Southeast_Text_FatMan: @ 82A58FD
+SafariZone_Southeast_Text_FatMan:
 	.string "The POKéMON in this area are all\n"
 	.string "new to me.\p"
 	.string "And I'm allowed to catch these rare\n"
 	.string "POKéMON! Too cool!$"
 
-SafariZone_Southeast_Text_RichBoy: @ 82A5960
+SafariZone_Southeast_Text_RichBoy:
 	.string "The POKéMON around here seem to be\n"
 	.string "from somewhere other than HOENN.$"
 
-SafariZone_Northeast_Text_Boy: @ 82A59A4
+SafariZone_Northeast_Text_Boy:
 	.string "I only have a couple SAFARI BALLS left.\p"
 	.string "I'm having a hard time trying to\n"
 	.string "decide what I should catch.$"
 
-SafariZone_Northeast_Text_Woman: @ 82A5A09
+SafariZone_Northeast_Text_Woman:
 	.string "I heard that you can see PIKACHU here.\n"
 	.string "Where might one be?$"
 
-SafariZone_Northeast_Text_Girl: @ 82A5A44
+SafariZone_Northeast_Text_Girl:
 	.string "Oh, boo!\n"
 	.string "I can't seem to catch anything!\p"
 	.string "I'll end up wasting the admission\n"
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 9e7a60e15..ae802cdfd 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -1,30 +1,30 @@
-SecretBase_Text_TreeCanBeClimbed: @ 8274746
+SecretBase_Text_TreeCanBeClimbed:
 	.string "If some vines drop down, this tree can\n"
 	.string "be climbed.$"
 
-SecretBase_Text_TreeUseSecretPower: @ 8274779
+SecretBase_Text_TreeUseSecretPower:
 	.string "If some vines drop down, this tree can\n"
 	.string "be climbed.\p"
 	.string "Use the SECRET POWER?$"
 
-SecretBase_Text_VineDroppedDown: @ 82747C2
+SecretBase_Text_VineDroppedDown:
 	.string "A thick vine dropped down!$"
 
-SecretBase_Text_ClumpOfGrass: @ 82747DD
+SecretBase_Text_ClumpOfGrass:
 	.string "If this clump of grass can be moved,\n"
 	.string "it might be possible to go inside.$"
 
-SecretBase_Text_ClumpUseSecretPower: @ 8274825
+SecretBase_Text_ClumpUseSecretPower:
 	.string "If this clump of grass can be moved,\n"
 	.string "it might be possible to go inside.\p"
 	.string "Use the SECRET POWER?$"
 
-SecretBase_Text_DiscoveredSmallEntrance: @ 8274883
+SecretBase_Text_DiscoveredSmallEntrance:
 	.string "Discovered a small entrance!$"
 
 	.include "data/text/secret_base_trainers.inc"
 
-SecretBase_EventScript_CheckEntrance:: @ 82759F1
+SecretBase_EventScript_CheckEntrance::
 	special GetSecretBaseTypeInFrontOfPlayer
 	special CheckPlayerHasSecretBase
 	compare VAR_RESULT, TRUE
@@ -46,7 +46,7 @@ SecretBase_EventScript_CheckEntrance:: @ 82759F1
 	goto_if_eq SecretBase_EventScript_Shrub
 	end
 
-SecretBase_EventScript_Cave:: @ 8275A50
+SecretBase_EventScript_Cave::
 	lockall
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq SecretBase_EventScript_CaveNoSecretPower
@@ -61,24 +61,24 @@ SecretBase_EventScript_Cave:: @ 8275A50
 	goto SecretBase_EventScript_CaveEnter
 	end
 
-SecretBase_EventScript_CaveUseSecretPower:: @ 8275A86
+SecretBase_EventScript_CaveUseSecretPower::
 	lockall
 	dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
 	waitstate
 	goto SecretBase_EventScript_CaveEnter
 	end
 
-SecretBase_EventScript_CaveNoSecretPower:: @ 8275A91
+SecretBase_EventScript_CaveNoSecretPower::
 	msgbox SecretBase_Text_SmallIndentInWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SecretBase_EventScript_CaveEnter:: @ 8275A9B
+SecretBase_EventScript_CaveEnter::
 	msgbox SecretBase_Text_DiscoveredSmallCavern, MSGBOX_DEFAULT
 	goto SecretBase_EventScript_InitSecretBase
 	end
 
-SecretBase_EventScript_Tree:: @ 8275AA9
+SecretBase_EventScript_Tree::
 	lockall
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq SecretBase_EventScript_TreeNoSecretPower
@@ -93,24 +93,24 @@ SecretBase_EventScript_Tree:: @ 8275AA9
 	goto SecretBase_EventScript_TreeEnter
 	end
 
-SecretBase_EventScript_TreeUseSecretPower:: @ 8275ADF
+SecretBase_EventScript_TreeUseSecretPower::
 	lockall
 	dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
 	waitstate
 	goto SecretBase_EventScript_TreeEnter
 	end
 
-SecretBase_EventScript_TreeNoSecretPower:: @ 8275AEA
+SecretBase_EventScript_TreeNoSecretPower::
 	msgbox SecretBase_Text_TreeCanBeClimbed, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SecretBase_EventScript_TreeEnter:: @ 8275AF4
+SecretBase_EventScript_TreeEnter::
 	msgbox SecretBase_Text_VineDroppedDown, MSGBOX_DEFAULT
 	goto SecretBase_EventScript_InitSecretBase
 	end
 
-SecretBase_EventScript_Shrub:: @ 8275B02
+SecretBase_EventScript_Shrub::
 	lockall
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq SecretBase_EventScript_ShrubNoSecretPower
@@ -125,24 +125,24 @@ SecretBase_EventScript_Shrub:: @ 8275B02
 	goto SecretBase_EventScript_ShrubEnter
 	end
 
-SecretBase_EventScript_ShrubUseSecretPower:: @ 8275B38
+SecretBase_EventScript_ShrubUseSecretPower::
 	lockall
 	dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
 	waitstate
 	goto SecretBase_EventScript_ShrubEnter
 	end
 
-SecretBase_EventScript_ShrubNoSecretPower:: @ 8275B43
+SecretBase_EventScript_ShrubNoSecretPower::
 	msgbox SecretBase_Text_ClumpOfGrass, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SecretBase_EventScript_ShrubEnter:: @ 8275B4D
+SecretBase_EventScript_ShrubEnter::
 	msgbox SecretBase_Text_DiscoveredSmallEntrance, MSGBOX_DEFAULT
 	goto SecretBase_EventScript_InitSecretBase
 	end
 
-SecretBase_EventScript_InitSecretBase:: @ 8275B5B
+SecretBase_EventScript_InitSecretBase::
 	closemessage
 	playse SE_EXIT
 	setvar VAR_INIT_SECRET_BASE, 0
@@ -156,7 +156,7 @@ SecretBase_EventScript_InitSecretBase:: @ 8275B5B
 	waitstate
 	end
 
-SecretBase_EventScript_FirstEntrance:: @ 8275B81
+SecretBase_EventScript_FirstEntrance::
 	applymovement OBJ_EVENT_ID_PLAYER, SecretBase_Movement_EnterBase
 	waitmovement 0
 	setvar VAR_INIT_SECRET_BASE, 1
@@ -168,19 +168,19 @@ SecretBase_EventScript_FirstEntrance:: @ 8275B81
 	special ClearAndLeaveSecretBase
 	end
 
-SecretBase_EventScript_SetAsBase:: @ 8275BAB
+SecretBase_EventScript_SetAsBase::
 	closemessage
 	setflag FLAG_RECEIVED_SECRET_POWER
 	special EnterNewlyCreatedSecretBase
 	waitstate
 	end
 
-SecretBase_Movement_EnterBase: @ 8275BB4
+SecretBase_Movement_EnterBase:
 	walk_up
 	walk_up
 	step_end
 
-SecretBase_EventScript_Enter:: @ 8275BB7
+SecretBase_EventScript_Enter::
 	lockall
 	setvar VAR_INIT_SECRET_BASE, 1
 	playse SE_EXIT
@@ -193,14 +193,14 @@ SecretBase_EventScript_Enter:: @ 8275BB7
 	waitstate
 	end
 
-SecretBase_EventScript_EnterPlayersBase:: @ 8275BDB
+SecretBase_EventScript_EnterPlayersBase::
 	setflag FLAG_DECORATION_0
 	special EnterSecretBase
 	setvar VAR_SECRET_BASE_INITIALIZED, 0
 	waitstate
 	end
 
-SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8
+SecretBase_EventScript_AlreadyHasSecretBase::
 	checkpartymove MOVE_SECRET_POWER
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq SecretBase_EventScript_NoSecretPower
@@ -241,7 +241,7 @@ SecretBase_EventScript_AlreadyHasSecretBase:: @ 8275BE8
 	releaseall
 	end
 
-SecretBase_EventScript_NoSecretPower:: @ 8275C9A
+SecretBase_EventScript_NoSecretPower::
 	lockall
 	compare VAR_0x8007, SECRET_BASE_RED_CAVE
 	goto_if_eq SecretBase_EventScript_CaveNoSecretPower
@@ -257,12 +257,12 @@ SecretBase_EventScript_NoSecretPower:: @ 8275C9A
 	goto_if_eq SecretBase_EventScript_ShrubNoSecretPower
 	end
 
-SecretBase_EventScript_CancelOnEntrance:: @ 8275CDE
+SecretBase_EventScript_CancelOnEntrance::
 	closemessage
 	releaseall
 	end
 
-SecretBase_EventScript_SetDecorationFlags:: @ 8275CE1
+SecretBase_EventScript_SetDecorationFlags::
 	setflag FLAG_DECORATION_1
 	setflag FLAG_DECORATION_2
 	setflag FLAG_DECORATION_3
@@ -279,28 +279,28 @@ SecretBase_EventScript_SetDecorationFlags:: @ 8275CE1
 	setflag FLAG_DECORATION_14
 	return
 
-SecretBase_EventScript_InitDecorations:: @ 8275D0C
+SecretBase_EventScript_InitDecorations::
 	setvar VAR_0x8004, 0
 	setvar VAR_0x8005, 0
 	special InitSecretBaseDecorationSprites
 	setvar VAR_SECRET_BASE_INITIALIZED, 1
 	end
 
-SecretBase_EventScript_SetDecoration:: @ 8275D1F
+SecretBase_EventScript_SetDecoration::
 	setvar VAR_0x8005, 0
 	goto SecretBase_EventScript_SetDecoration2
 	end
 
-SecretBase_EventScript_SetDecoration2:: @ 8275D2A
+SecretBase_EventScript_SetDecoration2::
 	special SetDecoration
 	end
 
-SecretBase_EventScript_PutAwayDecoration:: @ 8275D2E
+SecretBase_EventScript_PutAwayDecoration::
 	setvar VAR_0x8004, 0
 	goto SecretBase_EventScript_PutAwayDecorationLoop
 	end
 
-SecretBase_EventScript_PutAwayDecorationLoop:: @ 8275D39
+SecretBase_EventScript_PutAwayDecorationLoop::
 	special PutAwayDecorationIteration
 	compare VAR_RESULT, 1
 	goto_if_eq SecretBase_EventScript_PutAwayDecorationEnd
@@ -312,10 +312,10 @@ SecretBase_EventScript_PutAwayDecorationLoop:: @ 8275D39
 	goto SecretBase_EventScript_PutAwayDecorationLoop
 	end
 
-SecretBase_EventScript_PutAwayDecorationEnd:: @ 8275D63
+SecretBase_EventScript_PutAwayDecorationEnd::
 	end
 
-SecretBase_EventScript_RecordMixTrainer:: @ 8275D64
+SecretBase_EventScript_RecordMixTrainer::
 	special GetSecretBaseOwnerAndState
 	compare VAR_0x8004, 0
 	goto_if_eq SecretBase_EventScript_Trainer0
@@ -340,7 +340,7 @@ SecretBase_EventScript_RecordMixTrainer:: @ 8275D64
 	end
 
 @ VAR_RESULT is initially set by GetSecretBaseOwnerAndState
-SecretBase_EventScript_Trainer0:: @ 8275DD6
+SecretBase_EventScript_Trainer0::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer0PreChampion
@@ -358,12 +358,12 @@ SecretBase_EventScript_Trainer0:: @ 8275DD6
 	goto SecretBase_EventScript_BattleTrainer
 	end
 
-SecretBase_EventScript_Trainer0PreChampion:: @ 8275E25
+SecretBase_EventScript_Trainer0PreChampion::
 	msgbox SecretBase_Text_Trainer0PreChampion, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_Trainer0DeclineBattle:: @ 8275E2F
+SecretBase_EventScript_Trainer0DeclineBattle::
 	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
@@ -371,13 +371,13 @@ SecretBase_EventScript_Trainer0DeclineBattle:: @ 8275E2F
 	release
 	end
 
-SecretBase_EventScript_Trainer0PostBattle:: @ 8275E44
+SecretBase_EventScript_Trainer0PostBattle::
 	msgbox SecretBase_Text_Trainer0PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
 @ VAR_RESULT is initially set by GetSecretBaseOwnerAndState
-SecretBase_EventScript_Trainer1:: @ 8275E4E
+SecretBase_EventScript_Trainer1::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer1PreChampion
@@ -395,12 +395,12 @@ SecretBase_EventScript_Trainer1:: @ 8275E4E
 	goto SecretBase_EventScript_BattleTrainer
 	end
 
-SecretBase_EventScript_Trainer1PreChampion:: @ 8275E9D
+SecretBase_EventScript_Trainer1PreChampion::
 	msgbox SecretBase_Text_Trainer1PreChampion, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_Trainer1DeclineBattle:: @ 8275EA7
+SecretBase_EventScript_Trainer1DeclineBattle::
 	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
@@ -408,13 +408,13 @@ SecretBase_EventScript_Trainer1DeclineBattle:: @ 8275EA7
 	release
 	end
 
-SecretBase_EventScript_Trainer1PostBattle:: @ 8275EBC
+SecretBase_EventScript_Trainer1PostBattle::
 	msgbox SecretBase_Text_Trainer1PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
 @ VAR_RESULT is initially set by GetSecretBaseOwnerAndState
-SecretBase_EventScript_Trainer2:: @ 8275EC6
+SecretBase_EventScript_Trainer2::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer2PreChampion
@@ -432,12 +432,12 @@ SecretBase_EventScript_Trainer2:: @ 8275EC6
 	goto SecretBase_EventScript_BattleTrainer
 	end
 
-SecretBase_EventScript_Trainer2PreChampion:: @ 8275F15
+SecretBase_EventScript_Trainer2PreChampion::
 	msgbox SecretBase_Text_Trainer2PreChampion, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_Trainer2DeclineBattle:: @ 8275F1F
+SecretBase_EventScript_Trainer2DeclineBattle::
 	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
@@ -445,13 +445,13 @@ SecretBase_EventScript_Trainer2DeclineBattle:: @ 8275F1F
 	release
 	end
 
-SecretBase_EventScript_Trainer2PostBattle:: @ 8275F34
+SecretBase_EventScript_Trainer2PostBattle::
 	msgbox SecretBase_Text_Trainer2PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
 @ VAR_RESULT is initially set by GetSecretBaseOwnerAndState
-SecretBase_EventScript_Trainer3:: @ 8275F3E
+SecretBase_EventScript_Trainer3::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer3PreChampion
@@ -469,12 +469,12 @@ SecretBase_EventScript_Trainer3:: @ 8275F3E
 	goto SecretBase_EventScript_BattleTrainer
 	end
 
-SecretBase_EventScript_Trainer3PreChampion:: @ 8275F8D
+SecretBase_EventScript_Trainer3PreChampion::
 	msgbox SecretBase_Text_Trainer3PreChampion, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_Trainer3DeclineBattle:: @ 8275F97
+SecretBase_EventScript_Trainer3DeclineBattle::
 	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
@@ -482,13 +482,13 @@ SecretBase_EventScript_Trainer3DeclineBattle:: @ 8275F97
 	release
 	end
 
-SecretBase_EventScript_Trainer3PostBattle:: @ 8275FAC
+SecretBase_EventScript_Trainer3PostBattle::
 	msgbox SecretBase_Text_Trainer3PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
 @ VAR_RESULT is initially set by GetSecretBaseOwnerAndState
-SecretBase_EventScript_Trainer4:: @ 8275FB6
+SecretBase_EventScript_Trainer4::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer4PreChampion
@@ -506,12 +506,12 @@ SecretBase_EventScript_Trainer4:: @ 8275FB6
 	goto SecretBase_EventScript_BattleTrainer
 	end
 
-SecretBase_EventScript_Trainer4PreChampion:: @ 8276005
+SecretBase_EventScript_Trainer4PreChampion::
 	msgbox SecretBase_Text_Trainer4PreChampion, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_Trainer4DeclineBattle:: @ 827600F
+SecretBase_EventScript_Trainer4DeclineBattle::
 	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
@@ -519,13 +519,13 @@ SecretBase_EventScript_Trainer4DeclineBattle:: @ 827600F
 	release
 	end
 
-SecretBase_EventScript_Trainer4PostBattle:: @ 8276024
+SecretBase_EventScript_Trainer4PostBattle::
 	msgbox SecretBase_Text_Trainer4PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
 @ VAR_RESULT is initially set by GetSecretBaseOwnerAndState
-SecretBase_EventScript_Trainer5:: @ 827602E
+SecretBase_EventScript_Trainer5::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer5PreChampion
@@ -543,12 +543,12 @@ SecretBase_EventScript_Trainer5:: @ 827602E
 	goto SecretBase_EventScript_BattleTrainer
 	end
 
-SecretBase_EventScript_Trainer5PreChampion:: @ 827607D
+SecretBase_EventScript_Trainer5PreChampion::
 	msgbox SecretBase_Text_Trainer5PreChampion, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_Trainer5DeclineBattle:: @ 8276087
+SecretBase_EventScript_Trainer5DeclineBattle::
 	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
@@ -556,13 +556,13 @@ SecretBase_EventScript_Trainer5DeclineBattle:: @ 8276087
 	release
 	end
 
-SecretBase_EventScript_Trainer5PostBattle:: @ 827609C
+SecretBase_EventScript_Trainer5PostBattle::
 	msgbox SecretBase_Text_Trainer5PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
 @ VAR_RESULT is initially set by GetSecretBaseOwnerAndState
-SecretBase_EventScript_Trainer6:: @ 82760A6
+SecretBase_EventScript_Trainer6::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer6PreChampion
@@ -580,12 +580,12 @@ SecretBase_EventScript_Trainer6:: @ 82760A6
 	goto SecretBase_EventScript_BattleTrainer
 	end
 
-SecretBase_EventScript_Trainer6PreChampion:: @ 82760F5
+SecretBase_EventScript_Trainer6PreChampion::
 	msgbox SecretBase_Text_Trainer6PreChampion, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_Trainer6DeclineBattle:: @ 82760FF
+SecretBase_EventScript_Trainer6DeclineBattle::
 	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
@@ -593,13 +593,13 @@ SecretBase_EventScript_Trainer6DeclineBattle:: @ 82760FF
 	release
 	end
 
-SecretBase_EventScript_Trainer6PostBattle:: @ 8276114
+SecretBase_EventScript_Trainer6PostBattle::
 	msgbox SecretBase_Text_Trainer6PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
 @ VAR_RESULT is initially set by GetSecretBaseOwnerAndState
-SecretBase_EventScript_Trainer7:: @ 827611E
+SecretBase_EventScript_Trainer7::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer7PreChampion
@@ -617,12 +617,12 @@ SecretBase_EventScript_Trainer7:: @ 827611E
 	goto SecretBase_EventScript_BattleTrainer
 	end
 
-SecretBase_EventScript_Trainer7PreChampion:: @ 827616D
+SecretBase_EventScript_Trainer7PreChampion::
 	msgbox SecretBase_Text_Trainer7PreChampion, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_Trainer7DeclineBattle:: @ 8276177
+SecretBase_EventScript_Trainer7DeclineBattle::
 	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
@@ -630,13 +630,13 @@ SecretBase_EventScript_Trainer7DeclineBattle:: @ 8276177
 	release
 	end
 
-SecretBase_EventScript_Trainer7PostBattle:: @ 827618C
+SecretBase_EventScript_Trainer7PostBattle::
 	msgbox SecretBase_Text_Trainer7PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
 @ VAR_RESULT is initially set by GetSecretBaseOwnerAndState
-SecretBase_EventScript_Trainer8:: @ 8276196
+SecretBase_EventScript_Trainer8::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer8PreChampion
@@ -654,12 +654,12 @@ SecretBase_EventScript_Trainer8:: @ 8276196
 	goto SecretBase_EventScript_BattleTrainer
 	end
 
-SecretBase_EventScript_Trainer8PreChampion:: @ 82761E5
+SecretBase_EventScript_Trainer8PreChampion::
 	msgbox SecretBase_Text_Trainer8PreChampion, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_Trainer8DeclineBattle:: @ 82761EF
+SecretBase_EventScript_Trainer8DeclineBattle::
 	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
@@ -667,13 +667,13 @@ SecretBase_EventScript_Trainer8DeclineBattle:: @ 82761EF
 	release
 	end
 
-SecretBase_EventScript_Trainer8PostBattle:: @ 8276204
+SecretBase_EventScript_Trainer8PostBattle::
 	msgbox SecretBase_Text_Trainer8PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
 @ VAR_RESULT is initially set by GetSecretBaseOwnerAndState
-SecretBase_EventScript_Trainer9:: @ 827620E
+SecretBase_EventScript_Trainer9::
 	lock
 	faceplayer
 	goto_if_unset FLAG_SYS_GAME_CLEAR, SecretBase_EventScript_Trainer9PreChampion
@@ -691,12 +691,12 @@ SecretBase_EventScript_Trainer9:: @ 827620E
 	goto SecretBase_EventScript_BattleTrainer
 	end
 
-SecretBase_EventScript_Trainer9PreChampion:: @ 827625D
+SecretBase_EventScript_Trainer9PreChampion::
 	msgbox SecretBase_Text_Trainer9PreChampion, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_Trainer9DeclineBattle:: @ 8276267
+SecretBase_EventScript_Trainer9DeclineBattle::
 	special DeclinedSecretBaseBattle
 	setvar VAR_RESULT, 0
 	special SetBattledOwnerFromResult
@@ -704,12 +704,12 @@ SecretBase_EventScript_Trainer9DeclineBattle:: @ 8276267
 	release
 	end
 
-SecretBase_EventScript_Trainer9PostBattle:: @ 827627C
+SecretBase_EventScript_Trainer9PostBattle::
 	msgbox SecretBase_Text_Trainer9PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-SecretBase_EventScript_BattleTrainer:: @ 8276286
+SecretBase_EventScript_BattleTrainer::
 	special PrepSecretBaseBattleFlags
 	setvar VAR_0x8004, SPECIAL_BATTLE_SECRET_BASE
 	setvar VAR_0x8005, 0
@@ -725,59 +725,59 @@ SecretBase_EventScript_BattleTrainer:: @ 8276286
 	release
 	end
 
-SecretBase_EventScript_DrewSecretBaseBattle:: @ 82762BD
+SecretBase_EventScript_DrewSecretBaseBattle::
 	special DrewSecretBaseBattle
 	return
 
-SecretBase_EventScript_WonSecretBaseBattle:: @ 82762C1
+SecretBase_EventScript_WonSecretBaseBattle::
 	special WonSecretBaseBattle
 	return
 
-SecretBase_EventScript_LostSecretBaseBattle:: @ 82762C5
+SecretBase_EventScript_LostSecretBaseBattle::
 	special LostSecretBaseBattle
 	return
 
 	.include "data/scripts/secret_power_tm.inc"
 
-SecretBase_EventScript_DollInteract:: @ 82766A2
+SecretBase_EventScript_DollInteract::
 	special CheckInteractedWithFriendsDollDecor
 	end
 
-SecretBase_EventScript_CushionInteract:: @ 82766A6
+SecretBase_EventScript_CushionInteract::
 	special CheckInteractedWithFriendsCushionDecor
 	end
 
-SecretBase_Text_AllDecorationsWillBeReturned: @ 82766AA
+SecretBase_Text_AllDecorationsWillBeReturned:
 	.string "All decorations and furniture in your\n"
 	.string "SECRET BASE will be returned to your PC.\p"
 	.string "Is that okay?$"
 
-SecretBase_Text_WantToRegisterSecretBase: @ 8276707
+SecretBase_Text_WantToRegisterSecretBase:
 	.string "Do you want to register\n"
 	.string "{STR_VAR_1}'s SECRET BASE?$"
 
-SecretBase_Text_AlreadyRegisteredDelete: @ 8276731
+SecretBase_Text_AlreadyRegisteredDelete:
 	.string "This data is already registered.\n"
 	.string "Would you like to delete it?$"
 
-SecretBase_Text_TooManyBasesDeleteSome: @ 827676F
+SecretBase_Text_TooManyBasesDeleteSome:
 	.string "Up to 10 locations can be registered.\p"
 	.string "Delete a location if you want to\n"
 	.string "register another location.$"
 
-SecretBase_Text_RegistrationCompleted: @ 82767D1
+SecretBase_Text_RegistrationCompleted:
 	.string "Registration completed.$"
 
-SecretBase_Text_DataUnregistered: @ 82767E9
+SecretBase_Text_DataUnregistered:
 	.string "Data has been unregistered.$"
 
-SecretBase_Text_BootUpPC: @ 8276805
+SecretBase_Text_BootUpPC:
 	.string "{PLAYER} booted up the PC.$"
 
-SecretBase_Text_WhatWouldYouLikeToDo: @ 827681A
+SecretBase_Text_WhatWouldYouLikeToDo:
 	.string "What would you like to do?$"
 
-SecretBase_Text_RegistryInfo: @ 8276835
+SecretBase_Text_RegistryInfo:
 	.string "Once registered, a SECRET BASE will not\n"
 	.string "disappear unless the other TRAINER\l"
 	.string "moves it to a different location.\p"
@@ -787,27 +787,27 @@ SecretBase_Text_RegistryInfo: @ 8276835
 	.string "Up to ten SECRET BASE locations\n"
 	.string "may be registered.$"
 
-SecretBase_Text_BattleTowerShield: @ 827692B
+SecretBase_Text_BattleTowerShield:
 	.string "A shield of {STR_VAR_2} that marks winning\n"
 	.string "{STR_VAR_1} times in a row at the BATTLE TOWER.$"
 
-SecretBase_Text_ToyTV: @ 8276974
+SecretBase_Text_ToyTV:
 	.string "A realistic toy TV. It could be easily\n"
 	.string "mistaken for the real thing.$"
 
-SecretBase_Text_SeedotTV: @ 82769B8
+SecretBase_Text_SeedotTV:
 	.string "A toy TV shaped like a SEEDOT.\n"
 	.string "It looks ready to roll away on its own…$"
 
-SecretBase_Text_SkittyTV: @ 82769FF
+SecretBase_Text_SkittyTV:
 	.string "A toy TV shaped like a SKITTY.\n"
 	.string "It looks ready to stroll away…$"
 
-SecretBase_Text_WouldYouLikeToMoveBases: @ 8276A3D
+SecretBase_Text_WouldYouLikeToMoveBases:
 	.string "You may only make one SECRET BASE.\p"
 	.string "Would you like to move from the SECRET\n"
 	.string "BASE near {STR_VAR_1}?$"
 
-SecretBase_Text_MovingCompletedUseSecretPower: @ 8276A95
+SecretBase_Text_MovingCompletedUseSecretPower:
 	.string "Moving completed.\p"
 	.string "Would you like to use the SECRET POWER?$"
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 6684ec98b..41c21e100 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -1,4 +1,4 @@
-Route111_Text_MakingRoomUseTMToMakeYourOwn: @ 82762C9
+Route111_Text_MakingRoomUseTMToMakeYourOwn:
 	.string "What's that?\n"
 	.string "What am I doing?\p"
 	.string "I'm thinking about making my own room\n"
@@ -6,7 +6,7 @@ Route111_Text_MakingRoomUseTMToMakeYourOwn: @ 82762C9
 	.string "I know! I'll give you this TM.\n"
 	.string "Will you use it to make your own room?$"
 
-Route111_Text_ExplainSecretPower: @ 827636E
+Route111_Text_ExplainSecretPower:
 	.string "Find a big tree that looks like it might\n"
 	.string "drop some vines.\p"
 	.string "Use SECRET POWER in front of the tree.\n"
@@ -24,16 +24,16 @@ Route111_Text_ExplainSecretPower: @ 827636E
 	.string "I'm going to look for other places, too.\n"
 	.string "Okay, bye!$"
 
-Route111_Text_DontWantThis: @ 827655C
+Route111_Text_DontWantThis:
 	.string "Oh, you don't want this?\n"
 	.string "If you change your mind, tell me, okay?$"
 
-Route111_Text_DontHaveAnyRoom: @ 827659D
+Route111_Text_DontHaveAnyRoom:
 	.string "Oh, you don't have any room for this.\p"
 	.string "I'll hold on to it, so come back for it\n"
 	.string "another time, okay?$"
 
-Route111_EventScript_SecretPowerMan:: @ 82765FF
+Route111_EventScript_SecretPowerMan::
 	lock
 	faceplayer
 	msgbox Route111_Text_MakingRoomUseTMToMakeYourOwn, MSGBOX_YESNO
@@ -43,7 +43,7 @@ Route111_EventScript_SecretPowerMan:: @ 82765FF
 	release
 	end
 
-Route111_EventScript_GiveSecretPower:: @ 827661E
+Route111_EventScript_GiveSecretPower::
 	giveitem ITEM_TM43
 	compare VAR_RESULT, FALSE
 	goto_if_eq Route111_EventScript_NoRoomForSecretPower
@@ -61,22 +61,22 @@ Route111_EventScript_GiveSecretPower:: @ 827661E
 	release
 	end
 
-Route111_EventScript_SecretPowerManExit:: @ 827666A
+Route111_EventScript_SecretPowerManExit::
 	applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExit
 	waitmovement 0
 	return
 
-Route111_EventScript_SecretPowerManExitNorth:: @ 8276675
+Route111_EventScript_SecretPowerManExitNorth::
 	applymovement VAR_LAST_TALKED, Route111_Movement_SecretPowerManExitNorth
 	waitmovement 0
 	return
 
-Route111_EventScript_NoRoomForSecretPower:: @ 8276680
+Route111_EventScript_NoRoomForSecretPower::
 	msgbox Route111_Text_DontHaveAnyRoom, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_Movement_SecretPowerManExit: @ 827668A
+Route111_Movement_SecretPowerManExit:
 	walk_down
 	walk_down
 	walk_down
@@ -90,7 +90,7 @@ Route111_Movement_SecretPowerManExit: @ 827668A
 	walk_down
 	step_end
 
-Route111_Movement_SecretPowerManExitNorth: @ 8276696
+Route111_Movement_SecretPowerManExitNorth:
 	walk_left
 	walk_down
 	walk_down
diff --git a/data/scripts/set_gym_trainers.inc b/data/scripts/set_gym_trainers.inc
index c263e42d4..1faa9f7d5 100644
--- a/data/scripts/set_gym_trainers.inc
+++ b/data/scripts/set_gym_trainers.inc
@@ -1,4 +1,4 @@
-Common_EventScript_SetGymTrainers:: @ 8271F43
+Common_EventScript_SetGymTrainers::
 	switch VAR_0x8008
 	case 1, RustboroCity_Gym_SetGymTrainers
 	case 2, DewfordTown_Gym_SetGymTrainers
@@ -10,13 +10,13 @@ Common_EventScript_SetGymTrainers:: @ 8271F43
 	case 8, SootopolisCity_Gym_SetGymTrainers
 	end
 
-RustboroCity_Gym_SetGymTrainers:: @ 8271FA1
+RustboroCity_Gym_SetGymTrainers::
 	settrainerflag TRAINER_JOSH
 	settrainerflag TRAINER_TOMMY
 	settrainerflag TRAINER_MARC
 	return
 
-DewfordTown_Gym_SetGymTrainers:: @ 8271FAB
+DewfordTown_Gym_SetGymTrainers::
 	settrainerflag TRAINER_TAKAO
 	settrainerflag TRAINER_JOCELYN
 	settrainerflag TRAINER_LAURA
@@ -25,7 +25,7 @@ DewfordTown_Gym_SetGymTrainers:: @ 8271FAB
 	settrainerflag TRAINER_LILITH
 	return
 
-MauvilleCity_Gym_SetGymTrainers:: @ 8271FBE
+MauvilleCity_Gym_SetGymTrainers::
 	settrainerflag TRAINER_KIRK
 	settrainerflag TRAINER_SHAWN
 	settrainerflag TRAINER_BEN
@@ -33,7 +33,7 @@ MauvilleCity_Gym_SetGymTrainers:: @ 8271FBE
 	settrainerflag TRAINER_ANGELO
 	return
 
-LavaridgeTown_Gym_SetGymTrainers:: @ 8271FCE
+LavaridgeTown_Gym_SetGymTrainers::
 	settrainerflag TRAINER_COLE
 	settrainerflag TRAINER_AXLE
 	settrainerflag TRAINER_KEEGAN
@@ -44,7 +44,7 @@ LavaridgeTown_Gym_SetGymTrainers:: @ 8271FCE
 	settrainerflag TRAINER_ELI
 	return
 
-PetalburgCity_Gym_SetGymTrainers:: @ 8271FE7
+PetalburgCity_Gym_SetGymTrainers::
 	settrainerflag TRAINER_RANDALL
 	settrainerflag TRAINER_PARKER
 	settrainerflag TRAINER_GEORGE
@@ -54,7 +54,7 @@ PetalburgCity_Gym_SetGymTrainers:: @ 8271FE7
 	settrainerflag TRAINER_JODY
 	return
 
-FortreeCity_Gym_SetGymTrainers:: @ 8271FFD
+FortreeCity_Gym_SetGymTrainers::
 	settrainerflag TRAINER_JARED
 	settrainerflag TRAINER_FLINT
 	settrainerflag TRAINER_ASHLEY
@@ -63,7 +63,7 @@ FortreeCity_Gym_SetGymTrainers:: @ 8271FFD
 	settrainerflag TRAINER_DARIUS
 	return
 
-MossdeepCity_Gym_SetGymTrainers:: @ 8272010
+MossdeepCity_Gym_SetGymTrainers::
 	settrainerflag TRAINER_PRESTON
 	settrainerflag TRAINER_VIRGIL
 	settrainerflag TRAINER_BLAKE
@@ -78,7 +78,7 @@ MossdeepCity_Gym_SetGymTrainers:: @ 8272010
 	settrainerflag TRAINER_NICHOLAS
 	return
 
-SootopolisCity_Gym_SetGymTrainers:: @ 8272035
+SootopolisCity_Gym_SetGymTrainers::
 	settrainerflag TRAINER_ANDREA
 	settrainerflag TRAINER_CRISSY
 	settrainerflag TRAINER_BRIANNA
diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc
index 9e1759872..ef389d3fc 100644
--- a/data/scripts/shared_secret_base.inc
+++ b/data/scripts/shared_secret_base.inc
@@ -5,25 +5,25 @@ SecretBase_MapScripts::
     map_script MAP_SCRIPT_ON_RESUME, SecretBase_OnResume
     .byte 0
 
-SecretBase_OnWarp: @ 823B498
+SecretBase_OnWarp:
     map_script_2 VAR_SECRET_BASE_INITIALIZED, 0, SecretBase_EventScript_InitDecorations
     .2byte 0
 
-SecretBase_OnTransition: @ 823B4A2
+SecretBase_OnTransition:
     call SecretBase_EventScript_SetDecorationFlags
     special SetSecretBaseOwnerGfxId
     special InitSecretBaseVars
     end
 
-SecretBase_OnFrame: @ 823B4AE
+SecretBase_OnFrame:
     map_script_2 VAR_INIT_SECRET_BASE, 0, SecretBase_EventScript_FirstEntrance
     .2byte 0
 
-SecretBase_OnResume: @ 823B4B8
+SecretBase_OnResume:
     setstepcallback STEP_CB_SECRET_BASE
     end
 
-SecretBase_EventScript_PC:: @ 823B4BB
+SecretBase_EventScript_PC::
     lockall
     playse SE_PC_LOGIN
     message SecretBase_Text_BootUpPC
@@ -35,19 +35,19 @@ SecretBase_EventScript_PC:: @ 823B4BB
     goto SecretBase_EventScript_PCShowMainMenu
     end
 
-SecretBase_EventScript_PCShowMainMenu:: @ 823B4D3
+SecretBase_EventScript_PCShowMainMenu::
     message SecretBase_Text_WhatWouldYouLikeToDo
     waitmessage
     goto_if_set FLAG_SECRET_BASE_REGISTRY_ENABLED, SecretBase_EventScript_PCMainMenuWithRegister
     goto SecretBase_EventScript_PCMainMenuWithoutRegister
     end
 
-SecretBase_EventScript_PCCancel:: @ 823B4E8
+SecretBase_EventScript_PCCancel::
     lockall
     goto SecretBase_EventScript_PCShowMainMenu
     end
 
-SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF
+SecretBase_EventScript_PCMainMenuWithRegister::
     multichoice 0, 0, MULTI_BASE_PC_WITH_REGISTRY, FALSE
     switch VAR_RESULT
     case 0, SecretBase_EventScript_PCDecorationMenu
@@ -57,7 +57,7 @@ SecretBase_EventScript_PCMainMenuWithRegister:: @ 823B4EF
     case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff
     end
 
-SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531
+SecretBase_EventScript_PCMainMenuWithoutRegister::
     multichoice 0, 0, MULTI_BASE_PC_NO_REGISTRY, FALSE
     switch VAR_RESULT
     case 0, SecretBase_EventScript_PCDecorationMenu
@@ -66,7 +66,7 @@ SecretBase_EventScript_PCMainMenuWithoutRegister:: @ 823B531
     case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff
     end
 
-SecretBase_EventScript_PCPackUp:: @ 823B568
+SecretBase_EventScript_PCPackUp::
     msgbox SecretBase_Text_AllDecorationsWillBeReturned, MSGBOX_YESNO
     compare VAR_RESULT, NO
     goto_if_eq SecretBase_EventScript_PCShowMainMenu
@@ -75,15 +75,15 @@ SecretBase_EventScript_PCPackUp:: @ 823B568
     releaseall
     end
 
-SecretBase_EventScript_PCDecorationMenu:: @ 823B581
+SecretBase_EventScript_PCDecorationMenu::
     special ShowSecretBaseDecorationMenu
     end
 
-SecretBase_EventScript_PCRegistryMenu:: @ 823B585
+SecretBase_EventScript_PCRegistryMenu::
     special ShowSecretBaseRegistryMenu
     end
 
-SecretBase_EventScript_RecordMixingPC:: @ 823B589
+SecretBase_EventScript_RecordMixingPC::
     lockall
     message SecretBase_Text_BootUpPC
     playse SE_PC_LOGIN
@@ -95,7 +95,7 @@ SecretBase_EventScript_RecordMixingPC:: @ 823B589
     goto SecretBase_EventScript_PCRegisterMenu
     end
 
-SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1
+SecretBase_EventScript_PCRegisterMenu::
     message SecretBase_Text_WhatWouldYouLikeToDo
     waitmessage
     multichoice 0, 0, MULTI_REGISTER_MENU, FALSE
@@ -107,12 +107,12 @@ SecretBase_EventScript_PCRegisterMenu:: @ 823B5A1
     case MULTI_B_PRESSED, SecretBase_EventScript_PCTurnOff
     end
 
-SecretBase_EventScript_ShowRegisterMenu:: @ 823B5E9
+SecretBase_EventScript_ShowRegisterMenu::
     lockall
     goto SecretBase_EventScript_PCRegisterMenu
     end
 
-SecretBase_EventScript_PCRegister:: @ 823B5F0
+SecretBase_EventScript_PCRegister::
     special GetCurSecretBaseRegistrationValidity
     compare VAR_RESULT, 1
     goto_if_eq SecretBase_EventScript_AlreadyRegistered
@@ -128,7 +128,7 @@ SecretBase_EventScript_PCRegister:: @ 823B5F0
     releaseall
     end
 
-SecretBase_EventScript_AlreadyRegistered:: @ 823B62F
+SecretBase_EventScript_AlreadyRegistered::
     msgbox SecretBase_Text_AlreadyRegisteredDelete, MSGBOX_YESNO
     compare VAR_RESULT, NO
     goto_if_eq SecretBase_EventScript_PCRegisterMenu
@@ -138,51 +138,51 @@ SecretBase_EventScript_AlreadyRegistered:: @ 823B62F
     releaseall
     end
 
-SecretBase_EventScript_CantRegisterTooManyBases:: @ 823B652
+SecretBase_EventScript_CantRegisterTooManyBases::
     msgbox SecretBase_Text_TooManyBasesDeleteSome, MSGBOX_SIGN
     special DoSecretBasePCTurnOffEffect
     closemessage
     releaseall
     end
 
-SecretBase_EventScript_PCRegistryInfo:: @ 823B660
+SecretBase_EventScript_PCRegistryInfo::
     msgbox SecretBase_Text_RegistryInfo, MSGBOX_DEFAULT
     goto SecretBase_EventScript_PCRegisterMenu
     end
 
-SecretBase_EventScript_PCTurnOff:: @ 823B66E
+SecretBase_EventScript_PCTurnOff::
     special DoSecretBasePCTurnOffEffect
     closemessage
     releaseall
     end
 
 @ Unused
-SecretBase_EventScript_Poster:: @ 823B674
+SecretBase_EventScript_Poster::
     special CheckInteractedWithFriendsPosterDecor
     end
 
 @ Unused
-SecretBase_EventScript_FurnitureBottom:: @ 823B678
+SecretBase_EventScript_FurnitureBottom::
     special CheckInteractedWithFriendsFurnitureBottom
     end
 
 @ Unused
-SecretBase_EventScript_FurnitureMiddle:: @ 823B67C
+SecretBase_EventScript_FurnitureMiddle::
     special CheckInteractedWithFriendsFurnitureMiddle
     end
 
 @ Unused
-SecretBase_EventScript_FurnitureTop:: @ 823B680
+SecretBase_EventScript_FurnitureTop::
     special CheckInteractedWithFriendsFurnitureTop
     end
 
-SecretBase_EventScript_SandOrnament:: @ 823B684
+SecretBase_EventScript_SandOrnament::
     special CheckInteractedWithFriendsSandOrnament
     dofieldeffect FLDEFF_SAND_PILLAR
     waitstate
     end
 
-SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C
+SecretBase_EventScript_ShieldOrToyTV::
     special InteractWithShieldOrTVDecoration
     compare VAR_RESULT, 0
     goto_if_eq SecretBase_EventScript_BattleTowerShield
@@ -194,31 +194,31 @@ SecretBase_EventScript_ShieldOrToyTV:: @ 823B68C
     goto_if_eq SecretBase_EventScript_SkittyTV
     end
 
-SecretBase_EventScript_BattleTowerShield:: @ 823B6BC
+SecretBase_EventScript_BattleTowerShield::
     msgbox SecretBase_Text_BattleTowerShield, MSGBOX_SIGN
     end
 
-SecretBase_EventScript_ToyTV:: @ 823B6C5
+SecretBase_EventScript_ToyTV::
     msgbox SecretBase_Text_ToyTV, MSGBOX_SIGN
     end
 
-SecretBase_EventScript_SeedotTV:: @ 823B6CE
+SecretBase_EventScript_SeedotTV::
     msgbox SecretBase_Text_SeedotTV, MSGBOX_SIGN
     end
 
-SecretBase_EventScript_SkittyTV:: @ 823B6D7
+SecretBase_EventScript_SkittyTV::
     msgbox SecretBase_Text_SkittyTV, MSGBOX_SIGN
     end
 
-SecretBase_Text_SmallIndentInWall:: @ 823B6E0
+SecretBase_Text_SmallIndentInWall::
     .string "There's a small indent in the wall.$"
 
-SecretBase_Text_IndentUseSecretPower:: @ 823B704
+SecretBase_Text_IndentUseSecretPower::
     .string "There's a small indent in the wall.\p"
     .string "Use the SECRET POWER?$"
 
-SecretBase_Text_DiscoveredSmallCavern:: @ 823B73E
+SecretBase_Text_DiscoveredSmallCavern::
     .string "Discovered a small cavern!$"
 
-SecretBase_Text_WantToMakeYourSecretBaseHere: @ 823B759
+SecretBase_Text_WantToMakeYourSecretBaseHere:
     .string "Want to make your SECRET BASE here?$"
diff --git a/data/scripts/std_msgbox.inc b/data/scripts/std_msgbox.inc
index 10b46700e..941cc0e96 100644
--- a/data/scripts/std_msgbox.inc
+++ b/data/scripts/std_msgbox.inc
@@ -1,4 +1,4 @@
-Std_MsgboxNPC: @ 8271315
+Std_MsgboxNPC:
 	lock
 	faceplayer
 	message 0x0
@@ -7,7 +7,7 @@ Std_MsgboxNPC: @ 8271315
 	release
 	return
 
-Std_MsgboxSign: @ 8271320
+Std_MsgboxSign:
 	lockall
 	message 0x0
 	waitmessage
@@ -15,34 +15,34 @@ Std_MsgboxSign: @ 8271320
 	releaseall
 	return
 
-Std_MsgboxDefault: @ 827132A
+Std_MsgboxDefault:
 	message 0x0
 	waitmessage
 	waitbuttonpress
 	return
 
-Std_MsgboxYesNo: @ 8271332
+Std_MsgboxYesNo:
 	message 0x0
 	waitmessage
 	yesnobox 20, 8
 	return
 
-Std_MsgboxGetPoints: @ 827133C
+Std_MsgboxGetPoints:
 	message 0x0
 	playfanfare MUS_OBTAIN_B_POINTS
 	waitfanfare
 	waitmessage
 	return
 
-Std_10: @ 8271347
+Std_10:
 	pokenavcall 0x0
 	waitmessage
 	return
 
-EventScript_UnusedReturn: @ 827134E
+EventScript_UnusedReturn:
 	return
 
-Common_EventScript_SaveGame:: @ 827134F
+Common_EventScript_SaveGame::
 	special SaveGame
 	waitstate
 	return
diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc
index af6cac1da..91580422e 100644
--- a/data/scripts/surf.inc
+++ b/data/scripts/surf.inc
@@ -1,4 +1,4 @@
-EventScript_UseSurf:: @ 8271EA0
+EventScript_UseSurf::
 	checkpartymove MOVE_SURF
 	compare VAR_RESULT, PARTY_SIZE
 	goto_if_eq EventScript_EndUseSurf
@@ -10,7 +10,7 @@ EventScript_UseSurf:: @ 8271EA0
 	goto_if_eq EventScript_ReleaseUseSurf
 	msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT
 	dofieldeffect FLDEFF_USE_SURF
-EventScript_ReleaseUseSurf:: @ 8271ED5
+EventScript_ReleaseUseSurf::
 	releaseall
-EventScript_EndUseSurf:: @ 8271ED6
+EventScript_EndUseSurf::
 	end
diff --git a/data/scripts/test_signpost.inc b/data/scripts/test_signpost.inc
index 482fe18f2..6a8be547b 100644
--- a/data/scripts/test_signpost.inc
+++ b/data/scripts/test_signpost.inc
@@ -1,7 +1,7 @@
-Text_ThisIsATestSignpostMsg:: @ 82C840A
+Text_ThisIsATestSignpostMsg::
 	.string "This is a test message.\n"
 	.string "This is a signpost.$"
 
-EventScript_TestSignpostMsg:: @ 82C8436
+EventScript_TestSignpostMsg::
 	msgbox Text_ThisIsATestSignpostMsg, MSGBOX_SIGN
 	end
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
index 0b5c1118b..a59b58a6f 100644
--- a/data/scripts/trainer_battle.inc
+++ b/data/scripts/trainer_battle.inc
@@ -1,13 +1,13 @@
-EventScript_StartTrainerApproach:: @ 8271354
+EventScript_StartTrainerApproach::
 	selectapproachingtrainer
 	lockfortrainer
-EventScript_TrainerApproach:: @ 8271356
+EventScript_TrainerApproach::
 	special PlayTrainerEncounterMusic
 	special DoTrainerApproach
 	waitstate
 	goto EventScript_ShowTrainerIntroMsg
 
-EventScript_TryDoNormalTrainerBattle:: @ 8271362
+EventScript_TryDoNormalTrainerBattle::
 	lock
 	faceplayer
 	applymovement VAR_LAST_TALKED, Movement_RevealTrainer
@@ -19,10 +19,10 @@ EventScript_TryDoNormalTrainerBattle:: @ 8271362
 	special SetTrainerFacingDirection
 	goto EventScript_ShowTrainerIntroMsg
 
-EventScript_NoNormalTrainerBattle:: @ 8271389
+EventScript_NoNormalTrainerBattle::
 	gotopostbattlescript
 
-EventScript_TryDoDoubleTrainerBattle:: @ 827138A
+EventScript_TryDoDoubleTrainerBattle::
 	lock
 	faceplayer
 	call EventScript_RevealTrainer
@@ -36,24 +36,24 @@ EventScript_TryDoDoubleTrainerBattle:: @ 827138A
 	special SetTrainerFacingDirection
 	goto EventScript_ShowTrainerIntroMsg
 
-EventScript_NotEnoughMonsForDoubleBattle:: @ 82713BA
+EventScript_NotEnoughMonsForDoubleBattle::
 	special ShowTrainerCantBattleSpeech
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-EventScript_NoDoubleTrainerBattle:: @ 82713C1
+EventScript_NoDoubleTrainerBattle::
 	gotopostbattlescript
 
-EventScript_DoNoIntroTrainerBattle:: @ 82713C2
+EventScript_DoNoIntroTrainerBattle::
 	applymovement VAR_LAST_TALKED, Movement_RevealTrainer
 	waitmovement 0
 	special PlayTrainerEncounterMusic
 	trainerbattlebegin
 	gotopostbattlescript
 
-EventScript_TryDoRematchBattle:: @ 82713D1
+EventScript_TryDoRematchBattle::
 	call EventScript_RevealTrainer
 	specialvar VAR_RESULT, IsTrainerReadyForRematch
 	compare VAR_RESULT, FALSE
@@ -68,10 +68,10 @@ EventScript_TryDoRematchBattle:: @ 82713D1
 	releaseall
 	end
 
-EventScript_NoRematchTrainerBattle:: @ 82713F7
+EventScript_NoRematchTrainerBattle::
 	gotopostbattlescript
 
-EventScript_TryDoDoubleRematchBattle:: @ 82713F8
+EventScript_TryDoDoubleRematchBattle::
 	specialvar VAR_RESULT, IsTrainerReadyForRematch
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_NoDoubleRematchTrainerBattle
@@ -88,26 +88,26 @@ EventScript_TryDoDoubleRematchBattle:: @ 82713F8
 	releaseall
 	end
 
-EventScript_NoDoubleRematchTrainerBattle:: @ 8271427
+EventScript_NoDoubleRematchTrainerBattle::
 	gotopostbattlescript
 
-EventScript_NotEnoughMonsForDoubleRematchBattle:: @ 8271428
+EventScript_NotEnoughMonsForDoubleRematchBattle::
 	special ShowTrainerCantBattleSpeech
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-EventScript_RevealTrainer:: @ 827142F
+EventScript_RevealTrainer::
 	applymovement VAR_LAST_TALKED, Movement_RevealTrainer
 	waitmovement 0
 	return
 
-Movement_RevealTrainer: @ 827143A
+Movement_RevealTrainer:
 	reveal_trainer
 	step_end
 
-EventScript_ShowTrainerIntroMsg:: @ 827143C
+EventScript_ShowTrainerIntroMsg::
 	special ShowTrainerIntroSpeech
 	waitmessage
 	waitbuttonpress
@@ -116,7 +116,7 @@ EventScript_ShowTrainerIntroMsg:: @ 827143C
 	goto_if_eq EventScript_TrainerApproach
 	goto EventScript_DoTrainerBattle
 
-EventScript_DoTrainerBattle:: @ 8271454
+EventScript_DoTrainerBattle::
 	trainerbattlebegin
 	@ Below battle mode check only needed in FRLG
 	specialvar VAR_RESULT, GetTrainerBattleMode
@@ -130,12 +130,12 @@ EventScript_DoTrainerBattle:: @ 8271454
 	goto_if_eq EventScript_EndTrainerBattle
 	compare VAR_RESULT, TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC
 	goto_if_eq EventScript_EndTrainerBattle
-EventScript_EndTrainerBattle:: @ 8271491
+EventScript_EndTrainerBattle::
 	gotobeatenscript
 	releaseall
 	end
 
-Std_MsgboxAutoclose:: @ 8271494
+Std_MsgboxAutoclose::
 	message 0x0
 	waitmessage
 	waitbuttonpress
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index e4e453228..f3ba5f035 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -1,4 +1,4 @@
-TrainerHill_OnResume: @ 82C8336
+TrainerHill_OnResume:
 	setvar VAR_TEMP_2, 0
 	trainerhill_resumetimer
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
@@ -10,29 +10,29 @@ TrainerHill_OnResume: @ 82C8336
 	goto_if_eq TrainerHill_1F_EventScript_Lost
 	end
 
-TrainerHill_OnWarp: @ 82C8372
+TrainerHill_OnWarp:
 	map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_DummyOnWarp
 	.2byte 0
 
-TrainerHill_1F_EventScript_DummyOnWarp:: @ 82C837C
+TrainerHill_1F_EventScript_DummyOnWarp::
 	setvar VAR_TEMP_3, 1
 .ifdef BUGFIX
 	end  @ Missing end. By chance, the next byte (0x02 of VAR_TEMP_2) is also the id for the end cmd
 .endif
 
-TrainerHill_OnFrame: @ 82C8381
+TrainerHill_OnFrame:
 	map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter
 	map_script_2 VAR_TEMP_1, 1, TrainerHill_EventScript_WarpToEntranceCounter
 	.2byte 0
 
-EventScript_TrainerHillTimer:: @ 82C8393
+EventScript_TrainerHillTimer::
 	lockall
 	trainerhill_gettime
 	msgbox TrainerHill_Entrance_Text_ChallengeTime, MSGBOX_DEFAULT
 	releaseall
 	end
 
-TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6
+TrainerHill_1F_EventScript_DummyWarpToEntranceCounter::
 	setvar VAR_TEMP_2, 1
 	trainerhill_getusingereader
 	compare VAR_RESULT, TRUE  @ VAR_RESULT always FALSE here
@@ -40,30 +40,30 @@ TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6
 	end
 
 @ Never reached
-TrainerHill_1F_EventScript_WarpSilentToEntranceCounter:: @ 82C83BF
+TrainerHill_1F_EventScript_WarpSilentToEntranceCounter::
 	warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
 	waitstate
 	end
 
-TrainerHill_1F_EventScript_Lost:: @ 82C83C9
+TrainerHill_1F_EventScript_Lost::
 	trainerhill_settrainerflags
 	trainerhill_lost
 	setvar VAR_TEMP_1, 1
 	end
 
-TrainerHill_EventScript_WarpToEntranceCounter:: @ 82C83DF
+TrainerHill_EventScript_WarpToEntranceCounter::
 	setvar VAR_TEMP_1, 0
 	warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
 	waitstate
 	end
 
 @ Unused
-TrainerHill_1F_Movement_SetInvisible:: @ 82C83EE
+TrainerHill_1F_Movement_SetInvisible::
 	set_invisible
 	step_end
 
 @ TRAINER_PHILLIP is an actual Trainer on the SS Tidal, but is used as a placeholder here
-TrainerHill_EventScript_TrainerBattle:: @ 82C83F0
+TrainerHill_EventScript_TrainerBattle::
 	trainerbattle TRAINER_BATTLE_HILL, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
 	trainerhill_postbattletext
 	waitmessage
diff --git a/data/scripts/trainer_script.inc b/data/scripts/trainer_script.inc
index c77e628ee..2a2384c66 100644
--- a/data/scripts/trainer_script.inc
+++ b/data/scripts/trainer_script.inc
@@ -1,4 +1,4 @@
-Std_RegisteredInMatchCall:: @ 82742C9
+Std_RegisteredInMatchCall::
 	buffertrainerclassname 0, VAR_0x8000
 	buffertrainername 1, VAR_0x8000
 	closemessage
@@ -10,14 +10,14 @@ Std_RegisteredInMatchCall:: @ 82742C9
 	delay 30
 	return
 
-EventScript_TryGetTrainerScript:: @ 82742E6
+EventScript_TryGetTrainerScript::
 	special ShouldTryGetTrainerScript
 	compare VAR_RESULT, 1
 	goto_if_eq EventScript_GotoTrainerScript
 	releaseall
 	end
 
-EventScript_GotoTrainerScript:: @ 82742F6
+EventScript_GotoTrainerScript::
 	gotobeatenscript
 	releaseall
 	end
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index 1dfc1884b..14f3ade48 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -1,4 +1,4 @@
-EventScript_TV:: @ 827EE0B
+EventScript_TV::
 	lockall
 	incrementgamestat GAME_STAT_WATCHED_TV
 	special ResetTVShowState
@@ -15,7 +15,7 @@ EventScript_TV:: @ 827EE0B
 	goto EventScript_TryDoPokeNews
 	end
 
-EventScript_TryDoTVShow:: @ 827EE54
+EventScript_TryDoTVShow::
 	specialvar VAR_0x8004, GetRandomActiveShowIdx
 	compare VAR_0x8004, 255
 	goto_if_eq EventScript_MomDadMightLikeThis2
@@ -28,14 +28,14 @@ EventScript_TryDoTVShow:: @ 827EE54
 	goto_if_ne EventScript_DoTVShow
 	end
 
-EventScript_MomDadMightLikeThis1:: @ 827EE8A
+EventScript_MomDadMightLikeThis1::
 	special GetMomOrDadStringForTVMessage
 	msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT
 	special TurnOffTVScreen
 	releaseall
 	end
 
-EventScript_PlayersHouseMovie:: @ 827EE9A
+EventScript_PlayersHouseMovie::
 	msgbox PlayersHouse_1F_Text_TheresAMovieOnTV, MSGBOX_DEFAULT
 	releaseall
 	end
@@ -43,7 +43,7 @@ EventScript_PlayersHouseMovie:: @ 827EE9A
 @ special InitRoamer is a junk call. Its input var (VAR_0x8004) hasn't been set, and
 @ It's called again when Mom actually asks for the color, overwriting
 @ whatever it does here.
-EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4
+EventScript_PlayersHouseLatiNewsFlash::
 	msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT
 	special InitRoamer
 	clearflag FLAG_SYS_TV_LATIAS_LATIOS
@@ -52,7 +52,7 @@ EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4
 	releaseall
 	end
 
-EventScript_DoTVShow:: @ 827EEBA
+EventScript_DoTVShow::
 	special DoTVShow
 	waitmessage
 	waitbuttonpress
@@ -61,19 +61,19 @@ EventScript_DoTVShow:: @ 827EEBA
 	goto EventScript_TurnOffTV
 	end
 
-EventScript_TurnOffTV:: @ 827EED0
+EventScript_TurnOffTV::
 	special TurnOffTVScreen
 	setflag FLAG_SYS_TV_WATCH
 	releaseall
 	end
 
-EventScript_MomDadMightLikeThis2:: @ 827EED8
+EventScript_MomDadMightLikeThis2::
 	special GetMomOrDadStringForTVMessage
 	msgbox gText_MomOrDadMightLikeThisProgram, MSGBOX_DEFAULT
 	goto EventScript_TurnOffTV
 	end
 
-EventScript_TryDoPokeNews:: @ 827EEE9
+EventScript_TryDoPokeNews::
 	special DoPokeNews
 	compare VAR_RESULT, FALSE
 	goto_if_eq EventScript_TryDoTVShow
@@ -82,7 +82,7 @@ EventScript_TryDoPokeNews:: @ 827EEE9
 	goto EventScript_TurnOffTV
 	end
 
-EventScript_DoInSearchOfTrainers:: @ 827EEFF
+EventScript_DoInSearchOfTrainers::
 	special DoTVShowInSearchOfTrainers
 	waitmessage
 	waitbuttonpress
diff --git a/data/specials.inc b/data/specials.inc
index e9eadac4c..81b25c14d 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -7,7 +7,7 @@
 
 .set __special__, 0
 		.align 2
-gSpecials:: @ 81DBA64
+gSpecials::
 	def_special HealPlayerParty
 	def_special SetCableClubWarp
 	def_special DoCableClubWarp
diff --git a/data/text/abnormal_weather.inc b/data/text/abnormal_weather.inc
index 42e61e68d..f7193121e 100644
--- a/data/text/abnormal_weather.inc
+++ b/data/text/abnormal_weather.inc
@@ -1,7 +1,7 @@
-gText_AbnormalWeatherEnded_Rain:: @ 8273656
+gText_AbnormalWeatherEnded_Rain::
 	.string "The massive downpour appears to\n"
 	.string "have stopped…$"
 
-gText_AbnormalWeatherEnded_Sun:: @ 8273684
+gText_AbnormalWeatherEnded_Sun::
 	.string "The intense sunshine appears to\n"
 	.string "have subsided…$"
diff --git a/data/text/apprentice.inc b/data/text/apprentice.inc
index 7d5bab198..6688a0c69 100644
--- a/data/text/apprentice.inc
+++ b/data/text/apprentice.inc
@@ -1,68 +1,68 @@
-gText_ApprenticeChallenge0:: @ 82B6EA5
+gText_ApprenticeChallenge0::
 	.string "Um, I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
 	.string "Snivel… This tension is getting to me…$"
 
-gText_ApprenticeChallenge1:: @ 82B6EEC
+gText_ApprenticeChallenge1::
 	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
 	.string "Here we come!$"
 
-gText_ApprenticeChallenge2:: @ 82B6F16
+gText_ApprenticeChallenge2::
 	.string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}!\n"
 	.string "Accept my challenge!$"
 
-gText_ApprenticeChallenge3:: @ 82B6F4C
+gText_ApprenticeChallenge3::
 	.string "Um… I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice…\n"
 	.string "Do you think someone like me can win?$"
 
-gText_ApprenticeChallenge4:: @ 82B6F92
+gText_ApprenticeChallenge4::
 	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
 	.string "I'll let you challenge me!$"
 
-gText_ApprenticeChallenge5:: @ 82B6FC9
+gText_ApprenticeChallenge5::
 	.string "I'm horribly busy, but I also happen\n"
 	.string "to be {STR_VAR_1}'s no. {STR_VAR_2} apprentice.$"
 
-gText_ApprenticeChallenge6:: @ 82B700C
+gText_ApprenticeChallenge6::
 	.string "I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
 	.string "Glad to meet you!$"
 
-gText_ApprenticeChallenge7:: @ 82B703A
+gText_ApprenticeChallenge7::
 	.string "I serve as {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
 	.string "May I begin?$"
 
-gText_ApprenticeChallenge8:: @ 82B706A
+gText_ApprenticeChallenge8::
 	.string "Eek! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
 	.string "I'll do my best!$"
 
-gText_ApprenticeChallenge9:: @ 82B709C
+gText_ApprenticeChallenge9::
 	.string "Yeehaw! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
 	.string "Put 'em up!$"
 
-gText_ApprenticeChallenge10:: @ 82B70CC
+gText_ApprenticeChallenge10::
 	.string "I'm {STR_VAR_1}'s 1,000th apprentice!\n"
 	.string "Actually, I'm no. {STR_VAR_2}! Here goes!$"
 
-gText_ApprenticeChallenge11:: @ 82B710A
+gText_ApprenticeChallenge11::
 	.string "Yeah, I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice!\n"
 	.string "Let's get rockin' and a-rollin'!$"
 
-gText_ApprenticeChallenge12:: @ 82B714D
+gText_ApprenticeChallenge12::
 	.string "Yippee-yahoo! I'm what you call\n"
 	.string "{STR_VAR_1}'s no. {STR_VAR_2} apprentice!$"
 
-gText_ApprenticeChallenge13:: @ 82B7185
+gText_ApprenticeChallenge13::
 	.string "Cough! I'm {STR_VAR_1}'s no. {STR_VAR_2} apprentice.\n"
 	.string "Good to meet you! Cough!$"
 
-gText_ApprenticeChallenge14:: @ 82B71C1
+gText_ApprenticeChallenge14::
 	.string "This is nerve-racking…\n"
 	.string "I'm the no. {STR_VAR_2} apprentice of {STR_VAR_1}.$"
 
-gText_ApprenticeChallenge15:: @ 82B71F9
+gText_ApprenticeChallenge15::
 	.string "I am {STR_VAR_1}'s no. {STR_VAR_2} apprentice,\n"
 	.string "and that's no lie.$"
 
-gText_ApprenticePleaseTeach0:: @ 82B7229
+gText_ApprenticePleaseTeach0::
 	.string "Are you… {PLAYER}?\n"
 	.string "Oh! Sniff…sob…\p"
 	.string "Oh! S-sorry…\n"
@@ -74,13 +74,13 @@ gText_ApprenticePleaseTeach0:: @ 82B7229
 	.string "Please, please, {PLAYER}!\n"
 	.string "Please teach me about POKéMON!$"
 
-gText_ApprenticeRejectTeaching0:: @ 82B731C
+gText_ApprenticeRejectTeaching0::
 	.string "Oh… B-but…\n"
 	.string "Snivel… Waaaaaaah!\p"
 	.string "Please!\n"
 	.string "I'm begging you, please!$"
 
-gText_ApprenticeWhichLevelMode0:: @ 82B735B
+gText_ApprenticeWhichLevelMode0::
 	.string "Oh, really? You will?\n"
 	.string "Awesome! Wicked! Awoooh!\p"
 	.string "Oh… I'm sorry…\n"
@@ -90,7 +90,7 @@ gText_ApprenticeWhichLevelMode0:: @ 82B735B
 	.string "Which would be better for me: Level 50\n"
 	.string "or the Open Level?$"
 
-gText_ApprenticeLevelModeThanks0:: @ 82B7423
+gText_ApprenticeLevelModeThanks0::
 	.string "{STR_VAR_1}?\n"
 	.string "Waaaaah!\p"
 	.string "Oh! I'm so sorry!\n"
@@ -100,7 +100,7 @@ gText_ApprenticeLevelModeThanks0:: @ 82B7423
 	.string "Thank you so much!\l"
 	.string "Please talk with me again!$"
 
-gText_ApprenticePleaseTeach1:: @ 82B74C1
+gText_ApprenticePleaseTeach1::
 	.string "Wowee! You're {PLAYER}, aren't you?\n"
 	.string "You're awesomely strong, aren't you?\p"
 	.string "I'm {STR_VAR_1}!\n"
@@ -109,25 +109,25 @@ gText_ApprenticePleaseTeach1:: @ 82B74C1
 	.string "Can you be my teacher and tell me\l"
 	.string "lots about being a TRAINER?$"
 
-gText_ApprenticeRejectTeaching1:: @ 82B756F
+gText_ApprenticeRejectTeaching1::
 	.string "Aww, why?\n"
 	.string "Oh, please? Pretty please?\l"
 	.string "Please be my teacher, please!$"
 
-gText_ApprenticeWhichLevelMode1:: @ 82B75B2
+gText_ApprenticeWhichLevelMode1::
 	.string "Yay! Great!\p"
 	.string "The first thing I wanted to ask you is\n"
 	.string "about the BATTLE TOWER!\p"
 	.string "The Level 50 and Open Level Rooms…\n"
 	.string "Which would be perfect for me?$"
 
-gText_ApprenticeLevelModeThanks1:: @ 82B763F
+gText_ApprenticeLevelModeThanks1::
 	.string "{STR_VAR_1}, huh? That's true!\n"
 	.string "I'll do my best there!\p"
 	.string "If we meet here again, please teach\n"
 	.string "me something else, teacher!$"
 
-gText_ApprenticePleaseTeach2:: @ 82B76AC
+gText_ApprenticePleaseTeach2::
 	.string "Um… Are you {PLAYER}?\n"
 	.string "My name is {STR_VAR_1}.\p"
 	.string "I want to become a POKéMON TRAINER,\n"
@@ -136,13 +136,13 @@ gText_ApprenticePleaseTeach2:: @ 82B76AC
 	.string "advice because you're so famous.\p"
 	.string "{PLAYER}, could you give me advice?$"
 
-gText_ApprenticeRejectTeaching2:: @ 82B7772
+gText_ApprenticeRejectTeaching2::
 	.string "Oh, but…\p"
 	.string "I sincerely want to become a POKéMON\n"
 	.string "TRAINER!\p"
 	.string "Please, can you answer my questions?$"
 
-gText_ApprenticeWhichLevelMode2:: @ 82B77CE
+gText_ApprenticeWhichLevelMode2::
 	.string "Thank you!\n"
 	.string "Here's my first question right away!\p"
 	.string "The BATTLE TOWER has two levels,\n"
@@ -150,13 +150,13 @@ gText_ApprenticeWhichLevelMode2:: @ 82B77CE
 	.string "Which level do you think is more\n"
 	.string "suitable for me?$"
 
-gText_ApprenticeLevelModeThanks2:: @ 82B7871
+gText_ApprenticeLevelModeThanks2::
 	.string "Oh, the {STR_VAR_1} challenge?\n"
 	.string "Understood!\p"
 	.string "If I have another question, I'll come\n"
 	.string "back here for your advice!$"
 
-gText_ApprenticePleaseTeach3:: @ 82B78D4
+gText_ApprenticePleaseTeach3::
 	.string "Oh? Huh? You're…\n"
 	.string "No, that can't be true.\p"
 	.string "There isn't any way that someone\n"
@@ -180,7 +180,7 @@ gText_ApprenticePleaseTeach3:: @ 82B78D4
 	.string "…Or will you be so kind as to give\n"
 	.string "me advice?$"
 
-gText_ApprenticeRejectTeaching3:: @ 82B7B1A
+gText_ApprenticeRejectTeaching3::
 	.string "I knew it…\p"
 	.string "It had to happen because I'm such\n"
 	.string "a really boring nobody…\p"
@@ -191,7 +191,7 @@ gText_ApprenticeRejectTeaching3:: @ 82B7B1A
 	.string "Please, will you be so kind as to give\n"
 	.string "me advice?$"
 
-gText_ApprenticeWhichLevelMode3:: @ 82B7C13
+gText_ApprenticeWhichLevelMode3::
 	.string "Really? I can't believe it!\n"
 	.string "I can't believe you'll advise me!\l"
 	.string "I… I'm so happy…\p"
@@ -202,7 +202,7 @@ gText_ApprenticeWhichLevelMode3:: @ 82B7C13
 	.string "Which course do you think even I may\n"
 	.string "have a chance at?$"
 
-gText_ApprenticeLevelModeThanks3:: @ 82B7D18
+gText_ApprenticeLevelModeThanks3::
 	.string "{STR_VAR_1}? Okay!\n"
 	.string "But do you really think someone like\l"
 	.string "me would have a chance?\p"
@@ -211,7 +211,7 @@ gText_ApprenticeLevelModeThanks3:: @ 82B7D18
 	.string "Thank you very much for spending\n"
 	.string "time with someone like me.$"
 
-gText_ApprenticePleaseTeach4:: @ 82B7DD4
+gText_ApprenticePleaseTeach4::
 	.string "Oh! You're {PLAYER}{KUN}, aren't you?\p"
 	.string "I've heard that you're tough at\n"
 	.string "POKéMON!\p"
@@ -224,12 +224,12 @@ gText_ApprenticePleaseTeach4:: @ 82B7DD4
 	.string "I'm willing to listen to your advice.\n"
 	.string "You'll agree, of course?$"
 
-gText_ApprenticeRejectTeaching4:: @ 82B7EE5
+gText_ApprenticeRejectTeaching4::
 	.string "Huh? Why are you refusing me?\n"
 	.string "It's me who's asking you!\l"
 	.string "You have to reconsider!$"
 
-gText_ApprenticeWhichLevelMode4:: @ 82B7F35
+gText_ApprenticeWhichLevelMode4::
 	.string "Okay, so there is this something.\n"
 	.string "I want you to decide it for me.\p"
 	.string "You know that the BATTLE TOWER has\n"
@@ -237,7 +237,7 @@ gText_ApprenticeWhichLevelMode4:: @ 82B7F35
 	.string "Which do you think would be good\n"
 	.string "for me, {PLAYER}{KUN}?$"
 
-gText_ApprenticeLevelModeThanks4:: @ 82B7FE8
+gText_ApprenticeLevelModeThanks4::
 	.string "Okay, {STR_VAR_1} is suitable for me?\n"
 	.string "Thank you!\p"
 	.string "Knowing that you made the decision,\n"
@@ -246,7 +246,7 @@ gText_ApprenticeLevelModeThanks4:: @ 82B7FE8
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
 
-gText_ApprenticePleaseTeach5:: @ 82B8087
+gText_ApprenticePleaseTeach5::
 	.string "Oh, hi, there! {PLAYER}{KUN}!\n"
 	.string "I know you because you're famous!\l"
 	.string "Call me {STR_VAR_1}! Glad to meet you!\p"
@@ -261,13 +261,13 @@ gText_ApprenticePleaseTeach5:: @ 82B8087
 	.string "So, {PLAYER}{KUN}, how about sharing your\l"
 	.string "wisdom with me every so often?$"
 
-gText_ApprenticeRejectTeaching5:: @ 82B822B
+gText_ApprenticeRejectTeaching5::
 	.string "Oh, but, please?\n"
 	.string "A guy like me needs someone like\l"
 	.string "you, {PLAYER}{KUN}!\p"
 	.string "Honestly, I need your advice!$"
 
-gText_ApprenticeWhichLevelMode5:: @ 82B8286
+gText_ApprenticeWhichLevelMode5::
 	.string "Thank you! That's more like it!\n"
 	.string "So, let's start with an easy one!\p"
 	.string "You know about the BATTLE TOWER's\n"
@@ -276,13 +276,13 @@ gText_ApprenticeWhichLevelMode5:: @ 82B8286
 	.string "Me being a busy guy, which one should\n"
 	.string "I gear up for?$"
 
-gText_ApprenticeLevelModeThanks5:: @ 82B8356
+gText_ApprenticeLevelModeThanks5::
 	.string "{STR_VAR_1}, huh? Okay, gotcha.\n"
 	.string "I'll find time somehow and give it a go!\p"
 	.string "…Whoops, I'd better go to work!\n"
 	.string "Thanks! See you around!$"
 
-gText_ApprenticePleaseTeach6:: @ 82B83CE
+gText_ApprenticePleaseTeach6::
 	.string "No way! Uh-uh!\n"
 	.string "Are you maybe the real {PLAYER}?\p"
 	.string "A-hah! Awesome! I'm {STR_VAR_1},\n"
@@ -296,12 +296,12 @@ gText_ApprenticePleaseTeach6:: @ 82B83CE
 	.string "Isn't it a great idea?\n"
 	.string "Please, I want your advice!$"
 
-gText_ApprenticeRejectTeaching6:: @ 82B84FC
+gText_ApprenticeRejectTeaching6::
 	.string "Ahahaha, you can pretend to be mean,\n"
 	.string "but you can't fool me!\l"
 	.string "You really mean okay, don't you?$"
 
-gText_ApprenticeWhichLevelMode6:: @ 82B8559
+gText_ApprenticeWhichLevelMode6::
 	.string "Yay! I knew you'd have a big heart,\n"
 	.string "{PLAYER}!\p"
 	.string "What should I ask you first?\n"
@@ -313,7 +313,7 @@ gText_ApprenticeWhichLevelMode6:: @ 82B8559
 	.string "Level 50 or Open Level?\n"
 	.string "Which suits me more?$"
 
-gText_ApprenticeLevelModeThanks6:: @ 82B8656
+gText_ApprenticeLevelModeThanks6::
 	.string "Oh-oh-oh!\n"
 	.string "{STR_VAR_1}, you say!\l"
 	.string "Thank you for a totally cool reply!\p"
@@ -322,7 +322,7 @@ gText_ApprenticeLevelModeThanks6:: @ 82B8656
 	.string "Let's meet here again, okay?\n"
 	.string "Thanks!$"
 
-gText_ApprenticePleaseTeach7:: @ 82B86EA
+gText_ApprenticePleaseTeach7::
 	.string "I beg your pardon, but…\n"
 	.string "Are you {PLAYER}?\p"
 	.string "I'm {STR_VAR_1}, and I am delighted to\n"
@@ -335,7 +335,7 @@ gText_ApprenticePleaseTeach7:: @ 82B86EA
 	.string "May I become your apprentice,\n"
 	.string "{PLAYER}?$"
 
-gText_ApprenticeRejectTeaching7:: @ 82B87DA
+gText_ApprenticeRejectTeaching7::
 	.string "Oh…!\p"
 	.string "… … … … … …\n"
 	.string "… … … … … …\p"
@@ -344,7 +344,7 @@ gText_ApprenticeRejectTeaching7:: @ 82B87DA
 	.string "Please! Please say that you will\n"
 	.string "accept me as your apprentice!$"
 
-gText_ApprenticeWhichLevelMode7:: @ 82B887C
+gText_ApprenticeWhichLevelMode7::
 	.string "Oh… I'm delighted!\p"
 	.string "I don't wish to waste your time,\n"
 	.string "so please advise me on this.\p"
@@ -354,14 +354,14 @@ gText_ApprenticeWhichLevelMode7:: @ 82B887C
 	.string "Which would be most suitable for me?\n"
 	.string "Level 50 or Open Level?$"
 
-gText_ApprenticeLevelModeThanks7:: @ 82B8957
+gText_ApprenticeLevelModeThanks7::
 	.string "{STR_VAR_1} is your choice!\n"
 	.string "I see. I will do my best!\p"
 	.string "Thank you, {PLAYER}.\n"
 	.string "I hope I can count on you again.\l"
 	.string "Please take care!$"
 
-gText_ApprenticePleaseTeach8:: @ 82B89C6
+gText_ApprenticePleaseTeach8::
 	.string "Eek! Eek! {PLAYER}!\n"
 	.string "You spoke to me!\l"
 	.string "I… I'm overjoyed!\p"
@@ -374,7 +374,7 @@ gText_ApprenticePleaseTeach8:: @ 82B89C6
 	.string "Please take me in as your apprentice!\n"
 	.string "I want to learn from you!$"
 
-gText_ApprenticeRejectTeaching8:: @ 82B8ACF
+gText_ApprenticeRejectTeaching8::
 	.string "Waaaah!\n"
 	.string "{PLAYER} turned me down…\l"
 	.string "It… It's an invaluable experience!\p"
@@ -382,7 +382,7 @@ gText_ApprenticeRejectTeaching8:: @ 82B8ACF
 	.string "an affirmative answer this time!\p"
 	.string "I beg you for your guidance!$"
 
-gText_ApprenticeWhichLevelMode8:: @ 82B8B66
+gText_ApprenticeWhichLevelMode8::
 	.string "Hieeeeh! {PLAYER} said yes!\n"
 	.string "{PLAYER} said yes!\p"
 	.string "I won't be able to sleep tonight…\n"
@@ -391,14 +391,14 @@ gText_ApprenticeWhichLevelMode8:: @ 82B8B66
 	.string "At the BATTLE TOWER, what is right\n"
 	.string "for me, Level 50 or Open Level?$"
 
-gText_ApprenticeLevelModeThanks8:: @ 82B8C20
+gText_ApprenticeLevelModeThanks8::
 	.string "{STR_VAR_1}! Perfectly understood!\n"
 	.string "I understand perfectly!\l"
 	.string "I'm deliriously delighted!\p"
 	.string "I hope you'll be willing to teach me\n"
 	.string "some more another time.$"
 
-gText_ApprenticePleaseTeach9:: @ 82B8CAA
+gText_ApprenticePleaseTeach9::
 	.string "Whoa! Could you be…\n"
 	.string "Might you be… {PLAYER}{KUN}?!\l"
 	.string "That strong and famous TRAINER?\l"
@@ -411,13 +411,13 @@ gText_ApprenticePleaseTeach9:: @ 82B8CAA
 	.string "So, there you have it, {PLAYER}{KUN}!\n"
 	.string "Let me apprentice under you!$"
 
-gText_ApprenticeRejectTeaching9:: @ 82B8DD3
+gText_ApprenticeRejectTeaching9::
 	.string "Gwaaaah!\n"
 	.string "You're quite cool and tough…\p"
 	.string "Don't be that way, please.\n"
 	.string "I'm asking you!$"
 
-gText_ApprenticeWhichLevelMode9:: @ 82B8E24
+gText_ApprenticeWhichLevelMode9::
 	.string "Oh, yeah! That's a solid reply!\n"
 	.string "Excellent, I might add!\p"
 	.string "So how about a first piece of advice\n"
@@ -425,14 +425,14 @@ gText_ApprenticeWhichLevelMode9:: @ 82B8E24
 	.string "If I were to go, what would be better?\n"
 	.string "Level 50 or Open Level?$"
 
-gText_ApprenticeLevelModeThanks9:: @ 82B8ED5
+gText_ApprenticeLevelModeThanks9::
 	.string "Uh-huh, {STR_VAR_1} it is!\n"
 	.string "OK, A-OK!\l"
 	.string "I'll go show my mettle, like, jam!\p"
 	.string "All right, I'll look to you as my mentor!\n"
 	.string "Adios!$"
 
-gText_ApprenticePleaseTeach10:: @ 82B8F45
+gText_ApprenticePleaseTeach10::
 	.string "Oh, hey, {PLAYER}{KUN}, right?\n"
 	.string "The police were looking for you!\p"
 	.string "… … …\n"
@@ -445,7 +445,7 @@ gText_ApprenticePleaseTeach10:: @ 82B8F45
 	.string "So, how about you becoming my master\n"
 	.string "about all things POKéMON?$"
 
-gText_ApprenticeRejectTeaching10:: @ 82B905F
+gText_ApprenticeRejectTeaching10::
 	.string "If you're going to act cold like that,\n"
 	.string "I'll show you what I'll do!\p"
 	.string "Waaah! Waaah! Waaah!\n"
@@ -454,7 +454,7 @@ gText_ApprenticeRejectTeaching10:: @ 82B905F
 	.string "Come on, will you please be\n"
 	.string "my POKéMON master?$"
 
-gText_ApprenticeWhichLevelMode10:: @ 82B910E
+gText_ApprenticeWhichLevelMode10::
 	.string "Yippee!\n"
 	.string "I'll buy you a boat for that!\p"
 	.string "Of course I'm lying again!\n"
@@ -465,7 +465,7 @@ gText_ApprenticeWhichLevelMode10:: @ 82B910E
 	.string "level I should challenge…\p"
 	.string "Can you decide for me, master?$"
 
-gText_ApprenticeLevelModeThanks10:: @ 82B9204
+gText_ApprenticeLevelModeThanks10::
 	.string "Okay, so {STR_VAR_1} is better!\n"
 	.string "I'll go to the other level, then!\p"
 	.string "Just kidding!\n"
@@ -473,7 +473,7 @@ gText_ApprenticeLevelModeThanks10:: @ 82B9204
 	.string "Thanks, master!\n"
 	.string "I hope you'll keep teaching me!$"
 
-gText_ApprenticePleaseTeach11:: @ 82B929C
+gText_ApprenticePleaseTeach11::
 	.string "A-H-O-Y!\n"
 	.string "And that spells ahoy, and it means hi!\p"
 	.string "I'm {STR_VAR_1}, the rappin' SAILOR\n"
@@ -491,13 +491,13 @@ gText_ApprenticePleaseTeach11:: @ 82B929C
 	.string "Let's make that a celebration!\n"
 	.string "Become my mentor for commemoration!$"
 
-gText_ApprenticeRejectTeaching11:: @ 82B9438
+gText_ApprenticeRejectTeaching11::
 	.string "But!\n"
 	.string "You have to work with me!\p"
 	.string "Don't be such a tease!\n"
 	.string "Become my mentor, please!$"
 
-gText_ApprenticeWhichLevelMode11:: @ 82B9488
+gText_ApprenticeWhichLevelMode11::
 	.string "That's it!\n"
 	.string "{PLAYER}, you've got the spirit!\p"
 	.string "So here's my first question\n"
@@ -507,13 +507,13 @@ gText_ApprenticeWhichLevelMode11:: @ 82B9488
 	.string "Level 50 and Open Level there be,\n"
 	.string "which is the one that's good for me?$"
 
-gText_ApprenticeLevelModeThanks11:: @ 82B9564
+gText_ApprenticeLevelModeThanks11::
 	.string "Okay, {STR_VAR_1} it is, you say!\n"
 	.string "I'll go and take it on my way!\p"
 	.string "If it's advice I ever need,\n"
 	.string "{PLAYER}, your word I'll always heed!$"
 
-gText_ApprenticePleaseTeach12:: @ 82B95D8
+gText_ApprenticePleaseTeach12::
 	.string "Say, hey, aren't you {PLAYER}?\n"
 	.string "What should I do? Talk to you?\l"
 	.string "Why not? I'm already talking to you!\p"
@@ -529,13 +529,13 @@ gText_ApprenticePleaseTeach12:: @ 82B95D8
 	.string "{PLAYER}, let me be your underling!\n"
 	.string "I want you to teach me everything!$"
 
-gText_ApprenticeRejectTeaching12:: @ 82B9763
+gText_ApprenticeRejectTeaching12::
 	.string "You're turning me down, then?\n"
 	.string "I'll just have to ask you again!\p"
 	.string "{PLAYER}, I beg to be your underling!\n"
 	.string "I need you to teach me everything!$"
 
-gText_ApprenticeWhichLevelMode12:: @ 82B97E5
+gText_ApprenticeWhichLevelMode12::
 	.string "Lucky, yeah, woohoo!\n"
 	.string "Should I pop a question to you?\p"
 	.string "Since we're near the BATTLE TOWER,\n"
@@ -543,14 +543,14 @@ gText_ApprenticeWhichLevelMode12:: @ 82B97E5
 	.string "Of the choices you see,\n"
 	.string "which is the right one for me?$"
 
-gText_ApprenticeLevelModeThanks12:: @ 82B989A
+gText_ApprenticeLevelModeThanks12::
 	.string "If {STR_VAR_1} is what you suggest,\n"
 	.string "it must be the very best!\p"
 	.string "Well, {PLAYER}, I have to roam free,\n"
 	.string "but don't you forget about me.\p"
 	.string "See you again, my smart friend!$"
 
-gText_ApprenticePleaseTeach13:: @ 82B992D
+gText_ApprenticePleaseTeach13::
 	.string "Oh, hi! You there!\n"
 	.string "Can I get you to massage my shoulder?\p"
 	.string "…Yes, there! That's it!\n"
@@ -565,12 +565,12 @@ gText_ApprenticePleaseTeach13:: @ 82B992D
 	.string "Listen, can I get you to give me\n"
 	.string "advice?$"
 
-gText_ApprenticeRejectTeaching13:: @ 82B9A84
+gText_ApprenticeRejectTeaching13::
 	.string "Oh, why?\p"
 	.string "I won't be a big bother, I promise!\n"
 	.string "Please?$"
 
-gText_ApprenticeWhichLevelMode13:: @ 82B9AB9
+gText_ApprenticeWhichLevelMode13::
 	.string "Thank you. Mighty good of you!\n"
 	.string "…Cough! Cough!\p"
 	.string "Oogh, I have to toughen up quick…\p"
@@ -578,13 +578,13 @@ gText_ApprenticeWhichLevelMode13:: @ 82B9AB9
 	.string "right away, but what would be better\l"
 	.string "for me? Level 50 or Open Level?$"
 
-gText_ApprenticeLevelModeThanks13:: @ 82B9B76
+gText_ApprenticeLevelModeThanks13::
 	.string "Hm, all right. That's {STR_VAR_1}.\n"
 	.string "I'll go there right away.\p"
 	.string "I hope I can keep hitting you up for\n"
 	.string "help--after all, you're my mentor!$"
 
-gText_ApprenticePleaseTeach14:: @ 82B9BF2
+gText_ApprenticePleaseTeach14::
 	.string "Er… Um…\n"
 	.string "{PLAYER}{KUN}…?\p"
 	.string "Please, don't look at me that way.\n"
@@ -601,13 +601,13 @@ gText_ApprenticePleaseTeach14:: @ 82B9BF2
 	.string "Could you become my teacher and\n"
 	.string "give me advice?$"
 
-gText_ApprenticeRejectTeaching14:: @ 82B9D83
+gText_ApprenticeRejectTeaching14::
 	.string "Please don't brush me off like this!\n"
 	.string "I can't live with the humiliation.\p"
 	.string "Please become my teacher!\n"
 	.string "I need your advice!$"
 
-gText_ApprenticeWhichLevelMode14:: @ 82B9DF9
+gText_ApprenticeWhichLevelMode14::
 	.string "Th-thank you…\p"
 	.string "But please don't look at me like that.\n"
 	.string "It makes me all flustered.\p"
@@ -616,7 +616,7 @@ gText_ApprenticeWhichLevelMode14:: @ 82B9DF9
 	.string "At the BATTLE TOWER…\n"
 	.string "Which level should I attempt?$"
 
-gText_ApprenticeLevelModeThanks14:: @ 82B9EAA
+gText_ApprenticeLevelModeThanks14::
 	.string "Oh… Okay!\n"
 	.string "I'll try my hand at that.\p"
 	.string "I hope I can make a valiant challenge\n"
@@ -625,7 +625,7 @@ gText_ApprenticeLevelModeThanks14:: @ 82B9EAA
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
-gText_ApprenticePleaseTeach15:: @ 82B9F55
+gText_ApprenticePleaseTeach15::
 	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really real?\p"
 	.string "You may call me {STR_VAR_1}.\p"
@@ -637,7 +637,7 @@ gText_ApprenticePleaseTeach15:: @ 82B9F55
 	.string "I merely want you to recognize me\l"
 	.string "as your apprentice.$"
 
-gText_ApprenticeRejectTeaching15:: @ 82BA084
+gText_ApprenticeRejectTeaching15::
 	.string "Oh?\n"
 	.string "But what would compel you to refuse?\p"
 	.string "I apologize for being skeptical about\n"
@@ -645,7 +645,7 @@ gText_ApprenticeRejectTeaching15:: @ 82BA084
 	.string "Please accept my apology and\n"
 	.string "accept me as your apprentice.$"
 
-gText_ApprenticeWhichLevelMode15:: @ 82BA11D
+gText_ApprenticeWhichLevelMode15::
 	.string "You really are accepting me?\n"
 	.string "I don't wish to celebrate prematurely.\p"
 	.string "If it is true, I apologize.\n"
@@ -654,7 +654,7 @@ gText_ApprenticeWhichLevelMode15:: @ 82BA11D
 	.string "what would be worthy of me?\l"
 	.string "Level 50 or Open Level?$"
 
-gText_ApprenticeLevelModeThanks15:: @ 82BA1F3
+gText_ApprenticeLevelModeThanks15::
 	.string "{STR_VAR_1}?\n"
 	.string "Are you certain?\p"
 	.string "I see. If that's the case, that's fine.\n"
@@ -663,7 +663,7 @@ gText_ApprenticeLevelModeThanks15:: @ 82BA1F3
 	.string "me that you have accepted me.\p"
 	.string "Let us meet again!$"
 
-gText_ApprenticeWhatHeldItem0:: @ 82BA2A3
+gText_ApprenticeWhatHeldItem0::
 	.string "Sigh… Sob…\n"
 	.string "Oh, {PLAYER}!\p"
 	.string "I'm all tangled up in a dilemma\n"
@@ -673,30 +673,30 @@ gText_ApprenticeWhatHeldItem0:: @ 82BA2A3
 	.string "Please tell me, {PLAYER}.\n"
 	.string "What item should I make it hold?$"
 
-gText_ApprenticeHoldNothing0:: @ 82BA34E
+gText_ApprenticeHoldNothing0::
 	.string "Oh, really? I shouldn't make\n"
 	.string "my {STR_VAR_1} hold anything?$"
 
-gText_ApprenticeThanksNoHeldItem0:: @ 82BA380
+gText_ApprenticeThanksNoHeldItem0::
 	.string "Oh, okay! I'm delighted it's settled!\n"
 	.string "Awesome! Wicked! Awoooh!\p"
 	.string "Thank you so much!$"
 
-gText_ApprenticeThanksHeldItem0:: @ 82BA3D2
+gText_ApprenticeThanksHeldItem0::
 	.string "Oh, I'm so glad…\n"
 	.string "I think I have that {STR_VAR_1}, too.\p"
 	.string "I'm delighted it's settled!\n"
 	.string "Awesome! Wicked! Awoooh!\p"
 	.string "Thank you so much!$"
 
-gText_ApprenticeItemAlreadyRecommended0:: @ 82BA448
+gText_ApprenticeItemAlreadyRecommended0::
 	.string "Waaaah! Please don't be mean!\p"
 	.string "That item {STR_VAR_1} was already\n"
 	.string "recommended to me before, sob…\p"
 	.string "Or do you mean I shouldn't make\n"
 	.string "my {STR_VAR_2} hold anything?$"
 
-gText_ApprenticeWhatHeldItem1:: @ 82BA4D3
+gText_ApprenticeWhatHeldItem1::
 	.string "Yay! It's {PLAYER}!\n"
 	.string "Great! I wanted to ask you something!\p"
 	.string "Do you make your POKéMON hold items?\n"
@@ -705,47 +705,47 @@ gText_ApprenticeWhatHeldItem1:: @ 82BA4D3
 	.string "{STR_VAR_1} to hold?\p"
 	.string "What do you think?$"
 
-gText_ApprenticeHoldNothing1:: @ 82BA58C
+gText_ApprenticeHoldNothing1::
 	.string "Huh? You mean my {STR_VAR_1} doesn't\n"
 	.string "have to hold anything?$"
 
-gText_ApprenticeThanksNoHeldItem1:: @ 82BA5BF
+gText_ApprenticeThanksNoHeldItem1::
 	.string "Oh, I get it! I'll do that!\n"
 	.string "Thanks for teaching me!$"
 
-gText_ApprenticeThanksHeldItem1:: @ 82BA5F3
+gText_ApprenticeThanksHeldItem1::
 	.string "Oh, wow! One {STR_VAR_1}, huh?\n"
 	.string "Okay, I'll do that!\p"
 	.string "Thanks for teaching me!$"
 
-gText_ApprenticeItemAlreadyRecommended1:: @ 82BA635
+gText_ApprenticeItemAlreadyRecommended1::
 	.string "Oh, uh, no, that's not what I meant.\n"
 	.string "I want to know about a different item\l"
 	.string "than the ones I already know.\p"
 	.string "Or do you mean that my POKéMON doesn't\n"
 	.string "have to hold anything this time?$"
 
-gText_ApprenticeWhatHeldItem2:: @ 82BA6E6
+gText_ApprenticeWhatHeldItem2::
 	.string "{PLAYER}, hello!\n"
 	.string "It's about my {STR_VAR_1}…\p"
 	.string "I want to make it hold a good item.\n"
 	.string "What would be good for it?$"
 
-gText_ApprenticeHoldNothing2:: @ 82BA742
+gText_ApprenticeHoldNothing2::
 	.string "Oh, then my {STR_VAR_1} doesn't have\n"
 	.string "to hold anything?$"
 
-gText_ApprenticeThanksNoHeldItem2:: @ 82BA770
+gText_ApprenticeThanksNoHeldItem2::
 	.string "Okay, I got it!\n"
 	.string "See you again!$"
 
-gText_ApprenticeThanksHeldItem2:: @ 82BA78F
+gText_ApprenticeThanksHeldItem2::
 	.string "Oh, the item {STR_VAR_1}?\n"
 	.string "Understood!\p"
 	.string "I'll do my best to find one!\n"
 	.string "See you again!$"
 
-gText_ApprenticeItemAlreadyRecommended2:: @ 82BA7D8
+gText_ApprenticeItemAlreadyRecommended2::
 	.string "Somebody taught me about\n"
 	.string "the {STR_VAR_1} already.\p"
 	.string "I want my POKéMON to hold a different\n"
@@ -753,7 +753,7 @@ gText_ApprenticeItemAlreadyRecommended2:: @ 82BA7D8
 	.string "Or do you think {STR_VAR_2} doesn't\n"
 	.string "have to hold anything?$"
 
-gText_ApprenticeWhatHeldItem3:: @ 82BA867
+gText_ApprenticeWhatHeldItem3::
 	.string "Hello, {PLAYER}…\n"
 	.string "I'm sorry to disturb you, but I have\l"
 	.string "something else I wanted to ask you.\p"
@@ -764,23 +764,23 @@ gText_ApprenticeWhatHeldItem3:: @ 82BA867
 	.string "{PLAYER}, please, could you decide\n"
 	.string "for me?$"
 
-gText_ApprenticeHoldNothing3:: @ 82BA96B
+gText_ApprenticeHoldNothing3::
 	.string "A POKéMON belonging to someone like me\n"
 	.string "would be better off without an item?$"
 
-gText_ApprenticeThanksNoHeldItem3:: @ 82BA9B7
+gText_ApprenticeThanksNoHeldItem3::
 	.string "I understand…\n"
 	.string "You're saying I shouldn't rely on items.\l"
 	.string "I'll do my best not to!\p"
 	.string "Thank you very much!$"
 
-gText_ApprenticeThanksHeldItem3:: @ 82BAA1B
+gText_ApprenticeThanksHeldItem3::
 	.string "The item {STR_VAR_1}, okay.\n"
 	.string "I'm not sure if I can get one…\l"
 	.string "No! I'll do my best to get it.\p"
 	.string "Thank you very much!$"
 
-gText_ApprenticeItemAlreadyRecommended3:: @ 82BAA81
+gText_ApprenticeItemAlreadyRecommended3::
 	.string "Oh, but…\n"
 	.string "I think I've heard about that before…\p"
 	.string "Is it maybe because I haven't handled\n"
@@ -788,7 +788,7 @@ gText_ApprenticeItemAlreadyRecommended3:: @ 82BAA81
 	.string "Or do you mean I shouldn't make\n"
 	.string "my {STR_VAR_2} hold anything?$"
 
-gText_ApprenticeWhatHeldItem4:: @ 82BAB22
+gText_ApprenticeWhatHeldItem4::
 	.string "Oh, {PLAYER}{KUN}.\n"
 	.string "There's something I wanted to ask you.\p"
 	.string "You know how you decided which\n"
@@ -800,11 +800,11 @@ gText_ApprenticeWhatHeldItem4:: @ 82BAB22
 	.string "What would be good? I want to make\n"
 	.string "my {STR_VAR_1} hold something.$"
 
-gText_ApprenticeHoldNothing4:: @ 82BAC43
+gText_ApprenticeHoldNothing4::
 	.string "Oh! So my {STR_VAR_1} should do\n"
 	.string "the best it can empty-handed?$"
 
-gText_ApprenticeThanksNoHeldItem4:: @ 82BAC78
+gText_ApprenticeThanksNoHeldItem4::
 	.string "If you think that's best, I'll do that.\p"
 	.string "Knowing that you made the decision,\n"
 	.string "{PLAYER}{KUN}, I won't be so upset if\l"
@@ -812,7 +812,7 @@ gText_ApprenticeThanksNoHeldItem4:: @ 82BAC78
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
 
-gText_ApprenticeThanksHeldItem4:: @ 82BAD17
+gText_ApprenticeThanksHeldItem4::
 	.string "The item {STR_VAR_1}, huh?\n"
 	.string "Not bad. I'll use it!\p"
 	.string "Knowing that you made the decision,\n"
@@ -821,14 +821,14 @@ gText_ApprenticeThanksHeldItem4:: @ 82BAD17
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
 
-gText_ApprenticeItemAlreadyRecommended4:: @ 82BADB6
+gText_ApprenticeItemAlreadyRecommended4::
 	.string "Huh? What are you saying?\n"
 	.string "You told me about the {STR_VAR_1}\l"
 	.string "already before.\p"
 	.string "Or do you mean my {STR_VAR_2} should\n"
 	.string "do the best it can empty-handed?$"
 
-gText_ApprenticeWhatHeldItem5:: @ 82BAE36
+gText_ApprenticeWhatHeldItem5::
 	.string "Yo, {PLAYER}{KUN}!\p"
 	.string "We're both busy, but we seem to run\n"
 	.string "into each other often anyway!\p"
@@ -840,31 +840,31 @@ gText_ApprenticeWhatHeldItem5:: @ 82BAE36
 	.string "giving me advice on what I should make\l"
 	.string "my {STR_VAR_1} hold?$"
 
-gText_ApprenticeHoldNothing5:: @ 82BAF4E
+gText_ApprenticeHoldNothing5::
 	.string "Oh, so me being a busy guy, you say\n"
 	.string "my {STR_VAR_1} doesn't need anything?$"
 
-gText_ApprenticeThanksNoHeldItem5:: @ 82BAF8F
+gText_ApprenticeThanksNoHeldItem5::
 	.string "Okay, gotcha.\n"
 	.string "I won't need any time for that.\p"
 	.string "Thanks today!\n"
 	.string "See you around!$"
 
-gText_ApprenticeThanksHeldItem5:: @ 82BAFDB
+gText_ApprenticeThanksHeldItem5::
 	.string "Okay, gotcha.\n"
 	.string "I'll find time somehow and find\l"
 	.string "that {STR_VAR_1} you recommended.\p"
 	.string "I'm glad I met a good mentor in you.\n"
 	.string "Thanks! See you around!$"
 
-gText_ApprenticeItemAlreadyRecommended5:: @ 82BB05F
+gText_ApprenticeItemAlreadyRecommended5::
 	.string "Huh? I already know about\n"
 	.string "that {STR_VAR_1}.\p"
 	.string "Oh, right, I get it.\n"
 	.string "So me being a busy guy, you say\l"
 	.string "my {STR_VAR_2} doesn't need anything?$"
 
-gText_ApprenticeWhatHeldItem6:: @ 82BB0D4
+gText_ApprenticeWhatHeldItem6::
 	.string "Hiya, {PLAYER}! It's me!\n"
 	.string "I need to tap your mind again today.\l"
 	.string "Please, I need your advice!\p"
@@ -873,18 +873,18 @@ gText_ApprenticeWhatHeldItem6:: @ 82BB0D4
 	.string "If I want to make my {STR_VAR_1} hold\n"
 	.string "an item, what should it be?$"
 
-gText_ApprenticeHoldNothing6:: @ 82BB18C
+gText_ApprenticeHoldNothing6::
 	.string "Is that right? My {STR_VAR_1} doesn't\n"
 	.string "need to hold an item, you're saying.$"
 
-gText_ApprenticeThanksNoHeldItem6:: @ 82BB1CE
+gText_ApprenticeThanksNoHeldItem6::
 	.string "Okay, that's what I'll do!\p"
 	.string "I guess that's about all I wanted\n"
 	.string "to ask you today.\p"
 	.string "Let's meet here again, okay?\n"
 	.string "Thanks!$"
 
-gText_ApprenticeThanksHeldItem6:: @ 82BB242
+gText_ApprenticeThanksHeldItem6::
 	.string "Uh-huh! One {STR_VAR_1}.\n"
 	.string "What a cool choice!\l"
 	.string "I'll definitely try that!\p"
@@ -893,7 +893,7 @@ gText_ApprenticeThanksHeldItem6:: @ 82BB242
 	.string "Let's meet here again, okay?\n"
 	.string "Thanks!$"
 
-gText_ApprenticeItemAlreadyRecommended6:: @ 82BB2D9
+gText_ApprenticeItemAlreadyRecommended6::
 	.string "Ahahah! That's silly!\n"
 	.string "You already told me about that\l"
 	.string "{STR_VAR_1} before!\p"
@@ -901,7 +901,7 @@ gText_ApprenticeItemAlreadyRecommended6:: @ 82BB2D9
 	.string "Oh, wait! My {STR_VAR_2} doesn't\n"
 	.string "need to hold an item, you're saying.$"
 
-gText_ApprenticeWhatHeldItem7:: @ 82BB370
+gText_ApprenticeWhatHeldItem7::
 	.string "Hello, {PLAYER}. I hope you've been\n"
 	.string "keeping well.\p"
 	.string "May I approach you for advice?\p"
@@ -915,31 +915,31 @@ gText_ApprenticeWhatHeldItem7:: @ 82BB370
 	.string "It would please me if you could decide\n"
 	.string "what would be right for my POKéMON…$"
 
-gText_ApprenticeHoldNothing7:: @ 82BB4C3
+gText_ApprenticeHoldNothing7::
 	.string "In other words… My POKéMON has\n"
 	.string "no need to hold an item?$"
 
-gText_ApprenticeThanksNoHeldItem7:: @ 82BB4FB
+gText_ApprenticeThanksNoHeldItem7::
 	.string "I understand clearly now!\n"
 	.string "I will keep trying like this.\p"
 	.string "Thank you, {PLAYER}.\n"
 	.string "I hope I can count on you again.\l"
 	.string "Please take care!$"
 
-gText_ApprenticeThanksHeldItem7:: @ 82BB575
+gText_ApprenticeThanksHeldItem7::
 	.string "One {STR_VAR_1} it is!\n"
 	.string "I will order it right away.\p"
 	.string "Thank you, {PLAYER}.\n"
 	.string "I hope I can count on you again.\l"
 	.string "Please take care!$"
 
-gText_ApprenticeItemAlreadyRecommended7:: @ 82BB5E1
+gText_ApprenticeItemAlreadyRecommended7::
 	.string "You've already told me about that,\n"
 	.string "and I already have it.\p"
 	.string "Or are you saying… My POKéMON has\n"
 	.string "no need to hold an item?$"
 
-gText_ApprenticeWhatHeldItem8:: @ 82BB656
+gText_ApprenticeWhatHeldItem8::
 	.string "Eek! {PLAYER}!\n"
 	.string "I… I'm overjoyed to see you again!\p"
 	.string "Oh-oh-oh! There's something I just\n"
@@ -947,17 +947,17 @@ gText_ApprenticeWhatHeldItem8:: @ 82BB656
 	.string "Please decide what my {STR_VAR_1}\n"
 	.string "should be holding!$"
 
-gText_ApprenticeHoldNothing8:: @ 82BB6E5
+gText_ApprenticeHoldNothing8::
 	.string "Oh, wow! I didn't expect that answer!\n"
 	.string "So, a hold item isn't necessary?$"
 
-gText_ApprenticeThanksNoHeldItem8:: @ 82BB72C
+gText_ApprenticeThanksNoHeldItem8::
 	.string "Perfectly understood!\n"
 	.string "I'll keep at this without an item!\p"
 	.string "I hope you'll be willing to teach me\n"
 	.string "some more another time.$"
 
-gText_ApprenticeThanksHeldItem8:: @ 82BB7A2
+gText_ApprenticeThanksHeldItem8::
 	.string "{STR_VAR_1}! I'll use that!\p"
 	.string "Um… Could it be, {PLAYER}, you also\n"
 	.string "make your POKéMON hold that item?\p"
@@ -965,14 +965,14 @@ gText_ApprenticeThanksHeldItem8:: @ 82BB7A2
 	.string "I hope you'll be willing to teach me\l"
 	.string "some more another time.$"
 
-gText_ApprenticeItemAlreadyRecommended8:: @ 82BB84A
+gText_ApprenticeItemAlreadyRecommended8::
 	.string "Oh? You recommended that\n"
 	.string "{STR_VAR_1} before, too.\p"
 	.string "Or is it the best thing to hold?\n"
 	.string "Or do you mean that my {STR_VAR_2}\l"
 	.string "doesn't need anything to hold?$"
 
-gText_ApprenticeWhatHeldItem9:: @ 82BB8CD
+gText_ApprenticeWhatHeldItem9::
 	.string "Hola!\n"
 	.string "My maestro, {PLAYER}{KUN}!\p"
 	.string "I want to hit you up for advice on\n"
@@ -982,31 +982,31 @@ gText_ApprenticeWhatHeldItem9:: @ 82BB8CD
 	.string "Don't be shy now.\n"
 	.string "Let's blurt it out!$"
 
-gText_ApprenticeHoldNothing9:: @ 82BB970
+gText_ApprenticeHoldNothing9::
 	.string "Oh? So, you're saying my {STR_VAR_1}\n"
 	.string "can win without holding any item?$"
 
-gText_ApprenticeThanksNoHeldItem9:: @ 82BB9AE
+gText_ApprenticeThanksNoHeldItem9::
 	.string "Si, bueno!\n"
 	.string "I'll give it my best shot, like, slam!\p"
 	.string "All right, thanks, as always!\n"
 	.string "Adios!$"
 
-gText_ApprenticeThanksHeldItem9:: @ 82BBA05
+gText_ApprenticeThanksHeldItem9::
 	.string "Uh-huh, that's one {STR_VAR_1}?\n"
 	.string "Si, bueno!\l"
 	.string "I'll go find me one, like, bam!\p"
 	.string "All right, thanks, as always!\n"
 	.string "Adios!$"
 
-gText_ApprenticeItemAlreadyRecommended9:: @ 82BBA6C
+gText_ApprenticeItemAlreadyRecommended9::
 	.string "No, no! You already told me about\n"
 	.string "that {STR_VAR_1} thing before.\p"
 	.string "Oh, now wait just one minute here…\n"
 	.string "So, you're saying my {STR_VAR_2}\l"
 	.string "can win without holding any item?$"
 
-gText_ApprenticeWhatHeldItem10:: @ 82BBB01
+gText_ApprenticeWhatHeldItem10::
 	.string "{PLAYER}{KUN}, something unbelievable\n"
 	.string "has happened!\p"
 	.string "I woke up this morning, and my POKéMON\n"
@@ -1019,11 +1019,11 @@ gText_ApprenticeWhatHeldItem10:: @ 82BBB01
 	.string "So, how about deciding for me what\n"
 	.string "my {STR_VAR_1} should hold, master?$"
 
-gText_ApprenticeHoldNothing10:: @ 82BBC1C
+gText_ApprenticeHoldNothing10::
 	.string "What's that mean?\n"
 	.string "Don't make it hold anything?$"
 
-gText_ApprenticeThanksNoHeldItem10:: @ 82BBC4B
+gText_ApprenticeThanksNoHeldItem10::
 	.string "Okay, so it shouldn't hold anything.\n"
 	.string "Then, I'd better get something for it!\p"
 	.string "Just kidding!\n"
@@ -1031,7 +1031,7 @@ gText_ApprenticeThanksNoHeldItem10:: @ 82BBC4B
 	.string "Thanks, master!\n"
 	.string "I hope you'll keep teaching me!$"
 
-gText_ApprenticeThanksHeldItem10:: @ 82BBCF6
+gText_ApprenticeThanksHeldItem10::
 	.string "Okay, so it's one {STR_VAR_1}!\n"
 	.string "I'll make it hold anything but that!\p"
 	.string "Just kidding!\n"
@@ -1039,14 +1039,14 @@ gText_ApprenticeThanksHeldItem10:: @ 82BBCF6
 	.string "Thanks, master!\n"
 	.string "I hope you'll keep teaching me!$"
 
-gText_ApprenticeItemAlreadyRecommended10:: @ 82BBD90
+gText_ApprenticeItemAlreadyRecommended10::
 	.string "Um, you told me about that before,\n"
 	.string "didn't you?\p"
 	.string "Isn't there something else?\p"
 	.string "Or do you mean, don't make\n"
 	.string "my {STR_VAR_2} hold anything?$"
 
-gText_ApprenticeWhatHeldItem11:: @ 82BBE0B
+gText_ApprenticeWhatHeldItem11::
 	.string "A-H-O-Y!\n"
 	.string "And that spells ahoy!\p"
 	.string "The rappin' SAILOR am I!\n"
@@ -1057,25 +1057,25 @@ gText_ApprenticeWhatHeldItem11:: @ 82BBE0B
 	.string "My {STR_VAR_1} needs an item to hold,\n"
 	.string "What should it be, if I may be bold?$"
 
-gText_ApprenticeHoldNothing11:: @ 82BBEE5
+gText_ApprenticeHoldNothing11::
 	.string "Is that right?\n"
 	.string "My {STR_VAR_1} doesn't need to be\l"
 	.string "holding anything tight?$"
 
-gText_ApprenticeThanksNoHeldItem11:: @ 82BBF25
+gText_ApprenticeThanksNoHeldItem11::
 	.string "Okay, I hear you, sure I do!\n"
 	.string "My POKéMON will go empty-handed, too!\p"
 	.string "If it's advice I ever need,\n"
 	.string "{PLAYER}, your word I'll always heed!$"
 
-gText_ApprenticeThanksHeldItem11:: @ 82BBFA4
+gText_ApprenticeThanksHeldItem11::
 	.string "Okay, one {STR_VAR_1},\n"
 	.string "that's what I'll use.\l"
 	.string "I was right to make you choose!\p"
 	.string "If it's advice I ever need,\n"
 	.string "{PLAYER}, your word I'll always heed!$"
 
-gText_ApprenticeItemAlreadyRecommended11:: @ 82BC024
+gText_ApprenticeItemAlreadyRecommended11::
 	.string "Okay, one {STR_VAR_1}, you say?\n"
 	.string "You told me that the other day.\l"
 	.string "I need a new idea, a brand new way.\p"
@@ -1083,7 +1083,7 @@ gText_ApprenticeItemAlreadyRecommended11:: @ 82BC024
 	.string "My POKéMON doesn't need to hold\l"
 	.string "anything tight?$"
 
-gText_ApprenticeWhatHeldItem12:: @ 82BC0C8
+gText_ApprenticeWhatHeldItem12::
 	.string "Say, hey, {PLAYER}!\n"
 	.string "I found you again today!\p"
 	.string "What should I do? Get your advice?\n"
@@ -1097,25 +1097,25 @@ gText_ApprenticeWhatHeldItem12:: @ 82BC0C8
 	.string "my {STR_VAR_1} that'd be good.\l"
 	.string "My indecision is making me brood.$"
 
-gText_ApprenticeHoldNothing12:: @ 82BC213
+gText_ApprenticeHoldNothing12::
 	.string "My {STR_VAR_1} needs nothing?\n"
 	.string "Doesn't need to hold anything?$"
 
-gText_ApprenticeThanksNoHeldItem12:: @ 82BC247
+gText_ApprenticeThanksNoHeldItem12::
 	.string "If holding nothing is the best,\n"
 	.string "I'll do as you suggest!\p"
 	.string "Well, {PLAYER}, I have to roam free,\n"
 	.string "but don't you forget about me.\p"
 	.string "See you again, my smart friend!$"
 
-gText_ApprenticeThanksHeldItem12:: @ 82BC2DD
+gText_ApprenticeThanksHeldItem12::
 	.string "If holding that {STR_VAR_1} is\n"
 	.string "the best, I'll do as you suggest!\p"
 	.string "Well, {PLAYER}, I have to roam free,\n"
 	.string "but don't you forget about me.\p"
 	.string "See you again, my smart friend!$"
 
-gText_ApprenticeItemAlreadyRecommended12:: @ 82BC373
+gText_ApprenticeItemAlreadyRecommended12::
 	.string "Haven't I heard about that\n"
 	.string "{STR_VAR_1} before?\l"
 	.string "I'm certain I have, that's for sure!\p"
@@ -1123,7 +1123,7 @@ gText_ApprenticeItemAlreadyRecommended12:: @ 82BC373
 	.string "Or, my {STR_VAR_2} needs nothing?\l"
 	.string "Doesn't need to hold anything?$"
 
-gText_ApprenticeWhatHeldItem13:: @ 82BC40E
+gText_ApprenticeWhatHeldItem13::
 	.string "Gwah! Ouch! {PLAYER}{KUN}, my arm's broken!\n"
 	.string "Don't touch it, please!\p"
 	.string "I must've broken it while I was trying\n"
@@ -1134,25 +1134,25 @@ gText_ApprenticeWhatHeldItem13:: @ 82BC40E
 	.string "{PLAYER}{KUN}, what do you think would be\n"
 	.string "good for my {STR_VAR_1} to hold?$"
 
-gText_ApprenticeHoldNothing13:: @ 82BC514
+gText_ApprenticeHoldNothing13::
 	.string "Ouch…\p"
 	.string "So your suggestion is my {STR_VAR_1}\n"
 	.string "doesn't have to hold anything?$"
 
-gText_ApprenticeThanksNoHeldItem13:: @ 82BC555
+gText_ApprenticeThanksNoHeldItem13::
 	.string "Hm, all right. That would be easier\n"
 	.string "for me, the way things are now.\p"
 	.string "I hope I can keep hitting you up\n"
 	.string "for help like this.$"
 
-gText_ApprenticeThanksHeldItem13:: @ 82BC5CE
+gText_ApprenticeThanksHeldItem13::
 	.string "Hm, all right. That's one {STR_VAR_1}.\n"
 	.string "My POKéMON's arm is fine, so I'll make\l"
 	.string "it hold that item right away.\p"
 	.string "I hope I can keep hitting you up\n"
 	.string "for help like this.$"
 
-gText_ApprenticeItemAlreadyRecommended13:: @ 82BC666
+gText_ApprenticeItemAlreadyRecommended13::
 	.string "No, no, you told me about that\n"
 	.string "{STR_VAR_1} before, remember?\p"
 	.string "How about telling me something\n"
@@ -1161,7 +1161,7 @@ gText_ApprenticeItemAlreadyRecommended13:: @ 82BC666
 	.string "So your suggestion is my {STR_VAR_2}\l"
 	.string "doesn't have to hold anything?$"
 
-gText_ApprenticeWhatHeldItem14:: @ 82BC714
+gText_ApprenticeWhatHeldItem14::
 	.string "Er… Um…\n"
 	.string "{PLAYER}{KUN}…\p"
 	.string "Please, don't look at me that way.\n"
@@ -1173,11 +1173,11 @@ gText_ApprenticeWhatHeldItem14:: @ 82BC714
 	.string "{PLAYER}{KUN}, what do you think would\n"
 	.string "be good?$"
 
-gText_ApprenticeHoldNothing14:: @ 82BC808
+gText_ApprenticeHoldNothing14::
 	.string "Oh… Then, you think it would be better\n"
 	.string "if my {STR_VAR_1} didn't have an item?$"
 
-gText_ApprenticeThanksNoHeldItem14:: @ 82BC84D
+gText_ApprenticeThanksNoHeldItem14::
 	.string "Oh… Okay!\n"
 	.string "I'll go without an item.\p"
 	.string "This is nerve-racking, though.\n"
@@ -1186,7 +1186,7 @@ gText_ApprenticeThanksNoHeldItem14:: @ 82BC84D
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
-gText_ApprenticeThanksHeldItem14:: @ 82BC8EA
+gText_ApprenticeThanksHeldItem14::
 	.string "Oh… Okay!\n"
 	.string "I'll go with that {STR_VAR_1}.\p"
 	.string "This is nerve-racking, though.\n"
@@ -1195,7 +1195,7 @@ gText_ApprenticeThanksHeldItem14:: @ 82BC8EA
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
-gText_ApprenticeItemAlreadyRecommended14:: @ 82BC984
+gText_ApprenticeItemAlreadyRecommended14::
 	.string "B-but I already heard about that.\p"
 	.string "Please don't brush me off like this!\n"
 	.string "I can't live with the humiliation.\p"
@@ -1203,7 +1203,7 @@ gText_ApprenticeItemAlreadyRecommended14:: @ 82BC984
 	.string "Do you think it would be better if\l"
 	.string "my {STR_VAR_2} didn't have an item?$"
 
-gText_ApprenticeWhatHeldItem15:: @ 82BCA4D
+gText_ApprenticeWhatHeldItem15::
 	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really?\l"
 	.string "Perhaps you're a twin?\p"
@@ -1216,16 +1216,16 @@ gText_ApprenticeWhatHeldItem15:: @ 82BCA4D
 	.string "to make hold a convenient item.\p"
 	.string "What would be worthy of it?$"
 
-gText_ApprenticeHoldNothing15:: @ 82BCB75
+gText_ApprenticeHoldNothing15::
 	.string "It's better if it held nothing?\n"
 	.string "Are you certain?$"
 
-gText_ApprenticeThanksNoHeldItem15:: @ 82BCBA6
+gText_ApprenticeThanksNoHeldItem15::
 	.string "I see. If that's the case, that's fine.\n"
 	.string "I thank you for your time.\p"
 	.string "Let us meet again!$"
 
-gText_ApprenticeThanksHeldItem15:: @ 82BCBFC
+gText_ApprenticeThanksHeldItem15::
 	.string "One {STR_VAR_1}?\n"
 	.string "Are you certain?\p"
 	.string "I see. If that's the case, that's fine.\n"
@@ -1234,7 +1234,7 @@ gText_ApprenticeThanksHeldItem15:: @ 82BCBFC
 	.string "put it to good use.\p"
 	.string "Let us meet again!$"
 
-gText_ApprenticeItemAlreadyRecommended15:: @ 82BCCA4
+gText_ApprenticeItemAlreadyRecommended15::
 	.string "No, no, wait a minute.\n"
 	.string "I believe you taught me that before.\p"
 	.string "I would like you to recommend\n"
@@ -1243,7 +1243,7 @@ gText_ApprenticeItemAlreadyRecommended15:: @ 82BCCA4
 	.string "my {STR_VAR_2} should hold nothing?\l"
 	.string "Are you certain?$"
 
-gText_ApprenticeWhichMonFirst0:: @ 82BCD68
+gText_ApprenticeWhichMonFirst0::
 	.string "Waah, {PLAYER}!\n"
 	.string "I have a dilemma, sob…\p"
 	.string "I want to begin battling other people,\n"
@@ -1254,7 +1254,7 @@ gText_ApprenticeWhichMonFirst0:: @ 82BCD68
 	.string "If you were me, which of these POKéMON\l"
 	.string "would you send out first?$"
 
-gText_ApprenticeMonFirstThanks0:: @ 82BCE64
+gText_ApprenticeMonFirstThanks0::
 	.string "My {STR_VAR_1} should go first?\n"
 	.string "Waaaaah!\p"
 	.string "Oh! I'm so sorry!\n"
@@ -1262,30 +1262,30 @@ gText_ApprenticeMonFirstThanks0:: @ 82BCE64
 	.string "my first POKéMON, and it's made me cry…\p"
 	.string "Thank you so much!$"
 
-gText_ApprenticeWhichMonFirst1:: @ 82BCEF2
+gText_ApprenticeWhichMonFirst1::
 	.string "Yay! It's {PLAYER}!\n"
 	.string "Great! I wanted to ask you something!\p"
 	.string "Um, of my POKéMON, which do you\n"
 	.string "think should go out first?$"
 
-gText_ApprenticeMonFirstThanks1:: @ 82BCF61
+gText_ApprenticeMonFirstThanks1::
 	.string "My {STR_VAR_1}? That's true.\n"
 	.string "Okay, I'll do that!\p"
 	.string "Thanks for teaching me!$"
 
-gText_ApprenticeWhichMonFirst2:: @ 82BCFA1
+gText_ApprenticeWhichMonFirst2::
 	.string "{PLAYER}, hello!\p"
 	.string "I think, in a battle, it's very important\n"
 	.string "which POKéMON comes out first.\p"
 	.string "Out of the POKéMON that I have,\n"
 	.string "which would be good to send out first?$"
 
-gText_ApprenticeMonFirstThanks2:: @ 82BD03C
+gText_ApprenticeMonFirstThanks2::
 	.string "My {STR_VAR_1} goes first?\n"
 	.string "Okay, I got it!\p"
 	.string "See you again!$"
 
-gText_ApprenticeWhichMonFirst3:: @ 82BD06D
+gText_ApprenticeWhichMonFirst3::
 	.string "Hello, {PLAYER}…\n"
 	.string "I'm sorry to disturb you again with\l"
 	.string "another question.\p"
@@ -1297,7 +1297,7 @@ gText_ApprenticeWhichMonFirst3:: @ 82BD06D
 	.string "Which of my POKéMON should I send\n"
 	.string "out first in a battle?$"
 
-gText_ApprenticeMonFirstThanks3:: @ 82BD18A
+gText_ApprenticeMonFirstThanks3::
 	.string "My {STR_VAR_1}?\n"
 	.string "Understood!\p"
 	.string "I can't believe that you would bother\n"
@@ -1305,7 +1305,7 @@ gText_ApprenticeMonFirstThanks3:: @ 82BD18A
 	.string "I'm so grateful that you would even\n"
 	.string "speak with me… Thank you!$"
 
-gText_ApprenticeWhichMonFirst4:: @ 82BD222
+gText_ApprenticeWhichMonFirst4::
 	.string "Oh, {PLAYER}{KUN}! It's me!\n"
 	.string "I'm so glad to see you because I have\l"
 	.string "this little problem.\p"
@@ -1316,7 +1316,7 @@ gText_ApprenticeWhichMonFirst4:: @ 82BD222
 	.string "How about deciding just the first\n"
 	.string "POKéMON for me?$"
 
-gText_ApprenticeMonFirstThanks4:: @ 82BD325
+gText_ApprenticeMonFirstThanks4::
 	.string "My {STR_VAR_1}? That's great!\p"
 	.string "Knowing that you made the decision,\n"
 	.string "{PLAYER}{KUN}, I won't be so upset if\l"
@@ -1324,7 +1324,7 @@ gText_ApprenticeMonFirstThanks4:: @ 82BD325
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
 
-gText_ApprenticeWhichMonFirst5:: @ 82BD3B1
+gText_ApprenticeWhichMonFirst5::
 	.string "Hi, my teacher {PLAYER}{KUN}!\n"
 	.string "I'm busy again today!\p"
 	.string "I have to do some cycling, shopping,\n"
@@ -1334,14 +1334,14 @@ gText_ApprenticeWhichMonFirst5:: @ 82BD3B1
 	.string "So, how about checking out my team?\n"
 	.string "Which one should go first?$"
 
-gText_ApprenticeMonFirstThanks5:: @ 82BD493
+gText_ApprenticeMonFirstThanks5::
 	.string "Okay, gotcha.\n"
 	.string "I have enough time at least to put\l"
 	.string "my {STR_VAR_1} at the head of the line!\p"
 	.string "Whoops, my girlfriend's waiting!\n"
 	.string "Thanks! See you around!$"
 
-gText_ApprenticeWhichMonFirst6:: @ 82BD51C
+gText_ApprenticeWhichMonFirst6::
 	.string "Yoohoo! Hiya, {PLAYER}!\n"
 	.string "You always walk around looking tough!\p"
 	.string "Listen, I need something from you\n"
@@ -1351,7 +1351,7 @@ gText_ApprenticeWhichMonFirst6:: @ 82BD51C
 	.string "Which POKéMON of mine should be first\n"
 	.string "to go out in a battle?$"
 
-gText_ApprenticeMonFirstThanks6:: @ 82BD609
+gText_ApprenticeMonFirstThanks6::
 	.string "Hmhm!\n"
 	.string "My {STR_VAR_1}, you say!\l"
 	.string "Thanks for a most cool answer!\p"
@@ -1360,7 +1360,7 @@ gText_ApprenticeMonFirstThanks6:: @ 82BD609
 	.string "Let's meet here again, okay?\n"
 	.string "Thanks!$"
 
-gText_ApprenticeWhichMonFirst7:: @ 82BD697
+gText_ApprenticeWhichMonFirst7::
 	.string "Thank you so much for stopping to\n"
 	.string "chat with me, {PLAYER}.\p"
 	.string "I know I'm taking advantage of your\n"
@@ -1370,14 +1370,14 @@ gText_ApprenticeWhichMonFirst7:: @ 82BD697
 	.string "It would please me if you could decide\n"
 	.string "which POKéMON should come first.$"
 
-gText_ApprenticeMonFirstThanks7:: @ 82BD797
+gText_ApprenticeMonFirstThanks7::
 	.string "My {STR_VAR_1} it is!\n"
 	.string "I will put it first right away!\p"
 	.string "Thank you, {PLAYER}.\n"
 	.string "I hope I can count on you again.\l"
 	.string "Please take care!$"
 
-gText_ApprenticeWhichMonFirst8:: @ 82BD806
+gText_ApprenticeWhichMonFirst8::
 	.string "Eek! {PLAYER}!\n"
 	.string "I… I'm overjoyed to see you again!\p"
 	.string "My POKéMON have become much\n"
@@ -1388,7 +1388,7 @@ gText_ApprenticeWhichMonFirst8:: @ 82BD806
 	.string "Please decide which of my POKéMON\n"
 	.string "should go out first!$"
 
-gText_ApprenticeMonFirstThanks8:: @ 82BD8F5
+gText_ApprenticeMonFirstThanks8::
 	.string "Sigh… I'm overwhelmed with happiness…\p"
 	.string "It's like a dream having you decide\n"
 	.string "for me, {PLAYER}.\p"
@@ -1397,7 +1397,7 @@ gText_ApprenticeMonFirstThanks8:: @ 82BD8F5
 	.string "I hope you'll be willing to teach me\n"
 	.string "some more another time.$"
 
-gText_ApprenticeWhichMonFirst9:: @ 82BD9BE
+gText_ApprenticeWhichMonFirst9::
 	.string "Hello, hello!\n"
 	.string "My mentor, {PLAYER}{KUN}!\l"
 	.string "Hit me with your sage advice today!\p"
@@ -1410,14 +1410,14 @@ gText_ApprenticeWhichMonFirst9:: @ 82BD9BE
 	.string "Don't be shy now.\n"
 	.string "Let's blurt it out!$"
 
-gText_ApprenticeMonFirstThanks9:: @ 82BDAE1
+gText_ApprenticeMonFirstThanks9::
 	.string "Uh-huh, my {STR_VAR_1} leads off!\n"
 	.string "OK, A-OK!\l"
 	.string "I'll reorder the lineup, like, wham!\p"
 	.string "All right, thanks, as always!\n"
 	.string "Adios!$"
 
-gText_ApprenticeWhichMonFirst10:: @ 82BDB4E
+gText_ApprenticeWhichMonFirst10::
 	.string "{PLAYER}{KUN}, listen!\n"
 	.string "It's a crisis!\p"
 	.string "My POKéMON, all three of them, go into\n"
@@ -1430,7 +1430,7 @@ gText_ApprenticeWhichMonFirst10:: @ 82BDB4E
 	.string "So, how about deciding for me which\n"
 	.string "POKéMON should go first, master?$"
 
-gText_ApprenticeMonFirstThanks10:: @ 82BDC6B
+gText_ApprenticeMonFirstThanks10::
 	.string "Okay, so it's my {STR_VAR_1} you chose?\n"
 	.string "I'll let any but that one go first!\p"
 	.string "Just kidding!\n"
@@ -1438,7 +1438,7 @@ gText_ApprenticeMonFirstThanks10:: @ 82BDC6B
 	.string "Thanks, master!\n"
 	.string "I hope you'll keep teaching me!$"
 
-gText_ApprenticeWhichMonFirst11:: @ 82BDD0D
+gText_ApprenticeWhichMonFirst11::
 	.string "A-H-O-Y!\n"
 	.string "And that spells ahoy!\p"
 	.string "The rappin' SAILOR am I!\n"
@@ -1449,13 +1449,13 @@ gText_ApprenticeWhichMonFirst11:: @ 82BDD0D
 	.string "Out of this lot, which should go first\n"
 	.string "as the first on the spot?$"
 
-gText_ApprenticeMonFirstThanks11:: @ 82BDDEC
+gText_ApprenticeMonFirstThanks11::
 	.string "Okay, I hear you, sure I do!\n"
 	.string "I'll switch them up, that I'll do!\p"
 	.string "If it's advice I ever need,\n"
 	.string "{PLAYER}, your word I'll always heed!$"
 
-gText_ApprenticeWhichMonFirst12:: @ 82BDE68
+gText_ApprenticeWhichMonFirst12::
 	.string "Yahoo, {PLAYER}!\n"
 	.string "How do you do?\p"
 	.string "What should I do? Go ahead and ask?\n"
@@ -1466,14 +1466,14 @@ gText_ApprenticeWhichMonFirst12:: @ 82BDE68
 	.string "POKéMON is the first to ride!\l"
 	.string "Into battle, I mean to say.$"
 
-gText_ApprenticeMonFirstThanks12:: @ 82BDF4D
+gText_ApprenticeMonFirstThanks12::
 	.string "My {STR_VAR_1}? Yes!\n"
 	.string "That'll do, there's no distress!\p"
 	.string "Well, {PLAYER}, I have to roam free,\n"
 	.string "but don't you forget about me.\p"
 	.string "See you again, my smart friend!$"
 
-gText_ApprenticeWhichMonFirst13:: @ 82BDFD8
+gText_ApprenticeWhichMonFirst13::
 	.string "…Oof…ooch… {PLAYER}{KUN}…\n"
 	.string "My stomach's hurting all of a sudden…\p"
 	.string "…It's getting better now…\p"
@@ -1485,7 +1485,7 @@ gText_ApprenticeWhichMonFirst13:: @ 82BDFD8
 	.string "{PLAYER}{KUN}, which of my POKéMON should\n"
 	.string "go first? So I'd win, I mean.$"
 
-gText_ApprenticeMonFirstThanks13:: @ 82BE0FD
+gText_ApprenticeMonFirstThanks13::
 	.string "Hm, all right.\n"
 	.string "My {STR_VAR_1} goes first.\p"
 	.string "I'll fix the lineup like that after\n"
@@ -1493,7 +1493,7 @@ gText_ApprenticeMonFirstThanks13:: @ 82BE0FD
 	.string "I hope I can keep hitting you up\n"
 	.string "for help like this.$"
 
-gText_ApprenticeWhichMonFirst14:: @ 82BE189
+gText_ApprenticeWhichMonFirst14::
 	.string "Er… Um…\n"
 	.string "{PLAYER}{KUN}?\p"
 	.string "Please, don't look at me that way.\n"
@@ -1506,7 +1506,7 @@ gText_ApprenticeWhichMonFirst14:: @ 82BE189
 	.string "Which POKéMON should I send out first\n"
 	.string "so I at least look capable?$"
 
-gText_ApprenticeMonFirstThanks14:: @ 82BE2A5
+gText_ApprenticeMonFirstThanks14::
 	.string "Oh… Okay!\n"
 	.string "I'll lead with my {STR_VAR_1}.\p"
 	.string "I hope I can do my best without\n"
@@ -1515,7 +1515,7 @@ gText_ApprenticeMonFirstThanks14:: @ 82BE2A5
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
-gText_ApprenticeWhichMonFirst15:: @ 82BE33E
+gText_ApprenticeWhichMonFirst15::
 	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really?\l"
 	.string "Perhaps you're a clever look-alike?\p"
@@ -1527,7 +1527,7 @@ gText_ApprenticeWhichMonFirst15:: @ 82BE33E
 	.string "I would like you to tell me which one\l"
 	.string "should go first in a battle.$"
 
-gText_ApprenticeMonFirstThanks15:: @ 82BE46C
+gText_ApprenticeMonFirstThanks15::
 	.string "My {STR_VAR_1}…\n"
 	.string "You aren't pulling my leg?\p"
 	.string "I see. If that's the case, that's fine.\n"
@@ -1536,7 +1536,7 @@ gText_ApprenticeMonFirstThanks15:: @ 82BE46C
 	.string "my best.\p"
 	.string "Let us meet again!$"
 
-gText_ApprenticeWhichMon0:: @ 82BE50D
+gText_ApprenticeWhichMon0::
 	.string "Snivel…\n"
 	.string "Oh, {PLAYER}!\p"
 	.string "What perfect timing!\n"
@@ -1548,7 +1548,7 @@ gText_ApprenticeWhichMon0:: @ 82BE50D
 	.string "{PLAYER}, which do you think will give\n"
 	.string "even me a chance at winning?$"
 
-gText_ApprenticeMonThanks0:: @ 82BE5F5
+gText_ApprenticeMonThanks0::
 	.string "Snivel… I… I understand!\n"
 	.string "Oh! I'm so sorry!\l"
 	.string "You've made me so happy, I'm crying…\p"
@@ -1556,7 +1556,7 @@ gText_ApprenticeMonThanks0:: @ 82BE5F5
 	.string "{STR_VAR_1}!\p"
 	.string "Thank you so much!$"
 
-gText_ApprenticeWhichMon1:: @ 82BE679
+gText_ApprenticeWhichMon1::
 	.string "Yay! It's {PLAYER}!\n"
 	.string "Yay, you came at the right time, too!\l"
 	.string "I need your advice again!\p"
@@ -1565,12 +1565,12 @@ gText_ApprenticeWhichMon1:: @ 82BE679
 	.string "Which do you think I should raise,\n"
 	.string "{PLAYER}?$"
 
-gText_ApprenticeMonThanks1:: @ 82BE71E
+gText_ApprenticeMonThanks1::
 	.string "Oh, so my {STR_VAR_1} is better!\n"
 	.string "Okay, I'll do that!\p"
 	.string "Thanks for teaching me!$"
 
-gText_ApprenticeWhichMon2:: @ 82BE762
+gText_ApprenticeWhichMon2::
 	.string "{PLAYER}, hello!\n"
 	.string "I have a question I wanted to ask.\p"
 	.string "I'm in a dilemma over whether I should\n"
@@ -1578,14 +1578,14 @@ gText_ApprenticeWhichMon2:: @ 82BE762
 	.string "Which POKéMON do you think will\n"
 	.string "be stronger?$"
 
-gText_ApprenticeMonThanks2:: @ 82BE7F8
+gText_ApprenticeMonThanks2::
 	.string "{STR_VAR_1} is your choice?\n"
 	.string "Okay, I got it!\p"
 	.string "I'll go catch a strong {STR_VAR_1}\n"
 	.string "right away!\p"
 	.string "See you again!$"
 
-gText_ApprenticeWhichMon3:: @ 82BE850
+gText_ApprenticeWhichMon3::
 	.string "Hello, {PLAYER}…\p"
 	.string "Um, you've probably already forgotten\n"
 	.string "about someone like me…\p"
@@ -1599,7 +1599,7 @@ gText_ApprenticeWhichMon3:: @ 82BE850
 	.string "{PLAYER}, you probably don't want to\n"
 	.string "bother, but please decide for me.$"
 
-gText_ApprenticeMonThanks3:: @ 82BE99C
+gText_ApprenticeMonThanks3::
 	.string "But will a wild {STR_VAR_1} even pay\n"
 	.string "attention to me?\p"
 	.string "I will try!\p"
@@ -1607,7 +1607,7 @@ gText_ApprenticeMonThanks3:: @ 82BE99C
 	.string "No! I'll do my best!\p"
 	.string "Thank you!$"
 
-gText_ApprenticeWhichMon4:: @ 82BEA1B
+gText_ApprenticeWhichMon4::
 	.string "Oh, {PLAYER}{KUN}! I'm so glad to see you!\n"
 	.string "I was about to go looking for you!\p"
 	.string "Can you decide what kind of POKéMON\n"
@@ -1618,7 +1618,7 @@ gText_ApprenticeWhichMon4:: @ 82BEA1B
 	.string "Which one do you think would be\n"
 	.string "better?$"
 
-gText_ApprenticeMonThanks4:: @ 82BEAE9
+gText_ApprenticeMonThanks4::
 	.string "{STR_VAR_1}? That's great!\p"
 	.string "Knowing that you made the decision,\n"
 	.string "{PLAYER}{KUN}, I won't be so upset if\l"
@@ -1626,7 +1626,7 @@ gText_ApprenticeMonThanks4:: @ 82BEAE9
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
 
-gText_ApprenticeWhichMon5:: @ 82BEB72
+gText_ApprenticeWhichMon5::
 	.string "If it isn't {PLAYER}{KUN}! How's it going?\n"
 	.string "I'm busy again as always!\p"
 	.string "I want to do good with POKéMON, too,\n"
@@ -1637,14 +1637,14 @@ gText_ApprenticeWhichMon5:: @ 82BEB72
 	.string "{PLAYER}{KUN}, give me some of your good\n"
 	.string "advice! Which one'd be good for me?$"
 
-gText_ApprenticeMonThanks5:: @ 82BEC8E
+gText_ApprenticeMonThanks5::
 	.string "Okay, gotcha.\n"
 	.string "I'll find time somehow and catch me\l"
 	.string "that {STR_VAR_1} you recommended.\p"
 	.string "I'm glad I met a good mentor in you.\n"
 	.string "Thanks! See you around!$"
 
-gText_ApprenticeWhichMon6:: @ 82BED16
+gText_ApprenticeWhichMon6::
 	.string "Oh!\n"
 	.string "Yay, it's {PLAYER}!\p"
 	.string "I didn't waste any time boasting to\n"
@@ -1657,7 +1657,7 @@ gText_ApprenticeWhichMon6:: @ 82BED16
 	.string "and the choices were one {STR_VAR_1}\l"
 	.string "or {STR_VAR_2}, which should it be?$"
 
-gText_ApprenticeMonThanks6:: @ 82BEE29
+gText_ApprenticeMonThanks6::
 	.string "Ahhh!\n"
 	.string "{STR_VAR_1}, you say!\l"
 	.string "Thanks for a most cool answer!\p"
@@ -1666,7 +1666,7 @@ gText_ApprenticeMonThanks6:: @ 82BEE29
 	.string "Let's meet here again, okay?\n"
 	.string "Thanks!$"
 
-gText_ApprenticeWhichMon7:: @ 82BEEB4
+gText_ApprenticeWhichMon7::
 	.string "Oh, is it you, {PLAYER}?\n"
 	.string "I'm delighted to see you again!\p"
 	.string "Ever since I became your apprentice,\n"
@@ -1679,14 +1679,14 @@ gText_ApprenticeWhichMon7:: @ 82BEEB4
 	.string "{STR_VAR_1} or {STR_VAR_2}…\l"
 	.string "Which POKéMON is right for me?$"
 
-gText_ApprenticeMonThanks7:: @ 82BEFE2
+gText_ApprenticeMonThanks7::
 	.string "One {STR_VAR_1} it is!\n"
 	.string "I will find one right away!\p"
 	.string "Thank you, {PLAYER}.\n"
 	.string "I hope I can count on you again.\l"
 	.string "Please take care!$"
 
-gText_ApprenticeWhichMon8:: @ 82BF04E
+gText_ApprenticeWhichMon8::
 	.string "Eek! {PLAYER}! I met you again!\n"
 	.string "I… I'm overjoyed!\p"
 	.string "Oh-oh-oh, I know!\n"
@@ -1696,14 +1696,14 @@ gText_ApprenticeWhichMon8:: @ 82BF04E
 	.string "Please decide which would be better,\n"
 	.string "{STR_VAR_1} or {STR_VAR_2}!$"
 
-gText_ApprenticeMonThanks8:: @ 82BF11D
+gText_ApprenticeMonThanks8::
 	.string "Wow! You decided for me!\n"
 	.string "One {STR_VAR_1} is what I'll raise to\l"
 	.string "the best of my ability.\p"
 	.string "I hope you'll be willing to teach me\n"
 	.string "some more another time.$"
 
-gText_ApprenticeWhichMon9:: @ 82BF1A8
+gText_ApprenticeWhichMon9::
 	.string "Hey, hey!\n"
 	.string "My mentor, {PLAYER}{KUN}!\p"
 	.string "Hello, I've been looking for you\n"
@@ -1713,14 +1713,14 @@ gText_ApprenticeWhichMon9:: @ 82BF1A8
 	.string "Don't be shy now.\n"
 	.string "Let's blurt it out!$"
 
-gText_ApprenticeMonThanks9:: @ 82BF268
+gText_ApprenticeMonThanks9::
 	.string "Uh-huh, one {STR_VAR_1} it is!\n"
 	.string "OK, A-OK!\l"
 	.string "I'll get one in a BALL, like, cram!\p"
 	.string "All right, thanks, as always!\n"
 	.string "Adios!$"
 
-gText_ApprenticeWhichMon10:: @ 82BF2D1
+gText_ApprenticeWhichMon10::
 	.string "{PLAYER}{KUN}, listen! Big news!\n"
 	.string "I caught a mirage POKéMON!\p"
 	.string "Of course I'm lying!\n"
@@ -1734,7 +1734,7 @@ gText_ApprenticeWhichMon10:: @ 82BF2D1
 	.string "Which would be better?\n"
 	.string "{STR_VAR_1} or {STR_VAR_2}?$"
 
-gText_ApprenticeMonThanks10:: @ 82BF3CF
+gText_ApprenticeMonThanks10::
 	.string "Okay, so it's {STR_VAR_1} you chose?\n"
 	.string "I'll grab the other kind, then!\p"
 	.string "Just kidding!\n"
@@ -1742,7 +1742,7 @@ gText_ApprenticeMonThanks10:: @ 82BF3CF
 	.string "Thanks, master!\n"
 	.string "I hope you'll keep teaching me!$"
 
-gText_ApprenticeWhichMon11:: @ 82BF46A
+gText_ApprenticeWhichMon11::
 	.string "A-H-O-Y!\n"
 	.string "And that spells ahoy!\p"
 	.string "The rappin' SAILOR am I!\n"
@@ -1753,13 +1753,13 @@ gText_ApprenticeWhichMon11:: @ 82BF46A
 	.string "{STR_VAR_1} and {STR_VAR_2}, you see.\l"
 	.string "Which is the one to catch for me?$"
 
-gText_ApprenticeMonThanks11:: @ 82BF551
+gText_ApprenticeMonThanks11::
 	.string "{STR_VAR_1}, you say, hey, hey!\n"
 	.string "I'll go get me one right away!\p"
 	.string "If it's advice I ever need,\n"
 	.string "{PLAYER}, your word I'll always heed!$"
 
-gText_ApprenticeWhichMon12:: @ 82BF5C3
+gText_ApprenticeWhichMon12::
 	.string "Oh, wow, if it isn't {PLAYER}!\p"
 	.string "What should I do? Get your advice?\n"
 	.string "Why not? I'm already talking to you!\p"
@@ -1771,14 +1771,14 @@ gText_ApprenticeWhichMon12:: @ 82BF5C3
 	.string "It's either {STR_VAR_1} or {STR_VAR_2}.\l"
 	.string "Which do you choose?$"
 
-gText_ApprenticeMonThanks12:: @ 82BF6E5
+gText_ApprenticeMonThanks12::
 	.string "If that {STR_VAR_1} is the best,\n"
 	.string "I'll do as you suggest!\p"
 	.string "Well, {PLAYER}, I have to roam free,\n"
 	.string "but don't you forget about me.\p"
 	.string "See you again, my smart friend!$"
 
-gText_ApprenticeWhichMon13:: @ 82BF773
+gText_ApprenticeWhichMon13::
 	.string "Oh, hi, {PLAYER}{KUN}…\n"
 	.string "I have this horrible headache…\p"
 	.string "I must've worried too much about\n"
@@ -1789,13 +1789,13 @@ gText_ApprenticeWhichMon13:: @ 82BF773
 	.string "the POKéMON {STR_VAR_1} and\l"
 	.string "{STR_VAR_2}, which should it be?$"
 
-gText_ApprenticeMonThanks13:: @ 82BF869
+gText_ApprenticeMonThanks13::
 	.string "Hm, one {STR_VAR_1}, all right.\n"
 	.string "I'll go look for one when I get better.\p"
 	.string "I hope I can keep hitting you up\n"
 	.string "for help like this.$"
 
-gText_ApprenticeWhichMon14:: @ 82BF8DD
+gText_ApprenticeWhichMon14::
 	.string "Er… Um…\n"
 	.string "{PLAYER}{KUN}…?\p"
 	.string "Please, don't look at me that way.\n"
@@ -1806,7 +1806,7 @@ gText_ApprenticeWhichMon14:: @ 82BF8DD
 	.string "If the choices were {STR_VAR_1} or\n"
 	.string "{STR_VAR_2}, which would be better?$"
 
-gText_ApprenticeMonThanks14:: @ 82BF9BA
+gText_ApprenticeMonThanks14::
 	.string "Oh… Okay!\n"
 	.string "I'll do my best with one {STR_VAR_1}.\p"
 	.string "I hope I can do my best without\n"
@@ -1815,7 +1815,7 @@ gText_ApprenticeMonThanks14:: @ 82BF9BA
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
-gText_ApprenticeWhichMon15:: @ 82BFA5A
+gText_ApprenticeWhichMon15::
 	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really real?\p"
 	.string "No, no, if you are real, it's fine.\n"
@@ -1826,7 +1826,7 @@ gText_ApprenticeWhichMon15:: @ 82BFA5A
 	.string "{STR_VAR_1} and {STR_VAR_2}, which is\l"
 	.string "more worthy of me?$"
 
-gText_ApprenticeMonThanks15:: @ 82BFB4E
+gText_ApprenticeMonThanks15::
 	.string "{STR_VAR_1}?\n"
 	.string "Are you certain?\p"
 	.string "I see. If that's the case, that's fine.\n"
@@ -1835,7 +1835,7 @@ gText_ApprenticeMonThanks15:: @ 82BFB4E
 	.string "handle with aplomb.\p"
 	.string "Let us meet again!$"
 
-gText_ApprenticeWhichMove0:: @ 82BFBF2
+gText_ApprenticeWhichMove0::
 	.string "Waaah! Oh, {PLAYER}!\n"
 	.string "Snivel… Hiccup…\p"
 	.string "I have a dilemma!\n"
@@ -1847,7 +1847,7 @@ gText_ApprenticeWhichMove0:: @ 82BFBF2
 	.string "be the better choice: {STR_VAR_2}\l"
 	.string "or {STR_VAR_3}?$"
 
-gText_ApprenticeMoveThanks0:: @ 82BFCAE
+gText_ApprenticeMoveThanks0::
 	.string "{STR_VAR_1}?\n"
 	.string "Waaaaah!\p"
 	.string "Oh! I'm so sorry, {PLAYER}!\n"
@@ -1856,7 +1856,7 @@ gText_ApprenticeMoveThanks0:: @ 82BFCAE
 	.string "Snivel…\n"
 	.string "Thank you so much!$"
 
-gText_ApprenticeWhichMove1:: @ 82BFD26
+gText_ApprenticeWhichMove1::
 	.string "Yay! Hi, {PLAYER}!\n"
 	.string "I need your advice again!\p"
 	.string "I want to teach my {STR_VAR_1}\n"
@@ -1865,13 +1865,13 @@ gText_ApprenticeWhichMove1:: @ 82BFD26
 	.string "{STR_VAR_2} or {STR_VAR_3}.\l"
 	.string "What's your recommendation?$"
 
-gText_ApprenticeMoveThanks1:: @ 82BFDB1
+gText_ApprenticeMoveThanks1::
 	.string "{STR_VAR_1} is better? I guess so!\n"
 	.string "Okay, I'll go with that!\p"
 	.string "If we meet here again, please teach\n"
 	.string "me something else, teacher!$"
 
-gText_ApprenticeWhichMove2:: @ 82BFE24
+gText_ApprenticeWhichMove2::
 	.string "{PLAYER}, hello!\n"
 	.string "It's about my {STR_VAR_1}, but I'm\l"
 	.string "worried about its moves.\p"
@@ -1880,14 +1880,14 @@ gText_ApprenticeWhichMove2:: @ 82BFE24
 	.string "Which is stronger and better for\n"
 	.string "my {STR_VAR_1}?$"
 
-gText_ApprenticeMoveThanks2:: @ 82BFEAD
+gText_ApprenticeMoveThanks2::
 	.string "{STR_VAR_1} is your choice?\n"
 	.string "Okay, I got it!\p"
 	.string "I'll go teach {STR_VAR_1} to\n"
 	.string "my POKéMON right away!\p"
 	.string "See you again!$"
 
-gText_ApprenticeWhichMove3:: @ 82BFF0A
+gText_ApprenticeWhichMove3::
 	.string "Ohhh, {PLAYER}…\n"
 	.string "I'm hopeless, no, really!\p"
 	.string "I've decided to raise a POKéMON,\n"
@@ -1901,14 +1901,14 @@ gText_ApprenticeWhichMove3:: @ 82BFF0A
 	.string "If you could even choose between\n"
 	.string "{STR_VAR_2} and {STR_VAR_3}…$"
 
-gText_ApprenticeMoveThanks3:: @ 82C0032
+gText_ApprenticeMoveThanks3::
 	.string "I understand!\p"
 	.string "But will it even be willing to learn\n"
 	.string "{STR_VAR_1} for me…\l"
 	.string "No! I'll do my best!\p"
 	.string "Thank you!$"
 
-gText_ApprenticeWhichMove4:: @ 82C0090
+gText_ApprenticeWhichMove4::
 	.string "Oh, {PLAYER}{KUN}!\n"
 	.string "I was just hoping to see you, too!\p"
 	.string "I was wondering what move would\n"
@@ -1919,7 +1919,7 @@ gText_ApprenticeWhichMove4:: @ 82C0090
 	.string "{STR_VAR_2} and {STR_VAR_3}?\l"
 	.string "Which one would be better?$"
 
-gText_ApprenticeMoveThanks4:: @ 82C016E
+gText_ApprenticeMoveThanks4::
 	.string "{STR_VAR_1}? That's great!\p"
 	.string "Knowing that you made the decision,\n"
 	.string "{PLAYER}{KUN}, I won't be so upset if\l"
@@ -1927,7 +1927,7 @@ gText_ApprenticeMoveThanks4:: @ 82C016E
 	.string "Okay, I'll look to you for advice again.\n"
 	.string "Bye!$"
 
-gText_ApprenticeWhichMove5:: @ 82C01F7
+gText_ApprenticeWhichMove5::
 	.string "How could things be this busy?\n"
 	.string "Hey, if it isn't {PLAYER}{KUN}!\l"
 	.string "How's it going?\p"
@@ -1941,14 +1941,14 @@ gText_ApprenticeWhichMove5:: @ 82C01F7
 	.string "{PLAYER}{KUN}, give me some of your good\n"
 	.string "advice! Which move'd be good for me?$"
 
-gText_ApprenticeMoveThanks5:: @ 82C034C
+gText_ApprenticeMoveThanks5::
 	.string "Okay, gotcha.\n"
 	.string "I'll make room in my schedule and\l"
 	.string "teach that move.\p"
 	.string "I'm glad I met a good mentor in you.\n"
 	.string "Thanks! See you around!$"
 
-gText_ApprenticeWhichMove6:: @ 82C03CA
+gText_ApprenticeWhichMove6::
 	.string "Oh! Lucky!\n"
 	.string "I met you again, {PLAYER}!\l"
 	.string "I need to tap your mind again today.\p"
@@ -1958,7 +1958,7 @@ gText_ApprenticeWhichMove6:: @ 82C03CA
 	.string "best suited, {STR_VAR_2} or\l"
 	.string "{STR_VAR_3}?$"
 
-gText_ApprenticeMoveThanks6:: @ 82C046E
+gText_ApprenticeMoveThanks6::
 	.string "Ahhh!\n"
 	.string "{STR_VAR_1}, you say!\l"
 	.string "Thanks for a most cool answer!\p"
@@ -1967,7 +1967,7 @@ gText_ApprenticeMoveThanks6:: @ 82C046E
 	.string "Let's meet here again, okay?\n"
 	.string "Thanks!$"
 
-gText_ApprenticeWhichMove7:: @ 82C04F9
+gText_ApprenticeWhichMove7::
 	.string "Oh, hello, {PLAYER}.\n"
 	.string "I trust you've been well?\p"
 	.string "I have to seek your advice again.\n"
@@ -1976,14 +1976,14 @@ gText_ApprenticeWhichMove7:: @ 82C04F9
 	.string "my lovable {STR_VAR_1}?\l"
 	.string "{STR_VAR_2} or {STR_VAR_3}?$"
 
-gText_ApprenticeMoveThanks7:: @ 82C0598
+gText_ApprenticeMoveThanks7::
 	.string "{STR_VAR_1} it is!\n"
 	.string "I will teach that right away!\p"
 	.string "Thank you, {PLAYER}.\n"
 	.string "I hope I can count on you again.\l"
 	.string "Please take care!$"
 
-gText_ApprenticeWhichMove8:: @ 82C0602
+gText_ApprenticeWhichMove8::
 	.string "Eek! {PLAYER}! I met you again!\n"
 	.string "I… I'm overjoyed!\p"
 	.string "Whenever I'm in need, you're always\n"
@@ -1995,14 +1995,14 @@ gText_ApprenticeWhichMove8:: @ 82C0602
 	.string "Which move would be better,\n"
 	.string "{STR_VAR_2} or {STR_VAR_3}?$"
 
-gText_ApprenticeMoveThanks8:: @ 82C06D8
+gText_ApprenticeMoveThanks8::
 	.string "Oh-oh-oh! Thank you!\n"
 	.string "{STR_VAR_1} is it!\l"
 	.string "Perfectly understood!\p"
 	.string "I hope you'll be willing to teach me\n"
 	.string "some more another time.$"
 
-gText_ApprenticeWhichMove9:: @ 82C074A
+gText_ApprenticeWhichMove9::
 	.string "Hola, {PLAYER}{KUN}, bueno!\n"
 	.string "I'm hoping for some more of\l"
 	.string "your sage advice today!\p"
@@ -2013,14 +2013,14 @@ gText_ApprenticeWhichMove9:: @ 82C074A
 	.string "Would it be {STR_VAR_2}?\n"
 	.string "Or {STR_VAR_3}?$"
 
-gText_ApprenticeMoveThanks9:: @ 82C0809
+gText_ApprenticeMoveThanks9::
 	.string "Uh-huh, {STR_VAR_1} it is!\n"
 	.string "Si, bueno!\l"
 	.string "I'll get it taught, like, ka-blam!\p"
 	.string "All right, thanks, as always!\n"
 	.string "Adios!$"
 
-gText_ApprenticeWhichMove10:: @ 82C086E
+gText_ApprenticeWhichMove10::
 	.string "{PLAYER}{KUN}, it's completely wild!\p"
 	.string "My POKéMON!\n"
 	.string "It learned six moves!\p"
@@ -2034,7 +2034,7 @@ gText_ApprenticeWhichMove10:: @ 82C086E
 	.string "{STR_VAR_2} or {STR_VAR_3}--which\n"
 	.string "would go with my {STR_VAR_1} best?$"
 
-gText_ApprenticeMoveThanks10:: @ 82C0982
+gText_ApprenticeMoveThanks10::
 	.string "Okay, so it's {STR_VAR_1} you chose?\n"
 	.string "I'll choose another move, then!\p"
 	.string "Just kidding!\n"
@@ -2042,7 +2042,7 @@ gText_ApprenticeMoveThanks10:: @ 82C0982
 	.string "Thanks, master!\n"
 	.string "I hope you'll keep teaching me!$"
 
-gText_ApprenticeWhichMove11:: @ 82C0A1D
+gText_ApprenticeWhichMove11::
 	.string "A-H-O-Y!\n"
 	.string "And that spells ahoy!\p"
 	.string "The rappin' SAILOR am I!\n"
@@ -2053,13 +2053,13 @@ gText_ApprenticeWhichMove11:: @ 82C0A1D
 	.string "the moves. What would be the best\l"
 	.string "for my {STR_VAR_1} so it grooves?$"
 
-gText_ApprenticeMoveThanks11:: @ 82C0AFD
+gText_ApprenticeMoveThanks11::
 	.string "{STR_VAR_1}, you say, hey, hey!\n"
 	.string "I'll go teach that right away!\p"
 	.string "If it's advice I ever need,\n"
 	.string "{PLAYER}, your word I'll always heed!$"
 
-gText_ApprenticeWhichMove12:: @ 82C0B6F
+gText_ApprenticeWhichMove12::
 	.string "Oh, yeahah, if it isn't {PLAYER}!\p"
 	.string "What should I do? Get your advice?\n"
 	.string "Why not? I'm already talking to you!\p"
@@ -2071,14 +2071,14 @@ gText_ApprenticeWhichMove12:: @ 82C0B6F
 	.string "It's {STR_VAR_2} or {STR_VAR_3},\l"
 	.string "what do you choose?$"
 
-gText_ApprenticeMoveThanks12:: @ 82C0C7D
+gText_ApprenticeMoveThanks12::
 	.string "If that {STR_VAR_1} is the best,\n"
 	.string "I'll do as you suggest!\p"
 	.string "Well, {PLAYER}, I have to roam free,\n"
 	.string "but don't you forget about me.\p"
 	.string "See you again, my smart friend!$"
 
-gText_ApprenticeWhichMove13:: @ 82C0D0B
+gText_ApprenticeWhichMove13::
 	.string "Gahack! Gaah! Oh, {PLAYER}{KUN}…\n"
 	.string "I have this lousy cold, I do…\p"
 	.string "I want to pick a move for my POKéMON,\n"
@@ -2089,13 +2089,13 @@ gText_ApprenticeWhichMove13:: @ 82C0D0B
 	.string "{STR_VAR_2} and {STR_VAR_3} for\l"
 	.string "my {STR_VAR_1}, which would it be?$"
 
-gText_ApprenticeMoveThanks13:: @ 82C0DFE
+gText_ApprenticeMoveThanks13::
 	.string "Hm, {STR_VAR_1}, all right. Cough!\n"
 	.string "I'll go teach it when I get better.\p"
 	.string "I hope I can keep hitting you up\n"
 	.string "for help like this.$"
 
-gText_ApprenticeWhichMove14:: @ 82C0E71
+gText_ApprenticeWhichMove14::
 	.string "Er… Um…\n"
 	.string "{PLAYER}{KUN}…?\p"
 	.string "Please, don't look at me that way.\n"
@@ -2108,7 +2108,7 @@ gText_ApprenticeWhichMove14:: @ 82C0E71
 	.string "If the choices were {STR_VAR_2} or\l"
 	.string "{STR_VAR_3}, which would be better?$"
 
-gText_ApprenticeMoveThanks14:: @ 82C0F6D
+gText_ApprenticeMoveThanks14::
 	.string "Oh… Okay!\n"
 	.string "I'll try that {STR_VAR_1}.\p"
 	.string "I hope I can teach that move…\n"
@@ -2117,7 +2117,7 @@ gText_ApprenticeMoveThanks14:: @ 82C0F6D
 	.string "If we meet again, I hope you will be\l"
 	.string "as helpful.$"
 
-gText_ApprenticeWhichMove15:: @ 82C1003
+gText_ApprenticeWhichMove15::
 	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really real?\p"
 	.string "Perhaps you're one of those popular\n"
@@ -2130,7 +2130,7 @@ gText_ApprenticeWhichMove15:: @ 82C1003
 	.string "Which move would be better for it to\n"
 	.string "use, {STR_VAR_2} or {STR_VAR_3}?$"
 
-gText_ApprenticeMoveThanks15:: @ 82C1122
+gText_ApprenticeMoveThanks15::
 	.string "{STR_VAR_1}?\n"
 	.string "There's no question about that?\p"
 	.string "I see. If that's the case, that's fine.\n"
@@ -2139,7 +2139,7 @@ gText_ApprenticeMoveThanks15:: @ 82C1122
 	.string "my POKéMON can learn.\p"
 	.string "Let us meet again!$"
 
-gText_ApprenticePickWinSpeech0:: @ 82C11D1
+gText_ApprenticePickWinSpeech0::
 	.string "Oh… {PLAYER}?\n"
 	.string "It is {PLAYER}!\l"
 	.string "Oh! Sniff…sob… Please, listen!\p"
@@ -2151,7 +2151,7 @@ gText_ApprenticePickWinSpeech0:: @ 82C11D1
 	.string "Could you maybe teach me something\l"
 	.string "cool to say when I win so I don't cry?$"
 
-gText_ApprenticeWinSpeechThanks0:: @ 82C12D5
+gText_ApprenticeWinSpeechThanks0::
 	.string "{STR_VAR_1}\p"
 	.string "Awesome! Wicked! Awoooh!\n"
 	.string "It's really cool!\p"
@@ -2164,7 +2164,7 @@ gText_ApprenticeWinSpeechThanks0:: @ 82C12D5
 	.string "{PLAYER}…\n"
 	.string "Next time… We should battle!$"
 
-gText_ApprenticePickWinSpeech1:: @ 82C13AB
+gText_ApprenticePickWinSpeech1::
 	.string "Yay! It's {PLAYER}! Hello!\n"
 	.string "I wanted to ask you something!\p"
 	.string "I want to say something cool when\n"
@@ -2172,7 +2172,7 @@ gText_ApprenticePickWinSpeech1:: @ 82C13AB
 	.string "Do you have a cool saying that\n"
 	.string "you could recommend?$"
 
-gText_ApprenticeWinSpeechThanks1:: @ 82C1444
+gText_ApprenticeWinSpeechThanks1::
 	.string "{STR_VAR_1}\p"
 	.string "Oh, wow! That is so cool!\n"
 	.string "Okay, I'll say that!\p"
@@ -2182,7 +2182,7 @@ gText_ApprenticeWinSpeechThanks1:: @ 82C1444
 	.string "When we meet again, it'll be for\n"
 	.string "a battle!$"
 
-gText_ApprenticePickWinSpeech2:: @ 82C1501
+gText_ApprenticePickWinSpeech2::
 	.string "{PLAYER}, hello!\p"
 	.string "My POKéMON and I are ready for\n"
 	.string "anything, except for one thing.\p"
@@ -2191,7 +2191,7 @@ gText_ApprenticePickWinSpeech2:: @ 82C1501
 	.string "Could you think up something good\n"
 	.string "to say?$"
 
-gText_ApprenticeWinSpeechThanks2:: @ 82C15B6
+gText_ApprenticeWinSpeechThanks2::
 	.string "{STR_VAR_1}\p"
 	.string "…Cool!\n"
 	.string "I will use that!\p"
@@ -2202,7 +2202,7 @@ gText_ApprenticeWinSpeechThanks2:: @ 82C15B6
 	.string "Next time, let's meet at a place\n"
 	.string "of battle!$"
 
-gText_ApprenticePickWinSpeech3:: @ 82C165E
+gText_ApprenticePickWinSpeech3::
 	.string "Hello, {PLAYER}…\n"
 	.string "I'm sorry to bug you, but I'm hopeless…\p"
 	.string "Even when…\n"
@@ -2214,7 +2214,7 @@ gText_ApprenticePickWinSpeech3:: @ 82C165E
 	.string "Please, {PLAYER}, what should I say\n"
 	.string "if I win a battle?$"
 
-gText_ApprenticeWinSpeechThanks3:: @ 82C174F
+gText_ApprenticeWinSpeechThanks3::
 	.string "{STR_VAR_1}\p"
 	.string "That's inspired…\p"
 	.string "Uh… Is it okay for someone like me\n"
@@ -2227,7 +2227,7 @@ gText_ApprenticeWinSpeechThanks3:: @ 82C174F
 	.string "someone like me, but let's meet\l"
 	.string "somewhere again!$"
 
-gText_ApprenticePickWinSpeech4:: @ 82C1862
+gText_ApprenticePickWinSpeech4::
 	.string "Oh, {PLAYER}{KUN}.\n"
 	.string "There's something I want you to hear.\p"
 	.string "I know that I don't always sound\n"
@@ -2240,7 +2240,7 @@ gText_ApprenticePickWinSpeech4:: @ 82C1862
 	.string "But I can't think of anything good!\n"
 	.string "Could you think something up for me?$"
 
-gText_ApprenticeWinSpeechThanks4:: @ 82C19A0
+gText_ApprenticeWinSpeechThanks4::
 	.string "{STR_VAR_1}\p"
 	.string "Not bad!\n"
 	.string "Yup, that's what I'll go with!\p"
@@ -2252,7 +2252,7 @@ gText_ApprenticeWinSpeechThanks4:: @ 82C19A0
 	.string "Next time, we battle, okay?\n"
 	.string "See you!$"
 
-gText_ApprenticePickWinSpeech5:: @ 82C1A76
+gText_ApprenticePickWinSpeech5::
 	.string "Oh, I can't get over how busy I am!\n"
 	.string "Oh, hey, I was looking for you, {PLAYER}{KUN}.\p"
 	.string "Are you well as usual?\n"
@@ -2266,7 +2266,7 @@ gText_ApprenticePickWinSpeech5:: @ 82C1A76
 	.string "underline my coolness when I'm done\l"
 	.string "and walking away? {PLAYER}{KUN}, help me!$"
 
-gText_ApprenticeWinSpeechThanks5:: @ 82C1C16
+gText_ApprenticeWinSpeechThanks5::
 	.string "{STR_VAR_1}\p"
 	.string "Okay, gotcha.\n"
 	.string "I can find time to say that!\p"
@@ -2277,7 +2277,7 @@ gText_ApprenticeWinSpeechThanks5:: @ 82C1C16
 	.string "Thanks for everything, {PLAYER}{KUN}!\n"
 	.string "We have to battle, you and me, one day!$"
 
-gText_ApprenticePickWinSpeech6:: @ 82C1CF5
+gText_ApprenticePickWinSpeech6::
 	.string "I lucked out again!\n"
 	.string "{PLAYER}! Am I glad to see you!\l"
 	.string "Like usual, I need your advice!\p"
@@ -2287,7 +2287,7 @@ gText_ApprenticePickWinSpeech6:: @ 82C1CF5
 	.string "it with a cool flourish, what\l"
 	.string "should I say?$"
 
-gText_ApprenticeWinSpeechThanks6:: @ 82C1DC1
+gText_ApprenticeWinSpeechThanks6::
 	.string "{STR_VAR_1}\p"
 	.string "That… That's fabulous!\n"
 	.string "It's dignified and cool! I claim it!\p"
@@ -2300,7 +2300,7 @@ gText_ApprenticeWinSpeechThanks6:: @ 82C1DC1
 	.string "we battle!\p"
 	.string "Thank you for everything!$"
 
-gText_ApprenticePickWinSpeech7:: @ 82C1EDC
+gText_ApprenticePickWinSpeech7::
 	.string "Oh, {PLAYER}.\n"
 	.string "I'm so glad I met you!\p"
 	.string "I no longer have any concerns with\n"
@@ -2313,7 +2313,7 @@ gText_ApprenticePickWinSpeech7:: @ 82C1EDC
 	.string "Please, what should I say when\n"
 	.string "I win a battle?$"
 
-gText_ApprenticeWinSpeechThanks7:: @ 82C1FEC
+gText_ApprenticeWinSpeechThanks7::
 	.string "{STR_VAR_1}\p"
 	.string "Ah! That saying! It refreshes me\n"
 	.string "and makes me feel reborn!\p"
@@ -2325,7 +2325,7 @@ gText_ApprenticeWinSpeechThanks7:: @ 82C1FEC
 	.string "Perhaps one day…\n"
 	.string "Farewell!$"
 
-gText_ApprenticePickWinSpeech8:: @ 82C20D1
+gText_ApprenticePickWinSpeech8::
 	.string "Eek! I spotted {PLAYER}!\n"
 	.string "I… I'm overjoyed to see you!\p"
 	.string "Oh-oh-oh! There's something I just\n"
@@ -2337,7 +2337,7 @@ gText_ApprenticePickWinSpeech8:: @ 82C20D1
 	.string "So now, {PLAYER}, please, I want you to\n"
 	.string "think up an exit line for when I win!$"
 
-gText_ApprenticeWinSpeechThanks8:: @ 82C21FF
+gText_ApprenticeWinSpeechThanks8::
 	.string "{STR_VAR_1}\p"
 	.string "Waaaaah!\n"
 	.string "I'm going to say that?!\l"
@@ -2351,7 +2351,7 @@ gText_ApprenticeWinSpeechThanks8:: @ 82C21FF
 	.string "I've got to go now, but let's meet\n"
 	.string "in battle one day!$"
 
-gText_ApprenticePickWinSpeech9:: @ 82C231C
+gText_ApprenticePickWinSpeech9::
 	.string "Hola, bueno!\n"
 	.string "{PLAYER}{KUN}!\p"
 	.string "You know, I'm getting the itch to roam\n"
@@ -2362,7 +2362,7 @@ gText_ApprenticePickWinSpeech9:: @ 82C231C
 	.string "be a good boast I could say to my\l"
 	.string "fallen TRAINER opponent?$"
 
-gText_ApprenticeWinSpeechThanks9:: @ 82C2407
+gText_ApprenticeWinSpeechThanks9::
 	.string "{STR_VAR_1}\p"
 	.string "Uh-huh, that's sweet!\n"
 	.string "Si, bueno!\l"
@@ -2372,7 +2372,7 @@ gText_ApprenticeWinSpeechThanks9:: @ 82C2407
 	.string "Give me a battle one day, OK?\n"
 	.string "Adios!$"
 
-gText_ApprenticePickWinSpeech10:: @ 82C24B5
+gText_ApprenticePickWinSpeech10::
 	.string "{PLAYER}{KUN}, there's big trouble!\p"
 	.string "When I win a battle, I brag about it\n"
 	.string "for an hour at least!\p"
@@ -2384,7 +2384,7 @@ gText_ApprenticePickWinSpeech10:: @ 82C24B5
 	.string "I should say after winning a battle,\l"
 	.string "master?$"
 
-gText_ApprenticeWinSpeechThanks10:: @ 82C25B1
+gText_ApprenticeWinSpeechThanks10::
 	.string "{STR_VAR_1}\p"
 	.string "That's what I should say, huh?\n"
 	.string "Then, I'll stay away from that!\p"
@@ -2400,7 +2400,7 @@ gText_ApprenticeWinSpeechThanks10:: @ 82C25B1
 	.string "That's all!\n"
 	.string "Farewell, my master!$"
 
-gText_ApprenticePickWinSpeech11:: @ 82C2707
+gText_ApprenticePickWinSpeech11::
 	.string "A-H-O-Y!\n"
 	.string "And that spells ahoy!\p"
 	.string "The rappin' SAILOR am I!\n"
@@ -2411,7 +2411,7 @@ gText_ApprenticePickWinSpeech11:: @ 82C2707
 	.string "If I win a match, what can I say\n"
 	.string "in a real cool way?$"
 
-gText_ApprenticeWinSpeechThanks11:: @ 82C27D4
+gText_ApprenticeWinSpeechThanks11::
 	.string "{STR_VAR_1}\p"
 	.string "Perfect! That's what I'll use.\n"
 	.string "I was right to make you choose!\p"
@@ -2423,7 +2423,7 @@ gText_ApprenticeWinSpeechThanks11:: @ 82C27D4
 	.string "And that spells bon voyage,\l"
 	.string "to you this is my homage!$"
 
-gText_ApprenticePickWinSpeech12:: @ 82C28D6
+gText_ApprenticePickWinSpeech12::
 	.string "Oh, yeah, {PLAYER}!\n"
 	.string "I found you again today!\p"
 	.string "What should I do? Ask you again?\n"
@@ -2437,7 +2437,7 @@ gText_ApprenticePickWinSpeech12:: @ 82C28D6
 	.string "a battle ends well.\p"
 	.string "Come on, I wanna hear you say it!$"
 
-gText_ApprenticeWinSpeechThanks12:: @ 82C2A0B
+gText_ApprenticeWinSpeechThanks12::
 	.string "{STR_VAR_1}\p"
 	.string "All right, all right!\n"
 	.string "I'll use that because it's so tight!\p"
@@ -2451,7 +2451,7 @@ gText_ApprenticeWinSpeechThanks12:: @ 82C2A0B
 	.string "Take care, {PLAYER}!\n"
 	.string "Love ya!$"
 
-gText_ApprenticePickWinSpeech13:: @ 82C2B50
+gText_ApprenticePickWinSpeech13::
 	.string "{PLAYER}{KUN}, I'm finished…\n"
 	.string "My nose won't stop dripping…\p"
 	.string "I was trying to think up something\n"
@@ -2463,7 +2463,7 @@ gText_ApprenticePickWinSpeech13:: @ 82C2B50
 	.string "When I win a battle,\n"
 	.string "what should I say?$"
 
-gText_ApprenticeWinSpeechThanks13:: @ 82C2C77
+gText_ApprenticeWinSpeechThanks13::
 	.string "{STR_VAR_1}\p"
 	.string "… … …That's good.\n"
 	.string "No, it's awe inspiring!\l"
@@ -2475,7 +2475,7 @@ gText_ApprenticeWinSpeechThanks13:: @ 82C2C77
 	.string "From now on, we're rivals!\n"
 	.string "Thanks for everything!$"
 
-gText_ApprenticePickWinSpeech14:: @ 82C2D67
+gText_ApprenticePickWinSpeech14::
 	.string "Er… Um…\n"
 	.string "{PLAYER}{KUN}…\p"
 	.string "Please, don't look at me that way.\n"
@@ -2486,7 +2486,7 @@ gText_ApprenticePickWinSpeech14:: @ 82C2D67
 	.string "but what if I win a battle?\l"
 	.string "What should I say?$"
 
-gText_ApprenticeWinSpeechThanks14:: @ 82C2E41
+gText_ApprenticeWinSpeechThanks14::
 	.string "{STR_VAR_1}\p"
 	.string "Oh… Okay!\n"
 	.string "I'll try to say that!\l"
@@ -2496,7 +2496,7 @@ gText_ApprenticeWinSpeechThanks14:: @ 82C2E41
 	.string "I'll obey all that you've taught me,\n"
 	.string "{PLAYER}{KUN}, and do the best I can.$"
 
-gText_ApprenticePickWinSpeech15:: @ 82C2EF5
+gText_ApprenticePickWinSpeech15::
 	.string "Hm? You appear to be {PLAYER}{KUN}…\n"
 	.string "But are you really?\l"
 	.string "Perhaps a clever {PLAYER} DOLL?\p"
@@ -2509,7 +2509,7 @@ gText_ApprenticePickWinSpeech15:: @ 82C2EF5
 	.string "More precisely, what should I say\n"
 	.string "if I win a battle?$"
 
-gText_ApprenticeWinSpeechThanks15:: @ 82C3023
+gText_ApprenticeWinSpeechThanks15::
 	.string "{STR_VAR_1}\p"
 	.string "… … … … … …\n"
 	.string "When I win a match…\p"
diff --git a/data/text/battle_tent.inc b/data/text/battle_tent.inc
index 98aa689ce..511ae8724 100644
--- a/data/text/battle_tent.inc
+++ b/data/text/battle_tent.inc
@@ -1,17 +1,17 @@
-FallarborTown_BattleTentLobby_Text_WelcomeToBattleTent: @ 82C47EB
+FallarborTown_BattleTentLobby_Text_WelcomeToBattleTent:
 	.string "I welcome you to the BATTLE TENT\n"
 	.string "FALLARBOR SITE!\p"
 	.string "I am your guide to the Set KO Tourney!$"
 
-FallarborTown_BattleTentLobby_Text_TakeChallenge: @ 82C4843
+FallarborTown_BattleTentLobby_Text_TakeChallenge:
 	.string "Now, do you wish to take the challenge\n"
 	.string "of a Set KO Tourney?$"
 
-FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge: @ 82C487F
+FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge:
 	.string "We await your challenge on\n"
 	.string "another occasion!$"
 
-FallarborTown_BattleTentLobby_Text_ExplainFallarborTent: @ 82C48AC
+FallarborTown_BattleTentLobby_Text_ExplainFallarborTent:
 	.string "In the FALLARBOR BATTLE TENT,\n"
 	.string "we undertake the Set KO Tourney.\p"
 	.string "All participants enter with a team of\n"
@@ -32,21 +32,21 @@ FallarborTown_BattleTentLobby_Text_ExplainFallarborTent: @ 82C48AC
 	.string "three TRAINERS in succession,\l"
 	.string "we will present you with a fine prize.$"
 
-FallarborTown_BattleTentLobby_Text_SaveBeforeChallenge: @ 82C4B35
+FallarborTown_BattleTentLobby_Text_SaveBeforeChallenge:
 	.string "Before showing you to the BATTLE\n"
 	.string "TENT, I must save. Is that okay?$"
 
 @ Unused
-FallarborTown_BattleTentLobby_Text_WhichLevelMode: @ 82C4B77
+FallarborTown_BattleTentLobby_Text_WhichLevelMode:
 	.string "We offer two levels of challenge,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which is your choice?$"
 
-FallarborTown_BattleTentLobby_Text_SelectThreeMons: @ 82C4BC8
+FallarborTown_BattleTentLobby_Text_SelectThreeMons:
 	.string "Very well, now select your\n"
 	.string "three POKéMON, please.$"
 
-FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLv50: @ 82C4BFA
+FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLv50:
 	.string "My dear challenger!\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for entry.\p"
@@ -56,7 +56,7 @@ FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLv50: @ 82C4BFA
 	.string "When you have made your preparations,\n"
 	.string "please do return.$"
 
-FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen: @ 82C4CC0
+FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "My dear challenger!\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for entry.\p"
@@ -68,11 +68,11 @@ FallarborTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen: @ 82C4CC0
 	.string "When you have made your preparations,\n"
 	.string "please do return.$"
 
-FallarborTown_BattleTentLobby_Text_GuideYouToBattleTent: @ 82C4DC3
+FallarborTown_BattleTentLobby_Text_GuideYouToBattleTent:
 	.string "I shall now guide you to\n"
 	.string "the BATTLE TENT.$"
 
-FallarborTown_BattleTentLobby_Text_DidntSaveBeforeQuitting: @ 82C4DED
+FallarborTown_BattleTentLobby_Text_DidntSaveBeforeQuitting:
 	.string "My dear challenger!\p"
 	.string "You did not save the game before\n"
 	.string "shutting down, did you?\p"
@@ -82,52 +82,52 @@ FallarborTown_BattleTentLobby_Text_DidntSaveBeforeQuitting: @ 82C4DED
 	.string "You may, of course, start with a fresh\n"
 	.string "challenge.$"
 
-FallarborTown_BattleTentLobby_Text_BeatThreeTrainers: @ 82C4EC3
+FallarborTown_BattleTentLobby_Text_BeatThreeTrainers:
 	.string "How splendid! You have beaten\n"
 	.string "three TRAINERS in succession!$"
 
-FallarborTown_BattleTentLobby_Text_WaitWhileSaveGame: @ 82C4EFF
+FallarborTown_BattleTentLobby_Text_WaitWhileSaveGame:
 	.string "Please wait while I save the game.$"
 
-FallarborTown_BattleTentLobby_Text_PresentYouWithPrize: @ 82C4F22
+FallarborTown_BattleTentLobby_Text_PresentYouWithPrize:
 	.string "In commemoration of your 3-win streak,\n"
 	.string "we present you with this prize.$"
 
-FallarborTown_BattleTentLobby_Text_ReceivedPrize: @ 82C4F69
+FallarborTown_BattleTentLobby_Text_ReceivedPrize:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-FallarborTown_BattleTentLobby_Text_BagFullReturnForPrize: @ 82C4F83
+FallarborTown_BattleTentLobby_Text_BagFullReturnForPrize:
 	.string "Oh?\n"
 	.string "Your BAG seems to be full.\p"
 	.string "I urge you to clear space and\n"
 	.string "return for your prize.$"
 
-FallarborTown_BattleTentLobby_Text_ThankYouWaitWhileSaving: @ 82C4FD7
+FallarborTown_BattleTentLobby_Text_ThankYouWaitWhileSaving:
 	.string "Thank you so much for participating!\p"
 	.string "Please wait while I save the game.$"
 
-FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2: @ 82C501F
+FallarborTown_BattleTentLobby_Text_AwaitAnotherChallenge2:
 	.string "We await your challenge on\n"
 	.string "another occasion!$"
 
-FallarborTown_BattleTentLobby_Text_LookingForwardToArrival: @ 82C504C
+FallarborTown_BattleTentLobby_Text_LookingForwardToArrival:
 	.string "We have been looking forward to\n"
 	.string "your arrival.\p"
 	.string "Before I show you to the BATTLE TENT,\n"
 	.string "I must save the game. Please wait.$"
 
-VerdanturfTown_BattleTentLobby_Text_WelcomeToBattleTent: @ 82C50C3
+VerdanturfTown_BattleTentLobby_Text_WelcomeToBattleTent:
 	.string "I welcome you to the BATTLE TENT\n"
 	.string "VERDANTURF SITE!\p"
 	.string "Here, the TRAINER's trust toward\n"
 	.string "POKéMON is tested.$"
 
-VerdanturfTown_BattleTentLobby_Text_TakeChallenge: @ 82C5129
+VerdanturfTown_BattleTentLobby_Text_TakeChallenge:
 	.string "Do you wish to take the VERDANTURF\n"
 	.string "BATTLE TENT challenge?$"
 
-VerdanturfTown_BattleTentLobby_Text_ExplainVerdanturfTent: @ 82C5163
+VerdanturfTown_BattleTentLobby_Text_ExplainVerdanturfTent:
 	.string "In the VERDANTURF BATTLE TENT,\n"
 	.string "there is one crucial rule that must\l"
 	.string "be obeyed.\p"
@@ -147,17 +147,17 @@ VerdanturfTown_BattleTentLobby_Text_ExplainVerdanturfTent: @ 82C5163
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-VerdanturfTown_BattleTentLobby_Text_ReturnFortified: @ 82C539A
+VerdanturfTown_BattleTentLobby_Text_ReturnFortified:
 	.string "When you have fortified your heart\n"
 	.string "and POKéMON, you must return.$"
 
 @ Unused
-VerdanturfTown_BattleTentLobby_Text_WhichLevelMode: @ 82C53DB
+VerdanturfTown_BattleTentLobby_Text_WhichLevelMode:
 	.string "There are two levels of difficulty,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which is your choice of a challenge?$"
 
-VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLv50: @ 82C543D
+VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLv50:
 	.string "Sigh…\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for the challenge.\p"
@@ -169,7 +169,7 @@ VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLv50: @ 82C543D
 	.string "Come back when you have made\n"
 	.string "your preparations.$"
 
-VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen: @ 82C5538
+VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "Sigh…\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for the challenge.\p"
@@ -181,48 +181,48 @@ VerdanturfTown_BattleTentLobby_Text_NotEnoughValidMonsLvOpen: @ 82C5538
 	.string "Come back when you have made\n"
 	.string "your preparations.$"
 
-VerdanturfTown_BattleTentLobby_Text_SelectThreeMons: @ 82C5633
+VerdanturfTown_BattleTentLobby_Text_SelectThreeMons:
 	.string "Good. Now, you must select your\n"
 	.string "three POKéMON.$"
 
-VerdanturfTown_BattleTentLobby_Text_SaveBeforeChallenge: @ 82C5662
+VerdanturfTown_BattleTentLobby_Text_SaveBeforeChallenge:
 	.string "I must save before I show you to\n"
 	.string "the BATTLE TENT. Is that okay?$"
 
-VerdanturfTown_BattleTentLobby_Text_NowFollowMe: @ 82C56A2
+VerdanturfTown_BattleTentLobby_Text_NowFollowMe:
 	.string "Good.\n"
 	.string "Now, follow me.$"
 
-VerdanturfTown_BattleTentLobby_Text_ResultsWillBeRecorded: @ 82C56B8
+VerdanturfTown_BattleTentLobby_Text_ResultsWillBeRecorded:
 	.string "I feel privileged for having seen\n"
 	.string "your POKéMON's exploits.\p"
 	.string "The results will be recorded.\n"
 	.string "I must ask you to briefly wait.$"
 
-VerdanturfTown_BattleTentLobby_Text_AchievedThreeWinStreak: @ 82C5731
+VerdanturfTown_BattleTentLobby_Text_AchievedThreeWinStreak:
 	.string "To achieve a 3-win streak…\p"
 	.string "The bonds that bind your heart with\n"
 	.string "your POKéMON seem firm and true.$"
 
-VerdanturfTown_BattleTentLobby_Text_FeatWillBeRecorded: @ 82C5791
+VerdanturfTown_BattleTentLobby_Text_FeatWillBeRecorded:
 	.string "Your feat will be recorded.\n"
 	.string "I must ask you to briefly wait.$"
 
-VerdanturfTown_BattleTentLobby_Text_PresentYouWithPrize: @ 82C57CD
+VerdanturfTown_BattleTentLobby_Text_PresentYouWithPrize:
 	.string "For the feat of your 3-win streak,\n"
 	.string "we present you with this prize.$"
 
-SlateportCity_BattleTentLobby_Text_WelcomeToBattleTent: @ 82C5810
+SlateportCity_BattleTentLobby_Text_WelcomeToBattleTent:
 	.string "Welcome to the BATTLE TENT\n"
 	.string "SLATEPORT SITE!\p"
 	.string "I am your guide to the Battle Swap\n"
 	.string "Tournament.$"
 
-SlateportCity_BattleTentLobby_Text_TakeChallenge: @ 82C586A
+SlateportCity_BattleTentLobby_Text_TakeChallenge:
 	.string "Would you like to take the Battle\n"
 	.string "Swap challenge?$"
 
-SlateportCity_BattleTentLobby_Text_ExplainSlateportTent: @ 82C589C
+SlateportCity_BattleTentLobby_Text_ExplainSlateportTent:
 	.string "Here at the SLATEPORT BATTLE TENT,\n"
 	.string "we hold Battle Swap events\l"
 	.string "using rental POKéMON.\p"
@@ -240,27 +240,27 @@ SlateportCity_BattleTentLobby_Text_ExplainSlateportTent: @ 82C589C
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-SlateportCity_BattleTentLobby_Text_LookForwardToNextVisit: @ 82C5AA5
+SlateportCity_BattleTentLobby_Text_LookForwardToNextVisit:
 	.string "We look forward to your next visit.$"
 
 @ Unused
-SlateportCity_BattleTentLobby_Text_WhichLevelMode: @ 82C5AC9
+SlateportCity_BattleTentLobby_Text_WhichLevelMode:
 	.string "Which level do you wish to challenge?\n"
 	.string "Level 50 or Level 100?$"
 
-SlateportCity_BattleTentLobby_Text_SaveBeforeChallenge: @ 82C5B06
+SlateportCity_BattleTentLobby_Text_SaveBeforeChallenge:
 	.string "Before you begin your challenge,\n"
 	.string "I need to save data. Is that okay?$"
 
 @ Unused
-SlateportCity_BattleTentLobby_Text_HoldMonsForSafekeeping: @ 82C5B4A
+SlateportCity_BattleTentLobby_Text_HoldMonsForSafekeeping:
 	.string "Okay, I will hold your POKéMON for\n"
 	.string "safekeeping while you compete.$"
 
-SlateportCity_BattleTentLobby_Text_StepThisWay: @ 82C5B8C
+SlateportCity_BattleTentLobby_Text_StepThisWay:
 	.string "Please step this way.$"
 
-SlateportCity_BattleTentLobby_Text_ReturnRentalMonsSaveResults: @ 82C5BA2
+SlateportCity_BattleTentLobby_Text_ReturnRentalMonsSaveResults:
 	.string "Thank you for participating!\p"
 	.string "I will return your POKéMON in exchange\n"
 	.string "for our rental POKéMON.\p"
@@ -268,11 +268,11 @@ SlateportCity_BattleTentLobby_Text_ReturnRentalMonsSaveResults: @ 82C5BA2
 	.string "Please wait.$"
 
 @ Unused
-SlateportCity_BattleTentLobby_Text_ReturnMonsExchangeRentals: @ 82C5C30
+SlateportCity_BattleTentLobby_Text_ReturnMonsExchangeRentals:
 	.string "I will return your POKéMON in exchange\n"
 	.string "for our rental POKéMON.$"
 
-SlateportCity_BattleTentLobby_Text_WonThreeMatchesReturnMons: @ 82C5C6F
+SlateportCity_BattleTentLobby_Text_WonThreeMatchesReturnMons:
 	.string "Congratulations!\n"
 	.string "You've won three straight matches!\p"
 	.string "I will return your POKéMON in exchange\n"
@@ -280,65 +280,65 @@ SlateportCity_BattleTentLobby_Text_WonThreeMatchesReturnMons: @ 82C5C6F
 	.string "I must also save your event results.\n"
 	.string "Please wait.$"
 
-SlateportCity_BattleTentLobby_Text_AwardYouThisPrize: @ 82C5D14
+SlateportCity_BattleTentLobby_Text_AwardYouThisPrize:
 	.string "In recognition of your 3-win streak,\n"
 	.string "we award you this prize.$"
 
-SlateportCity_BattleTentLobby_Text_NoRoomInBagMakeRoom: @ 82C5D52
+SlateportCity_BattleTentLobby_Text_NoRoomInBagMakeRoom:
 	.string "Oh?\n"
 	.string "You seem to have no room for this.\p"
 	.string "Please make room in your BAG and\n"
 	.string "let me know.$"
 
-SlateportCity_BattleTentLobby_Text_BeenWaitingForYou: @ 82C5DA7
+SlateportCity_BattleTentLobby_Text_BeenWaitingForYou:
 	.string "We've been waiting for you!\p"
 	.string "Before we resume your challenge,\n"
 	.string "I must save the game.$"
 
-SlateportCity_BattleTentLobby_Text_DidntSaveBeforeQuitting: @ 82C5DFA
+SlateportCity_BattleTentLobby_Text_DidntSaveBeforeQuitting:
 	.string "I'm sorry to say this, but you didn't\n"
 	.string "save before you quit playing last time.\p"
 	.string "As a result, you have been disqualified\n"
 	.string "from your challenge.$"
 
 @ Unused
-SlateportCity_BattleTentLobby_Text_ReturnPersonalMons: @ 82C5E85
+SlateportCity_BattleTentLobby_Text_ReturnPersonalMons:
 	.string "We'll return your personal POKéMON.$"
 
 @ Unused
-SlateportCity_BattleTentLobby_Text_ReceivedPrize: @ 82C5EA9
+SlateportCity_BattleTentLobby_Text_ReceivedPrize:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
 @ Unused
-SlateportCity_BattleTentLobby_Text_RulesAreListed: @ 82C5EC3
+SlateportCity_BattleTentLobby_Text_RulesAreListed:
 	.string "The Battle Swap rules are listed.$"
 
 @ Unused
-SlateportCity_BattleTentLobby_Text_ReadWhichHeading: @ 82C5EE5
+SlateportCity_BattleTentLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-SlateportCity_BattleTentLobby_Text_ExplainBasicRules: @ 82C5F08
+SlateportCity_BattleTentLobby_Text_ExplainBasicRules:
 	.string "In a Battle Swap event, you may use\n"
 	.string "only three POKéMON.\p"
 	.string "Whether you are renting or swapping,\n"
 	.string "your team may not have two or more\l"
 	.string "of the same POKéMON.$"
 
-SlateportCity_BattleTentLobby_Text_ExplainSwapPartnerRules: @ 82C5F9D
+SlateportCity_BattleTentLobby_Text_ExplainSwapPartnerRules:
 	.string "You may swap POKéMON only with\n"
 	.string "the TRAINER you have just defeated.\p"
 	.string "You may swap for only those POKéMON\n"
 	.string "used by the beaten TRAINER.$"
 
-SlateportCity_BattleTentLobby_Text_ExplainSwapNumberRules: @ 82C6020
+SlateportCity_BattleTentLobby_Text_ExplainSwapNumberRules:
 	.string "After every battle you win, you may\n"
 	.string "swap for one of your defeated\l"
 	.string "opponent's POKéMON.\p"
 	.string "You will not be able to swap POKéMON\n"
 	.string "with the third TRAINER in the event.$"
 
-SlateportCity_BattleTentLobby_Text_ExplainSwapNotes: @ 82C60C0
+SlateportCity_BattleTentLobby_Text_ExplainSwapNotes:
 	.string "There are two key points to be aware\n"
 	.string "of when swapping POKéMON.\p"
 	.string "First, when swapping, you can't check\n"
@@ -350,23 +350,23 @@ SlateportCity_BattleTentLobby_Text_ExplainSwapNotes: @ 82C60C0
 	.string "This sequence remains unchanged\n"
 	.string "even when swaps are made.$"
 
-SlateportCity_BattleTentLobby_Text_ExplainMonRules: @ 82C61FE
+SlateportCity_BattleTentLobby_Text_ExplainMonRules:
 	.string "The POKéMON of the SLATEPORT\n"
 	.string "BATTLE TENT are all rentals.\p"
 	.string "All rental POKéMON are kept at\n"
 	.string "Level 30.$"
 
 @ Unused
-VerdanturfTown_BattleTentLobby_Text_RulesAreListed2: @ 82C6261
+VerdanturfTown_BattleTentLobby_Text_RulesAreListed2:
 	.string "The VERDANTURF BATTLE TENT\n"
 	.string "rules are listed.$"
 
 @ Unused
-VerdanturfTown_BattleTentLobby_Text_ReadWhichHeading: @ 82C628E
+VerdanturfTown_BattleTentLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
 @ Unused
-VerdanturfTown_BattleTentLobby_Text_ExplainBasicRules: @ 82C62B1
+VerdanturfTown_BattleTentLobby_Text_ExplainBasicRules:
 	.string "Here at the VERDANTURF BATTLE TENT,\n"
 	.string "POKéMON are required to think and\l"
 	.string "battle by themselves.\p"
@@ -375,7 +375,7 @@ VerdanturfTown_BattleTentLobby_Text_ExplainBasicRules: @ 82C62B1
 	.string "depending on their nature.$"
 
 @ Unused
-VerdanturfTown_BattleTentLobby_Text_ExplainNatureRules: @ 82C636D
+VerdanturfTown_BattleTentLobby_Text_ExplainNatureRules:
 	.string "Depending on its nature, a POKéMON\n"
 	.string "may prefer to attack no matter what.\p"
 	.string "Another POKéMON may prefer to protect\n"
@@ -389,7 +389,7 @@ VerdanturfTown_BattleTentLobby_Text_ExplainNatureRules: @ 82C636D
 	.string "it has trouble using.$"
 
 @ Unused
-VerdanturfTown_BattleTentLobby_Text_ExplainMoveRules: @ 82C64BA
+VerdanturfTown_BattleTentLobby_Text_ExplainMoveRules:
 	.string "There are offensive moves that inflict\n"
 	.string "direct damage on the foe.\p"
 	.string "There are defensive moves that are\n"
@@ -403,7 +403,7 @@ VerdanturfTown_BattleTentLobby_Text_ExplainMoveRules: @ 82C64BA
 	.string "these three categories.$"
 
 @ Unused
-VerdanturfTown_BattleTentLobby_Text_ExplainUnderpoweredRules: @ 82C6612
+VerdanturfTown_BattleTentLobby_Text_ExplainUnderpoweredRules:
 	.string "When not under command by its TRAINER,\n"
 	.string "a POKéMON may be unable to effectively\l"
 	.string "use certain moves.\p"
@@ -414,20 +414,20 @@ VerdanturfTown_BattleTentLobby_Text_ExplainUnderpoweredRules: @ 82C6612
 	.string "be unable to live up to its potential.$"
 
 @ Unused
-VerdanturfTown_BattleTentLobby_Text_ExplainWhenInDangerRules: @ 82C671E
+VerdanturfTown_BattleTentLobby_Text_ExplainWhenInDangerRules:
 	.string "Depending on its nature, a POKéMON may\n"
 	.string "start using moves that don't match its\l"
 	.string "nature when it is in trouble.\p"
 	.string "If a POKéMON begins behaving oddly\n"
 	.string "in a pinch, watch it carefully.$"
 
-BattleTentLobby_Text_ExplainLevelRules: @ 82C67CD
+BattleTentLobby_Text_ExplainLevelRules:
 	.string "At this BATTLE TENT, the levels of\n"
 	.string "your opponents will be adjusted to\l"
 	.string "match the levels of your POKéMON.\p"
 	.string "However, no TRAINER you face will\n"
 	.string "have any POKéMON below Level 30.$"
 
-VerdanturfTown_BattleTentLobby_Text_RulesAreListed: @ 82C6878
+VerdanturfTown_BattleTentLobby_Text_RulesAreListed:
 	.string "The VERDANTURF BATTLE TENT\n"
 	.string "rules are listed.$"
diff --git a/data/text/berries.inc b/data/text/berries.inc
index 152690e20..af4f0adbc 100644
--- a/data/text/berries.inc
+++ b/data/text/berries.inc
@@ -1,16 +1,16 @@
-PetalburgCity_Gym_Text_GiveEnigmaBerry: @ 82A6D3D
+PetalburgCity_Gym_Text_GiveEnigmaBerry:
 	.string "DAD: Hi, {PLAYER}!\p"
 	.string "I just received a very rare BERRY.\n"
 	.string "I'd like you to have it.$"
 
-Route104_Text_PlantBerriesInSoilTakeThis: @ 82A6D86
+Route104_Text_PlantBerriesInSoilTakeThis:
 	.string "If you see BERRIES growing in loamy\n"
 	.string "soil, feel free to take them.\p"
 	.string "But make sure you plant a BERRY in the\n"
 	.string "same spot. That's common courtesy.\p"
 	.string "Here, I'll share this with you.$"
 
-Route104_Text_TrainersOftenMakeMonHoldBerries: @ 82A6E32
+Route104_Text_TrainersOftenMakeMonHoldBerries:
 	.string "The way you look, you must be a\n"
 	.string "TRAINER, no?\p"
 	.string "TRAINERS often make POKéMON hold\n"
@@ -18,139 +18,139 @@ Route104_Text_TrainersOftenMakeMonHoldBerries: @ 82A6E32
 	.string "It's up to you whether to grow BERRIES\n"
 	.string "or use them.$"
 
-Route111_Text_WateredPlantsEveryDayTakeBerry: @ 82A6EBD
+Route111_Text_WateredPlantsEveryDayTakeBerry:
 	.string "I watered the plants every day.\n"
 	.string "They grew lots of flowers.\p"
 	.string "And they gave me lots of BERRIES, too.\p"
 	.string "Here you go!\n"
 	.string "You can have it!$"
 
-Route111_Text_GoingToTryToMakeDifferentColorBerries: @ 82A6F3D
+Route111_Text_GoingToTryToMakeDifferentColorBerries:
 	.string "I'm going to try really hard and make\n"
 	.string "BERRIES in different colors.\p"
 	.string "I hope you try hard, too!$"
 
-Route111_Text_WhatColorBerriesToLookForToday: @ 82A6F9A
+Route111_Text_WhatColorBerriesToLookForToday:
 	.string "I wonder what color BERRIES I'll look\n"
 	.string "for today?$"
 
-Route114_Text_LoveUsingBerryCrushShareBerry: @ 82A6FCB
+Route114_Text_LoveUsingBerryCrushShareBerry:
 	.string "I love using the BERRY CRUSH machine,\n"
 	.string "so I'm collecting BERRIES.\p"
 	.string "I'll share one with you, if you'd like.$"
 
-Route114_Text_TryBerryCrushWithFriends: @ 82A7034
+Route114_Text_TryBerryCrushWithFriends:
 	.string "You should try the BERRY CRUSH\n"
 	.string "machine with your friends.$"
 
-Route114_Text_FunToThinkAboutBerries: @ 82A706E
+Route114_Text_FunToThinkAboutBerries:
 	.string "Which BERRY should be planted?\n"
 	.string "Should you use or hoard BERRIES?\p"
 	.string "It's fun to think about.$"
 
-Route120_Text_BerriesExpressionOfLoveIsntIt: @ 82A70C7
+Route120_Text_BerriesExpressionOfLoveIsntIt:
 	.string "BERRIES grow by soaking up sunlight.\p"
 	.string "We help the BERRIES grow by watering\n"
 	.string "them regularly.\p"
 	.string "It's an expression of love, isn't it?$"
 
-Route120_Text_YesYouUnderstand: @ 82A7147
+Route120_Text_YesYouUnderstand:
 	.string "Yes, yes.\n"
 	.string "You understand what I mean.\p"
 	.string "You should take this.$"
 
-Route120_Text_MakeYourOwnImpressions: @ 82A7183
+Route120_Text_MakeYourOwnImpressions:
 	.string "Oh… But it is important to make your\n"
 	.string "own impressions, I guess…\p"
 	.string "You can have this.$"
 
-Route120_Text_BerryIsRareRaiseItWithCare: @ 82A71D5
+Route120_Text_BerryIsRareRaiseItWithCare:
 	.string "I think that BERRY is rare.\n"
 	.string "I hope you raise it with loving care.$"
 
-Route120_Text_IllGetMoreBerriesFromBerryMaster: @ 82A7217
+Route120_Text_IllGetMoreBerriesFromBerryMaster:
 	.string "I'll get more BERRIES from\n"
 	.string "the BERRY MASTER.$"
 
-LilycoveCity_Text_BerrySuitsYou: @ 82A7244
+LilycoveCity_Text_BerrySuitsYou:
 	.string "When it gets right down to it…\p"
 	.string "The same way suits suit me perfectly,\n"
 	.string "a crisp breeze suits the sea.\p"
 	.string "And you, a BERRY suits you to a “T”…\p"
 	.string "Why should that be so?$"
 
-LilycoveCity_Text_BecauseYoureTrainer: @ 82A72E3
+LilycoveCity_Text_BecauseYoureTrainer:
 	.string "When it gets right down to it…\p"
 	.string "It's because you're a TRAINER!$"
 
-LilycoveCity_Text_PokeblocksSuitPokemon: @ 82A7321
+LilycoveCity_Text_PokeblocksSuitPokemon:
 	.string "When it gets right down to it…\p"
 	.string "The way dignified simplicity suits me,\n"
 	.string "{POKEBLOCK}S perfectly suit POKéMON.$"
 
-Route123_BerryMastersHouse_Text_YoureDeservingOfBerry: @ 82A7386
+Route123_BerryMastersHouse_Text_YoureDeservingOfBerry:
 	.string "You may call me the BERRY MASTER.\p"
 	.string "I dream of filling the world with\n"
 	.string "beautiful flowers, so I raise BERRIES\l"
 	.string "and hand them out to everyone.\p"
 	.string "You're deserving of one!$"
 
-Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother: @ 82A7428
+Route123_BerryMastersHouse_Text_WhyBeStingyTakeAnother:
 	.string "Why be stingy?\n"
 	.string "Take another!$"
 
-Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop: @ 82A7445
+Route123_BerryMastersHouse_Text_VisitPrettyPetalFlowerShop:
 	.string "Be sure to visit the PRETTY PETAL\n"
 	.string "flower shop near RUSTBORO.\p"
 	.string "Let flowers fill the world!$"
 
-Route123_BerryMastersHouse_Text_DoneForToday: @ 82A749E
+Route123_BerryMastersHouse_Text_DoneForToday:
 	.string "I'm done for today.\n"
 	.string "Come again another day.\p"
 	.string "Let flowers fill the world!$"
 
-Route123_BerryMastersHouse_Text_HeardAGoodSayingLately: @ 82A74E6
+Route123_BerryMastersHouse_Text_HeardAGoodSayingLately:
 	.string "The way my husband grows BERRIES,\n"
 	.string "oh, he's the best in the world.\p"
 	.string "He makes me proud, that he does.\p"
 	.string "Incidentally, child, have you heard\n"
 	.string "a good saying lately?$"
 
-Route123_BerryMastersHouse_Text_InspirationalTakeThis: @ 82A7583
+Route123_BerryMastersHouse_Text_InspirationalTakeThis:
 	.string "Ah! What a remarkable saying!\n"
 	.string "Inspirational, it is!\p"
 	.string "I want you to have this.$"
 
-Route123_BerryMastersHouse_Text_GoodSayingTakeThis: @ 82A75D0
+Route123_BerryMastersHouse_Text_GoodSayingTakeThis:
 	.string "Oh! A good saying it is.\n"
 	.string "You're quite remarkable.\p"
 	.string "I want you to have this.$"
 
-Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife: @ 82A761B
+Route123_BerryMastersHouse_Text_JoyNeverGoesOutOfMyLife:
 	.string "Our four grandchildren should become\n"
 	.string "more accomplished than my husband.\p"
 	.string "Joy never goes out of my life!$"
 
-Route123_BerryMastersHouse_Text_Ah: @ 82A7682
+Route123_BerryMastersHouse_Text_Ah:
 	.string "Ah…$"
 
-Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop: @ 82A7686
+Route104_PrettyPetalFlowerShop_Text_ThisIsPrettyPetalFlowerShop:
 	.string "Hello!\p"
 	.string "This is the PRETTY PETAL flower shop.\n"
 	.string "Spreading flowers all over the world!$"
 
-Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries: @ 82A76D9
+Route104_PrettyPetalFlowerShop_Text_LearnAboutBerries:
 	.string "{PLAYER}{KUN}, would you like to learn about\n"
 	.string "BERRIES?$"
 
-Route104_PrettyPetalFlowerShop_Text_IntroLearnAboutBerries: @ 82A7706
+Route104_PrettyPetalFlowerShop_Text_IntroLearnAboutBerries:
 	.string "Your name is?\p"
 	.string "{PLAYER}{KUN}.\n"
 	.string "That's a nice name.\p"
 	.string "{PLAYER}{KUN}, would you like to learn about\n"
 	.string "BERRIES?$"
 
-Route104_PrettyPetalFlowerShop_Text_BerriesExplanation: @ 82A775B
+Route104_PrettyPetalFlowerShop_Text_BerriesExplanation:
 	.string "BERRIES grow on trees that thrive\n"
 	.string "only in soft, loamy soil.\p"
 	.string "If you take some BERRIES, be sure to\n"
@@ -164,18 +164,18 @@ Route104_PrettyPetalFlowerShop_Text_BerriesExplanation: @ 82A775B
 	.string "Please help me, {PLAYER}{KUN}. Plant BERRIES\n"
 	.string "and bring more flowers into the world.$"
 
-Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness: @ 82A78DF
+Route104_PrettyPetalFlowerShop_Text_FlowersBringHappiness:
 	.string "Flowers bring so much happiness to\n"
 	.string "people, don't they?$"
 
-Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis: @ 82A7916
+Route104_PrettyPetalFlowerShop_Text_YouCanHaveThis:
 	.string "Hello!\p"
 	.string "The more attention you give to flowers,\n"
 	.string "the more beautifully they bloom.\p"
 	.string "You'll like tending flowers. I'm sure\n"
 	.string "of it. You can have this.$"
 
-Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation: @ 82A79A6
+Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation:
 	.string "While BERRY plants are growing,\n"
 	.string "water them with the WAILMER PAIL.\p"
 	.string "Oh, another thing.\p"
@@ -185,13 +185,13 @@ Route104_PrettyPetalFlowerShop_Text_WailmerPailExplanation: @ 82A79A6
 	.string "Isn't that awesome?\n"
 	.string "It's like they have the will to live.$"
 
-Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers: @ 82A7A98
+Route104_PrettyPetalFlowerShop_Text_ImGrowingFlowers:
 	.string "I'm trying to be like my big sisters.\n"
 	.string "I'm growing flowers, too!\p"
 	.string "Here you go!\n"
 	.string "It's for you!$"
 
-Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries: @ 82A7AF3
+Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries:
 	.string "You can plant a BERRY and grow it big,\n"
 	.string "or you can make a POKéMON hold it.\p"
 	.string "But now they have a machine that mixes\n"
@@ -199,7 +199,7 @@ Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries: @ 82A7AF3
 	.string "for POKéMON.\p"
 	.string "I want some candy, too.$"
 
-SootopolisCity_Text_NameIsKiriHaveOneOfThese: @ 82A7BB0
+SootopolisCity_Text_NameIsKiriHaveOneOfThese:
 	.string "Hi, what's your name?\p"
 	.string "… … …  … … …  … … …\n"
 	.string "Okay. That's nice!\p"
@@ -209,26 +209,26 @@ SootopolisCity_Text_NameIsKiriHaveOneOfThese: @ 82A7BB0
 	.string "That's what they wished.\p"
 	.string "You can have one of these.$"
 
-SootopolisCity_Text_GiveYouThisBerryToo: @ 82A7C7C
+SootopolisCity_Text_GiveYouThisBerryToo:
 	.string "KIRI will give you this BERRY, too!\n"
 	.string "I really like it lots!$"
 
-SootopolisCity_Text_WhatKindOfWishInYourName: @ 82A7CB7
+SootopolisCity_Text_WhatKindOfWishInYourName:
 	.string "I wonder what kind of wish is included\n"
 	.string "in your name.$"
 
-SootopolisCity_Text_LikeSeasonBornIn: @ 82A7CEC
+SootopolisCity_Text_LikeSeasonBornIn:
 	.string "Spring, summer, autumn, and winter.\p"
 	.string "If you're born in springtime, do you like\n"
 	.string "the spring, and if you're born in the\l"
 	.string "summer, do you like the summer?$"
 
-SootopolisCity_Text_ThenILoveAutumn: @ 82A7D80
+SootopolisCity_Text_ThenILoveAutumn:
 	.string "Then KIRI was born in the autumn,\n"
 	.string "so I love the autumn!\p"
 	.string "Which season do you like?$"
 
-SootopolisCity_Text_OhDoesntMatter: @ 82A7DD2
+SootopolisCity_Text_OhDoesntMatter:
 	.string "Oh…\n"
 	.string "It doesn't matter…\p"
 	.string "There's so much that I want to know…$"
diff --git a/data/text/birch_speech.inc b/data/text/birch_speech.inc
index abdbc89ef..7a9ea6a61 100644
--- a/data/text/birch_speech.inc
+++ b/data/text/birch_speech.inc
@@ -1,4 +1,4 @@
-gText_Birch_Welcome:: @ 82C897B
+gText_Birch_Welcome::
 	.string "Hi! Sorry to keep you waiting!\p"
 	.string "Welcome to the world of POKéMON!\p"
 	.string "My name is BIRCH.\p"
@@ -6,12 +6,12 @@ gText_Birch_Welcome:: @ 82C897B
 	.string "PROFESSOR.\p"
 	.string "$"
 
-gText_Birch_Pokemon:: @ 82C89FB
+gText_Birch_Pokemon::
 	.string "This is what we call a “POKéMON.”\p"
 	.string "\n"
 	.string "$"
 
-gText_Birch_MainSpeech:: @ 82C8A1F
+gText_Birch_MainSpeech::
 	.string "This world is widely inhabited by\n"
 	.string "creatures known as POKéMON.\p"
 	.string "We humans live alongside POKéMON,\n"
@@ -28,28 +28,28 @@ gText_Birch_MainSpeech:: @ 82C8A1F
 	.string "That's what I do.\p"
 	.string "$"
 
-gText_Birch_AndYouAre:: @ 82C8BD0
+gText_Birch_AndYouAre::
 	.string "And you are?$"
 
-gText_Birch_BoyOrGirl:: @ 82C8BDD
+gText_Birch_BoyOrGirl::
 	.string "Are you a boy?\n"
 	.string "Or are you a girl?$"
 
-gText_Birch_WhatsYourName:: @ 82C8BFF
+gText_Birch_WhatsYourName::
 	.string "All right.\n"
 	.string "What's your name?$"
 
-gText_Birch_SoItsPlayer:: @ 82C8C1C
+gText_Birch_SoItsPlayer::
 	.string "So it's {PLAYER}{KUN}?$"
 
-gText_Birch_YourePlayer:: @ 82C8C2A
+gText_Birch_YourePlayer::
 	.string "Ah, okay!\p"
 	.string "You're {PLAYER}{KUN} who's moving to my\n"
 	.string "hometown of LITTLEROOT.\l"
 	.string "I get it now!\p"
 	.string "$"
 
-gText_Birch_AreYouReady:: @ 82C8C7A
+gText_Birch_AreYouReady::
 	.string "All right, are you ready?\p"
 	.string "Your very own adventure is about\n"
 	.string "to unfold.\p"
diff --git a/data/text/blend_master.inc b/data/text/blend_master.inc
index 31315bbd5..462d9c496 100644
--- a/data/text/blend_master.inc
+++ b/data/text/blend_master.inc
@@ -1,34 +1,34 @@
-BerryBlender_Text_BlendWithTheBlendMaster: @ 82C427C
+BerryBlender_Text_BlendWithTheBlendMaster:
 	.string "BLEND MASTER: Indeed I am!\n"
 	.string "The BLEND MASTER am I!\p"
 	.string "Blend with me, and you shall witness\n"
 	.string "the mastery I bring to blending!$"
 
-BerryBlender_Text_SeeMyMasteryInAction: @ 82C42F4
+BerryBlender_Text_SeeMyMasteryInAction:
 	.string "BLEND MASTER: Hmmm! So, you wish to\n"
 	.string "see my mastery in action?$"
 
-BerryBlender_Text_TooBusyNowIsee: @ 82C4332
+BerryBlender_Text_TooBusyNowIsee:
 	.string "Hmmm!\p"
 	.string "So, you are too busy now, I see!\p"
 	.string "But fear not!\n"
 	.string "I shall be here all day!\l"
 	.string "Hurry back from your errand!$"
 
-BerryBlender_Text_BlendMasterNoBerries: @ 82C439D
+BerryBlender_Text_BlendMasterNoBerries:
 	.string "Hmmm!\p"
 	.string "You haven't got a single BERRY!\p"
 	.string "I shall be here all day!\n"
 	.string "Hurry back with some BERRIES!$"
 
-BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks: @ 82C43FA
+BerryBlender_Text_BlendMasterKnowHowToMakePokeblocks:
 	.string "Of course!\n"
 	.string "Of course!\p"
 	.string "Incidentally…\n"
 	.string "You do know how to blend {POKEBLOCK}S\l"
 	.string "from BERRIES?$"
 
-BerryBlender_Text_BlendMasterExplainBerryBlending: @ 82C444C
+BerryBlender_Text_BlendMasterExplainBerryBlending:
 	.string "Hmmm!\p"
 	.string "Ah, but it is a simple process!\p"
 	.string "When the BLENDER's arrow comes to\n"
@@ -37,40 +37,40 @@ BerryBlender_Text_BlendMasterExplainBerryBlending: @ 82C444C
 	.string "When you see how precisely I press\n"
 	.string "the A Button, you will understand.$"
 
-BerryBlender_Text_BlendMasterLetsBerryBlender: @ 82C451B
+BerryBlender_Text_BlendMasterLetsBerryBlender:
 	.string "Fine!\p"
 	.string "Let's get started, then!\p"
 	.string "All together with the BLEND MASTER,\n"
 	.string "let's BERRY BLENDER!$"
 
-BerryBlender_Text_BlendMasterNoPokeblockCase: @ 82C4573
+BerryBlender_Text_BlendMasterNoPokeblockCase:
 	.string "Hmmm!\p"
 	.string "You don't appear to have gotten\n"
 	.string "the {POKEBLOCK} CASE!\p"
 	.string "I shall be here all day!\n"
 	.string "Obtain the {POKEBLOCK} CASE and hurry back!$"
 
-BerryBlender_Text_BlendMasterPokeblockCaseFull: @ 82C45E8
+BerryBlender_Text_BlendMasterPokeblockCaseFull:
 	.string "Hmmm!\p"
 	.string "Your {POKEBLOCK} CASE appears to be full!\p"
 	.string "I shall be here all day!\n"
 	.string "Use some {POKEBLOCK}S and hurry back!$"
 
-BerryBlender_Text_WhoaAwesome: @ 82C464B
+BerryBlender_Text_WhoaAwesome:
 	.string "Whoa!\n"
 	.string "Awesome!$"
 
-BerryBlender_Text_WickedlyFast: @ 82C465A
+BerryBlender_Text_WickedlyFast:
 	.string "Wickedly fast!$"
 
-BerryBlender_Text_WhatAnExpert: @ 82C4669
+BerryBlender_Text_WhatAnExpert:
 	.string "What an expert!$"
 
-BerryBlender_Text_MadeAmazingPokeblocksWithMaster: @ 82C4679
+BerryBlender_Text_MadeAmazingPokeblocksWithMaster:
 	.string "When I blended with the MASTER,\n"
 	.string "we made amazing {POKEBLOCK}S!$"
 
-BerryBlender_Text_QualitiesOfBlendMaster: @ 82C46B1
+BerryBlender_Text_QualitiesOfBlendMaster:
 	.string "Eyes that track the arrow with\n"
 	.string "machinelike intensity…\p"
 	.string "A hand that taps the A Button\n"
@@ -78,7 +78,7 @@ BerryBlender_Text_QualitiesOfBlendMaster: @ 82C46B1
 	.string "Possessing these qualities makes\n"
 	.string "the BLEND MASTER truly great.$"
 
-BerryBlender_Text_MasterWorksOnSkillsInMountains: @ 82C4763
+BerryBlender_Text_MasterWorksOnSkillsInMountains:
 	.string "The BLEND MASTER's supposed to work\n"
 	.string "on his skills deep in the mountains.\p"
 	.string "Sometimes, he comes to LILYCOVE\n"
diff --git a/data/text/braille.inc b/data/text/braille.inc
index 57b77e393..69f0a81e3 100644
--- a/data/text/braille.inc
+++ b/data/text/braille.inc
@@ -1,111 +1,111 @@
-Underwater_SealedChamber_Braille_GoUpHere: @ 82A6B15
+Underwater_SealedChamber_Braille_GoUpHere:
 	brailleformat 4, 6, 26, 13, 7, 9
 	.braille "GO UP HERE.$"
 
-SealedChamber_OuterRoom_Braille_ABC: @ 82A6B27
+SealedChamber_OuterRoom_Braille_ABC:
 	brailleformat 7, 6, 21, 13, 10, 9
 	.braille "ABC$"
 
-SealedChamber_OuterRoom_Braille_GHI: @ 82A6B31
+SealedChamber_OuterRoom_Braille_GHI:
 	brailleformat 7, 6, 21, 13, 10, 9
 	.braille "GHI$"
 
-SealedChamber_OuterRoom_Braille_MNO: @ 82A6B3B
+SealedChamber_OuterRoom_Braille_MNO:
 	brailleformat 7, 6, 21, 13, 10, 9
 	.braille "MNO$"
 
-SealedChamber_OuterRoom_Braille_TUV: @ 82A6B45
+SealedChamber_OuterRoom_Braille_TUV:
 	brailleformat 7, 6, 21, 13, 10, 9
 	.braille "TUV$"
 
-SealedChamber_OuterRoom_Braille_DEF: @ 82A6B4F
+SealedChamber_OuterRoom_Braille_DEF:
 	brailleformat 7, 6, 21, 13, 10, 9
 	.braille "DEF$"
 
-SealedChamber_OuterRoom_Braille_JKL: @ 82A6B59
+SealedChamber_OuterRoom_Braille_JKL:
 	brailleformat 7, 6, 21, 13, 10, 9
 	.braille "JKL$"
 
-SealedChamber_OuterRoom_Braille_PQRS: @ 82A6B63
+SealedChamber_OuterRoom_Braille_PQRS:
 	brailleformat 7, 6, 21, 13, 10, 9
 	.braille "PQRS$"
 
-SealedChamber_OuterRoom_Braille_Period: @ 82A6B6E
+SealedChamber_OuterRoom_Braille_Period:
 	brailleformat 9, 6, 19, 13, 12, 9
 	.braille ".$"
 
-SealedChamber_OuterRoom_Braille_WXYZ: @ 82A6B76
+SealedChamber_OuterRoom_Braille_WXYZ:
 	brailleformat 7, 6, 21, 13, 10, 9
 	.braille "WXYZ$"
 
-SealedChamber_OuterRoom_Braille_Comma: @ 82A6B81
+SealedChamber_OuterRoom_Braille_Comma:
 	brailleformat 9, 6, 19, 13, 12, 9
 	.braille ",$"
 
-SealedChamber_OuterRoom_Braille_DigHere: @ 82A6B89
+SealedChamber_OuterRoom_Braille_DigHere:
 	brailleformat 7, 4, 23, 15, 10, 7
 	.braille "DIG HERE.$"
 
-SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth: @ 82A6B99
+SealedChamber_InnerRoom_Braille_FirstWailordLastRelicanth:
 	brailleformat 0, 0, 29, 19, 3, 3
 	.braille "FIRST COMES\n"
 	.braille "WAILORD.\n"
 	.braille "LAST COMES\n"
 	.braille "RELICANTH.$"
 
-SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived: @ 82A6BCA
+SealedChamber_InnerRoom_Braille_InThisCaveWeHaveLived:
 	brailleformat 2, 0, 26, 19, 5, 3
 	.braille "IN THIS\n"
 	.braille "CAVE WE\n"
 	.braille "HAVE\n"
 	.braille "LIVED.$"
 
-SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon: @ 82A6BEC
+SealedChamber_InnerRoom_Braille_WeOweAllToThePokemon:
 	brailleformat 7, 2, 23, 17, 10, 5
 	.braille "WE OWE ALL\n"
 	.braille "TO THE\n"
 	.braille "POKEMON.$"
 
-SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway: @ 82A6C0D
+SealedChamber_InnerRoom_Braille_ButWeSealedThePokemonAway:
 	brailleformat 3, 0, 25, 19, 6, 3
 	.braille "BUT, WE\n"
 	.braille "SEALED THE\n"
 	.braille "POKEMON\n"
 	.braille "AWAY.$"
 
-SealedChamber_InnerRoom_Braille_WeFearedIt: @ 82A6C34
+SealedChamber_InnerRoom_Braille_WeFearedIt:
 	brailleformat 5, 6, 25, 13, 8, 9
 	.braille "WE FEARED IT.$"
 
-SealedChamber_InnerRoom_Braille_ThoseWithCourageHope: @ 82A6C48
+SealedChamber_InnerRoom_Braille_ThoseWithCourageHope:
 	brailleformat 6, 0, 24, 19, 9, 3
 	.braille "THOSE WITH\n"
 	.braille "COURAGE,\n"
 	.braille "THOSE WITH\n"
 	.braille "HOPE.$"
 
-SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits: @ 82A6C73
+SealedChamber_InnerRoom_Braille_OpenDoorEternalPokemonWaits:
 	brailleformat 3, 2, 27, 17, 6, 5
 	.braille "OPEN A DOOR.\n"
 	.braille "AN ETERNAL\n"
 	.braille "POKEMON\n"
 	.braille "WAITS.$"
 
-DesertRuins_Braille_UseRockSmash: @ 82A6CA0
+DesertRuins_Braille_UseRockSmash:
 	brailleformat 1, 0, 27, 19, 4, 3
 	.braille "LEFT, LEFT,\n"
 	.braille "DOWN, DOWN.\n"
 	.braille "THEN, USE\n"
 	.braille "ROCK SMASH.$"
 
-IslandCave_Braille_RunLapAroundWall: @ 82A6CD4
+IslandCave_Braille_RunLapAroundWall:
 	brailleformat 5, 0, 25, 19, 8, 3
 	.braille "STAY CLOSE\n"
 	.braille "TO THE WALL.\n"
 	.braille "RUN AROUND\n"
 	.braille "ONE LAP.$"
 
-AncientTomb_Braille_ShineInTheMiddle: @ 82A6D06
+AncientTomb_Braille_ShineInTheMiddle:
 	brailleformat 3, 0, 25, 19, 6, 3
 	.braille "THOSE WHO\n"
 	.braille "INHERIT OUR\n"
diff --git a/data/text/cable_club.inc b/data/text/cable_club.inc
index b4f656a00..fd760e1cd 100644
--- a/data/text/cable_club.inc
+++ b/data/text/cable_club.inc
@@ -1,167 +1,167 @@
-CableClub_Text_WelcomeWhichCableClubService: @ 8277EA4
+CableClub_Text_WelcomeWhichCableClubService:
 	.string "Welcome to the POKéMON CABLE\n"
 	.string "CLUB.\p"
 	.string "Which of our services do you wish\n"
 	.string "to use?$"
 
-CableClub_Text_WhichService: @ 8277EF1
+CableClub_Text_WhichService:
 	.string "Which of our services do you wish\n"
 	.string "to use?$"
 
-CableClub_Text_TradeUsingLinkCable:: @ 8277F1B
+CableClub_Text_TradeUsingLinkCable::
 	.string "Trade POKéMON with another player\n"
 	.string "using a GBA Game Link cable.$"
 
-CableClub_Text_BattleUsingLinkCable:: @ 8277F5A
+CableClub_Text_BattleUsingLinkCable::
 	.string "You may battle another TRAINER\n"
 	.string "using a GBA Game Link cable.$"
 
-CableClub_Text_RecordCornerUsingLinkCable:: @ 8277F96
+CableClub_Text_RecordCornerUsingLinkCable::
 	.string "You can use the RECORD CORNER with\n"
 	.string "others using a GBA Game Link cable.$"
 
 @ Unused
-CableClub_Text_CloseThisMenu: @ 8277FDD
+CableClub_Text_CloseThisMenu:
 	.string "Close this menu.$"
 
-CableClub_Text_NeedTwoMonsForDoubleBattle: @ 8277FEE
+CableClub_Text_NeedTwoMonsForDoubleBattle:
 	.string "For a DOUBLE BATTLE, you must\n"
 	.string "have at least two POKéMON.$"
 
-CableClub_Text_NeedTwoMonsToTrade: @ 8278027
+CableClub_Text_NeedTwoMonsToTrade:
 	.string "For trading, you must have at\n"
 	.string "least two POKéMON with you.$"
 
-CableClub_Text_CantTradeEnigmaBerry: @ 8278061
+CableClub_Text_CantTradeEnigmaBerry:
 	.string "A POKéMON holding the {STR_VAR_1}\n"
 	.string "BERRY can't be traded.$"
 
-gText_PleaseWaitForLink:: @ 8278091
+gText_PleaseWaitForLink::
 	.string "Please wait.\n"
 	.string "… … B Button: Cancel$"
 
-gText_ConfirmLinkWhenPlayersReady:: @ 82780B3
+gText_ConfirmLinkWhenPlayersReady::
 	.string "When all players are ready…\n"
 	.string "A Button: Confirm\l"
 	.string "B Button: Cancel$"
 
-gText_ConfirmStartLinkWithXPlayers:: @ 82780F2
+gText_ConfirmStartLinkWithXPlayers::
 	.string "Start link with {STR_VAR_1} players.\n"
 	.string "A Button: Confirm\l"
 	.string "B Button: Cancel$"
 
-gText_AwaitingLinkup:: @ 8278131
+gText_AwaitingLinkup::
 	.string "Awaiting linkup…\n"
 	.string "… … B Button: Cancel$"
 
 @ Unused
-CableClub_Text_OkayToSaveProgress:: @ 8278157
+CableClub_Text_OkayToSaveProgress::
 	.string "Your progress must be saved before\n"
 	.string "linking. Is it okay to save?$"
 
-CableClub_Text_PleaseEnter: @ 8278197
+CableClub_Text_PleaseEnter:
 	.string "Please enter.$"
 
-CableClub_Text_DirectYouToYourRoom: @ 82781A5
+CableClub_Text_DirectYouToYourRoom:
 	.string "I'll direct you to your room now.$"
 
-Text_SomeoneIsNotReadyToLink: @ 82781C7
+Text_SomeoneIsNotReadyToLink:
 	.string "Someone is not ready to link.\p"
 	.string "Please come back after everyone\n"
 	.string "has made preparations.$"
 
-Text_LinkErrorPleaseReset: @ 827821C
+Text_LinkErrorPleaseReset:
 	.string "Sorry, we have a link error…\n"
 	.string "Please reset and try again.$"
 
-Text_PlayersMadeDifferentSelections: @ 8278255
+Text_PlayersMadeDifferentSelections:
 	.string "The link partners appear to have\n"
 	.string "made different selections.$"
 
-CableClub_Text_PleaseVisitAgain: @ 8278291
+CableClub_Text_PleaseVisitAgain:
 	.string "Please do visit again.$"
 
-CableClub_Text_IncorrectNumberOfParticipants: @ 82782A8
+CableClub_Text_IncorrectNumberOfParticipants:
 	.string "The number of participants is\n"
 	.string "incorrect.$"
 
-CableClub_Text_CantSingleBattleWithXPlayers: @ 82782D1
+CableClub_Text_CantSingleBattleWithXPlayers:
 	.string "The SINGLE BATTLE Mode can't be\n"
 	.string "played by {STR_VAR_1} players.$"
 
-CableClub_Text_CantDoubleBattleWithXPlayers: @ 8278307
+CableClub_Text_CantDoubleBattleWithXPlayers:
 	.string "The DOUBLE BATTLE Mode can't be\n"
 	.string "played by {STR_VAR_1} players.$"
 
-CableClub_Text_NeedFourPlayers: @ 827833D
+CableClub_Text_NeedFourPlayers:
 	.string "There must be four players to play\n"
 	.string "this Battle Mode.$"
 
-CableClub_Text_PleaseConfirmNumberAndRestart: @ 8278372
+CableClub_Text_PleaseConfirmNumberAndRestart:
 	.string "Please confirm the number of\n"
 	.string "players and start again.$"
 
-Text_TerminateLinkConfirmation: @ 82783A8
+Text_TerminateLinkConfirmation:
 	.string "The link will be terminated if you\n"
 	.string "leave the room. Is that okay?$"
 
-Text_TerminateLinkPleaseWait: @ 82783E9
+Text_TerminateLinkPleaseWait:
 	.string "Terminating link…\n"
 	.string "You will be escorted out of\l"
 	.string "the room. Please wait.$"
 
-CableClub_Text_TooBusyToNotice: @ 827842E
+CableClub_Text_TooBusyToNotice:
 	.string "This TRAINER is too busy to\n"
 	.string "notice…$"
 
-CableClub_Text_GotToLookAtTrainerCard: @ 8278452
+CableClub_Text_GotToLookAtTrainerCard:
 	.string "Score! Got to look at {STR_VAR_1}'s\n"
 	.string "TRAINER CARD!$"
 
-CableClub_Text_GotToLookAtColoredTrainerCard: @ 827847B
+CableClub_Text_GotToLookAtColoredTrainerCard:
 	.string "Score! Got to look at {STR_VAR_1}'s\n"
 	.string "TRAINER CARD!\p"
 	.string "It's a {STR_VAR_2} card!$"
 
-BattleColosseum_2P_Text_TakePlaceStartBattle: @ 82784B4
+BattleColosseum_2P_Text_TakePlaceStartBattle:
 	.string "Please take your place and start\n"
 	.string "your battle.$"
 
-TradeCenter_Text_TakeSeatStartTrade: @ 82784E2
+TradeCenter_Text_TakeSeatStartTrade:
 	.string "Please take your seat and start\n"
 	.string "your trade.$"
 
-RecordCorner_Text_ThanksForComing: @ 827850E
+RecordCorner_Text_ThanksForComing:
 	.string "Thanks for coming.$"
 
-CableClub_Text_TrainerCardDataOverwritten: @ 8278521
+CableClub_Text_TrainerCardDataOverwritten:
 	.string "The TRAINER CARD data will\n"
 	.string "be overwritten.$"
 
-CableClub_Text_HopeToSeeYouAgain: @ 827854C
+CableClub_Text_HopeToSeeYouAgain:
 	.string "I hope to see you again!$"
 
-CableClub_Text_NotSetUpForFarAwayRegion: @ 8278565
+CableClub_Text_NotSetUpForFarAwayRegion:
 	.string "I'm awfully sorry.\p"
 	.string "We're not set up to conduct trades\n"
 	.string "with TRAINERS far away in another\l"
 	.string "region yet…$"
 
-CableClub_Text_OtherTrainerNotReady: @ 82785C9
+CableClub_Text_OtherTrainerNotReady:
 	.string "The other TRAINER is not ready.$"
 
-CableClub_Text_YouHaveAMonThatCantBeTaken: @ 82785E9
+CableClub_Text_YouHaveAMonThatCantBeTaken:
 	.string "You have at least one POKéMON\n"
 	.string "that can't be taken.$"
 
-RecordCorner_Text_TakeSeatAndWait: @ 827861C
+RecordCorner_Text_TakeSeatAndWait:
 	.string "Please take your seat and wait.$"
 
-RecordCorner_Text_PlayerSentOverOneX: @ 827863C
+RecordCorner_Text_PlayerSentOverOneX:
 	.string "{STR_VAR_1} sent over one\n"
 	.string "{STR_VAR_2}.$"
 
-CableClub_Text_CantMixWithJapaneseGame: @ 8278651
+CableClub_Text_CantMixWithJapaneseGame:
 	.string "Sorry, there is a transmission error.\p"
 	.string "You may not mix records with  \n"
 	.string "Japanese Ruby or Sapphire games.\p"
@@ -169,67 +169,67 @@ CableClub_Text_CantMixWithJapaneseGame: @ 8278651
 	.string "Japanese Emerald and overseas Ruby\l"
 	.string "or Sapphire games at the same time.$"
 
-CableClub_Text_AdapterNotConnected: @ 827871F
+CableClub_Text_AdapterNotConnected:
 	.string "The Wireless Adapter is not\n"
 	.string "connected properly.$"
 
-CableClub_Text_ParticipantsStepUpToCounter: @ 827874F
+CableClub_Text_ParticipantsStepUpToCounter:
 	.string "Participants are asked to step up\n"
 	.string "to the reception counter.$"
 
 @ Unused
-CableClub_Text_Hello: @ 827878B
+CableClub_Text_Hello:
 	.string "Hello!$"
 
 @ Unused
-CableClub_Text_PleaseWait: @ 8278792
+CableClub_Text_PleaseWait:
 	.string "Please wait.$"
 
-CableClub_Text_YouMayTradeHere:: @ 827879F
+CableClub_Text_YouMayTradeHere::
 	.string "You may trade your POKéMON here\n"
 	.string "with another TRAINER.$"
 
-CableClub_Text_YouMayBattleHere:: @ 82787D5
+CableClub_Text_YouMayBattleHere::
 	.string "You may battle with your friends\n"
 	.string "here.$"
 
-CableClub_Text_CanMakeBerryPowder:: @ 82787FC
+CableClub_Text_CanMakeBerryPowder::
 	.string "Two to five TRAINERS can make\n"
 	.string "BERRY POWDER together.$"
 
-CableClub_Text_CanMixRecords:: @ 8278831
+CableClub_Text_CanMixRecords::
 	.string "The records of two to four players\n"
 	.string "can be mixed together.$"
 
 @ Unused
-CableClub_Text_GuideToVariousServices: @ 827886B
+CableClub_Text_GuideToVariousServices:
 	.string "A guide to the WIRELESS CLUB's\n"
 	.string "various services.$"
 
-CableClub_Text_CancelSelectedItem:: @ 827889C
+CableClub_Text_CancelSelectedItem::
 	.string "Cancels the selected MENU item.$"
 
 @ Unused
-CableClub_Text_WhichBattleMode: @ 82788BC
+CableClub_Text_WhichBattleMode:
 	.string "Which battle mode would you like?$"
 
 @ Unused
-CableClub_Text_ReturnsToPreviousStep: @ 82788DE
+CableClub_Text_ReturnsToPreviousStep:
 	.string "Returns to the previous step.$"
 
-CableClub_Text_NeedBerryForBerryCrush: @ 82788FC
+CableClub_Text_NeedBerryForBerryCrush:
 	.string "To use the BERRY CRUSH service,\n"
 	.string "you must have at least one BERRY.$"
 
-CableClub_Text_NeedTwoMonsForUnionRoom: @ 827893E
+CableClub_Text_NeedTwoMonsForUnionRoom:
 	.string "To enter the UNION ROOM, you must\n"
 	.string "have at least two POKéMON.$"
 
-CableClub_Text_NoEnigmaBerryInUnionRoom: @ 827897B
+CableClub_Text_NoEnigmaBerryInUnionRoom:
 	.string "No POKéMON holding the {STR_VAR_1}\n"
 	.string "BERRY may enter the UNION ROOM.$"
 
-CableClub_Text_UnionRoomAdapterNotConnected: @ 82789B5
+CableClub_Text_UnionRoomAdapterNotConnected:
 	.string "This is the POKéMON WIRELESS CLUB\n"
 	.string "UNION ROOM.\p"
 	.string "Unfortunately, your Wireless\n"
@@ -237,21 +237,21 @@ CableClub_Text_UnionRoomAdapterNotConnected: @ 82789B5
 	.string "Please do come again.$"
 
 @ Unused
-CableClub_Text_OhExcuseMe: @ 8278A39
+CableClub_Text_OhExcuseMe:
 	.string "Oh…\n"
 	.string "Excuse me!$"
 
-CableClub_Text_PlayerIsWaiting: @ 8278A48
+CableClub_Text_PlayerIsWaiting:
 	.string "It appears as if {STR_VAR_1} is playing\n"
 	.string "right now.\l"
 	.string "Go for it!$"
 
-MossdeepCity_GameCorner_1F_Text_DescribeWhichGame: @ 8278A7D
+MossdeepCity_GameCorner_1F_Text_DescribeWhichGame:
 	.string "I can explain game rules to you,\n"
 	.string "if you'd like.\p"
 	.string "Which game should I describe?$"
 
-MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo: @ 8278ACB
+MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo:
 	.string "“POKéMON JUMP”\p"
 	.string "Make your POKéMON skip the VINE WHIP\n"
 	.string "rope with the A Button.\p"
@@ -264,7 +264,7 @@ MossdeepCity_GameCorner_1F_Text_PokemonJumpInfo: @ 8278ACB
 	.string "Good things happen if everyone\n"
 	.string "jumps in time.$"
 
-MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo: @ 8278BF1
+MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo:
 	.string "“DODRIO BERRY-PICKING”\p"
 	.string "Command DODRIO's three heads to\n"
 	.string "catch falling BERRIES.\p"
@@ -273,47 +273,47 @@ MossdeepCity_GameCorner_1F_Text_DodrioBerryPickingInfo: @ 8278BF1
 	.string "To play this game, you must have\n"
 	.string "a DODRIO.$"
 
-MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay: @ 8278CAC
+MossdeepCity_GameCorner_1F_Text_TalkToOldManToPlay:
 	.string "If you want to play a game,\n"
 	.string "please tell the old man beside me.$"
 
-MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait: @ 8278CEB
+MossdeepCity_GameCorner_1F_Text_WelcomeCanYouWait:
 	.string "Hi, welcome!\n"
 	.string "Are you here to play games using\l"
 	.string "Wireless Communication?\p"
 	.string "Can you wait just a little bit?$"
 
-MossdeepCity_GameCorner_1F_Text_ComeAgain: @ 8278D51
+MossdeepCity_GameCorner_1F_Text_ComeAgain:
 	.string "All right, come again!$"
 
-MossdeepCity_GameCorner_1F_Text_AdapterNotConnected: @ 8278D68
+MossdeepCity_GameCorner_1F_Text_AdapterNotConnected:
 	.string "The Wireless Adapter isn't connected.\n"
 	.string "Come back when it's hooked up!$"
 
-MossdeepCity_GameCorner_1F_Text_PlayWhichGame: @ 8278DAD
+MossdeepCity_GameCorner_1F_Text_PlayWhichGame:
 	.string "All right, which game did you want\n"
 	.string "to play?$"
 
-MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon: @ 8278DD9
+MossdeepCity_GameCorner_1F_Text_EnterWhichPokemon:
 	.string "Which POKéMON would you like to\n"
 	.string "enter?$"
 
-MossdeepCity_GameCorner_1F_Text_AllGoodToGo: @ 8278E00
+MossdeepCity_GameCorner_1F_Text_AllGoodToGo:
 	.string "Okay, you're all good to go.\n"
 	.string "Don't let the others beat you!$"
 
 @ Unused
-MossdeepCity_GameCorner_1F_Text_LeavingDoComeAgain: @ 8278E3C
+MossdeepCity_GameCorner_1F_Text_LeavingDoComeAgain:
 	.string "Are you leaving now?\n"
 	.string "Do come again!$"
 
-MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon: @ 8278E60
+MossdeepCity_GameCorner_1F_Text_ExplainRequiredMon:
 	.string "It doesn't look like you have any\n"
 	.string "POKéMON that you can enter…\p"
 	.string "Would you like me to explain what\n"
 	.string "kinds of POKéMON can enter?$"
 
-MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed: @ 8278EDC
+MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed:
 	.string "“POKéMON JUMP” is open to POKéMON\n"
 	.string "around 28 inches or less.\p"
 	.string "What you can't enter are those\n"
@@ -322,16 +322,16 @@ MossdeepCity_GameCorner_1F_Text_ShortJumpingPokemonAllowed: @ 8278EDC
 	.string "swim, burrow, or fly.\p"
 	.string "That's all you need to know.$"
 
-MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed: @ 8278FA4
+MossdeepCity_GameCorner_1F_Text_OnlyDodrioAllowed:
 	.string "DODRIO BERRY-PICKING is a game that \n"
 	.string "only DODRIO may enter.$"
 
 @ Unused
-MossdeepCity_GameCorner_1F_Text_RetryPlease: @ 8278FE0
+MossdeepCity_GameCorner_1F_Text_RetryPlease:
 	.string "Could you retry this from the start\n"
 	.string "again, please?$"
 
-CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013
+CableClub_Text_WelcomeWhichDirectCornerRoom:
 	.string "Welcome to the POKéMON WIRELESS\n"
 	.string "CLUB DIRECT CORNER.\p"
 	.string "You may interact directly with\n"
@@ -339,22 +339,22 @@ CableClub_Text_WelcomeWhichDirectCornerRoom: @ 8279013
 	.string "Which room would you like to\n"
 	.string "enter?$"
 
-CableClub_Text_TradePokemon: @ 827909D
+CableClub_Text_TradePokemon:
 	.string "Would you like to trade POKéMON?$"
 
-CableClub_Text_PlayWhichBattleMode: @ 82790BE
+CableClub_Text_PlayWhichBattleMode:
 	.string "Which Battle Mode would you like\n"
 	.string "to play?$"
 
-CableClub_Text_AccessRecordCorner: @ 82790E8
+CableClub_Text_AccessRecordCorner:
 	.string "Would you like to access\n"
 	.string "the RECORD CORNER?$"
 
-CableClub_Text_UseBerryCrush: @ 8279114
+CableClub_Text_UseBerryCrush:
 	.string "Would you like to use the\n"
 	.string "BERRY CRUSH System?$"
 
-CableClub_Text_ExplainBattleModes: @ 8279142
+CableClub_Text_ExplainBattleModes:
 	.string "There are three Battle Modes.\p"
 	.string "SINGLE BATTLE is for two TRAINERS\n"
 	.string "with one or more POKéMON each.\p"
@@ -369,25 +369,25 @@ CableClub_Text_ExplainBattleModes: @ 8279142
 	.string "Each TRAINER can have one POKéMON\n"
 	.string "in battle at a time.$"
 
-CableClub_Text_ChooseGroupLeaderOfTwo: @ 82792CD
+CableClub_Text_ChooseGroupLeaderOfTwo:
 	.string "Please decide which of you two\n"
 	.string "will become the LEADER.\p"
 	.string "The other player must then choose\n"
 	.string "“JOIN GROUP.”$"
 
-CableClub_Text_ChooseGroupLeaderOfFour: @ 8279334
+CableClub_Text_ChooseGroupLeaderOfFour:
 	.string "Please decide which of you four\n"
 	.string "will become the GROUP LEADER.\p"
 	.string "The other players must then choose\n"
 	.string "“JOIN GROUP.”$"
 
-CableClub_Text_ChooseGroupLeader: @ 82793A3
+CableClub_Text_ChooseGroupLeader:
 	.string "Please decide which of you will\n"
 	.string "become the GROUP LEADER.\p"
 	.string "The other players must then choose\n"
 	.string "“JOIN GROUP.”$"
 
-CableClub_Text_WelcomeUnionRoomEnter: @ 827940D
+CableClub_Text_WelcomeUnionRoomEnter:
 	.string "Welcome to the POKéMON WIRELESS\n"
 	.string "CLUB UNION ROOM.\p"
 	.string "You may interact directly with\n"
@@ -395,7 +395,7 @@ CableClub_Text_WelcomeUnionRoomEnter: @ 827940D
 	.string "whom you may not even know.\p"
 	.string "Would you like to enter the ROOM?$"
 
-CableClub_Text_UnionRoomInfo: @ 82794B8
+CableClub_Text_UnionRoomInfo:
 	.string "The TRAINERS in the UNION ROOM\n"
 	.string "will be those players around you\l"
 	.string "who have also entered the ROOM.\p"
@@ -409,11 +409,11 @@ CableClub_Text_UnionRoomInfo: @ 82794B8
 	.string "trade.\p"
 	.string "Would you like to enter the ROOM?$"
 
-CableClub_Text_EnjoyUnionRoom: @ 827961C
+CableClub_Text_EnjoyUnionRoom:
 	.string "I hope you enjoy your time in\n"
 	.string "the UNION ROOM.$"
 
-CableClub_Text_FirstTimeRightThisWay: @ 827964A
+CableClub_Text_FirstTimeRightThisWay:
 	.string "Hello!\n"
 	.string "My name is TEALA.\p"
 	.string "This must be your first time\n"
@@ -424,7 +424,7 @@ CableClub_Text_FirstTimeRightThisWay: @ 827964A
 	.string "floor of our POKéMON CENTER.\p"
 	.string "Right this way, please.$"
 
-CableClub_Text_ExplainWirelessClubFirstTime: @ 8279718
+CableClub_Text_ExplainWirelessClubFirstTime:
 	.string "On the top floor, there are two\n"
 	.string "rooms.\p"
 	.string "First, the room on the left.\n"
@@ -446,14 +446,14 @@ CableClub_Text_ExplainWirelessClubFirstTime: @ 8279718
 	.string "I hope you enjoy the Wireless \n"
 	.string "Communication System.$"
 
-CableClub_Text_AskAboutLinking: @ 8279937
+CableClub_Text_AskAboutLinking:
 	.string "Hello, {PLAYER}!\p"
 	.string "It's me, TEALA, the POKéMON\n"
 	.string "CENTER 2F attendant.\p"
 	.string "Is there something you needed to\n"
 	.string "ask me about linking?$"
 
-CableClub_Text_ExplainWirelessClub: @ 82799AA
+CableClub_Text_ExplainWirelessClub:
 	.string "Let me explain how the POKéMON\n"
 	.string "WIRELESS CLUB works.\p"
 	.string "On this, the top floor, there are\n"
@@ -482,6 +482,6 @@ CableClub_Text_ExplainWirelessClub: @ 82799AA
 	.string "I hope you enjoy the Wireless \n"
 	.string "Communication System.$"
 
-CableClub_Text_HopeYouEnjoyWirelessSystem: @ 8279C91
+CableClub_Text_HopeYouEnjoyWirelessSystem:
 	.string "I hope you enjoy the Wireless\n"
 	.string "Communication System.$"
diff --git a/data/text/check_furniture.inc b/data/text/check_furniture.inc
index 23f966bbd..abf6cf48a 100644
--- a/data/text/check_furniture.inc
+++ b/data/text/check_furniture.inc
@@ -1,27 +1,27 @@
-Text_PictureBookShelf: @ 82A81E5
+Text_PictureBookShelf:
 	.string "There's a set of POKéMON picture books.$"
 
-Text_BookShelf: @ 82A820D
+Text_BookShelf:
 	.string "It's filled with all sorts of books.$"
 
-Text_PokemonCenterBookShelf: @ 82A8232
+Text_PokemonCenterBookShelf:
 	.string "POKéMON magazines!\n"
 	.string "POKéMON PAL…\p"
 	.string "POKéMON HANDBOOK…\n"
 	.string "ADORABLE POKéMON…$"
 
-Text_Vase: @ 82A8276
+Text_Vase:
 	.string "This vase looks expensive…\n"
 	.string "Peered inside…\p"
 	.string "But, it was empty.$"
 
-Text_EmptyTrashCan: @ 82A82B3
+Text_EmptyTrashCan:
 	.string "It's empty.$"
 
-Text_ShopShelf: @ 82A82BF
+Text_ShopShelf:
 	.string "The shelves brim with all sorts of\n"
 	.string "POKéMON merchandise.$"
 
-Text_Blueprint: @ 82A82F7
+Text_Blueprint:
 	.string "A blueprint of some sort?\n"
 	.string "It's too complicated!$"
diff --git a/data/text/contest_link.inc b/data/text/contest_link.inc
index d9873904f..f2f1469e0 100644
--- a/data/text/contest_link.inc
+++ b/data/text/contest_link.inc
@@ -1,38 +1,38 @@
 @ With the exception of Link standby, none of the below texts are used
 
-gTest_MissedTurn:: @ 827E8CE
+gTest_MissedTurn::
 	.string "Missed turn$"
 
-gText_LinkStandby4:: @ 827E8DA
+gText_LinkStandby4::
 	.string "Link standby!$"
 
-gText_WinnerIsPlayersMonCongrats:: @ 827E8E8
+gText_WinnerIsPlayersMonCongrats::
 	.string "The winner is {STR_VAR_1}'s {STR_VAR_2}!\n"
 	.string "Congratulations!$"
 
-gText_WinnerIsPlayersMon:: @ 827E910
+gText_WinnerIsPlayersMon::
 	.string "The winner is {STR_VAR_1}'s {STR_VAR_2}!{PAUSE_UNTIL_PRESS}$"
 
-gText_PrimaryJudgingNumX:: @ 827E929
+gText_PrimaryJudgingNumX::
 	.string "Primary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
 
-gText_SecondaryJudgingNumX:: @ 827E943
+gText_SecondaryJudgingNumX::
 	.string "Secondary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
 
-gText_SetEventNumX:: @ 827E95F
+gText_SetEventNumX::
 	.string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
 
-gText_MoveUsedMostOften:: @ 827E973
+gText_MoveUsedMostOften::
 	.string "The move used most often:\n"
 	.string "{STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
 
-gText_MostImpressiveMon:: @ 827E992
+gText_MostImpressiveMon::
 	.string "The most impressive POKéMON:\n"
 	.string "{STR_VAR_1}'s {STR_VAR_2}{PAUSE_UNTIL_PRESS}$"
 
-gText_SetEventNumX2:: @ 827E9B9
+gText_SetEventNumX2::
 	.string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
 
-gText_LinkTVProgramWillNotBeMadeTrainerLost:: @ 827E9CD
+gText_LinkTVProgramWillNotBeMadeTrainerLost::
 	.string "A link TV program will not be made\n"
 	.string "because the TRAINER lost.{PAUSE_UNTIL_PRESS}$"
diff --git a/data/text/contest_painting.inc b/data/text/contest_painting.inc
index b423fbb27..5152cb3bb 100644
--- a/data/text/contest_painting.inc
+++ b/data/text/contest_painting.inc
@@ -1,9 +1,9 @@
-gContestHallPaintingCaption:: @ 827EA0C
+gContestHallPaintingCaption::
 	.string "{STR_VAR_1}\n"
 	.string "{STR_VAR_2}'s {STR_VAR_3}$"
 
 @ Unused
-gContestPaintingContest:: @ 827EA17
+gContestPaintingContest::
 	.string "CONTEST$"
 
 gContestRankNormal::
diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc
index 3cebef526..e57e76a52 100644
--- a/data/text/contest_strings.inc
+++ b/data/text/contest_strings.inc
@@ -1,725 +1,725 @@
 @ Contest move effect descriptions
 
-gText_HighlyAppealingMove:: @ 827CB82
+gText_HighlyAppealingMove::
 	.string "A highly appealing move.$"
 
-gText_UserMoreEasilyStartled:: @ 827CB9B
+gText_UserMoreEasilyStartled::
 	.string "After this move, the user is\nmore easily startled.$"
 
-gText_GreatAppealButNoMoreToEnd:: @ 827CBCE
+gText_GreatAppealButNoMoreToEnd::
 	.string "Makes a great appeal, but\nallows no more to the end.$"
 
-gText_UsedRepeatedlyWithoutBoringJudge:: @ 827CC03
+gText_UsedRepeatedlyWithoutBoringJudge::
 	.string "Can be repeatedly used\nwithout boring the JUDGE.$"
 
-gText_AvoidStartledByOthersOnce:: @ 827CC34
+gText_AvoidStartledByOthersOnce::
 	.string "Can avoid being startled\nby others once.$"
 
-gText_AvoidStartledByOthers:: @ 827CC5D
+gText_AvoidStartledByOthers::
 	.string "Can avoid being startled\nby others.$"
 
-gText_AvoidStartledByOthersLittle:: @ 827CC81
+gText_AvoidStartledByOthersLittle::
 	.string "Can avoid being startled\nby others a little.$"
 
-gText_UserLessLikelyStartled:: @ 827CCAE
+gText_UserLessLikelyStartled::
 	.string "After this move, the user is\nless likely to be startled.$"
 
-gText_SlightlyStartleFrontMon:: @ 827CCE7
+gText_SlightlyStartleFrontMon::
 	.string "Slightly startles the\nPOKéMON in front.$"
 
-gText_SlightlyStartleAppealed:: @ 827CD0F
+gText_SlightlyStartleAppealed::
 	.string "Slightly startles those\nthat have made appeals.$"
 
-gText_StartleAppealedBeforeUser:: @ 827CD3F
+gText_StartleAppealedBeforeUser::
 	.string "Startles the POKéMON that\nappealed before the user.$"
 
-gText_StartleAllAppealed:: @ 827CD73
+gText_StartleAllAppealed::
 	.string "Startles all POKéMON that\nhave done their appeals.$"
 
-gText_BadlyStartleFrontMon:: @ 827CDA6
+gText_BadlyStartleFrontMon::
 	.string "Badly startles the\nPOKéMON in front.$"
 
-gText_BadlyStartleAppealed:: @ 827CDCB
+gText_BadlyStartleAppealed::
 	.string "Badly startles those that\nhave made appeals.$"
 
-gText_StartleAppealedBeforeUser2:: @ 827CDF8
+gText_StartleAppealedBeforeUser2::
 	.string "Startles the POKéMON that\nappealed before the user.$"
 
-gText_StartleAllAppealed2:: @ 827CE2C
+gText_StartleAllAppealed2::
 	.string "Startles all POKéMON that\nhave done their appeals.$"
 
-gText_ShiftJudgesAttentionFromOthers:: @ 827CE5F
+gText_ShiftJudgesAttentionFromOthers::
 	.string "Shifts the JUDGE's\nattention from others.$"
 
-gText_StartleMonHasJudgesAttention:: @ 827CE89
+gText_StartleMonHasJudgesAttention::
 	.string "Startles the POKéMON that\nhas the JUDGE's attention.$"
 
-gText_JamOthersMissesTurn:: @ 827CEBE
+gText_JamOthersMissesTurn::
 	.string "Jams the others, and misses\none turn of appeals.$"
 
-gText_StartleMonsMadeSameTypeAppeal:: @ 827CEEF
+gText_StartleMonsMadeSameTypeAppeal::
 	.string "Startles POKéMON that\nmade a same-type appeal.$"
 
-gText_BadlyStartleCoolAppeals:: @ 827CF1E
+gText_BadlyStartleCoolAppeals::
 	.string "Badly startles POKéMON\nthat made COOL appeals.$"
 
-gText_BadlyStartleBeautyAppeals:: @ 827CF4D
+gText_BadlyStartleBeautyAppeals::
 	.string "Badly startles POKéMON\nthat made BEAUTY appeals.$"
 
-gText_BadlyStartleCuteAppeals:: @ 827CF7E
+gText_BadlyStartleCuteAppeals::
 	.string "Badly startles POKéMON\nthat made CUTE appeals.$"
 
-gText_BadlyStartleSmartAppeals:: @ 827CFAD
+gText_BadlyStartleSmartAppeals::
 	.string "Badly startles POKéMON\nthat made SMART appeals.$"
 
-gText_BadlyStartleToughAppeals:: @ 827CFDD
+gText_BadlyStartleToughAppeals::
 	.string "Badly startles POKéMON\nthat made TOUGH appeals.$"
 
-gText_MakeMonAfterUserNervous:: @ 827D00D
+gText_MakeMonAfterUserNervous::
 	.string "Makes one POKéMON after\nthe user nervous.$"
 
-gText_MakeAllMonsAfterUserNervous:: @ 827D037
+gText_MakeAllMonsAfterUserNervous::
 	.string "Makes all POKéMON after\nthe user nervous.$"
 
-gText_WorsenConditionOfThoseMadeAppeals:: @ 827D061
+gText_WorsenConditionOfThoseMadeAppeals::
 	.string "Worsens the condition of\nthose that made appeals.$"
 
-gText_BadlyStartleMonsGoodCondition:: @ 827D093
+gText_BadlyStartleMonsGoodCondition::
 	.string "Badly startles POKéMON in\ngood condition.$"
 
-gText_AppealGreatIfPerformedFirst:: @ 827D0BD
+gText_AppealGreatIfPerformedFirst::
 	.string "The appeal works great if\nperformed first.$"
 
-gText_AppealGreatIfPerformedLast:: @ 827D0E8
+gText_AppealGreatIfPerformedLast::
 	.string "The appeal works great if\nperformed last.$"
 
-gText_AppealAsGoodAsThoseBeforeIt:: @ 827D112
+gText_AppealAsGoodAsThoseBeforeIt::
 	.string "Makes the appeal as good\nas those before it.$"
 
-gText_AppealAsGoodAsOneBeforeIt:: @ 827D13F
+gText_AppealAsGoodAsOneBeforeIt::
 	.string "Makes the appeal as good\nas the one before it.$"
 
-gText_AppealBetterLaterItsPerformed:: @ 827D16E
+gText_AppealBetterLaterItsPerformed::
 	.string "The appeal works better\nthe later it is performed.$"
 
-gText_AppealVariesDependingOnTiming:: @ 827D1A1
+gText_AppealVariesDependingOnTiming::
 	.string "The appeal's quality varies\ndepending on its timing.$"
 
-gText_WorksWellIfSameTypeAsBefore:: @ 827D1D6
+gText_WorksWellIfSameTypeAsBefore::
 	.string "Works well if it's the same\ntype as the one before.$"
 
-gText_WorksWellIfDifferentTypeAsBefore:: @ 827D20A
+gText_WorksWellIfDifferentTypeAsBefore::
 	.string "Works well if different in\ntype than the one before.$"
 
-gText_AffectedByAppealInFront:: @ 827D23F
+gText_AffectedByAppealInFront::
 	.string "Affected by how well the\nappeal in front goes.$"
 
-gText_UpsConditionHelpsPreventNervousness:: @ 827D26E
+gText_UpsConditionHelpsPreventNervousness::
 	.string "Ups the user's condition.\nHelps prevent nervousness.$"
 
-gText_AppealWorksWellIfConditionGood:: @ 827D2A3
+gText_AppealWorksWellIfConditionGood::
 	.string "The appeal works well if the\nuser's condition is good.$"
 
-gText_NextAppealMadeEarlier:: @ 827D2DA
+gText_NextAppealMadeEarlier::
 	.string "The next appeal can be\nmade earlier next turn.$"
 
-gText_NextAppealMadeLater:: @ 827D309
+gText_NextAppealMadeLater::
 	.string "The next appeal can be\nmade later next turn.$"
 
-gText_TurnOrderMoreEasilyScrambled:: @ 827D336
+gText_TurnOrderMoreEasilyScrambled::
 	.string "Makes the next turn's order\nmore easily scrambled.$"
 
-gText_ScrambleOrderOfNextAppeals:: @ 827D369
+gText_ScrambleOrderOfNextAppeals::
 	.string "Scrambles the order of\nappeals on the next turn.$"
 
-gText_AppealExcitesAudienceInAnyContest:: @ 827D39A
+gText_AppealExcitesAudienceInAnyContest::
 	.string "An appeal that excites the\naudience in any CONTEST.$"
 
-gText_BadlyStartlesMonsGoodAppeals:: @ 827D3CE
+gText_BadlyStartlesMonsGoodAppeals::
 	.string "Badly startles all POKéMON\nthat made good appeals.$"
 
-gText_AppealBestMoreCrowdExcited:: @ 827D401
+gText_AppealBestMoreCrowdExcited::
 	.string "The appeal works best the\nmore the crowd is excited.$"
 
-gText_TemporarilyStopCrowdExcited:: @ 827D436
+gText_TemporarilyStopCrowdExcited::
 	.string "Temporarily stops the\ncrowd from growing excited.$"
 
 @ Unused move names
 
-gText_RainDance:: @ 827D468
+gText_RainDance::
 	.string "RAIN DANCE$"
 
-gText_Rage:: @ 827D473
+gText_Rage::
 	.string "RAGE$"
 
-gText_FocusEnergy:: @ 827D478
+gText_FocusEnergy::
 	.string "FOCUS ENERGY$"
 
-gText_Hypnosis:: @ 827D485
+gText_Hypnosis::
 	.string "HYPNOSIS$"
 
-gText_Softboiled:: @ 827D48E
+gText_Softboiled::
 	.string "SOFTBOILED$"
 
-gText_HornAttack:: @ 827D499
+gText_HornAttack::
 	.string "HORN ATTACK$"
 
-gText_SwordsDance:: @ 827D4A5
+gText_SwordsDance::
 	.string "SWORDS DANCE$"
 
-gText_Conversion:: @ 827D4B2
+gText_Conversion::
 	.string "CONVERSION$"
 
-gText_SunnyDay:: @ 827D4BD
+gText_SunnyDay::
 	.string "SUNNY DAY$"
 
-gText_Rest2:: @ 827D4C7
+gText_Rest2::
 	.string "REST$"
 
-gText_Vicegrip:: @ 827D4CC
+gText_Vicegrip::
 	.string "VICEGRIP$"
 
-gText_DefenseCurl:: @ 827D4D5
+gText_DefenseCurl::
 	.string "DEFENSE CURL$"
 
-gText_LockOn:: @ 827D4E2
+gText_LockOn::
 	.string "LOCK-ON$"
 
 @ Contest type names
 
-gContestMoveTypeCoolText:: @ 827D4EA
+gContestMoveTypeCoolText::
 	.string "COOL$"
 
-gContestMoveTypeBeautyText:: @ 827D4EF
+gContestMoveTypeBeautyText::
 	.string "BEAUTY$"
 
-gContestMoveTypeCuteText:: @ 827D4F6
+gContestMoveTypeCuteText::
 	.string "CUTE$"
 
-gContestMoveTypeSmartText:: @ 827D4FB
+gContestMoveTypeSmartText::
 	.string "SMART$"
 
-gContestMoveTypeToughText:: @ 827D501
+gContestMoveTypeToughText::
 	.string "TOUGH$"
 
-gText_AppealNumWhichMoveWillBePlayed:: @ 827D507
+gText_AppealNumWhichMoveWillBePlayed::
 	.string "Appeal no. {STR_VAR_1}!\n"
 	.string "Which move will be played?$"
 
-gText_AppealNumButItCantParticipate:: @ 827D531
+gText_AppealNumButItCantParticipate::
 	.string "Appeal no. {STR_VAR_1}!\n"
 	.string "But it can't participate!$"
 
-gText_MonAppealedWithMove:: @ 827D55A
+gText_MonAppealedWithMove::
 	.string "{STR_VAR_1} appealed with\n"
 	.string "{STR_VAR_2}!$"
 
-gText_MonWasWatchingOthers:: @ 827D56F
+gText_MonWasWatchingOthers::
 	.string "{STR_VAR_1} was watching\n"
 	.string "the others.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_AllOutOfAppealTime:: @ 827D597
+gText_AllOutOfAppealTime::
 	.string "We're all out of\n"
 	.string "Appeal Time!{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
 @ Unused appeal result texts
 
-gText_ButAppealWasJammed:: @ 827D5C1
+gText_ButAppealWasJammed::
 	.string "But the appeal was\n"
 	.string "jammed.$"
 
-gText_FollowedAnotherMonsLead:: @ 827D5DC
+gText_FollowedAnotherMonsLead::
 	.string "It followed another\n"
 	.string "POKéMON's lead.$"
 
-gText_ButItMessedUp:: @ 827D600
+gText_ButItMessedUp::
 	.string "But it messed up.$"
 
-gText_WentBetterThanUsual:: @ 827D612
+gText_WentBetterThanUsual::
 	.string "It went better than\n"
 	.string "usual.$"
 
-gText_JudgeLookedAwayForSomeReason:: @ 827D62D
+gText_JudgeLookedAwayForSomeReason::
 	.string "The JUDGE looked away\n"
 	.string "for some reason.$"
 
-gText_WorkedHardToBuildOnPastMistakes:: @ 827D654
+gText_WorkedHardToBuildOnPastMistakes::
 	.string "It worked hard to build on\n"
 	.string "past mistakes.$"
 
-gText_CantMakeAnyMoreMoves:: @ 827D67E
+gText_CantMakeAnyMoreMoves::
 	.string "It can't make any more\n"
 	.string "moves.$"
 
-gText_WorkedFrighteninglyWell:: @ 827D69C
+gText_WorkedFrighteninglyWell::
 	.string "It worked frighteningly\n"
 	.string "well.$"
 
-gText_WorkedHardAsStandoutMon:: @ 827D6BA
+gText_WorkedHardAsStandoutMon::
 	.string "It worked as hard as the\n"
 	.string "standout POKéMON.$"
 
-gText_JudgedLookedOnExpectantly:: @ 827D6E5
+gText_JudgedLookedOnExpectantly::
 	.string "The JUDGE looked on\n"
 	.string "expectantly.$"
 
-gText_WorkedRatherWell:: @ 827D706
+gText_WorkedRatherWell::
 	.string "It worked rather well.$"
 
-gText_WorkedLittleBetterThanUsual:: @ 827D71D
+gText_WorkedLittleBetterThanUsual::
 	.string "It worked a little better\n"
 	.string "than usual.$"
 
 @ Round result texts
 
-gText_MonFailedToStandOutAtAll:: @ 827D743
+gText_MonFailedToStandOutAtAll::
 	.string "{STR_VAR_1} failed to\n"
 	.string "stand out at all…{PAUSE_UNTIL_PRESS}$"
 
-gText_MonDidntStandOutVeryMuch:: @ 827D764
+gText_MonDidntStandOutVeryMuch::
 	.string "{STR_VAR_1} didn't stand\n"
 	.string "out very much…{PAUSE_UNTIL_PRESS}$"
 
-gText_MonCaughtALittleAttention:: @ 827D785
+gText_MonCaughtALittleAttention::
 	.string "{STR_VAR_1} caught a\n"
 	.string "little attention.{PAUSE_UNTIL_PRESS}$"
 
-gText_MonAttractedALotOfAttention:: @ 827D7A5
+gText_MonAttractedALotOfAttention::
 	.string "{STR_VAR_1} attracted a\n"
 	.string "lot of attention.{PAUSE_UNTIL_PRESS}$"
 
-gText_MonCommandedTotalAttention:: @ 827D7C8
+gText_MonCommandedTotalAttention::
 	.string "{STR_VAR_1} commanded\n"
 	.string "total attention.{PAUSE_UNTIL_PRESS}$"
 
-gText_MonHasntMadeItsAppeal:: @ 827D7E8
+gText_MonHasntMadeItsAppeal::
 	.string "{STR_VAR_1} hasn't made\n"
 	.string "its appeal.{PAUSE_UNTIL_PRESS}$"
 
 @ Unused
-gText_AnticipationSwelledForMonsAppealNext2:: @ 827D805
+gText_AnticipationSwelledForMonsAppealNext2::
 	.string "Anticipation swelled for\n"
 	.string "{STR_VAR_1}'s appeal next.$"
 
-gText_EmptyContestString:: @ 827D830
+gText_EmptyContestString::
 	.string "$"
 
-gText_JudgesViewsOnMonHeldFirm:: @ 827D831
+gText_JudgesViewsOnMonHeldFirm::
 	.string "The JUDGE 's views on\n"
 	.string "{STR_VAR_1} held firm.$"
 
-gText_MonsXChangedPerceptions:: @ 827D855
+gText_MonsXChangedPerceptions::
 	.string "{STR_VAR_1}'s {STR_VAR_3}\n"
 	.string "changed perceptions.$"
 
-gText_MonsAppealEffectWoreOff:: @ 827D872
+gText_MonsAppealEffectWoreOff::
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "effect wore off.$"
 
-gText_SpecialAppealsEffectWoreOff:: @ 827D88F
+gText_SpecialAppealsEffectWoreOff::
 	.string "The special appeal's\n"
 	.string "effect wore off.$"
 
-gText_EveryonesAppealsMadeToLookSame:: @ 827D8B5
+gText_EveryonesAppealsMadeToLookSame::
 	.string "Everyone's appeals were\n"
 	.string "made to look the same.$"
 
-gText_CheapenedMonsAppeal:: @ 827D8E4
+gText_CheapenedMonsAppeal::
 	.string "It cheapened\n"
 	.string "{STR_VAR_2}'s appeal.$"
 
-gText_CheapenedAppealOfThoseAhead:: @ 827D8FE
+gText_CheapenedAppealOfThoseAhead::
 	.string "It cheapened the appeal\n"
 	.string "of those ahead.$"
 
-gText_StoleAttentionAwayFromMon:: @ 827D926
+gText_StoleAttentionAwayFromMon::
 	.string "It stole attention away\n"
 	.string "from {STR_VAR_2}.$"
 
-gText_CheapenedMonsAppeal2:: @ 827D947
+gText_CheapenedMonsAppeal2::
 	.string "It cheapened\n"
 	.string "{STR_VAR_2}'s appeal.$"
 
-gText_SeverelyCheapenedOtherAppeals:: @ 827D961
+gText_SeverelyCheapenedOtherAppeals::
 	.string "It severely cheapened\n"
 	.string "other appeals.$"
 
-gText_AnticipationSwelledForMonsAppealNext:: @ 827D986
+gText_AnticipationSwelledForMonsAppealNext::
 	.string "Anticipation swelled for\n"
 	.string "{STR_VAR_1}'s appeal next.$"
 
-gText_CheapenedAppealOfThoseAhead2:: @ 827D9B1
+gText_CheapenedAppealOfThoseAhead2::
 	.string "It cheapened the appeal\n"
 	.string "of those ahead.$"
 
-gText_CheapenedJudgesFavoriteAppeal:: @ 827D9D9
+gText_CheapenedJudgesFavoriteAppeal::
 	.string "It cheapened the JUDGE's\n"
 	.string "favorite appeal.$"
 
-gText_AppealsOfOthersCheapenedByHalf:: @ 827DA03
+gText_AppealsOfOthersCheapenedByHalf::
 	.string "The appeals of others\n"
 	.string "were cheapened by half.$"
 
-gText_StoodOutToMakeUpForBeingJammed:: @ 827DA31
+gText_StoodOutToMakeUpForBeingJammed::
 	.string "It stood out to make up\n"
 	.string "for being jammed.$"
 
-gText_CantParticipateInAppealsAnyMore:: @ 827DA5B
+gText_CantParticipateInAppealsAnyMore::
 	.string "It can't participate in\n"
 	.string "appeals any more.$"
 
-gText_TouchedJudgeForFantasticAppeal:: @ 827DA85
+gText_TouchedJudgeForFantasticAppeal::
 	.string "It touched the JUDGE for\n"
 	.string "a fantastic appeal.$"
 
-gText_AnticipationRoseForUpcomingAppeals:: @ 827DAB2
+gText_AnticipationRoseForUpcomingAppeals::
 	.string "Anticipation rose for\n"
 	.string "upcoming appeals.$"
 
-gText_StoodOutAsMuchAsSpecialAppeals:: @ 827DADA
+gText_StoodOutAsMuchAsSpecialAppeals::
 	.string "It stood out as much as\n"
 	.string "special appeals.$"
 
-gText_StoodOutAsMuchAsMon:: @ 827DB03
+gText_StoodOutAsMuchAsMon::
 	.string "It stood out as much as\n"
 	.string "{STR_VAR_1}.$"
 
-gText_JammedAppealsMadeEvenLessNoticeable:: @ 827DB1F
+gText_JammedAppealsMadeEvenLessNoticeable::
 	.string "Jammed appeals were made\n"
 	.string "even less noticeable.$"
 
-gText_EveryonesAppealsMadeSame:: @ 827DB4E
+gText_EveryonesAppealsMadeSame::
 	.string "Everyone's appeals were\n"
 	.string "made the same.$"
 
 @ Appeal result texts
 
-gText_BecameMoreConsciousOfOtherMons:: @ 827DB75
+gText_BecameMoreConsciousOfOtherMons::
 	.string "It became more conscious\n"
 	.string "of the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonCantMakeAnAppealAfterThis:: @ 827DBB0
+gText_MonCantMakeAnAppealAfterThis::
 	.string "{STR_VAR_1} can't make an\n"
 	.string "appeal after this.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_SettledDownJustLittleBit:: @ 827DBE0
+gText_SettledDownJustLittleBit::
 	.string "It settled down just a\n"
 	.string "little bit.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_BecameObliviousToOtherMons:: @ 827DC0F
+gText_BecameObliviousToOtherMons::
 	.string "It became oblivious to\n"
 	.string "the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_BecameLessAwareOfOtherMons:: @ 827DC45
+gText_BecameLessAwareOfOtherMons::
 	.string "It became less aware of\n"
 	.string "the other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_StoppedCaringAboutOtherMons:: @ 827DC7C
+gText_StoppedCaringAboutOtherMons::
 	.string "It stopped caring about\n"
 	.string "other POKéMON much.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_TriedToStartleOtherMons:: @ 827DCB4
+gText_TriedToStartleOtherMons::
 	.string "It tried to startle the\n"
 	.string "other POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_TriedToDazzleOthers:: @ 827DCE7
+gText_TriedToDazzleOthers::
 	.string "It tried to dazzle the\n"
 	.string "others.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_JudgeLookedAwayFromMon:: @ 827DD12
+gText_JudgeLookedAwayFromMon::
 	.string "The JUDGE looked away\n"
 	.string "from {STR_VAR_1}.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_TriedToUnnerveNextMon:: @ 827DD3D
+gText_TriedToUnnerveNextMon::
 	.string "It tried to unnerve the\n"
 	.string "next POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonBecameNervous:: @ 827DD6F
+gText_MonBecameNervous::
 	.string "{STR_VAR_1} became\n"
 	.string "nervous.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_AppealTriedToUnnerveWaitingMons:: @ 827DD8E
+gText_AppealTriedToUnnerveWaitingMons::
 	.string "The appeal tried to\n"
 	.string "unnerve waiting POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_TauntedMonsDoingWell:: @ 827DDC7
+gText_TauntedMonsDoingWell::
 	.string "It taunted POKéMON\n"
 	.string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonRegainedItsForm:: @ 827DDF2
+gText_MonRegainedItsForm::
 	.string "{STR_VAR_1} regained its\n"
 	.string "form.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_TriedToJamMonDoingWell:: @ 827DE14
+gText_TriedToJamMonDoingWell::
 	.string "It tried to jam POKéMON\n"
 	.string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_StandoutMonHustledEvenMore:: @ 827DE44
+gText_StandoutMonHustledEvenMore::
 	.string "The standout {STR_VAR_1}\n"
 	.string "hustled even more.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_LargelyUnnoticedMonWorkedHard:: @ 827DE73
+gText_LargelyUnnoticedMonWorkedHard::
 	.string "The largely unnoticed\n"
 	.string "{STR_VAR_1} worked hard.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_WorkedAsMuchAsMonBefore:: @ 827DEA5
+gText_WorkedAsMuchAsMonBefore::
 	.string "It worked as much as\n"
 	.string "POKéMON before it.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealDidNotGoWell:: @ 827DED9
+gText_MonsAppealDidNotGoWell::
 	.string "{STR_VAR_1}'s appeal did\n"
 	.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_WorkedAsMuchAsPrecedingMon:: @ 827DF02
+gText_WorkedAsMuchAsPrecedingMon::
 	.string "It worked as much as the\n"
 	.string "preceding POKéMON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealDidNotGoWell2:: @ 827DF3A
+gText_MonsAppealDidNotGoWell2::
 	.string "{STR_VAR_1}'s appeal did\n"
 	.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealDidNotGoWell3:: @ 827DF63
+gText_MonsAppealDidNotGoWell3::
 	.string "{STR_VAR_1}'s appeal did\n"
 	.string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealWentSlightlyWell:: @ 827DF8C
+gText_MonsAppealWentSlightlyWell::
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealWentPrettyWell:: @ 827DFB8
+gText_MonsAppealWentPrettyWell::
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealWentExcellently:: @ 827DFE2
+gText_MonsAppealWentExcellently::
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealWasDud:: @ 827E00C
+gText_MonsAppealWasDud::
 	.string "{STR_VAR_1}'s appeal was\n"
 	.string "a dud.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealDidNotWorkVeryWell:: @ 827E02F
+gText_MonsAppealDidNotWorkVeryWell::
 	.string "{STR_VAR_1}'s appeal did\n"
 	.string "not work very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealWentSlightlyWell2:: @ 827E05F
+gText_MonsAppealWentSlightlyWell2::
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealWentPrettyWell2:: @ 827E08B
+gText_MonsAppealWentPrettyWell2::
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealWentVeryWell:: @ 827E0B5
+gText_MonsAppealWentVeryWell::
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsAppealWentExcellently2:: @ 827E0DD
+gText_MonsAppealWentExcellently2::
 	.string "{STR_VAR_1}'s appeal\n"
 	.string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_SameTypeAsOneBeforeGood:: @ 827E107
+gText_SameTypeAsOneBeforeGood::
 	.string "It's the same type as the\n"
 	.string "POKéMON before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_NotSameTypeAsOneBeforeGood:: @ 827E143
+gText_NotSameTypeAsOneBeforeGood::
 	.string "It's not the same type as\n"
 	.string "the one before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_StoodOutMuchMoreThanMonBefore:: @ 827E17F
+gText_StoodOutMuchMoreThanMonBefore::
 	.string "It stood out much more\n"
 	.string "than the POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_DidntDoAsWellAsMonBefore:: @ 827E1BB
+gText_DidntDoAsWellAsMonBefore::
 	.string "It didn't do as well as the\n"
 	.string "POKéMON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsConditionRoseAboveUsual:: @ 827E1F3
+gText_MonsConditionRoseAboveUsual::
 	.string "{STR_VAR_1}'s condition\n"
 	.string "rose above usual.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MonsHotStatusMadeGreatAppeal:: @ 827E220
+gText_MonsHotStatusMadeGreatAppeal::
 	.string "{STR_VAR_1}'s hot status\n"
 	.string "made it a great appeal!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MovedUpInLineForNextAppeal:: @ 827E254
+gText_MovedUpInLineForNextAppeal::
 	.string "It moved up in line for\n"
 	.string "the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_MovedBackInLineForNextAppeal:: @ 827E289
+gText_MovedBackInLineForNextAppeal::
 	.string "It moved back in line once\n"
 	.string "for the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_ScrambledUpOrderForNextTurn:: @ 827E2C5
+gText_ScrambledUpOrderForNextTurn::
 	.string "It scrambled up the\n"
 	.string "order for the next turn.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
 
-gText_JudgeLookedAtMonExpectantly:: @ 827E2FE
+gText_JudgeLookedAtMonExpectantly::
 	.string "The JUDGE looked at\n"
 	.string "{STR_VAR_1} expectantly.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_AppealComboWentOverWell:: @ 827E32E
+gText_AppealComboWentOverWell::
 	.string "The appeal combo went\n"
 	.string "over well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_AppealComboWentOverVeryWell:: @ 827E35B
+gText_AppealComboWentOverVeryWell::
 	.string "The appeal combo went\n"
 	.string "over very well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_AppealComboWentOverExcellently:: @ 827E38D
+gText_AppealComboWentOverExcellently::
 	.string "The appeal combo went\n"
 	.string "over excellently.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonManagedToAvertGaze:: @ 827E3C1
+gText_MonManagedToAvertGaze::
 	.string "{STR_VAR_1} managed to\n"
 	.string "avert its gaze.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonManagedToAvoidSeeingIt:: @ 827E3EB
+gText_MonManagedToAvoidSeeingIt::
 	.string "{STR_VAR_1} managed to\n"
 	.string "avoid seeing it.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonIsntFazedByThatSortOfThing:: @ 827E416
+gText_MonIsntFazedByThatSortOfThing::
 	.string "{STR_VAR_1} isn't fazed\n"
 	.string "by that sort of thing.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonBecameALittleDistracted:: @ 827E448
+gText_MonBecameALittleDistracted::
 	.string "{STR_VAR_1} became a\n"
 	.string "little distracted.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_TriedToStartleOtherPokemon:: @ 827E473
+gText_TriedToStartleOtherPokemon::
 	.string "It tried to startle the\n"
 	.string "other POKéMON.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonLookedDownOutOfDistraction:: @ 827E4A6
+gText_MonLookedDownOutOfDistraction::
 	.string "{STR_VAR_1} looked down\n"
 	.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonTurnedBackOutOfDistraction:: @ 827E4D5
+gText_MonTurnedBackOutOfDistraction::
 	.string "{STR_VAR_1} turned back\n"
 	.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonCouldntHelpUtteringCry:: @ 827E504
+gText_MonCouldntHelpUtteringCry::
 	.string "{STR_VAR_1} couldn't help\n"
 	.string "uttering a cry.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonCouldntHelpLeapingUp:: @ 827E531
+gText_MonCouldntHelpLeapingUp::
 	.string "{STR_VAR_1} couldn't help\n"
 	.string "leaping up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonTrippedOutOfDistraction:: @ 827E55A
+gText_MonTrippedOutOfDistraction::
 	.string "{STR_VAR_1} tripped over\n"
 	.string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonWasTooNervousToMove:: @ 827E58A
+gText_MonWasTooNervousToMove::
 	.string "{STR_VAR_1} was too\n"
 	.string "nervous to move.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_ButItMessedUp2:: @ 827E5B2
+gText_ButItMessedUp2::
 	.string "But it messed up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_ButItFailedToMakeTargetNervous:: @ 827E5D0
+gText_ButItFailedToMakeTargetNervous::
 	.string "But it failed to make\n"
 	.string "the target nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_ButItFailedToMakeAnyoneNervous:: @ 827E606
+gText_ButItFailedToMakeAnyoneNervous::
 	.string "But it failed to make\n"
 	.string "anyone nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_ButItWasIgnored:: @ 827E638
+gText_ButItWasIgnored::
 	.string "But it was ignored…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_CouldntImproveItsCondition:: @ 827E658
+gText_CouldntImproveItsCondition::
 	.string "But it couldn't improve\n"
 	.string "its condition…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_BadConditionResultedInWeakAppeal:: @ 827E68B
+gText_BadConditionResultedInWeakAppeal::
 	.string "Its bad condition\n"
 	.string "resulted in a weak appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonWasUnaffected:: @ 827E6C4
+gText_MonWasUnaffected::
 	.string "{STR_VAR_1} was\n"
 	.string "unaffected.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_RepeatedAppeal:: @ 827E6E3
+gText_RepeatedAppeal::
 	.string "{STR_VAR_1} disappointed\n"
 	.string "by repeating an appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonsXWentOverGreat:: @ 827E717
+gText_MonsXWentOverGreat::
 	.string "{STR_VAR_1}'s {STR_VAR_3}\n"
 	.string "went over great.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonsXDidntGoOverWell:: @ 827E73C
+gText_MonsXDidntGoOverWell::
 	.string "{STR_VAR_1}'s {STR_VAR_3}\n"
 	.string "didn't go over well here…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonsXGotTheCrowdGoing:: @ 827E76A
+gText_MonsXGotTheCrowdGoing::
 	.string "{STR_VAR_1}'s {STR_VAR_3}\n"
 	.string "got the crowd going.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonCantAppealNextTurn:: @ 827E793
+gText_MonCantAppealNextTurn::
 	.string "{STR_VAR_1} can't appeal\n"
 	.string "next turn…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_AttractedCrowdsAttention:: @ 827E7BA
+gText_AttractedCrowdsAttention::
 	.string "It attracted the crowd's\n"
 	.string "attention.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_CrowdContinuesToWatchMon:: @ 827E7EA
+gText_CrowdContinuesToWatchMon::
 	.string "The crowd continues to\n"
 	.string "watch {STR_VAR_3}.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_MonsMoveIsIgnored:: @ 827E817
+gText_MonsMoveIsIgnored::
 	.string "{STR_VAR_1}'s\n"
 	.string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-gText_Contest_Shyness:: @ 827E837
+gText_Contest_Shyness::
 	.string "shyness$"
 
-gText_Contest_Anxiety:: @ 827E83F
+gText_Contest_Anxiety::
 	.string "anxiety$"
 
-gText_Contest_Laziness:: @ 827E847
+gText_Contest_Laziness::
 	.string "laziness$"
 
-gText_Contest_Hesitancy:: @ 827E850
+gText_Contest_Hesitancy::
 	.string "hesitancy$"
 
-gText_Contest_Fear:: @ 827E85A
+gText_Contest_Fear::
 	.string "fear$"
 
-gText_Contest_Coolness:: @ 827E85F
+gText_Contest_Coolness::
 	.string "coolness$"
 
-gText_Contest_Beauty:: @ 827E868
+gText_Contest_Beauty::
 	.string "beauty$"
 
-gText_Contest_Cuteness:: @ 827E86F
+gText_Contest_Cuteness::
 	.string "cuteness$"
 
-gText_Contest_Smartness:: @ 827E878
+gText_Contest_Smartness::
 	.string "smartness$"
 
-gText_Contest_Toughness:: @ 827E882
+gText_Contest_Toughness::
 	.string "toughness$"
 
 @ Unused
-gText_Tension:: @ 827E88C
+gText_Tension::
 	.string "TENSION$"
 
-gText_CoolMove:: @ 827E894
+gText_CoolMove::
 	.string "COOL Move$"
 
-gText_BeautyMove:: @ 827E89E
+gText_BeautyMove::
 	.string "BEAUTY Move$"
 
-gText_CuteMove:: @ 827E8AA
+gText_CuteMove::
 	.string "CUTE Move$"
 
-gText_SmartMove:: @ 827E8B4
+gText_SmartMove::
 	.string "SMART Move$"
 
-gText_ToughMove:: @ 827E8BF
+gText_ToughMove::
 	.string "TOUGH Move$"
 
-gText_3QuestionMarks:: @ 827E8CA
+gText_3QuestionMarks::
 	.string "???$"
diff --git a/data/text/event_ticket_1.inc b/data/text/event_ticket_1.inc
index da4d525f6..cd2b4219d 100644
--- a/data/text/event_ticket_1.inc
+++ b/data/text/event_ticket_1.inc
@@ -1,16 +1,16 @@
-EventTicket_Text_ShowOldSeaMap: @ 82A6848
+EventTicket_Text_ShowOldSeaMap:
 	.string "The ferry to SLATEPORT is…\p"
 	.string "I beg your pardon?\n"
 	.string "Can we sail to this place on the map?\p"
 	.string "I know someone who will help you better.\n"
 	.string "Please wait.$"
 
-EventTicket_Text_ThatPass: @ 82A68D2
+EventTicket_Text_ThatPass:
 	.string "The ferry to SLATEPORT is…\p"
 	.string "Oh?\n"
 	.string "That PASS…$"
 
-EventTicket_Text_ShowEonTicket: @ 82A68FC
+EventTicket_Text_ShowEonTicket:
 	.string "Aye, mate, are you the one who brought\n"
 	.string "that mighty odd PASS?\p"
 	.string "I'll tell you, you're trying to reach a\n"
@@ -20,22 +20,22 @@ EventTicket_Text_ShowEonTicket: @ 82A68FC
 	.string "That shivers my timbers!\p"
 	.string "All aboard!$"
 
-EventTicket_Text_SouthernIslandSailBack: @ 82A69F1
+EventTicket_Text_SouthernIslandSailBack:
 	.string "Aye, mate, there's nothing here to\n"
 	.string "see or do on this forgettable island.\p"
 	.string "What say we sail back to LILYCOVE?$"
 
-EventTicket_Text_SailHome: @ 82A6A5D
+EventTicket_Text_SailHome:
 	.string "Aye, right, then!\n"
 	.string "Sail home we will!$"
 
-EventTicket_Text_AsYouLike: @ 82A6A82
+EventTicket_Text_AsYouLike:
 	.string "Aye, right, as you like, then.$"
 
-SouthernIsland_Interior_Text_Sign: @ 82A6AA1
+SouthernIsland_Interior_Text_Sign:
 	.string "“All dreams are but another reality.\n"
 	.string "Never forget…”$"
 
-SouthernIsland_Exterior_Text_Sign: @ 82A6AD5
+SouthernIsland_Exterior_Text_Sign:
 	.string "“Those whose memories fade seek to\n"
 	.string "carve them in their hearts…”$"
diff --git a/data/text/event_ticket_2.inc b/data/text/event_ticket_2.inc
index e081edbd9..0165b5fde 100644
--- a/data/text/event_ticket_2.inc
+++ b/data/text/event_ticket_2.inc
@@ -1,4 +1,4 @@
-EventTicket_Text_OldSeaMapTooFar: @ 82C68A5
+EventTicket_Text_OldSeaMapTooFar:
     .string "What's up, youngster?\p"
     .string "What, it's you who's supposed to have\n"
     .string "a tattered old map?\p"
@@ -7,12 +7,12 @@ EventTicket_Text_OldSeaMapTooFar: @ 82C68A5
     .string "Boy, this is quite a ways away.\n"
     .string "I'm afraid I can't help you…$"
 
-EventTicket_Text_BrineyHoldOnASecond: @ 82C6951
+EventTicket_Text_BrineyHoldOnASecond:
     .string "BRINEY: Hold on a second!\p"
     .string "What's the idea of turning down\n"
     .string "someone that I owe so much to?$"
 
-EventTicket_Text_BrineyLetsSail: @ 82C69AA
+EventTicket_Text_BrineyLetsSail:
     .string "{PLAYER}{KUN}, I'm terribly sorry.\p"
     .string "You came to me seeking my help,\n"
     .string "and we almost turned you away.\p"
@@ -21,7 +21,7 @@ EventTicket_Text_BrineyLetsSail: @ 82C69AA
     .string "Let's find this island on\n"
     .string "this OLD SEA MAP!$"
 
-EventTicket_Text_OddTicketGetOnBoard: @ 82C6A71
+EventTicket_Text_OddTicketGetOnBoard:
     .string "Is it you who brought that odd\n"
     .string "ticket?\p"
     .string "Where you're trying to go is an island\n"
@@ -31,16 +31,16 @@ EventTicket_Text_OddTicketGetOnBoard: @ 82C6A71
     .string "as a sailing man!\p"
     .string "Get on board, youngster!$"
 
-FarawayIsland_Entrance_Text_SailorReturn: @ 82C6B42
+FarawayIsland_Entrance_Text_SailorReturn:
     .string "CAPT. BRINEY can be so maddeningly\n"
     .string "fickle…\p"
     .string "Do you want to return to LILYCOVE?$"
 
-BirthIsland_Harbor_Text_SailorReturn: @ 82C6B90
+BirthIsland_Harbor_Text_SailorReturn:
     .string "What an oddly shaped island, eh?\n"
     .string "Do you want to return to LILYCOVE?$"
 
-EventTicket_Text_OddTicketsWhereTo: @ 82C6BD4
+EventTicket_Text_OddTicketsWhereTo:
     .string "Is it you who brought those\n"
     .string "odd tickets?\p"
     .string "… … …Hm.\p"
@@ -53,13 +53,13 @@ EventTicket_Text_OddTicketsWhereTo: @ 82C6BD4
     .string "Get on board, youngster!\n"
     .string "Where shall we sail first?$"
 
-NavelRock_Harbor_Text_SailorReturn: @ 82C6CE6
+NavelRock_Harbor_Text_SailorReturn:
     .string "Did… Did you hear that?\n"
     .string "That low growling from deep in there.\p"
     .string "Are you sure it's safe?\n"
     .string "Do you think we should leave?$"
 
-FarawayIsland_Entrance_Text_Sign: @ 82C6D5A
+FarawayIsland_Entrance_Text_Sign:
     .string "The writing is fading as if it was\n"
     .string "written a long time ago…\p"
     .string "“…ber, 6th day\n"
@@ -67,5 +67,5 @@ FarawayIsland_Entrance_Text_Sign: @ 82C6D5A
     .string "again…et it be a kindhearted pers…\l"
     .string "…ith that hope, I depar…”$"
 
-FarawayIsland_Interior_Text_Mew: @ 82C6DFF
+FarawayIsland_Interior_Text_Mew:
     .string "Myuu…$"
diff --git a/data/text/frontier_brain.inc b/data/text/frontier_brain.inc
index 3bce8076e..1292f2a56 100644
--- a/data/text/frontier_brain.inc
+++ b/data/text/frontier_brain.inc
@@ -1,108 +1,108 @@
 @ Battle Tower
-gText_AnabelWonSilver:: @ 82C843F
+gText_AnabelWonSilver::
 	.string "It's very disappointing…$"
 
-gText_AnabelDefeatSilver:: @ 82C8458
+gText_AnabelDefeatSilver::
 	.string "Okay, I understand…$"
 
-gText_AnabelWonGold:: @ 82C846C
+gText_AnabelWonGold::
 	.string "I'm terribly sorry…$"
 
-gText_AnabelDefeatGold:: @ 82C8480
+gText_AnabelDefeatGold::
 	.string "Thank you…$"
 
 @ Battle Dome
-gText_TuckerWonSilver:: @ 82C848B
+gText_TuckerWonSilver::
 	.string "Ahahaha! Aren't you embarrassed?\n"
 	.string "Everyone's watching!$"
 
-gText_TuckerDefeatSilver:: @ 82C84C1
+gText_TuckerDefeatSilver::
 	.string "Grr…\n"
 	.string "What the…$"
 
-gText_TuckerWonGold:: @ 82C84D0
+gText_TuckerWonGold::
 	.string "My DOME ACE title isn't just for show!$"
 
-gText_TuckerDefeatGold:: @ 82C84F7
+gText_TuckerDefeatGold::
 	.string "Ahahaha!\n"
 	.string "You're inspiring!$"
 
 @ Battle Factory
-gText_NolandWonSilver:: @ 82C8512
+gText_NolandWonSilver::
 	.string "Way to work!\n"
 	.string "That was a good lesson, eh?$"
 
-gText_NolandDefeatSilver:: @ 82C853B
+gText_NolandDefeatSilver::
 	.string "Good job!\n"
 	.string "You know what you're doing!$"
 
-gText_NolandWonGold:: @ 82C8561
+gText_NolandWonGold::
 	.string "Hey, hey, hey!\n"
 	.string "You're finished already?$"
 
-gText_NolandDefeatGold:: @ 82C8589
+gText_NolandDefeatGold::
 	.string "What happened here?$"
 
 @ Battle Pike
-gText_LucyWonSilver:: @ 82C859D
+gText_LucyWonSilver::
 	.string "Humph…$"
 
-gText_LucyDefeatSilver:: @ 82C85A4
+gText_LucyDefeatSilver::
 	.string "Urk…$"
 
-gText_LucyWonGold:: @ 82C85A9
+gText_LucyWonGold::
 	.string "Hah!$"
 
-gText_LucyDefeatGold:: @ 82C85AE
+gText_LucyDefeatGold::
 	.string "Darn!$"
 
 @ Battle Arena
-gText_GretaWonSilver:: @ 82C85B4
+gText_GretaWonSilver::
 	.string "Oh, come on!\n"
 	.string "You have to try harder than that!$"
 
-gText_GretaDefeatSilver:: @ 82C85E3
+gText_GretaDefeatSilver::
 	.string "No way!\n"
 	.string "Good job!$"
 
-gText_GretaWonGold:: @ 82C85F5
+gText_GretaWonGold::
 	.string "Heheh!\n"
 	.string "What did you expect?$"
 
-gText_GretaDefeatGold:: @ 82C8611
+gText_GretaDefeatGold::
 	.string "Huh?\n"
 	.string "Are you serious?!$"
 
 @ Battle Palace
-gText_SpenserWonSilver:: @ 82C8628
+gText_SpenserWonSilver::
 	.string "Your POKéMON are wimpy because\n"
 	.string "you're wimpy as a TRAINER!$"
 
-gText_SpenserDefeatSilver:: @ 82C8662
+gText_SpenserDefeatSilver::
 	.string "Ah…\n"
 	.string "Now this is something else…$"
 
-gText_SpenserWonGold:: @ 82C8682
+gText_SpenserWonGold::
 	.string "Gwahahaha!\n"
 	.string "My brethren, we have nothing to fear!$"
 
-gText_SpenserDefeatGold:: @ 82C86B3
+gText_SpenserDefeatGold::
 	.string "Gwah!\n"
 	.string "Hahahaha!$"
 
 @ Battle Pyramid
-gText_BrandonWonSilver:: @ 82C86C3
+gText_BrandonWonSilver::
 	.string "Hey! What's wrong with you!\n"
 	.string "Let's see some effort! Get up!$"
 
-gText_BrandonDefeatSilver:: @ 82C86FE
+gText_BrandonDefeatSilver::
 	.string "That's it! You've done great!\n"
 	.string "You've worked hard for this!$"
 
-gText_BrandonWonGold:: @ 82C8739
+gText_BrandonWonGold::
 	.string "Hey! Don't you give up now!\n"
 	.string "Get up! Don't lose faith in yourself!$"
 
-gText_BrandonDefeatGold:: @ 82C877B
+gText_BrandonDefeatGold::
 	.string "That's it! You've done it!\n"
 	.string "You kept working for this!$"
diff --git a/data/text/lottery_corner.inc b/data/text/lottery_corner.inc
index 102e6b4a2..44571ef56 100644
--- a/data/text/lottery_corner.inc
+++ b/data/text/lottery_corner.inc
@@ -1,4 +1,4 @@
-LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket: @ 82A6390
+LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket:
 	.string "This is the POKéMON LOTTERY CORNER.\p"
 	.string "All shoppers at our DEPARTMENT STORE\n"
 	.string "get to draw a POKéMON LOTO TICKET.\p"
@@ -8,70 +8,70 @@ LilycoveCity_DepartmentStore_1F_Text_LotteryCornerDrawTicket: @ 82A6390
 	.string "Would you like to draw a POKéMON\n"
 	.string "LOTO TICKET?$"
 
-LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow: @ 82A6496
+LilycoveCity_DepartmentStore_1F_Text_ComeBackTomorrow:
 	.string "Please come back tomorrow.$"
 
-LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain: @ 82A64B1
+LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain:
 	.string "Please do visit again.$"
 
-LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket: @ 82A64C8
+LilycoveCity_DepartmentStore_1F_Text_PleasePickTicket:
 	.string "Please pick a LOTO TICKET.\n"
 	.string "…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}…{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
 
-LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait: @ 82A650B
+LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait:
 	.string "The LOTO TICKET number is {STR_VAR_1}.\p"
 	.string "I need to run a check on this number\n"
 	.string "to see if it matches any of your\l"
 	.string "POKéMON's ID numbers. Please wait.$"
 
-LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon: @ 82A6592
+LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPartyMon:
 	.string "Congratulations!\p"
 	.string "The ID number of your team's\n"
 	.string "{STR_VAR_1} matches your\l"
 	.string "LOTO TICKET's number!$"
 
-LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon: @ 82A65E6
+LilycoveCity_DepartmentStore_1F_Text_TicketMatchesPCMon:
 	.string "Congratulations!\p"
 	.string "The ID number of your PC-boxed\n"
 	.string "{STR_VAR_1} matches your\l"
 	.string "LOTO TICKET's number!$"
 
-LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched: @ 82A663C
+LilycoveCity_DepartmentStore_1F_Text_NoNumbersMatched:
 	.string "I'm sorry.\n"
 	.string "None of the numbers matched.$"
 
-LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched: @ 82A6664
+LilycoveCity_DepartmentStore_1F_Text_TwoDigitsMatched:
 	.string "Two digits matched, so you win the\n"
 	.string "third prize!\l"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched: @ 82A66A7
+LilycoveCity_DepartmentStore_1F_Text_ThreeDigitsMatched:
 	.string "Three digits matched, so you win the\n"
 	.string "second prize!\l"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched: @ 82A66ED
+LilycoveCity_DepartmentStore_1F_Text_FourDigitsMatched:
 	.string "Four digits matched, so you win the\n"
 	.string "first prize!\l"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched: @ 82A6731
+LilycoveCity_DepartmentStore_1F_Text_AllFiveDigitsMatched:
 	.string "Oh, my goodness, all five digits\n"
 	.string "matched!\p"
 	.string "You've won the jackpot prize!\n"
 	.string "You've won the {STR_VAR_1}!$"
 
-LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis: @ 82A678C
+LilycoveCity_DepartmentStore_1F_Text_NoRoomForThis:
 	.string "Oh?\n"
 	.string "You seem to have no room for this.\p"
 	.string "Please make room in your BAG and\n"
 	.string "let me know.$"
 
-LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding: @ 82A67E1
+LilycoveCity_DepartmentStore_1F_Text_PrizeWeveBeenHolding:
 	.string "{PLAYER}?\n"
 	.string "Yes, I've been expecting you.\p"
 	.string "This is the prize we've been holding\n"
 	.string "for you.$"
 
-LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2: @ 82A6831
+LilycoveCity_DepartmentStore_1F_Text_PleaseVisitAgain2:
 	.string "Please do visit again.$"
diff --git a/data/text/mart_clerk.inc b/data/text/mart_clerk.inc
index 2357963be..891fb937e 100644
--- a/data/text/mart_clerk.inc
+++ b/data/text/mart_clerk.inc
@@ -1,10 +1,10 @@
-gText_HowMayIServeYou:: @ 8272A21
+gText_HowMayIServeYou::
 	.string "Welcome!\p"
 	.string "How may I serve you?$"
 
-gText_PleaseComeAgain:: @ 8272A3F
+gText_PleaseComeAgain::
 	.string "Please come again!$"
 
-gText_PlayerWhatCanIDoForYou:: @ 8272A52
+gText_PlayerWhatCanIDoForYou::
 	.string "{PLAYER}{STRING 5}, welcome!\p"
 	.string "What can I do for you?$"
diff --git a/data/text/match_call.inc b/data/text/match_call.inc
index 568ed2a86..63aac8aa8 100644
--- a/data/text/match_call.inc
+++ b/data/text/match_call.inc
@@ -1,4 +1,4 @@
-MatchCall_WildBattleText1:: @ 82A971C
+MatchCall_WildBattleText1::
 	.string "Hi! {PLAYER}{KUN}, hello!\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "I saw this {STR_VAR_2} a while back\n"
@@ -6,7 +6,7 @@ MatchCall_WildBattleText1:: @ 82A971C
 	.string "It was so close, too!\n"
 	.string "Well, see you again!$"
 
-MatchCall_WildBattleText2:: @ 82A9798
+MatchCall_WildBattleText2::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "I tried to catch a nice {STR_VAR_2}\n"
@@ -15,7 +15,7 @@ MatchCall_WildBattleText2:: @ 82A9798
 	.string "I was sure disappointed!\p"
 	.string "Okay, bye!$"
 
-MatchCall_WildBattleText3:: @ 82A9813
+MatchCall_WildBattleText3::
 	.string "Hey there, {PLAYER}!\n"
 	.string "It's me, {STR_VAR_1}.\p"
 	.string "I just took a shot at catching\n"
@@ -24,7 +24,7 @@ MatchCall_WildBattleText3:: @ 82A9813
 	.string "It spoiled my day…\n"
 	.string "All right, see you!$"
 
-MatchCall_WildBattleText4:: @ 82A98A8
+MatchCall_WildBattleText4::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "You know the POKéMON {STR_VAR_2}?\n"
@@ -35,7 +35,7 @@ MatchCall_WildBattleText4:: @ 82A98A8
 	.string "sure, though.\p"
 	.string "Okay, catch you later.$"
 
-MatchCall_WildBattleText5:: @ 82A9977
+MatchCall_WildBattleText5::
 	.string "Hiya, {PLAYER}{KUN}!\n"
 	.string "It's {STR_VAR_1}.\l"
 	.string "Catching any POKéMON lately?\p"
@@ -43,7 +43,7 @@ MatchCall_WildBattleText5:: @ 82A9977
 	.string "nabbing one, but it got loose.\p"
 	.string "Right, take care!$"
 
-MatchCall_WildBattleText6:: @ 82A99FD
+MatchCall_WildBattleText6::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\l"
 	.string "Caught any POKéMON lately?\p"
@@ -51,7 +51,7 @@ MatchCall_WildBattleText6:: @ 82A99FD
 	.string "But it evaded me somehow.\p"
 	.string "You take care.$"
 
-MatchCall_WildBattleText7:: @ 82A9A78
+MatchCall_WildBattleText7::
 	.string "…Uh, {PLAYER}{KUN}?\n"
 	.string "It's me, {STR_VAR_1}.\p"
 	.string "Oh, wait! Wait!\n"
@@ -59,7 +59,7 @@ MatchCall_WildBattleText7:: @ 82A9A78
 	.string "Aaarrrgh! It bolted loose!\n"
 	.string "That wasn't just close!$"
 
-MatchCall_WildBattleText8:: @ 82A9AE8
+MatchCall_WildBattleText8::
 	.string "Oh, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1} speaking.\p"
 	.string "Have you had success catching\n"
@@ -69,7 +69,7 @@ MatchCall_WildBattleText8:: @ 82A9AE8
 	.string "I need to try harder!\n"
 	.string "See you again!$"
 
-MatchCall_WildBattleText9:: @ 82A9BA7
+MatchCall_WildBattleText9::
 	.string "Oh, {PLAYER}{KUN}, hi there!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "So? Are you getting more POKéMON\n"
@@ -78,7 +78,7 @@ MatchCall_WildBattleText9:: @ 82A9BA7
 	.string "They all get away from me!\p"
 	.string "See you!$"
 
-MatchCall_WildBattleText10:: @ 82A9C36
+MatchCall_WildBattleText10::
 	.string "Oh, {PLAYER}{KUN}, hello…\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "Listen, I came within a whisker of\n"
@@ -87,7 +87,7 @@ MatchCall_WildBattleText10:: @ 82A9C36
 	.string "I need to try harder.\n"
 	.string "See you around.$"
 
-MatchCall_WildBattleText11:: @ 82A9CC8
+MatchCall_WildBattleText11::
 	.string "Ah, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\l"
 	.string "How are things with you?\p"
@@ -95,7 +95,7 @@ MatchCall_WildBattleText11:: @ 82A9CC8
 	.string "earlier, but it managed to flee.\p"
 	.string "I feel defeated…$"
 
-MatchCall_WildBattleText12:: @ 82A9D44
+MatchCall_WildBattleText12::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "Are you still catching POKéMON?\p"
@@ -103,7 +103,7 @@ MatchCall_WildBattleText12:: @ 82A9D44
 	.string "myself, but it's not so easy.\p"
 	.string "The way of POKéMON is deep!$"
 
-MatchCall_WildBattleText13:: @ 82A9DD7
+MatchCall_WildBattleText13::
 	.string "Ah, hello, {PLAYER}{KUN}!\n"
 	.string "This is {STR_VAR_1}!\l"
 	.string "Have you been catching POKéMON?\p"
@@ -111,7 +111,7 @@ MatchCall_WildBattleText13:: @ 82A9DD7
 	.string "myself, but with little success.\p"
 	.string "The way of POKéMON is deep!$"
 
-MatchCall_WildBattleText14:: @ 82A9E70
+MatchCall_WildBattleText14::
 	.string "Oh, hi, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "Just now, I tried to catch a cute\n"
@@ -120,7 +120,7 @@ MatchCall_WildBattleText14:: @ 82A9E70
 	.string "Oh, you bet I was disappointed!\p"
 	.string "Bye-bye!$"
 
-MatchCall_WildBattleText15:: @ 82A9EFD
+MatchCall_WildBattleText15::
 	.string "Hey, {PLAYER}!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "I've been thinking about trying\n"
@@ -130,7 +130,7 @@ MatchCall_WildBattleText15:: @ 82A9EFD
 	.string "I'm at my wit's end!\n"
 	.string "See you around!$"
 
-MatchCall_NegativeBattleText1:: @ 82A9FAB
+MatchCall_NegativeBattleText1::
 	.string "Hi! {PLAYER}{KUN}, hello!\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "I tried battling another TRAINER,\n"
@@ -138,7 +138,7 @@ MatchCall_NegativeBattleText1:: @ 82A9FAB
 	.string "It was really disappointing.\n"
 	.string "Well, see you again!$"
 
-MatchCall_NegativeBattleText2:: @ 82AA028
+MatchCall_NegativeBattleText2::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "I challenged someone else after\n"
@@ -146,14 +146,14 @@ MatchCall_NegativeBattleText2:: @ 82AA028
 	.string "I came close, but I ended up\n"
 	.string "losing. Oh, well!$"
 
-MatchCall_NegativeBattleText3:: @ 82AA099
+MatchCall_NegativeBattleText3::
 	.string "Hey there, {PLAYER}!\n"
 	.string "It's me, {STR_VAR_1}.\p"
 	.string "I just got cleaned in a battle.\p"
 	.string "I guess I need to raise my team\n"
 	.string "some more!$"
 
-MatchCall_NegativeBattleText4:: @ 82AA100
+MatchCall_NegativeBattleText4::
 	.string "Hey, {PLAYER}.\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "I tried another battle yesterday,\n"
@@ -161,7 +161,7 @@ MatchCall_NegativeBattleText4:: @ 82AA100
 	.string "My team needs more raising.\n"
 	.string "Okay, catch you later.$"
 
-MatchCall_NegativeBattleText5:: @ 82AA188
+MatchCall_NegativeBattleText5::
 	.string "Hiya, {PLAYER}!\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "How are things with you?\p"
@@ -170,7 +170,7 @@ MatchCall_NegativeBattleText5:: @ 82AA188
 	.string "I can't get it together.\n"
 	.string "Right, take care!$"
 
-MatchCall_NegativeBattleText6:: @ 82AA214
+MatchCall_NegativeBattleText6::
 	.string "Hey, {PLAYER}.\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "How's it going for you?\p"
@@ -179,7 +179,7 @@ MatchCall_NegativeBattleText6:: @ 82AA214
 	.string "I can't get into the groove.\n"
 	.string "You take care.$"
 
-MatchCall_NegativeBattleText7:: @ 82AA2A1
+MatchCall_NegativeBattleText7::
 	.string "{STR_VAR_1} here.\n"
 	.string "How's it going lately?\p"
 	.string "I lost a battle yesterday,\n"
@@ -187,7 +187,7 @@ MatchCall_NegativeBattleText7:: @ 82AA2A1
 	.string "I have to devise a plan…\n"
 	.string "See you.$"
 
-MatchCall_NegativeBattleText8:: @ 82AA31B
+MatchCall_NegativeBattleText8::
 	.string "Oh, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1} speaking.\p"
 	.string "How are your POKéMON doing?\n"
@@ -195,7 +195,7 @@ MatchCall_NegativeBattleText8:: @ 82AA31B
 	.string "I need to try harder!\n"
 	.string "See you again!$"
 
-MatchCall_NegativeBattleText9:: @ 82AA3A8
+MatchCall_NegativeBattleText9::
 	.string "Oh, {PLAYER}{KUN}, hi there!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "Listen, listen, you have to hear\n"
@@ -204,7 +204,7 @@ MatchCall_NegativeBattleText9:: @ 82AA3A8
 	.string "but I lost at the last second.\p"
 	.string "Oh, it burns me up!$"
 
-MatchCall_NegativeBattleText10:: @ 82AA442
+MatchCall_NegativeBattleText10::
 	.string "Oh, {PLAYER}{KUN}, hello…\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "A little earlier, I was in a battle.\n"
@@ -212,14 +212,14 @@ MatchCall_NegativeBattleText10:: @ 82AA442
 	.string "I need to raise my POKéMON more.\n"
 	.string "See you around.$"
 
-MatchCall_NegativeBattleText11:: @ 82AA4C5
+MatchCall_NegativeBattleText11::
 	.string "Ah, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\l"
 	.string "How are your POKéMON?\p"
 	.string "I just lost yet another battle.\p"
 	.string "Well, see you!$"
 
-MatchCall_NegativeBattleText12:: @ 82AA520
+MatchCall_NegativeBattleText12::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "Are you still battling hard?\p"
@@ -227,7 +227,7 @@ MatchCall_NegativeBattleText12:: @ 82AA520
 	.string "been training my team all over.\p"
 	.string "Let's meet again.$"
 
-MatchCall_NegativeBattleText13:: @ 82AA5AD
+MatchCall_NegativeBattleText13::
 	.string "Ah, hello, {PLAYER}{KUN}!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "I hope you've been keeping well.\p"
@@ -236,7 +236,7 @@ MatchCall_NegativeBattleText13:: @ 82AA5AD
 	.string "{PLAYER}{KUN}, try to be active like me.\n"
 	.string "See you again!$"
 
-MatchCall_NegativeBattleText14:: @ 82AA64D
+MatchCall_NegativeBattleText14::
 	.string "Oh, hi, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "Are you doing good?\p"
@@ -244,7 +244,7 @@ MatchCall_NegativeBattleText14:: @ 82AA64D
 	.string "though.\p"
 	.string "Bye-bye!$"
 
-MatchCall_PositiveBattleText1:: @ 82AA6AF
+MatchCall_PositiveBattleText1::
 	.string "Hi! {PLAYER}{KUN}, hello!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "I battled another TRAINER earlier.\n"
@@ -252,13 +252,13 @@ MatchCall_PositiveBattleText1:: @ 82AA6AF
 	.string "My {STR_VAR_2} really worked hard\n"
 	.string "for me. This is so great!$"
 
-MatchCall_PositiveBattleText2:: @ 82AA730
+MatchCall_PositiveBattleText2::
 	.string "Hello, {PLAYER}{KUN}!\n"
 	.string "It's {STR_VAR_1}!\p"
 	.string "I had a battle yesterday and\n"
 	.string "I won! It's fantastic!$"
 
-MatchCall_PositiveBattleText3:: @ 82AA77A
+MatchCall_PositiveBattleText3::
 	.string "Hey there, {PLAYER}!\n"
 	.string "It's me, {STR_VAR_1}!\l"
 	.string "How's your battling?\p"
@@ -267,7 +267,7 @@ MatchCall_PositiveBattleText3:: @ 82AA77A
 	.string "The next time I battle you,\n"
 	.string "{PLAYER}, it won't be me losing!$"
 
-MatchCall_PositiveBattleText4:: @ 82AA81C
+MatchCall_PositiveBattleText4::
 	.string "Hey, {PLAYER}.\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "I had a match earlier.\n"
@@ -275,7 +275,7 @@ MatchCall_PositiveBattleText4:: @ 82AA81C
 	.string "My {STR_VAR_2} put on one\n"
 	.string "inspired showing.$"
 
-MatchCall_PositiveBattleText5:: @ 82AA88C
+MatchCall_PositiveBattleText5::
 	.string "Hiya, {PLAYER}{KUN}!\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "How are things with you?\n"
@@ -285,7 +285,7 @@ MatchCall_PositiveBattleText5:: @ 82AA88C
 	.string "You wait. I'm going to beat you\n"
 	.string "next time! Right, take care!$"
 
-MatchCall_PositiveBattleText6:: @ 82AA934
+MatchCall_PositiveBattleText6::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "How's it going for you?\p"
@@ -294,7 +294,7 @@ MatchCall_PositiveBattleText6:: @ 82AA934
 	.string "When we have our next battle,\n"
 	.string "I'm sure not going to lose!$"
 
-MatchCall_PositiveBattleText7:: @ 82AA9D3
+MatchCall_PositiveBattleText7::
 	.string "{PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "My {STR_VAR_2} is a force!\n"
@@ -302,7 +302,7 @@ MatchCall_PositiveBattleText7:: @ 82AA9D3
 	.string "I can't wait to have a rematch\n"
 	.string "with you.$"
 
-MatchCall_PositiveBattleText8:: @ 82AAA40
+MatchCall_PositiveBattleText8::
 	.string "Oh, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1} speaking.\p"
 	.string "I hope you've been well.\n"
@@ -311,7 +311,7 @@ MatchCall_PositiveBattleText8:: @ 82AAA40
 	.string "hard to get the win.\p"
 	.string "See you again!$"
 
-MatchCall_PositiveBattleText9:: @ 82AAAE4
+MatchCall_PositiveBattleText9::
 	.string "Oh, {PLAYER}{KUN}, hi there!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "How are your POKéMON holding up?\n"
@@ -321,7 +321,7 @@ MatchCall_PositiveBattleText9:: @ 82AAAE4
 	.string "I wish I could've shown you!\n"
 	.string "See you again!$"
 
-MatchCall_PositiveBattleText10:: @ 82AAB8C
+MatchCall_PositiveBattleText10::
 	.string "Oh, {PLAYER}{KUN}, hello…\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "How has life been treating you?\p"
@@ -330,7 +330,7 @@ MatchCall_PositiveBattleText10:: @ 82AAB8C
 	.string "I just won a battle with them.\n"
 	.string "See you around.$"
 
-MatchCall_PositiveBattleText11:: @ 82AAC25
+MatchCall_PositiveBattleText11::
 	.string "Ah, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "Been in any battles lately?\n"
@@ -338,7 +338,7 @@ MatchCall_PositiveBattleText11:: @ 82AAC25
 	.string "I'm on a roll! Gahahaha!\n"
 	.string "Well, see you!$"
 
-MatchCall_PositiveBattleText12:: @ 82AAC9D
+MatchCall_PositiveBattleText12::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's me, {STR_VAR_1}.\p"
 	.string "I trust you've been well?\n"
@@ -347,7 +347,7 @@ MatchCall_PositiveBattleText12:: @ 82AAC9D
 	.string "I'm not stepping aside to you\l"
 	.string "youngsters yet!$"
 
-MatchCall_PositiveBattleText13:: @ 82AAD41
+MatchCall_PositiveBattleText13::
 	.string "Ah, hello, {PLAYER}{KUN}!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "I hope you've been keeping well.\n"
@@ -357,7 +357,7 @@ MatchCall_PositiveBattleText13:: @ 82AAD41
 	.string "quite yet!\p"
 	.string "See you again!$"
 
-MatchCall_PositiveBattleText14:: @ 82AAE00
+MatchCall_PositiveBattleText14::
 	.string "Oh, hi, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "I was in a battle recently, and my\n"
@@ -365,7 +365,7 @@ MatchCall_PositiveBattleText14:: @ 82AAE00
 	.string "I wish you could have seen it,\n"
 	.string "{PLAYER}{KUN}. Bye-bye!$"
 
-MatchCall_SameRouteBattleRequestText1:: @ 82AAE7F
+MatchCall_SameRouteBattleRequestText1::
 	.string "Hi! {PLAYER}, hello!\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "Huh? Wait, you're near\n"
@@ -373,7 +373,7 @@ MatchCall_SameRouteBattleRequestText1:: @ 82AAE7F
 	.string "Oh, wow, we have to battle, then!\n"
 	.string "I'll be waiting! See you!$"
 
-MatchCall_SameRouteBattleRequestText2:: @ 82AAEF1
+MatchCall_SameRouteBattleRequestText2::
 	.string "Hello, {PLAYER}!\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "Oh? You happen to be around\n"
@@ -381,7 +381,7 @@ MatchCall_SameRouteBattleRequestText2:: @ 82AAEF1
 	.string "Would you like to battle now?\n"
 	.string "I'll wait for you! See you!$"
 
-MatchCall_SameRouteBattleRequestText3:: @ 82AAF69
+MatchCall_SameRouteBattleRequestText3::
 	.string "Hey there, {PLAYER}!\n"
 	.string "It's me, {STR_VAR_1}.\p"
 	.string "Oh, hey, are you near\n"
@@ -391,7 +391,7 @@ MatchCall_SameRouteBattleRequestText3:: @ 82AAF69
 	.string "I'm not losing again!\n"
 	.string "I'll be waiting! Catch you soon!$"
 
-MatchCall_SameRouteBattleRequestText4:: @ 82AB010
+MatchCall_SameRouteBattleRequestText4::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "Whereabouts are you now?\n"
@@ -399,7 +399,7 @@ MatchCall_SameRouteBattleRequestText4:: @ 82AB010
 	.string "Want to battle now?\n"
 	.string "I'll wait for you. See you!$"
 
-MatchCall_SameRouteBattleRequestText5:: @ 82AB076
+MatchCall_SameRouteBattleRequestText5::
 	.string "Hiya, {PLAYER}{KUN}!\n"
 	.string "It's {STR_VAR_1}.\l"
 	.string "How are things with you?\p"
@@ -410,7 +410,7 @@ MatchCall_SameRouteBattleRequestText5:: @ 82AB076
 	.string "I'll keep an eye out for you.\n"
 	.string "See you soon!$"
 
-MatchCall_SameRouteBattleRequestText6:: @ 82AB11A
+MatchCall_SameRouteBattleRequestText6::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\l"
 	.string "How are your POKéMON keeping?\p"
@@ -421,7 +421,7 @@ MatchCall_SameRouteBattleRequestText6:: @ 82AB11A
 	.string "I can wait, sure.\n"
 	.string "See you!$"
 
-MatchCall_SameRouteBattleRequestText7:: @ 82AB1B4
+MatchCall_SameRouteBattleRequestText7::
 	.string "…Er, {PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here…\p"
 	.string "Oh, you happen to be around\n"
@@ -431,7 +431,7 @@ MatchCall_SameRouteBattleRequestText7:: @ 82AB1B4
 	.string "I'll show you my POKéMON.\n"
 	.string "I'll wait for you.$"
 
-MatchCall_SameRouteBattleRequestText8:: @ 82AB23D
+MatchCall_SameRouteBattleRequestText8::
 	.string "Oh, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1} speaking.\p"
 	.string "I hope you're doing well.\n"
@@ -441,7 +441,7 @@ MatchCall_SameRouteBattleRequestText8:: @ 82AB23D
 	.string "I'll wait for you.\n"
 	.string "See you soon!$"
 
-MatchCall_SameRouteBattleRequestText9:: @ 82AB2E9
+MatchCall_SameRouteBattleRequestText9::
 	.string "Oh, {PLAYER}{KUN}, hi there!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "Are you keeping up?\n"
@@ -450,7 +450,7 @@ MatchCall_SameRouteBattleRequestText9:: @ 82AB2E9
 	.string "should battle?\p"
 	.string "Don't keep me waiting too long!$"
 
-MatchCall_SameRouteBattleRequestText10:: @ 82AB382
+MatchCall_SameRouteBattleRequestText10::
 	.string "Oh, {PLAYER}{KUN}, hello…\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "How are things with you?\n"
@@ -459,7 +459,7 @@ MatchCall_SameRouteBattleRequestText10:: @ 82AB382
 	.string "I'm ready and waiting.\n"
 	.string "Be quick!$"
 
-MatchCall_SameRouteBattleRequestText11:: @ 82AB410
+MatchCall_SameRouteBattleRequestText11::
 	.string "Ah, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "Ah, so where you are now is\n"
@@ -469,7 +469,7 @@ MatchCall_SameRouteBattleRequestText11:: @ 82AB410
 	.string "I'll wait around for you!\n"
 	.string "See you real quick!$"
 
-MatchCall_SameRouteBattleRequestText12:: @ 82AB4B0
+MatchCall_SameRouteBattleRequestText12::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "Where might you be now?\p"
@@ -480,7 +480,7 @@ MatchCall_SameRouteBattleRequestText12:: @ 82AB4B0
 	.string "I can wait.\n"
 	.string "See you!$"
 
-MatchCall_SameRouteBattleRequestText13:: @ 82AB538
+MatchCall_SameRouteBattleRequestText13::
 	.string "Ah, hello, {PLAYER}{KUN}!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "I hope you've been keeping well.\n"
@@ -490,7 +490,7 @@ MatchCall_SameRouteBattleRequestText13:: @ 82AB538
 	.string "I'll wait for you.\n"
 	.string "Bye for now.$"
 
-MatchCall_SameRouteBattleRequestText14:: @ 82AB5E4
+MatchCall_SameRouteBattleRequestText14::
 	.string "Oh, hi, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "You're what? …{STR_VAR_2}?\n"
@@ -500,14 +500,14 @@ MatchCall_SameRouteBattleRequestText14:: @ 82AB5E4
 	.string "I'll be looking for you!\n"
 	.string "Bye-bye!$"
 
-MatchCall_DifferentRouteBattleRequestText1:: @ 82AB670
+MatchCall_DifferentRouteBattleRequestText1::
 	.string "Hi! {PLAYER}, hello!\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "Want to have a battle with me?\p"
 	.string "I'll be waiting for you around\n"
 	.string "{STR_VAR_2}!$"
 
-MatchCall_DifferentRouteBattleRequestText2:: @ 82AB6CD
+MatchCall_DifferentRouteBattleRequestText2::
 	.string "Hello, {PLAYER}!\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "Would you like to have a battle\n"
@@ -515,7 +515,7 @@ MatchCall_DifferentRouteBattleRequestText2:: @ 82AB6CD
 	.string "You can find me around\n"
 	.string "{STR_VAR_2}. I'll be waiting!$"
 
-MatchCall_DifferentRouteBattleRequestText3:: @ 82AB73C
+MatchCall_DifferentRouteBattleRequestText3::
 	.string "Hey there, {PLAYER}!\n"
 	.string "It's me, {STR_VAR_1}.\p"
 	.string "My POKéMON have grown a lot\n"
@@ -526,7 +526,7 @@ MatchCall_DifferentRouteBattleRequestText3:: @ 82AB73C
 	.string "I'll be waiting for you around\n"
 	.string "{STR_VAR_2}.$"
 
-MatchCall_DifferentRouteBattleRequestText4:: @ 82AB808
+MatchCall_DifferentRouteBattleRequestText4::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\l"
 	.string "How are things with you?\p"
@@ -537,7 +537,7 @@ MatchCall_DifferentRouteBattleRequestText4:: @ 82AB808
 	.string "Let's meet up around\n"
 	.string "{STR_VAR_2}, okay?$"
 
-MatchCall_DifferentRouteBattleRequestText5:: @ 82AB8B7
+MatchCall_DifferentRouteBattleRequestText5::
 	.string "Hiya, {PLAYER}{KUN}!\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "My POKéMON are growing up in\n"
@@ -547,7 +547,7 @@ MatchCall_DifferentRouteBattleRequestText5:: @ 82AB8B7
 	.string "I'll keep an eye out for you around\n"
 	.string "{STR_VAR_2}. See you soon!$"
 
-MatchCall_DifferentRouteBattleRequestText6:: @ 82AB95D
+MatchCall_DifferentRouteBattleRequestText6::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\l"
 	.string "I hope you're on top of things.\p"
@@ -557,7 +557,7 @@ MatchCall_DifferentRouteBattleRequestText6:: @ 82AB95D
 	.string "come to {STR_VAR_2}.\p"
 	.string "See you!$"
 
-MatchCall_DifferentRouteBattleRequestText7:: @ 82ABA03
+MatchCall_DifferentRouteBattleRequestText7::
 	.string "…Er, {PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here…\l"
 	.string "So? Are your POKéMON growing?\p"
@@ -567,7 +567,7 @@ MatchCall_DifferentRouteBattleRequestText7:: @ 82ABA03
 	.string "Come see me for a match.\p"
 	.string "See you around.$"
 
-MatchCall_DifferentRouteBattleRequestText8:: @ 82ABA9F
+MatchCall_DifferentRouteBattleRequestText8::
 	.string "Oh, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1} speaking.\p"
 	.string "I hope you're doing well.\n"
@@ -577,7 +577,7 @@ MatchCall_DifferentRouteBattleRequestText8:: @ 82ABA9F
 	.string "I'll be around {STR_VAR_2}.\n"
 	.string "Until then, good-bye!$"
 
-MatchCall_DifferentRouteBattleRequestText9:: @ 82ABB62
+MatchCall_DifferentRouteBattleRequestText9::
 	.string "Oh, {PLAYER}{KUN}, hi there!\n"
 	.string "This is {STR_VAR_1}!\l"
 	.string "How are your POKéMON doing?\p"
@@ -587,7 +587,7 @@ MatchCall_DifferentRouteBattleRequestText9:: @ 82ABB62
 	.string "so let's battle if you're close by.\p"
 	.string "Hope I see you soon!$"
 
-MatchCall_DifferentRouteBattleRequestText10:: @ 82ABC26
+MatchCall_DifferentRouteBattleRequestText10::
 	.string "Oh, {PLAYER}{KUN}, hello…\n"
 	.string "This is {STR_VAR_1}.\l"
 	.string "So, how are things with you?\p"
@@ -598,7 +598,7 @@ MatchCall_DifferentRouteBattleRequestText10:: @ 82ABC26
 	.string "I'll be around {STR_VAR_2}.\n"
 	.string "Come see me if you're close.$"
 
-MatchCall_DifferentRouteBattleRequestText11:: @ 82ABCE9
+MatchCall_DifferentRouteBattleRequestText11::
 	.string "Ah, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\l"
 	.string "Where might you be now?\p"
@@ -608,7 +608,7 @@ MatchCall_DifferentRouteBattleRequestText11:: @ 82ABCE9
 	.string "I'm around {STR_VAR_2} now.\n"
 	.string "I hope you'll seek us out.$"
 
-MatchCall_DifferentRouteBattleRequestText12:: @ 82ABDA2
+MatchCall_DifferentRouteBattleRequestText12::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's me, {STR_VAR_1}.\p"
 	.string "I should tell you, my POKéMON have\n"
@@ -618,7 +618,7 @@ MatchCall_DifferentRouteBattleRequestText12:: @ 82ABDA2
 	.string "We'll be around {STR_VAR_2}.\n"
 	.string "Come see us anytime!$"
 
-MatchCall_DifferentRouteBattleRequestText13:: @ 82ABE5E
+MatchCall_DifferentRouteBattleRequestText13::
 	.string "Ah, hello, {PLAYER}{KUN}!\n"
 	.string "This is {STR_VAR_1}!\l"
 	.string "Are your POKéMON keeping well?\p"
@@ -629,7 +629,7 @@ MatchCall_DifferentRouteBattleRequestText13:: @ 82ABE5E
 	.string "If you're near {STR_VAR_2},\n"
 	.string "do come see us.$"
 
-MatchCall_DifferentRouteBattleRequestText14:: @ 82ABF36
+MatchCall_DifferentRouteBattleRequestText14::
 	.string "Oh, hi, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\l"
 	.string "Keeping well, I hope.\p"
@@ -641,7 +641,7 @@ MatchCall_DifferentRouteBattleRequestText14:: @ 82ABF36
 	.string "{STR_VAR_2}.\p"
 	.string "Come see us anytime, okay?$"
 
-MatchCall_PersonalizedText1:: @ 82AC009
+MatchCall_PersonalizedText1::
 	.string "It's me, the mountain-loving\n"
 	.string "{STR_VAR_1}!\p"
 	.string "Well, since we met, have you grown\n"
@@ -650,7 +650,7 @@ MatchCall_PersonalizedText1:: @ 82AC009
 	.string "Next time, we'll meet somewhere\n"
 	.string "around {STR_VAR_2}.$"
 
-MatchCall_PersonalizedText2:: @ 82AC0BD
+MatchCall_PersonalizedText2::
 	.string "This is {STR_VAR_1}.\n"
 	.string "Hello.\p"
 	.string "I was just telling a new TRAINER\n"
@@ -661,7 +661,7 @@ MatchCall_PersonalizedText2:: @ 82AC0BD
 	.string "that everyone will admire.\p"
 	.string "I hope we meet again!$"
 
-MatchCall_PersonalizedText3:: @ 82AC18C
+MatchCall_PersonalizedText3::
 	.string "Hello! It's {STR_VAR_1}.\p"
 	.string "I love where I am now.\n"
 	.string "It's pleasant with sweet aromas!\p"
@@ -669,7 +669,7 @@ MatchCall_PersonalizedText3:: @ 82AC18C
 	.string "and they burst into bloom.\p"
 	.string "See you again sometime!$"
 
-MatchCall_PersonalizedText4:: @ 82AC228
+MatchCall_PersonalizedText4::
 	.string "Hello! Thirty years of exploration,\n"
 	.string "{STR_VAR_1} at your service!\p"
 	.string "It seems that you're energetically\n"
@@ -679,7 +679,7 @@ MatchCall_PersonalizedText4:: @ 82AC228
 	.string "Now, if you'll excuse me,\n"
 	.string "I have ruins to explore.$"
 
-MatchCall_PersonalizedText5:: @ 82AC30C
+MatchCall_PersonalizedText5::
 	.string "It's {STR_VAR_1}!\p"
 	.string "Know what I'm doing today?\n"
 	.string "Looking at waves from the beach!\p"
@@ -687,7 +687,7 @@ MatchCall_PersonalizedText5:: @ 82AC30C
 	.string "The sea is the prettiest from here.\l"
 	.string "I'm getting hungry, so bye-bye!$"
 
-MatchCall_PersonalizedText6:: @ 82AC3B6
+MatchCall_PersonalizedText6::
 	.string "Munch-chew…\n"
 	.string "Oh, hi, it's {STR_VAR_1}.\l"
 	.string "I love eating on the beach.\p"
@@ -695,7 +695,7 @@ MatchCall_PersonalizedText6:: @ 82AC3B6
 	.string "great. We're fully fueled!\l"
 	.string "I'm going for a swim. Bye!$"
 
-MatchCall_PersonalizedText7:: @ 82AC446
+MatchCall_PersonalizedText7::
 	.string "Hello, this is {STR_VAR_1}…\p"
 	.string "I've grown a little jaded with this\n"
 	.string "whole COOLTRAINER thing…\p"
@@ -711,7 +711,7 @@ MatchCall_PersonalizedText7:: @ 82AC446
 	.string "But when I see you next,\n"
 	.string "don't worry, I won't whine!$"
 
-MatchCall_PersonalizedText8:: @ 82AC5C7
+MatchCall_PersonalizedText8::
 	.string "Yahoo, it's {STR_VAR_1}!\n"
 	.string "How do you do?\p"
 	.string "I've been raising my POKéMON with\n"
@@ -721,7 +721,7 @@ MatchCall_PersonalizedText8:: @ 82AC5C7
 	.string "Isn't it great to have TRAINER\n"
 	.string "friends? Let's meet again!$"
 
-MatchCall_PersonalizedText9:: @ 82AC682
+MatchCall_PersonalizedText9::
 	.string "It's {STR_VAR_1}…\n"
 	.string "Right now, behind you…\l"
 	.string "Wasn't there something…?\p"
@@ -733,7 +733,7 @@ MatchCall_PersonalizedText9:: @ 82AC682
 	.string "Giggle…\n"
 	.string "Farewell…$"
 
-MatchCall_PersonalizedText10:: @ 82AC755
+MatchCall_PersonalizedText10::
 	.string "This is {STR_VAR_1}.\n"
 	.string "How do you do?\p"
 	.string "Isn't it convenient that we can\n"
@@ -744,7 +744,7 @@ MatchCall_PersonalizedText10:: @ 82AC755
 	.string "I should be going now.\n"
 	.string "I'm glad we had this chat.$"
 
-MatchCall_PersonalizedText11:: @ 82AC82C
+MatchCall_PersonalizedText11::
 	.string "It's {STR_VAR_1}!\n"
 	.string "Will you listen to this?\p"
 	.string "I like the SAFARI ZONE a lot,\n"
@@ -756,7 +756,7 @@ MatchCall_PersonalizedText11:: @ 82AC82C
 	.string "I'm off to the SAFARI ZONE again!\n"
 	.string "Catch you!$"
 
-MatchCall_PersonalizedText12:: @ 82AC914
+MatchCall_PersonalizedText12::
 	.string "Hello, {STR_VAR_1} here.\n"
 	.string "Yes, correct, I am rich, yes.\p"
 	.string "I should tell you, my wealth has\n"
@@ -770,7 +770,7 @@ MatchCall_PersonalizedText12:: @ 82AC914
 	.string "Oh, you must excuse me, I have this\n"
 	.string "formal dinner to attend.$"
 
-MatchCall_PersonalizedText13:: @ 82ACA59
+MatchCall_PersonalizedText13::
 	.string "Ufufufufu…\n"
 	.string "It's me, {STR_VAR_1}…\p"
 	.string "Can you guess what I'm seeing?\n"
@@ -780,7 +780,7 @@ MatchCall_PersonalizedText13:: @ 82ACA59
 	.string "I… I'm kind of busy now.\n"
 	.string "I have to go.$"
 
-MatchCall_PersonalizedText14:: @ 82ACB02
+MatchCall_PersonalizedText14::
 	.string "Oh, it's {STR_VAR_1}!\p"
 	.string "I was just thinking I'm getting\n"
 	.string "bored of the ABANDONED SHIP.\p"
@@ -794,7 +794,7 @@ MatchCall_PersonalizedText14:: @ 82ACB02
 	.string "door to a match.\p"
 	.string "Be seeing you!$"
 
-MatchCall_PersonalizedText15:: @ 82ACC3F
+MatchCall_PersonalizedText15::
 	.string "I'm {STR_VAR_1}!\n"
 	.string "The man of the sea!\p"
 	.string "You know what I think?\p"
@@ -806,7 +806,7 @@ MatchCall_PersonalizedText15:: @ 82ACC3F
 	.string "It's a great training opportunity!\n"
 	.string "Sorry, but I have to go!$"
 
-MatchCall_PersonalizedText16:: @ 82ACD2F
+MatchCall_PersonalizedText16::
 	.string "It's {STR_VAR_1}! Listen, I've been\n"
 	.string "teaching karate to my POKéMON.\p"
 	.string "But now they're better than me!\n"
@@ -817,7 +817,7 @@ MatchCall_PersonalizedText16:: @ 82ACD2F
 	.string "We have to battle again!\n"
 	.string "Ugwaah!$"
 
-MatchCall_PersonalizedText17:: @ 82ACE1E
+MatchCall_PersonalizedText17::
 	.string "It's me, {STR_VAR_1}.\n"
 	.string "How're your travels unwinding?\p"
 	.string "…Whoa, is that right?\n"
@@ -829,7 +829,7 @@ MatchCall_PersonalizedText17:: @ 82ACE1E
 	.string "I'd better get this tune properly\n"
 	.string "written, so I've got to fly! Later!$"
 
-MatchCall_PersonalizedText18:: @ 82ACF32
+MatchCall_PersonalizedText18::
 	.string "This is {STR_VAR_1}…\n"
 	.string "Hear my new song.\p"
 	.string "Lalala, {STR_VAR_2}, {STR_VAR_2}!\n"
@@ -839,7 +839,7 @@ MatchCall_PersonalizedText18:: @ 82ACF32
 	.string "{STR_VAR_1} and {STR_VAR_2}…\p"
 	.string "Repeat chorus, fade…$"
 
-MatchCall_PersonalizedText19:: @ 82ACFBE
+MatchCall_PersonalizedText19::
 	.string "I'm {STR_VAR_1}, you know,\n"
 	.string "the camping expert!\p"
 	.string "When we battled, I couldn't help\n"
@@ -851,7 +851,7 @@ MatchCall_PersonalizedText19:: @ 82ACFBE
 	.string "Battle with us again, okay?\n"
 	.string "Oh, and let's go camping, too!$"
 
-MatchCall_PersonalizedText20:: @ 82AD0AC
+MatchCall_PersonalizedText20::
 	.string "It's me, me, {STR_VAR_1}!\p"
 	.string "I'd like to climb other mountains\n"
 	.string "than this one, to be honest.\p"
@@ -861,7 +861,7 @@ MatchCall_PersonalizedText20:: @ 82AD0AC
 	.string "with ladies around, let me know!\p"
 	.string "Ehehehe, see you around!$"
 
-MatchCall_PersonalizedText21:: @ 82AD194
+MatchCall_PersonalizedText21::
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "It's {STR_VAR_1}…\p"
@@ -869,7 +869,7 @@ MatchCall_PersonalizedText21:: @ 82AD194
 	.string "… … … … … …\l"
 	.string "That's all today…$"
 
-MatchCall_PersonalizedText22:: @ 82AD1DF
+MatchCall_PersonalizedText22::
 	.string "This is {STR_VAR_1}. Today, I had\n"
 	.string "this feeling I would chat with you.\p"
 	.string "My desire to defeat you builds\n"
@@ -879,7 +879,7 @@ MatchCall_PersonalizedText22:: @ 82AD1DF
 	.string "I'm glad you heard me out.\n"
 	.string "See you!$"
 
-MatchCall_PersonalizedText23:: @ 82AD2A8
+MatchCall_PersonalizedText23::
 	.string "It's {STR_VAR_1}.\p"
 	.string "When there's a strong TRAINER\n"
 	.string "nearby, I can sometimes sense that\l"
@@ -889,7 +889,7 @@ MatchCall_PersonalizedText23:: @ 82AD2A8
 	.string "I'll be waiting for your visit.\n"
 	.string "Bye!$"
 
-MatchCall_PersonalizedText24:: @ 82AD34F
+MatchCall_PersonalizedText24::
 	.string "Hello, this is {STR_VAR_1}.\n"
 	.string "You sound well, {PLAYER}{KUN}.\p"
 	.string "I've traveled around the world,\n"
@@ -901,7 +901,7 @@ MatchCall_PersonalizedText24:: @ 82AD34F
 	.string "techniques.\p"
 	.string "I do hope for a rematch.$"
 
-MatchCall_PersonalizedText25:: @ 82AD44E
+MatchCall_PersonalizedText25::
 	.string "Snivel… It's… {STR_VAR_1}…\n"
 	.string "…Sob…\p"
 	.string "ROXANNE chewed me out in class\n"
@@ -913,7 +913,7 @@ MatchCall_PersonalizedText25:: @ 82AD44E
 	.string "the TRAINER'S SCHOOL tomorrow!\p"
 	.string "See you later!$"
 
-MatchCall_PersonalizedText26:: @ 82AD53A
+MatchCall_PersonalizedText26::
 	.string "It's {STR_VAR_1}!\p"
 	.string "ROXANNE let me battle with her\n"
 	.string "yesterday.\p"
@@ -926,7 +926,7 @@ MatchCall_PersonalizedText26:: @ 82AD53A
 	.string "I'm going to really focus and work!\n"
 	.string "I'd better go!$"
 
-MatchCall_PersonalizedText27:: @ 82AD642
+MatchCall_PersonalizedText27::
 	.string "Hi, it's ANNA! I'm with my junior\n"
 	.string "partner MEG again today.\p"
 	.string "I really love caring for MEG and\n"
@@ -944,7 +944,7 @@ MatchCall_PersonalizedText27:: @ 82AD642
 	.string "I have to go now.\n"
 	.string "It's time for our snack!$"
 
-MatchCall_PersonalizedText28:: @ 82AD801
+MatchCall_PersonalizedText28::
 	.string "I love POKéMON!\n"
 	.string "It's {STR_VAR_1} from the FAN CLUB!\p"
 	.string "You have to hear this!\n"
@@ -958,7 +958,7 @@ MatchCall_PersonalizedText28:: @ 82AD801
 	.string "Sorry, but I can't talk now!\n"
 	.string "You'll have to hear this next time!$"
 
-MatchCall_PersonalizedText29:: @ 82AD92E
+MatchCall_PersonalizedText29::
 	.string "Ohoho!\p"
 	.string "This is {STR_VAR_1}! I can't wait to\n"
 	.string "tell you about my darling POKéMON!\p"
@@ -974,7 +974,7 @@ MatchCall_PersonalizedText29:: @ 82AD92E
 	.string "Well, I must be going.\n"
 	.string "Bye, now!$"
 
-MatchCall_PersonalizedText30:: @ 82ADA8F
+MatchCall_PersonalizedText30::
 	.string "I am… {STR_VAR_1}.\n"
 	.string "People call me an EXPERT.\p"
 	.string "But there is one thing I know.\n"
@@ -986,7 +986,7 @@ MatchCall_PersonalizedText30:: @ 82ADA8F
 	.string "something deep and profound!\p"
 	.string "I shall leave you in good spirits!$"
 
-MatchCall_PersonalizedText31:: @ 82ADB9B
+MatchCall_PersonalizedText31::
 	.string "It's {STR_VAR_1}.\n"
 	.string "I'm glad to chat with you!\p"
 	.string "I am feeling alive and refreshed\n"
@@ -997,7 +997,7 @@ MatchCall_PersonalizedText31:: @ 82ADB9B
 	.string "I imagine you'll become an EXPERT\n"
 	.string "in your old age! Ohohoho…$"
 
-MatchCall_PersonalizedText32:: @ 82ADC92
+MatchCall_PersonalizedText32::
 	.string "Yay! This is {STR_VAR_1}!\n"
 	.string "What's up?\p"
 	.string "I might be imagining this, but when\n"
@@ -1013,7 +1013,7 @@ MatchCall_PersonalizedText32:: @ 82ADC92
 	.string "You didn't really believe that?\l"
 	.string "Ehehehe, that's all! Bye now!$"
 
-MatchCall_PersonalizedText33:: @ 82ADE08
+MatchCall_PersonalizedText33::
 	.string "Ahoy!\n"
 	.string "{STR_VAR_1} here!\p"
 	.string "As always, I'm fishing with wild\n"
@@ -1027,7 +1027,7 @@ MatchCall_PersonalizedText33:: @ 82ADE08
 	.string "Gotta go!\n"
 	.string "Find me some new fishing spots!$"
 
-MatchCall_PersonalizedText34:: @ 82ADF07
+MatchCall_PersonalizedText34::
 	.string "Hey, there! It's {STR_VAR_1}.\n"
 	.string "Are you taking it casually?\p"
 	.string "Ever since I was a kid, you know,\n"
@@ -1045,7 +1045,7 @@ MatchCall_PersonalizedText34:: @ 82ADF07
 	.string "But, hey, be cool. Take it casual.\n"
 	.string "See you around.$"
 
-MatchCall_PersonalizedText35:: @ 82AE0D9
+MatchCall_PersonalizedText35::
 	.string "This is {STR_VAR_1}!\n"
 	.string "I'm cycling right now.\p"
 	.string "I love swimming and running,\n"
@@ -1059,7 +1059,7 @@ MatchCall_PersonalizedText35:: @ 82AE0D9
 	.string "You should make the challenge, too!\n"
 	.string "See you!$"
 
-MatchCall_PersonalizedText36:: @ 82AE1FD
+MatchCall_PersonalizedText36::
 	.string "Yo, this is {STR_VAR_1}! I'm smack\n"
 	.string "in the middle of a triathlon!\p"
 	.string "But, hey, I've always got time to\n"
@@ -1073,7 +1073,7 @@ MatchCall_PersonalizedText36:: @ 82AE1FD
 	.string "I'm getting run down…\l"
 	.string "Gasp… Have…to…go…$"
 
-MatchCall_PersonalizedText37:: @ 82AE327
+MatchCall_PersonalizedText37::
 	.string "Hi, it's {STR_VAR_1}.\n"
 	.string "If you want to improve endurance,\l"
 	.string "high-altitude training is it!\p"
@@ -1082,7 +1082,7 @@ MatchCall_PersonalizedText37:: @ 82AE327
 	.string "I'm getting oxygen starved, too!\n"
 	.string "See you!$"
 
-MatchCall_PersonalizedText38:: @ 82AE3DA
+MatchCall_PersonalizedText38::
 	.string "Oh, it's {STR_VAR_1}, hello.\p"
 	.string "I've been swimming a lot but I still\n"
 	.string "can't seem to reach EVERGRANDE.\p"
@@ -1091,7 +1091,7 @@ MatchCall_PersonalizedText38:: @ 82AE3DA
 	.string "Wahahaha.\l"
 	.string "Take care!$"
 
-MatchCall_PersonalizedText39:: @ 82AE489
+MatchCall_PersonalizedText39::
 	.string "Hey, it's {STR_VAR_1}…\n"
 	.string "Whoops!\p"
 	.string "Splash!\p"
@@ -1107,7 +1107,7 @@ MatchCall_PersonalizedText39:: @ 82AE489
 	.string "Anyways, I'm busy sunbathing,\n"
 	.string "so let's chat another time.$"
 
-MatchCall_PersonalizedText40:: @ 82AE5CD
+MatchCall_PersonalizedText40::
 	.string "Hello, this is {STR_VAR_1}.\p"
 	.string "Out of the three triathlon events,\n"
 	.string "I like swimming best.\p"
@@ -1116,14 +1116,14 @@ MatchCall_PersonalizedText40:: @ 82AE5CD
 	.string "Ooh, triathlon is such a grueling\n"
 	.string "test of human endurance! Bye!$"
 
-MatchCall_PersonalizedText41:: @ 82AE698
+MatchCall_PersonalizedText41::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "How are your POKéMON doing?\p"
 	.string "My DRAGON POKéMON appear to be\n"
 	.string "in peak form. Bye for now.$"
 
-MatchCall_PersonalizedText42:: @ 82AE704
+MatchCall_PersonalizedText42::
 	.string "{STR_VAR_1} here.\p"
 	.string "My {STR_VAR_2} has grown even more\n"
 	.string "tough than that last time.\p"
@@ -1131,7 +1131,7 @@ MatchCall_PersonalizedText42:: @ 82AE704
 	.string "You wait till next time!\p"
 	.string "See you around!$"
 
-MatchCall_PersonalizedText43:: @ 82AE78F
+MatchCall_PersonalizedText43::
 	.string "It is {STR_VAR_1} here.\p"
 	.string "I have continued with my studies\n"
 	.string "in the art of concealment.\p"
@@ -1141,7 +1141,7 @@ MatchCall_PersonalizedText43:: @ 82AE78F
 	.string "Like smoke I disappear!\n"
 	.string "Farewell!$"
 
-MatchCall_PersonalizedText44:: @ 82AE859
+MatchCall_PersonalizedText44::
 	.string "This is {STR_VAR_1}.\n"
 	.string "I kept up my training since we met.\p"
 	.string "My {STR_VAR_2} is getting pretty\n"
@@ -1149,7 +1149,7 @@ MatchCall_PersonalizedText44:: @ 82AE859
 	.string "Training on a beach is effective,\n"
 	.string "just as I thought. Bye now!$"
 
-MatchCall_PersonalizedText45:: @ 82AE8E6
+MatchCall_PersonalizedText45::
 	.string "How do you do?\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "I wonder when this yucky volcanic\n"
@@ -1158,7 +1158,7 @@ MatchCall_PersonalizedText45:: @ 82AE8E6
 	.string "up the pattern on my parasol…\p"
 	.string "Let's promise to meet again!$"
 
-MatchCall_PersonalizedText46:: @ 82AE998
+MatchCall_PersonalizedText46::
 	.string "Hi, {STR_VAR_1} here.\p"
 	.string "Did you know that it's easier to\n"
 	.string "float in the sea than a pool?\p"
@@ -1170,7 +1170,7 @@ MatchCall_PersonalizedText46:: @ 82AE998
 	.string "…Where am I, anyway?\n"
 	.string "I'd better go!$"
 
-MatchCall_PersonalizedText47:: @ 82AEA8F
+MatchCall_PersonalizedText47::
 	.string "Oh, {PLAYER}{KUN}, hello!\n"
 	.string "This is {STR_VAR_1}.\l"
 	.string "I'm up in the mountains now.\p"
@@ -1182,14 +1182,14 @@ MatchCall_PersonalizedText47:: @ 82AEA8F
 	.string "I'm going to try that!\n"
 	.string "Bye-bye!$"
 
-MatchCall_PersonalizedText48:: @ 82AEB77
+MatchCall_PersonalizedText48::
 	.string "Oh, hi, hi, this is {STR_VAR_1}!\p"
 	.string "I'm raising POKéMON with LIV!\n"
 	.string "We're trying very hard!\p"
 	.string "If we try harder, can we become\n"
 	.string "number one? Bye-bye!$"
 
-MatchCall_PersonalizedText49:: @ 82AEBFA
+MatchCall_PersonalizedText49::
 	.string "{STR_VAR_1} here!\p"
 	.string "I'm a SAILOR, but I'm not on a boat\n"
 	.string "now.\p"
@@ -1199,7 +1199,7 @@ MatchCall_PersonalizedText49:: @ 82AEBFA
 	.string "while staring out across the waves.\p"
 	.string "All right, next time!$"
 
-MatchCall_PersonalizedText50:: @ 82AECC1
+MatchCall_PersonalizedText50::
 	.string "It's {STR_VAR_1}.\n"
 	.string "So? Get any more POKéMON?\p"
 	.string "If you catch a new POKéMON,\n"
@@ -1207,7 +1207,7 @@ MatchCall_PersonalizedText50:: @ 82AECC1
 	.string "I won't whine for it, honest.\n"
 	.string "I'll be waiting. See you.$"
 
-MatchCall_PersonalizedText51:: @ 82AED52
+MatchCall_PersonalizedText51::
 	.string "This is {STR_VAR_1}.\p"
 	.string "Are you raising your POKéMON\n"
 	.string "in the optimal way?\p"
@@ -1218,7 +1218,7 @@ MatchCall_PersonalizedText51:: @ 82AED52
 	.string "POKéMON, you should come out to\l"
 	.string "{STR_VAR_2}. Take care now.$"
 
-MatchCall_PersonalizedText52:: @ 82AEE35
+MatchCall_PersonalizedText52::
 	.string "Hi, this is {STR_VAR_1}.\p"
 	.string "I gave a {POKEBLOCK} to my {STR_VAR_2}.\n"
 	.string "It seemed to enjoy it very much.\p"
@@ -1227,7 +1227,7 @@ MatchCall_PersonalizedText52:: @ 82AEE35
 	.string "I find that quite fascinating.\n"
 	.string "Please do take care.$"
 
-MatchCall_PersonalizedText53:: @ 82AEEF4
+MatchCall_PersonalizedText53::
 	.string "{STR_VAR_1} here.\p"
 	.string "If you cooperate with POKéMON,\n"
 	.string "one can be comfortable in the wild.\p"
@@ -1238,7 +1238,7 @@ MatchCall_PersonalizedText53:: @ 82AEEF4
 	.string "I think you're on the right track!\n"
 	.string "Catch you later!$"
 
-MatchCall_PersonalizedText54:: @ 82AEFDA
+MatchCall_PersonalizedText54::
 	.string "Hi, it's {STR_VAR_1}. You know,\n"
 	.string "the TRAINER who's always prepared!\p"
 	.string "{PLAYER}{KUN}, do you have enough items?\n"
@@ -1249,7 +1249,7 @@ MatchCall_PersonalizedText54:: @ 82AEFDA
 	.string "I'd better go check my own\n"
 	.string "supplies! Be vigilant!$"
 
-MatchCall_PersonalizedText55:: @ 82AF0E7
+MatchCall_PersonalizedText55::
 	.string "It's {STR_VAR_1}!\n"
 	.string "It's {STR_VAR_1}!\p"
 	.string "{STR_VAR_2} is a very busy\n"
@@ -1260,7 +1260,7 @@ MatchCall_PersonalizedText55:: @ 82AF0E7
 	.string "How did you do today?\n"
 	.string "Tell me about it next time, okay?$"
 
-MatchCall_PersonalizedText56:: @ 82AF1B8
+MatchCall_PersonalizedText56::
 	.string "It's me, {STR_VAR_1}.\p"
 	.string "I'm popular because I have lots\n"
 	.string "of BUG POKéMON, right?\p"
@@ -1273,7 +1273,7 @@ MatchCall_PersonalizedText56:: @ 82AF1B8
 	.string "Snivel…\n"
 	.string "See you!$"
 
-MatchCall_PersonalizedText57:: @ 82AF2C4
+MatchCall_PersonalizedText57::
 	.string "Hah! Hah! Hah! Hah!\p"
 	.string "Hi! It's {STR_VAR_1}! Hah! Hah!\p"
 	.string "Trying to chat…\n"
@@ -1284,7 +1284,7 @@ MatchCall_PersonalizedText57:: @ 82AF2C4
 	.string "We'll chat…another time…\l"
 	.string "Hah! Hah! Hah!$"
 
-MatchCall_PersonalizedText58:: @ 82AF371
+MatchCall_PersonalizedText58::
 	.string "Oh, hi!\p"
 	.string "I'm still searching for treasures\n"
 	.string "with KIRA!\p"
@@ -1298,7 +1298,7 @@ MatchCall_PersonalizedText58:: @ 82AF371
 	.string "You're my one and only!\p"
 	.string "…{PLAYER}, I have to go, bye!$"
 
-MatchCall_PersonalizedText59:: @ 82AF480
+MatchCall_PersonalizedText59::
 	.string "This is {STR_VAR_1}!\p"
 	.string "I went to DEWFORD's GYM again\n"
 	.string "for training.\p"
@@ -1319,7 +1319,7 @@ MatchCall_PersonalizedText59:: @ 82AF480
 	.string "Forget this chat ever happened,\n"
 	.string "how about it? So long!$"
 
-MatchCall_PersonalizedText60:: @ 82AF671
+MatchCall_PersonalizedText60::
 	.string "It's a pleasure to chat with\n"
 	.string "a young TRAINER like you.\p"
 	.string "I imagine that you will continue to\n"
@@ -1334,7 +1334,7 @@ MatchCall_PersonalizedText60:: @ 82AF671
 	.string "Hahaha!\n"
 	.string "Never be discouraged!$"
 
-MatchCall_PersonalizedText61:: @ 82AF7D8
+MatchCall_PersonalizedText61::
 	.string "Hi, this is {STR_VAR_1}!\n"
 	.string "We just won a battle!\p"
 	.string "We don't win often, but it was this\n"
@@ -1348,7 +1348,7 @@ MatchCall_PersonalizedText61:: @ 82AF7D8
 	.string "to her next time?\p"
 	.string "Okay, see you!$"
 
-MatchCall_PersonalizedText62:: @ 82AF8F7
+MatchCall_PersonalizedText62::
 	.string "{STR_VAR_1} here, yes.\n"
 	.string "I headed out to sea yesterday.\p"
 	.string "I had been hoping to find a new\n"
@@ -1363,7 +1363,7 @@ MatchCall_PersonalizedText62:: @ 82AF8F7
 	.string "That's all I have to say!\n"
 	.string "Farewell for now!$"
 
-MatchCall_PersonalizedText63:: @ 82AFA39
+MatchCall_PersonalizedText63::
 	.string "Ahoy there!\n"
 	.string "It's me, {STR_VAR_1}!\l"
 	.string "I'm out on ROUTE 108 now!\l"
@@ -1375,7 +1375,7 @@ MatchCall_PersonalizedText63:: @ 82AFA39
 	.string "That's all from ROUTE 108!\n"
 	.string "Brought to you by {STR_VAR_1}!$"
 
-MatchCall_PersonalizedText64:: @ 82AFB26
+MatchCall_PersonalizedText64::
 	.string "It's {STR_VAR_1}!\p"
 	.string "I'm kind of busy, but I figured\n"
 	.string "I should let you know that I've\l"
@@ -1385,7 +1385,7 @@ MatchCall_PersonalizedText64:: @ 82AFB26
 	.string "I think we'll be good rivals,\n"
 	.string "you and I. Good-bye for now!$"
 
-MatchCall_BattleFrontierStreakText1:: @ 82AFC07
+MatchCall_BattleFrontierStreakText1::
 	.string "Hi! This is {STR_VAR_1}.\n"
 	.string "I heard the news!\p"
 	.string "They say you did excellent at\n"
@@ -1393,7 +1393,7 @@ MatchCall_BattleFrontierStreakText1:: @ 82AFC07
 	.string "It's awesome, {STR_VAR_3} straight wins?\n"
 	.string "See you!$"
 
-MatchCall_BattleFrontierStreakText2:: @ 82AFC78
+MatchCall_BattleFrontierStreakText2::
 	.string "Hello, it's {STR_VAR_1}!\n"
 	.string "I heard about you!\p"
 	.string "They said you won {STR_VAR_3} straight\n"
@@ -1401,7 +1401,7 @@ MatchCall_BattleFrontierStreakText2:: @ 82AFC78
 	.string "That's special! I should try\n"
 	.string "harder, too! See you!$"
 
-MatchCall_BattleFrontierStreakText3:: @ 82AFCFF
+MatchCall_BattleFrontierStreakText3::
 	.string "Hey there, {PLAYER}!\n"
 	.string "It's me, {STR_VAR_1}.\p"
 	.string "I heard you went on a tear at\n"
@@ -1411,7 +1411,7 @@ MatchCall_BattleFrontierStreakText3:: @ 82AFCFF
 	.string "I'd better get it together, too!\n"
 	.string "Catch you soon!$"
 
-MatchCall_BattleFrontierStreakText4:: @ 82AFDA7
+MatchCall_BattleFrontierStreakText4::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here. What's up?\p"
 	.string "There's a rumor going around that\n"
@@ -1420,7 +1420,7 @@ MatchCall_BattleFrontierStreakText4:: @ 82AFDA7
 	.string "I'd better step it up, too.\n"
 	.string "See you!$"
 
-MatchCall_BattleFrontierStreakText5:: @ 82AFE3D
+MatchCall_BattleFrontierStreakText5::
 	.string "Hiya, {PLAYER}{KUN}!\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "You were at the {STR_VAR_2}\n"
@@ -1429,7 +1429,7 @@ MatchCall_BattleFrontierStreakText5:: @ 82AFE3D
 	.string "I'd better work on my POKéMON more.\n"
 	.string "See you soon!$"
 
-MatchCall_BattleFrontierStreakText6:: @ 82AFECA
+MatchCall_BattleFrontierStreakText6::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here. How are you?\p"
 	.string "By the way, I heard you pulled off\n"
@@ -1438,7 +1438,7 @@ MatchCall_BattleFrontierStreakText6:: @ 82AFECA
 	.string "That inspires me to focus on\n"
 	.string "raising my team.$"
 
-MatchCall_BattleFrontierStreakText7:: @ 82AFF64
+MatchCall_BattleFrontierStreakText7::
 	.string "…Er, {PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here…\p"
 	.string "Oh, yeah, you were over at\n"
@@ -1447,7 +1447,7 @@ MatchCall_BattleFrontierStreakText7:: @ 82AFF64
 	.string "Oh, there goes a rare POKéMON!\n"
 	.string "I have to go!$"
 
-MatchCall_BattleFrontierStreakText8:: @ 82AFFF0
+MatchCall_BattleFrontierStreakText8::
 	.string "Oh, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1} speaking.\l"
 	.string "I hope you're doing well.\p"
@@ -1457,7 +1457,7 @@ MatchCall_BattleFrontierStreakText8:: @ 82AFFF0
 	.string "That's very impressive!\n"
 	.string "I hope you stay successful.$"
 
-MatchCall_BattleFrontierStreakText9:: @ 82B00B5
+MatchCall_BattleFrontierStreakText9::
 	.string "Oh, {PLAYER}{KUN}, hi there!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "I heard! Your {STR_VAR_3}-win streak at\n"
@@ -1465,7 +1465,7 @@ MatchCall_BattleFrontierStreakText9:: @ 82B00B5
 	.string "That is so cool!\n"
 	.string "I'd better try harder, too!$"
 
-MatchCall_BattleFrontierStreakText10:: @ 82B0129
+MatchCall_BattleFrontierStreakText10::
 	.string "Oh, {PLAYER}{KUN}, hello…\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "You won {STR_VAR_3} straight battles at\n"
@@ -1473,7 +1473,7 @@ MatchCall_BattleFrontierStreakText10:: @ 82B0129
 	.string "That's quite the accomplishment.\n"
 	.string "I need to work harder.$"
 
-MatchCall_BattleFrontierStreakText11:: @ 82B01A5
+MatchCall_BattleFrontierStreakText11::
 	.string "Ah, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "I hear you're the terror of\n"
@@ -1483,7 +1483,7 @@ MatchCall_BattleFrontierStreakText11:: @ 82B01A5
 	.string "You're good, you.\n"
 	.string "I wonder how many I can win?$"
 
-MatchCall_BattleFrontierStreakText12:: @ 82B0232
+MatchCall_BattleFrontierStreakText12::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "Are you keeping well?\p"
@@ -1493,7 +1493,7 @@ MatchCall_BattleFrontierStreakText12:: @ 82B0232
 	.string "That's quite the tale.\n"
 	.string "See you!$"
 
-MatchCall_BattleFrontierStreakText13:: @ 82B02D9
+MatchCall_BattleFrontierStreakText13::
 	.string "Ah, hello, {PLAYER}{KUN}!\n"
 	.string "This is {STR_VAR_1}!\l"
 	.string "I hope you've been keeping well.\p"
@@ -1502,7 +1502,7 @@ MatchCall_BattleFrontierStreakText13:: @ 82B02D9
 	.string "I admire your energy!\n"
 	.string "Bye now.$"
 
-MatchCall_BattleFrontierStreakText14:: @ 82B0366
+MatchCall_BattleFrontierStreakText14::
 	.string "Oh, hi, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "I heard about you!\n"
@@ -1511,7 +1511,7 @@ MatchCall_BattleFrontierStreakText14:: @ 82B0366
 	.string "You're an inspiration!\n"
 	.string "Bye-bye!$"
 
-MatchCall_BattleFrontierRecordStreakText1:: @ 82B03E6
+MatchCall_BattleFrontierRecordStreakText1::
 	.string "Hi! This is {STR_VAR_1}.\n"
 	.string "I heard the news!\p"
 	.string "They say you did excellent at\n"
@@ -1519,7 +1519,7 @@ MatchCall_BattleFrontierRecordStreakText1:: @ 82B03E6
 	.string "It's awesome--{STR_VAR_3} straight wins?\n"
 	.string "See you!$"
 
-MatchCall_BattleFrontierRecordStreakText2:: @ 82B0457
+MatchCall_BattleFrontierRecordStreakText2::
 	.string "Hello, it's {STR_VAR_1}!\n"
 	.string "I heard about you!\p"
 	.string "They said you won {STR_VAR_3} straight\n"
@@ -1527,7 +1527,7 @@ MatchCall_BattleFrontierRecordStreakText2:: @ 82B0457
 	.string "That's special! I should try\n"
 	.string "harder, too! See you!$"
 
-MatchCall_BattleFrontierRecordStreakText3:: @ 82B04DE
+MatchCall_BattleFrontierRecordStreakText3::
 	.string "Hey there, {PLAYER}!\n"
 	.string "It's me, {STR_VAR_1}.\p"
 	.string "I heard you went on a tear at\n"
@@ -1537,7 +1537,7 @@ MatchCall_BattleFrontierRecordStreakText3:: @ 82B04DE
 	.string "I'd better get it together, too!\n"
 	.string "Catch you soon!$"
 
-MatchCall_BattleFrontierRecordStreakText4:: @ 82B0586
+MatchCall_BattleFrontierRecordStreakText4::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here. What's up?\p"
 	.string "There's a rumor going around that\n"
@@ -1546,7 +1546,7 @@ MatchCall_BattleFrontierRecordStreakText4:: @ 82B0586
 	.string "I'd better step it up, too.\n"
 	.string "See you!$"
 
-MatchCall_BattleFrontierRecordStreakText5:: @ 82B061C
+MatchCall_BattleFrontierRecordStreakText5::
 	.string "Hiya, {PLAYER}{KUN}!\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "You were at the {STR_VAR_2}\n"
@@ -1555,7 +1555,7 @@ MatchCall_BattleFrontierRecordStreakText5:: @ 82B061C
 	.string "Me? I'd say I'm coming along.\n"
 	.string "See you soon!$"
 
-MatchCall_BattleFrontierRecordStreakText6:: @ 82B06A3
+MatchCall_BattleFrontierRecordStreakText6::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here. How are you?\p"
 	.string "By the way, I heard you pulled off\n"
@@ -1564,7 +1564,7 @@ MatchCall_BattleFrontierRecordStreakText6:: @ 82B06A3
 	.string "I'd better try harder myself!\n"
 	.string "See you soon!$"
 
-MatchCall_BattleFrontierRecordStreakText7:: @ 82B073B
+MatchCall_BattleFrontierRecordStreakText7::
 	.string "…Er, {PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here…\p"
 	.string "Oh, yeah, you were over at\n"
@@ -1573,7 +1573,7 @@ MatchCall_BattleFrontierRecordStreakText7:: @ 82B073B
 	.string "Oh, there goes a rare POKéMON!\n"
 	.string "I have to go!$"
 
-MatchCall_BattleFrontierRecordStreakText8:: @ 82B07C7
+MatchCall_BattleFrontierRecordStreakText8::
 	.string "Oh, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1} speaking.\l"
 	.string "I hope you're doing well.\p"
@@ -1583,7 +1583,7 @@ MatchCall_BattleFrontierRecordStreakText8:: @ 82B07C7
 	.string "That's very impressive!\n"
 	.string "I'd better work on my POKéMON, too!$"
 
-MatchCall_BattleFrontierRecordStreakText9:: @ 82B0894
+MatchCall_BattleFrontierRecordStreakText9::
 	.string "Oh, {PLAYER}{KUN}, hi there!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "I heard! Your {STR_VAR_3}-win streak at\n"
@@ -1591,7 +1591,7 @@ MatchCall_BattleFrontierRecordStreakText9:: @ 82B0894
 	.string "That is so cool!\n"
 	.string "I'd better try harder, too!$"
 
-MatchCall_BattleFrontierRecordStreakText10:: @ 82B0908
+MatchCall_BattleFrontierRecordStreakText10::
 	.string "Oh, {PLAYER}{KUN}, hello…\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "You won {STR_VAR_3} straight battles at\n"
@@ -1599,7 +1599,7 @@ MatchCall_BattleFrontierRecordStreakText10:: @ 82B0908
 	.string "That's quite the accomplishment.\n"
 	.string "I need to work harder.$"
 
-MatchCall_BattleFrontierRecordStreakText11:: @ 82B0984
+MatchCall_BattleFrontierRecordStreakText11::
 	.string "Ah, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "I hear you're the terror of\n"
@@ -1609,7 +1609,7 @@ MatchCall_BattleFrontierRecordStreakText11:: @ 82B0984
 	.string "You're good, you.\n"
 	.string "I wonder how many I can win?$"
 
-MatchCall_BattleFrontierRecordStreakText12:: @ 82B0A11
+MatchCall_BattleFrontierRecordStreakText12::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "Are you keeping well?\p"
@@ -1619,7 +1619,7 @@ MatchCall_BattleFrontierRecordStreakText12:: @ 82B0A11
 	.string "That's quite the tale.\n"
 	.string "See you!$"
 
-MatchCall_BattleFrontierRecordStreakText13:: @ 82B0AB8
+MatchCall_BattleFrontierRecordStreakText13::
 	.string "Ah, hello, {PLAYER}{KUN}!\n"
 	.string "This is {STR_VAR_1}!\l"
 	.string "I hope you've been keeping well.\p"
@@ -1628,7 +1628,7 @@ MatchCall_BattleFrontierRecordStreakText13:: @ 82B0AB8
 	.string "I admire your energy!\n"
 	.string "Bye now.$"
 
-MatchCall_BattleFrontierRecordStreakText14:: @ 82B0B45
+MatchCall_BattleFrontierRecordStreakText14::
 	.string "Oh, hi, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\l"
 	.string "I heard about you!\p"
@@ -1637,7 +1637,7 @@ MatchCall_BattleFrontierRecordStreakText14:: @ 82B0B45
 	.string "You're an inspiration!\n"
 	.string "Bye-bye!$"
 
-MatchCall_BattleDomeText1:: @ 82B0BC5
+MatchCall_BattleDomeText1::
 	.string "Hi! {PLAYER}?\n"
 	.string "Hello, this is {STR_VAR_1}!\l"
 	.string "I heard the news!\p"
@@ -1646,7 +1646,7 @@ MatchCall_BattleDomeText1:: @ 82B0BC5
 	.string "It's awesome! I have to do better!\n"
 	.string "See you!$"
 
-MatchCall_BattleDomeText2:: @ 82B0C4A
+MatchCall_BattleDomeText2::
 	.string "Hello, it's {STR_VAR_1}!\n"
 	.string "I heard about you!\p"
 	.string "They said you won {STR_VAR_3} titles\n"
@@ -1654,7 +1654,7 @@ MatchCall_BattleDomeText2:: @ 82B0C4A
 	.string "That's super! I wonder if I can\n"
 	.string "become a champion?$"
 
-MatchCall_BattleDomeText3:: @ 82B0CC7
+MatchCall_BattleDomeText3::
 	.string "Hey there, {PLAYER}!\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "How's it going?\p"
@@ -1663,7 +1663,7 @@ MatchCall_BattleDomeText3:: @ 82B0CC7
 	.string "Make it one more next time!\n"
 	.string "Catch you soon!$"
 
-MatchCall_BattleDomeText4:: @ 82B0D4A
+MatchCall_BattleDomeText4::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "I heard you became the champion\n"
@@ -1671,7 +1671,7 @@ MatchCall_BattleDomeText4:: @ 82B0D4A
 	.string "Sounds like you're working hard.\n"
 	.string "I'll try to keep up!$"
 
-MatchCall_BattleDomeText5:: @ 82B0DC8
+MatchCall_BattleDomeText5::
 	.string "Hiya, {PLAYER}{KUN}!\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "I heard you won {STR_VAR_3} times\n"
@@ -1679,7 +1679,7 @@ MatchCall_BattleDomeText5:: @ 82B0DC8
 	.string "I'd better get with it, too!\n"
 	.string "See you soon!$"
 
-MatchCall_BattleDomeText6:: @ 82B0E35
+MatchCall_BattleDomeText6::
 	.string "Hey, {PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here. How are you?\p"
 	.string "By the way, I heard you became\n"
@@ -1688,7 +1688,7 @@ MatchCall_BattleDomeText6:: @ 82B0E35
 	.string "I'd better raise my POKéMON before\n"
 	.string "you pull farther ahead.$"
 
-MatchCall_BattleDomeText7:: @ 82B0ED1
+MatchCall_BattleDomeText7::
 	.string "{PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "You were at the {STR_VAR_2}\n"
@@ -1698,7 +1698,7 @@ MatchCall_BattleDomeText7:: @ 82B0ED1
 	.string "Oh, is that right.\n"
 	.string "Okay, bye.$"
 
-MatchCall_BattleDomeText8:: @ 82B0F72
+MatchCall_BattleDomeText8::
 	.string "Oh, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1} speaking.\l"
 	.string "I hope you're doing well.\l"
@@ -1708,7 +1708,7 @@ MatchCall_BattleDomeText8:: @ 82B0F72
 	.string "I must raise my POKéMON like you.\n"
 	.string "See you again.$"
 
-MatchCall_BattleDomeText9:: @ 82B102A
+MatchCall_BattleDomeText9::
 	.string "Oh, {PLAYER}{KUN}, hi there!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "I heard! You took the title\n"
@@ -1716,7 +1716,7 @@ MatchCall_BattleDomeText9:: @ 82B102A
 	.string "That is so cool!\n"
 	.string "I'd better try harder, too!$"
 
-MatchCall_BattleDomeText10:: @ 82B10A7
+MatchCall_BattleDomeText10::
 	.string "Oh, {PLAYER}{KUN}, hello.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "You won {STR_VAR_3} straight times at\n"
@@ -1724,7 +1724,7 @@ MatchCall_BattleDomeText10:: @ 82B10A7
 	.string "That's quite the accomplishment.\n"
 	.string "I need to work harder.$"
 
-MatchCall_BattleDomeText11:: @ 82B1121
+MatchCall_BattleDomeText11::
 	.string "Ah, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "I hear you're the terror of\n"
@@ -1736,7 +1736,7 @@ MatchCall_BattleDomeText11:: @ 82B1121
 	.string "…Pretty well impossible?\n"
 	.string "Well, see you!$"
 
-MatchCall_BattleDomeText12:: @ 82B11D3
+MatchCall_BattleDomeText12::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "Are you keeping well?\p"
@@ -1745,7 +1745,7 @@ MatchCall_BattleDomeText12:: @ 82B11D3
 	.string "That's quite the tale.\n"
 	.string "See you!$"
 
-MatchCall_BattleDomeText13:: @ 82B124D
+MatchCall_BattleDomeText13::
 	.string "Ah, hello, {PLAYER}{KUN}!\n"
 	.string "This is {STR_VAR_1}!\l"
 	.string "I hope you've been keeping well.\p"
@@ -1754,7 +1754,7 @@ MatchCall_BattleDomeText13:: @ 82B124D
 	.string "I admire your energy!\n"
 	.string "Bye now.$"
 
-MatchCall_BattleDomeText14:: @ 82B12D0
+MatchCall_BattleDomeText14::
 	.string "Oh, hi, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\l"
 	.string "I heard about you!\p"
@@ -1763,7 +1763,7 @@ MatchCall_BattleDomeText14:: @ 82B12D0
 	.string "You're an inspiration!\n"
 	.string "See you again!$"
 
-MatchCall_BattlePikeText1:: @ 82B1347
+MatchCall_BattlePikeText1::
 	.string "Hi! {PLAYER}?\n"
 	.string "Hello, this is {STR_VAR_1}!\l"
 	.string "I heard the news!\p"
@@ -1772,7 +1772,7 @@ MatchCall_BattlePikeText1:: @ 82B1347
 	.string "That's awesome!\n"
 	.string "See you!$"
 
-MatchCall_BattlePikeText2:: @ 82B13B1
+MatchCall_BattlePikeText2::
 	.string "Hello, it's {STR_VAR_1}!\n"
 	.string "I heard about you!\p"
 	.string "They said you won your way through\n"
@@ -1780,7 +1780,7 @@ MatchCall_BattlePikeText2:: @ 82B13B1
 	.string "I have to try much harder!\n"
 	.string "Bye!$"
 
-MatchCall_BattlePikeText3:: @ 82B142B
+MatchCall_BattlePikeText3::
 	.string "Hey there, {PLAYER}!\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "How's it going?\p"
@@ -1789,7 +1789,7 @@ MatchCall_BattlePikeText3:: @ 82B142B
 	.string "Try to do even better next time!\n"
 	.string "Catch you soon!$"
 
-MatchCall_BattlePikeText4:: @ 82B14B4
+MatchCall_BattlePikeText4::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "I heard you blew through {STR_VAR_3} rooms\n"
@@ -1797,7 +1797,7 @@ MatchCall_BattlePikeText4:: @ 82B14B4
 	.string "I'd better train my POKéMON and\n"
 	.string "try to keep up!$"
 
-MatchCall_BattlePikeText5:: @ 82B1525
+MatchCall_BattlePikeText5::
 	.string "Hiya, {PLAYER}{KUN}!\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "I heard you got past {STR_VAR_3} rooms\n"
@@ -1805,7 +1805,7 @@ MatchCall_BattlePikeText5:: @ 82B1525
 	.string "I'd better get with it, too!\n"
 	.string "See you soon!$"
 
-MatchCall_BattlePikeText6:: @ 82B158E
+MatchCall_BattlePikeText6::
 	.string "Hey, {PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here. How are you?\p"
 	.string "By the way, I heard you got through\n"
@@ -1813,7 +1813,7 @@ MatchCall_BattlePikeText6:: @ 82B158E
 	.string "I'd better raise my POKéMON before\n"
 	.string "you pull further ahead.$"
 
-MatchCall_BattlePikeText7:: @ 82B1622
+MatchCall_BattlePikeText7::
 	.string "{PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "You were at the {STR_VAR_2}\n"
@@ -1822,7 +1822,7 @@ MatchCall_BattlePikeText7:: @ 82B1622
 	.string "Oh, there goes a rare POKéMON!\n"
 	.string "Okay, bye.$"
 
-MatchCall_BattlePikeText8:: @ 82B169D
+MatchCall_BattlePikeText8::
 	.string "Oh, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1} speaking.\l"
 	.string "I hope you're doing well.\l"
@@ -1833,7 +1833,7 @@ MatchCall_BattlePikeText8:: @ 82B169D
 	.string "I must raise my POKéMON like you.\l"
 	.string "See you again.$"
 
-MatchCall_BattlePikeText9:: @ 82B1775
+MatchCall_BattlePikeText9::
 	.string "Oh, {PLAYER}{KUN}, hi there!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "I heard! You won your way through\n"
@@ -1841,7 +1841,7 @@ MatchCall_BattlePikeText9:: @ 82B1775
 	.string "That is so cool!\n"
 	.string "I'd better try harder, too!$"
 
-MatchCall_BattlePikeText10:: @ 82B17F8
+MatchCall_BattlePikeText10::
 	.string "Oh, {PLAYER}{KUN}, hello.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "You won your way past {STR_VAR_3} rooms\n"
@@ -1849,7 +1849,7 @@ MatchCall_BattlePikeText10:: @ 82B17F8
 	.string "That's quite the accomplishment.\n"
 	.string "I need to work harder.$"
 
-MatchCall_BattlePikeText11:: @ 82B1877
+MatchCall_BattlePikeText11::
 	.string "Ah, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "I hear you're the terror of\n"
@@ -1861,7 +1861,7 @@ MatchCall_BattlePikeText11:: @ 82B1877
 	.string "…Pretty well impossible?\n"
 	.string "Well, see you!$"
 
-MatchCall_BattlePikeText12:: @ 82B1946
+MatchCall_BattlePikeText12::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "Are you keeping well?\p"
@@ -1870,7 +1870,7 @@ MatchCall_BattlePikeText12:: @ 82B1946
 	.string "That's quite the tale.\n"
 	.string "See you!$"
 
-MatchCall_BattlePikeText13:: @ 82B19C7
+MatchCall_BattlePikeText13::
 	.string "Ah, hello, {PLAYER}{KUN}!\n"
 	.string "This is {STR_VAR_1}!\l"
 	.string "I hope you've been keeping well.\p"
@@ -1879,7 +1879,7 @@ MatchCall_BattlePikeText13:: @ 82B19C7
 	.string "I admire your energy!\n"
 	.string "Bye now.$"
 
-MatchCall_BattlePikeText14:: @ 82B1A4C
+MatchCall_BattlePikeText14::
 	.string "Oh, hi, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\l"
 	.string "I heard about you!\p"
@@ -1888,7 +1888,7 @@ MatchCall_BattlePikeText14:: @ 82B1A4C
 	.string "You're an inspiration!\n"
 	.string "See you again!$"
 
-MatchCall_BattlePyramidText1:: @ 82B1ACA
+MatchCall_BattlePyramidText1::
 	.string "Hi! {PLAYER}?\n"
 	.string "Hello, this is {STR_VAR_1}!\l"
 	.string "I heard the news!\p"
@@ -1897,7 +1897,7 @@ MatchCall_BattlePyramidText1:: @ 82B1ACA
 	.string "That's awesome!\n"
 	.string "I should try that challenge.$"
 
-MatchCall_BattlePyramidText2:: @ 82B1B50
+MatchCall_BattlePyramidText2::
 	.string "Hello, it's {STR_VAR_1}!\n"
 	.string "I heard about you!\p"
 	.string "They said you won your way through\n"
@@ -1905,7 +1905,7 @@ MatchCall_BattlePyramidText2:: @ 82B1B50
 	.string "Wow, that's fantastic!\n"
 	.string "I'd better raise my POKéMON, too!$"
 
-MatchCall_BattlePyramidText3:: @ 82B1BE4
+MatchCall_BattlePyramidText3::
 	.string "Hey there, {PLAYER}!\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "How's it going?\p"
@@ -1914,7 +1914,7 @@ MatchCall_BattlePyramidText3:: @ 82B1BE4
 	.string "Try to do even better next time!\n"
 	.string "Catch you soon!$"
 
-MatchCall_BattlePyramidText4:: @ 82B1C6A
+MatchCall_BattlePyramidText4::
 	.string "Hey, {PLAYER}{KUN}.\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "I heard you scaled {STR_VAR_3} floors\n"
@@ -1922,7 +1922,7 @@ MatchCall_BattlePyramidText4:: @ 82B1C6A
 	.string "I'd better work hard and try\n"
 	.string "to keep up!$"
 
-MatchCall_BattlePyramidText5:: @ 82B1CCF
+MatchCall_BattlePyramidText5::
 	.string "Hiya, {PLAYER}{KUN}!\n"
 	.string "It's {STR_VAR_1}.\p"
 	.string "I heard you climbed {STR_VAR_3} floors\n"
@@ -1930,7 +1930,7 @@ MatchCall_BattlePyramidText5:: @ 82B1CCF
 	.string "I'd better get with it, too!\n"
 	.string "See you soon!$"
 
-MatchCall_BattlePyramidText6:: @ 82B1D38
+MatchCall_BattlePyramidText6::
 	.string "Hey, {PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here. How are you?\p"
 	.string "By the way, I heard you got through\n"
@@ -1938,7 +1938,7 @@ MatchCall_BattlePyramidText6:: @ 82B1D38
 	.string "I'd better raise my POKéMON before\n"
 	.string "you pull further ahead.$"
 
-MatchCall_BattlePyramidText7:: @ 82B1DCD
+MatchCall_BattlePyramidText7::
 	.string "{PLAYER}{KUN}?\n"
 	.string "{STR_VAR_1} here.\p"
 	.string "You were at the {STR_VAR_2}\n"
@@ -1948,7 +1948,7 @@ MatchCall_BattlePyramidText7:: @ 82B1DCD
 	.string "No, huh?\n"
 	.string "Okay, bye.$"
 
-MatchCall_BattlePyramidText8:: @ 82B1E4B
+MatchCall_BattlePyramidText8::
 	.string "Oh, {PLAYER}{KUN}, how do you do?\n"
 	.string "This is {STR_VAR_1} speaking.\l"
 	.string "I hope you're doing well.\l"
@@ -1959,7 +1959,7 @@ MatchCall_BattlePyramidText8:: @ 82B1E4B
 	.string "I must raise my POKéMON like you.\l"
 	.string "See you again.$"
 
-MatchCall_BattlePyramidText9:: @ 82B1F24
+MatchCall_BattlePyramidText9::
 	.string "Oh, {PLAYER}{KUN}, hi there!\n"
 	.string "This is {STR_VAR_1}!\p"
 	.string "I heard! You won your way through\n"
@@ -1967,7 +1967,7 @@ MatchCall_BattlePyramidText9:: @ 82B1F24
 	.string "That is so cool!\n"
 	.string "I'd better try harder, too!$"
 
-MatchCall_BattlePyramidText10:: @ 82B1FA8
+MatchCall_BattlePyramidText10::
 	.string "Oh, {PLAYER}{KUN}, hello.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "You climbed {STR_VAR_3} floors inside\n"
@@ -1975,7 +1975,7 @@ MatchCall_BattlePyramidText10:: @ 82B1FA8
 	.string "That's quite the accomplishment.\n"
 	.string "I need to work harder.$"
 
-MatchCall_BattlePyramidText11:: @ 82B2022
+MatchCall_BattlePyramidText11::
 	.string "Ah, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\p"
 	.string "I hear you're the terror of\n"
@@ -1987,7 +1987,7 @@ MatchCall_BattlePyramidText11:: @ 82B2022
 	.string "…Pretty well impossible?\n"
 	.string "Well, see you!$"
 
-MatchCall_BattlePyramidText12:: @ 82B20F3
+MatchCall_BattlePyramidText12::
 	.string "Hello, {PLAYER}{KUN}.\n"
 	.string "It's me, {STR_VAR_1}.\l"
 	.string "Are you keeping well?\p"
@@ -1996,7 +1996,7 @@ MatchCall_BattlePyramidText12:: @ 82B20F3
 	.string "That's quite the tale.\n"
 	.string "See you!$"
 
-MatchCall_BattlePyramidText13:: @ 82B2175
+MatchCall_BattlePyramidText13::
 	.string "Ah, hello, {PLAYER}{KUN}!\n"
 	.string "This is {STR_VAR_1}!\l"
 	.string "I hope you've been keeping well.\p"
@@ -2005,7 +2005,7 @@ MatchCall_BattlePyramidText13:: @ 82B2175
 	.string "I admire your energy!\n"
 	.string "Bye now.$"
 
-MatchCall_BattlePyramidText14:: @ 82B21FC
+MatchCall_BattlePyramidText14::
 	.string "Oh, hi, {PLAYER}{KUN}.\n"
 	.string "This is {STR_VAR_1}.\l"
 	.string "I heard about you!\p"
@@ -2014,7 +2014,7 @@ MatchCall_BattlePyramidText14:: @ 82B21FC
 	.string "You're an inspiration!\n"
 	.string "See you again!$"
 
-MatchCall_Text_Mom1:: @ 82B227B
+MatchCall_Text_Mom1::
 	.string "MOM: Your father and you…\n"
 	.string "Everyone is captivated by POKéMON.\p"
 	.string "What is the charm of POKéMON?\p"
@@ -2022,7 +2022,7 @@ MatchCall_Text_Mom1:: @ 82B227B
 	.string "I adore POKéMON that help me with\l"
 	.string "my everyday chores.$"
 
-MatchCall_Text_Mom2:: @ 82B2310
+MatchCall_Text_Mom2::
 	.string "MOM: Hi, {PLAYER}!\n"
 	.string "Your father keeps himself locked\l"
 	.string "away in the PETALBURG GYM.\p"
@@ -2032,13 +2032,13 @@ MatchCall_Text_Mom2:: @ 82B2310
 	.string "I'm guessing that losing to you\n"
 	.string "was a big blow to his pride!$"
 
-MatchCall_Text_Mom3:: @ 82B23F3
+MatchCall_Text_Mom3::
 	.string "MOM: {PLAYER}…\n"
 	.string "Don't worry about me or the house.\p"
 	.string "Wear those RUNNING SHOES until\n"
 	.string "they fall apart, honey!$"
 
-MatchCall_Text_Roxanne1:: @ 82B2456
+MatchCall_Text_Roxanne1::
 	.string "ROXANNE: Oh, hello, {PLAYER}!\p"
 	.string "I've been hard at work retraining\n"
 	.string "since we met.\p"
@@ -2047,7 +2047,7 @@ MatchCall_Text_Roxanne1:: @ 82B2456
 	.string "But when I do, please visit my GYM\n"
 	.string "for a rematch!$"
 
-MatchCall_Text_Roxanne2:: @ 82B250E
+MatchCall_Text_Roxanne2::
 	.string "ROXANNE: Is this {PLAYER}?\n"
 	.string "Congratulations!\l"
 	.string "I've been hearing about you!\p"
@@ -2056,18 +2056,18 @@ MatchCall_Text_Roxanne2:: @ 82B250E
 	.string "But when I do, please visit my GYM\n"
 	.string "for a rematch!$"
 
-MatchCall_Text_Roxanne3:: @ 82B25C1
+MatchCall_Text_Roxanne3::
 	.string "ROXANNE: {PLAYER}!\n"
 	.string "My GYM is ready!\p"
 	.string "Please visit RUSTBORO whenever\n"
 	.string "you can!$"
 
-MatchCall_Text_Roxanne4:: @ 82B2607
+MatchCall_Text_Roxanne4::
 	.string "ROXANNE: At the RUSTBORO GYM,\n"
 	.string "the fact that we battled, {PLAYER},\l"
 	.string "is a matter of pride.$"
 
-MatchCall_Text_Brawly1:: @ 82B2659
+MatchCall_Text_Brawly1::
 	.string "BRAWLY: Hey, there, {PLAYER}{KUN}!\p"
 	.string "I learned a lot from the battle we\n"
 	.string "had together.\p"
@@ -2078,7 +2078,7 @@ MatchCall_Text_Brawly1:: @ 82B2659
 	.string "But if I can reopen the GYM,\n"
 	.string "I want you to challenge us again.$"
 
-MatchCall_Text_Brawly2:: @ 82B275D
+MatchCall_Text_Brawly2::
 	.string "BRAWLY: Hey, {PLAYER}{KUN}!\n"
 	.string "Congratulations!\p"
 	.string "Word about your exploits arrived\n"
@@ -2090,17 +2090,17 @@ MatchCall_Text_Brawly2:: @ 82B275D
 	.string "But if I can reopen the GYM,\n"
 	.string "I want you to challenge us again.$"
 
-MatchCall_Text_Brawly3:: @ 82B286F
+MatchCall_Text_Brawly3::
 	.string "BRAWLY: Hey, {PLAYER}{KUN}!\n"
 	.string "My GYM's ready for action!\p"
 	.string "Come back to DEWFORD anytime\n"
 	.string "for another challenge!$"
 
-MatchCall_Text_Brawly4:: @ 82B28D1
+MatchCall_Text_Brawly4::
 	.string "BRAWLY: {PLAYER}{KUN}, I don't think\n"
 	.string "I'll ever get bored of battling you!$"
 
-MatchCall_Text_Wattson1:: @ 82B2912
+MatchCall_Text_Wattson1::
 	.string "WATTSON: Oh, it's you!\p"
 	.string "After you left, I've been redoing\n"
 	.string "my training from scratch.\p"
@@ -2109,7 +2109,7 @@ MatchCall_Text_Wattson1:: @ 82B2912
 	.string "You'll have to wait till then!\n"
 	.string "Wahahahaha!$"
 
-MatchCall_Text_Wattson2:: @ 82B29CA
+MatchCall_Text_Wattson2::
 	.string "WATTSON: Wahahahaha!\p"
 	.string "You've really done it, haven't you?\n"
 	.string "I've been getting word about you!\p"
@@ -2120,18 +2120,18 @@ MatchCall_Text_Wattson2:: @ 82B29CA
 	.string "You'll have to wait till then!\n"
 	.string "Wahahahaha!$"
 
-MatchCall_Text_Wattson3:: @ 82B2AB6
+MatchCall_Text_Wattson3::
 	.string "WATTSON: Oh, it's you!\n"
 	.string "My GYM's ready!\p"
 	.string "Visit MAUVILLE anytime!\n"
 	.string "Wahahahaha!$"
 
-MatchCall_Text_Wattson4:: @ 82B2B01
+MatchCall_Text_Wattson4::
 	.string "WATTSON: Wahahaha!\p"
 	.string "A battle with you is always charged\n"
 	.string "with shocking power!$"
 
-MatchCall_Text_Flannery1:: @ 82B2B4D
+MatchCall_Text_Flannery1::
 	.string "FLANNERY: {PLAYER}…\p"
 	.string "When we battled, I learned exactly\n"
 	.string "how immature I was.\p"
@@ -2141,7 +2141,7 @@ MatchCall_Text_Flannery1:: @ 82B2B4D
 	.string "When the time comes, {PLAYER},\n"
 	.string "please challenge us again.$"
 
-MatchCall_Text_Flannery2:: @ 82B2C0E
+MatchCall_Text_Flannery2::
 	.string "FLANNERY: Hello, {PLAYER}?\n"
 	.string "Congratulations!\p"
 	.string "Word of your success has reached\n"
@@ -2152,44 +2152,44 @@ MatchCall_Text_Flannery2:: @ 82B2C0E
 	.string "appear beside my name in the\l"
 	.string "MATCH CALL list.$"
 
-MatchCall_Text_Flannery3:: @ 82B2CF1
+MatchCall_Text_Flannery3::
 	.string "FLANNERY: Oh, {PLAYER}?\n"
 	.string "Our GYM's ready!\p"
 	.string "Come to LAVARIDGE for a soak\n"
 	.string "in the hot spring and a challenge!$"
 
-MatchCall_Text_Flannery4:: @ 82B2D54
+MatchCall_Text_Flannery4::
 	.string "FLANNERY: {PLAYER}…\n"
 	.string "I'm positive that you keep getting\l"
 	.string "better at training every time.$"
 
-MatchCall_Text_Winona1:: @ 82B2DA4
+MatchCall_Text_Winona1::
 	.string "WINONA: Hello, {PLAYER}!\p"
 	.string "Thanks to our battle, I've come\n"
 	.string "to understand my weak points!\p"
 	.string "When I reopen the GYM, I won't go\n"
 	.string "down in defeat again!$"
 
-MatchCall_Text_Winona2:: @ 82B2E2B
+MatchCall_Text_Winona2::
 	.string "WINONA: You've done it, {PLAYER}!\p"
 	.string "News about the new CHAMPION\n"
 	.string "has reached us in FORTREE!\p"
 	.string "But… The next time we battle,\n"
 	.string "it's not going to end the same way.$"
 
-MatchCall_Text_Winona3:: @ 82B2EC2
+MatchCall_Text_Winona3::
 	.string "WINONA: Is this {PLAYER}?\n"
 	.string "Our GYM is back in operation!\p"
 	.string "We're waiting for you in FORTREE!$"
 
-MatchCall_Text_Winona4:: @ 82B2F16
+MatchCall_Text_Winona4::
 	.string "WINONA: {PLAYER}…\n"
 	.string "Though I have lost, my wings will\l"
 	.string "never break.\p"
 	.string "Yes, in exactly the same way that\n"
 	.string "you never lost sight of your dream.$"
 
-MatchCall_Text_TateLiza1:: @ 82B2F97
+MatchCall_Text_TateLiza1::
 	.string "TATE: Oh! You're…\n"
 	.string "LIZA: {PLAYER}!\p"
 	.string "TATE: We're in training again…\n"
@@ -2199,7 +2199,7 @@ MatchCall_Text_TateLiza1:: @ 82B2F97
 	.string "TATE: A mark'll appear by our name…\n"
 	.string "LIZA: On the MATCH CALL list.$"
 
-MatchCall_Text_TateLiza2:: @ 82B306E
+MatchCall_Text_TateLiza2::
 	.string "TATE: {PLAYER}, congratulations!\n"
 	.string "LIZA: {PLAYER}, congratulations!\p"
 	.string "TATE: The two of us are…\n"
@@ -2209,7 +2209,7 @@ MatchCall_Text_TateLiza2:: @ 82B306E
 	.string "TATE: A mark'll appear by our name…\n"
 	.string "LIZA: On the MATCH CALL list.$"
 
-MatchCall_Text_TateLiza3:: @ 82B3158
+MatchCall_Text_TateLiza3::
 	.string "TATE: {PLAYER}!\n"
 	.string "LIZA: {PLAYER}!\p"
 	.string "TATE: Our GYM is ready!\n"
@@ -2217,13 +2217,13 @@ MatchCall_Text_TateLiza3:: @ 82B3158
 	.string "TATE: Please come visit…\n"
 	.string "LIZA: MOSSDEEP anytime!$"
 
-MatchCall_Text_TateLiza4:: @ 82B31CD
+MatchCall_Text_TateLiza4::
 	.string "TATE: {PLAYER}, the battle we had…\n"
 	.string "LIZA: Is an invaluable experience.\p"
 	.string "TATE: It would be nice if…\n"
 	.string "LIZA: We could all battle again!$"
 
-MatchCall_Text_Juan1:: @ 82B3249
+MatchCall_Text_Juan1::
 	.string "JUAN: Hmm…\n"
 	.string "{PLAYER}{KUN}… Was it?\p"
 	.string "Our battle together--it brought\n"
@@ -2232,7 +2232,7 @@ MatchCall_Text_Juan1:: @ 82B3249
 	.string "Perhaps you are a genius who may\n"
 	.string "yet surpass WALLACE!$"
 
-MatchCall_Text_Juan2:: @ 82B32EC
+MatchCall_Text_Juan2::
 	.string "JUAN: Fufu… {PLAYER}{KUN}…\n"
 	.string "You've finally achieved your goal.\p"
 	.string "My eye for appraising talent wasn't\n"
@@ -2241,14 +2241,14 @@ MatchCall_Text_Juan2:: @ 82B32EC
 	.string "you, for you have scaled the peak\l"
 	.string "of power and prestige.$"
 
-MatchCall_Text_Juan3:: @ 82B33AA
+MatchCall_Text_Juan3::
 	.string "JUAN: Hoho… {PLAYER}{KUN}…\p"
 	.string "Our SOOTOPOLIS GYM has finally\n"
 	.string "reopened.\p"
 	.string "If you wish to see me, you are\n"
 	.string "welcome to visit anytime.$"
 
-MatchCall_Text_Juan4:: @ 82B341E
+MatchCall_Text_Juan4::
 	.string "JUAN: {PLAYER}{KUN}…\p"
 	.string "Like the finest music, the battles\n"
 	.string "we wage together strike chords\l"
@@ -2256,7 +2256,7 @@ MatchCall_Text_Juan4:: @ 82B341E
 	.string "When I close my eyes, I see visions\n"
 	.string "of you soaring with the melody…$"
 
-MatchCall_Text_Sidney:: @ 82B34CC
+MatchCall_Text_Sidney::
 	.string "SIDNEY: Yo, {PLAYER}!\p"
 	.string "If you want to battle with me\n"
 	.string "again, you come on back whenever\l"
@@ -2264,7 +2264,7 @@ MatchCall_Text_Sidney:: @ 82B34CC
 	.string "I'll always be here!\n"
 	.string "I'll be waiting!$"
 
-MatchCall_Text_Phoebe:: @ 82B3561
+MatchCall_Text_Phoebe::
 	.string "PHOEBE: Hi, {PLAYER}!\p"
 	.string "How about coming back here again\n"
 	.string "sometime?\p"
@@ -2272,7 +2272,7 @@ MatchCall_Text_Phoebe:: @ 82B3561
 	.string "your bond has grown with your\l"
 	.string "POKéMON.$"
 
-MatchCall_Text_Glacia:: @ 82B35E4
+MatchCall_Text_Glacia::
 	.string "GLACIA: Hello, {PLAYER}.\p"
 	.string "I trust you haven't become\n"
 	.string "complacent with your power?\p"
@@ -2280,7 +2280,7 @@ MatchCall_Text_Glacia:: @ 82B35E4
 	.string "hot emotions just a little, do come\l"
 	.string "to the POKéMON LEAGUE…$"
 
-MatchCall_Text_Drake:: @ 82B368B
+MatchCall_Text_Drake::
 	.string "DRAKE: That voice… {PLAYER}, is it?\n"
 	.string "You sound well…\p"
 	.string "I understand that there is now\n"
@@ -2292,7 +2292,7 @@ MatchCall_Text_Drake:: @ 82B368B
 	.string "the POKéMON LEAGUE!\p"
 	.string "Don't you agree, {PLAYER}?$"
 
-MatchCall_Text_Wallace:: @ 82B3790
+MatchCall_Text_Wallace::
 	.string "WALLACE: Hello, {PLAYER}{KUN}.\n"
 	.string "Have you met STEVEN?\p"
 	.string "He is…\n"
@@ -2306,7 +2306,7 @@ MatchCall_Text_Wallace:: @ 82B3790
 	.string "But what is a rare stone exactly?\n"
 	.string "All I can think of is a METEORITE…$"
 
-MatchCall_Text_MayRayquazaCall: @ 82B38C1
+MatchCall_Text_MayRayquazaCall:
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
@@ -2321,7 +2321,7 @@ MatchCall_Text_MayRayquazaCall: @ 82B38C1
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-MatchCall_Text_BrendanRayquazaCall: @ 82B39C6
+MatchCall_Text_BrendanRayquazaCall:
 	.string "… … … … … …\n"
 	.string "… … … … … Beep!\p"
 	.string "BRENDAN: Hey, {PLAYER}!\n"
@@ -2335,14 +2335,14 @@ MatchCall_Text_BrendanRayquazaCall: @ 82B39C6
 	.string "… … … … … …\n"
 	.string "… … … … … Click!$"
 
-MatchCall_Text_May1:: @ 2B3AB3
+MatchCall_Text_May1::
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "MR. BRINEY retired as a SAILOR,\n"
 	.string "but I still see him out on the sea\l"
 	.string "with his pet PEEKO sometimes.\p"
 	.string "He must love the sea still.$"
 
-MatchCall_Text_May2:: @ 2B3B3F
+MatchCall_Text_May2::
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "You know how little towns like\n"
 	.string "PETALBURG and DEWFORD have GYMS?\p"
@@ -2351,7 +2351,7 @@ MatchCall_Text_May2:: @ 2B3B3F
 	.string "When they finally build a GYM there,\n"
 	.string "I should apply to be the LEADER.$"
 
-MatchCall_Text_May3:: @ 2B3C13
+MatchCall_Text_May3::
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "Do you remember a man named\n"
 	.string "the CUTTER in RUSTBORO?\l"
@@ -2363,13 +2363,13 @@ MatchCall_Text_May3:: @ 2B3C13
 	.string "… … … … … …\p"
 	.string "The ROCK SMASH GUY!$"
 
-MatchCall_Text_May4:: @ 2B3CF3
+MatchCall_Text_May4::
 	.string "MAY: {PLAYER}{KUN}?\p"
 	.string "RUSTURF TUNNEL…\n"
 	.string "They named it that because it\l"
 	.string "joins RUSTBORO and VERDANTURF.$"
 
-MatchCall_Text_May5:: @ 2B3D4B
+MatchCall_Text_May5::
 	.string "MAY: {PLAYER}{KUN}, how are you?\p"
 	.string "I'm out on ROUTE 111 now.\p"
 	.string "I'm going to get a rest at an old\n"
@@ -2377,7 +2377,7 @@ MatchCall_Text_May5:: @ 2B3D4B
 	.string "She lives just north of\n"
 	.string "the desert.$"
 
-MatchCall_Text_May6:: @ 2B3DD1
+MatchCall_Text_May6::
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "Did you know about the MIRAGE\n"
 	.string "TOWER in the desert?\p"
@@ -2385,21 +2385,21 @@ MatchCall_Text_May6:: @ 2B3DD1
 	.string "to mysteriously come and go.\p"
 	.string "I wish I could see it.$"
 
-MatchCall_Text_May7:: @ 2B3E69
+MatchCall_Text_May7::
 	.string "MAY: {PLAYER}{KUN}, yahoo!\n"
 	.string "I'm on ROUTE 119 now.\p"
 	.string "There's a big river here, and\n"
 	.string "it often rains.\p"
 	.string "I got soaked!$"
 
-MatchCall_Text_May8:: @ 2B3ECD
+MatchCall_Text_May8::
 	.string "MAY: {PLAYER}{KUN}, hi.\p"
 	.string "MT. PYRE is a memorial to POKéMON\n"
 	.string "whose lives have ended.\p"
 	.string "Maybe as a result, it's infested\n"
 	.string "with many GHOST-type POKéMON!$"
 
-MatchCall_Text_May9:: @ 2B3F2B
+MatchCall_Text_May9::
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "I was thinking of going to the hot\n"
 	.string "spring in LAVARIDGE.\p"
@@ -2407,14 +2407,14 @@ MatchCall_Text_May9:: @ 2B3F2B
 	.string "PASS, I ran into some bad-looking\l"
 	.string "characters. The mood was ugly!$"
 
-MatchCall_Text_May10:: @ 2B3FFB
+MatchCall_Text_May10::
 	.string "MAY: Hi, {PLAYER}{KUN}!\n"
 	.string "Did you see the news?\p"
 	.string "They say CAPT. STERN discovered\n"
 	.string "the SEAFLOOR CAVERN while on his\l"
 	.string "submarine expedition.$"
 
-MatchCall_Text_May11:: @ 2B402B
+MatchCall_Text_May11::
 	.string "MAY: Hi, {PLAYER}{KUN}!\n"
 	.string "Don't you think it's neat?\p"
 	.string "Even if you don't have a boat,\n"
@@ -2424,7 +2424,7 @@ MatchCall_Text_May11:: @ 2B402B
 	.string "There's a POKéMON move that lets\n"
 	.string "you go to the bottom of the sea.$"
 
-MatchCall_Text_May12:: @ 2B414B
+MatchCall_Text_May12::
 	.string "MAY: Hi, {PLAYER}{KUN}!\n"
 	.string "Hope things are okay!\p"
 	.string "Have you been on the sea and\n"
@@ -2435,7 +2435,7 @@ MatchCall_Text_May12:: @ 2B414B
 	.string "When you get to the other side,\n"
 	.string "come up to the surface. Easy!$"
 
-MatchCall_Text_May13:: @ 2B4228
+MatchCall_Text_May13::
 	.string "MAY: Hi, {PLAYER}{KUN}!\p"
 	.string "How's it going?\n"
 	.string "Are you filling your POKéDEX?\p"
@@ -2444,7 +2444,7 @@ MatchCall_Text_May13:: @ 2B4228
 	.string "And there are three of them!\p"
 	.string "I would love to see even one…$"
 
-MatchCall_Text_May14:: @ 2B42E0
+MatchCall_Text_May14::
 	.string "MAY: {PLAYER}{KUN}!\n"
 	.string "I heard the rumors!\p"
 	.string "You beat the SOOTOPOLIS GYM\n"
@@ -2452,7 +2452,7 @@ MatchCall_Text_May14:: @ 2B42E0
 	.string "That means you don't have far\n"
 	.string "to go, do you?$"
 
-MatchCall_Text_May15:: @ 2B4350
+MatchCall_Text_May15::
 	.string "MAY: There isn't a single TRAINER\n"
 	.string "left in HOENN who doesn't know who\l"
 	.string "you are, {PLAYER}{KUN}!\p"
@@ -2460,7 +2460,7 @@ MatchCall_Text_May15:: @ 2B4350
 	.string "with you, {PLAYER}{KUN}, they're all\l"
 	.string "surprised!$"
 
-MatchCall_Text_Brendan1:: @ 2B43EF
+MatchCall_Text_Brendan1::
 	.string "BRENDAN: Hey, {PLAYER}!\p"
 	.string "MR. BRINEY retired as a SAILOR,\n"
 	.string "but I still see him out on the sea\l"
@@ -2468,7 +2468,7 @@ MatchCall_Text_Brendan1:: @ 2B43EF
 	.string "I guess he must love\n"
 	.string "the sea still.$"
 
-MatchCall_Text_Brendan2:: @ 2B4486
+MatchCall_Text_Brendan2::
 	.string "BRENDAN: Hey, {PLAYER}!\p"
 	.string "I don't get how little towns like\n"
 	.string "PETALBURG and DEWFORD have GYMS.\p"
@@ -2477,7 +2477,7 @@ MatchCall_Text_Brendan2:: @ 2B4486
 	.string "When they finally build a GYM there,\n"
 	.string "I should apply to be the LEADER.$"
 
-MatchCall_Text_Brendan3:: @ 2B4560
+MatchCall_Text_Brendan3::
 	.string "BRENDAN: Yo, {PLAYER}!\p"
 	.string "Do you remember a guy named\n"
 	.string "the CUTTER in RUSTBORO?\l"
@@ -2489,14 +2489,14 @@ MatchCall_Text_Brendan3:: @ 2B4560
 	.string "… … … … … …\p"
 	.string "The ROCK SMASH GUY!$"
 
-MatchCall_Text_Brendan4:: @ 2B463F
+MatchCall_Text_Brendan4::
 	.string "BRENDAN: This voice… {PLAYER}?\p"
 	.string "They gave RUSTURF TUNNEL its name\n"
 	.string "because it joins RUSTBORO and\l"
 	.string "VERDANTURF.\p"
 	.string "Did you know that?$"
 
-MatchCall_Text_Brendan5:: @ 2B46B7
+MatchCall_Text_Brendan5::
 	.string "BRENDAN: {PLAYER}, what's up?\p"
 	.string "Hey, I'm out on ROUTE 111 now.\p"
 	.string "I'm going to rest up at an old\n"
@@ -2504,7 +2504,7 @@ MatchCall_Text_Brendan5:: @ 2B46B7
 	.string "If you're in the area, you should\n"
 	.string "visit her, too.$"
 
-MatchCall_Text_Brendan6:: @ 2B4761
+MatchCall_Text_Brendan6::
 	.string "BRENDAN: Hey, {PLAYER}!\p"
 	.string "Did you know about the MIRAGE\n"
 	.string "TOWER in the desert?\p"
@@ -2512,21 +2512,21 @@ MatchCall_Text_Brendan6:: @ 2B4761
 	.string "seen only sometimes.\p"
 	.string "I'd like to see that!$"
 
-MatchCall_Text_Brendan7:: @ 2B47F4
+MatchCall_Text_Brendan7::
 	.string "BRENDAN: Who's this? Oh, {PLAYER}?\n"
 	.string "Guess what? I'm on ROUTE 119 now.\p"
 	.string "There's a big river here, and\n"
 	.string "it rains all the time.\p"
 	.string "I got soaked to the bone!$"
 
-MatchCall_Text_Brendan8:: @ 2B4882
+MatchCall_Text_Brendan8::
 	.string "BRENDAN: {PLAYER}!\p"
 	.string "MT. PYRE is a memorial to POKéMON\n"
 	.string "whose lives have ended.\p"
 	.string "That's probably why it's infested\n"
 	.string "with many GHOST-type POKéMON!$"
 
-MatchCall_Text_Brendan9:: @ 2B4909
+MatchCall_Text_Brendan9::
 	.string "BRENDAN: Hey there, {PLAYER}.\p"
 	.string "I was on my way back to the hot\n"
 	.string "spring in LAVARIDGE.\p"
@@ -2535,14 +2535,14 @@ MatchCall_Text_Brendan9:: @ 2B4909
 	.string "Those creeps…\n"
 	.string "I think they were TEAM MAGMA.$"
 
-MatchCall_Text_Brendan10:: @ 2B49C4
+MatchCall_Text_Brendan10::
 	.string "BRENDAN: Hi, {PLAYER}!\n"
 	.string "Did you catch the news?\p"
 	.string "They say CAPT. STERN discovered\n"
 	.string "the SEAFLOOR CAVERN while on his\l"
 	.string "submarine expedition.$"
 
-MatchCall_Text_Brendan11:: @ 2B4A44
+MatchCall_Text_Brendan11::
 	.string "BRENDAN: Hey there, {PLAYER}!\n"
 	.string "Don't you think it's awesome?\p"
 	.string "Even if you don't have a boat,\n"
@@ -2552,7 +2552,7 @@ MatchCall_Text_Brendan11:: @ 2B4A44
 	.string "travel to the bottom of the sea.\p"
 	.string "Man, POKéMON can do anything!$"
 
-MatchCall_Text_Brendan12:: @ 2B4B28
+MatchCall_Text_Brendan12::
 	.string "BRENDAN: Howdy, {PLAYER}!\n"
 	.string "How are you holding up?\p"
 	.string "Ever found your way to the other\n"
@@ -2562,7 +2562,7 @@ MatchCall_Text_Brendan12:: @ 2B4B28
 	.string "When you get to the other side,\n"
 	.string "come up to the surface. Simple!$"
 
-MatchCall_Text_Brendan13:: @ 2B4C15
+MatchCall_Text_Brendan13::
 	.string "BRENDAN: Hey there, {PLAYER}!\p"
 	.string "How's it going? Filling up your\n"
 	.string "POKéDEX successfully?\p"
@@ -2571,14 +2571,14 @@ MatchCall_Text_Brendan13:: @ 2B4C15
 	.string "And not just one--three!\p"
 	.string "I'd love to catch even one…$"
 
-MatchCall_Text_Brendan14:: @ 2B4CD8
+MatchCall_Text_Brendan14::
 	.string "BRENDAN: {PLAYER}!\n"
 	.string "I heard the rumors!\p"
 	.string "You beat the SOOTOPOLIS GYM\n"
 	.string "LEADER? Awesome!\p"
 	.string "You're getting awful close now!$"
 
-MatchCall_Text_Brendan15:: @ 2B4D46
+MatchCall_Text_Brendan15::
 	.string "BRENDAN: There isn't a TRAINER in\n"
 	.string "all of HOENN who doesn't know who\l"
 	.string "you are, {PLAYER}!\p"
@@ -2586,19 +2586,19 @@ MatchCall_Text_Brendan15:: @ 2B4D46
 	.string "with you, {PLAYER}, they get pretty\l"
 	.string "envious!$"
 
-MatchCall_Text_Wally1:: @ 2B4DE2
+MatchCall_Text_Wally1::
 	.string "WALLY: Oh, {PLAYER}!\p"
 	.string "I've been getting healthier and\n"
 	.string "more physically fit.\p"
 	.string "I hope I can become a TRAINER like\n"
 	.string "you soon, {PLAYER}!$"
 
-MatchCall_Text_Wally2:: @ 2B4E57
+MatchCall_Text_Wally2::
 	.string "WALLY: {PLAYER}, hello!\p"
 	.string "After RUSTURF TUNNEL went\n"
 	.string "through, WANDA's been very happy!$"
 
-MatchCall_Text_Wally3:: @ 2B4EA5
+MatchCall_Text_Wally3::
 	.string "WALLY: Oh, {PLAYER}!\p"
 	.string "I… I left my uncle's place in\n"
 	.string "VERDANTURF without telling anyone.\p"
@@ -2606,7 +2606,7 @@ MatchCall_Text_Wally3:: @ 2B4EA5
 	.string "{PLAYER}, you understand how\n"
 	.string "I feel, don't you?$"
 
-MatchCall_Text_Wally4:: @ 2B4F41
+MatchCall_Text_Wally4::
 	.string "WALLY: {PLAYER}?\n"
 	.string "It's me, WALLY!\p"
 	.string "The world of TRAINERS is amazing!\p"
@@ -2615,7 +2615,7 @@ MatchCall_Text_Wally4:: @ 2B4F41
 	.string "It's as if everyone's getting\n"
 	.string "connected through POKéMON!$"
 
-MatchCall_Text_Wally5:: @ 2B4FF3
+MatchCall_Text_Wally5::
 	.string "WALLY: {PLAYER}? It's awesome!\n"
 	.string "That RALTS we caught together?\l"
 	.string "It evolved, {PLAYER}!\p"
@@ -2625,13 +2625,13 @@ MatchCall_Text_Wally5:: @ 2B4FF3
 	.string "After all, it's the POKéMON that\n"
 	.string "should be praised!$"
 
-MatchCall_Text_Wally6:: @ 2B50B1
+MatchCall_Text_Wally6::
 	.string "… … … … … …\n"
 	.string "… … … … … …\p"
 	.string "WALLY appears to be out of\n"
 	.string "the POKéNAV's service area…$"
 
-MatchCall_Text_Wally7:: @ 2B5100
+MatchCall_Text_Wally7::
 	.string "WALLY: Oh, {PLAYER}!\p"
 	.string "Before I met you, I hardly ever\n"
 	.string "left my house…\p"
@@ -2640,7 +2640,7 @@ MatchCall_Text_Wally7:: @ 2B5100
 	.string "{PLAYER}…\n"
 	.string "Thank you…$"
 
-MatchCall_Text_Scott1:: @ 2B5184
+MatchCall_Text_Scott1::
 	.string "SCOTT: Howdy, {PLAYER}{KUN}!\p"
 	.string "You know how POKéMON can be found\n"
 	.string "everywhere?\p"
@@ -2651,7 +2651,7 @@ MatchCall_Text_Scott1:: @ 2B5184
 	.string "As a result, I have to hurry\n"
 	.string "everywhere, too. Busy, busy!$"
 
-MatchCall_Text_Scott2:: @ 2B5275
+MatchCall_Text_Scott2::
 	.string "SCOTT: I'm on ROUTE 119 right now.\n"
 	.string "It's teeming with TRAINERS!\p"
 	.string "It's also overgrown with tall grass\n"
@@ -2659,7 +2659,7 @@ MatchCall_Text_Scott2:: @ 2B5275
 	.string "Walking around in shorts here\n"
 	.string "makes me all ticklish!$"
 
-MatchCall_Text_Scott3:: @ 2B5323
+MatchCall_Text_Scott3::
 	.string "SCOTT: Hi, hi, {PLAYER}{KUN}!\p"
 	.string "Have you had the chance to climb\n"
 	.string "MT. PYRE?\p"
@@ -2668,7 +2668,7 @@ MatchCall_Text_Scott3:: @ 2B5323
 	.string "It's somewhere every TRAINER\n"
 	.string "should climb to the top of once.$"
 
-MatchCall_Text_Scott4:: @ 2B53DB
+MatchCall_Text_Scott4::
 	.string "SCOTT: Hi, {PLAYER}{KUN}!\p"
 	.string "I've been hearing about these odd\n"
 	.string "gangs being a nuisance.\p"
@@ -2678,7 +2678,7 @@ MatchCall_Text_Scott4:: @ 2B53DB
 	.string "skilled TRAINERS among them.\p"
 	.string "…But if they're thugs…$"
 
-MatchCall_Text_Scott5:: @ 2B54A5
+MatchCall_Text_Scott5::
 	.string "SCOTT: Oh, hi, {PLAYER}{KUN}.\p"
 	.string "Might there be tough TRAINERS\n"
 	.string "at the bottom of the sea?\p"
@@ -2686,7 +2686,7 @@ MatchCall_Text_Scott5:: @ 2B54A5
 	.string "I can't swim, for one.\l"
 	.string "And I don't raise POKéMON…$"
 
-MatchCall_Text_Scott6:: @ 2B5541
+MatchCall_Text_Scott6::
 	.string "SCOTT: Hi, hi, {PLAYER}{KUN}!\p"
 	.string "You know that you can challenge\n"
 	.string "the POKéMON LEAGUE when you've\l"
@@ -2703,20 +2703,20 @@ MatchCall_Text_Scott6:: @ 2B5541
 	.string "the POKéMON LEAGUE into the HALL\l"
 	.string "OF FAME!$"
 
-MatchCall_Text_Scott7:: @ 2B56CA
+MatchCall_Text_Scott7::
 	.string "… … … … … …\n"
 	.string "… … … … … …\p"
 	.string "SCOTT appears to be out of\n"
 	.string "the POKéNAV's service area…$"
 
-MatchCall_Text_Norman1:: @ 82B5719
+MatchCall_Text_Norman1::
 	.string "DAD: In RUSTBORO, there's a man\n"
 	.string "that goes by the odd name of\l"
 	.string "the CUTTER.\p"
 	.string "If you're in the area, you should\n"
 	.string "pay him a visit.$"
 
-MatchCall_Text_Norman2:: @ 82B5795
+MatchCall_Text_Norman2::
 	.string "DAD: Hm… Little by little, but also\n"
 	.string "very surely, you're getting\l"
 	.string "tougher, {PLAYER}.\p"
@@ -2725,7 +2725,7 @@ MatchCall_Text_Norman2:: @ 82B5795
 	.string "and me…\p"
 	.string "This feeling is hard to explain.$"
 
-MatchCall_Text_Norman3:: @ 82B584D
+MatchCall_Text_Norman3::
 	.string "DAD: I see…\n"
 	.string "You've collected four GYM BADGES…\p"
 	.string "There's no avoiding it now.\n"
@@ -2733,7 +2733,7 @@ MatchCall_Text_Norman3:: @ 82B584D
 	.string "Come anytime.\n"
 	.string "We'll all be waiting for you!$"
 
-MatchCall_Text_Norman4:: @ 82B58E3
+MatchCall_Text_Norman4::
 	.string "DAD: {PLAYER}! You'd better go visit\n"
 	.string "Mother every so often.\p"
 	.string "I'm going to remain here and\n"
@@ -2741,27 +2741,27 @@ MatchCall_Text_Norman4:: @ 82B58E3
 	.string "The way of battling is deep\n"
 	.string "and unforgiving!$"
 
-MatchCall_Text_Norman5:: @ 82B5979
+MatchCall_Text_Norman5::
 	.string "DAD: Oh, hi, {PLAYER}!\p"
 	.string "What's that? MAGMA EMBLEM?\n"
 	.string "I don't know what that's about.\p"
 	.string "But with a name like that, it may\n"
 	.string "be somehow linked to a volcano!$"
 
-MatchCall_Text_Norman6:: @ 82B5A07
+MatchCall_Text_Norman6::
 	.string "DAD: Hiyah! Haah! Dwah!\p"
 	.string "…Oh? {PLAYER}!\p"
 	.string "You caught me right in the middle\n"
 	.string "of a POKéMON training session!$"
 
-MatchCall_Text_Norman7:: @ 82B5A69
+MatchCall_Text_Norman7::
 	.string "DAD: {PLAYER}!\p"
 	.string "Who would've thought you'd become\n"
 	.string "the POKéMON LEAGUE CHAMPION…\p"
 	.string "Okay!\n"
 	.string "I won't be left behind!$"
 
-MatchCall_Text_Norman8:: @ 82B5ACF
+MatchCall_Text_Norman8::
 	.string "DAD: Hm? {PLAYER}?\n"
 	.string "What good timing!\p"
 	.string "This time, I'm going to challenge\n"
@@ -2769,11 +2769,11 @@ MatchCall_Text_Norman8:: @ 82B5ACF
 	.string "I'm waiting in the PETALBURG GYM.\n"
 	.string "Accept my challenge anytime!$"
 
-MatchCall_Text_Norman9:: @ 82B5B5E
+MatchCall_Text_Norman9::
 	.string "DAD: …You amaze me, {PLAYER}.\n"
 	.string "How much higher will you soar?$"
 
-MatchCall_Text_Steven1:: @ 82B5B95
+MatchCall_Text_Steven1::
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "Have you been to MAUVILLE\n"
 	.string "already?\p"
@@ -2784,14 +2784,14 @@ MatchCall_Text_Steven1:: @ 82B5B95
 	.string "You may make a new discovery\n"
 	.string "there.$"
 
-MatchCall_Text_Steven2:: @ 82B5C53
+MatchCall_Text_Steven2::
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "I've met a lot of different\n"
 	.string "TRAINERS so far.\p"
 	.string "But you're one of a kind.\n"
 	.string "You're not like anyone else.$"
 
-MatchCall_Text_Steven3:: @ 82B5CC9
+MatchCall_Text_Steven3::
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "When you're on an adventure with\n"
 	.string "your POKéMON, what do you think?\p"
@@ -2802,7 +2802,7 @@ MatchCall_Text_Steven3:: @ 82B5CC9
 	.string "Depending on how you think, your\n"
 	.string "adventure's significance changes.$"
 
-MatchCall_Text_Steven4:: @ 82B5DB4
+MatchCall_Text_Steven4::
 	.string "STEVEN: Hello?\n"
 	.string "{PLAYER}{KUN}?\p"
 	.string "I'm involved in a spot of trouble\n"
@@ -2810,7 +2810,7 @@ MatchCall_Text_Steven4:: @ 82B5DB4
 	.string "I'm sorry, but I can't talk now.\n"
 	.string "Bye!$"
 
-MatchCall_Text_Steven5:: @ 82B5E26
+MatchCall_Text_Steven5::
 	.string "STEVEN: Oh!\n"
 	.string "{PLAYER}{KUN}!\p"
 	.string "There's no need to talk.\n"
@@ -2818,12 +2818,12 @@ MatchCall_Text_Steven5:: @ 82B5E26
 	.string "You have to believe in yourself\n"
 	.string "and do what's right.$"
 
-MatchCall_Text_Steven6:: @ 82B5EA2
+MatchCall_Text_Steven6::
 	.string "… … … … … …\p"
 	.string "STEVEN appears not to be getting\n"
 	.string "the call…$"
 
-MatchCall_Text_Steven7:: @ 82B5ED9
+MatchCall_Text_Steven7::
 	.string "STEVEN: {PLAYER}{KUN}… Congratulations\n"
 	.string "for entering the HALL OF FAME.\p"
 	.string "… … … … … …\n"
@@ -2831,7 +2831,7 @@ MatchCall_Text_Steven7:: @ 82B5ED9
 	.string "I hope we can meet again\n"
 	.string "somewhere!$"
 
-MatchCall_Text_BirchRegisterCall: @ 82B5F52
+MatchCall_Text_BirchRegisterCall:
 	.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
 	.string "I've already heard about you!\p"
 	.string "It seems your POKéNAV's been\n"
@@ -2842,7 +2842,7 @@ MatchCall_Text_BirchRegisterCall: @ 82B5F52
 	.string "out in the field.\p"
 	.string "… … … … … …$"
 
-MatchCall_Text_RegisteredBirch: @ 82B603A
+MatchCall_Text_RegisteredBirch:
 	.string "Registered PROF. BIRCH\n"
 	.string "in the POKéNAV.$"
 
@@ -2851,7 +2851,7 @@ MatchCall_Text_UnusedProfBirch:
 	.string "the POKéDEX and POKéNAV, studying\l"
 	.string "POKéMON becomes more fun, eh?$"
 
-MatchCall_Text_MrStone1:: @ 82B60C0
+MatchCall_Text_MrStone1::
 	.string "MR. STONE: Oh? {PLAYER}{KUN}!\p"
 	.string "Since you called me, the POKéNAV\n"
 	.string "must be working properly!\p"
@@ -2866,7 +2866,7 @@ MatchCall_Text_MrStone1:: @ 82B60C0
 	.string "Wahahaha!\n"
 	.string "See you again!$"
 
-MatchCall_Text_MrStone2:: @ 82B61E6
+MatchCall_Text_MrStone2::
 	.string "MR. STONE: Oh? {PLAYER}{KUN}!\p"
 	.string "What's wrong? Have you forgotten\n"
 	.string "about that little errand of mine?\p"
@@ -2878,7 +2878,7 @@ MatchCall_Text_MrStone2:: @ 82B61E6
 	.string "Now, since I am a busy PRESIDENT,\n"
 	.string "I have to go! Bye-bye!$"
 
-MatchCall_Text_MrStone3:: @ 82B6302
+MatchCall_Text_MrStone3::
 	.string "MR. STONE: Oh! {PLAYER}{KUN}!\p"
 	.string "Ah, so you've met STEVEN!\n"
 	.string "I'd better reward you, then!\p"
@@ -2886,7 +2886,7 @@ MatchCall_Text_MrStone3:: @ 82B6302
 	.string "come see me at my office.\p"
 	.string "I'll be waiting for you!$"
 
-MatchCall_Text_MrStone4:: @ 82B63A0
+MatchCall_Text_MrStone4::
 	.string "MR. STONE: Oh! {PLAYER}{KUN}!\p"
 	.string "Did you know that DEVON was\n"
 	.string "digging the RUSTURF TUNNEL?\p"
@@ -2897,14 +2897,14 @@ MatchCall_Text_MrStone4:: @ 82B63A0
 	.string "live in peace than worry about our\l"
 	.string "own convenience.$"
 
-MatchCall_Text_MrStone5:: @ 82B64A2
+MatchCall_Text_MrStone5::
 	.string "MR. STONE: Hello, hello, {PLAYER}{KUN}!\p"
 	.string "I heard from someone in PETALBURG\n"
 	.string "that you're NORMAN's child!\p"
 	.string "No wonder you're such a capable\n"
 	.string "being!$"
 
-MatchCall_Text_MrStone6:: @ 82B6526
+MatchCall_Text_MrStone6::
 	.string "MR. STONE: What's that?\p"
 	.string "You battled your own father and\n"
 	.string "defeated him?\p"
@@ -2912,7 +2912,7 @@ MatchCall_Text_MrStone6:: @ 82B6526
 	.string "I had no idea that I befriended\n"
 	.string "someone so special! Wahaha!$"
 
-MatchCall_Text_MrStone7:: @ 82B65BB
+MatchCall_Text_MrStone7::
 	.string "Hello!\n"
 	.string "This is DEVON CORPORATI…\l"
 	.string "Oh, hello, {PLAYER}!\p"
@@ -2921,21 +2921,21 @@ MatchCall_Text_MrStone7:: @ 82B65BB
 	.string "Our PRESIDENT is busy, but you\n"
 	.string "seem to be just as busy, {PLAYER}.$"
 
-MatchCall_Text_MrStone8:: @ 82B6664
+MatchCall_Text_MrStone8::
 	.string "…Huh? …What's that?\p"
 	.string "GROU… Yes? …DON?\p"
 	.string "You're breaking up…\n"
 	.string "…can't hear…\p"
 	.string "BZZZZ…$"
 
-MatchCall_Text_MrStone9:: @ 82B66B1
+MatchCall_Text_MrStone9::
 	.string "…Huh? …What's that?\p"
 	.string "Seaflo… Yes? …Caver…?\p"
 	.string "You're breaking up…\n"
 	.string "…can't hear…\p"
 	.string "BZZZZ…$"
 
-MatchCall_Text_MrStone10:: @ 82B6703
+MatchCall_Text_MrStone10::
 	.string "MR. STONE: {PLAYER}{KUN}! It's me!\p"
 	.string "You were apparently involved in all\n"
 	.string "sorts of things, but I, being busy,\l"
@@ -2945,7 +2945,7 @@ MatchCall_Text_MrStone10:: @ 82B6703
 	.string "I'll always be in your corner!\n"
 	.string "Take care!$"
 
-MatchCall_Text_MrStone11:: @ 82B67ED
+MatchCall_Text_MrStone11::
 	.string "MR. STONE: … … … … … …\n"
 	.string "Is this maybe {PLAYER}{KUN}?\p"
 	.string "Your voice is so full of confidence,\n"
diff --git a/data/text/mauville_man.inc b/data/text/mauville_man.inc
index 6326f5d8c..5d9954d9b 100644
--- a/data/text/mauville_man.inc
+++ b/data/text/mauville_man.inc
@@ -1,63 +1,63 @@
 @ Only contains a portion of the mauville_man text. The rest is in scripts/mauville_man.inc
-gText_SoPretty:: @ 8294295
+gText_SoPretty::
 	.string " so pretty!$"
 
-gText_SoDarling:: @ 82942A1
+gText_SoDarling::
 	.string " so darling!$"
 
-gText_SoRelaxed:: @ 82942AE
+gText_SoRelaxed::
 	.string " so relaxed!$"
 
-gText_SoSunny:: @ 82942BB
+gText_SoSunny::
 	.string " so sunny!$"
 
-gText_SoDesirable:: @ 82942C6
+gText_SoDesirable::
 	.string " so desirable!$"
 
-gText_SoExciting:: @ 82942D5
+gText_SoExciting::
 	.string " so exciting!$"
 
-gText_SoAmusing:: @ 82942E3
+gText_SoAmusing::
 	.string " so amusing!$"
 
-gText_SoMagical:: @ 82942F0
+gText_SoMagical::
 	.string " so magical!$"
 
-gOtherText_Is:: @ 82942FD
+gOtherText_Is::
 	.string " is$"
 
-gOtherText_DontYouAgree:: @ 8294301
+gOtherText_DontYouAgree::
 	.string "\n"
 	.string "Don't you agree?$"
 
-gMauvilleManText_ISoWantToGoOnAVacation:: @ 8294313
+gMauvilleManText_ISoWantToGoOnAVacation::
 	.string "I so want to go on a vacation.\n"
 	.string "Would you happen to know a nice place?$"
 
-gMauvilleManText_IBoughtCrayonsWith120Colors:: @ 8294359
+gMauvilleManText_IBoughtCrayonsWith120Colors::
 	.string "I bought crayons with 120 colors!\n"
 	.string "Don't you think that's nice?$"
 
-gMauvilleManText_WouldntItBeNiceIfWeCouldFloat:: @ 8294398
+gMauvilleManText_WouldntItBeNiceIfWeCouldFloat::
 	.string "Wouldn't it be nice if we could float\n"
 	.string "away on a cloud of bubbles?$"
 
-gMauvilleManText_WhenYouWriteOnASandyBeach:: @ 82943DA
+gMauvilleManText_WhenYouWriteOnASandyBeach::
 	.string "When you write on a sandy beach,\n"
 	.string "they wash away. It makes me sad.$"
 
-gMauvilleManText_WhatsTheBottomOfTheSeaLike:: @ 829441C
+gMauvilleManText_WhatsTheBottomOfTheSeaLike::
 	.string "What's the bottom of the sea like?\n"
 	.string "Just once I would so love to go!$"
 
-gMauvilleManText_WhenYouSeeTheSettingSunDoesIt:: @ 8294460
+gMauvilleManText_WhenYouSeeTheSettingSunDoesIt::
 	.string "When you see the setting sun, does it\n"
 	.string "make you want to go home?$"
 
-gMauvilleManText_LyingBackInTheGreenGrass:: @ 82944A0
+gMauvilleManText_LyingBackInTheGreenGrass::
 	.string "Lying back in the green grass…\n"
 	.string "Oh, it's so, so nice!$"
 
-gMauvilleManText_SecretBasesAreSoWonderful:: @ 82944D5
+gMauvilleManText_SecretBasesAreSoWonderful::
 	.string "SECRET BASES are so wonderful!\n"
 	.string "Can't you feel the excitement?$"
diff --git a/data/text/mevent.inc b/data/text/mevent.inc
index ae4032eb4..5fb00bc97 100644
--- a/data/text/mevent.inc
+++ b/data/text/mevent.inc
@@ -1,14 +1,14 @@
-Mevent_Text_FillOutQuestionnaire:: @ 827339F
+Mevent_Text_FillOutQuestionnaire::
 	.string "There is a questionnaire.\n"
 	.string "Would you like to fill it out?$"
 
-Mevent_Text_QuestionnaireThankYou:: @ 82733D8
+Mevent_Text_QuestionnaireThankYou::
 	.string "Thank you for taking the time to\n"
 	.string "fill out our questionnaire.\p"
 	.string "Your feedback will be used for\n"
 	.string "future reference.$"
 
-Mevent_Text_YouKnowThoseWordsGift:: @ 8273446
+Mevent_Text_YouKnowThoseWordsGift::
 	.string "Oh, hello!\n"
 	.string "You know those words?\p"
 	.string "That means you must know about\n"
@@ -16,27 +16,27 @@ Mevent_Text_YouKnowThoseWordsGift:: @ 8273446
 	.string "From now on, you should be\n"
 	.string "receiving MYSTERY GIFTS!$"
 
-Mevent_Text_YouCanAccessMysteryGift:: @ 82734CC
+Mevent_Text_YouCanAccessMysteryGift::
 	.string "Once you save your game, you can\n"
 	.string "access the MYSTERY GIFT.$"
 
-Mevent_Text_YouKnowThoseWordsEvent:: @ 8273506
+Mevent_Text_YouKnowThoseWordsEvent::
 	.string "Oh, hello!\n"
 	.string "You know those words?\p"
 	.string "That means you must know about\n"
 	.string "the MYSTERY EVENT.$"
 
-Mevent_Text_YouCanAccessMysteryEvent:: @ 8273559
+Mevent_Text_YouCanAccessMysteryEvent::
 	.string "Once you save your game, you can\n"
 	.string "access the MYSTERY EVENT.$"
 
-Mevent_Text_TheresATicketForYou:: @ 8273594
+Mevent_Text_TheresATicketForYou::
 	.string "Thank you for using the MYSTERY\n"
 	.string "EVENT System.\p"
 	.string "You must be {PLAYER}.\n"
 	.string "There is a ticket here for you.$"
 
-Mevent_Text_TryUsingItAtLilycovePort:: @ 82735F2
+Mevent_Text_TryUsingItAtLilycovePort::
 	.string "It appears to be for use at\n"
 	.string "the LILYCOVE CITY port.\p"
 	.string "Why not give it a try and see what\n"
diff --git a/data/text/move_tutors.inc b/data/text/move_tutors.inc
index baadad73d..591655640 100644
--- a/data/text/move_tutors.inc
+++ b/data/text/move_tutors.inc
@@ -1,8 +1,8 @@
-MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce: @ 82C6E05
+MoveTutor_Text_ThisMoveCanOnlyBeLearnedOnce:
 	.string "This move can be learned only\n"
 	.string "once. Is that okay?$"
 
-MoveTutor_Text_SwaggerTeach: @ 82C6E37
+MoveTutor_Text_SwaggerTeach:
 	.string "Heh! My POKéMON totally rules!\n"
 	.string "It's cooler than any POKéMON!\p"
 	.string "I was lipping off with a swagger in\n"
@@ -12,19 +12,19 @@ MoveTutor_Text_SwaggerTeach: @ 82C6E37
 	.string "If you'd like, I'll teach the move\n"
 	.string "SWAGGER to a POKéMON of yours.$"
 
-MoveTutor_Text_SwaggerDeclined: @ 82C6F33
+MoveTutor_Text_SwaggerDeclined:
 	.string "What, no? Can't you get into\n"
 	.string "the spirit of things?$"
 
-MoveTutor_Text_SwaggerWhichMon: @ 82C6F66
+MoveTutor_Text_SwaggerWhichMon:
 	.string "All right, which POKéMON wants to\n"
 	.string "learn how to SWAGGER?$"
 
-MoveTutor_Text_SwaggerTaught: @ 82C6F9E
+MoveTutor_Text_SwaggerTaught:
 	.string "I'll just praise my POKéMON from now\n"
 	.string "on without the swagger.$"
 
-MoveTutor_Text_RolloutTeach: @ 82C6FDB
+MoveTutor_Text_RolloutTeach:
 	.string "Did you know that you can go from\n"
 	.string "here a long way in that direction\l"
 	.string "without changing direction?\p"
@@ -35,19 +35,19 @@ MoveTutor_Text_RolloutTeach: @ 82C6FDB
 	.string "I can teach one the move ROLLOUT\n"
 	.string "if you'd like.$"
 
-MoveTutor_Text_RolloutDeclined: @ 82C70C4
+MoveTutor_Text_RolloutDeclined:
 	.string "You don't need to be shy about it.\n"
 	.string "Let's roll!$"
 
-MoveTutor_Text_RolloutWhichMon: @ 82C70F3
+MoveTutor_Text_RolloutWhichMon:
 	.string "Ehehe, sure thing! It'd be great if\n"
 	.string "the POKéMON looked like me.$"
 
-MoveTutor_Text_RolloutTaught: @ 82C7133
+MoveTutor_Text_RolloutTaught:
 	.string "Rolling around in the grass makes me\n"
 	.string "happy. Come on, let's roll!$"
 
-MoveTutor_Text_FuryCutterTeach: @ 82C7174
+MoveTutor_Text_FuryCutterTeach:
 	.string "There's a move that gets stronger\n"
 	.string "when you keep using it in a row.\p"
 	.string "It's a BUG-type move, and it is\n"
@@ -55,18 +55,18 @@ MoveTutor_Text_FuryCutterTeach: @ 82C7174
 	.string "It's called FURY CUTTER.\n"
 	.string "Want me to teach it to a POKéMON?$"
 
-MoveTutor_Text_FuryCutterDeclined: @ 82C7221
+MoveTutor_Text_FuryCutterDeclined:
 	.string "We're not on the same wavelength.$"
 
-MoveTutor_Text_FuryCutterWhichMon: @ 82C7243
+MoveTutor_Text_FuryCutterWhichMon:
 	.string "Yay!\n"
 	.string "Show me which POKéMON I should teach.$"
 
-MoveTutor_Text_FuryCutterTaught: @ 82C726E
+MoveTutor_Text_FuryCutterTaught:
 	.string "I get a thrill watching to see if\n"
 	.string "the move keeps hitting in succession!$"
 
-MoveTutor_MimicTeach: @ 82C72B6
+MoveTutor_MimicTeach:
 	.string "Ah, young one!\p"
 	.string "I am also a young one, but I mimic\n"
 	.string "the styles and speech of the elderly\l"
@@ -75,21 +75,21 @@ MoveTutor_MimicTeach: @ 82C72B6
 	.string "Would you agree to it if I were to\l"
 	.string "offer to teach the move MIMIC?$"
 
-MoveTutor_MimicDeclined: @ 82C737F
+MoveTutor_MimicDeclined:
 	.string "Oh, boo! I wanted to teach MIMIC\n"
 	.string "to your POKéMON!$"
 
-MoveTutor_Text_MimicWhichMon: @ 82C73B1
+MoveTutor_Text_MimicWhichMon:
 	.string "Fwofwo! And so I shall!\n"
 	.string "Let me see the POKéMON\l"
 	.string "you wish me to teach.$"
 
-MoveTutor_Text_MimicTaught: @ 82C73F6
+MoveTutor_Text_MimicTaught:
 	.string "MIMIC is a move of great depth.\p"
 	.string "Could you execute it to perfection\n"
 	.string "as well as me…?$"
 
-MoveTutor_Text_MetronomeTeach: @ 82C7449
+MoveTutor_Text_MetronomeTeach:
 	.string "I want all sorts of things!\n"
 	.string "But I used up my allowance…\p"
 	.string "Wouldn't it be nice if there were\n"
@@ -100,22 +100,22 @@ MoveTutor_Text_MetronomeTeach: @ 82C7449
 	.string "Money won't appear, but your POKéMON\n"
 	.string "will waggle a finger. Yes?$"
 
-MoveTutor_Text_MetronomeDeclined: @ 82C7556
+MoveTutor_Text_MetronomeDeclined:
 	.string "Okay. I'll be here if you change\n"
 	.string "your mind.$"
 
-MoveTutor_Text_MetronomeWhichMon: @ 82C7582
+MoveTutor_Text_MetronomeWhichMon:
 	.string "Okay! I'll teach it!\n"
 	.string "Which POKéMON should I teach?$"
 
-MoveTutor_Text_MetronomeTaught: @ 82C75B5
+MoveTutor_Text_MetronomeTaught:
 	.string "When a POKéMON waggles its finger\n"
 	.string "like a METRONOME, all sorts of nice\l"
 	.string "things happen.\p"
 	.string "Wouldn't it be nice if we could\n"
 	.string "use it, too?$"
 
-MoveTutor_Text_SleepTalkTeach: @ 82C7637
+MoveTutor_Text_SleepTalkTeach:
 	.string "Humph! My wife relies on HIDDEN\n"
 	.string "POWER to stay awake.\p"
 	.string "She should just take a nap like I do,\n"
@@ -123,21 +123,21 @@ MoveTutor_Text_SleepTalkTeach: @ 82C7637
 	.string "I can teach your POKéMON how to\n"
 	.string "SLEEP TALK instead. Interested?$"
 
-MoveTutor_Text_SleepTalkDeclined: @ 82C76E2
+MoveTutor_Text_SleepTalkDeclined:
 	.string "Oh, fine, fine. You want to stay awake\n"
 	.string "with HIDDEN POWER, too…$"
 
-MoveTutor_Text_SleepTalkWhichMon: @ 82C7721
+MoveTutor_Text_SleepTalkWhichMon:
 	.string "Ah, an appreciative child!\n"
 	.string "Which POKéMON should I teach?$"
 
-MoveTutor_Text_SleepTalkTaught: @ 82C775A
+MoveTutor_Text_SleepTalkTaught:
 	.string "I've never once gotten my wife's\n"
 	.string "coin trick right.\p"
 	.string "I would be happy if I got it right\n"
 	.string "even as I SLEEP TALK…$"
 
-MoveTutor_Text_SubstituteTeach: @ 82C77C6
+MoveTutor_Text_SubstituteTeach:
 	.string "When I see the wide world from up\n"
 	.string "here on the roof…\p"
 	.string "I think about how nice it would be\n"
@@ -148,22 +148,22 @@ MoveTutor_Text_SubstituteTeach: @ 82C77C6
 	.string "I know! Would you be interested in\n"
 	.string "having a POKéMON learn SUBSTITUTE?$"
 
-MoveTutor_Text_SubstituteDeclined: @ 82C78D1
+MoveTutor_Text_SubstituteDeclined:
 	.string "Oh, no?\p"
 	.string "A POKéMON can make a copy of\n"
 	.string "itself using it, you know.$"
 
-MoveTutor_Text_SubstituteWhichMon: @ 82C7911
+MoveTutor_Text_SubstituteWhichMon:
 	.string "Giggle…\n"
 	.string "Which POKéMON do you want me to\l"
 	.string "teach SUBSTITUTE?$"
 
-MoveTutor_Text_SubstituteTaught: @ 82C794B
+MoveTutor_Text_SubstituteTaught:
 	.string "We human beings should enjoy our\n"
 	.string "own lives to the utmost!\p"
 	.string "I hope you'll get that way, too!$"
 
-MoveTutor_Text_DynamicPunchTeach: @ 82C79A6
+MoveTutor_Text_DynamicPunchTeach:
 	.string "I can't do this anymore!\p"
 	.string "It's utterly hopeless!\p"
 	.string "I'm a FIGHTING-type TRAINER,\n"
@@ -176,19 +176,19 @@ MoveTutor_Text_DynamicPunchTeach: @ 82C79A6
 	.string "Or do you want me to teach your\n"
 	.string "POKéMON DYNAMICPUNCH?$"
 
-MoveTutor_Text_DynamicPunchDeclined: @ 82C7AD4
+MoveTutor_Text_DynamicPunchDeclined:
 	.string "Darn! You're even making fun of me?\n"
 	.string "Punch! Punch! Punch!$"
 
-MoveTutor_Text_DynamicPunchWhichMon: @ 82C7B0D
+MoveTutor_Text_DynamicPunchWhichMon:
 	.string "What? You do? You're a good person!\n"
 	.string "Which POKéMON should I teach?$"
 
-MoveTutor_Text_DynamicPunchTaught: @ 82C7B4F
+MoveTutor_Text_DynamicPunchTaught:
 	.string "I want you to win at the MOSSDEEP GYM\n"
 	.string "using that DYNAMICPUNCH!$"
 
-MoveTutor_Text_DoubleEdgeTeach: @ 82C7B8E
+MoveTutor_Text_DoubleEdgeTeach:
 	.string "Sigh…\p"
 	.string "SOOTOPOLIS's GYM LEADER is really\n"
 	.string "lovably admirable.\p"
@@ -199,19 +199,19 @@ MoveTutor_Text_DoubleEdgeTeach: @ 82C7B8E
 	.string "Please, let me teach your POKéMON\n"
 	.string "the move DOUBLE-EDGE!$"
 
-MoveTutor_Text_DoubleEdgeDeclined: @ 82C7C7E
+MoveTutor_Text_DoubleEdgeDeclined:
 	.string "Oh…\n"
 	.string "Even you rejected me…$"
 
-MoveTutor_Text_DoubleEdgeWhichMon: @ 82C7C98
+MoveTutor_Text_DoubleEdgeWhichMon:
 	.string "Okay, which POKéMON should I teach\n"
 	.string "DOUBLE-EDGE?$"
 
-MoveTutor_Text_DoubleEdgeTaught: @ 82C7CC8
+MoveTutor_Text_DoubleEdgeTaught:
 	.string "I won't live for love anymore!\n"
 	.string "I'll become tough!$"
 
-MoveTutor_Text_ExplosionTeach: @ 82C7CFA
+MoveTutor_Text_ExplosionTeach:
 	.string "I don't intend to be going nowhere\n"
 	.string "fast in the sticks like this forever.\p"
 	.string "You watch me, I'll get out to the city\n"
@@ -221,15 +221,15 @@ MoveTutor_Text_ExplosionTeach: @ 82C7CFA
 	.string "If you overheard that, I'll happily\n"
 	.string "teach EXPLOSION to your POKéMON!$"
 
-MoveTutor_Text_ExplosionDeclined: @ 82C7E04
+MoveTutor_Text_ExplosionDeclined:
 	.string "Gaah! You're turning me down because\n"
 	.string "I live in the country?$"
 
-MoveTutor_Text_ExplosionWhichMon: @ 82C7E40
+MoveTutor_Text_ExplosionWhichMon:
 	.string "Fine! An EXPLOSION it is!\n"
 	.string "Which POKéMON wants to blow up?$"
 
-MoveTutor_Text_ExplosionTaught: @ 82C7E7A
+MoveTutor_Text_ExplosionTaught:
 	.string "For a long time, I've taught POKéMON\n"
 	.string "how to use EXPLOSION, but I've yet\l"
 	.string "to ignite my own EXPLOSION…\p"
diff --git a/data/text/obtain_item.inc b/data/text/obtain_item.inc
index d263388f5..37788a8ff 100644
--- a/data/text/obtain_item.inc
+++ b/data/text/obtain_item.inc
@@ -1,31 +1,31 @@
-gText_ObtainedTheItem:: @ 8272A78
+gText_ObtainedTheItem::
 	.string "Obtained the {STR_VAR_2}!$"
 
-gText_TheBagIsFull:: @ 8272A89
+gText_TheBagIsFull::
 	.string "The BAG is full…$"
 
-gText_PutItemInPocket:: @ 8272A9A
+gText_PutItemInPocket::
 	.string "{PLAYER} put away the {STR_VAR_2}\n"
 	.string "in the {STR_VAR_3} POCKET.$"
 
-gText_PlayerFoundOneItem:: @ 8272ABF
+gText_PlayerFoundOneItem::
 	.string "{PLAYER} found one {STR_VAR_2}!$"
 
-gText_TooBadBagIsFull:: @ 8272AD0
+gText_TooBadBagIsFull::
 	.string "Too bad!\n"
 	.string "The BAG is full…$"
 
-gText_PlayerPutItemInBag:: @ 8272AEA
+gText_PlayerPutItemInBag::
 	.string "{PLAYER} put away the {STR_VAR_2}\n"
 	.string "in the BAG.$"
 
-gText_ObtainedTheDecor:: @ 8272B09
+gText_ObtainedTheDecor::
 	.string "Obtained the {STR_VAR_2}!$"
 
-gText_NoRoomLeftForAnother:: @ 8272B1A
+gText_NoRoomLeftForAnother::
 	.string "Too bad! There's no room left for\n"
 	.string "another {STR_VAR_2}…$"
 
-gText_TheDecorWasTransferredToThePC:: @ 8272B48
+gText_TheDecorWasTransferredToThePC::
 	.string "The {STR_VAR_2} was transferred\n"
 	.string "to the PC.$"
diff --git a/data/text/pc.inc b/data/text/pc.inc
index 5367632b5..1c7bf5a32 100644
--- a/data/text/pc.inc
+++ b/data/text/pc.inc
@@ -1,17 +1,17 @@
-Text_BootUpPC: @ 827265A
+Text_BootUpPC:
 	.string "{PLAYER} booted up the PC.$"
 
-gText_WhichPCShouldBeAccessed:: @ 827266F
+gText_WhichPCShouldBeAccessed::
 	.string "Which PC should be accessed?$"
 
-gText_AccessedSomeonesPC:: @ 827268C
+gText_AccessedSomeonesPC::
 	.string "Accessed SOMEONE'S PC.$"
 
-gText_StorageSystemOpened:: @ 82726A3
+gText_StorageSystemOpened::
 	.string "POKéMON Storage System opened.$"
 
-gText_AccessedPlayersPC:: @ 82726C2
+gText_AccessedPlayersPC::
 	.string "Accessed {PLAYER}'s PC.$"
 
-gText_AccessedLanettesPC:: @ 82726D4
+gText_AccessedLanettesPC::
 	.string "Accessed LANETTE's PC.$"
diff --git a/data/text/pc_transfer.inc b/data/text/pc_transfer.inc
index 216e0b570..53a82c8f1 100644
--- a/data/text/pc_transfer.inc
+++ b/data/text/pc_transfer.inc
@@ -1,31 +1,31 @@
-gText_PkmnTransferredSomeonesPC:: @ 8273216
+gText_PkmnTransferredSomeonesPC::
 	.string "{STR_VAR_2} was transferred to\n"
 	.string "SOMEONE'S PC.\p"
 	.string "It was placed in \n"
 	.string "BOX “{STR_VAR_1}.”$"
 
-gText_PkmnTransferredLanettesPC:: @ 8273256
+gText_PkmnTransferredLanettesPC::
 	.string "{STR_VAR_2} was transferred to\nLANETTE'S PC.\p"
 	.string "It was placed in \n"
 	.string "BOX “{STR_VAR_1}.”$"
 
-gText_PkmnTransferredSomeonesPCBoxFull:: @ 8273296
+gText_PkmnTransferredSomeonesPCBoxFull::
 	.string "BOX “{STR_VAR_3}” on\n"
 	.string "SOMEONE'S PC was full.\p"
 	.string "{STR_VAR_2} was transferred to\n"
 	.string "BOX “{STR_VAR_1}.”$"
 
-gText_PkmnTransferredLanettesPCBoxFull:: @ 82732D9
+gText_PkmnTransferredLanettesPCBoxFull::
 	.string "BOX “{STR_VAR_3}” on\n"
 	.string "LANETTE'S PC was full.\p"
 	.string "{STR_VAR_2} was transferred to\n"
 	.string "BOX “{STR_VAR_1}.”$"
 
-gText_NoMoreRoomForPokemon:: @ 827331C
+gText_NoMoreRoomForPokemon::
 	.string "There's no more room for POKéMON!\p"
 	.string "The POKéMON BOXES are full and\n"
 	.string "can't accept any more!$"
 
-gText_NicknameThisPokemon:: @ 8273374
+gText_NicknameThisPokemon::
 	.string "Do you want to give a nickname to\n"
 	.string "this {STR_VAR_1}?$"
diff --git a/data/text/pkmn_center_nurse.inc b/data/text/pkmn_center_nurse.inc
index 1c2837203..05a186f2f 100644
--- a/data/text/pkmn_center_nurse.inc
+++ b/data/text/pkmn_center_nurse.inc
@@ -1,30 +1,30 @@
-gText_WouldYouLikeToRestYourPkmn:: @ 82726EB
+gText_WouldYouLikeToRestYourPkmn::
     .string "Hello, and welcome to\n"
     .string "the POKéMON CENTER.\p"
     .string "We restore your tired POKéMON\n"
     .string "to full health.\p"
     .string "Would you like to rest your POKéMON?$"
 
-gText_IllTakeYourPkmn:: @ 8272768
+gText_IllTakeYourPkmn::
     .string "Okay, I'll take your POKéMON\n"
     .string "for a few seconds.$"
 
-gText_RestoredPkmnToFullHealth:: @ 8272798
+gText_RestoredPkmnToFullHealth::
     .string "Thank you for waiting.\p"
     .string "We've restored your POKéMON\n"
     .string "to full health.$"
 
-gText_WeHopeToSeeYouAgain:: @ 82727DB
+gText_WeHopeToSeeYouAgain::
     .string "We hope to see you again!$"
 
-gText_WelcomeCutShort:: @ 82727F5
+gText_WelcomeCutShort::
     .string "Hello, and welcome to\n"
     .string "the POKéMON CENTER.\p"
     .string "We restore your tired POKéMON\n"
     .string "to full health.\p"
     .string "Would you like to…$"
 
-gText_NoticesGoldCard:: @ 8272860
+gText_NoticesGoldCard::
     .string "Th-that card…\n"
     .string "Could it be… The GOLD CARD?!\p"
     .string "Oh, the gold color is brilliant!\n"
@@ -36,16 +36,16 @@ gText_NoticesGoldCard:: @ 8272860
     .string "Okay, {PLAYER}, please allow me\n"
     .string "the honor of resting your POKéMON!$"
 
-gText_YouWantTheUsual:: @ 8272982
+gText_YouWantTheUsual::
     .string "I'm delighted to see you, {PLAYER}!\n"
     .string "You want the usual, am I right?$"
 
-gText_IllTakeYourPkmn2:: @ 82729C0
+gText_IllTakeYourPkmn2::
     .string "Okay, I'll take your POKéMON\n"
     .string "for a few seconds.$"
 
-gText_ThankYouForWaiting:: @ 82729F0
+gText_ThankYouForWaiting::
     .string "Thank you for waiting.$"
 
-gText_WeHopeToSeeYouAgain2:: @ 8272A07
+gText_WeHopeToSeeYouAgain2::
     .string "We hope to see you again!$"
diff --git a/data/text/pokedex_rating.inc b/data/text/pokedex_rating.inc
index 4c6c3f2b6..fcb26bc7d 100644
--- a/data/text/pokedex_rating.inc
+++ b/data/text/pokedex_rating.inc
@@ -1,114 +1,114 @@
-gBirchDexRatingText_AreYouCurious:: @ 82A5C9C
+gBirchDexRatingText_AreYouCurious::
 	.string "PROF. BIRCH: Ah, {PLAYER}{KUN}!\p"
 	.string "Are you curious about how your\n"
 	.string "POKéDEX is coming along?$"
 
-gBirchDexRatingText_Cancel: @ 82A5CEB
+gBirchDexRatingText_Cancel:
 	.string "Hm? Oh, you haven't caught enough\n"
 	.string "POKéMON to make it worthwhile.$"
 
-gBirchDexRatingText_SoYouveSeenAndCaught:: @ 82A5D2C
+gBirchDexRatingText_SoYouveSeenAndCaught::
 	.string "Hmhm…\p"
 	.string "So, you've seen {STR_VAR_1} POKéMON,\n"
 	.string "and you've caught {STR_VAR_2} POKéMON…$"
 
-gBirchDexRatingText_LessThan10:: @ 82A5D6C
+gBirchDexRatingText_LessThan10::
 	.string "Go into grassy areas more and look\n"
 	.string "for POKéMON more carefully.$"
 
-gBirchDexRatingText_LessThan20:: @ 82A5DAB
+gBirchDexRatingText_LessThan20::
 	.string "I guess you're getting the hang\n"
 	.string "of it. But, it gets harder from here.$"
 
-gBirchDexRatingText_LessThan30:: @ 82A5DF1
+gBirchDexRatingText_LessThan30::
 	.string "Some POKéMON only appear in\n"
 	.string "certain areas.\l"
 	.string "You must be persistent.$"
 
-gBirchDexRatingText_LessThan40:: @ 82A5E34
+gBirchDexRatingText_LessThan40::
 	.string "Well, it could use more quantity,\n"
 	.string "but this is looking more like\l"
 	.string "a POKéDEX now.$"
 
-gBirchDexRatingText_LessThan50:: @ 82A5E83
+gBirchDexRatingText_LessThan50::
 	.string "This is coming along pretty good.\n"
 	.string "Keep up the effort.$"
 
-gBirchDexRatingText_LessThan60:: @ 82A5EB9
+gBirchDexRatingText_LessThan60::
 	.string "Are you using any RODS?\n"
 	.string "There are many POKéMON in the sea.$"
 
-gBirchDexRatingText_LessThan70:: @ 82A5EF4
+gBirchDexRatingText_LessThan70::
 	.string "Instead of just catching POKéMON,\n"
 	.string "how about making them evolve, too?$"
 
-gBirchDexRatingText_LessThan80:: @ 82A5F39
+gBirchDexRatingText_LessThan80::
 	.string "This is going to be a fantastic\n"
 	.string "POKéDEX.\l"
 	.string "That's the feeling I'm getting.$"
 
-gBirchDexRatingText_LessThan90:: @ 82A5F82
+gBirchDexRatingText_LessThan90::
 	.string "You've collected this many…\n"
 	.string "Your talent is remarkable!$"
 
-gBirchDexRatingText_LessThan100:: @ 82A5FB9
+gBirchDexRatingText_LessThan100::
 	.string "Have you visited the SAFARI ZONE?\p"
 	.string "I hear there are some POKéMON that\n"
 	.string "can only be caught there.$"
 
-gBirchDexRatingText_LessThan110:: @ 82A6018
+gBirchDexRatingText_LessThan110::
 	.string "You've finally reached\n"
 	.string "the 100-kind mark.\p"
 	.string "This is an impressive POKéDEX!$"
 
-gBirchDexRatingText_LessThan120:: @ 82A6061
+gBirchDexRatingText_LessThan120::
 	.string "There might be POKéMON that can be\n"
 	.string "found using ROCK SMASH.$"
 
-gBirchDexRatingText_LessThan130:: @ 82A609C
+gBirchDexRatingText_LessThan130::
 	.string "You should get some more POKéMON\n"
 	.string "by trading with others.$"
 
-gBirchDexRatingText_LessThan140:: @ 82A60D5
+gBirchDexRatingText_LessThan140::
 	.string "I've heard of POKéMON that evolve\n"
 	.string "when they come to fully love their\l"
 	.string "TRAINERS.$"
 
-gBirchDexRatingText_LessThan150:: @ 82A6124
+gBirchDexRatingText_LessThan150::
 	.string "I had no idea that there were so\n"
 	.string "many POKéMON species in the HOENN\l"
 	.string "region.$"
 
-gBirchDexRatingText_LessThan160:: @ 82A616F
+gBirchDexRatingText_LessThan160::
 	.string "On occasion, some POKéMON appear\n"
 	.string "in large numbers like outbreaks.\p"
 	.string "Don't miss opportunities like\n"
 	.string "those.$"
 
-gBirchDexRatingText_LessThan170:: @ 82A61D6
+gBirchDexRatingText_LessThan170::
 	.string "One can get a very good idea about\n"
 	.string "the POKéMON of the HOENN region\l"
 	.string "by looking through your POKéDEX.$"
 
-gBirchDexRatingText_LessThan180:: @ 82A623A
+gBirchDexRatingText_LessThan180::
 	.string "I would say you already qualify as\n"
 	.string "a POKéMON PROFESSOR, and a good\l"
 	.string "one, too!$"
 
-gBirchDexRatingText_LessThan190:: @ 82A6287
+gBirchDexRatingText_LessThan190::
 	.string "With a POKéDEX this complete,\n"
 	.string "you're a real professional at this!$"
 
-gBirchDexRatingText_LessThan200:: @ 82A62C9
+gBirchDexRatingText_LessThan200::
 	.string "You're very close to completing\n"
 	.string "this POKéDEX.\l"
 	.string "I can feel it in my bones!$"
 
-gBirchDexRatingText_DexCompleted:: @ 82A6312
+gBirchDexRatingText_DexCompleted::
 	.string "Congratulations!\n"
 	.string "Your POKéDEX is complete!$"
 
-gBirchDexRatingText_OnANationwideBasis:: @ 82A633D
+gBirchDexRatingText_OnANationwideBasis::
 	.string "Hmhm…\n"
 	.string "On a nationwide basis…\p"
 	.string "You've seen {STR_VAR_1} POKéMON,\n"
diff --git a/data/text/pokemon_news.inc b/data/text/pokemon_news.inc
index 3cac20c18..c91d9958a 100644
--- a/data/text/pokemon_news.inc
+++ b/data/text/pokemon_news.inc
@@ -1,5 +1,5 @@
 
-gPokeNewsTextSlateport_Upcoming:: @ 0828D0F8
+gPokeNewsTextSlateport_Upcoming::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "SLATEPORT's most popular kind of guy,\n"
@@ -14,7 +14,7 @@ gPokeNewsTextSlateport_Upcoming:: @ 0828D0F8
 	.string "would be well worth your while that day.\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextSlateport_Ongoing:: @ 0828D2A1
+gPokeNewsTextSlateport_Ongoing::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "This is the news you've all been\n"
@@ -28,7 +28,7 @@ gPokeNewsTextSlateport_Ongoing:: @ 0828D2A1
 	.string "to your heart's content?\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextSlateport_Ending:: @ 0828D3F5
+gPokeNewsTextSlateport_Ending::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "This is the news you've all been\n"
@@ -43,7 +43,7 @@ gPokeNewsTextSlateport_Ending:: @ 0828D3F5
 	.string "a most enjoyable shopping trip?\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextGameCorner_Upcoming:: @ 0828D571
+gPokeNewsTextGameCorner_Upcoming::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "It's approaching!\n"
@@ -54,7 +54,7 @@ gPokeNewsTextGameCorner_Upcoming:: @ 0828D571
 	.string "may be lucky on this particular day!\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextGameCorner_Ongoing:: @ 0828D66F
+gPokeNewsTextGameCorner_Ongoing::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "It's here!\n"
@@ -67,7 +67,7 @@ gPokeNewsTextGameCorner_Ongoing:: @ 0828D66F
 	.string "This is the place!\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextGameCorner_Ending:: @ 0828D768
+gPokeNewsTextGameCorner_Ending::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "It's here!\n"
@@ -80,7 +80,7 @@ gPokeNewsTextGameCorner_Ending:: @ 0828D768
 	.string "The location is MAUVILLE CITY.\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextLilycove_Upcoming:: @ 0828D875
+gPokeNewsTextLilycove_Upcoming::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "We've just received wonderful news\n"
@@ -91,7 +91,7 @@ gPokeNewsTextLilycove_Upcoming:: @ 0828D875
 	.string "you've always wanted could be yours!\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextLilycove_Ongoing:: @ 0828D994
+gPokeNewsTextLilycove_Ongoing::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "This is the news you've all been\n"
@@ -104,7 +104,7 @@ gPokeNewsTextLilycove_Ongoing:: @ 0828D994
 	.string "with them all!\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextLilycove_Ending:: @ 0828DAC0
+gPokeNewsTextLilycove_Ending::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "This is the news you've all been\n"
@@ -117,7 +117,7 @@ gPokeNewsTextLilycove_Ending:: @ 0828DAC0
 	.string "with them all!\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextBlendMaster_Upcoming:: @ 0828DBEC
+gPokeNewsTextBlendMaster_Upcoming::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "We have big news for everyone\n"
@@ -133,7 +133,7 @@ gPokeNewsTextBlendMaster_Upcoming:: @ 0828DBEC
 	.string "are urged to save their BERRIES.\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextBlendMaster_Ongoing:: @ 0828DD9E
+gPokeNewsTextBlendMaster_Ongoing::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "We have big news for everyone\n"
@@ -148,7 +148,7 @@ gPokeNewsTextBlendMaster_Ongoing:: @ 0828DD9E
 	.string "should hurry to LILYCOVE.\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gPokeNewsTextBlendMaster_Ending:: @ 0828DF05
+gPokeNewsTextBlendMaster_Ending::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "It's incredible!\n"
diff --git a/data/text/record_mix.inc b/data/text/record_mix.inc
index 1270c0c0a..bebdfdd95 100644
--- a/data/text/record_mix.inc
+++ b/data/text/record_mix.inc
@@ -1,6 +1,6 @@
-Text_WouldYouLikeToMixRecords: @ 827260D
+Text_WouldYouLikeToMixRecords:
 	.string "Would you like to mix records with\n"
 	.string "other TRAINERS?$"
 
-Text_WeHopeToSeeYouAgain: @ 8272640
+Text_WeHopeToSeeYouAgain:
 	.string "We hope to see you again!$"
diff --git a/data/text/save.inc b/data/text/save.inc
index 4719f34d3..4d17327c9 100644
--- a/data/text/save.inc
+++ b/data/text/save.inc
@@ -1,19 +1,19 @@
 	.align 2
-gText_ConfirmSave:: @ 82C87B4
+gText_ConfirmSave::
 	.string "Would you like to save the game?$"
 
-gText_AlreadySavedFile:: @ 82C87D5
+gText_AlreadySavedFile::
 	.string "There is already a saved file.\n"
 	.string "Is it okay to overwrite it?$"
 
-gText_SavingDontTurnOff:: @ 82C8810
+gText_SavingDontTurnOff::
 	.string "SAVING…\n"
 	.string "DON'T TURN OFF THE POWER.$"
 
-gText_PlayerSavedGame:: @ 82C8832
+gText_PlayerSavedGame::
 	.string "{PLAYER} saved the game.$"
 
-gText_DifferentSaveFile:: @ 82C8845
+gText_DifferentSaveFile::
 	.string "WARNING!\p"
 	.string "There is a different game file that\n"
 	.string "is already saved.\p"
@@ -23,11 +23,11 @@ gText_DifferentSaveFile:: @ 82C8845
 	.string "Are you sure you want to save now\n"
 	.string "and overwrite the other save file?$"
 
-gText_SaveError:: @ 82C892A
+gText_SaveError::
 	.string "Save error.\p"
 	.string "Please exchange the\n"
 	.string "backup memory.$"
 
-gText_SavingDontTurnOffPower:: @ 82C8959
+gText_SavingDontTurnOffPower::
 	.string "SAVING…\n"
 	.string "DON'T TURN OFF THE POWER.$"
diff --git a/data/text/secret_base_trainers.inc b/data/text/secret_base_trainers.inc
index 979aa4ff3..f1881533a 100644
--- a/data/text/secret_base_trainers.inc
+++ b/data/text/secret_base_trainers.inc
@@ -1,62 +1,62 @@
-SecretBase_Text_Trainer0Intro: @ 82748A0
+SecretBase_Text_Trainer0Intro:
     .string "Have you made a SECRET BASE already?\p"
     .string "I went here, there, everywhere before\n"
     .string "choosing this place.\p"
     .string "Since you're already here, how would\n"
     .string "you like to battle?$"
 
-SecretBase_Text_Trainer0AcceptBattle: @ 8274939
+SecretBase_Text_Trainer0AcceptBattle:
     .string "Okay!\n"
     .string "Here we come!$"
 
-SecretBase_Text_Trainer0DeclineBattle: @ 827494D
+SecretBase_Text_Trainer0DeclineBattle:
     .string "Hunh?\n"
     .string "Oh, you can't now…$"
 
-SecretBase_Text_Trainer0Defeated:: @ 8274966
+SecretBase_Text_Trainer0Defeated::
     .string "Waaargh! You're too strong!\n"
     .string "About me losing… Please keep it secret!$"
 
-SecretBase_Text_Trainer0PostBattle: @ 82749AA
+SecretBase_Text_Trainer0PostBattle:
     .string "What do you think of my SECRET BASE?\n"
     .string "Come visit me again tomorrow.$"
 
-SecretBase_Text_Trainer0PreChampion: @ 82749ED
+SecretBase_Text_Trainer0PreChampion:
     .string "Have you made a SECRET BASE already?\p"
     .string "I went here, there, everywhere before\n"
     .string "choosing this place.\p"
     .string "Feel free to hang out!$"
 
-SecretBase_Text_Trainer5Intro: @ 8274A64
+SecretBase_Text_Trainer5Intro:
     .string "There're a lot of places where\n"
     .string "you can make a SECRET BASE.\p"
     .string "But I like this spot best.\n"
     .string "Don't you think it's nice?\p"
     .string "Oh, would you like to have a battle?$"
 
-SecretBase_Text_Trainer5AcceptBattle: @ 8274AFA
+SecretBase_Text_Trainer5AcceptBattle:
     .string "Okay, here goes!$"
 
-SecretBase_Text_Trainer5DeclineBattle: @ 8274B0B
+SecretBase_Text_Trainer5DeclineBattle:
     .string "Oh…\n"
     .string "You can't now, okay.$"
 
-SecretBase_Text_Trainer5Defeated:: @ 8274B24
+SecretBase_Text_Trainer5Defeated::
     .string "Hmmm… It's our loss…\n"
     .string "But don't tell anyone!\l"
     .string "It's a confidential secret!$"
 
-SecretBase_Text_Trainer5PostBattle: @ 8274B6C
+SecretBase_Text_Trainer5PostBattle:
     .string "If you're in this area again,\n"
     .string "I hope you'll visit me.$"
 
-SecretBase_Text_Trainer5PreChampion: @ 8274BA2
+SecretBase_Text_Trainer5PreChampion:
     .string "There're a lot of places where you can\n"
     .string "make a SECRET BASE.\p"
     .string "But I like this spot best.\n"
     .string "Don't you think it's nice?$"
 
-SecretBase_Text_Trainer1Intro: @ 8274C13
+SecretBase_Text_Trainer1Intro:
     .string "This is a popular spot.\n"
     .string "It's always taken.\p"
     .string "Oh! Were you thinking about\n"
@@ -64,84 +64,84 @@ SecretBase_Text_Trainer1Intro: @ 8274C13
     .string "I'll tell you what, you can have this\n"
     .string "spot if you can beat me.$"
 
-SecretBase_Text_Trainer1AcceptBattle: @ 8274CB0
+SecretBase_Text_Trainer1AcceptBattle:
     .string "Okay!\n"
     .string "I'm going to defend my SECRET BASE!$"
 
-SecretBase_Text_Trainer1DeclineBattle: @ 8274CDA
+SecretBase_Text_Trainer1DeclineBattle:
     .string "Hunh? Is that right?\n"
     .string "You're not interested in this spot?$"
 
-SecretBase_Text_Trainer1Defeated:: @ 8274D13
+SecretBase_Text_Trainer1Defeated::
     .string "I can't keep going!\n"
     .string "I surrender!$"
 
-SecretBase_Text_Trainer1PostBattle: @ 8274D34
+SecretBase_Text_Trainer1PostBattle:
     .string "Okay, when I move one day,\n"
     .string "this place will be yours!$"
 
-SecretBase_Text_Trainer1PreChampion: @ 8274D69
+SecretBase_Text_Trainer1PreChampion:
     .string "This is a popular spot.\n"
     .string "It's always taken.\p"
     .string "I waited a long time for it to open.\n"
     .string "I finally got to use it!$"
 
-SecretBase_Text_Trainer6Intro: @ 8274DD2
+SecretBase_Text_Trainer6Intro:
     .string "Welcome to my POKéMON LAB.\p"
     .string "I carry out research on battling in\n"
     .string "secrecy.\p"
     .string "Would you like to see how strong I am?$"
 
-SecretBase_Text_Trainer6AcceptBattle: @ 8274E41
+SecretBase_Text_Trainer6AcceptBattle:
     .string "I'm going to go all out!$"
 
-SecretBase_Text_Trainer6DeclineBattle: @ 8274E5A
+SecretBase_Text_Trainer6DeclineBattle:
     .string "Oh.\n"
     .string "Some other time, then!$"
 
-SecretBase_Text_Trainer6Defeated:: @ 8274E75
+SecretBase_Text_Trainer6Defeated::
     .string "Hmm… I've still got lots to learn.\n"
     .string "I have to study some more.$"
 
-SecretBase_Text_Trainer6PostBattle: @ 8274EB3
+SecretBase_Text_Trainer6PostBattle:
     .string "Thanks for battling with me.\n"
     .string "Please come back again tomorrow.$"
 
-SecretBase_Text_Trainer6PreChampion: @ 8274EF1
+SecretBase_Text_Trainer6PreChampion:
     .string "Welcome to my POKéMON LAB.\p"
     .string "I carry out research on battling in\n"
     .string "secrecy.$"
 
-SecretBase_Text_Trainer2Intro: @ 8274F39
+SecretBase_Text_Trainer2Intro:
     .string "A big mansion is nice, but I like this\n"
     .string "sort of place more.\p"
     .string "I like it because all kinds of people\n"
     .string "come visit me.\p"
     .string "So, how would you like a battle?$"
 
-SecretBase_Text_Trainer2AcceptBattle: @ 8274FCA
+SecretBase_Text_Trainer2AcceptBattle:
     .string "That's the way!$"
 
-SecretBase_Text_Trainer2DeclineBattle: @ 8274FDA
+SecretBase_Text_Trainer2DeclineBattle:
     .string "When you're ready, give me a shout!$"
 
-SecretBase_Text_Trainer2Defeated:: @ 8274FFE
+SecretBase_Text_Trainer2Defeated::
     .string "Aww! Done in!\n"
     .string "But it's still fun to battle!$"
 
-SecretBase_Text_Trainer2PostBattle: @ 827502A
+SecretBase_Text_Trainer2PostBattle:
     .string "Well, anyway, I should go buy some\n"
     .string "decorations and furniture.\p"
     .string "I want my SECRET BASE to be a place\n"
     .string "other people can enjoy.$"
 
-SecretBase_Text_Trainer2PreChampion: @ 82750A4
+SecretBase_Text_Trainer2PreChampion:
     .string "A big mansion is nice, but I like this\n"
     .string "sort of place more.\p"
     .string "I like it because all kinds of people\n"
     .string "come visit me.$"
 
-SecretBase_Text_Trainer7Intro: @ 8275114
+SecretBase_Text_Trainer7Intro:
     .string "I simply adore shopping for decorations\n"
     .string "and furniture.\p"
     .string "I also love raising POKéMON just\n"
@@ -149,82 +149,82 @@ SecretBase_Text_Trainer7Intro: @ 8275114
     .string "If you would be so kind, will you battle\n"
     .string "with my POKéMON?$"
 
-SecretBase_Text_Trainer7AcceptBattle: @ 82751AF
+SecretBase_Text_Trainer7AcceptBattle:
     .string "Thank you.\n"
     .string "Shall we begin?$"
 
-SecretBase_Text_Trainer7DeclineBattle: @ 82751CA
+SecretBase_Text_Trainer7DeclineBattle:
     .string "Oh.\n"
     .string "How disappointing…$"
 
-SecretBase_Text_Trainer7Defeated:: @ 82751E1
+SecretBase_Text_Trainer7Defeated::
     .string "I concede…$"
 
-SecretBase_Text_Trainer7PostBattle: @ 82751EC
+SecretBase_Text_Trainer7PostBattle:
     .string "That was all in good fun!\n"
     .string "I should go enjoy shopping now.$"
 
-SecretBase_Text_Trainer7PreChampion: @ 8275226
+SecretBase_Text_Trainer7PreChampion:
     .string "I simply adore shopping for decorations\n"
     .string "and furniture.\p"
     .string "I also love raising POKéMON just\n"
     .string "as much.$"
 
-SecretBase_Text_Trainer3Intro: @ 8275287
+SecretBase_Text_Trainer3Intro:
     .string "Some people make their SECRET BASES in\n"
     .string "hard-to-find places.\l"
     .string "Do they want to just lie low?\p"
     .string "But since you found me, how about we\n"
     .string "have a battle?$"
 
-SecretBase_Text_Trainer3AcceptBattle: @ 8275315
+SecretBase_Text_Trainer3AcceptBattle:
     .string "I'm not going down easily!$"
 
-SecretBase_Text_Trainer3DeclineBattle: @ 8275330
+SecretBase_Text_Trainer3DeclineBattle:
     .string "Oh… Are you maybe tired from searching\n"
     .string "for this place?$"
 
-SecretBase_Text_Trainer3Defeated:: @ 8275367
+SecretBase_Text_Trainer3Defeated::
     .string "I went down…$"
 
-SecretBase_Text_Trainer3PostBattle: @ 8275374
+SecretBase_Text_Trainer3PostBattle:
     .string "Where's your SECRET BASE?\n"
     .string "I should go visit you there.$"
 
-SecretBase_Text_Trainer3PreChampion: @ 82753AB
+SecretBase_Text_Trainer3PreChampion:
     .string "Some people make their SECRET BASES in\n"
     .string "hard-to-find places.\l"
     .string "Do they want to just lie low?$"
 
-SecretBase_Text_Trainer8Intro: @ 8275405
+SecretBase_Text_Trainer8Intro:
     .string "People have told me that you can get\n"
     .string "decorations in several ways.\p"
     .string "We should have a race to see who can\n"
     .string "get nicer decorations and furniture!\p"
     .string "In the meantime, want to battle?$"
 
-SecretBase_Text_Trainer8AcceptBattle: @ 82754B2
+SecretBase_Text_Trainer8AcceptBattle:
     .string "This is my SECRET BASE.\n"
     .string "I can't lose!$"
 
-SecretBase_Text_Trainer8DeclineBattle: @ 82754D8
+SecretBase_Text_Trainer8DeclineBattle:
     .string "I'll battle with you anytime.$"
 
-SecretBase_Text_Trainer8Defeated:: @ 82754F6
+SecretBase_Text_Trainer8Defeated::
     .string "Huh?\n"
     .string "Did I just lose?$"
 
-SecretBase_Text_Trainer8PostBattle: @ 827550C
+SecretBase_Text_Trainer8PostBattle:
     .string "I won't lose at collecting decorations.\n"
     .string "Come visit again!$"
 
-SecretBase_Text_Trainer8PreChampion: @ 8275546
+SecretBase_Text_Trainer8PreChampion:
     .string "People have told me that you can get\n"
     .string "decorations in several ways.\p"
     .string "We should have a race to see who can\n"
     .string "get nicer decorations and furniture!$"
 
-SecretBase_Text_Trainer4Intro: @ 82755D2
+SecretBase_Text_Trainer4Intro:
     .string "I found a spot I liked, and I did it up\n"
     .string "with my favorite decorations.\p"
     .string "I raise my favorite POKéMON and grow\n"
@@ -232,28 +232,28 @@ SecretBase_Text_Trainer4Intro: @ 82755D2
     .string "That's what I do.\n"
     .string "Want to battle with me?$"
 
-SecretBase_Text_Trainer4AcceptBattle: @ 8275679
+SecretBase_Text_Trainer4AcceptBattle:
     .string "Show me what you're made of!$"
 
-SecretBase_Text_Trainer4DeclineBattle: @ 8275696
+SecretBase_Text_Trainer4DeclineBattle:
     .string "I guess there are times when you're not\n"
     .string "into it.$"
 
-SecretBase_Text_Trainer4Defeated:: @ 82756C7
+SecretBase_Text_Trainer4Defeated::
     .string "I know exactly what you're made of now.$"
 
-SecretBase_Text_Trainer4PostBattle: @ 82756EF
+SecretBase_Text_Trainer4PostBattle:
     .string "We can both become stronger.\n"
     .string "Let's keep at it!$"
 
-SecretBase_Text_Trainer4PreChampion: @ 827571E
+SecretBase_Text_Trainer4PreChampion:
     .string "I found a spot I liked, and I did it up\n"
     .string "with my favorite decorations.\p"
     .string "I raise my favorite POKéMON and grow\n"
     .string "stronger with it.\p"
     .string "Every day is a great day.$"
 
-SecretBase_Text_Trainer9Intro: @ 82757B5
+SecretBase_Text_Trainer9Intro:
     .string "You can learn a lot about the taste\n"
     .string "and sense of people by the kinds of\l"
     .string "decorations they have, and how they\l"
@@ -262,22 +262,22 @@ SecretBase_Text_Trainer9Intro: @ 82757B5
     .string "Are you speechless?\p"
     .string "Want to see my taste in battling?$"
 
-SecretBase_Text_Trainer9AcceptBattle: @ 8275884
+SecretBase_Text_Trainer9AcceptBattle:
     .string "There's no holding back!$"
 
-SecretBase_Text_Trainer9DeclineBattle: @ 827589D
+SecretBase_Text_Trainer9DeclineBattle:
     .string "I'll be happy to demonstrate my style\n"
     .string "anytime.$"
 
-SecretBase_Text_Trainer9Defeated:: @ 82758CC
+SecretBase_Text_Trainer9Defeated::
     .string "You're supremely talented!\n"
     .string "Your power seems to be limitless…$"
 
-SecretBase_Text_Trainer9PostBattle: @ 8275909
+SecretBase_Text_Trainer9PostBattle:
     .string "What did you think of my style?\n"
     .string "I'll keep on polishing it!$"
 
-SecretBase_Text_Trainer9PreChampion: @ 8275944
+SecretBase_Text_Trainer9PreChampion:
     .string "You can learn a lot about the taste\n"
     .string "and sense of people by the kinds of\l"
     .string "decorations they have, and how they\l"
diff --git a/data/text/shoal_cave.inc b/data/text/shoal_cave.inc
index 4a15e7498..88d057b74 100644
--- a/data/text/shoal_cave.inc
+++ b/data/text/shoal_cave.inc
@@ -1,4 +1,4 @@
-ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere: @ 82A7E0E
+ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere:
 	.string "Are you planning on going deep\n"
 	.string "in there?\p"
 	.string "How about bringing me back some\n"
@@ -6,27 +6,27 @@ ShoalCave_LowTideEntranceRoom_Text_AreYouPlanningOnGoingInThere: @ 82A7E0E
 	.string "I can make you something good if\n"
 	.string "you bring me the ingredients.$"
 
-ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells: @ 82A7EB3
+ShoalCave_LowTideEntranceRoom_Text_BringMe4ShoalSaltAndShells:
 	.string "If you bring me four each of the\n"
 	.string "SHOAL SALT and SHOAL SHELLS,\l"
 	.string "I can make you a SHELL BELL…\p"
 	.string "You can get those ingredients\n"
 	.string "every day.$"
 
-ShoalCave_LowTideEntranceRoom_Text_WouldYouLikeShellBell: @ 82A7F37
+ShoalCave_LowTideEntranceRoom_Text_WouldYouLikeShellBell:
 	.string "Oh, hey! SHOAL SALT and SHOAL SHELLS!\n"
 	.string "And enough of them, too!\p"
 	.string "Would you like me to make you\n"
 	.string "a SHELL BELL with them?$"
 
-ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway: @ 82A7FAC
+ShoalCave_LowTideEntranceRoom_Text_MakeShellBellRightAway:
 	.string "All righty, then! I'll make you\n"
 	.string "a SHELL BELL right away.\p"
 	.string "… … … … … … … …\n"
 	.string "… … … … … … … …\p"
 	.string "There! Done!$"
 
-ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell: @ 82A8012
+ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell:
 	.string "Have a POKéMON hold on to that.\n"
 	.string "It'll love it, that's for certain.\p"
 	.string "Why, the SHELL BELL's chime…\n"
@@ -34,20 +34,20 @@ ShoalCave_LowTideEntranceRoom_Text_ExplainShellBell: @ 82A8012
 	.string "You can get its ingredients every day,\n"
 	.string "so I can make you more.$"
 
-ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell: @ 82A80C6
+ShoalCave_LowTideEntranceRoom_Text_WantedToMakeShellBell:
 	.string "Oh… Is that so…\n"
 	.string "I wanted to make a SHELL BELL…$"
 
-ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag: @ 82A80F5
+ShoalCave_LowTideEntranceRoom_Text_NoSpaceInYourBag:
 	.string "You don't have space in your BAG\n"
 	.string "if I were to make it for you.\p"
 	.string "You should make room and come back\n"
 	.string "for a SHELL BELL.$"
 
-ShoalCave_Text_WasShoalSaltNowNothing: @ 82A8169
+ShoalCave_Text_WasShoalSaltNowNothing:
 	.string "There was some SHOAL SALT here.\n"
 	.string "But, there's nothing here now.$"
 
-ShoalCave_Text_WasShoallShellNowNothing: @ 82A81A8
+ShoalCave_Text_WasShoallShellNowNothing:
 	.string "There was a SHOAL SHELL here.\n"
 	.string "But, there's nothing here now.$"
diff --git a/data/text/surf.inc b/data/text/surf.inc
index 31c197222..453a3d5b1 100644
--- a/data/text/surf.inc
+++ b/data/text/surf.inc
@@ -1,5 +1,5 @@
-gText_WantToUseSurf:: @ 8272FD6
+gText_WantToUseSurf::
 	.string "The water is dyed a deep blue…\nWould you like to SURF?$"
 
-gText_PlayerUsedSurf:: @ 827300D
+gText_PlayerUsedSurf::
 	.string "{STR_VAR_1} used SURF!$"
diff --git a/data/text/trainers.inc b/data/text/trainers.inc
index 9e971b223..c3e85ef50 100644
--- a/data/text/trainers.inc
+++ b/data/text/trainers.inc
@@ -1,1322 +1,1322 @@
-Route102_Text_CalvinIntro: @ 8294513
+Route102_Text_CalvinIntro:
 	.string "If you have POKéMON with you, then\n"
 	.string "you're an official POKéMON TRAINER!\l"
 	.string "You can't say no to my challenge!$"
 
-Route102_Text_CalvinDefeated: @ 829457C
+Route102_Text_CalvinDefeated:
 	.string "Arrgh, I lost…\n"
 	.string "I should have trained mine more…$"
 
-Route102_Text_CalvinPostBattle: @ 82945AC
+Route102_Text_CalvinPostBattle:
 	.string "Listen, you. If you're strong,\n"
 	.string "you should have told me before!$"
 
-Route102_Text_CalvinRegister: @ 82945EB
+Route102_Text_CalvinRegister:
 	.string "I've been working hard at this since\n"
 	.string "I saw you before.\p"
 	.string "I'd like to battle you again, so can\n"
 	.string "you register me in your POKéNAV?$"
 
-Route102_Text_CalvinRegisterShort: @ 8294668
+Route102_Text_CalvinRegisterShort:
 	.string "I'd like to battle you again, so can\n"
 	.string "you register me in your POKéNAV?$"
 
-Route102_Text_CalvinRematchIntro: @ 82946AE
+Route102_Text_CalvinRematchIntro:
 	.string "Ever since I lost to you, I desperately\n"
 	.string "trained my POKéMON.\l"
 	.string "You can't say no to my challenge!$"
 
-Route102_Text_CalvinRematchDefeated: @ 829470C
+Route102_Text_CalvinRematchDefeated:
 	.string "Arrgh, I lost…\n"
 	.string "Is my training method not right?$"
 
-Route102_Text_CalvinRematchPostBattle: @ 829473C
+Route102_Text_CalvinRematchPostBattle:
 	.string "If you're going to get stronger,\n"
 	.string "I'll get stronger, too.$"
 
-Route102_Text_AllenIntro: @ 8294775
+Route102_Text_AllenIntro:
 	.string "Did you just become a TRAINER?\n"
 	.string "We're both beginners!$"
 
-Route102_Text_AllenDefeated: @ 82947AA
+Route102_Text_AllenDefeated:
 	.string "I called you because I thought\n"
 	.string "I could beat you…$"
 
-Route102_Text_AllenPostBattle: @ 82947DB
+Route102_Text_AllenPostBattle:
 	.string "I haven't won once yet…\n"
 	.string "I wish I would win soon…$"
 
-Route102_Text_RickIntro: @ 829480C
+Route102_Text_RickIntro:
 	.string "Hahah! Our eyes met!\n"
 	.string "I'll take you on with my BUG POKéMON!$"
 
-Route102_Text_RickDefeated: @ 8294847
+Route102_Text_RickDefeated:
 	.string "Ow! Down and out!$"
 
-Route102_Text_RickPostBattle: @ 8294859
+Route102_Text_RickPostBattle:
 	.string "If you lock eyes with a TRAINER,\n"
 	.string "you have to challenge! It's a rule!$"
 
-Route102_Text_TianaIntro: @ 829489E
+Route102_Text_TianaIntro:
 	.string "I'm going to keep winning and aim\n"
 	.string "to be the best TRAINER.\p"
 	.string "Help me further my career!$"
 
-Route102_Text_TianaDefeated: @ 82948F3
+Route102_Text_TianaDefeated:
 	.string "I ended up furthering your career…$"
 
-Route102_Text_TianaPostBattle: @ 8294916
+Route102_Text_TianaPostBattle:
 	.string "To keep winning my way up, I see that\n"
 	.string "I have to catch more POKéMON.$"
 
-Route103_Text_DaisyIntro: @ 829495A
+Route103_Text_DaisyIntro:
 	.string "Did you feel the tug of our\n"
 	.string "soul-soothing fragrance?$"
 
-Route103_Text_DaisyDefeated: @ 829498F
+Route103_Text_DaisyDefeated:
 	.string "You weren't led astray by our aroma…$"
 
-Route103_Text_DaisyPostBattle: @ 82949B4
+Route103_Text_DaisyPostBattle:
 	.string "Aromatherapy is a form of mental\n"
 	.string "healing that works with fragrances.$"
 
-Route103_Text_AmyIntro: @ 82949F9
+Route103_Text_AmyIntro:
 	.string "AMY: I'm AMY.\n"
 	.string "And this is my little sister LIV.\l"
 	.string "We battle together!$"
 
-Route103_Text_AmyDefeated: @ 8294A3D
+Route103_Text_AmyDefeated:
 	.string "AMY: Uh-oh, we lost.$"
 
-Route103_Text_AmyPostBattle: @ 8294A52
+Route103_Text_AmyPostBattle:
 	.string "AMY: You have to think about all\n"
 	.string "kinds of things when you're battling\l"
 	.string "against two TRAINERS.$"
 
-Route103_Text_AmyNotEnoughPokemon: @ 8294AAE
+Route103_Text_AmyNotEnoughPokemon:
 	.string "AMY: Uh-oh, you have only one\n"
 	.string "POKéMON with you.\l"
 	.string "You can't battle us like that.$"
 
-Route103_Text_LivIntro: @ 8294AFD
+Route103_Text_LivIntro:
 	.string "LIV: We battle together as one\n"
 	.string "team.$"
 
-Route103_Text_LivDefeated: @ 8294B22
+Route103_Text_LivDefeated:
 	.string "LIV: Oh, we lost, big sister…$"
 
-Route103_Text_LivPostBattle: @ 8294B40
+Route103_Text_LivPostBattle:
 	.string "LIV: We work perfectly together,\n"
 	.string "me and my big sister…\p"
 	.string "But we still lost…$"
 
-Route103_Text_AmyLivRegister: @ 8294B8A
+Route103_Text_AmyLivRegister:
 	.string "LIV: Really, we're a lot better…\n"
 	.string "It's true! We'll show you next time!$"
 
-Route103_Text_LivNotEnoughPokemon: @ 8294BD0
+Route103_Text_LivNotEnoughPokemon:
 	.string "LIV: If you want to battle us,\n"
 	.string "you have to have two POKéMON!\l"
 	.string "It's not fair if you don't!$"
 
-Route103_Text_AmyRematchIntro: @ 8294C29
+Route103_Text_AmyRematchIntro:
 	.string "AMY: I'm AMY.\n"
 	.string "And this is my little sister LIV.\l"
 	.string "We battle together!$"
 
-Route103_Text_AmyRematchDefeated: @ 8294C6D
+Route103_Text_AmyRematchDefeated:
 	.string "AMY: Aww, boo!\n"
 	.string "We couldn't win again…$"
 
-Route103_Text_AmyRematchPostBattle: @ 8294C93
+Route103_Text_AmyRematchPostBattle:
 	.string "AMY: You have to think about all\n"
 	.string "kinds of things when you're battling\l"
 	.string "against two TRAINERS.$"
 
-Route103_Text_AmyRematchNotEnoughPokemon: @ 8294CEF
+Route103_Text_AmyRematchNotEnoughPokemon:
 	.string "AMY: Uh-oh, you have only one\n"
 	.string "POKéMON with you.\l"
 	.string "You can't battle us like that.$"
 
-Route103_Text_LivRematchIntro: @ 8294D3E
+Route103_Text_LivRematchIntro:
 	.string "LIV: We battle together as one\n"
 	.string "team.$"
 
-Route103_Text_LivRematchDefeated: @ 8294D63
+Route103_Text_LivRematchDefeated:
 	.string "LIV: Awww, we lost again…\n"
 	.string "Big sister…$"
 
-Route103_Text_LivRematchPostBattle: @ 8294D89
+Route103_Text_LivRematchPostBattle:
 	.string "LIV: We work perfectly together,\n"
 	.string "me and my big sister…\p"
 	.string "But why did we lose again?$"
 
-Route103_Text_LivRematchNotEnoughPokemon: @ 8294DDB
+Route103_Text_LivRematchNotEnoughPokemon:
 	.string "LIV: If you want to battle us, you\n"
 	.string "have to have two POKéMON!\l"
 	.string "It's not fair if you don't!$"
 
-Route103_Text_AndrewIntro: @ 8294E34
+Route103_Text_AndrewIntro:
 	.string "Gah! My fishing line's all snarled up!\n"
 	.string "I'm getting frustrated and mean!\l"
 	.string "That's it! Battle me!$"
 
-Route103_Text_AndrewDefeated: @ 8294E92
+Route103_Text_AndrewDefeated:
 	.string "Gah! Lost it!\n"
 	.string "I'm even more annoyed now!$"
 
-Route103_Text_AndrewPostBattle: @ 8294EBB
+Route103_Text_AndrewPostBattle:
 	.string "Gah, I'm still boiling mad…\n"
 	.string "Grrrrr…$"
 
-Route103_Text_MiguelIntro: @ 8294EDF
+Route103_Text_MiguelIntro:
 	.string "My POKéMON is delightfully adorable!\n"
 	.string "Don't be shy--I'll show you!$"
 
-Route103_Text_MiguelDefeated: @ 8294F21
+Route103_Text_MiguelDefeated:
 	.string "Oh, my gosh!\n"
 	.string "My darling POKéMON!$"
 
-Route103_Text_MiguelPostBattle: @ 8294F42
+Route103_Text_MiguelPostBattle:
 	.string "My delightful POKéMON looks darling\n"
 	.string "even when it's fainted!$"
 
-Route103_Text_MiguelRegister: @ 8294F7E
+Route103_Text_MiguelRegister:
 	.string "I'll get you to come out and look in\n"
 	.string "on my delightful POKéMON again!$"
 
-Route103_Text_MiguelRematchIntro: @ 8294FC3
+Route103_Text_MiguelRematchIntro:
 	.string "Hi, you! My delightfully adorable\n"
 	.string "POKéMON has become more darling!$"
 
-Route103_Text_MiguelRematchDefeated: @ 8295006
+Route103_Text_MiguelRematchDefeated:
 	.string "Oh!\n"
 	.string "My darling POKéMON!$"
 
-Route103_Text_MiguelRematchPostBattle: @ 829501E
+Route103_Text_MiguelRematchPostBattle:
 	.string "The more I spend time with it,\n"
 	.string "the more adorable my POKéMON becomes.$"
 
-Route103_Text_PeteIntro: @ 8295063
+Route103_Text_PeteIntro:
 	.string "This sort of distance…\n"
 	.string "You should just swim it!$"
 
-Route103_Text_PeteDefeated: @ 8295093
+Route103_Text_PeteDefeated:
 	.string "Oh, that's good going!$"
 
-Route103_Text_PetePostBattle: @ 82950AA
+Route103_Text_PetePostBattle:
 	.string "Oh, I understand where you're coming\n"
 	.string "from now.\p"
 	.string "If I had a POKéMON that trusty,\n"
 	.string "I'd want to SURF on it, too!$"
 
-Route103_Text_IsabelleIntro: @ 8295116
+Route103_Text_IsabelleIntro:
 	.string "Watch where you're going!\n"
 	.string "We're going to crash!$"
 
-Route103_Text_IsabelleDefeated: @ 8295146
+Route103_Text_IsabelleDefeated:
 	.string "Groan…$"
 
-Route103_Text_IsabellePostBattle: @ 829514D
+Route103_Text_IsabellePostBattle:
 	.string "I'm a poor swimmer so I was practicing…\n"
 	.string "Sorry for almost crashing into you.$"
 
-Route103_Text_RhettIntro: @ 8295199
+Route103_Text_RhettIntro:
 	.string "Whoa!\n"
 	.string "How'd you get into a space this small?$"
 
-Route103_Text_RhettDefeated: @ 82951C6
+Route103_Text_RhettDefeated:
 	.string "Whoa!\n"
 	.string "The kid can rock!$"
 
-Route103_Text_RhettPostBattle: @ 82951DE
+Route103_Text_RhettPostBattle:
 	.string "Do you like cramped quarters\n"
 	.string "like this?$"
 
-Route103_Text_MarcosIntro: @ 8295206
+Route103_Text_MarcosIntro:
 	.string "Did my guitar's wailing draw you in?$"
 
-Route103_Text_MarcosDefeated: @ 829522B
+Route103_Text_MarcosDefeated:
 	.string "My one-man show is ruined…$"
 
-Route103_Text_MarcosPostBattle: @ 8295246
+Route103_Text_MarcosPostBattle:
 	.string "I was playing my guitar where few\n"
 	.string "people were around, but a lot of fans\l"
 	.string "have gathered.\p"
 	.string "Heh, maybe I should turn pro.$"
 
-Route104_Text_GinaIntro: @ 82952BB
+Route104_Text_GinaIntro:
 	.string "GINA: Okay, let's battle with our\n"
 	.string "POKéMON!$"
 
-Route104_Text_GinaDefeat: @ 82952E6
+Route104_Text_GinaDefeat:
 	.string "GINA: Losing upsets me!$"
 
-Route104_Text_GinaPostBattle: @ 82952FE
+Route104_Text_GinaPostBattle:
 	.string "GINA: You are strong!\n"
 	.string "We have to train lots more!$"
 
-Route104_Text_GinaNotEnoughMons: @ 8295330
+Route104_Text_GinaNotEnoughMons:
 	.string "GINA: Oh? Only one POKéMON?\n"
 	.string "Then, we don't battle with you.\p"
 	.string "If there's only one POKéMON, it will\n"
 	.string "be lonesome. That's not nice.$"
 
-Route104_Text_MiaIntro: @ 82953AF
+Route104_Text_MiaIntro:
 	.string "MIA: We are twins, so we battle\n"
 	.string "POKéMON together.$"
 
-Route104_Text_MiaDefeat: @ 82953E1
+Route104_Text_MiaDefeat:
 	.string "MIA: We battled together, but we\n"
 	.string "both lost…$"
 
-Route104_Text_MiaPostBattle: @ 829540D
+Route104_Text_MiaPostBattle:
 	.string "MIA: We will train our POKéMON more\n"
 	.string "and be strong like you.$"
 
-Route104_Text_MiaNotEnoughMons: @ 8295449
+Route104_Text_MiaNotEnoughMons:
 	.string "MIA: You want to battle with us?\p"
 	.string "It's a big no-no if you don't have two\n"
 	.string "POKéMON with you.\l"
 	.string "We're too strong for you!$"
 
-Route104_Text_IvanIntro: @ 82954BD
+Route104_Text_IvanIntro:
 	.string "Why keep it a secret?\n"
 	.string "I'm the WATER POKéMON expert!\p"
 	.string "Huh?\n"
 	.string "You don't know me?$"
 
-Route104_Text_IvanDefeat: @ 8295509
+Route104_Text_IvanDefeat:
 	.string "I thought I wasn't too bad, if I may\n"
 	.string "say so, but I guess not… Bleah…$"
 
-Route104_Text_IvanPostBattle: @ 829554E
+Route104_Text_IvanPostBattle:
 	.string "I got too into fishing.\n"
 	.string "I forgot I had to raise my POKéMON…$"
 
-Route104_Text_BillyIntro: @ 829558A
+Route104_Text_BillyIntro:
 	.string "Leaving footprints in the sand is\n"
 	.string "so fun!$"
 
-Route104_Text_BillyDefeat: @ 82955B4
+Route104_Text_BillyDefeat:
 	.string "Waah! I got sand in my runners!\n"
 	.string "They're all gritty!$"
 
-Route104_Text_BillyPostBattle: @ 82955E8
+Route104_Text_BillyPostBattle:
 	.string "I want to leave my footprints in\n"
 	.string "the sand everywhere, but they\l"
 	.string "disappear quickly…$"
 
-Route104_Text_HaleyIntro: @ 829563A
+Route104_Text_HaleyIntro:
 	.string "Should I…\n"
 	.string "Or shouldn't I?\p"
 	.string "Okay, sure, I will battle!$"
 
-Route104_Text_HaleyDefeat: @ 829566F
+Route104_Text_HaleyDefeat:
 	.string "I shouldn't have battled…$"
 
-Route104_Text_HaleyPostBattle: @ 8295689
+Route104_Text_HaleyPostBattle:
 	.string "If you're faced with a decision and\n"
 	.string "you let someone else choose for you,\l"
 	.string "you will regret it, however things\l"
 	.string "turn out.$"
 
-Route104_Text_HaleyRegister1: @ 82956FF
+Route104_Text_HaleyRegister1:
 	.string "You're strong, but should I register\n"
 	.string "you in my POKéNAV?\l"
 	.string "Maybe I shouldn't…\p"
 	.string "Okay, sure, I will register you!$"
 
-Route104_Text_HaleyRegister2: @ 829576B
+Route104_Text_HaleyRegister2:
 	.string "You're strong, but should I register\n"
 	.string "you in my POKéNAV?\l"
 	.string "Maybe I shouldn't…\p"
 	.string "Okay, sure, I will register you!$"
 
-Route104_Text_HaleyRematchIntro: @ 82957D7
+Route104_Text_HaleyRematchIntro:
 	.string "Come on, battle with me!$"
 
-Route104_Text_HaleyRematchDefeat: @ 82957F0
+Route104_Text_HaleyRematchDefeat:
 	.string "Ohh…\n"
 	.string "I thought I could win…$"
 
-Route104_Text_HaleyPostRematch: @ 829580C
+Route104_Text_HaleyPostRematch:
 	.string "I made the decision to battle, so\n"
 	.string "I can accept this loss with grace.\p"
 	.string "I am still upset about losing!$"
 
-Route104_Text_WinstonIntro: @ 8295870
+Route104_Text_WinstonIntro:
 	.string "Oh, sure, I'll accept your challenge.\n"
 	.string "I have a lot of money.$"
 
-Route104_Text_WinstonDefeat: @ 82958AD
+Route104_Text_WinstonDefeat:
 	.string "Why couldn't I win?$"
 
-Route104_Text_WinstonPostBattle: @ 82958C1
+Route104_Text_WinstonPostBattle:
 	.string "There are some things money can't buy.\n"
 	.string "That's POKéMON…$"
 
-Route104_Text_WinstonRegister1: @ 82958F8
+Route104_Text_WinstonRegister1:
 	.string "Hm?\n"
 	.string "Ah, you've obtained a POKéNAV.\p"
 	.string "I will gladly register you.\n"
 	.string "After all, I have plenty of money.$"
 
-Route104_Text_WinstonRegister2: @ 829595A
+Route104_Text_WinstonRegister2:
 	.string "Hm?\n"
 	.string "Ah, you've obtained a POKéNAV.\p"
 	.string "I will gladly register you.\n"
 	.string "After all, I have plenty of money.$"
 
-Route104_Text_WinstonRematchIntro: @ 82959BC
+Route104_Text_WinstonRematchIntro:
 	.string "After I lost to you, I learned a bunch\n"
 	.string "of things about POKéMON.$"
 
-Route104_Text_WinstonRematchDefeat: @ 82959FC
+Route104_Text_WinstonRematchDefeat:
 	.string "I lost again?\n"
 	.string "Why couldn't I win?$"
 
-Route104_Text_WinstonPostRematch: @ 8295A1E
+Route104_Text_WinstonPostRematch:
 	.string "I'm fabulously wealthy, but I can't\n"
 	.string "seem to win at POKéMON…\p"
 	.string "It's so deep, the world of POKéMON…$"
 
-Route104_Text_CindyIntro: @ 8295A7E
+Route104_Text_CindyIntro:
 	.string "We must have been fated to meet.\n"
 	.string "May I ask you for a battle?$"
 
-Route104_Text_CindyDefeat: @ 8295ABB
+Route104_Text_CindyDefeat:
 	.string "Oh, my!$"
 
-Route104_Text_CindyPostBattle: @ 8295AC3
+Route104_Text_CindyPostBattle:
 	.string "“Hello” is the beginning of “good-bye.”\n"
 	.string "I hope we meet again.$"
 
-Route104_Text_CindyRegister1: @ 8295B01
+Route104_Text_CindyRegister1:
 	.string "Hello, we meet again.\p"
 	.string "We seem to be drawn together. Let's\n"
 	.string "register each other in our POKéNAVS.$"
 
-Route104_Text_CindyRegister2: @ 8295B60
+Route104_Text_CindyRegister2:
 	.string "We should commemorate how we seem\n"
 	.string "to be drawn to each other.\p"
 	.string "Let's register each other in our\n"
 	.string "POKéNAVS.$"
 
-Route104_Text_CindyRematchIntro: @ 8295BC8
+Route104_Text_CindyRematchIntro:
 	.string "Hello, we meet again.\n"
 	.string "May I ask you for a battle?$"
 
-Route104_Text_CindyRematchDefeat: @ 8295BFA
+Route104_Text_CindyRematchDefeat:
 	.string "Oh, my…\n"
 	.string "I did the best that I could…$"
 
-Route104_Text_CindyPostRematch: @ 8295C1F
+Route104_Text_CindyPostRematch:
 	.string "“Hello” is the beginning of “good-bye.”\n"
 	.string "I hope we meet again.$"
 
-Route104_Text_DarianIntro: @ 8295C5D
+Route104_Text_DarianIntro:
 	.string "I fished up a tough-looking POKéMON!\p"
 	.string "It has this magical quality to it!\n"
 	.string "It surely looks tough, yes it does!$"
 
-Route104_Text_DarianDefeat: @ 8295CC9
+Route104_Text_DarianDefeat:
 	.string "What the…$"
 
-Route104_Text_DarianPostBattle: @ 8295CD3
+Route104_Text_DarianPostBattle:
 	.string "Hey, MAGIKARP, you sure don't live up\n"
 	.string "to your name, do you?$"
 
-Route105_Text_FosterIntro: @ 8295D0F
+Route105_Text_FosterIntro:
 	.string "There's supposed to be a mystical\n"
 	.string "rock around here.\l"
 	.string "Do you know anything about it?$"
 
-Route105_Text_FosterDefeated: @ 8295D62
+Route105_Text_FosterDefeated:
 	.string "I was thinking too much about that\n"
 	.string "rock, while my POKéMON remained weak…$"
 
-Route105_Text_FosterPostBattle: @ 8295DAB
+Route105_Text_FosterPostBattle:
 	.string "I can spend hours and hours staring\n"
 	.string "at a nice rock without growing bored.$"
 
-Route105_Text_LuisIntro: @ 8295DF5
+Route105_Text_LuisIntro:
 	.string "Whew! I was worried that a kid was\n"
 	.string "drowning when I saw you.\p"
 	.string "You seem to be okay, so what do you\n"
 	.string "say to a battle?$"
 
-Route105_Text_LuisDefeated: @ 8295E66
+Route105_Text_LuisDefeated:
 	.string "Glub… Glub…$"
 
-Route105_Text_LuisPostBattle: @ 8295E72
+Route105_Text_LuisPostBattle:
 	.string "If you are drowning, the signal is to\n"
 	.string "wave one arm toward the beach.$"
 
-Route105_Text_DominikIntro: @ 8295EB7
+Route105_Text_DominikIntro:
 	.string "Swimming the deep blue sea…\n"
 	.string "It feels the greatest!$"
 
-Route105_Text_DominikDefeated: @ 8295EEA
+Route105_Text_DominikDefeated:
 	.string "I lost…\n"
 	.string "Now I'm feeling blue…$"
 
-Route105_Text_DominikPostBattle: @ 8295F08
+Route105_Text_DominikPostBattle:
 	.string "Why is the sea blue?\p"
 	.string "I learned about that at the MUSEUM in\n"
 	.string "SLATEPORT, but I forgot.$"
 
-Route105_Text_BeverlyIntro: @ 8295F5C
+Route105_Text_BeverlyIntro:
 	.string "My body feels lighter in the water.\n"
 	.string "It's as if I've gotten slimmer!$"
 
-Route105_Text_BeverlyDefeated: @ 8295FA0
+Route105_Text_BeverlyDefeated:
 	.string "I'm floating…$"
 
-Route105_Text_PostBattle: @ 8295FAE
+Route105_Text_PostBattle:
 	.string "Your body weight is reduced to just\n"
 	.string "one tenth in the water.\p"
 	.string "That would make me…\n"
 	.string "Whoops! I'm not telling you my weight!$"
 
-Route105_Text_ImaniIntro: @ 8296025
+Route105_Text_ImaniIntro:
 	.string "The blue, blue sky…\n"
 	.string "The vast sea…\l"
 	.string "It's so peaceful…$"
 
-Route105_Text_ImaniDefeated: @ 8296059
+Route105_Text_ImaniDefeated:
 	.string "I lost while I was lounging!$"
 
-Route105_Text_ImaniPostBattle: @ 8296076
+Route105_Text_ImaniPostBattle:
 	.string "I want to be told I'm relaxing to be\n"
 	.string "with. Giggle.$"
 
-Route105_Text_AndresIntro: @ 82960A9
+Route105_Text_AndresIntro:
 	.string "I'm convinced that the sea keeps\n"
 	.string "secrets from us.$"
 
-Route105_Text_AndresDefeated: @ 82960DB
+Route105_Text_AndresDefeated:
 	.string "Yes…\n"
 	.string "I am no good at battling…$"
 
-Route105_Text_AndresPostBattle: @ 82960FA
+Route105_Text_AndresPostBattle:
 	.string "I'm sure there are many secrets to be\n"
 	.string "discovered in the world's seas.\p"
 	.string "I mean to find them all!$"
 
-Route105_Text_AndresRegister: @ 8296159
+Route105_Text_AndresRegister:
 	.string "Huh? I'm so weak, but you're willing\n"
 	.string "to register me in your POKéNAV?$"
 
-Route105_Text_AndresRematchIntro: @ 829619E
+Route105_Text_AndresRematchIntro:
 	.string "I've told you that I'm weak…\n"
 	.string "Are you sure you want to do this?$"
 
-Route105_Text_AndresRematchDefeated: @ 82961DD
+Route105_Text_AndresRematchDefeated:
 	.string "Yes…\n"
 	.string "I didn't think I could win.$"
 
-Route105_Text_AndresRematchPostBattle: @ 82961FE
+Route105_Text_AndresRematchPostBattle:
 	.string "I may be weak at battling, but my\n"
 	.string "drive to explore can't be bested.\p"
 	.string "I will travel the seas all around\n"
 	.string "the world!$"
 
-Route105_Text_JosueIntro: @ 829626F
+Route105_Text_JosueIntro:
 	.string "I'm exhausted from swimming.\n"
 	.string "I'm just not used to it.\p"
 	.string "I need a battle for a change of pace!$"
 
-Route105_Text_JosueDefeated: @ 82962CB
+Route105_Text_JosueDefeated:
 	.string "I lost because I battled at sea.$"
 
-Route105_Text_JosuePostBattle: @ 82962EC
+Route105_Text_JosuePostBattle:
 	.string "Yeah, for me, the sky is a much better\n"
 	.string "match than the sea.$"
 
-Route106_Text_ElliotIntro: @ 8296327
+Route106_Text_ElliotIntro:
 	.string "Which do you prefer, fishing in the\n"
 	.string "sea or a stream?$"
 
-Route106_Text_ElliotDefeated: @ 829635C
+Route106_Text_ElliotDefeated:
 	.string "Like in deep-sea fishing, I lost\n"
 	.string "spectacularly!$"
 
-Route106_Text_ElliotPostBattle: @ 829638C
+Route106_Text_ElliotPostBattle:
 	.string "Fishing is the greatest whether it's\n"
 	.string "in the sea or a stream.\l"
 	.string "You agree with me, right?$"
 
-Route106_Text_ElliotRegister: @ 82963E3
+Route106_Text_ElliotRegister:
 	.string "Fishing's great, but so is battling.\n"
 	.string "If you don't mind, can we meet again?$"
 
-Route106_Text_ElliotRematchIntro: @ 829642E
+Route106_Text_ElliotRematchIntro:
 	.string "I caught a bunch of POKéMON fishing.\n"
 	.string "I'll show you an impressive battle!$"
 
-Route106_Text_ElliotRematchDefeated: @ 8296477
+Route106_Text_ElliotRematchDefeated:
 	.string "I lost again spectacularly!$"
 
-Route106_Text_ElliotRematchPostBattle: @ 8296493
+Route106_Text_ElliotRematchPostBattle:
 	.string "Win or lose, POKéMON are the greatest!\n"
 	.string "You agree with me, right?$"
 
-Route106_Text_NedIntro: @ 82964D4
+Route106_Text_NedIntro:
 	.string "What do people do if they need to go\n"
 	.string "to a washroom?\p"
 	.string "What if my ROD hooks a big one while\n"
 	.string "I'm in the washroom? I just can't go…$"
 
-Route106_Text_NedDefeated: @ 8296553
+Route106_Text_NedDefeated:
 	.string "I lost because I'm trying to not go\n"
 	.string "to the washroom…$"
 
-Route106_Text_NedPostBattle: @ 8296588
+Route106_Text_NedPostBattle:
 	.string "Oh, no! I've got this feeling I'll hook\n"
 	.string "a big one!$"
 
-Route106_Text_DouglasIntro: @ 82965BB
+Route106_Text_DouglasIntro:
 	.string "Hahahah! I'm a lousy runner, but in\n"
 	.string "the water you can't catch me!$"
 
-Route106_Text_DouglasDefeated: @ 82965FD
+Route106_Text_DouglasDefeated:
 	.string "I give up!$"
 
-Route106_Text_DouglasPostBattle: @ 8296608
+Route106_Text_DouglasPostBattle:
 	.string "I wouldn't lose in a swim race…$"
 
-Route106_Text_KylaIntro: @ 8296628
+Route106_Text_KylaIntro:
 	.string "The sea is my backyard. I'm not going\n"
 	.string "to take it easy because you're a kid!$"
 
-Route106_Text_KylaDefeated: @ 8296674
+Route106_Text_KylaDefeated:
 	.string "Did you take it easy on me by any\n"
 	.string "chance?$"
 
-Route106_Text_KylaPostBattle: @ 829669E
+Route106_Text_KylaPostBattle:
 	.string "Drifting along with the waves…\n"
 	.string "I love it! Why don't you give it a try?$"
 
-Route107_Text_DarrinIntro: @ 82966E5
+Route107_Text_DarrinIntro:
 	.string "Yawn…\p"
 	.string "I must have drifted off to sleep while\n"
 	.string "I was drifting in the waves.$"
 
-Route107_Text_DarrinDefeated: @ 829672F
+Route107_Text_DarrinDefeated:
 	.string "Ahaha, I lost…\n"
 	.string "I'll take a snooze, I think…$"
 
-Route107_Text_DarrinPostBattle: @ 829675B
+Route107_Text_DarrinPostBattle:
 	.string "Floating and being rocked by\n"
 	.string "the waves--it's like sleeping in\l"
 	.string "a plush, comfy bed.$"
 
-Route107_Text_TonyIntro: @ 82967AD
+Route107_Text_TonyIntro:
 	.string "The sea is like my backyard.\n"
 	.string "Let's battle!$"
 
-Route107_Text_TonyDefeated: @ 82967D8
+Route107_Text_TonyDefeated:
 	.string "I lost on my home field…\n"
 	.string "I'm in shock!$"
 
-Route107_Text_TonyPostBattle: @ 82967FF
+Route107_Text_TonyPostBattle:
 	.string "I swim the seas with a heart full of\n"
 	.string "dreams…\p"
 	.string "It's a song!\n"
 	.string "Anyways, I'm swimming some more.$"
 
-Route107_Text_TonyRegister: @ 829685A
+Route107_Text_TonyRegister:
 	.string "You've shocked me to the bone!\n"
 	.string "Well, so you won't forget me…$"
 
-Route107_Text_TonyRematchIntro: @ 8296897
+Route107_Text_TonyRematchIntro:
 	.string "Swimming in the big, wide sea,\n"
 	.string "my POKéMON has grown stronger!$"
 
-Route107_Text_TonyRematchDefeated: @ 82968D5
+Route107_Text_TonyRematchDefeated:
 	.string "What a shock!\p"
 	.string "My POKéMON has gotten stronger, but\n"
 	.string "I stayed weak as a TRAINER!$"
 
-Route107_Text_TonyRematchPostBattle: @ 8296923
+Route107_Text_TonyRematchPostBattle:
 	.string "What you learn in battle makes you\n"
 	.string "a stronger TRAINER.\l"
 	.string "The waves taught me that.$"
 
-Route107_Text_DeniseIntro: @ 8296974
+Route107_Text_DeniseIntro:
 	.string "Do you know a little town called\n"
 	.string "DEWFORD?$"
 
-Route107_Text_DeniseDefeated: @ 829699E
+Route107_Text_DeniseDefeated:
 	.string "I hate this!$"
 
-Route107_Text_DenisePostBattle: @ 82969AB
+Route107_Text_DenisePostBattle:
 	.string "A weird saying is getting really\n"
 	.string "trendy at DEWFORD HALL.$"
 
-Route107_Text_BethIntro: @ 82969E4
+Route107_Text_BethIntro:
 	.string "Did you want to battle me?\n"
 	.string "Sure, I'll go with you!$"
 
-Route107_Text_BethDefeated: @ 8296A17
+Route107_Text_BethDefeated:
 	.string "I wasn't good enough for you.$"
 
-Route107_Text_BethPostBattle: @ 8296A35
+Route107_Text_BethPostBattle:
 	.string "I think you're going to keep getting\n"
 	.string "better. I'll go for it, too!$"
 
-Route107_Text_LisaIntro: @ 8296A77
+Route107_Text_LisaIntro:
 	.string "LISA: We challenge you as a sister\n"
 	.string "and brother!$"
 
-Route107_Text_LisaDefeated: @ 8296AA7
+Route107_Text_LisaDefeated:
 	.string "LISA: Awesome.\n"
 	.string "You're in a different class of tough.$"
 
-Route107_Text_LisaPostBattle: @ 8296ADC
+Route107_Text_LisaPostBattle:
 	.string "LISA: Do you have any friends who\n"
 	.string "would go to the beach with you?$"
 
-Route107_Text_LisaNotEnoughPokemon: @ 8296B1E
+Route107_Text_LisaNotEnoughPokemon:
 	.string "LISA: If you want to battle with us,\n"
 	.string "bring more POKéMON.$"
 
-Route107_Text_RayIntro: @ 8296B57
+Route107_Text_RayIntro:
 	.string "RAY: We always battle POKéMON,\n"
 	.string "me and my sister.\p"
 	.string "I always lose, but we can beat you\n"
 	.string "2-on-2!$"
 
-Route107_Text_RayDefeated: @ 8296BB3
+Route107_Text_RayDefeated:
 	.string "RAY: Wowee, you're at a higher level\n"
 	.string "than us!$"
 
-Route107_Text_RayPostBattle: @ 8296BE1
+Route107_Text_RayPostBattle:
 	.string "RAY: My sister gave me my POKéMON.\n"
 	.string "I raised it, and now it's my important\l"
 	.string "partner!$"
 
-Route107_Text_RayNotEnoughPokemon: @ 8296C34
+Route107_Text_RayNotEnoughPokemon:
 	.string "RAY: If you want to battle us,\n"
 	.string "go bring some more POKéMON!$"
 
-Route107_Text_CamronIntro: @ 8296C6F
+Route107_Text_CamronIntro:
 	.string "I'm in the middle of a triathlon,\n"
 	.string "but I'm nowhere near tired!$"
 
-Route107_Text_CamronDefeated: @ 8296CAD
+Route107_Text_CamronDefeated:
 	.string "That exhausted me…$"
 
-Route107_Text_CamronPostBattle: @ 8296CC0
+Route107_Text_CamronPostBattle:
 	.string "I still have swimming and running left\n"
 	.string "to do after this.\p"
 	.string "Am I going to be okay?$"
 
-Route108_Text_JeromeIntro: @ 8296D10
+Route108_Text_JeromeIntro:
 	.string "My dream is to swim the world's seven\n"
 	.string "seas!$"
 
-Route108_Text_JeromeDefeated: @ 8296D3C
+Route108_Text_JeromeDefeated:
 	.string "I won't be able to swim the seven seas\n"
 	.string "like this…$"
 
-Route108_Text_JeromePostBattle: @ 8296D6E
+Route108_Text_JeromePostBattle:
 	.string "Playing with marine POKéMON is one of\n"
 	.string "the pleasures of swimming!$"
 
-Route108_Text_MatthewIntro: @ 8296DAF
+Route108_Text_MatthewIntro:
 	.string "Ahoy, there! Are you going out to\n"
 	.string "the ABANDONED SHIP, too?$"
 
-Route108_Text_MatthewDefeated: @ 8296DEA
+Route108_Text_MatthewDefeated:
 	.string "I'm sinking!\n"
 	.string "Glub… Glub…$"
 
-Route108_Text_MatthewPostBattle: @ 8296E03
+Route108_Text_MatthewPostBattle:
 	.string "Some people even go inside that\n"
 	.string "ABANDONED SHIP.$"
 
-Route108_Text_TaraIntro: @ 8296E33
+Route108_Text_TaraIntro:
 	.string "My liar of a boyfriend told me that\n"
 	.string "I look great in a bikini…$"
 
-Route108_Text_TaraDefeated: @ 8296E71
+Route108_Text_TaraDefeated:
 	.string "Oh, boo!$"
 
-Route108_Text_TaraPostBattle: @ 8296E7A
+Route108_Text_TaraPostBattle:
 	.string "Even if it's a lie, I love being told\n"
 	.string "I look great…\l"
 	.string "We girls are so complex…$"
 
-Route108_Text_MissyIntro: @ 8296EC7
+Route108_Text_MissyIntro:
 	.string "I love the sea!\n"
 	.string "I forget all my worries when I swim!$"
 
-Route108_Text_MissyDefeated: @ 8296EFC
+Route108_Text_MissyDefeated:
 	.string "When I lose a battle, I get all\n"
 	.string "stressed out!$"
 
-Route108_Text_MissyPostBattle: @ 8296F2A
+Route108_Text_MissyPostBattle:
 	.string "Work off your stress by swimming!\n"
 	.string "It's so healthy!$"
 
-Route108_Text_CoryIntro: @ 8296F5D
+Route108_Text_CoryIntro:
 	.string "I love WATER-type POKéMON.\n"
 	.string "I love other POKéMON, too!$"
 
-Route108_Text_CoryDefeated: @ 8296F93
+Route108_Text_CoryDefeated:
 	.string "Waaah! I lost!\n"
 	.string "Waaah! Waaah!$"
 
-Route108_Text_CoryPostBattle: @ 8296FB0
+Route108_Text_CoryPostBattle:
 	.string "Shouting is good for me!\n"
 	.string "It uplifts me!$"
 
-Route108_Text_CoryRegister: @ 8296FD8
+Route108_Text_CoryRegister:
 	.string "I love tough TRAINERS, too!\n"
 	.string "Register me in your POKéNAV!$"
 
-Route108_Text_CoryRematchIntro: @ 8297011
+Route108_Text_CoryRematchIntro:
 	.string "Win or lose, I love battling at sea!$"
 
-Route108_Text_CoryRematchDefeated: @ 8297036
+Route108_Text_CoryRematchDefeated:
 	.string "Waaah! I lost again!\n"
 	.string "Waaah! Waaah!$"
 
-Route108_Text_CoryRematchPostBattle: @ 8297059
+Route108_Text_CoryRematchPostBattle:
 	.string "If you're faced with a challenge,\n"
 	.string "try shouting at the sea!$"
 
-Route108_Text_CarolinaIntro: @ 8297094
+Route108_Text_CarolinaIntro:
 	.string "I take huge pride in my POKéMON.\n"
 	.string "We'll show you one speedy battle!$"
 
-Route108_Text_CarolinaDefeated: @ 82970D7
+Route108_Text_CarolinaDefeated:
 	.string "That wasn't cute at all.$"
 
-Route108_Text_CarolinaPostBattle: @ 82970F0
+Route108_Text_CarolinaPostBattle:
 	.string "Since I'm at sea like this, I wouldn't\n"
 	.string "mind putting on a pink, frilly swimsuit…$"
 
-Route109_Text_DavidIntro: @ 8297140
+Route109_Text_DavidIntro:
 	.string "Hiyah! Look at my chiseled abs!\n"
 	.string "This is what you call “cut”!$"
 
-Route109_Text_DavidDefeated: @ 829717D
+Route109_Text_DavidDefeated:
 	.string "Aiyah!\n"
 	.string "Flubbed out!$"
 
-Route109_Text_DavidPostBattle: @ 8297191
+Route109_Text_DavidPostBattle:
 	.string "Hiyah!\p"
 	.string "My sculpted abs have nothing to do\n"
 	.string "with POKéMON battles!$"
 
-Route109_Text_AliceIntro: @ 82971D1
+Route109_Text_AliceIntro:
 	.string "Are you properly protected against\n"
 	.string "the sun?$"
 
-Route109_Text_AliceDefeated: @ 82971FD
+Route109_Text_AliceDefeated:
 	.string "Ouch, ouch, ouch!$"
 
-Route109_Text_AlicePostBattle: @ 829720F
+Route109_Text_AlicePostBattle:
 	.string "Cheeks are the most prone to burning!$"
 
-Route109_Text_HueyIntro: @ 8297235
+Route109_Text_HueyIntro:
 	.string "I've laid anchor in ports around\n"
 	.string "the world, but SLATEPORT's the best.$"
 
-Route109_Text_HueyDefeated: @ 829727B
+Route109_Text_HueyDefeated:
 	.string "You're the best!$"
 
-Route109_Text_HueyPostBattle: @ 829728C
+Route109_Text_HueyPostBattle:
 	.string "In the best port was the best\n"
 	.string "TRAINER…$"
 
-Route109_Text_EdmondIntro: @ 82972B3
+Route109_Text_EdmondIntro:
 	.string "Urrrrppp…\n"
 	.string "Battle? With me?$"
 
-Route109_Text_EdmondDefeated: @ 82972CE
+Route109_Text_EdmondDefeated:
 	.string "Urp… Ooooooohhhhhh…\n"
 	.string "Urrrrpppp…$"
 
-Route109_Text_EdmondPostBattle: @ 82972ED
+Route109_Text_EdmondPostBattle:
 	.string "I'm usually stronger than this!\n"
 	.string "I'm just seasick as a dog!\p"
 	.string "I'm a SAILOR, but…$"
 
-Route109_Text_RickyIntro: @ 829733B
+Route109_Text_RickyIntro:
 	.string "I'm thirsty… I could go for a SODA POP\n"
 	.string "at the SEASHORE HOUSE…$"
 
-Route109_Text_RickyDefeated: @ 8297379
+Route109_Text_RickyDefeated:
 	.string "Groan…$"
 
-Route109_Text_RickyPostBattle: @ 8297380
+Route109_Text_RickyPostBattle:
 	.string "I'm getting famished… My inner tube\n"
 	.string "looks like a giant doughnut…$"
 
-Route109_Text_RickyRegister: @ 82973C1
+Route109_Text_RickyRegister:
 	.string "Will you have another match with me\n"
 	.string "when I'm not all thirsty?$"
 
-Route109_Text_RickyRematchIntro: @ 82973FF
+Route109_Text_RickyRematchIntro:
 	.string "I'm hungry, but I've got enough pep in\n"
 	.string "me for a battle!$"
 
-Route109_Text_RickyRematchDefeated: @ 8297437
+Route109_Text_RickyRematchDefeated:
 	.string "I lost…\n"
 	.string "It's because I'm hungry…$"
 
-Route109_Text_RickyRematchPostBattle: @ 8297458
+Route109_Text_RickyRematchPostBattle:
 	.string "When you eat on a beach, everything\n"
 	.string "seems to taste a little better.$"
 
-Route109_Text_LolaIntro: @ 829749C
+Route109_Text_LolaIntro:
 	.string "Doesn't a beach umbrella look like\n"
 	.string "a giant flower?$"
 
-Route109_Text_LolaDefeated: @ 82974CF
+Route109_Text_LolaDefeated:
 	.string "Mommy!$"
 
-Route109_Text_LolaPostBattle: @ 82974D6
+Route109_Text_LolaPostBattle:
 	.string "If you look at the beach from the sky,\n"
 	.string "it looks like a big flower garden!$"
 
-Route109_Text_LolaRegister: @ 8297520
+Route109_Text_LolaRegister:
 	.string "Me?\n"
 	.string "I'm here every day!$"
 
-Route109_Text_LolaRematchIntro: @ 8297538
+Route109_Text_LolaRematchIntro:
 	.string "I'm not losing to you again!\n"
 	.string "That's why I have my inner tube!$"
 
-Route109_Text_LolaRematchDefeated: @ 8297576
+Route109_Text_LolaRematchDefeated:
 	.string "Mommy!$"
 
-Route109_Text_LolaRematchPostBattle: @ 829757D
+Route109_Text_LolaRematchPostBattle:
 	.string "If I have an inner tube, me and my\n"
 	.string "POKéMON's cuteness goes way up!$"
 
-Route109_Text_AustinaIntro: @ 82975C0
+Route109_Text_AustinaIntro:
 	.string "I can't swim without my inner tube,\n"
 	.string "but I won't lose at POKéMON!$"
 
-Route109_Text_AustinaDefeated: @ 8297601
+Route109_Text_AustinaDefeated:
 	.string "Did I lose because I have an inner\n"
 	.string "tube?$"
 
-Route109_Text_AustinaPostBattle: @ 829762A
+Route109_Text_AustinaPostBattle:
 	.string "My inner tube is a fashion item.\n"
 	.string "I can't be seen without it.$"
 
-Route109_Text_GwenIntro: @ 8297667
+Route109_Text_GwenIntro:
 	.string "Hi, big TRAINER.\n"
 	.string "Will you battle with me?$"
 
-Route109_Text_GwenDefeated: @ 8297691
+Route109_Text_GwenDefeated:
 	.string "Oh, you're strong.$"
 
-Route109_Text_GwenPostBattle: @ 82976A4
+Route109_Text_GwenPostBattle:
 	.string "How did you get to be so strong?$"
 
-Route109_Text_CarterIntro: @ 82976C5
+Route109_Text_CarterIntro:
 	.string "Wahahah! This dude's going to catch\n"
 	.string "himself a big one!$"
 
-Route109_Text_CarterDefeated: @ 82976FC
+Route109_Text_CarterDefeated:
 	.string "This dude just lost one…$"
 
-Route109_Text_CarterPostBattle: @ 8297715
+Route109_Text_CarterPostBattle:
 	.string "This dude thinks you're a big one.\n"
 	.string "No, you're a big-one-to-be!$"
 
-Route109_Text_PaulIntro: @ 8297754
+Route109_Text_PaulIntro:
 	.string "PAUL: Well, this is a mood-breaker.\p"
 	.string "I wish you wouldn't disturb our\n"
 	.string "precious time together.$"
 
-Route109_Text_PaulDefeated: @ 82977B0
+Route109_Text_PaulDefeated:
 	.string "PAUL: Well, I give up.$"
 
-Route109_Text_PaulPostBattle: @ 82977C7
+Route109_Text_PaulPostBattle:
 	.string "PAUL: Well, don't tell anyone that\n"
 	.string "we're here.\l"
 	.string "This is just our private world of two!$"
 
-Route109_Text_PaulNotEnoughPokemon: @ 829781D
+Route109_Text_PaulNotEnoughPokemon:
 	.string "PAUL: We're totally, deeply in love.\n"
 	.string "That's why we make our POKéMON battle\l"
 	.string "together.$"
 
-Route109_Text_MelIntro: @ 8297872
+Route109_Text_MelIntro:
 	.string "MEL: We're, like, totally in love.\n"
 	.string "Our romance is heating up all of HOENN!$"
 
-Route109_Text_MelDefeated: @ 82978BD
+Route109_Text_MelDefeated:
 	.string "MEL: We lost, and it's my fault!\n"
 	.string "PAUL will hate me!$"
 
-Route109_Text_MelPostBattle: @ 82978F1
+Route109_Text_MelPostBattle:
 	.string "MEL: Um, PAUL, are you angry with me?\n"
 	.string "Please don't be angry.$"
 
-Route109_Text_MelNotEnoughPokemon: @ 829792E
+Route109_Text_MelNotEnoughPokemon:
 	.string "MEL: We're, like, deeply and truly in love.\n"
 	.string "That's why we make our POKéMON\l"
 	.string "battle together.$"
 
-Route109_Text_ChandlerIntro: @ 829798A
+Route109_Text_ChandlerIntro:
 	.string "Tadaah! See?\n"
 	.string "My inner tube's round!$"
 
-Route109_Text_ChandlerDefeated: @ 82979AE
+Route109_Text_ChandlerDefeated:
 	.string "Oh, oh!\n"
 	.string "Too bad!$"
 
-Route109_Text_ChandlerPostBattle: @ 82979BF
+Route109_Text_ChandlerPostBattle:
 	.string "After I showed you my round inner\n"
 	.string "tube, too…$"
 
-Route109_Text_HaileyIntro: @ 82979EC
+Route109_Text_HaileyIntro:
 	.string "I can't swim, so I'm pretending\n"
 	.string "to swim.$"
 
-Route109_Text_HaileyDefeated: @ 8297A15
+Route109_Text_HaileyDefeated:
 	.string "I thought so!\n"
 	.string "I didn't think we could win.$"
 
-Route109_Text_HaileyPostBattle: @ 8297A40
+Route109_Text_HaileyPostBattle:
 	.string "When I learn how to swim, I think\n"
 	.string "my POKéMON will become tougher.$"
 
-Route109_Text_ElijahIntro: @ 8297A82
+Route109_Text_ElijahIntro:
 	.string "For a guy as macho as me, this kind\n"
 	.string "of POKéMON is the perfect match!$"
 
-Route109_Text_ElijahDefeated: @ 8297AC7
+Route109_Text_ElijahDefeated:
 	.string "I'm cool even in defeat, hey?$"
 
-Route109_Text_ElijahPostBattle: @ 8297AE5
+Route109_Text_ElijahPostBattle:
 	.string "For a guy as macho as me, a port\n"
 	.string "is the perfect setting!\p"
 	.string "I guess I'll head for SLATEPORT.$"
 
-Route110_Text_JacobIntro: @ 8297B3F
+Route110_Text_JacobIntro:
 	.string "Whoa! Watch it!\n"
 	.string "I guess you're not used to BIKE racing.$"
 
-Route110_Text_JacobDefeated: @ 8297B77
+Route110_Text_JacobDefeated:
 	.string "Whoa!\n"
 	.string "My brakes failed!$"
 
-Route110_Text_JacobPostBattle: @ 8297B8F
+Route110_Text_JacobPostBattle:
 	.string "Flat tires and brake problems can\n"
 	.string "cause serious injury!\l"
 	.string "Inspect your BIKE for problems!$"
 
-Route110_Text_AnthonyIntro: @ 8297BE7
+Route110_Text_AnthonyIntro:
 	.string "Yo, you!\n"
 	.string "Can you keep up with my speed?$"
 
-Route110_Text_AnthonyDefeated: @ 8297C0F
+Route110_Text_AnthonyDefeated:
 	.string "Crash and burn!$"
 
-Route110_Text_AnthonyPostBattle: @ 8297C1F
+Route110_Text_AnthonyPostBattle:
 	.string "Speed alone won't let me win at POKéMON.\n"
 	.string "I need to reconsider this…$"
 
-Route110_Text_BenjaminIntro: @ 8297C63
+Route110_Text_BenjaminIntro:
 	.string "Don't panic if your BIKE's going fast!$"
 
-Route110_Text_BenjaminDefeated: @ 8297C8A
+Route110_Text_BenjaminDefeated:
 	.string "I shouldn't panic during POKéMON\n"
 	.string "battles…$"
 
-Route110_Text_BenjaminPostBattle: @ 8297CB4
+Route110_Text_BenjaminPostBattle:
 	.string "There's no need to panic or stress.\n"
 	.string "Take it easy. There's plenty of time.$"
 
-Route110_Text_BenjaminRegister: @ 8297CFE
+Route110_Text_BenjaminRegister:
 	.string "I'll keep chugging on without stressing.\n"
 	.string "Give me a shout if you're up to it.$"
 
-Route110_Text_BenjaminRematchIntro: @ 8297D4B
+Route110_Text_BenjaminRematchIntro:
 	.string "Aren't you going a little too fast?\n"
 	.string "Take it easy and let's battle.$"
 
-Route110_Text_BenjaminRematchDefeated: @ 8297D8E
+Route110_Text_BenjaminRematchDefeated:
 	.string "I didn't panic, but I still lost…$"
 
-Route110_Text_BenjaminRematchPostBattle: @ 8297DB0
+Route110_Text_BenjaminRematchPostBattle:
 	.string "There's no need to panic or stress.\n"
 	.string "Take it easy. There's plenty of time.$"
 
-Route110_Text_AbigailIntro: @ 8297DFA
+Route110_Text_AbigailIntro:
 	.string "The triathlon is hard in the extreme.\p"
 	.string "You have to complete the three events\n"
 	.string "of swimming, cycling, and running.$"
 
-Route110_Text_AbigailDefeated: @ 8297E69
+Route110_Text_AbigailDefeated:
 	.string "POKéMON battles are hard, too!$"
 
-Route110_Text_AbigailPostBattle: @ 8297E88
+Route110_Text_AbigailPostBattle:
 	.string "I'm exhausted, so I need a break.\n"
 	.string "It's important to get proper rest.$"
 
-Route110_Text_AbigailRegister: @ 8297ECD
+Route110_Text_AbigailRegister:
 	.string "You know, I like you!\n"
 	.string "Let's have a rematch on CYCLING ROAD.$"
 
-Route110_Text_AbigailRematchIntro: @ 8297F09
+Route110_Text_AbigailRematchIntro:
 	.string "Isn't it neat to hold a battle while\n"
 	.string "cycling?$"
 
-Route110_Text_AbigailRematchDefeated: @ 8297F37
+Route110_Text_AbigailRematchDefeated:
 	.string "Wow…\n"
 	.string "How could you be so strong?$"
 
-Route110_Text_AbigailRematchPostBattle: @ 8297F58
+Route110_Text_AbigailRematchPostBattle:
 	.string "Were you going after a record?\p"
 	.string "I'm sorry if I held you up!$"
 
-Route110_Text_JasmineIntro: @ 8297F93
+Route110_Text_JasmineIntro:
 	.string "I've been riding without stopping.\n"
 	.string "My thighs are like rocks!$"
 
-Route110_Text_JasmineDefeated: @ 8297FD0
+Route110_Text_JasmineDefeated:
 	.string "I'm worried about muscle cramps…$"
 
-Route110_Text_JasminePostBattle: @ 8297FF1
+Route110_Text_JasminePostBattle:
 	.string "Oh, you have some GYM BADGES?\n"
 	.string "No wonder you're so strong!$"
 
-Route110_Text_EdwardIntro: @ 829802B
+Route110_Text_EdwardIntro:
 	.string "I have foreseen your intentions!\n"
 	.string "I cannot possibly lose!$"
 
-Route110_Text_EdwardDefeated: @ 8298064
+Route110_Text_EdwardDefeated:
 	.string "I failed to prophesize my own demise!$"
 
-Route110_Text_EdwardPostBattle: @ 829808A
+Route110_Text_EdwardPostBattle:
 	.string "I see your future…\p"
 	.string "Hmm…\n"
 	.string "I see a shining light…$"
 
-Route110_Text_JaclynIntro: @ 82980B9
+Route110_Text_JaclynIntro:
 	.string "Ahahahaha!\n"
 	.string "I'll dazzle you with my wonders!$"
 
-Route110_Text_JaclynDefeated: @ 82980E5
+Route110_Text_JaclynDefeated:
 	.string "I wondrously lost!$"
 
-Route110_Text_JaclynPostBattle: @ 82980F8
+Route110_Text_JaclynPostBattle:
 	.string "You managed to win only because it was\n"
 	.string "a wonder! Yes, a wonder!\l"
 	.string "Don't think you can win all the time!$"
 
-Route110_Text_EdwinIntro: @ 829815E
+Route110_Text_EdwinIntro:
 	.string "Could I see your POKéMON?\n"
 	.string "Just one look, please?$"
 
-Route110_Text_EdwinDefeated: @ 829818F
+Route110_Text_EdwinDefeated:
 	.string "I wanted to complete\n"
 	.string "my collection…$"
 
-Route110_Text_EdwinPostBattle: @ 82981B3
+Route110_Text_EdwinPostBattle:
 	.string "When I see a POKéMON that I don't know,\n"
 	.string "my passion as a collector is ignited!$"
 
-Route110_Text_EdwinRegister: @ 8298201
+Route110_Text_EdwinRegister:
 	.string "I like collecting MATCH CALL\n"
 	.string "registrations, too…$"
 
-Route110_Text_EdwinRematchIntro: @ 8298232
+Route110_Text_EdwinRematchIntro:
 	.string "Hi, have you caught any new POKéMON?\p"
 	.string "Could I see your POKéMON?\n"
 	.string "Just one look, please?$"
 
-Route110_Text_EdwinRematchDefeated: @ 8298288
+Route110_Text_EdwinRematchDefeated:
 	.string "Your POKéMON…\n"
 	.string "I envy you.$"
 
-Route110_Text_EdwinRematchPostBattle: @ 82982A2
+Route110_Text_EdwinRematchPostBattle:
 	.string "Oh, I long to make all rare POKéMON\n"
 	.string "mine!$"
 
-Route110_Text_DaleIntro: @ 82982CC
+Route110_Text_DaleIntro:
 	.string "Hey!\n"
 	.string "Don't sneak up behind me like that!$"
 
-Route110_Text_DaleDefeated: @ 82982F5
+Route110_Text_DaleDefeated:
 	.string "I lost!\n"
 	.string "Drat!$"
 
-Route110_Text_DalePostBattle: @ 8298303
+Route110_Text_DalePostBattle:
 	.string "Fishing is all about concentration.\n"
 	.string "You have to focus on the floater.$"
 
-Route110_Text_IsabelIntro: @ 8298349
+Route110_Text_IsabelIntro:
 	.string "Ahahaha! I would go anywhere to show\n"
 	.string "off my delightful POKéMON.$"
 
-Route110_Text_IsabelDefeated: @ 8298389
+Route110_Text_IsabelDefeated:
 	.string "Oh, dear, this won't do.$"
 
-Route110_Text_IsabelPostBattle: @ 82983A2
+Route110_Text_IsabelPostBattle:
 	.string "Rather than battling, perhaps I should\n"
 	.string "show off my POKéMON at the FAN CLUB.$"
 
-Route110_Text_IsabelRegister: @ 82983EE
+Route110_Text_IsabelRegister:
 	.string "That wasn't close to what I could\n"
 	.string "do to show off my POKéMON.\p"
 	.string "I'll have you as my captive audience\n"
 	.string "as often as possible!$"
 
-Route110_Text_IsabelRematchIntro: @ 8298466
+Route110_Text_IsabelRematchIntro:
 	.string "Ahahahaha! I would be happy to show\n"
 	.string "off my POKéMON as often as you like!$"
 
-Route110_Text_IsabelRematchDefeated: @ 82984AF
+Route110_Text_IsabelRematchDefeated:
 	.string "Oh, dear, this won't do.$"
 
-Route110_Text_IsabelRematchPostBattle: @ 82984C8
+Route110_Text_IsabelRematchPostBattle:
 	.string "I don't think that I could ever stop\n"
 	.string "from showing off my POKéMON.\p"
 	.string "But I like to battle, too!$"
 
-Route110_Text_TimmyIntro: @ 8298525
+Route110_Text_TimmyIntro:
 	.string "I found some cool POKéMON in the grass\n"
 	.string "around here!$"
 
-Route110_Text_TimmyDefeated: @ 8298559
+Route110_Text_TimmyDefeated:
 	.string "Being cool isn't enough to win…$"
 
-Route110_Text_TimmyPostBattle: @ 8298579
+Route110_Text_TimmyPostBattle:
 	.string "It's hard to battle with POKéMON you\n"
 	.string "just caught.$"
 
-Route110_Text_AlyssaIntro: @ 82985AB
+Route110_Text_AlyssaIntro:
 	.string "I fell off CYCLING ROAD…\p"
 	.string "I'll get over my embarrassment by\n"
 	.string "battling with you!$"
 
-Route110_Text_AlyssaDefeated: @ 82985F9
+Route110_Text_AlyssaDefeated:
 	.string "Oops!\n"
 	.string "I ended up losing!$"
 
-Route110_Text_AlyssaPostBattle: @ 8298612
+Route110_Text_AlyssaPostBattle:
 	.string "Falling… Losing…\n"
 	.string "This is so humiliating for me!$"
 
-Route110_Text_JosephIntro: @ 8298642
+Route110_Text_JosephIntro:
 	.string "Okay! Full-throttle time! If you can't\n"
 	.string "groove, you get left behind!$"
 
-Route110_Text_JosephDefeated: @ 8298686
+Route110_Text_JosephDefeated:
 	.string "You got into the groove all right…$"
 
-Route110_Text_JosephPostBattle: @ 82986A9
+Route110_Text_JosephPostBattle:
 	.string "This isn't going to bring me down!\n"
 	.string "Losing has made me a better man!$"
 
-Route110_Text_KalebIntro: @ 82986ED
+Route110_Text_KalebIntro:
 	.string "When cute POKéMON help each other…\n"
 	.string "You won't see a more adorable sight!$"
 
-Route110_Text_KalebDefeated: @ 8298735
+Route110_Text_KalebDefeated:
 	.string "Have you no compassion or pity?$"
 
-Route110_Text_KalebPostBattle: @ 8298755
+Route110_Text_KalebPostBattle:
 	.string "Okay, okay, you've done the best you\n"
 	.string "could, my pretties.$"
 
-Route111_Text_DrewIntro: @ 829878E
+Route111_Text_DrewIntro:
 	.string "Oh, hey! Those GO-GOGGLES suit you.\n"
 	.string "But I think they look better on me.\p"
 	.string "Let's decide who they look better on\n"
 	.string "with a battle!$"
 
-Route111_Text_DrewDefeat: @ 829880A
+Route111_Text_DrewDefeat:
 	.string "I couldn't see what was happening at\n"
 	.string "my sides because of the GO-GOGGLES.$"
 
-Route111_Text_DrewPostBattle: @ 8298853
+Route111_Text_DrewPostBattle:
 	.string "The GO-GOGGLES make it possible to\n"
 	.string "get through sandstorms.\l"
 	.string "That makes me happy!$"
 
-Route111_Text_HeidiIntro: @ 82988A3
+Route111_Text_HeidiIntro:
 	.string "I'm having a picnic in the desert.\p"
 	.string "You can always find a TRAINER,\n"
 	.string "so I can enjoy a battle here, too!$"
 
-Route111_Text_HeidiDefeat: @ 8298908
+Route111_Text_HeidiDefeat:
 	.string "Ohhh! You're mean!$"
 
-Route111_Text_HeidiPostBattle: @ 829891B
+Route111_Text_HeidiPostBattle:
 	.string "When you're battling in a sandstorm,\n"
 	.string "watch out for your POKéMON's HP.\p"
 	.string "It can faint if you don't keep\n"
 	.string "an eye on it!$"
 
-Route111_Text_BeauIntro: @ 829898E
+Route111_Text_BeauIntro:
 	.string "Wearing these GO-GOGGLES makes me\n"
 	.string "feel like a superhero.\l"
 	.string "Right now, nobody can beat me!$"
 
-Route111_Text_BeauDefeat: @ 82989E6
+Route111_Text_BeauDefeat:
 	.string "I can't win on spirit alone…$"
 
-Route111_Text_BeauPostBattle: @ 8298A03
+Route111_Text_BeauPostBattle:
 	.string "I'm going to be a real hero one day.\n"
 	.string "I'm going to work harder to make me\l"
 	.string "and my POKéMON stronger.$"
 
-Route111_Text_BeckyIntro: @ 8298A65
+Route111_Text_BeckyIntro:
 	.string "I heard there are fossils to be found\n"
 	.string "in the desert. Where could they be?$"
 
-Route111_Text_BeckyDefeat: @ 8298AAF
+Route111_Text_BeckyDefeat:
 	.string "I came up short…$"
 
-Route111_Text_BeckyPostBattle: @ 8298AC0
+Route111_Text_BeckyPostBattle:
 	.string "If they can find fossils in the desert,\n"
 	.string "it must have been a sea before.$"
 
-Route111_Text_DustyIntro: @ 8298B08
+Route111_Text_DustyIntro:
 	.string "For thirty years I have searched for\n"
 	.string "ancient ruins!\l"
 	.string "I am to be challenged?$"
 
-Route111_Text_DustyDefeat: @ 8298B53
+Route111_Text_DustyDefeat:
 	.string "While I have searched for ruins,\n"
 	.string "I've not searched for strong POKéMON.$"
 
-Route111_Text_DustyPostBattle: @ 8298B9A
+Route111_Text_DustyPostBattle:
 	.string "For thirty years I have searched for\n"
 	.string "ancient ruins!\p"
 	.string "No, wait, was that forty years?\n"
 	.string "Which was it now?$"
 
-Route111_Text_DustyRegister: @ 8298C00
+Route111_Text_DustyRegister:
 	.string "I haven't been searching for any\n"
 	.string "tough POKéMON.\p"
 	.string "But, for some reason, I sure do like\n"
 	.string "POKéNAVS.$"
 
-Route111_Text_DustyRematchIntro: @ 8298C5F
+Route111_Text_DustyRematchIntro:
 	.string "For thirty years I have searched for\n"
 	.string "ancient ruins!\p"
 	.string "No, wait, was that forty years?\n"
 	.string "Anyway, am I to be challenged?$"
 
-Route111_Text_DustyRematchDefeat: @ 8298CD2
+Route111_Text_DustyRematchDefeat:
 	.string "I've found no ruins, nor have I found\n"
 	.string "any strong POKéMON…$"
 
-Route111_Text_DustyPostRematch: @ 8298D0C
+Route111_Text_DustyPostRematch:
 	.string "For thirty years I have searched for\n"
 	.string "ancient ruins!\p"
 	.string "No, wait, was that forty years\n"
@@ -1324,215 +1324,215 @@ Route111_Text_DustyPostRematch: @ 8298D0C
 	.string "Hmm… It could even be fifty…\n"
 	.string "How long have I been at this?$"
 
-Route111_Text_TravisIntro: @ 8298DA9
+Route111_Text_TravisIntro:
 	.string "I'm full of pep!\n"
 	.string "And my POKéMON is peppy, too!$"
 
-Route111_Text_TravisDefeat: @ 8298DD8
+Route111_Text_TravisDefeat:
 	.string "My POKéMON lost its pep…$"
 
-Route111_Text_TravisPostBattle: @ 8298DF1
+Route111_Text_TravisPostBattle:
 	.string "When I see a TRAINER with a lot of pep,\n"
 	.string "I can't help looking.$"
 
-Route111_Text_IreneIntro: @ 8298E2F
+Route111_Text_IreneIntro:
 	.string "I don't know where you're going,\n"
 	.string "but would you like to battle?$"
 
-Route111_Text_IreneDefeat: @ 8298E6E
+Route111_Text_IreneDefeat:
 	.string "Oh, you're disgustingly good!$"
 
-Route111_Text_IrenePostBattle: @ 8298E8C
+Route111_Text_IrenePostBattle:
 	.string "I'm thinking that I should go to\n"
 	.string "MT. CHIMNEY, but the view around\l"
 	.string "here is very nice, too.$"
 
-Route111_Text_DaisukeIntro: @ 8298EE6
+Route111_Text_DaisukeIntro:
 	.string "To train myself, I challenge all\n"
 	.string "whom I meet!$"
 
-Route111_Text_DaisukeDefeat: @ 8298F14
+Route111_Text_DaisukeDefeat:
 	.string "Uncle! I give up!$"
 
-Route111_Text_DaisukePostBattle: @ 8298F26
+Route111_Text_DaisukePostBattle:
 	.string "All I can do is keep training until\n"
 	.string "I can defeat strong TRAINERS such\l"
 	.string "as yourself.$"
 
-Route111_Text_WiltonIntro: @ 8298F79
+Route111_Text_WiltonIntro:
 	.string "Show me how much you've toughened\n"
 	.string "your POKéMON.$"
 
-Route111_Text_WiltonDefeat: @ 8298FA9
+Route111_Text_WiltonDefeat:
 	.string "I see, you've toughened them\n"
 	.string "considerably.$"
 
-Route111_Text_WiltonPostBattle: @ 8298FD4
+Route111_Text_WiltonPostBattle:
 	.string "POKéMON and TRAINERS learn much\n"
 	.string "through battling.\p"
 	.string "What's important is to never give up\n"
 	.string "even if you lose.$"
 
-Route111_Text_WiltonRegister: @ 829903D
+Route111_Text_WiltonRegister:
 	.string "There is much to be learned from\n"
 	.string "your training style.\p"
 	.string "I request a rematch if it\n"
 	.string "behooves you.$"
 
-Route111_Text_WiltonRematchIntro: @ 829909B
+Route111_Text_WiltonRematchIntro:
 	.string "We're training here to elevate our\n"
 	.string "game to the next level.\l"
 	.string "Stay and train with us!$"
 
-Route111_Text_WiltonRematchDefeat: @ 82990EE
+Route111_Text_WiltonRematchDefeat:
 	.string "Ooh, you're decent!$"
 
-Route111_Text_WiltonPostRematch: @ 8299102
+Route111_Text_WiltonPostRematch:
 	.string "Since you're that strong, you should\n"
 	.string "aim for the POKéMON LEAGUE.$"
 
-Route111_Text_BrookeIntro: @ 8299143
+Route111_Text_BrookeIntro:
 	.string "Oh, your POKéMON look like serious\n"
 	.string "actors.\l"
 	.string "I have to ask you for an engagement.$"
 
-Route111_Text_BrookeDefeat: @ 8299193
+Route111_Text_BrookeDefeat:
 	.string "They didn't just look strong,\n"
 	.string "they are strong!$"
 
-Route111_Text_BrookePostBattle: @ 82991C2
+Route111_Text_BrookePostBattle:
 	.string "I thought I was raising my POKéMON\n"
 	.string "diligently, but, oh no, there is still\l"
 	.string "much to be done.$"
 
-Route111_Text_BrookeRegister: @ 829921D
+Route111_Text_BrookeRegister:
 	.string "I wish I could become friends with\n"
 	.string "more strong people like you!$"
 
-Route111_Text_BrookeRematchIntro: @ 829925D
+Route111_Text_BrookeRematchIntro:
 	.string "You can make POKéMON stronger or\n"
 	.string "weaker depending on the moves you\l"
 	.string "teach them.\p"
 	.string "What kinds of moves do your POKéMON\n"
 	.string "know?$"
 
-Route111_Text_BrookeRematchDefeat: @ 82992D6
+Route111_Text_BrookeRematchDefeat:
 	.string "You've taught them good moves!$"
 
-Route111_Text_BrookePostRematch: @ 82992F5
+Route111_Text_BrookePostRematch:
 	.string "Maybe I should have stopped my\n"
 	.string "POKéMON from evolving until they\l"
 	.string "learned better moves…$"
 
-Route111_Text_CeliaIntro: @ 829934B
+Route111_Text_CeliaIntro:
 	.string "I shouldn't have come to a place like\n"
 	.string "this for a picnic!$"
 
-Route111_Text_CeliaDefeat: @ 8299384
+Route111_Text_CeliaDefeat:
 	.string "Aww!\n"
 	.string "I really shouldn't have come!$"
 
-Route111_Text_CeliaPostBattle: @ 82993A7
+Route111_Text_CeliaPostBattle:
 	.string "In a sandstorm like this, I can't set\n"
 	.string "the places for a picnic even with my\l"
 	.string "GO-GOGGLES on…$"
 
-Route111_Text_BryanIntro: @ 8299401
+Route111_Text_BryanIntro:
 	.string "How tough are you?\n"
 	.string "We shall expose that secret!$"
 
-Route111_Text_BryanDefeat: @ 8299431
+Route111_Text_BryanDefeat:
 	.string "Oh! Your strength!\n"
 	.string "It is shrouded in mystery!$"
 
-Route111_Text_BryanPostBattle: @ 829945F
+Route111_Text_BryanPostBattle:
 	.string "This desert hoards mysteries in\n"
 	.string "its shifting sands!$"
 
-Route111_Text_BrandenIntro: @ 8299493
+Route111_Text_BrandenIntro:
 	.string "I'll give you some of my sandwich\n"
 	.string "if you'll lose.$"
 
-Route111_Text_BrandenDefeat: @ 82994C5
+Route111_Text_BrandenDefeat:
 	.string "Tch! I thought a sandwich would be\n"
 	.string "enough of a bribe…$"
 
-Route111_Text_BrandenPostBattle: @ 82994FB
+Route111_Text_BrandenPostBattle:
 	.string "My SANDSHREW loves eating\n"
 	.string "my sandwiches.$"
 
-Route111_Text_TyronIntro: @ 8299524
+Route111_Text_TyronIntro:
 	.string "This is my favorite kind of POKéMON!$"
 
-Route111_Text_TyronDefeat: @ 8299549
+Route111_Text_TyronDefeat:
 	.string "Wait!\n"
 	.string "Did you get a good look at my POKéMON?$"
 
-Route111_Text_TyronPostBattle: @ 8299576
+Route111_Text_TyronPostBattle:
 	.string "When having a battle, I get a kick out\n"
 	.string "of showing off my POKéMON.\p"
 	.string "I bet everyone feels that way when\n"
 	.string "they enter a battle!$"
 
-Route111_Text_CelinaIntro: @ 82995F0
+Route111_Text_CelinaIntro:
 	.string "Show me how to put a little excitement\n"
 	.string "into my life.$"
 
-Route111_Text_CelinaDefeat: @ 8299625
+Route111_Text_CelinaDefeat:
 	.string "Oh… My…\n"
 	.string "That was too much excitement.$"
 
-Route111_Text_CelinaPostBattle: @ 829964B
+Route111_Text_CelinaPostBattle:
 	.string "My pulse is still racing.\n"
 	.string "You're one fabulous TRAINER.$"
 
-Route111_Text_HaydenIntro: @ 8299682
+Route111_Text_HaydenIntro:
 	.string "When you're as famished as I am,\n"
 	.string "there is no room for pity!$"
 
-Route111_Text_HaydenDefeat: @ 82996BE
+Route111_Text_HaydenDefeat:
 	.string "Groan…$"
 
-Route111_Text_HaydenPostBattle: @ 82996C5
+Route111_Text_HaydenPostBattle:
 	.string "My stomach is grumbling!\n"
 	.string "Maybe I can grill some BERRIES…$"
 
-Route111_Text_BiancaIntro: @ 82996FE
+Route111_Text_BiancaIntro:
 	.string "Did you come from MAUVILLE?\n"
 	.string "Then you should be full of energy!$"
 
-Route111_Text_BiancaDefeat: @ 829973D
+Route111_Text_BiancaDefeat:
 	.string "Ooh lala!\n"
 	.string "That's a lot to take!$"
 
-Route111_Text_BiancaPostBattle: @ 829975D
+Route111_Text_BiancaPostBattle:
 	.string "This road here…\n"
 	.string "You have quite a ways to travel.$"
 
-Route112_Text_BriceIntro: @ 829978E
+Route112_Text_BriceIntro:
 	.string "Hahahaha!\n"
 	.string "How about we have a battle?\l"
 	.string "You and me!\l"
 	.string "Hahahaha!$"
 
-Route112_Text_BriceDefeat: @ 82997CA
+Route112_Text_BriceDefeat:
 	.string "I lost!\n"
 	.string "Hahahaha!$"
 
-Route112_Text_BricePostBattle: @ 82997DC
+Route112_Text_BricePostBattle:
 	.string "Hahahahaha! Something flew up my nose!\n"
 	.string "Hahahaha-hatchoo!$"
 
-Route112_Text_TrentIntro: @ 8299815
+Route112_Text_TrentIntro:
 	.string "My legs are solid from pounding up\n"
 	.string "and down the mountains.\p"
 	.string "They're not going to buckle easily,\n"
 	.string "friend!$"
 
-Route112_Text_TrentDefeat: @ 829987C
+Route112_Text_TrentDefeat:
 	.string "Ouch! My legs cramped up!$"
 
-Route112_Text_TrentPostBattle: @ 8299896
+Route112_Text_TrentPostBattle:
 	.string "Try hiking, and I mean really\n"
 	.string "pounding, on these mountain trails\l"
 	.string "with a heavy pack weighing dozens of\l"
@@ -1540,2318 +1540,2318 @@ Route112_Text_TrentPostBattle: @ 8299896
 	.string "That, my friend, will get your body\n"
 	.string "into serious shape.$"
 
-Route112_Text_TrentRegister: @ 829993C
+Route112_Text_TrentRegister:
 	.string "Ow, my legs have cramped up.\n"
 	.string "Can you grab me some bandages from\l"
 	.string "my backpack?\p"
 	.string "No, that's my POKéNAV!\n"
 	.string "Oh, fine, I'll register you.$"
 
-Route112_Text_TrentRematchIntro: @ 82999BD
+Route112_Text_TrentRematchIntro:
 	.string "I've been keeping fit by hiking.\n"
 	.string "Power, I have in spades!$"
 
-Route112_Text_TrentRematchDefeat: @ 82999F7
+Route112_Text_TrentRematchDefeat:
 	.string "I got trumped in power?$"
 
-Route112_Text_TrentRematchPostBattle: @ 8299A0F
+Route112_Text_TrentRematchPostBattle:
 	.string "I hear there are some seriously tough\n"
 	.string "TRAINERS on top of MT. CHIMNEY.\p"
 	.string "I intend to get up there and give them\n"
 	.string "a challenge!$"
 
-Route112_Text_LarryIntro: @ 8299A89
+Route112_Text_LarryIntro:
 	.string "I'm strong.\n"
 	.string "I won't cry if I lose.$"
 
-Route112_Text_LarryDefeat: @ 8299AAC
+Route112_Text_LarryDefeat:
 	.string "Waaaah!$"
 
-Route112_Text_LarryPostBattle: @ 8299AB4
+Route112_Text_LarryPostBattle:
 	.string "I'm not crying because I miss my mommy!\n"
 	.string "Snivel…$"
 
-Route112_Text_CarolIntro: @ 8299AE4
+Route112_Text_CarolIntro:
 	.string "When you're out on a picnic, why,\n"
 	.string "you simply have to sing!\l"
 	.string "Come on, sing with me!$"
 
-Route112_Text_CarolDefeat: @ 8299B36
+Route112_Text_CarolDefeat:
 	.string "Oh, you're so strong!$"
 
-Route112_Text_CarolPostBattle: @ 8299B4C
+Route112_Text_CarolPostBattle:
 	.string "It doesn't matter if you're good or bad\n"
 	.string "at singing or POKéMON.\p"
 	.string "If you have the most fun, you win!$"
 
-Route112_Text_BryantIntro: @ 8299BAE
+Route112_Text_BryantIntro:
 	.string "I caught hot POKéMON in FIERY PATH!\n"
 	.string "Take a look!$"
 
-Route112_Text_BryantDefeat: @ 8299BDF
+Route112_Text_BryantDefeat:
 	.string "What a bumpy ride that was!$"
 
-Route112_Text_BryantPostBattle: @ 8299BFB
+Route112_Text_BryantPostBattle:
 	.string "I like the way you battle.\n"
 	.string "It has a certain flair to it.$"
 
-Route112_Text_ShaylaIntro: @ 8299C34
+Route112_Text_ShaylaIntro:
 	.string "Oh, aren't you an adorable TRAINER!\n"
 	.string "Please, I need a romantic battle!\l"
 	.string "I'm somewhat decent!$"
 
-Route112_Text_ShaylaDefeat: @ 8299C8F
+Route112_Text_ShaylaDefeat:
 	.string "Oh, how strong you are!\n"
 	.string "You've given me quite a shock!$"
 
-Route112_Text_ShaylaPostBattle: @ 8299CC6
+Route112_Text_ShaylaPostBattle:
 	.string "Are you busy right now?\n"
 	.string "I was thinking that maybe we can have\l"
 	.string "a rematch right now…\l"
 	.string "But it's all right if you're busy.$"
 
-Route113_Text_JaylenIntro: @ 8299D3C
+Route113_Text_JaylenIntro:
 	.string "Can you guess why it's so cool\n"
 	.string "around here?$"
 
-Route113_Text_JaylenDefeat: @ 8299D68
+Route113_Text_JaylenDefeat:
 	.string "Peeuuw!\n"
 	.string "That stinks!$"
 
-Route113_Text_JaylenPostBattle: @ 8299D7D
+Route113_Text_JaylenPostBattle:
 	.string "The volcanic ash blocks the sun,\n"
 	.string "so it doesn't get very warm.\p"
 	.string "That's good for me--I can't stand heat!$"
 
-Route113_Text_DillonIntro: @ 8299DE3
+Route113_Text_DillonIntro:
 	.string "The volcano's eruption is proof that\n"
 	.string "the earth is alive.$"
 
-Route113_Text_DillonDefeat: @ 8299E1C
+Route113_Text_DillonDefeat:
 	.string "You're some kind of strong!$"
 
-Route113_Text_DillonPostBattle: @ 8299E38
+Route113_Text_DillonPostBattle:
 	.string "Ouch! Owww! I can't see!\n"
 	.string "I got ashes in my eyelashes!\p"
 	.string "Get it? Ashes and eyelashes?\p"
 	.string "Okay, that was bad, sorry…$"
 
-Route113_Text_MadelineIntro: @ 8299EA6
+Route113_Text_MadelineIntro:
 	.string "I use this parasol to ward off this\n"
 	.string "filthy, yucky volcanic ash from\l"
 	.string "my dear NUMEL.$"
 
-Route113_Text_MadelineDefeat: @ 8299EF9
+Route113_Text_MadelineDefeat:
 	.string "Huff, huff…\n"
 	.string "I am exhausted…$"
 
-Route113_Text_MadelinePostBattle: @ 8299F15
+Route113_Text_MadelinePostBattle:
 	.string "You're very good at this.\n"
 	.string "I must say I'm impressed!$"
 
-Route113_Text_MadelineRegister: @ 8299F49
+Route113_Text_MadelineRegister:
 	.string "Here, slide under my parasol.\n"
 	.string "Let me register you in my POKéNAV.$"
 
-Route113_Text_MadelineRematchIntro: @ 8299F8A
+Route113_Text_MadelineRematchIntro:
 	.string "Oh, hello, hasn't it been a while?\n"
 	.string "May I invite you to battle?$"
 
-Route113_Text_MadelineRematchDefeat: @ 8299FC9
+Route113_Text_MadelineRematchDefeat:
 	.string "Oh, how super!$"
 
-Route113_Text_MadelinePostRematch: @ 8299FD8
+Route113_Text_MadelinePostRematch:
 	.string "You've remained very good at this.\n"
 	.string "I must say I'm impressed!$"
 
-Route113_Text_LaoIntro: @ 829A015
+Route113_Text_LaoIntro:
 	.string "From out of the ashes I leap! Hiyah!\n"
 	.string "I challenge thee!$"
 
-Route113_Text_LaoDefeat: @ 829A04C
+Route113_Text_LaoDefeat:
 	.string "With honor I admit defeat!$"
 
-Route113_Text_LaoPostBattle: @ 829A067
+Route113_Text_LaoPostBattle:
 	.string "I must refine the art of concealment.\n"
 	.string "I bid thee farewell.$"
 
-Route113_Text_LaoRegister: @ 829A0A2
+Route113_Text_LaoRegister:
 	.string "Yiiyaah! Witness the ancient ninja\n"
 	.string "technique of POKéNAV registration!$"
 
-Route113_Text_LaoRematchIntro: @ 829A0E8
+Route113_Text_LaoRematchIntro:
 	.string "From out of the ashes I leap! Hiyah!\n"
 	.string "I challenge thee!$"
 
-Route113_Text_LaoRematchDefeat: @ 829A11F
+Route113_Text_LaoRematchDefeat:
 	.string "With honor I admit defeat!$"
 
-Route113_Text_LaoPostRematch: @ 829A13A
+Route113_Text_LaoPostRematch:
 	.string "My flawless concealment was let down\n"
 	.string "by my immature battle skills…\p"
 	.string "I bid thee farewell.$"
 
-Route113_Text_LungIntro: @ 829A192
+Route113_Text_LungIntro:
 	.string "Thanks for finding me!\n"
 	.string "But we still have to battle!$"
 
-Route113_Text_LungDefeat: @ 829A1C6
+Route113_Text_LungDefeat:
 	.string "I'll use my ninjutsu on you…\n"
 	.string "“VOLCANIC ASH SWIRL CLOAK”!\p"
 	.string "…What?\n"
 	.string "It's already over?$"
 
-Route113_Text_LungPostBattle: @ 829A219
+Route113_Text_LungPostBattle:
 	.string "You know what's crummy about hiding?\n"
 	.string "It's lonely if no one comes along.$"
 
-Route113_Text_ToriIntro: @ 829A261
+Route113_Text_ToriIntro:
 	.string "TORI: Both of us, we collect ashes.\n"
 	.string "We battle POKéMON, too.$"
 
-Route113_Text_ToriDefeat: @ 829A29D
+Route113_Text_ToriDefeat:
 	.string "TORI: We lost… It's boring, so I'm going\n"
 	.string "to get some more ashes.$"
 
-Route113_Text_ToriPostBattle: @ 829A2DE
+Route113_Text_ToriPostBattle:
 	.string "TORI: How much ash do we have?\n"
 	.string "Enough for a WHITE FLUTE, I hope.$"
 
-Route113_Text_ToriNotEnoughMons: @ 829A31F
+Route113_Text_ToriNotEnoughMons:
 	.string "TORI: We want to battle 2-on-2.\n"
 	.string "If we didn't, we would lose!$"
 
-Route113_Text_TiaIntro: @ 829A35C
+Route113_Text_TiaIntro:
 	.string "TIA: Both of us, we collect ashes.\n"
 	.string "We battle POKéMON, too.$"
 
-Route113_Text_TiaDefeat: @ 829A397
+Route113_Text_TiaDefeat:
 	.string "TIA: We couldn't win… It's boring,\n"
 	.string "so I'm getting some more ashes.$"
 
-Route113_Text_TiaPostBattle: @ 829A3DA
+Route113_Text_TiaPostBattle:
 	.string "TIA: We have a lot of ashes!\n"
 	.string "I think enough for a WHITE FLUTE!$"
 
-Route113_Text_TiaNotEnoughMons: @ 829A419
+Route113_Text_TiaNotEnoughMons:
 	.string "TIA: We want to battle 2-on-2.\n"
 	.string "If we don't, we won't win!$"
 
-Route113_Text_CobyIntro: @ 829A453
+Route113_Text_CobyIntro:
 	.string "Pfft, with these wings I can\n"
 	.string "flick you away!$"
 
-Route113_Text_CobyDefeat: @ 829A480
+Route113_Text_CobyDefeat:
 	.string "A… What?$"
 
-Route113_Text_CobyPostBattle: @ 829A489
+Route113_Text_CobyPostBattle:
 	.string "I don't know what to say when I get\n"
 	.string "beaten so easily…$"
 
-Route113_Text_SophieIntro: @ 829A4BF
+Route113_Text_SophieIntro:
 	.string "The warmth here is making me drowsy.\n"
 	.string "Battle with me so I can stay awake.$"
 
-Route113_Text_SophieDefeat: @ 829A508
+Route113_Text_SophieDefeat:
 	.string "This is a dream.\n"
 	.string "I'm sure of it…$"
 
-Route113_Text_SophiePostBattle: @ 829A529
+Route113_Text_SophiePostBattle:
 	.string "Losing burns me up…\n"
 	.string "I'm just going to sleep right here!\l"
 	.string "Zzz!$"
 
-Route113_Text_LawrenceIntro: @ 829A566
+Route113_Text_LawrenceIntro:
 	.string "Were you maybe in the middle\n"
 	.string "of gathering volcanic ashes?$"
 
-Route113_Text_LawrenceDefeat: @ 829A5A0
+Route113_Text_LawrenceDefeat:
 	.string "Ehehe.\n"
 	.string "We got beaten cleanly.$"
 
-Route113_Text_LawrencePostBattle: @ 829A5BE
+Route113_Text_LawrencePostBattle:
 	.string "I ought to hide under the ashes, too.$"
 
-Route113_Text_WyattIntro: @ 829A5E4
+Route113_Text_WyattIntro:
 	.string "Y-you want to battle with me?\n"
 	.string "Even though I just caught my POKéMON?$"
 
-Route113_Text_WyattDefeat: @ 829A628
+Route113_Text_WyattDefeat:
 	.string "Y-you're all happy to win?\n"
 	.string "Even though it's only me?$"
 
-Route113_Text_WyattPostBattle: @ 829A65D
+Route113_Text_WyattPostBattle:
 	.string "Oh, so now you want to say a word to\n"
 	.string "the loser?\p"
 	.string "Aren't you just the coolest?\n"
 	.string "Humph!$"
 
-Route114_Text_LennyIntro: @ 829A6B1
+Route114_Text_LennyIntro:
 	.string "Yodelayhihoo!\p"
 	.string "… …\p"
 	.string "You're supposed to shout\n"
 	.string "“yodelayhihoo” since it doesn't\l"
 	.string "echo here!$"
 
-Route114_Text_LennyDefeat: @ 829A707
+Route114_Text_LennyDefeat:
 	.string "Yodelayhihoo!$"
 
-Route114_Text_LennyPostBattle: @ 829A715
+Route114_Text_LennyPostBattle:
 	.string "When I was a wee tyke, I believed there\n"
 	.string "was someone copying me and shouting\l"
 	.string "back, “Yodelayhihoo.”$"
 
-Route114_Text_LucasIntro: @ 829A777
+Route114_Text_LucasIntro:
 	.string "If you're not prepared, you shouldn't\n"
 	.string "be up in the mountains!$"
 
-Route114_Text_LucasDefeat: @ 829A7B5
+Route114_Text_LucasDefeat:
 	.string "The mountains are unforgiving…$"
 
-Route114_Text_LucasPostBattle: @ 829A7D4
+Route114_Text_LucasPostBattle:
 	.string "In the winter, mountains turn deadly\n"
 	.string "with blizzards and avalanches.$"
 
-Route114_Text_ShaneIntro: @ 829A818
+Route114_Text_ShaneIntro:
 	.string "Camping's fun! You can fish, roast\n"
 	.string "marshmallows, and tell spooky stories!\p"
 	.string "But the best of all are the POKéMON\n"
 	.string "battles!$"
 
-Route114_Text_ShaneDefeat: @ 829A88F
+Route114_Text_ShaneDefeat:
 	.string "Way too strong!$"
 
-Route114_Text_ShanePostBattle: @ 829A89F
+Route114_Text_ShanePostBattle:
 	.string "I think it's great that I can go\n"
 	.string "camping with my POKéMON.$"
 
-Route114_Text_NancyIntro: @ 829A8D9
+Route114_Text_NancyIntro:
 	.string "I need to exercise after a meal.\n"
 	.string "Let's have a match!$"
 
-Route114_Text_NancyDefeat: @ 829A90E
+Route114_Text_NancyDefeat:
 	.string "Oh, no!$"
 
-Route114_Text_NancyPostBattle: @ 829A916
+Route114_Text_NancyPostBattle:
 	.string "I just had a tasty meal.\n"
 	.string "I'm getting drowsy…$"
 
-Route114_Text_SteveIntro: @ 829A943
+Route114_Text_SteveIntro:
 	.string "Ufufufufufu…\n"
 	.string "Want to battle against my POKéMON?$"
 
-Route114_Text_SteveDefeat: @ 829A973
+Route114_Text_SteveDefeat:
 	.string "M-My POKéMON…$"
 
-Route114_Text_StevePostBattle: @ 829A981
+Route114_Text_StevePostBattle:
 	.string "A big body that's all lumpy and hard,\n"
 	.string "enormous horns, and vicious fangs…\p"
 	.string "Ufufufufu…\n"
 	.string "I wish I had a POKéMON like that…$"
 
-Route114_Text_SteveRegister: @ 829A9F7
+Route114_Text_SteveRegister:
 	.string "Don't forget what you've done to me!\n"
 	.string "I'll make it so you can't forget!$"
 
-Route114_Text_SteveRematchIntro: @ 829AA3E
+Route114_Text_SteveRematchIntro:
 	.string "Ufufufufufu…\n"
 	.string "Come on, battle my POKéMON…$"
 
-Route114_Text_SteveRematchDefeat: @ 829AA67
+Route114_Text_SteveRematchDefeat:
 	.string "I feel so lucky getting to see your\n"
 	.string "POKéMON…$"
 
-Route114_Text_StevePostRematch: @ 829AA94
+Route114_Text_StevePostRematch:
 	.string "Ufufufufufu…\p"
 	.string "When I see POKéMON battling, I get all\n"
 	.string "shivery and shaky…$"
 
-Route114_Text_BernieIntro: @ 829AADB
+Route114_Text_BernieIntro:
 	.string "If you're lighting a campfire,\n"
 	.string "make sure you have water handy.$"
 
-Route114_Text_BernieDefeat: @ 829AB1A
+Route114_Text_BernieDefeat:
 	.string "Thanks for dousing my fire!$"
 
-Route114_Text_BerniePostBattle: @ 829AB36
+Route114_Text_BerniePostBattle:
 	.string "You really do have to be careful with\n"
 	.string "any sort of fire in a forest.\p"
 	.string "Don't ever underestimate the power\n"
 	.string "of fire.$"
 
-Route114_Text_BernieRegister: @ 829ABA6
+Route114_Text_BernieRegister:
 	.string "You set my spirit on fire.\n"
 	.string "Let's register each other!$"
 
-Route114_Text_BernieRematchIntro: @ 829ABDC
+Route114_Text_BernieRematchIntro:
 	.string "Have you learned to keep water handy\n"
 	.string "for campfires?$"
 
-Route114_Text_BernieRematchDefeat: @ 829AC10
+Route114_Text_BernieRematchDefeat:
 	.string "I got hosed down before I could\n"
 	.string "flare up, I guess.$"
 
-Route114_Text_BerniePostRematch: @ 829AC43
+Route114_Text_BerniePostRematch:
 	.string "You really do have to be careful with\n"
 	.string "any sort of fire in a forest.\p"
 	.string "Don't ever underestimate the power\n"
 	.string "of fire.$"
 
-Route114_Text_ClaudeIntro: @ 829ACB3
+Route114_Text_ClaudeIntro:
 	.string "If we were fishing, you wouldn't stand\n"
 	.string "a chance against me.\l"
 	.string "So, bring on your POKéMON!$"
 
-Route114_Text_ClaudeDefeat: @ 829AD0A
+Route114_Text_ClaudeDefeat:
 	.string "If we were fishing, I would've won…$"
 
-Route114_Text_ClaudePostBattle: @ 829AD2E
+Route114_Text_ClaudePostBattle:
 	.string "I think I'll try my luck at landing\n"
 	.string "a big one at METEOR FALLS.\p"
 	.string "There has to be something in there.\n"
 	.string "I just know it.$"
 
-Route114_Text_NolanIntro: @ 829ADA1
+Route114_Text_NolanIntro:
 	.string "I like to fish. But I also like to\n"
 	.string "battle!\p"
 	.string "If anyone challenges me, I'm there,\n"
 	.string "even if I'm fishing.$"
 
-Route114_Text_NolanDefeat: @ 829AE05
+Route114_Text_NolanDefeat:
 	.string "I like to battle, but that doesn't\n"
 	.string "mean I'm good at it…$"
 
-Route114_Text_NolanPostBattle: @ 829AE3D
+Route114_Text_NolanPostBattle:
 	.string "This time I'll do it!\p"
 	.string "I always think that, so I can't walk\n"
 	.string "away from fishing or POKéMON.$"
 
-Route114_Text_TyraIntro: @ 829AE96
+Route114_Text_TyraIntro:
 	.string "TYRA: Well, sure.\n"
 	.string "I'm in the mood for it.\l"
 	.string "I'll teach you a little about POKéMON.$"
 
-Route114_Text_TyraDefeat: @ 829AEE7
+Route114_Text_TyraDefeat:
 	.string "TYRA: What an amazing battle style!$"
 
-Route114_Text_TyraPostBattle: @ 829AF0B
+Route114_Text_TyraPostBattle:
 	.string "TYRA: I was teaching my junior IVY\n"
 	.string "about POKéMON.$"
 
-Route114_Text_TyraNotEnoughMons: @ 829AF3D
+Route114_Text_TyraNotEnoughMons:
 	.string "TYRA: Giggle…\n"
 	.string "If you want to battle with us, just one\l"
 	.string "POKéMON isn't enough!$"
 
-Route114_Text_IvyIntro: @ 829AF89
+Route114_Text_IvyIntro:
 	.string "IVY: Who taught you about POKéMON?$"
 
-Route114_Text_IvyDefeat: @ 829AFAC
+Route114_Text_IvyDefeat:
 	.string "IVY: What an amazing battle style!$"
 
-Route114_Text_IvyPostBattle: @ 829AFCF
+Route114_Text_IvyPostBattle:
 	.string "IVY: I started training POKéMON\n"
 	.string "because TYRA, my student mentor,\l"
 	.string "taught me!$"
 
-Route114_Text_IvyNotEnoughMons: @ 829B01B
+Route114_Text_IvyNotEnoughMons:
 	.string "IVY: Do you only have one POKéMON?\n"
 	.string "I think it must feel lonesome.$"
 
-Route114_Text_KaiIntro: @ 829B05D
+Route114_Text_KaiIntro:
 	.string "I landed a big one!\n"
 	.string "A huge one, I tell you!$"
 
-Route114_Text_KaiDefeat: @ 829B089
+Route114_Text_KaiDefeat:
 	.string "What was that about?\n"
 	.string "Did mine lose in size?$"
 
-Route114_Text_KaiPostBattle: @ 829B0B5
+Route114_Text_KaiPostBattle:
 	.string "Okay!\n"
 	.string "I'll just fish me a bigger one!$"
 
-Route114_Text_CharlotteIntro: @ 829B0DB
+Route114_Text_CharlotteIntro:
 	.string "Me!\n"
 	.string "I'm not just a pretty face!$"
 
-Route114_Text_CharlotteDefeat: @ 829B0FB
+Route114_Text_CharlotteDefeat:
 	.string "That wasn't cute in the least!$"
 
-Route114_Text_CharlottePostBattle: @ 829B11A
+Route114_Text_CharlottePostBattle:
 	.string "I don't want a POKéMON that's\n"
 	.string "just cute.\p"
 	.string "I adore cute ones that have a quirk\n"
 	.string "or two!$"
 
-Route114_Text_AngelinaIntro: @ 829B16F
+Route114_Text_AngelinaIntro:
 	.string "Have you made your POKéMON evolve\n"
 	.string "very much?$"
 
-Route114_Text_AngelinaDefeat: @ 829B19C
+Route114_Text_AngelinaDefeat:
 	.string "Oh, I see.\n"
 	.string "That's good to know.$"
 
-Route114_Text_AngelinaPostBattle: @ 829B1BC
+Route114_Text_AngelinaPostBattle:
 	.string "Some POKéMON change so much when\n"
 	.string "they evolve, it's startling!$"
 
-Route115_Text_TimothyIntro: @ 829B1FA
+Route115_Text_TimothyIntro:
 	.string "Hm…\n"
 	.string "You seem rather capable…\l"
 	.string "Let me keep you company!$"
 
-Route115_Text_TimothyDefeat: @ 829B230
+Route115_Text_TimothyDefeat:
 	.string "You're much stronger than\n"
 	.string "I'd imagined!$"
 
-Route115_Text_TimothyPostBattle: @ 829B258
+Route115_Text_TimothyPostBattle:
 	.string "There is no such thing as a born genius.\n"
 	.string "It all depends on effort!\l"
 	.string "That is what I believe…$"
 
-Route115_Text_TimothyRegister: @ 829B2B3
+Route115_Text_TimothyRegister:
 	.string "Hmm… A loss this thorough has been\n"
 	.string "a distant memory.\p"
 	.string "If you would allow it, I wish for\n"
 	.string "another opportunity to do battle.$"
 
-Route115_Text_TimothyRematchIntro: @ 829B32C
+Route115_Text_TimothyRematchIntro:
 	.string "Hm… As always, your agility speaks\n"
 	.string "for itself.\l"
 	.string "Come, keep me company!$"
 
-Route115_Text_TimothyRematchDefeat: @ 829B372
+Route115_Text_TimothyRematchDefeat:
 	.string "As strong as ever!$"
 
-Route115_Text_TimothyPostRematch: @ 829B385
+Route115_Text_TimothyPostRematch:
 	.string "All it takes is effort!\p"
 	.string "I lost because I haven't put in enough\n"
 	.string "effort!$"
 
-Route115_Text_KoichiIntro: @ 829B3CC
+Route115_Text_KoichiIntro:
 	.string "You!\p"
 	.string "My MACHOP!\p"
 	.string "Demand a battle!$"
 
-Route115_Text_KoichiDefeat: @ 829B3ED
+Route115_Text_KoichiDefeat:
 	.string "Ouch, ouch, ouch!$"
 
-Route115_Text_KoichiPostBattle: @ 829B3FF
+Route115_Text_KoichiPostBattle:
 	.string "My MACHOP crew!\p"
 	.string "So long as they seek power, I will\n"
 	.string "grow strong with them!$"
 
-Route115_Text_NobIntro: @ 829B449
+Route115_Text_NobIntro:
 	.string "My strongest skill is busting bricks\n"
 	.string "with my forehead!$"
 
-Route115_Text_NobDefeat: @ 829B480
+Route115_Text_NobDefeat:
 	.string "Ugwaaaah!\n"
 	.string "My head is busted!$"
 
-Route115_Text_NobPostBattle: @ 829B49D
+Route115_Text_NobPostBattle:
 	.string "I've been teaching my POKéMON karate.\p"
 	.string "It looks like they'll get a lot better\n"
 	.string "than me. I'm excited about that.$"
 
-Route115_Text_NobRegister: @ 829B50B
+Route115_Text_NobRegister:
 	.string "You impress me! Give me a rematch\n"
 	.string "after I redo my training!$"
 
-Route115_Text_NobRematchIntro: @ 829B547
+Route115_Text_NobRematchIntro:
 	.string "After you beat me, we trained hard to\n"
 	.string "improve our skills.\l"
 	.string "Come on, give us a rematch!$"
 
-Route115_Text_NobRematchDefeat: @ 829B59D
+Route115_Text_NobRematchDefeat:
 	.string "Ugwaaah!\n"
 	.string "We lost again!$"
 
-Route115_Text_NobPostRematch: @ 829B5B5
+Route115_Text_NobPostRematch:
 	.string "My POKéMON will grow stronger!\n"
 	.string "I'll redouble my training!$"
 
-Route115_Text_CyndyIntro: @ 829B5EF
+Route115_Text_CyndyIntro:
 	.string "This beach is my secret training spot!\n"
 	.string "Don't come butting in!$"
 
-Route115_Text_CyndyDefeat: @ 829B62D
+Route115_Text_CyndyDefeat:
 	.string "I haven't trained enough!$"
 
-Route115_Text_CyndyPostBattle: @ 829B647
+Route115_Text_CyndyPostBattle:
 	.string "The sand acts as a cushion to reduce\n"
 	.string "impact and prevent injury.\l"
 	.string "This is the perfect place to train.$"
 
-Route115_Text_CyndyRegister: @ 829B6AB
+Route115_Text_CyndyRegister:
 	.string "Okay, fine, you're free to come here.\n"
 	.string "In return, I'd like to battle you again.$"
 
-Route115_Text_CyndyRematchIntro: @ 829B6FA
+Route115_Text_CyndyRematchIntro:
 	.string "Okay, let's get this battle on!$"
 
-Route115_Text_CyndyRematchDefeat: @ 829B71A
+Route115_Text_CyndyRematchDefeat:
 	.string "I can battle but my POKéMON…$"
 
-Route115_Text_CyndyPostRematch: @ 829B737
+Route115_Text_CyndyPostRematch:
 	.string "Even when I lose, I still get some\n"
 	.string "enjoyment out of it.\l"
 	.string "It must be that I love POKéMON.$"
 
-Route115_Text_HectorIntro: @ 829B78F
+Route115_Text_HectorIntro:
 	.string "I have a rare POKéMON!\n"
 	.string "Would you like me to show you?$"
 
-Route115_Text_HectorDefeat: @ 829B7C5
+Route115_Text_HectorDefeat:
 	.string "You…\n"
 	.string "You want my POKéMON, don't you?$"
 
-Route115_Text_HectorPostBattle: @ 829B7EA
+Route115_Text_HectorPostBattle:
 	.string "I have this rare POKéMON.\n"
 	.string "It's enough to keep me satisfied.$"
 
-Route115_Text_KyraIntro: @ 829B826
+Route115_Text_KyraIntro:
 	.string "I'll battle while I'm running!\n"
 	.string "Try to keep up with me!$"
 
-Route115_Text_KyraDefeat: @ 829B85D
+Route115_Text_KyraDefeat:
 	.string "Gasp, gasp…$"
 
-Route115_Text_KyraPostBattle: @ 829B869
+Route115_Text_KyraPostBattle:
 	.string "I made the mistake of trying to battle\n"
 	.string "while running!\p"
 	.string "I should take a run to calm down…$"
 
-Route115_Text_JaidenIntro: @ 829B8C1
+Route115_Text_JaidenIntro:
 	.string "Take that!\n"
 	.string "Ultra POKéMON ninja attack!$"
 
-Route115_Text_JaidenDefeat: @ 829B8E8
+Route115_Text_JaidenDefeat:
 	.string "Waaah!\n"
 	.string "Our strategy failed!$"
 
-Route115_Text_JaidenPostBattle: @ 829B904
+Route115_Text_JaidenPostBattle:
 	.string "But my POKéMON were ultra,\n"
 	.string "weren't they?$"
 
-Route115_Text_HeleneIntro: @ 829B92D
+Route115_Text_HeleneIntro:
 	.string "My POKéMON have black belt-level\n"
 	.string "strength!$"
 
-Route115_Text_HeleneDefeat: @ 829B958
+Route115_Text_HeleneDefeat:
 	.string "This is too humiliating!$"
 
-Route115_Text_HelenePostBattle: @ 829B971
+Route115_Text_HelenePostBattle:
 	.string "I rarely meet anyone who's better\n"
 	.string "than me…\p"
 	.string "I get it now!\n"
 	.string "You're a GYM LEADER, aren't you?$"
 
-Route115_Text_AlixIntro: @ 829B9CB
+Route115_Text_AlixIntro:
 	.string "Our eyes met!\n"
 	.string "There's no getting away now!$"
 
-Route115_Text_AlixDefeat: @ 829B9F6
+Route115_Text_AlixDefeat:
 	.string "Gah!\n"
 	.string "Not bad!$"
 
-Route115_Text_AlixPostBattle: @ 829BA04
+Route115_Text_AlixPostBattle:
 	.string "Oh, well.\n"
 	.string "I think I will TELEPORT home.$"
 
-Route115_Text_MarleneIntro: @ 829BA2C
+Route115_Text_MarleneIntro:
 	.string "You've disturbed my meditation…\n"
 	.string "You'll be punished for it.$"
 
-Route115_Text_MarleneDefeat: @ 829BA67
+Route115_Text_MarleneDefeat:
 	.string "You've broken my concentration!$"
 
-Route115_Text_MarlenePostBattle: @ 829BA87
+Route115_Text_MarlenePostBattle:
 	.string "I was meditating with my POKéMON.\n"
 	.string "But this place isn't very peaceful…$"
 
-Route116_Text_ClarkIntro: @ 829BACD
+Route116_Text_ClarkIntro:
 	.string "If the tunnel doesn't go through, then\n"
 	.string "I'll just go over the top.$"
 
-Route116_Text_ClarkDefeat: @ 829BB0F
+Route116_Text_ClarkDefeat:
 	.string "Gasp… Gasp…\n"
 	.string "Losing made me tired…$"
 
-Route116_Text_ClarkPostBattle: @ 829BB31
+Route116_Text_ClarkPostBattle:
 	.string "It's no big deal if there's no tunnel.\n"
 	.string "To a HIKER, mountains are roads!$"
 
-Route116_Text_JoeyIntro: @ 829BB79
+Route116_Text_JoeyIntro:
 	.string "My POKéMON rule!\n"
 	.string "Check them out!$"
 
-Route116_Text_JoeyDefeat: @ 829BB9A
+Route116_Text_JoeyDefeat:
 	.string "Ouch! A scrape!\n"
 	.string "I have to put on a bandage!$"
 
-Route116_Text_JoeyPostBattle: @ 829BBC6
+Route116_Text_JoeyPostBattle:
 	.string "Bandages are signs of toughness!\n"
 	.string "I've got another one!$"
 
-Route116_Text_JoseIntro: @ 829BBFD
+Route116_Text_JoseIntro:
 	.string "My BUG POKéMON are tough!\n"
 	.string "Let's battle!$"
 
-Route116_Text_JoseDefeat: @ 829BC25
+Route116_Text_JoseDefeat:
 	.string "I lost!\n"
 	.string "I thought I had you!$"
 
-Route116_Text_JosePostBattle: @ 829BC42
+Route116_Text_JosePostBattle:
 	.string "BUG POKéMON evolve quickly.\n"
 	.string "So they get strong quickly, too.$"
 
-Route116_Text_JaniceIntro: @ 829BC7F
+Route116_Text_JaniceIntro:
 	.string "Let me teach you how strong my\n"
 	.string "adorable POKéMON is!$"
 
-Route116_Text_JaniceDefeat: @ 829BCB3
+Route116_Text_JaniceDefeat:
 	.string "You're a notch above me…$"
 
-Route116_Text_JanicePostBattle: @ 829BCCC
+Route116_Text_JanicePostBattle:
 	.string "POKéMON that possess cuteness and\n"
 	.string "power, that's ideal, I think.$"
 
-Route116_Text_JerryIntro: @ 829BD0C
+Route116_Text_JerryIntro:
 	.string "We learn all sorts of things at the\n"
 	.string "TRAINER'S SCHOOL.\p"
 	.string "I want to test things out for real!$"
 
-Route116_Text_JerryDefeat: @ 829BD66
+Route116_Text_JerryDefeat:
 	.string "I slacked off in school…\n"
 	.string "That's why I lost.$"
 
-Route116_Text_JerryPostBattle: @ 829BD92
+Route116_Text_JerryPostBattle:
 	.string "I'll have to redo some courses at\n"
 	.string "the TRAINER'S SCHOOL.\l"
 	.string "If I don't, ROXANNE will be steamed.$"
 
-Route116_Text_JerryRegister1: @ 829BDEF
+Route116_Text_JerryRegister1:
 	.string "I learned at the TRAINER'S SCHOOL\n"
 	.string "that a POKéNAV can register TRAINERS.\p"
 	.string "I don't really get what that means,\n"
 	.string "so can I just try it?$"
 
-Route116_Text_JerryRegister2: @ 829BE71
+Route116_Text_JerryRegister2:
 	.string "I learned at the TRAINER'S SCHOOL\n"
 	.string "that a POKéNAV can register TRAINERS.\p"
 	.string "I don't really get what that means,\n"
 	.string "so can I just try it?$"
 
-Route116_Text_JerryRematchIntro: @ 829BEF3
+Route116_Text_JerryRematchIntro:
 	.string "I've been studying seriously at the\n"
 	.string "TRAINER'S SCHOOL.\l"
 	.string "I won't lose like I did last time.$"
 
-Route116_Text_JerryRematchDefeat: @ 829BF4C
+Route116_Text_JerryRematchDefeat:
 	.string "Hunh?\n"
 	.string "I studied diligently.$"
 
-Route116_Text_JerryPostRematch: @ 829BF68
+Route116_Text_JerryPostRematch:
 	.string "I'll have to redo some courses at\n"
 	.string "the TRAINER'S SCHOOL.\l"
 	.string "If I don't, ROXANNE will be steamed.$"
 
-Route116_Text_KarenIntro: @ 829BFC5
+Route116_Text_KarenIntro:
 	.string "I study at school, and I study on\n"
 	.string "the way home, too!$"
 
-Route116_Text_KarenDefeat: @ 829BFFA
+Route116_Text_KarenDefeat:
 	.string "I'm in shock--I lost?$"
 
-Route116_Text_KarenPostBattle: @ 829C010
+Route116_Text_KarenPostBattle:
 	.string "Awww, I'll never become an elegant\n"
 	.string "TRAINER like ROXANNE this way!$"
 
-Route116_Text_KarenRegister1: @ 829C052
+Route116_Text_KarenRegister1:
 	.string "Oh, wow! Isn't that a POKéNAV?\n"
 	.string "I have one, too! Please register me!$"
 
-Route116_Text_KarenRegister2: @ 829C096
+Route116_Text_KarenRegister2:
 	.string "Oh, wow! Isn't that a POKéNAV?\n"
 	.string "I have one, too! Please register me!$"
 
-Route116_Text_KarenRematchIntro: @ 829C0DA
+Route116_Text_KarenRematchIntro:
 	.string "I studied a whole lot since I saw you.\n"
 	.string "You must see my achievements!$"
 
-Route116_Text_KarenRematchDefeat: @ 829C11F
+Route116_Text_KarenRematchDefeat:
 	.string "I'm in shock.\n"
 	.string "I lost again?$"
 
-Route116_Text_KarenPostRematch: @ 829C13B
+Route116_Text_KarenPostRematch:
 	.string "You've beaten ROXANNE?\n"
 	.string "I can't beat you, then. Not yet.$"
 
-Route116_Text_SarahIntro: @ 829C173
+Route116_Text_SarahIntro:
 	.string "Just so you know, I've never once been\n"
 	.string "bested by anyone at anything.$"
 
-Route116_Text_SarahDefeat: @ 829C1B8
+Route116_Text_SarahDefeat:
 	.string "Oh, my goodness.\n"
 	.string "This is a new experience for me.$"
 
-Route116_Text_SarahPostBattle: @ 829C1EA
+Route116_Text_SarahPostBattle:
 	.string "My life of luxury affords me all that\n"
 	.string "I could possibly desire.\p"
 	.string "However, when it comes to POKéMON,\n"
 	.string "my wealth has no meaning.$"
 
-Route116_Text_DawsonIntro: @ 829C266
+Route116_Text_DawsonIntro:
 	.string "When you lay your eyes on my POKéMON's\n"
 	.string "gorgeous fur, their beauty will render\l"
 	.string "you helpless!$"
 
-Route116_Text_DawsonDefeat: @ 829C2C2
+Route116_Text_DawsonDefeat:
 	.string "Oh, baby, say it isn't so!$"
 
-Route116_Text_DawsonPostBattle: @ 829C2DD
+Route116_Text_DawsonPostBattle:
 	.string "Oh, no, no, no!\n"
 	.string "You've mussed up my POKéMON's fur!\l"
 	.string "You've ruined my hairdo, too!\l"
 	.string "I'll have to call my stylist now!$"
 
-Route116_Text_DevanIntro: @ 829C350
+Route116_Text_DevanIntro:
 	.string "We'll rock you hard!$"
 
-Route116_Text_DevanDefeat: @ 829C365
+Route116_Text_DevanDefeat:
 	.string "Aiyiyi!\n"
 	.string "No contest at all!$"
 
-Route116_Text_DevanPostBattle: @ 829C380
+Route116_Text_DevanPostBattle:
 	.string "I should try different POKéMON\n"
 	.string "types, that's what I ought to do.$"
 
-Route116_Text_JohnsonIntro: @ 829C3C1
+Route116_Text_JohnsonIntro:
 	.string "It's a dead end up here.\n"
 	.string "I'm bored, so can we battle?$"
 
-Route116_Text_JohnsonDefeat: @ 829C3F7
+Route116_Text_JohnsonDefeat:
 	.string "That was fun even though I lost.$"
 
-Route116_Text_JohnsonPostBattle: @ 829C418
+Route116_Text_JohnsonPostBattle:
 	.string "Want to stay here and keep\n"
 	.string "me company?$"
 
-Route117_Text_IsaacIntro: @ 829C43F
+Route117_Text_IsaacIntro:
 	.string "Listen, could I get you to battle\n"
 	.string "the POKéMON I'm raising?$"
 
-Route117_Text_IsaacDefeat: @ 829C47A
+Route117_Text_IsaacDefeat:
 	.string "You've raised yours superbly…$"
 
-Route117_Text_IsaacPostBattle: @ 829C498
+Route117_Text_IsaacPostBattle:
 	.string "POKéMON isn't all about power.\p"
 	.string "Polishing a unique aspect of one's\n"
 	.string "character is another way of enjoying\l"
 	.string "POKéMON.$"
 
-Route117_Text_IsaacRegister: @ 829C508
+Route117_Text_IsaacRegister:
 	.string "I'm going to redouble my training.\n"
 	.string "Would you come look in on us?$"
 
-Route117_Text_IsaacRematchIntro: @ 829C549
+Route117_Text_IsaacRematchIntro:
 	.string "The POKéMON I've been raising are\n"
 	.string "looking good, just like before.$"
 
-Route117_Text_IsaacRematchDefeat: @ 829C58B
+Route117_Text_IsaacRematchDefeat:
 	.string "You know how to raise them properly.\n"
 	.string "You might have DAY CARE skills…$"
 
-Route117_Text_IsaacPostRematch: @ 829C5D0
+Route117_Text_IsaacPostRematch:
 	.string "Your POKéMON are growing good!\n"
 	.string "You should enter them in CONTESTS.$"
 
-Route117_Text_LydiaIntro: @ 829C612
+Route117_Text_LydiaIntro:
 	.string "Please, allow me to evaluate if you\n"
 	.string "have raised your POKéMON properly.$"
 
-Route117_Text_LydiaDefeat: @ 829C659
+Route117_Text_LydiaDefeat:
 	.string "Yes, they are growing properly.$"
 
-Route117_Text_LydiaPostBattle: @ 829C679
+Route117_Text_LydiaPostBattle:
 	.string "Try raising POKéMON with more\n"
 	.string "attention to their character traits.$"
 
-Route117_Text_LydiaRegister: @ 829C6BC
+Route117_Text_LydiaRegister:
 	.string "I'm glad I met a superb TRAINER in you.\n"
 	.string "I hope to see you again.$"
 
-Route117_Text_LydiaRematchIntro: @ 829C6FD
+Route117_Text_LydiaRematchIntro:
 	.string "Allow me to reevaluate if you have\n"
 	.string "raised your POKéMON properly.$"
 
-Route117_Text_LydiaRematchDefeat: @ 829C73E
+Route117_Text_LydiaRematchDefeat:
 	.string "They are growing admirably.$"
 
-Route117_Text_LydiaPostRematch: @ 829C75A
+Route117_Text_LydiaPostRematch:
 	.string "POKéMON seem to like different kinds\n"
 	.string "of {POKEBLOCK}S, depending on their nature.$"
 
-Route117_Text_DylanIntro: @ 829C7A5
+Route117_Text_DylanIntro:
 	.string "I'm in the middle of a triathlon, but,\n"
 	.string "whatever, let's have a battle!$"
 
-Route117_Text_DylanDefeat: @ 829C7EB
+Route117_Text_DylanDefeat:
 	.string "I ran out of energy!$"
 
-Route117_Text_DylanPostBattle: @ 829C800
+Route117_Text_DylanPostBattle:
 	.string "I may have blown it…\p"
 	.string "I might have dropped to last during\n"
 	.string "that battle…$"
 
-Route117_Text_DylanRegister: @ 829C846
+Route117_Text_DylanRegister:
 	.string "POKéMON have to be strong, too?\n"
 	.string "I'd like you to train me!$"
 
-Route117_Text_DylanRematchIntro: @ 829C880
+Route117_Text_DylanRematchIntro:
 	.string "I'm smack in the middle of a triathlon,\n"
 	.string "but I'm comfortably ahead.\l"
 	.string "Let's make this a quick battle!$"
 
-Route117_Text_DylanRematchDefeat: @ 829C8E3
+Route117_Text_DylanRematchDefeat:
 	.string "I ran out of energy again!$"
 
-Route117_Text_DylanPostRematch: @ 829C8FE
+Route117_Text_DylanPostRematch:
 	.string "I was tops in swimming and cycling,\n"
 	.string "but I'm not quite that confident with\l"
 	.string "POKéMON yet.$"
 
-Route117_Text_MariaIntro: @ 829C955
+Route117_Text_MariaIntro:
 	.string "I do my triathlon training with POKéMON,\n"
 	.string "so I'm pretty confident about my speed.$"
 
-Route117_Text_MariaDefeat: @ 829C9A6
+Route117_Text_MariaDefeat:
 	.string "I need to get more practices in,\n"
 	.string "I guess.$"
 
-Route117_Text_MariaPostBattle: @ 829C9D0
+Route117_Text_MariaPostBattle:
 	.string "Training is meaningful only if you\n"
 	.string "keep it up regularly.\p"
 	.string "Okay! I'll resume my training!\n"
 	.string "Tomorrow!$"
 
-Route117_Text_MariaRegister: @ 829CA32
+Route117_Text_MariaRegister:
 	.string "You appear to be training properly…\n"
 	.string "If you'd like, I'll battle you later!$"
 
-Route117_Text_MariaRematchIntro: @ 829CA7C
+Route117_Text_MariaRematchIntro:
 	.string "Are you keeping up with your training?\n"
 	.string "I sure am!\l"
 	.string "Let me show you the evidence!$"
 
-Route117_Text_MariaRematchDefeat: @ 829CACC
+Route117_Text_MariaRematchDefeat:
 	.string "I need to get more practices in,\n"
 	.string "I guess.$"
 
-Route117_Text_MariaPostRematch: @ 829CAF6
+Route117_Text_MariaPostRematch:
 	.string "I'll resume training tomorrow.\n"
 	.string "Let's battle again sometime!$"
 
-Route117_Text_DerekIntro: @ 829CB32
+Route117_Text_DerekIntro:
 	.string "Once a BUG CATCHER!\n"
 	.string "And now a BUG MANIAC!\p"
 	.string "But my love for POKéMON remains\n"
 	.string "unchanged!$"
 
-Route117_Text_DerekDefeat: @ 829CB87
+Route117_Text_DerekDefeat:
 	.string "My ineptitude also remains\n"
 	.string "unchanged…$"
 
-Route117_Text_DerekPostBattle: @ 829CBAD
+Route117_Text_DerekPostBattle:
 	.string "All I did was follow my heart, and now\n"
 	.string "they call me a BUG MANIAC…\p"
 	.string "Still, I am an expert on BUG POKéMON,\n"
 	.string "so it's only natural that they call me\l"
 	.string "a BUG MANIAC.$"
 
-Route117_Text_AnnaIntro: @ 829CC4A
+Route117_Text_AnnaIntro:
 	.string "ANNA: I'm with my pretty junior student\n"
 	.string "partner. I have to do good!$"
 
-Route117_Text_AnnaDefeat: @ 829CC8E
+Route117_Text_AnnaDefeat:
 	.string "ANNA: I'm with my pretty junior student\n"
 	.string "partner! Let me win!$"
 
-Route117_Text_AnnaPostBattle: @ 829CCCB
+Route117_Text_AnnaPostBattle:
 	.string "ANNA: Your POKéMON have some good\n"
 	.string "combinations.\p"
 	.string "I'd say you're second only to us!$"
 
-Route117_Text_AnnaAndMegRegister: @ 829CD1D
+Route117_Text_AnnaAndMegRegister:
 	.string "ANNA: We can't take this lying down!\n"
 	.string "You will come back, won't you?$"
 
-Route117_Text_AnnaNotEnoughMons: @ 829CD61
+Route117_Text_AnnaNotEnoughMons:
 	.string "ANNA: If you want to battle us,\n"
 	.string "bring two POKéMON with you.$"
 
-Route117_Text_MegIntro: @ 829CD9D
+Route117_Text_MegIntro:
 	.string "MEG: I'm going to tag up with my super\n"
 	.string "senior student partner and beat you!$"
 
-Route117_Text_MegDefeat: @ 829CDE9
+Route117_Text_MegDefeat:
 	.string "MEG: Oh, no!\n"
 	.string "I'm sorry, ANNA! I let you down…$"
 
-Route117_Text_MegPostBattle: @ 829CE17
+Route117_Text_MegPostBattle:
 	.string "MEG: I dragged ANNA down…\n"
 	.string "If I didn't, she would have won!$"
 
-Route117_Text_MegNotEnoughMons: @ 829CE52
+Route117_Text_MegNotEnoughMons:
 	.string "MEG: Do you only have one POKéMON?\n"
 	.string "We can't battle with you, then.\p"
 	.string "We want to have a 2-on-2 battle.$"
 
-Route117_Text_AnnaRematchIntro: @ 829CEB6
+Route117_Text_AnnaRematchIntro:
 	.string "ANNA: I can't keep losing in front of\n"
 	.string "my junior partner, right?$"
 
-Route117_Text_AnnaRematchDefeat: @ 829CEF6
+Route117_Text_AnnaRematchDefeat:
 	.string "ANNA: I couldn't get into the groove.$"
 
-Route117_Text_AnnaPostRematch: @ 829CF1C
+Route117_Text_AnnaPostRematch:
 	.string "ANNA: Your POKéMON have some good\n"
 	.string "combinations.\p"
 	.string "I'd say you're second only to us!$"
 
-Route117_Text_AnnaRematchNotEnoughMons: @ 829CF6E
+Route117_Text_AnnaRematchNotEnoughMons:
 	.string "ANNA: If you want to battle us,\n"
 	.string "bring two POKéMON with you.$"
 
-Route117_Text_MegRematchIntro: @ 829CFAA
+Route117_Text_MegRematchIntro:
 	.string "MEG: I'm going to tag up with my\n"
 	.string "senior partner and win this time!$"
 
-Route117_Text_MegRematchDefeat: @ 829CFED
+Route117_Text_MegRematchDefeat:
 	.string "MEG: Too strong!$"
 
-Route117_Text_MegPostRematch: @ 829CFFE
+Route117_Text_MegPostRematch:
 	.string "MEG: I battled together with my\n"
 	.string "senior partner, but we lost…\p"
 	.string "That's so discouraging…$"
 
-Route117_Text_MegRematchNotEnoughMons: @ 829D053
+Route117_Text_MegRematchNotEnoughMons:
 	.string "MEG: Do you only have one POKéMON?\n"
 	.string "We can't battle with you, then.\p"
 	.string "We want to have a 2-on-2 battle.$"
 
-Route117_Text_MelinaIntro: @ 829D0B7
+Route117_Text_MelinaIntro:
 	.string "Isn't it nice? To battle while looking\n"
 	.string "at pretty flowers?$"
 
-Route117_Text_MelinaDefeat: @ 829D0F1
+Route117_Text_MelinaDefeat:
 	.string "Oh, that's quite impressive!$"
 
-Route117_Text_MelinaPostBattle: @ 829D10E
+Route117_Text_MelinaPostBattle:
 	.string "It feels wonderful to go for a jog\n"
 	.string "while looking at flowers.$"
 
-Route117_Text_BrandiIntro: @ 829D14B
+Route117_Text_BrandiIntro:
 	.string "Let me demonstrate the power\n"
 	.string "hidden within a PSYCHIC POKéMON!$"
 
-Route117_Text_BrandiDefeat: @ 829D189
+Route117_Text_BrandiDefeat:
 	.string "Astonishing!$"
 
-Route117_Text_BrandiPostBattle: @ 829D196
+Route117_Text_BrandiPostBattle:
 	.string "PSYCHIC POKéMON are complex.\n"
 	.string "You should try catching some.$"
 
-Route117_Text_AishaIntro: @ 829D1D1
+Route117_Text_AishaIntro:
 	.string "Concentrate on getting the win.\n"
 	.string "That's how I battle!$"
 
-Route117_Text_AishaDefeat: @ 829D206
+Route117_Text_AishaDefeat:
 	.string "I don't waste any time being angry\n"
 	.string "over a loss--I would rather train.$"
 
-Route117_Text_AishaPostBattle: @ 829D24C
+Route117_Text_AishaPostBattle:
 	.string "I think that if you worry about losing,\n"
 	.string "you're more likely to lose.$"
 
-Route118_Text_RoseIntro: @ 829D290
+Route118_Text_RoseIntro:
 	.string "The aroma of flowers has a magical\n"
 	.string "power. It cleanses us body and soul.$"
 
-Route118_Text_RoseDefeat: @ 829D2D8
+Route118_Text_RoseDefeat:
 	.string "Oh, dear me.\n"
 	.string "I seem to have lost.$"
 
-Route118_Text_RosePostBattle: @ 829D2FA
+Route118_Text_RosePostBattle:
 	.string "Flowers, POKéMON…\n"
 	.string "I love whatever smells nice.\p"
 	.string "Stinky things…\n"
 	.string "I'll pass.$"
 
-Route118_Text_RoseRegister: @ 829D343
+Route118_Text_RoseRegister:
 	.string "Sniff… That odor--it's a POKéNAV!\n"
 	.string "We must register each other!$"
 
-Route118_Text_RoseRematchIntro: @ 829D382
+Route118_Text_RoseRematchIntro:
 	.string "Were you drawn here by the sweet\n"
 	.string "aroma?$"
 
-Route118_Text_RoseRematchDefeat: @ 829D3AA
+Route118_Text_RoseRematchDefeat:
 	.string "The power of aroma…\n"
 	.string "It didn't seem to do much.$"
 
-Route118_Text_RosePostRematch: @ 829D3D9
+Route118_Text_RosePostRematch:
 	.string "If you use a sweet aroma properly,\n"
 	.string "POKéMON will be attracted by it.$"
 
-Route118_Text_PerryIntro: @ 829D41D
+Route118_Text_PerryIntro:
 	.string "BIRD POKéMON that FLY elegantly in\n"
 	.string "the sky… They're the best!$"
 
-Route118_Text_PerryDefeat: @ 829D45B
+Route118_Text_PerryDefeat:
 	.string "Urgh…\n"
 	.string "I crashed…$"
 
-Route118_Text_PerryPostBattle: @ 829D46C
+Route118_Text_PerryPostBattle:
 	.string "You've got great POKéMON.\n"
 	.string "I'll have to train mine better.$"
 
-Route118_Text_ChesterIntro: @ 829D4A6
+Route118_Text_ChesterIntro:
 	.string "Take flight!\n"
 	.string "My BIRD POKéMON!$"
 
-Route118_Text_ChesterDefeat: @ 829D4C4
+Route118_Text_ChesterDefeat:
 	.string "They did take flight…$"
 
-Route118_Text_ChesterPostBattle: @ 829D4DA
+Route118_Text_ChesterPostBattle:
 	.string "If they'd get stronger, they'd be able\n"
 	.string "to fly more freely…$"
 
-Route118_Text_BarnyIntro: @ 829D515
+Route118_Text_BarnyIntro:
 	.string "I'm a FISHERMAN, but also a TRAINER.\n"
 	.string "I'm raising the POKéMON I caught.$"
 
-Route118_Text_BarnyDefeat: @ 829D55C
+Route118_Text_BarnyDefeat:
 	.string "I thought I was doing okay in my\n"
 	.string "training…$"
 
-Route118_Text_BarnyPostBattle: @ 829D587
+Route118_Text_BarnyPostBattle:
 	.string "I couldn't win by training POKéMON\n"
 	.string "while I fished…\p"
 	.string "Was I doing things in half measures?$"
 
-Route118_Text_WadeIntro: @ 829D5DF
+Route118_Text_WadeIntro:
 	.string "For FISHERMEN, equipment is the key.\p"
 	.string "But for TRAINERS, the key ingredients\n"
 	.string "are POKéMON and heart, of course!$"
 
-Route118_Text_WadeDefeat: @ 829D64C
+Route118_Text_WadeDefeat:
 	.string "I was beaten in heart?$"
 
-Route118_Text_WadePostBattle: @ 829D663
+Route118_Text_WadePostBattle:
 	.string "Come to think of it, fishing is a battle\n"
 	.string "between a FISHERMAN and a POKéMON.$"
 
-Route118_Text_DaltonIntro: @ 829D6AF
+Route118_Text_DaltonIntro:
 	.string "Let my melody rock your soul!$"
 
-Route118_Text_DaltonDefeat: @ 829D6CD
+Route118_Text_DaltonDefeat:
 	.string "La-lalala…$"
 
-Route118_Text_DaltonPostBattle: @ 829D6D8
+Route118_Text_DaltonPostBattle:
 	.string "An electric guitar doesn't always\n"
 	.string "have to be noisy…\p"
 	.string "It can be strummed to squeeze out\n"
 	.string "this heart-stirring melody…$"
 
-Route118_Text_DaltonRegister: @ 829D74A
+Route118_Text_DaltonRegister:
 	.string "When I compose better melodies,\n"
 	.string "you have to come listen, okay?$"
 
-Route118_Text_DaltonRematchIntro: @ 829D789
+Route118_Text_DaltonRematchIntro:
 	.string "A melody from my POKéMON and me…\n"
 	.string "Let us deliver it to your soul.$"
 
-Route118_Text_DaltonRematchDefeat: @ 829D7CA
+Route118_Text_DaltonRematchDefeat:
 	.string "La-lalala…$"
 
-Route118_Text_DaltonPostRematch: @ 829D7D5
+Route118_Text_DaltonPostRematch:
 	.string "When I play, my emotions should reach\n"
 	.string "you through my electric guitar…$"
 
-Route118_Text_DeandreIntro: @ 829D81B
+Route118_Text_DeandreIntro:
 	.string "Go, go, go!\n"
 	.string "POKéMON 1, 2, and 3!$"
 
-Route118_Text_DeandreDefeat: @ 829D83C
+Route118_Text_DeandreDefeat:
 	.string "Come in, POKéMON! Are you okay?\n"
 	.string "POKéMON 1, 2, and 3?!$"
 
-Route118_Text_DeandrePostBattle: @ 829D872
+Route118_Text_DeandrePostBattle:
 	.string "Isn't it cool that I have a POKéMON\n"
 	.string "battle team?\p"
 	.string "You can copy me--I don't mind!$"
 
-Route119_Text_BrentIntro: @ 829D8C2
+Route119_Text_BrentIntro:
 	.string "We're the MIMIC CIRCLE!\n"
 	.string "We MIMIC what you do!$"
 
-Route119_Text_BrentDefeat: @ 829D8F0
+Route119_Text_BrentDefeat:
 	.string "Whoopsie!\n"
 	.string "I lost!$"
 
-Route119_Text_BrentPostBattle: @ 829D902
+Route119_Text_BrentPostBattle:
 	.string "What's so good about mimicry?\p"
 	.string "Fufufu…\n"
 	.string "You'll never understand…$"
 
-Route119_Text_DonaldIntro: @ 829D941
+Route119_Text_DonaldIntro:
 	.string "So, we finally meet!\n"
 	.string "My BUG POKéMON will keep you company!$"
 
-Route119_Text_DonaldDefeat: @ 829D97C
+Route119_Text_DonaldDefeat:
 	.string "I wish we'd never met…$"
 
-Route119_Text_DonaldPostBattle: @ 829D993
+Route119_Text_DonaldPostBattle:
 	.string "I want to MIMIC you some more.\n"
 	.string "Can you hurry up and move?$"
 
-Route119_Text_TaylorIntro: @ 829D9CD
+Route119_Text_TaylorIntro:
 	.string "If you step forward, we step forward.\p"
 	.string "If you turn right, we turn, too…$"
 
-Route119_Text_TaylorDefeat: @ 829DA14
+Route119_Text_TaylorDefeat:
 	.string "But if you win, I lose…$"
 
-Route119_Text_TaylorPostBattle: @ 829DA2C
+Route119_Text_TaylorPostBattle:
 	.string "I can't MIMIC you winning the match.\n"
 	.string "That's just impossible…\l"
 	.string "It's burning me up…$"
 
-Route119_Text_DougIntro: @ 829DA7D
+Route119_Text_DougIntro:
 	.string "Yep, you've finally caught me!\n"
 	.string "Or were you trying to avoid me?$"
 
-Route119_Text_DougDefeat: @ 829DABC
+Route119_Text_DougDefeat:
 	.string "Whoop, that was a great match!$"
 
-Route119_Text_DougPostBattle: @ 829DADB
+Route119_Text_DougPostBattle:
 	.string "We're the MIMIC CIRCLE!\n"
 	.string "I hope you enjoyed our performance.$"
 
-Route119_Text_GregIntro: @ 829DB17
+Route119_Text_GregIntro:
 	.string "You don't know who I am, do you?\p"
 	.string "But, I also don't know you.\n"
 	.string "So, we'll battle!$"
 
-Route119_Text_GregDefeat: @ 829DB66
+Route119_Text_GregDefeat:
 	.string "You're pretty strong!$"
 
-Route119_Text_GregPostBattle: @ 829DB7C
+Route119_Text_GregPostBattle:
 	.string "Until you go away somewhere, we'll\n"
 	.string "keep on mimicking your every move.$"
 
-Route119_Text_KentIntro: @ 829DBC2
+Route119_Text_KentIntro:
 	.string "The MIMIC CIRCLE was formed by people\n"
 	.string "who like to MIMIC.\p"
 	.string "A battle starts the instant we meet!$"
 
-Route119_Text_KentDefeat: @ 829DC20
+Route119_Text_KentDefeat:
 	.string "I give up!$"
 
-Route119_Text_KentPostBattle: @ 829DC2B
+Route119_Text_KentPostBattle:
 	.string "Won't you join our MIMIC CIRCLE?$"
 
-Route119_Text_JacksonIntro: @ 829DC4C
+Route119_Text_JacksonIntro:
 	.string "Who has the knowledge and\n"
 	.string "the technique for survival?\p"
 	.string "POKéMON RANGERS, that's who!$"
 
-Route119_Text_JacksonDefeat: @ 829DC9F
+Route119_Text_JacksonDefeat:
 	.string "I didn't have enough POKéMON\n"
 	.string "know-how…$"
 
-Route119_Text_JacksonPostBattle: @ 829DCC6
+Route119_Text_JacksonPostBattle:
 	.string "To break away from civilization and\n"
 	.string "awaken the wild spirit within!\p"
 	.string "That's our vision.$"
 
-Route119_Text_JacksonRegister: @ 829DD1C
+Route119_Text_JacksonRegister:
 	.string "I hope you'll give me a rematch without\n"
 	.string "mocking my lack of knowledge.$"
 
-Route119_Text_JacksonRematchIntro: @ 829DD62
+Route119_Text_JacksonRematchIntro:
 	.string "I'm going to regain my wild spirit by\n"
 	.string "being together with POKéMON.$"
 
-Route119_Text_JacksonRematchDefeat: @ 829DDA5
+Route119_Text_JacksonRematchDefeat:
 	.string "You've remained strong!$"
 
-Route119_Text_JacksonPostRematch: @ 829DDBD
+Route119_Text_JacksonPostRematch:
 	.string "Believe in your POKéMON.\n"
 	.string "Believe in yourself.\p"
 	.string "The road will reveal itself to you.$"
 
-Route119_Text_CatherineIntro: @ 829DE0F
+Route119_Text_CatherineIntro:
 	.string "Oh? Look at you.\p"
 	.string "For someone on an adventure,\n"
 	.string "you're traveling awfully light.$"
 
-Route119_Text_CatherineDefeat: @ 829DE5D
+Route119_Text_CatherineDefeat:
 	.string "Accidents happen when you're not\n"
 	.string "prepared!$"
 
-Route119_Text_CatherinePostBattle: @ 829DE88
+Route119_Text_CatherinePostBattle:
 	.string "You're traveling light but you have\n"
 	.string "everything you need.\p"
 	.string "You're on top of things mentally and\n"
 	.string "physically, too.$"
 
-Route119_Text_CatherineRegister: @ 829DEF7
+Route119_Text_CatherineRegister:
 	.string "Do you have a POKéNAV?\n"
 	.string "It's a must-have tool for any TRAINER.\p"
 	.string "Oh, you do have one!\n"
 	.string "Let's register each other, then!$"
 
-Route119_Text_CatherineRematchIntro: @ 829DF6B
+Route119_Text_CatherineRematchIntro:
 	.string "How's your journey with POKéMON\n"
 	.string "going?$"
 
-Route119_Text_CatherineRematchDefeat: @ 829DF92
+Route119_Text_CatherineRematchDefeat:
 	.string "I'm still missing something…$"
 
-Route119_Text_CatherinePostRematch: @ 829DFAF
+Route119_Text_CatherinePostRematch:
 	.string "In the same way that you, as a TRAINER,\n"
 	.string "rely on your POKéMON, your POKéMON\l"
 	.string "rely on you.$"
 
-Route119_Text_HughIntro: @ 829E007
+Route119_Text_HughIntro:
 	.string "The vast sky holds untold promise!\p"
 	.string "Nothing can compare to the sheer\n"
 	.string "exhilaration of flight!$"
 
-Route119_Text_HughDefeat: @ 829E063
+Route119_Text_HughDefeat:
 	.string "Down and out!$"
 
-Route119_Text_HughPostBattle: @ 829E071
+Route119_Text_HughPostBattle:
 	.string "My BIRD POKéMON made my dreams of\n"
 	.string "flying come true!$"
 
-Route119_Text_PhilIntro: @ 829E0A5
+Route119_Text_PhilIntro:
 	.string "I'll show you the true potential of me\n"
 	.string "and my BIRD POKéMON!$"
 
-Route119_Text_PhilDefeat: @ 829E0E1
+Route119_Text_PhilDefeat:
 	.string "We lacked potential…$"
 
-Route119_Text_PhilPostBattle: @ 829E0F6
+Route119_Text_PhilPostBattle:
 	.string "Ever since I was a little kid, I always\n"
 	.string "admired BIRD POKéMON…$"
 
-Route119_Text_YasuIntro: @ 829E134
+Route119_Text_YasuIntro:
 	.string "To lurk in shadows, and live in\n"
 	.string "darkness… That is my destiny.\p"
 	.string "I emerge to challenge you!$"
 
-Route119_Text_YasuDefeat: @ 829E18D
+Route119_Text_YasuDefeat:
 	.string "I admit defeat!$"
 
-Route119_Text_YasuPostBattle: @ 829E19D
+Route119_Text_YasuPostBattle:
 	.string "Those defeated in battle withdraw\n"
 	.string "quietly back into the shadows.\l"
 	.string "That, too, is destiny…$"
 
-Route119_Text_TakashiIntro: @ 829E1F5
+Route119_Text_TakashiIntro:
 	.string "If you're not on your guard,\n"
 	.string "you're in for some pain!$"
 
-Route119_Text_TakashiDefeat: @ 829E22B
+Route119_Text_TakashiDefeat:
 	.string "You're surprisingly good!$"
 
-Route119_Text_TakashiPostBattle: @ 829E245
+Route119_Text_TakashiPostBattle:
 	.string "My surprise attack ended in\n"
 	.string "failure…$"
 
-Route119_Text_HideoIntro: @ 829E26A
+Route119_Text_HideoIntro:
 	.string "To hide a tree, use a forest!$"
 
-Route119_Text_HideoDefeat: @ 829E288
+Route119_Text_HideoDefeat:
 	.string "I bow to your superiority.$"
 
-Route119_Text_HideoPostBattle: @ 829E2A3
+Route119_Text_HideoPostBattle:
 	.string "To hide a tree, use a forest!\n"
 	.string "To hide a POKéMON, use a POKéMON!\p"
 	.string "There is no deep, hidden meaning\n"
 	.string "to that.$"
 
-Route119_Text_ChrisIntro: @ 829E30D
+Route119_Text_ChrisIntro:
 	.string "You spoke to me…\n"
 	.string "So you want to challenge me!\p"
 	.string "Sure! I'll try out the POKéMON I caught\n"
 	.string "while SURFING!$"
 
-Route119_Text_ChrisDefeat: @ 829E372
+Route119_Text_ChrisDefeat:
 	.string "I don't have a clue about what it\n"
 	.string "takes to win.$"
 
-Route119_Text_ChrisPostBattle: @ 829E3A2
+Route119_Text_ChrisPostBattle:
 	.string "Go for a SURF on my POKéMON…\p"
 	.string "Then fish off its back…\p"
 	.string "It's an indescribably luxuriant moment!$"
 
-Route119_Text_FabianIntro: @ 829E3FF
+Route119_Text_FabianIntro:
 	.string "Hit me with a power chord!\n"
 	.string "Victory is mine!\l"
 	.string "It's our time to shine, whoa, yeah!$"
 
-Route119_Text_FabianDefeat: @ 829E44F
+Route119_Text_FabianDefeat:
 	.string "You showed me who's the boss!\n"
 	.string "We'll have to take the loss, oh, no!$"
 
-Route119_Text_FabianPostBattle: @ 829E492
+Route119_Text_FabianPostBattle:
 	.string "Hit me with another power chord!\n"
 	.string "Leave me alone!\l"
 	.string "Your win you have to atone!$"
 
-Route119_Text_DaytonIntro: @ 829E4DF
+Route119_Text_DaytonIntro:
 	.string "Hohoho!\n"
 	.string "I like kid TRAINERS!\l"
 	.string "Let's have a good one!$"
 
-Route119_Text_DaytonDefeat: @ 829E513
+Route119_Text_DaytonDefeat:
 	.string "You're pretty amazing!\n"
 	.string "Hohoho!$"
 
-Route119_Text_DaytonPostBattle: @ 829E532
+Route119_Text_DaytonPostBattle:
 	.string "Hohoho!\n"
 	.string "I'll try emulating the pep of kid\l"
 	.string "TRAINERS like you!$"
 
-Route119_Text_RachelIntro: @ 829E56F
+Route119_Text_RachelIntro:
 	.string "Wherever and whenever I may be,\n"
 	.string "I always have my parasol in hand.$"
 
-Route119_Text_RachelDefeat: @ 829E5B1
+Route119_Text_RachelDefeat:
 	.string "Oh, but…\n"
 	.string "That's not fair.$"
 
-Route119_Text_RachelPostBattle: @ 829E5CB
+Route119_Text_RachelPostBattle:
 	.string "You're asking if my parasol is heavy?\n"
 	.string "Your BAG is filled with more junk than\l"
 	.string "I ever carry around.$"
 
-Route120_Text_ColinIntro: @ 829E62D
+Route120_Text_ColinIntro:
 	.string "Do you have any moves that can strike\n"
 	.string "a flying POKéMON?$"
 
-Route120_Text_ColinDefeat: @ 829E665
+Route120_Text_ColinDefeat:
 	.string "You soared above me!$"
 
-Route120_Text_ColinPostBattle: @ 829E67A
+Route120_Text_ColinPostBattle:
 	.string "The move FLY is convenient,\n"
 	.string "don't you think?\p"
 	.string "While the POKéMON is flying,\n"
 	.string "almost no moves can strike it.$"
 
-Route120_Text_RobertIntro: @ 829E6E3
+Route120_Text_RobertIntro:
 	.string "My POKéMON is strong!\n"
 	.string "How about yours?$"
 
-Route120_Text_RobertDefeat: @ 829E70A
+Route120_Text_RobertDefeat:
 	.string "Your POKéMON were stronger…$"
 
-Route120_Text_RobertPostBattle: @ 829E726
+Route120_Text_RobertPostBattle:
 	.string "A POKéMON that grows steadily is one\n"
 	.string "you can count on.$"
 
-Route120_Text_RobertRegister: @ 829E75D
+Route120_Text_RobertRegister:
 	.string "You can be counted on to get better.\n"
 	.string "I'd like to register you in my POKéNAV!$"
 
-Route120_Text_RobertRematchIntro: @ 829E7AA
+Route120_Text_RobertRematchIntro:
 	.string "A POKéMON that grows steadily is one\n"
 	.string "you can count on.$"
 
-Route120_Text_RobertRematchDefeat: @ 829E7E1
+Route120_Text_RobertRematchDefeat:
 	.string "Your POKéMON are seriously strong.$"
 
-Route120_Text_RobertPostRematch: @ 829E804
+Route120_Text_RobertPostRematch:
 	.string "My POKéMON are growing stronger.\n"
 	.string "I have to grow stronger, too.$"
 
-Route120_Text_LorenzoIntro: @ 829E843
+Route120_Text_LorenzoIntro:
 	.string "I'll check your POKéMON and see if\n"
 	.string "they're fit for the outdoors.$"
 
-Route120_Text_LorenzoDefeat: @ 829E884
+Route120_Text_LorenzoDefeat:
 	.string "With POKéMON that strong, you're in\n"
 	.string "no danger of needing rescue!$"
 
-Route120_Text_LorenzoPostBattle: @ 829E8C5
+Route120_Text_LorenzoPostBattle:
 	.string "To travel wherever your heart desires\n"
 	.string "with POKéMON…\l"
 	.string "That's the joy of being a TRAINER.$"
 
-Route120_Text_JennaIntro: @ 829E91C
+Route120_Text_JennaIntro:
 	.string "How's your physical fitness?\n"
 	.string "If you're not fit, you could have a\l"
 	.string "rough time in critical situations.$"
 
-Route120_Text_JennaDefeat: @ 829E980
+Route120_Text_JennaDefeat:
 	.string "I'm totally fit, but…$"
 
-Route120_Text_JennaPostBattle: @ 829E996
+Route120_Text_JennaPostBattle:
 	.string "Fitness training is in my routine.\n"
 	.string "I always run with my POKéMON.$"
 
-Route120_Text_JeffreyIntro: @ 829E9D7
+Route120_Text_JeffreyIntro:
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "Want to battle?$"
 
-Route120_Text_JeffreyDefeat: @ 829E9FF
+Route120_Text_JeffreyDefeat:
 	.string "Lost it…$"
 
-Route120_Text_JeffreyPostBattle: @ 829EA08
+Route120_Text_JeffreyPostBattle:
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "I'll try harder…$"
 
-Route120_Text_JeffreyRegister: @ 829EA31
+Route120_Text_JeffreyRegister:
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "Do you have a POKéNAV…?$"
 
-Route120_Text_JeffreyRematchIntro: @ 829EA61
+Route120_Text_JeffreyRematchIntro:
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "Want to battle again?$"
 
-Route120_Text_JeffreyRematchDefeat: @ 829EA8F
+Route120_Text_JeffreyRematchDefeat:
 	.string "… … … … … …\n"
 	.string "I lost again…$"
 
-Route120_Text_JeffreyPostRematch: @ 829EAA9
+Route120_Text_JeffreyPostRematch:
 	.string "… … … … … …\n"
 	.string "… … … … … …\l"
 	.string "I'll try harder…\l"
 	.string "For my precious BUG POKéMON…$"
 
-Route120_Text_JenniferIntro: @ 829EAEF
+Route120_Text_JenniferIntro:
 	.string "POKéMON have many special abilities.\n"
 	.string "If you want to become a first-class\l"
 	.string "TRAINER, learn about them.$"
 
-Route120_Text_JenniferDefeat: @ 829EB53
+Route120_Text_JenniferDefeat:
 	.string "You're obviously thinking.$"
 
-Route120_Text_JenniferPostBattle: @ 829EB6E
+Route120_Text_JenniferPostBattle:
 	.string "The special abilities of POKéMON\n"
 	.string "will make battle styles change.$"
 
-Route120_Text_ChipIntro: @ 829EBAF
+Route120_Text_ChipIntro:
 	.string "Who might you be?\p"
 	.string "Are you perhaps searching for ancient\n"
 	.string "ruins that are rumored to possibly\l"
 	.string "exist according to legend?$"
 
-Route120_Text_ChipDefeat: @ 829EC25
+Route120_Text_ChipDefeat:
 	.string "What a disgraceful setback…$"
 
-Route120_Text_ChipPostBattle: @ 829EC41
+Route120_Text_ChipPostBattle:
 	.string "That giant rock… I would like to\n"
 	.string "believe it may indeed contain ancient\l"
 	.string "ruins. But I see no entrance.$"
 
-Route120_Text_ClarissaIntro: @ 829ECA6
+Route120_Text_ClarissaIntro:
 	.string "Why am I carrying this parasol?\p"
 	.string "I'll tell you if you can win against me.$"
 
-Route120_Text_ClarissaDefeat: @ 829ECEF
+Route120_Text_ClarissaDefeat:
 	.string "A parasol can't ward off POKéMON\n"
 	.string "attacks…$"
 
-Route120_Text_ClarissaPostBattle: @ 829ED19
+Route120_Text_ClarissaPostBattle:
 	.string "I don't think strong sunlight is good\n"
 	.string "for my POKéMON.\l"
 	.string "So I shield them with my parasol.$"
 
-Route120_Text_AngelicaIntro: @ 829ED71
+Route120_Text_AngelicaIntro:
 	.string "Me, POKéMON, and my parasol…\p"
 	.string "If any one of them is missing,\n"
 	.string "the picture of beauty will be ruined.$"
 
-Route120_Text_AngelicaDefeat: @ 829EDD3
+Route120_Text_AngelicaDefeat:
 	.string "You've completely ruined my beauty…$"
 
-Route120_Text_AngelicaPostBattle: @ 829EDF7
+Route120_Text_AngelicaPostBattle:
 	.string "A parasol wouldn't suit you at all.\p"
 	.string "Why, something like this would only\n"
 	.string "get in your way.$"
 
-Route120_Text_KeigoIntro: @ 829EE50
+Route120_Text_KeigoIntro:
 	.string "I will adopt the movements of POKéMON\n"
 	.string "and create new ninja techniques.$"
 
-Route120_Text_KeigoDefeat: @ 829EE97
+Route120_Text_KeigoDefeat:
 	.string "The creation of new ninja techniques\n"
 	.string "is but a distant dream…$"
 
-Route120_Text_KeigoPostBattle: @ 829EED4
+Route120_Text_KeigoPostBattle:
 	.string "Perhaps I ought to apprentice under\n"
 	.string "a ninja sensei.$"
 
-Route120_Text_RileyIntro: @ 829EF08
+Route120_Text_RileyIntro:
 	.string "We ninja conceal ourselves under our\n"
 	.string "camouflage cloaks.\l"
 	.string "I bet you didn't know where I was!$"
 
-Route120_Text_RileyDefeat: @ 829EF63
+Route120_Text_RileyDefeat:
 	.string "I lost!\n"
 	.string "I should camouflage my shame!$"
 
-Route120_Text_RileyPostBattle: @ 829EF89
+Route120_Text_RileyPostBattle:
 	.string "Our camouflage cloaks are all\n"
 	.string "handmade.$"
 
-Route120_Text_CallieIntro: @ 829EFB1
+Route120_Text_CallieIntro:
 	.string "If you don't pay attention,\n"
 	.string "you could get hurt!$"
 
-Route120_Text_CallieDefeat: @ 829EFE1
+Route120_Text_CallieDefeat:
 	.string "Ouch!\n"
 	.string "I was the one to get hurt.$"
 
-Route120_Text_CalliePostBattle: @ 829F002
+Route120_Text_CalliePostBattle:
 	.string "I wonder… Should I evolve my POKéMON?\n"
 	.string "They're cute the way they are, though.$"
 
-Route120_Text_LeonelIntro: @ 829F04F
+Route120_Text_LeonelIntro:
 	.string "Your party POKéMON…\n"
 	.string "Do you have different types?$"
 
-Route120_Text_LeonelDefeat: @ 829F080
+Route120_Text_LeonelDefeat:
 	.string "I've seen your policy in action!$"
 
-Route120_Text_LeonelPostBattle: @ 829F0A1
+Route120_Text_LeonelPostBattle:
 	.string "I think it's awesome you're so strong\n"
 	.string "battling with your favorite POKéMON.$"
 
-Route121_Text_VanessaIntro: @ 829F0EC
+Route121_Text_VanessaIntro:
 	.string "Will you play with my delightfully\n"
 	.string "pretty POKéMON?$"
 
-Route121_Text_VanessaDefeat: @ 829F11F
+Route121_Text_VanessaDefeat:
 	.string "This isn't what I meant!$"
 
-Route121_Text_VanessaPostBattle: @ 829F138
+Route121_Text_VanessaPostBattle:
 	.string "I'm going to a CONTEST in LILYCOVE.\p"
 	.string "My POKéMON should have no problem\n"
 	.string "sweeping the MASTER CLASS.$"
 
-Route121_Text_WalterIntro: @ 829F199
+Route121_Text_WalterIntro:
 	.string "With my POKéMON, I have traveled\n"
 	.string "to the world's four corners.\p"
 	.string "You might say I have some confidence\n"
 	.string "in my abilities.$"
 
-Route121_Text_WalterDefeat: @ 829F20D
+Route121_Text_WalterDefeat:
 	.string "Ah, well played.$"
 
-Route121_Text_WalterPostBattle: @ 829F21E
+Route121_Text_WalterPostBattle:
 	.string "I would like to circle the globe once\n"
 	.string "again with my POKéMON.$"
 
-Route121_Text_WalterRegister: @ 829F25B
+Route121_Text_WalterRegister:
 	.string "Your POKéMON prowess is remarkable.\n"
 	.string "Allow me to register you as a memento.$"
 
-Route121_Text_WalterRematchIntro: @ 829F2A6
+Route121_Text_WalterRematchIntro:
 	.string "With my POKéMON, I have traveled\n"
 	.string "to the world's four corners.\p"
 	.string "You might say I have some confidence\n"
 	.string "in my abilities.$"
 
-Route121_Text_WalterRematchDefeat: @ 829F31A
+Route121_Text_WalterRematchDefeat:
 	.string "Ah, well played.$"
 
-Route121_Text_WalterPostRematch: @ 829F32B
+Route121_Text_WalterPostRematch:
 	.string "Your POKéMON and you…\p"
 	.string "Your prowess together will be\n"
 	.string "considered strong, even overseas.$"
 
-Route121_Text_TammyIntro: @ 829F381
+Route121_Text_TammyIntro:
 	.string "There are powers beyond our\n"
 	.string "understanding in the world…$"
 
-Route121_Text_TammyDefeat: @ 829F3B9
+Route121_Text_TammyDefeat:
 	.string "I have lost…$"
 
-Route121_Text_TammyPostBattle: @ 829F3C6
+Route121_Text_TammyPostBattle:
 	.string "MT. PYRE…\n"
 	.string "There is a mysterious power\l"
 	.string "at work there…$"
 
-Route121_Text_KateIntro: @ 829F3FB
+Route121_Text_KateIntro:
 	.string "KATE: Together, we're fearless!\n"
 	.string "We'll demonstrate how tough we are!$"
 
-Route121_Text_KateDefeat: @ 829F43F
+Route121_Text_KateDefeat:
 	.string "KATE: I blew it in front of my junior\n"
 	.string "student partner…$"
 
-Route121_Text_KatePostBattle: @ 829F476
+Route121_Text_KatePostBattle:
 	.string "KATE: When someone's relying on me,\n"
 	.string "I get this urge to look cool in front\l"
 	.string "of them…$"
 
-Route121_Text_KateNotEnoughMons: @ 829F4C9
+Route121_Text_KateNotEnoughMons:
 	.string "KATE: If you've only got one POKéMON,\n"
 	.string "we can't battle with you.\p"
 	.string "That would be bullying.$"
 
-Route121_Text_JoyIntro: @ 829F521
+Route121_Text_JoyIntro:
 	.string "JOY: Together, we're fearless!\n"
 	.string "We'll demonstrate how tough we are!$"
 
-Route121_Text_JoyDefeat: @ 829F564
+Route121_Text_JoyDefeat:
 	.string "JOY: Please forgive me, KATE!$"
 
-Route121_Text_JoyPostBattle: @ 829F582
+Route121_Text_JoyPostBattle:
 	.string "JOY: Ehehe, I'll have to train with KATE,\n"
 	.string "my senior student partner, again.$"
 
-Route121_Text_JoyNotEnoughMons: @ 829F5CE
+Route121_Text_JoyNotEnoughMons:
 	.string "JOY: You need at least two POKéMON\n"
 	.string "if you're going to challenge us!$"
 
-Route121_Text_JessicaIntro: @ 829F612
+Route121_Text_JessicaIntro:
 	.string "Stop! Have a good look at my precious\n"
 	.string "POKéMON!$"
 
-Route121_Text_JessicaDefeat: @ 829F641
+Route121_Text_JessicaDefeat:
 	.string "Oh, how dare you!\n"
 	.string "Don't take it so seriously!$"
 
-Route121_Text_JessicaPostBattle: @ 829F66F
+Route121_Text_JessicaPostBattle:
 	.string "Maybe I'll go catch more POKéMON at\n"
 	.string "the SAFARI.$"
 
-Route121_Text_JessicaRegister: @ 829F69F
+Route121_Text_JessicaRegister:
 	.string "I took it easy on you this time!\n"
 	.string "It won't be that way the next time!$"
 
-Route121_Text_JessicaRematchIntro: @ 829F6E4
+Route121_Text_JessicaRematchIntro:
 	.string "My precious POKéMON grew!\n"
 	.string "Have a good look!$"
 
-Route121_Text_JessicaRematchDefeat: @ 829F710
+Route121_Text_JessicaRematchDefeat:
 	.string "Oh, how dare you!\n"
 	.string "You still won't take it easy!$"
 
-Route121_Text_JessicaPostRematch: @ 829F740
+Route121_Text_JessicaPostRematch:
 	.string "Maybe I'll go catch more POKéMON at\n"
 	.string "the SAFARI.$"
 
-Route121_Text_CristinIntro: @ 829F770
+Route121_Text_CristinIntro:
 	.string "I have this routine.\n"
 	.string "Defeat five TRAINERS a day.\l"
 	.string "Guess what? You're number five!$"
 
-Route121_Text_CristinDefeat: @ 829F7C1
+Route121_Text_CristinDefeat:
 	.string "No!\n"
 	.string "You're horrid!$"
 
-Route121_Text_CristinPostBattle: @ 829F7D4
+Route121_Text_CristinPostBattle:
 	.string "I didn't expect to lose this easily…\n"
 	.string "I'll win next time!$"
 
-Route121_Text_CristinRegister: @ 829F80D
+Route121_Text_CristinRegister:
 	.string "That was total humiliation!\n"
 	.string "I won't forget you…\l"
 	.string "Hand over your POKéNAV!$"
 
-Route121_Text_CristinRematchIntro: @ 829F855
+Route121_Text_CristinRematchIntro:
 	.string "I have this new routine.\n"
 	.string "Defeat ten TRAINERS a day.\l"
 	.string "Guess what? You're number ten!$"
 
-Route121_Text_CristinRematchDefeat: @ 829F8A8
+Route121_Text_CristinRematchDefeat:
 	.string "Wait! That's nasty!\n"
 	.string "I demand a rematch!$"
 
-Route121_Text_CristinPostRematch: @ 829F8D0
+Route121_Text_CristinPostRematch:
 	.string "An opponent I just can't beat…\n"
 	.string "Snivel…\l"
 	.string "I can't believe this is happening…$"
 
-Route121_Text_CaleIntro: @ 829F91A
+Route121_Text_CaleIntro:
 	.string "Can't you see that I have all this\n"
 	.string "stuff with me?\p"
 	.string "Despite that, you still insist that\n"
 	.string "we battle?$"
 
-Route121_Text_CaleDefeat: @ 829F97B
+Route121_Text_CaleDefeat:
 	.string "Of course I lost!\n"
 	.string "I'm holding stuff in both hands!$"
 
-Route121_Text_CalePostBattle: @ 829F9AE
+Route121_Text_CalePostBattle:
 	.string "I bought too much stuff at\n"
 	.string "the LILYCOVE DEPT. STORE.\p"
 	.string "It's up the road from here.\n"
 	.string "I wish I had a BAG like yours.$"
 
-Route121_Text_MylesIntro: @ 829FA1E
+Route121_Text_MylesIntro:
 	.string "There's nothing I love more than\n"
 	.string "checking out other people's POKéMON!$"
 
-Route121_Text_MylesDefeat: @ 829FA64
+Route121_Text_MylesDefeat:
 	.string "Super awesome!$"
 
-Route121_Text_MylesPostBattle: @ 829FA73
+Route121_Text_MylesPostBattle:
 	.string "They're great, your POKéMON!\n"
 	.string "How do you raise them?$"
 
-Route121_Text_PatIntro: @ 829FAA7
+Route121_Text_PatIntro:
 	.string "I want everybody to see the POKéMON\n"
 	.string "I've raised!$"
 
-Route121_Text_PatDefeat: @ 829FAD8
+Route121_Text_PatDefeat:
 	.string "Wow!\n"
 	.string "Spectacular!$"
 
-Route121_Text_PatPostBattle: @ 829FAEA
+Route121_Text_PatPostBattle:
 	.string "I raise every POKéMON with the same\n"
 	.string "love and care--I don't pick favorites.$"
 
-Route121_Text_MarcelIntro: @ 829FB35
+Route121_Text_MarcelIntro:
 	.string "My POKéMON have never tasted defeat!\n"
 	.string "On their next win, I'm entering them\l"
 	.string "in CONTESTS.$"
 
-Route121_Text_MarcelDefeat: @ 829FB8C
+Route121_Text_MarcelDefeat:
 	.string "Oh, now what happened here?$"
 
-Route121_Text_MarcelPostBattle: @ 829FBA8
+Route121_Text_MarcelPostBattle:
 	.string "I may have to train my gang some more\n"
 	.string "before entering any CONTEST.$"
 
-Route123_Text_WendyIntro: @ 829FBEB
+Route123_Text_WendyIntro:
 	.string "Want to determine how strong you are?\n"
 	.string "I'll be the test!$"
 
-Route123_Text_WendyDefeat: @ 829FC23
+Route123_Text_WendyDefeat:
 	.string "You passed with flying colors!$"
 
-Route123_Text_WendyPostBattle: @ 829FC42
+Route123_Text_WendyPostBattle:
 	.string "To best even me…\n"
 	.string "Your strength is marvelous!$"
 
-Route123_Text_BraxtonIntro: @ 829FC6F
+Route123_Text_BraxtonIntro:
 	.string "You seem to have a big collection\n"
 	.string "of GYM BADGES.\p"
 	.string "Let me see if you're actually worthy of\n"
 	.string "those BADGES!$"
 
-Route123_Text_BraxtonDefeat: @ 829FCD6
+Route123_Text_BraxtonDefeat:
 	.string "Oh, you're worthy, all right!$"
 
-Route123_Text_BraxtonPostBattle: @ 829FCF4
+Route123_Text_BraxtonPostBattle:
 	.string "You did your BADGES proud in that\n"
 	.string "match!$"
 
-Route123_Text_VioletIntro: @ 829FD1D
+Route123_Text_VioletIntro:
 	.string "They say that good times are filled\n"
 	.string "with good aromas.$"
 
-Route123_Text_VioletDefeat: @ 829FD53
+Route123_Text_VioletDefeat:
 	.string "Oh…\n"
 	.string "I smell the bitter scent of misery…$"
 
-Route123_Text_VioletPostBattle: @ 829FD7B
+Route123_Text_VioletPostBattle:
 	.string "The BERRY MASTER's garden is filled\n"
 	.string "with uplifting fragrances.$"
 
-Route123_Text_CameronIntro: @ 829FDBA
+Route123_Text_CameronIntro:
 	.string "Being a psychic is about willpower.\p"
 	.string "I've willed myself not to lose to\n"
 	.string "anyone. That makes me strong!$"
 
-Route123_Text_CameronDefeat: @ 829FE1E
+Route123_Text_CameronDefeat:
 	.string "I feel sad…$"
 
-Route123_Text_CameronPostBattle: @ 829FE2A
+Route123_Text_CameronPostBattle:
 	.string "Being a psychic is about willpower.\n"
 	.string "I thought I wouldn't lose to you…$"
 
-Route123_Text_CameronRegister: @ 829FE70
+Route123_Text_CameronRegister:
 	.string "I sense it!\n"
 	.string "You and I shall battle again!\l"
 	.string "I can't tell if I'll win, though…\p"
 	.string "Let's see your POKéNAV.$"
 
-Route123_Text_CameronRematchIntro: @ 829FED4
+Route123_Text_CameronRematchIntro:
 	.string "I've convinced myself that I won't\n"
 	.string "lose anymore. That makes me strong!$"
 
-Route123_Text_CameronRematchDefeat: @ 829FF1B
+Route123_Text_CameronRematchDefeat:
 	.string "I feel sad…$"
 
-Route123_Text_CameronPostRematch: @ 829FF27
+Route123_Text_CameronPostRematch:
 	.string "I should train at MT. PYRE…\n"
 	.string "I'll never beat you this way…$"
 
-Route123_Text_JackiIntro: @ 829FF61
+Route123_Text_JackiIntro:
 	.string "Don't be too happy if your POKéMON\n"
 	.string "develop psychic powers.\p"
 	.string "You need to refine those powers to\n"
 	.string "make them really useful.$"
 
-Route123_Text_JackiDefeat: @ 829FFD8
+Route123_Text_JackiDefeat:
 	.string "Overwhelmed!$"
 
-Route123_Text_JackiPostBattle: @ 829FFE5
+Route123_Text_JackiPostBattle:
 	.string "We all have psychic powers.\n"
 	.string "We've just forgotten how to use them.$"
 
-Route123_Text_JackiRegister: @ 82A0027
+Route123_Text_JackiRegister:
 	.string "I would like to face you again.\n"
 	.string "Is that okay with you?$"
 
-Route123_Text_JackiRematchIntro: @ 82A005E
+Route123_Text_JackiRematchIntro:
 	.string "Have you awoken the psychic powers\n"
 	.string "within you?$"
 
-Route123_Text_JackiRematchDefeat: @ 82A008D
+Route123_Text_JackiRematchDefeat:
 	.string "Astounding!$"
 
-Route123_Text_JackiPostRematch: @ 82A0099
+Route123_Text_JackiPostRematch:
 	.string "Your power with POKéMON…\n"
 	.string "That could be a psychic power, too.$"
 
-Route123_Text_MiuIntro: @ 82A00D6
+Route123_Text_MiuIntro:
 	.string "MIU: Hello, TRAINER. I hope your\n"
 	.string "POKéMON won't cry when they lose.$"
 
-Route123_Text_MiuDefeat: @ 82A0119
+Route123_Text_MiuDefeat:
 	.string "MIU: Uh-oh, we lost.$"
 
-Route123_Text_MiuPostBattle: @ 82A012E
+Route123_Text_MiuPostBattle:
 	.string "MIU: TRAINER, your POKéMON are\n"
 	.string "strong because you are friends.$"
 
-Route123_Text_MiuNotEnoughMons: @ 82A016D
+Route123_Text_MiuNotEnoughMons:
 	.string "MIU: It's no fun to battle if you\n"
 	.string "don't have two POKéMON.$"
 
-Route123_Text_YukiIntro: @ 82A01A7
+Route123_Text_YukiIntro:
 	.string "YUKI: Okay!\n"
 	.string "We're beating the TRAINER's POKéMON!$"
 
-Route123_Text_YukiDefeat: @ 82A01D8
+Route123_Text_YukiDefeat:
 	.string "YUKI: Uh-oh, we lost.$"
 
-Route123_Text_YukiPostBattle: @ 82A01EE
+Route123_Text_YukiPostBattle:
 	.string "YUKI: Why are you so strong?\n"
 	.string "We've never lost before.$"
 
-Route123_Text_YukiNotEnoughMons: @ 82A0224
+Route123_Text_YukiNotEnoughMons:
 	.string "YUKI: It's no fun to battle if you\n"
 	.string "don't have two POKéMON.$"
 
-Route123_Text_KindraIntro: @ 82A025F
+Route123_Text_KindraIntro:
 	.string "MT. PYRE…\n"
 	.string "Where the spirits of POKéMON sleep…\l"
 	.string "Will your POKéMON sleep?$"
 
-Route123_Text_KindraDefeat: @ 82A02A6
+Route123_Text_KindraDefeat:
 	.string "Overflowing with vitality…$"
 
-Route123_Text_KindraPostBattle: @ 82A02C1
+Route123_Text_KindraPostBattle:
 	.string "MT. PYRE…\n"
 	.string "Where the spirits of POKéMON sleep…\p"
 	.string "It must overflow with a power that\n"
 	.string "soothes spirits…$"
 
-Route123_Text_FernandoIntro: @ 82A0323
+Route123_Text_FernandoIntro:
 	.string "I'll turn your lights out while\n"
 	.string "I rip through this tune!$"
 
-Route123_Text_FernandoDefeat: @ 82A035C
+Route123_Text_FernandoDefeat:
 	.string "Hey, hold it!\n"
 	.string "I was still playing the intro!$"
 
-Route123_Text_FernandoPostBattle: @ 82A0389
+Route123_Text_FernandoPostBattle:
 	.string "You're rock steady.\n"
 	.string "I'd like to write a tune about you.$"
 
-Route123_Text_FernandoRegister: @ 82A03C1
+Route123_Text_FernandoRegister:
 	.string "The next time, lend your ears to\n"
 	.string "the full tune, will you?$"
 
-Route123_Text_FernandoRematchIntro: @ 82A03FB
+Route123_Text_FernandoRematchIntro:
 	.string "Today's the day I'm going to do it!\n"
 	.string "I'll turn out your lights before\l"
 	.string "I finish singing my song!$"
 
-Route123_Text_FernandoRematchDefeat: @ 82A045A
+Route123_Text_FernandoRematchDefeat:
 	.string "Hey, hold it!\n"
 	.string "I haven't even hit the chorus!$"
 
-Route123_Text_FernandoPostRematch: @ 82A0487
+Route123_Text_FernandoPostRematch:
 	.string "I thought you'd be so enthralled\n"
 	.string "by my tune, you'd lose.$"
 
-Route123_Text_DavisIntro: @ 82A04C0
+Route123_Text_DavisIntro:
 	.string "This is my awesome BUG POKéMON!\n"
 	.string "My big brother got it for me.$"
 
-Route123_Text_DavisDefeat: @ 82A04FE
+Route123_Text_DavisDefeat:
 	.string "Waaaah!\n"
 	.string "You meanie!$"
 
-Route123_Text_DavisPostBattle: @ 82A0512
+Route123_Text_DavisPostBattle:
 	.string "Don't tell my brother I lost.\n"
 	.string "You have to keep it a secret!$"
 
-Route123_Text_JazmynIntro: @ 82A054E
+Route123_Text_JazmynIntro:
 	.string "My confidence will get a boost by\n"
 	.string "beating someone obviously strong!$"
 
-Route123_Text_JazmynDefeat: @ 82A0592
+Route123_Text_JazmynDefeat:
 	.string "There goes my confidence…$"
 
-Route123_Text_JazmynPostBattle: @ 82A05AC
+Route123_Text_JazmynPostBattle:
 	.string "They say that you can't judge a person\n"
 	.string "by their appearance.\p"
 	.string "But often, their looks don't lie…$"
 
-Route123_Text_FrederickIntro: @ 82A060A
+Route123_Text_FrederickIntro:
 	.string "Hello, child!\n"
 	.string "Can you spare some time?$"
 
-Route123_Text_FrederickDefeat: @ 82A0631
+Route123_Text_FrederickDefeat:
 	.string "Ah, a mighty capable child!\n"
 	.string "Let me contribute to your allowance.$"
 
-Route123_Text_FrederickPostBattle: @ 82A0672
+Route123_Text_FrederickPostBattle:
 	.string "Contribute to your allowance?\n"
 	.string "Wasn't the prize money enough?$"
 
-Route123_Text_AlbertoIntro: @ 82A06AF
+Route123_Text_AlbertoIntro:
 	.string "I have to tell you, BIRD POKéMON\n"
 	.string "are my obsession!\p"
 	.string "Birds are cool!\n"
 	.string "They're the best!$"
 
-Route123_Text_AlbertoDefeat: @ 82A0704
+Route123_Text_AlbertoDefeat:
 	.string "Even in defeat, BIRD POKéMON are cool!$"
 
-Route123_Text_AlbertoPostBattle: @ 82A072B
+Route123_Text_AlbertoPostBattle:
 	.string "I gather BIRD POKéMON feathers that\n"
 	.string "scatter during battles.\p"
 	.string "I'm going to make a hat with\n"
 	.string "BIRD POKéMON feathers.$"
 
-Route123_Text_EdIntro: @ 82A079B
+Route123_Text_EdIntro:
 	.string "When there are no TRAINERS around,\n"
 	.string "I let my POKéMON battle each other.\l"
 	.string "I watch them.$"
 
-Route123_Text_EdDefeat: @ 82A07F0
+Route123_Text_EdDefeat:
 	.string "I kind of like your POKéMON.$"
 
-Route123_Text_EdPostBattle: @ 82A080D
+Route123_Text_EdPostBattle:
 	.string "Hehe, I'm swiping your battling ideas!\n"
 	.string "I think they'll make me better.$"
 
-Route123_Text_JonasIntro: @ 82A0854
+Route123_Text_JonasIntro:
 	.string "I lay in ambush, and a TRAINER has\n"
 	.string "landed in my trap!$"
 
-Route123_Text_JonasDefeat: @ 82A088A
+Route123_Text_JonasDefeat:
 	.string "If you don't lose, how am I supposed\n"
 	.string "to have fun playing ninja?$"
 
-Route123_Text_JonasPostBattle: @ 82A08CA
+Route123_Text_JonasPostBattle:
 	.string "I'm going to ambush a weaker-looking\n"
 	.string "TRAINER next time.$"
 
-Route123_Text_KayleyIntro: @ 82A0902
+Route123_Text_KayleyIntro:
 	.string "I just bought this parasol.\n"
 	.string "My cuteness should be up by a third!$"
 
-Route123_Text_KayleyDefeat: @ 82A0943
+Route123_Text_KayleyDefeat:
 	.string "You're better than me by about\n"
 	.string "five times!$"
 
-Route123_Text_KayleyPostBattle: @ 82A096E
+Route123_Text_KayleyPostBattle:
 	.string "Using accessories effectively is\n"
 	.string "the secret behind fashion appeal.$"
 
-Route124_Text_SpencerIntro: @ 82A09B1
+Route124_Text_SpencerIntro:
 	.string "Hey, are you lost at sea?\p"
 	.string "If you can beat my POKéMON,\n"
 	.string "I can serve as your pilot.$"
 
-Route124_Text_SpencerDefeat: @ 82A0A02
+Route124_Text_SpencerDefeat:
 	.string "I lost my bearings in battle!$"
 
-Route124_Text_SpencerPostBattle: @ 82A0A20
+Route124_Text_SpencerPostBattle:
 	.string "Many people lose their bearings at sea.\p"
 	.string "If you're that sort, you should refer\n"
 	.string "to the POKéNAV's MAP.$"
 
-Route124_Text_RolandIntro: @ 82A0A84
+Route124_Text_RolandIntro:
 	.string "Hm! You're riding a POKéMON instead\n"
 	.string "of swimming yourself…\p"
 	.string "I am envious!$"
 
-Route124_Text_RolandDefeat: @ 82A0ACC
+Route124_Text_RolandDefeat:
 	.string "Oh!\n"
 	.string "I can't…$"
 
-Route124_Text_RolandPostBattle: @ 82A0AD9
+Route124_Text_RolandPostBattle:
 	.string "I'm getting chilled…\n"
 	.string "I've been in the water too long…\p"
 	.string "I wish I could ride a POKéMON like you…$"
 
-Route124_Text_JennyIntro: @ 82A0B37
+Route124_Text_JennyIntro:
 	.string "If you just float in the sea like\n"
 	.string "this, POKéMON come around to play.$"
 
-Route124_Text_JennyDefeat: @ 82A0B7C
+Route124_Text_JennyDefeat:
 	.string "Oh, darn.\n"
 	.string "I've gone and lost.$"
 
-Route124_Text_JennyPostBattle: @ 82A0B9A
+Route124_Text_JennyPostBattle:
 	.string "While swimming, I noticed that some\n"
 	.string "POKéMON attack, and some just watch.\p"
 	.string "I guess POKéMON have personalities\n"
 	.string "of their own.$"
 
-Route124_Text_JennyRegister: @ 82A0C14
+Route124_Text_JennyRegister:
 	.string "It's only on a whim, but maybe I'll get\n"
 	.string "you to register me in your POKéNAV.$"
 
-Route124_Text_JennyRematchIntro: @ 82A0C60
+Route124_Text_JennyRematchIntro:
 	.string "If you just float in the sea like this,\n"
 	.string "TRAINERS challenge you!$"
 
-Route124_Text_JennyRematchDefeat: @ 82A0CA0
+Route124_Text_JennyRematchDefeat:
 	.string "That's strange…\n"
 	.string "I lost again…$"
 
-Route124_Text_JennyPostRematch: @ 82A0CBE
+Route124_Text_JennyPostRematch:
 	.string "This has nothing to do with anything,\n"
 	.string "but maybe I'll visit the TRICK HOUSE.$"
 
-Route124_Text_GraceIntro: @ 82A0D0A
+Route124_Text_GraceIntro:
 	.string "I'm growing bored of swimming…\n"
 	.string "How about a battle?$"
 
-Route124_Text_GraceDefeat: @ 82A0D3D
+Route124_Text_GraceDefeat:
 	.string "I had no idea that you were\n"
 	.string "this strong!$"
 
-Route124_Text_GracePostBattle: @ 82A0D66
+Route124_Text_GracePostBattle:
 	.string "All the effort you put in must have\n"
 	.string "made you this strong.$"
 
-Route124_Text_ChadIntro: @ 82A0DA0
+Route124_Text_ChadIntro:
 	.string "Fufufufu… I dive deep underwater\n"
 	.string "to go deep under cover.\l"
 	.string "Plumbing the depths is where I excel!$"
 
-Route124_Text_ChadDefeat: @ 82A0DFF
+Route124_Text_ChadDefeat:
 	.string "Glub, glub, glub…\n"
 	.string "I'm sinking…$"
 
-Route124_Text_ChadPostBattle: @ 82A0E1E
+Route124_Text_ChadPostBattle:
 	.string "I have it on good authority that\n"
 	.string "there's a DIVE spot around here.\p"
 	.string "It gives me the urge to go deep\n"
 	.string "again…$"
 
-Route124_Text_LilaIntro: @ 82A0E87
+Route124_Text_LilaIntro:
 	.string "LILA: Sigh…\p"
 	.string "Here I am in the sea, but who's with me?\n"
 	.string "My little brother!\p"
 	.string "Let's battle so I won't have to dwell\n"
 	.string "on that!$"
 
-Route124_Text_LilaDefeat: @ 82A0EFE
+Route124_Text_LilaDefeat:
 	.string "LILA: ROY! It's your fault we lost!\n"
 	.string "You're in for it later!$"
 
-Route124_Text_LilaPostBattle: @ 82A0F3A
+Route124_Text_LilaPostBattle:
 	.string "LILA: Sigh…\p"
 	.string "If only it wasn't my little brother\n"
 	.string "next to me, but a nice boyfriend…$"
 
-Route124_Text_LilaNotEnoughMons: @ 82A0F8C
+Route124_Text_LilaNotEnoughMons:
 	.string "LILA: You're planning to battle us?\n"
 	.string "Not unless you have two POKéMON.$"
 
-Route124_Text_RoyIntro: @ 82A0FD1
+Route124_Text_RoyIntro:
 	.string "ROY: My big sister is tough at POKéMON!\p"
 	.string "Don't cry when you lose!$"
 
-Route124_Text_RoyDefeat: @ 82A1012
+Route124_Text_RoyDefeat:
 	.string "ROY: Uh-oh…\n"
 	.string "My big sister will chew me out…$"
 
-Route124_Text_RoyPostBattle: @ 82A103E
+Route124_Text_RoyPostBattle:
 	.string "ROY: My big sister is really scary\n"
 	.string "when she gets angry.\p"
 	.string "That's why she doesn't have a\n"
 	.string "boyfriend.$"
 
-Route124_Text_LilaRoyRegister: @ 82A109F
+Route124_Text_LilaRoyRegister:
 	.string "ROY: Will you battle with us again?\n"
 	.string "But take it easy next time, okay?$"
 
-Route124_Text_RoyNotEnoughMons: @ 82A10E5
+Route124_Text_RoyNotEnoughMons:
 	.string "ROY: Did you want to battle us?\n"
 	.string "Bring two POKéMON, then.$"
 
-Route124_Text_LilaRematchIntro: @ 82A111E
+Route124_Text_LilaRematchIntro:
 	.string "LILA: Sigh…\p"
 	.string "Here I am in the sea, but who's with me?\n"
 	.string "My little brother!\p"
 	.string "Oh, hi, it's been a while. Let's battle\n"
 	.string "so I won't have to dwell on things!$"
 
-Route124_Text_LilaRematchDefeat: @ 82A11B2
+Route124_Text_LilaRematchDefeat:
 	.string "LILA: ROY!\n"
 	.string "It's your fault we lost again!\p"
 	.string "We're having a training session later!$"
 
-Route124_Text_LilaPostRematch: @ 82A1203
+Route124_Text_LilaPostRematch:
 	.string "LILA: Sigh…\p"
 	.string "If I had a nice boyfriend, we'd beat\n"
 	.string "anyone with lovely combinations…$"
 
-Route124_Text_LilaRematchNotEnoughMons: @ 82A1255
+Route124_Text_LilaRematchNotEnoughMons:
 	.string "LILA: You're planning to battle us?\n"
 	.string "Not unless you have two POKéMON.$"
 
-Route124_Text_RoyRematchIntro: @ 82A129A
+Route124_Text_RoyRematchIntro:
 	.string "ROY: If we lose, I'll catch heck.\n"
 	.string "I'm going to go totally all out!$"
 
-Route124_Text_RoyRematchDefeat: @ 82A12DD
+Route124_Text_RoyRematchDefeat:
 	.string "ROY: Uh-oh…\n"
 	.string "My big sister will chew me out again.$"
 
-Route124_Text_RoyPostRematch: @ 82A130F
+Route124_Text_RoyPostRematch:
 	.string "ROY: My big sister is really scary\n"
 	.string "when she gets angry.\p"
 	.string "She's going to make me train really\n"
 	.string "hard with POKéMON later…$"
 
-Route124_Text_RoyRematchNotEnoughMons: @ 82A1384
+Route124_Text_RoyRematchNotEnoughMons:
 	.string "ROY: Did you want to battle us?\n"
 	.string "Bring two POKéMON, then.$"
 
-Route124_Text_DeclanIntro: @ 82A13BD
+Route124_Text_DeclanIntro:
 	.string "Here I am swimming by my lonesome\n"
 	.string "on this wide, beautiful sea.\p"
 	.string "There's no other word for it.\n"
 	.string "This is pathetic!$"
 
-Route124_Text_DeclanDefeat: @ 82A142C
+Route124_Text_DeclanDefeat:
 	.string "I'm feeling blue.\n"
 	.string "Blue as the sky…$"
 
-Route124_Text_DeclanPostBattle: @ 82A144F
+Route124_Text_DeclanPostBattle:
 	.string "I should chat up lady SWIMMERS\n"
 	.string "and invite them on a long swim.$"
 
-Route124_Text_IsabellaIntro: @ 82A148E
+Route124_Text_IsabellaIntro:
 	.string "I'm not going to lose to some\n"
 	.string "surfer TRAINER.$"
 
-Route124_Text_IsabellaDefeat: @ 82A14BC
+Route124_Text_IsabellaDefeat:
 	.string "I've only got sweat in my eyes!\n"
 	.string "I am not crying!$"
 
-Route124_Text_IsabellaPostBattle: @ 82A14ED
+Route124_Text_IsabellaPostBattle:
 	.string "You can find pretty colored shards\n"
 	.string "of things around here.$"
 
-Route125_Text_NolenIntro: @ 82A1527
+Route125_Text_NolenIntro:
 	.string "I heard you approaching, so I hung\n"
 	.string "around for you!$"
 
-Route125_Text_NolenDefeat: @ 82A155A
+Route125_Text_NolenDefeat:
 	.string "I surrender!$"
 
-Route125_Text_NolenPostBattle: @ 82A1567
+Route125_Text_NolenPostBattle:
 	.string "Sound travels faster in water than\n"
 	.string "it does through air.$"
 
-Route125_Text_StanIntro: @ 82A159F
+Route125_Text_StanIntro:
 	.string "Hey, there!\n"
 	.string "Check out my sweet POKéMON!$"
 
-Route125_Text_StanDefeat: @ 82A15C7
+Route125_Text_StanDefeat:
 	.string "I floundered…$"
 
-Route125_Text_StanPostBattle: @ 82A15D5
+Route125_Text_StanPostBattle:
 	.string "I was blown away by HORSEA's charm,\n"
 	.string "so I started swimming, too.$"
 
-Route125_Text_TanyaIntro: @ 82A1615
+Route125_Text_TanyaIntro:
 	.string "I'm tired of swimming.\n"
 	.string "Are you up for a battle with me?$"
 
-Route125_Text_TanyaDefeat: @ 82A164D
+Route125_Text_TanyaDefeat:
 	.string "You're too much!$"
 
-Route125_Text_TanyaPostBattle: @ 82A165E
+Route125_Text_TanyaPostBattle:
 	.string "Whew…\n"
 	.string "Which way is it to MOSSDEEP CITY?$"
 
-Route125_Text_SharonIntro: @ 82A1686
+Route125_Text_SharonIntro:
 	.string "How would you like to take on the\n"
 	.string "WATER-type POKéMON I raised?$"
 
-Route125_Text_SharonDefeat: @ 82A16C5
+Route125_Text_SharonDefeat:
 	.string "Lost it…$"
 
-Route125_Text_SharonPostBattle: @ 82A16CE
+Route125_Text_SharonPostBattle:
 	.string "Your power… You're the real deal.\n"
 	.string "I'm amazed!$"
 
-Route125_Text_ErnestIntro: @ 82A16FC
+Route125_Text_ErnestIntro:
 	.string "Ahoy! I'm a buff, tough SAILOR!\n"
 	.string "I've braved the world's seas!$"
 
-Route125_Text_ErnestDefeat: @ 82A173A
+Route125_Text_ErnestDefeat:
 	.string "Gwrroooar!\n"
 	.string "I couldn't win!$"
 
-Route125_Text_ErnestPostBattle: @ 82A1755
+Route125_Text_ErnestPostBattle:
 	.string "The tide ebbs and flows inside the\n"
 	.string "SHOAL CAVE.\p"
 	.string "By the way, it's about six hours from\n"
 	.string "high tide to low tide. Did you know?$"
 
-Route125_Text_ErnestRegister: @ 82A17CF
+Route125_Text_ErnestRegister:
 	.string "Register me in your POKéNAV,\n"
 	.string "and I'll tell you something good.$"
 
-Route125_Text_ErnestRematchIntro: @ 82A180E
+Route125_Text_ErnestRematchIntro:
 	.string "It's high time I get my payback\n"
 	.string "from you! Come on, we're battling!$"
 
-Route125_Text_ErnestRematchDefeat: @ 82A1851
+Route125_Text_ErnestRematchDefeat:
 	.string "I couldn't win!\n"
 	.string "I flat out couldn't win!$"
 
-Route125_Text_ErnestRematchPostBattle: @ 82A187A
+Route125_Text_ErnestRematchPostBattle:
 	.string "The SHOAL CAVE…\p"
 	.string "There are places you can and can't\n"
 	.string "get to depending on the rise and fall\l"
@@ -3859,524 +3859,524 @@ Route125_Text_ErnestRematchPostBattle: @ 82A187A
 	.string "By the way, it's about six hours from\n"
 	.string "high tide to low tide. Don't forget!$"
 
-Route125_Text_KimIntro: @ 82A192B
+Route125_Text_KimIntro:
 	.string "KIM: A funny old man lives in the\n"
 	.string "SHOAL CAVE. Someone told me.\l"
 	.string "Are you going to see him, too?$"
 
-Route125_Text_KimDefeat: @ 82A1989
+Route125_Text_KimDefeat:
 	.string "KIM: I thought we would win.$"
 
-Route125_Text_KimPostBattle: @ 82A19A6
+Route125_Text_KimPostBattle:
 	.string "KIM: A funny old man lives in the\n"
 	.string "SHOAL CAVE, doesn't he?\p"
 	.string "Let's go see him, IRIS!$"
 
-Route125_Text_KimNotEnoughMons: @ 82A19F8
+Route125_Text_KimNotEnoughMons:
 	.string "KIM: No, no, no! You need two POKéMON,\n"
 	.string "or it's just no good!$"
 
-Route125_Text_IrisIntro: @ 82A1A35
+Route125_Text_IrisIntro:
 	.string "IRIS: KIM, can you tell me what we're\n"
 	.string "looking for out here?$"
 
-Route125_Text_IrisDefeat: @ 82A1A71
+Route125_Text_IrisDefeat:
 	.string "IRIS: Oh, we came sort of close.$"
 
-Route125_Text_IrisPostBattle: @ 82A1A92
+Route125_Text_IrisPostBattle:
 	.string "IRIS: KIM, are we really going into\n"
 	.string "the SHOAL CAVE?\l"
 	.string "We'll get all wet.$"
 
-Route125_Text_IrisNotEnoughMons: @ 82A1AD9
+Route125_Text_IrisNotEnoughMons:
 	.string "IRIS: Oh, we could never, ever do\n"
 	.string "anything like a 2-on-1 battle.$"
 
-Route125_Text_PresleyIntro: @ 82A1B1A
+Route125_Text_PresleyIntro:
 	.string "Why would a BIRDKEEPER like me\n"
 	.string "come out to the sea?$"
 
-Route125_Text_PresleyDefeat: @ 82A1B4E
+Route125_Text_PresleyDefeat:
 	.string "Okay.\n"
 	.string "I'll tell you why I'm here.$"
 
-Route125_Text_PresleyPostBattle: @ 82A1B70
+Route125_Text_PresleyPostBattle:
 	.string "I put a message in a bottle and put\n"
 	.string "it out to sea.\p"
 	.string "I'm sure that a girl SWIMMER will\n"
 	.string "find it!$"
 
-Route125_Text_AuronIntro: @ 82A1BCE
+Route125_Text_AuronIntro:
 	.string "Hey! Was it you throwing garbage\n"
 	.string "into the sea?$"
 
-Route125_Text_AuronDefeat: @ 82A1BFD
+Route125_Text_AuronDefeat:
 	.string "Oh, you weren't throwing trash into\n"
 	.string "the sea.$"
 
-Route125_Text_AuronPostBattle: @ 82A1C2A
+Route125_Text_AuronPostBattle:
 	.string "I found an unsightly bottle bobbing\n"
 	.string "in the waves earlier.\p"
 	.string "It angers me that someone would\n"
 	.string "pollute the sea!$"
 
-Route126_Text_BarryIntro: @ 82A1C95
+Route126_Text_BarryIntro:
 	.string "Swimming is a full-body workout!\n"
 	.string "You will get fit!$"
 
-Route126_Text_BarryDefeat: @ 82A1CC8
+Route126_Text_BarryDefeat:
 	.string "I admit it!\n"
 	.string "You win!$"
 
-Route126_Text_BarryPostBattle: @ 82A1CDD
+Route126_Text_BarryPostBattle:
 	.string "Thanks to my daily swimming routine…\n"
 	.string "Look! Feast your eyes on this physique!$"
 
-Route126_Text_DeanIntro: @ 82A1D2A
+Route126_Text_DeanIntro:
 	.string "This towering white mountain of rock\n"
 	.string "is SOOTOPOLIS CITY.$"
 
-Route126_Text_DeanDefeat: @ 82A1D63
+Route126_Text_DeanDefeat:
 	.string "I was done in?$"
 
-Route126_Text_DeanPostBattle: @ 82A1D72
+Route126_Text_DeanPostBattle:
 	.string "I can't find the entrance to\n"
 	.string "SOOTOPOLIS. Where could it be?$"
 
-Route126_Text_NikkiIntro: @ 82A1DAE
+Route126_Text_NikkiIntro:
 	.string "Ufufufufu!\n"
 	.string "I'm a mermaid!$"
 
-Route126_Text_NikkiDefeat: @ 82A1DC8
+Route126_Text_NikkiDefeat:
 	.string "My fantasy burst as if it were a bubble!\n"
 	.string "Blub, blub, blub…$"
 
-Route126_Text_NikkiPostBattle: @ 82A1E03
+Route126_Text_NikkiPostBattle:
 	.string "You thrashed me… I want to\n"
 	.string "disappear in a wave of despair…$"
 
-Route126_Text_BrendaIntro: @ 82A1E3E
+Route126_Text_BrendaIntro:
 	.string "Hello, kiddo!\n"
 	.string "Want a battle with me?$"
 
-Route126_Text_BrendaDefeat: @ 82A1E63
+Route126_Text_BrendaDefeat:
 	.string "Oh, noooooh!$"
 
-Route126_Text_BrendaPostBattle: @ 82A1E70
+Route126_Text_BrendaPostBattle:
 	.string "I love frolicking with POKéMON in\n"
 	.string "the sea like this!$"
 
-Route126_Text_PabloIntro: @ 82A1EA5
+Route126_Text_PabloIntro:
 	.string "Check out this sculpted body!\n"
 	.string "I'm more cut than a BLACK BELT!$"
 
-Route126_Text_PabloDefeat: @ 82A1EE3
+Route126_Text_PabloDefeat:
 	.string "Whoops! Too strong!\n"
 	.string "Not bad! Not bad at all!$"
 
-Route126_Text_PabloPostBattle: @ 82A1F10
+Route126_Text_PabloPostBattle:
 	.string "Losing to you stimulated my senses!\n"
 	.string "I'll train myself and POKéMON harder!$"
 
-Route126_Text_PabloRegister: @ 82A1F5A
+Route126_Text_PabloRegister:
 	.string "Yep, you're not bad at all!\n"
 	.string "I'd like to get to know you more!$"
 
-Route126_Text_PabloRematchIntro: @ 82A1F98
+Route126_Text_PabloRematchIntro:
 	.string "Check out this beautiful body!\n"
 	.string "I'm more shapely than a SWIMMER!$"
 
-Route126_Text_PabloRematchDefeat: @ 82A1FD8
+Route126_Text_PabloRematchDefeat:
 	.string "Whoops! Really too strong!\n"
 	.string "Not bad! Not bad at all!$"
 
-Route126_Text_PabloPostRematch: @ 82A200C
+Route126_Text_PabloPostRematch:
 	.string "I'm going to train even harder!\n"
 	.string "You're a great motivator!\l"
 	.string "You have to come back again!$"
 
-Route126_Text_LeonardoIntro: @ 82A2063
+Route126_Text_LeonardoIntro:
 	.string "I couldn't even swim last year,\n"
 	.string "but now I'm a decent SWIMMER.\p"
 	.string "I think I'm capable of anything now.$"
 
-Route126_Text_LeonardoDefeat: @ 82A20C6
+Route126_Text_LeonardoDefeat:
 	.string "Sheesh, getting greedy didn't do\n"
 	.string "a thing for me.$"
 
-Route126_Text_LeonardoPostBattle: @ 82A20F7
+Route126_Text_LeonardoPostBattle:
 	.string "If you practice at something,\n"
 	.string "you will get better at it.\p"
 	.string "You're young--don't be afraid to\n"
 	.string "try all sorts of things!$"
 
-Route126_Text_IsobelIntro: @ 82A216A
+Route126_Text_IsobelIntro:
 	.string "If seawater gets up your nose,\n"
 	.string "doesn't it feel terrible?$"
 
-Route126_Text_IsobelDefeat: @ 82A21A3
+Route126_Text_IsobelDefeat:
 	.string "Ack! Why, you…\n"
 	.string "Glub!$"
 
-Route126_Text_IsobelPostBattle: @ 82A21B8
+Route126_Text_IsobelPostBattle:
 	.string "Ooh, I choked on some water!\n"
 	.string "It's bitter! It's salty!!$"
 
-Route126_Text_SiennaIntro: @ 82A21EF
+Route126_Text_SiennaIntro:
 	.string "I'm throwing my whole heart\n"
 	.string "into this!$"
 
-Route126_Text_SiennaDefeat: @ 82A2216
+Route126_Text_SiennaDefeat:
 	.string "You had more heart!$"
 
-Route126_Text_SiennaPostBattle: @ 82A222A
+Route126_Text_SiennaPostBattle:
 	.string "I need to cool down now…\n"
 	.string "I think I'll go for a dive.$"
 
-Route127_Text_CamdenIntro: @ 82A225F
+Route127_Text_CamdenIntro:
 	.string "I can see it in your face.\n"
 	.string "You want to challenge me.$"
 
-Route127_Text_CamdenDefeat: @ 82A2294
+Route127_Text_CamdenDefeat:
 	.string "Awawawawawa…$"
 
-Route127_Text_CamdenPostBattle: @ 82A22A1
+Route127_Text_CamdenPostBattle:
 	.string "A well-played match leaves me feeling\n"
 	.string "refreshed and serene.$"
 
-Route127_Text_DonnyIntro: @ 82A22DD
+Route127_Text_DonnyIntro:
 	.string "Do you have a rival whom you just\n"
 	.string "hate to lose against?$"
 
-Route127_Text_DonnyDefeat: @ 82A2315
+Route127_Text_DonnyDefeat:
 	.string "Arrrgh!\n"
 	.string "I hate losing!$"
 
-Route127_Text_DonnyPostBattle: @ 82A232C
+Route127_Text_DonnyPostBattle:
 	.string "If you have a rival, don't you get the\n"
 	.string "feeling that you have to keep getting\l"
 	.string "better?$"
 
-Route127_Text_JonahIntro: @ 82A2381
+Route127_Text_JonahIntro:
 	.string "Through fishing, I have attained a\n"
 	.string "state of becalmed serenity…\p"
 	.string "Please, allow me to demonstrate…$"
 
-Route127_Text_JonahDefeat: @ 82A23E1
+Route127_Text_JonahDefeat:
 	.string "Though I have lost, my heart remains\n"
 	.string "calm…$"
 
-Route127_Text_JonahPostBattle: @ 82A240C
+Route127_Text_JonahPostBattle:
 	.string "It matters not that I catch nothing.\n"
 	.string "The line remains in the water…$"
 
-Route127_Text_HenryIntro: @ 82A2450
+Route127_Text_HenryIntro:
 	.string "Whoops! Don't tell me I snagged\n"
 	.string "a SURFING POKéMON?$"
 
-Route127_Text_HenryDefeat: @ 82A2483
+Route127_Text_HenryDefeat:
 	.string "I can't keep up!$"
 
-Route127_Text_HenryPostBattle: @ 82A2494
+Route127_Text_HenryPostBattle:
 	.string "It'd be a handful if I hooked\n"
 	.string "your tough POKéMON!$"
 
-Route127_Text_RogerIntro: @ 82A24C6
+Route127_Text_RogerIntro:
 	.string "Well, hey! This is a match between\n"
 	.string "a POKéMON fan and a fishing buff!$"
 
-Route127_Text_RogerDefeat: @ 82A250B
+Route127_Text_RogerDefeat:
 	.string "No! My line's all tangled!\n"
 	.string "The party's over!$"
 
-Route127_Text_RogerPostBattle: @ 82A2538
+Route127_Text_RogerPostBattle:
 	.string "My fishing line's doing a dance!\n"
 	.string "The tangle tango! Hahaha, snarl!$"
 
-Route127_Text_AidanIntro: @ 82A257A
+Route127_Text_AidanIntro:
 	.string "BIRD POKéMON have excellent vision.\n"
 	.string "They spot prey from great heights.$"
 
-Route127_Text_AidanDefeat: @ 82A25C1
+Route127_Text_AidanDefeat:
 	.string "Whew… I give up.$"
 
-Route127_Text_AidanPostBattle: @ 82A25D2
+Route127_Text_AidanPostBattle:
 	.string "There're lots of diving spots in\n"
 	.string "the sea around here.\p"
 	.string "You can spot them easily from the sky\n"
 	.string "because of their darker color.$"
 
-Route127_Text_KojiIntro: @ 82A264D
+Route127_Text_KojiIntro:
 	.string "Run in your bare feet.\n"
 	.string "That will toughen up your soles!$"
 
-Route127_Text_KojiDefeat: @ 82A2685
+Route127_Text_KojiDefeat:
 	.string "Yowch!\n"
 	.string "I got a pebble under a toenail!$"
 
-Route127_Text_KojiPostBattle: @ 82A26AC
+Route127_Text_KojiPostBattle:
 	.string "Going barefoot feels great.\n"
 	.string "But your RUNNING SHOES are cool, too.$"
 
-Route127_Text_KojiRegister: @ 82A26EE
+Route127_Text_KojiRegister:
 	.string "This is what I do to people who beat me!\n"
 	.string "I hope we can do this again.$"
 
-Route127_Text_KojiRematchIntro: @ 82A2734
+Route127_Text_KojiRematchIntro:
 	.string "I still run in my bare feet daily.\n"
 	.string "My soles are tough!$"
 
-Route127_Text_KojiRematchDefeat: @ 82A276B
+Route127_Text_KojiRematchDefeat:
 	.string "Yowch!\n"
 	.string "Pebbles dug into my arches!$"
 
-Route127_Text_KojiPostRematch: @ 82A278E
+Route127_Text_KojiPostRematch:
 	.string "Want to go barefoot for a while?\n"
 	.string "So I can try your RUNNING SHOES?$"
 
-Route127_Text_AthenaIntro: @ 82A27D0
+Route127_Text_AthenaIntro:
 	.string "We should have a slow and methodical\n"
 	.string "match.$"
 
-Route127_Text_AthenaDefeat: @ 82A27FC
+Route127_Text_AthenaDefeat:
 	.string "You didn't give me the chance to\n"
 	.string "do any strategizing.$"
 
-Route127_Text_AthenaPostBattle: @ 82A2832
+Route127_Text_AthenaPostBattle:
 	.string "When I'm surrounded by the blue sea\n"
 	.string "and sky, it feels as if time slows down.$"
 
-Route128_Text_IsaiahIntro: @ 82A287F
+Route128_Text_IsaiahIntro:
 	.string "EVER GRANDE CITY is still a long ways\n"
 	.string "away…$"
 
-Route128_Text_IsaiahDefeat: @ 82A28AB
+Route128_Text_IsaiahDefeat:
 	.string "My first victory seems to be far\n"
 	.string "away, too…$"
 
-Route128_Text_IsaiahPostBattle: @ 82A28D7
+Route128_Text_IsaiahPostBattle:
 	.string "My whole life has been about losing,\n"
 	.string "but I will never give up!$"
 
-Route128_Text_IsaiahRegister: @ 82A2916
+Route128_Text_IsaiahRegister:
 	.string "I know I'm not good now, but I think\n"
 	.string "I can win eventually.\p"
 	.string "Please register me in your POKéNAV.$"
 
-Route128_Text_IsaiahRematchIntro: @ 82A2975
+Route128_Text_IsaiahRematchIntro:
 	.string "I'm still feeling good. I'll keep on\n"
 	.string "swimming to EVER GRANDE CITY.$"
 
-Route128_Text_IsaiahRematchDefeat: @ 82A29B8
+Route128_Text_IsaiahRematchDefeat:
 	.string "I've yet to taste my first victory…$"
 
-Route128_Text_IsaiahPostRematch: @ 82A29DC
+Route128_Text_IsaiahPostRematch:
 	.string "I'll eventually reach EVER GRANDE CITY\n"
 	.string "where I can eventually win…$"
 
-Route128_Text_KatelynIntro: @ 82A2A1F
+Route128_Text_KatelynIntro:
 	.string "You have to swim, cycle, and then run\n"
 	.string "a marathon in a triathlon.\p"
 	.string "It's a grueling race that consists\n"
 	.string "of three events.$"
 
-Route128_Text_KatelynDefeat: @ 82A2A94
+Route128_Text_KatelynDefeat:
 	.string "A POKéMON battle is grueling, too…$"
 
-Route128_Text_KatelynPostBattle: @ 82A2AB7
+Route128_Text_KatelynPostBattle:
 	.string "I have to ride a BIKE next, but…\n"
 	.string "I'm about to throw in the towel…$"
 
-Route128_Text_KatelynRegister: @ 82A2AF9
+Route128_Text_KatelynRegister:
 	.string "Well, I may as well make the best\n"
 	.string "of this. I'd like a rematch sometime.$"
 
-Route128_Text_KatelynRematchIntro: @ 82A2B41
+Route128_Text_KatelynRematchIntro:
 	.string "A triathlon is long. But I guess the\n"
 	.string "road to become the POKéMON CHAMPION\l"
 	.string "is also a long and grueling one.$"
 
-Route128_Text_KatelynRematchDefeat: @ 82A2BAB
+Route128_Text_KatelynRematchDefeat:
 	.string "A POKéMON battle really is harsh\n"
 	.string "and unforgiving…$"
 
-Route128_Text_KatelynPostRematch: @ 82A2BDD
+Route128_Text_KatelynPostRematch:
 	.string "You should give serious thought to\n"
 	.string "challenges on VICTORY ROAD.$"
 
-Route128_Text_AlexaIntro: @ 82A2C1C
+Route128_Text_AlexaIntro:
 	.string "We've been working so hard to mount\n"
 	.string "a POKéMON LEAGUE challenge…\p"
 	.string "We can't afford to lose now!$"
 
-Route128_Text_AlexaDefeat: @ 82A2C79
+Route128_Text_AlexaDefeat:
 	.string "Oh!\n"
 	.string "How could this happen?!$"
 
-Route128_Text_AlexaPostBattle: @ 82A2C95
+Route128_Text_AlexaPostBattle:
 	.string "After all I've done to get here,\n"
 	.string "I won't give up after one setback.$"
 
-Route128_Text_RubenIntro: @ 82A2CD9
+Route128_Text_RubenIntro:
 	.string "There is no stronger TRAINER than I!$"
 
-Route128_Text_RubenDefeat: @ 82A2CFE
+Route128_Text_RubenDefeat:
 	.string "This can't be!$"
 
-Route128_Text_RubenPostBattle: @ 82A2D0D
+Route128_Text_RubenPostBattle:
 	.string "There probably is no stronger TRAINER\n"
 	.string "than you!$"
 
-Route128_Text_WayneIntro: @ 82A2D3D
+Route128_Text_WayneIntro:
 	.string "I want to visit EVER GRANDE, so I\n"
 	.string "caught myself a POKéMON that knows\l"
 	.string "the move WATERFALL to crest the falls.$"
 
-Route128_Text_WayneDefeat: @ 82A2DA9
+Route128_Text_WayneDefeat:
 	.string "I'm crestfallen!$"
 
-Route128_Text_WaynePostBattle: @ 82A2DBA
+Route128_Text_WaynePostBattle:
 	.string "Awww, phooey!\p"
 	.string "My POKéMON knows WATERFALL, but\n"
 	.string "I don't have the SOOTOPOLIS GYM BADGE!$"
 
-Route128_Text_HarrisonIntro: @ 82A2E0F
+Route128_Text_HarrisonIntro:
 	.string "You're looking awfully tough.\n"
 	.string "I wonder if I can win?$"
 
-Route128_Text_HarrisonDefeat: @ 82A2E44
+Route128_Text_HarrisonDefeat:
 	.string "Ouch!\n"
 	.string "I guess it was impossible to win.$"
 
-Route128_Text_HarrisonPostBattle: @ 82A2E6C
+Route128_Text_HarrisonPostBattle:
 	.string "There are tough TRAINERS galore\n"
 	.string "around EVER GRANDE.\p"
 	.string "Do you think I may be out\n"
 	.string "of my league?$"
 
-Route128_Text_CarleeIntro: @ 82A2EC8
+Route128_Text_CarleeIntro:
 	.string "The sunlight seems to be more harsh\n"
 	.string "in this area.$"
 
-Route128_Text_CarleeDefeat: @ 82A2EFA
+Route128_Text_CarleeDefeat:
 	.string "I couldn't see very well because of\n"
 	.string "the sun's glare.$"
 
-Route128_Text_CarleePostBattle: @ 82A2F2F
+Route128_Text_CarleePostBattle:
 	.string "I should go back soon.\n"
 	.string "I need to reapply my sunscreen.$"
 
-Route129_Text_ChaseIntro: @ 82A2F66
+Route129_Text_ChaseIntro:
 	.string "This is my first triathlon.\n"
 	.string "I'm all tense and nervous!$"
 
-Route129_Text_ChaseDefeat: @ 82A2F9D
+Route129_Text_ChaseDefeat:
 	.string "Wroooaaar!\n"
 	.string "I failed to win!$"
 
-Route129_Text_ChasePostBattle: @ 82A2FB9
+Route129_Text_ChasePostBattle:
 	.string "If I'm all tensed up, I won't be able to\n"
 	.string "give it my all.$"
 
-Route129_Text_AllisonIntro: @ 82A2FF2
+Route129_Text_AllisonIntro:
 	.string "I'm in the middle of a triathlon,\n"
 	.string "but, sure, why don't we battle?$"
 
-Route129_Text_AllisonDefeat: @ 82A3034
+Route129_Text_AllisonDefeat:
 	.string "I was sure I'd win!$"
 
-Route129_Text_AllisonPostBattle: @ 82A3048
+Route129_Text_AllisonPostBattle:
 	.string "Do you know what's the greatest thing\n"
 	.string "about triathlons?\p"
 	.string "Testing the limits of your own\n"
 	.string "strength and endurance against\l"
 	.string "Mother Nature!$"
 
-Route129_Text_ReedIntro: @ 82A30CD
+Route129_Text_ReedIntro:
 	.string "Say hey, hey!\n"
 	.string "Let's get on with it!$"
 
-Route129_Text_ReedDefeat: @ 82A30F1
+Route129_Text_ReedDefeat:
 	.string "Beat, I'm beaten.\n"
 	.string "That's it, done!$"
 
-Route129_Text_ReedPostBattle: @ 82A3114
+Route129_Text_ReedPostBattle:
 	.string "There's nothing for a loser.\n"
 	.string "Time for me to beat it home.$"
 
-Route129_Text_TishaIntro: @ 82A314E
+Route129_Text_TishaIntro:
 	.string "What's the hurry?\n"
 	.string "Let's take it slow and easy.$"
 
-Route129_Text_TishaDefeat: @ 82A317D
+Route129_Text_TishaDefeat:
 	.string "Oh, my.\n"
 	.string "I wanted to relax a little more…$"
 
-Route129_Text_TishaPostBattle: @ 82A31A6
+Route129_Text_TishaPostBattle:
 	.string "Don't you hate making mistakes when\n"
 	.string "you're in a rush?\p"
 	.string "That's why I try to take things\n"
 	.string "slowly.$"
 
-Route129_Text_ClarenceIntro: @ 82A3204
+Route129_Text_ClarenceIntro:
 	.string "Surfing isn't as easy as it seems,\n"
 	.string "isn't that right?$"
 
-Route129_Text_ClarenceDefeat: @ 82A3239
+Route129_Text_ClarenceDefeat:
 	.string "Winning sure isn't easy.$"
 
-Route129_Text_ClarencePostBattle: @ 82A3252
+Route129_Text_ClarencePostBattle:
 	.string "You have your sights on the POKéMON\n"
 	.string "LEAGUE? Keep at it!$"
 
-Route130_Text_RodneyIntro: @ 82A328A
+Route130_Text_RodneyIntro:
 	.string "What a surprise! I didn't expect to\n"
 	.string "see a TRAINER out in the sea.\p"
 	.string "I think we should battle!$"
 
-Route130_Text_RodneyDefeat: @ 82A32E6
+Route130_Text_RodneyDefeat:
 	.string "This kid's awfully tough…$"
 
-Route130_Text_RodneyPostBattle: @ 82A3300
+Route130_Text_RodneyPostBattle:
 	.string "Your eyes have that look of someone\n"
 	.string "who's experienced harsh challenges\l"
 	.string "and won. It suits you well!$"
 
-Route130_Text_KatieIntro: @ 82A3363
+Route130_Text_KatieIntro:
 	.string "In the deep blue sea,\n"
 	.string "my shattered blue heart finds\l"
 	.string "comfort among waves.$"
 
-Route130_Text_KatieDefeat: @ 82A33AC
+Route130_Text_KatieDefeat:
 	.string "Like the vast blue sea,\n"
 	.string "the world of POKéMON spans\l"
 	.string "depths beyond belief.$"
 
-Route130_Text_KatiePostBattle: @ 82A33F5
+Route130_Text_KatiePostBattle:
 	.string "The world's children dream\n"
 	.string "of one day becoming\l"
 	.string "the POKéMON CHAMPION.$"
 
-Route130_Text_SantiagoIntro: @ 82A343A
+Route130_Text_SantiagoIntro:
 	.string "Floating on the open sea like this…\n"
 	.string "It's peaceful.$"
 
-Route130_Text_SantiagoDefeat: @ 82A346D
+Route130_Text_SantiagoDefeat:
 	.string "I needed to be a little less peaceful!$"
 
-Route130_Text_SantiagoPostBattle: @ 82A3494
+Route130_Text_SantiagoPostBattle:
 	.string "Swimming and battling like this…\n"
 	.string "I'm one happy guy…$"
 
-Route131_Text_RichardIntro: @ 82A34C8
+Route131_Text_RichardIntro:
 	.string "The sea is teeming with POKéMON.\n"
 	.string "It's not easy swimming, I tell you.$"
 
-Route131_Text_RichardDefeat: @ 82A350D
+Route131_Text_RichardDefeat:
 	.string "POKéMON raised by TRAINERS are\n"
 	.string "seriously tough…$"
 
-Route131_Text_RichardPostBattle: @ 82A353D
+Route131_Text_RichardPostBattle:
 	.string "Gasp… Gasp…\n"
 	.string "I'm wiped out…\p"
 	.string "The going's easy. It's the leaving\n"
@@ -4384,398 +4384,398 @@ Route131_Text_RichardPostBattle: @ 82A353D
 	.string "Will I have any energy left to make\n"
 	.string "the return trip?$"
 
-Route131_Text_HermanIntro: @ 82A35C6
+Route131_Text_HermanIntro:
 	.string "The sea… The sea… The sea…\n"
 	.string "The sea as far as these eyes can see!\l"
 	.string "I'm sick and tired of the sea!$"
 
-Route131_Text_HermanDefeat: @ 82A3626
+Route131_Text_HermanDefeat:
 	.string "Bleah!$"
 
-Route131_Text_HermanPostBattle: @ 82A362D
+Route131_Text_HermanPostBattle:
 	.string "Bored I am by the sea, but swim I must.\p"
 	.string "I'm a born swimmer!\n"
 	.string "That's what I am.$"
 
-Route131_Text_SusieIntro: @ 82A367B
+Route131_Text_SusieIntro:
 	.string "Hi, sweetie, wait!\n"
 	.string "We should battle, you and I!$"
 
-Route131_Text_SusieDefeat: @ 82A36AB
+Route131_Text_SusieDefeat:
 	.string "You're tough in spite of the way\n"
 	.string "you look!$"
 
-Route131_Text_SusiePostBattle: @ 82A36D6
+Route131_Text_SusiePostBattle:
 	.string "Did you see a guy over there who whines\n"
 	.string "that he's bored of the sea?\p"
 	.string "That's all talk.\n"
 	.string "He's hopelessly in love with the sea!$"
 
-Route131_Text_KaraIntro: @ 82A3751
+Route131_Text_KaraIntro:
 	.string "Why do men love bathing suits so much?\p"
 	.string "They all ogle me!$"
 
-Route131_Text_KaraDefeat: @ 82A378A
+Route131_Text_KaraDefeat:
 	.string "I'm out of my depth!$"
 
-Route131_Text_KaraPostBattle: @ 82A379F
+Route131_Text_KaraPostBattle:
 	.string "Maybe it's not my bathing suit that\n"
 	.string "makes men look. It must be my beauty!$"
 
-Route131_Text_ReliIntro: @ 82A37E9
+Route131_Text_ReliIntro:
 	.string "RELI: We'll work together as siblings\n"
 	.string "to take you on!$"
 
-Route131_Text_ReliDefeat: @ 82A381F
+Route131_Text_ReliDefeat:
 	.string "RELI: We couldn't win even though we\n"
 	.string "worked together…$"
 
-Route131_Text_ReliPostBattle: @ 82A3855
+Route131_Text_ReliPostBattle:
 	.string "RELI: The people of PACIFIDLOG are\n"
 	.string "together with the sea and POKéMON from\l"
 	.string "the time they are born.$"
 
-Route131_Text_ReliNotEnoughMons: @ 82A38B7
+Route131_Text_ReliNotEnoughMons:
 	.string "RELI: You don't have two POKéMON?\n"
 	.string "We can't enjoy a battle, then.$"
 
-Route131_Text_IanIntro: @ 82A38F8
+Route131_Text_IanIntro:
 	.string "IAN: I'm doing my best together with\n"
 	.string "my sis!$"
 
-Route131_Text_IanDefeat: @ 82A3925
+Route131_Text_IanDefeat:
 	.string "IAN: I did my best with my sis,\n"
 	.string "but we still couldn't win…$"
 
-Route131_Text_IanPostBattle: @ 82A3960
+Route131_Text_IanPostBattle:
 	.string "IAN: You know how PACIFIDLOG is\n"
 	.string "a floating town?\p"
 	.string "So, wherever there is the sea,\n"
 	.string "that's a part of PACIFIDLOG!$"
 
-Route131_Text_IanNotEnoughMons: @ 82A39CD
+Route131_Text_IanNotEnoughMons:
 	.string "IAN: If you have two POKéMON,\n"
 	.string "we'll take you on!$"
 
-Route131_Text_TaliaIntro: @ 82A39FE
+Route131_Text_TaliaIntro:
 	.string "If you can beat me, I'll give you some\n"
 	.string "great information!$"
 
-Route131_Text_TaliaDefeat: @ 82A3A38
+Route131_Text_TaliaDefeat:
 	.string "Oh?\n"
 	.string "Did I lose?$"
 
-Route131_Text_TaliaPostBattle: @ 82A3A48
+Route131_Text_TaliaPostBattle:
 	.string "There is an odd place nearby.\n"
 	.string "There's a huge tower there.\l"
 	.string "Why don't you go take a look?$"
 
-Route131_Text_KevinIntro: @ 82A3AA0
+Route131_Text_KevinIntro:
 	.string "The people of PACIFIDLOG are\n"
 	.string "a peaceful bunch.\p"
 	.string "They never get angry.\n"
 	.string "That goes for me, too.$"
 
-Route131_Text_KevinDefeat: @ 82A3AFC
+Route131_Text_KevinDefeat:
 	.string "Oops!$"
 
-Route131_Text_KevinPostBattle: @ 82A3B02
+Route131_Text_KevinPostBattle:
 	.string "Tch! …Oh, wait.\n"
 	.string "I'm not angry. Honestly!\p"
 	.string "But, boy, you're strong!\n"
 	.string "Hahaha!$"
 
-Route132_Text_GilbertIntro: @ 82A3B4C
+Route132_Text_GilbertIntro:
 	.string "I used to catch colds all the time as\n"
 	.string "a kid, but I became totally fit after\l"
 	.string "I started swimming.$"
 
-Route132_Text_GilbertDefeat: @ 82A3BAC
+Route132_Text_GilbertDefeat:
 	.string "I crave more power…$"
 
-Route132_Text_GilbertPostBattle: @ 82A3BC0
+Route132_Text_GilbertPostBattle:
 	.string "TRAINERS travel the fields and\n"
 	.string "mountains, so they must be fit, too.$"
 
-Route132_Text_DanaIntro: @ 82A3C04
+Route132_Text_DanaIntro:
 	.string "I try not to swim where the currents\n"
 	.string "are too strong.$"
 
-Route132_Text_DanaDefeat: @ 82A3C39
+Route132_Text_DanaDefeat:
 	.string "Oh, please, no!$"
 
-Route132_Text_DanaPostBattle: @ 82A3C49
+Route132_Text_DanaPostBattle:
 	.string "If I get swept away, I'll lose all my\n"
 	.string "sense of place…$"
 
-Route132_Text_RonaldIntro: @ 82A3C7F
+Route132_Text_RonaldIntro:
 	.string "Win or lose, you'll never know until\n"
 	.string "you try!$"
 
-Route132_Text_RonaldDefeat: @ 82A3CAD
+Route132_Text_RonaldDefeat:
 	.string "Waah!\n"
 	.string "I sank in defeat!$"
 
-Route132_Text_RonaldPostBattle: @ 82A3CC5
+Route132_Text_RonaldPostBattle:
 	.string "I never battle when I know I'll win.\n"
 	.string "I like to battle at the razor's edge of\l"
 	.string "victory and defeat!$"
 
-Route132_Text_KiyoIntro: @ 82A3D26
+Route132_Text_KiyoIntro:
 	.string "I contemplate POKéMON 24 hours a day.\n"
 	.string "How could you possibly beat me?$"
 
-Route132_Text_KiyoDefeat: @ 82A3D6C
+Route132_Text_KiyoDefeat:
 	.string "I lose.\n"
 	.string "I will concede defeat.$"
 
-Route132_Text_KiyoPostBattle: @ 82A3D8B
+Route132_Text_KiyoPostBattle:
 	.string "Urggh…\n"
 	.string "You're a POKéMON fanatic, aren't you?\p"
 	.string "You must contemplate POKéMON 24 hours\n"
 	.string "a day, don't you?$"
 
-Route132_Text_MakaylaIntro: @ 82A3DF0
+Route132_Text_MakaylaIntro:
 	.string "I'm always with my husband,\n"
 	.string "but I can win even without him.$"
 
-Route132_Text_MakaylaDefeat: @ 82A3E2C
+Route132_Text_MakaylaDefeat:
 	.string "Oh, I guess I wasn't good enough.$"
 
-Route132_Text_MakaylaPostBattle: @ 82A3E4E
+Route132_Text_MakaylaPostBattle:
 	.string "That young man over there looks just\n"
 	.string "like my husband when he was young.\p"
 	.string "He's making me blush!$"
 
-Route132_Text_JonathanIntro: @ 82A3EAC
+Route132_Text_JonathanIntro:
 	.string "Someone's been watching me intently.\n"
 	.string "Was it you?$"
 
-Route132_Text_JonathanDefeat: @ 82A3EDD
+Route132_Text_JonathanDefeat:
 	.string "Wow!\n"
 	.string "That's pretty strong, all right!$"
 
-Route132_Text_JonathanPostBattle: @ 82A3F03
+Route132_Text_JonathanPostBattle:
 	.string "I can't shake this feeling that\n"
 	.string "someone's watching me.\p"
 	.string "I can't concentrate!$"
 
-Route132_Text_PaxtonIntro: @ 82A3F4F
+Route132_Text_PaxtonIntro:
 	.string "Now where could my wife have gone?\n"
 	.string "I'm always with her.\l"
 	.string "I wonder if I can win on my own.$"
 
-Route132_Text_PaxtonDefeat: @ 82A3FA8
+Route132_Text_PaxtonDefeat:
 	.string "Ah, I see that I couldn't manage\n"
 	.string "to win on my own after all.$"
 
-Route132_Text_PaxtonPostBattle: @ 82A3FE5
+Route132_Text_PaxtonPostBattle:
 	.string "My wife must be looking for me.\n"
 	.string "I'd best go find her right away.$"
 
-Route132_Text_DarcyIntro: @ 82A4026
+Route132_Text_DarcyIntro:
 	.string "I liked training here by myself.\n"
 	.string "It's awful that all these people came!$"
 
-Route132_Text_DarcyDefeat: @ 82A406E
+Route132_Text_DarcyDefeat:
 	.string "Okay! I won't complain about other\n"
 	.string "people being here.$"
 
-Route132_Text_DarcyPostBattle: @ 82A40A4
+Route132_Text_DarcyPostBattle:
 	.string "I suppose I can partner up with that\n"
 	.string "old man and challenge that other team.$"
 
-Route133_Text_FranklinIntro: @ 82A40F0
+Route133_Text_FranklinIntro:
 	.string "Did the currents carry you here, too?\n"
 	.string "This must have been fated.\l"
 	.string "Let's battle!$"
 
-Route133_Text_FranklinDefeat: @ 82A413F
+Route133_Text_FranklinDefeat:
 	.string "Strong!\n"
 	.string "Too much so!$"
 
-Route133_Text_FranklinPostBattle: @ 82A4154
+Route133_Text_FranklinPostBattle:
 	.string "It's just my luck that a tough TRAINER\n"
 	.string "like you would drift here…\l"
 	.string "I must be cursed…$"
 
-Route133_Text_DebraIntro: @ 82A41A8
+Route133_Text_DebraIntro:
 	.string "I've led a life of woe and misery…\n"
 	.string "I've been cast away, and this is where\l"
 	.string "I've drifted…$"
 
-Route133_Text_DebraDefeat: @ 82A4200
+Route133_Text_DebraDefeat:
 	.string "Another loss…$"
 
-Route133_Text_DebraPostBattle: @ 82A420E
+Route133_Text_DebraPostBattle:
 	.string "A life adrift…\n"
 	.string "I don't want it anymore!$"
 
-Route133_Text_LindaIntro: @ 82A4236
+Route133_Text_LindaIntro:
 	.string "Welcome!\n"
 	.string "I've been expecting you!$"
 
-Route133_Text_LindaDefeat: @ 82A4258
+Route133_Text_LindaDefeat:
 	.string "No! Please!$"
 
-Route133_Text_LindaPostBattle: @ 82A4264
+Route133_Text_LindaPostBattle:
 	.string "A strong child TRAINER…\n"
 	.string "That's so annoying!$"
 
-Route133_Text_WarrenIntro: @ 82A4290
+Route133_Text_WarrenIntro:
 	.string "I want to win like everyone else, but I\n"
 	.string "won't raise POKéMON like everyone else.$"
 
-Route133_Text_WarrenDefeat: @ 82A42E0
+Route133_Text_WarrenDefeat:
 	.string "Darn it!\n"
 	.string "My way is still too slack!$"
 
-Route133_Text_WarrenPostBattle: @ 82A4304
+Route133_Text_WarrenPostBattle:
 	.string "It's way more fun to do things the way\n"
 	.string "I want than to be like everybody else.\l"
 	.string "I mean, that's obvious!$"
 
-Route133_Text_BeckIntro: @ 82A436A
+Route133_Text_BeckIntro:
 	.string "I came all the way out here with my\n"
 	.string "BIRD POKéMON.$"
 
-Route133_Text_BeckDefeat: @ 82A439C
+Route133_Text_BeckDefeat:
 	.string "You…\n"
 	.string "You're stunningly cool!$"
 
-Route133_Text_BeckPostBattle: @ 82A43B9
+Route133_Text_BeckPostBattle:
 	.string "I'd like to go back to FORTREE,\n"
 	.string "but I've grown to like this place, too.$"
 
-Route133_Text_MollieIntro: @ 82A4401
+Route133_Text_MollieIntro:
 	.string "I must have battled thousands\n"
 	.string "of times. I've lost count.$"
 
-Route133_Text_MollieDefeat: @ 82A443A
+Route133_Text_MollieDefeat:
 	.string "I may have lost thousands of times,\n"
 	.string "but a loss still stings.$"
 
-Route133_Text_MolliePostBattle: @ 82A4477
+Route133_Text_MolliePostBattle:
 	.string "Keep at this, youngster. So you can\n"
 	.string "become like my husband and me.$"
 
-Route133_Text_ConorIntro: @ 82A44BA
+Route133_Text_ConorIntro:
 	.string "Young people are too happy to go with\n"
 	.string "the flow. They're without direction.$"
 
-Route133_Text_ConorDefeat: @ 82A4505
+Route133_Text_ConorDefeat:
 	.string "You have a firm sense of purpose.$"
 
-Route133_Text_ConorPostBattle: @ 82A4527
+Route133_Text_ConorPostBattle:
 	.string "Don't let others lead you astray.\n"
 	.string "Don't lose direction as you grow older.$"
 
-Route134_Text_JackIntro: @ 82A4571
+Route134_Text_JackIntro:
 	.string "Even those POKéMON that can swim are\n"
 	.string "carried along by the rapid currents.$"
 
-Route134_Text_JackDefeat: @ 82A45BB
+Route134_Text_JackDefeat:
 	.string "Aiyeeeeh!$"
 
-Route134_Text_JackPostBattle: @ 82A45C5
+Route134_Text_JackPostBattle:
 	.string "I think POKéMON enjoy the fast-running\n"
 	.string "currents around these parts.$"
 
-Route134_Text_LaurelIntro: @ 82A4609
+Route134_Text_LaurelIntro:
 	.string "My LUVDISC are looking for a fun\n"
 	.string "match. Will you join us?$"
 
-Route134_Text_LaurelDefeat: @ 82A4643
+Route134_Text_LaurelDefeat:
 	.string "Oopsie!$"
 
-Route134_Text_LaurelPostBattle: @ 82A464B
+Route134_Text_LaurelPostBattle:
 	.string "There's a collector who's after\n"
 	.string "the SCALES of LUVDISC.$"
 
-Route134_Text_AlexIntro: @ 82A4682
+Route134_Text_AlexIntro:
 	.string "Okeydokey! That's enough rest, gang!\n"
 	.string "It's time for a match!$"
 
-Route134_Text_AlexDefeat: @ 82A46BE
+Route134_Text_AlexDefeat:
 	.string "Tuckered out again…$"
 
-Route134_Text_AlexPostBattle: @ 82A46D2
+Route134_Text_AlexPostBattle:
 	.string "My BIRD POKéMON get tired quickly after\n"
 	.string "a long flight…$"
 
-Route134_Text_HitoshiIntro: @ 82A4709
+Route134_Text_HitoshiIntro:
 	.string "You're a POKéMON TRAINER.\n"
 	.string "No need for words. We battle now.$"
 
-Route134_Text_HitoshiDefeat: @ 82A4745
+Route134_Text_HitoshiDefeat:
 	.string "… … … … … …\n"
 	.string "… … … … … …$"
 
-Route134_Text_HitoshiPostBattle: @ 82A475D
+Route134_Text_HitoshiPostBattle:
 	.string "It was I who challenged you, and yet\n"
 	.string "I lost. I am deeply shamed…$"
 
-Route134_Text_AaronIntro: @ 82A479E
+Route134_Text_AaronIntro:
 	.string "The savage tide in this area serves to\n"
 	.string "make us stronger than ever.$"
 
-Route134_Text_AaronDefeat: @ 82A47E1
+Route134_Text_AaronDefeat:
 	.string "I willingly concede defeat.$"
 
-Route134_Text_AaronPostBattle: @ 82A47FD
+Route134_Text_AaronPostBattle:
 	.string "We will return for more training at\n"
 	.string "METEOR FALLS.\p"
 	.string "If you'd like, you should go, too.\n"
 	.string "It will definitely toughen you up!$"
 
-Route134_Text_KelvinIntro: @ 82A4875
+Route134_Text_KelvinIntro:
 	.string "O-our boat!\n"
 	.string "The tide carried it away!$"
 
-Route134_Text_KelvinDefeat: @ 82A489B
+Route134_Text_KelvinDefeat:
 	.string "Awawawawah!\n"
 	.string "Please, stop! Please!$"
 
-Route134_Text_KelvinPostBattle: @ 82A48BD
+Route134_Text_KelvinPostBattle:
 	.string "If we can't SURF, how are we supposed\n"
 	.string "to get home?\p"
 	.string "Actually, I know a fainted POKéMON\n"
 	.string "can still SURF, but it feels wrong.$"
 
-Route134_Text_MarleyIntro: @ 82A4937
+Route134_Text_MarleyIntro:
 	.string "Can your POKéMON dodge our\n"
 	.string "lightning-quick attacks?$"
 
-Route134_Text_MarleyDefeat: @ 82A496B
+Route134_Text_MarleyDefeat:
 	.string "I never knew such a technique existed!\n"
 	.string "You've defeated us thoroughly.$"
 
-Route134_Text_MarleyPostBattle: @ 82A49B1
+Route134_Text_MarleyPostBattle:
 	.string "I haven't lost my passion for speed.\n"
 	.string "I will try harder.$"
 
-Route134_Text_ReynaIntro: @ 82A49E9
+Route134_Text_ReynaIntro:
 	.string "My POKéMON can't be taken down\n"
 	.string "easily!$"
 
-Route134_Text_ReynaDefeat: @ 82A4A10
+Route134_Text_ReynaDefeat:
 	.string "You're kidding!\n"
 	.string "Explain how I lost!$"
 
-Route134_Text_ReynaPostBattle: @ 82A4A34
+Route134_Text_ReynaPostBattle:
 	.string "Haha!\n"
 	.string "You won, all right!\p"
 	.string "I'll work my way back up by taking on\n"
 	.string "TRAINERS I happen to meet!$"
 
-Route134_Text_HudsonIntro: @ 82A4A8F
+Route134_Text_HudsonIntro:
 	.string "Listen, have you seen another SAILOR\n"
 	.string "around here?$"
 
-Route134_Text_HudsonDefeat: @ 82A4AC1
+Route134_Text_HudsonDefeat:
 	.string "Now, that's something!$"
 
-Route134_Text_HudsonPostBattle: @ 82A4AD8
+Route134_Text_HudsonPostBattle:
 	.string "Our boat drifted out to sea.\p"
 	.string "My buddy's a timid fellow, so I'm\n"
 	.string "worried about him.$"
diff --git a/data/text/trick_house_mechadolls.inc b/data/text/trick_house_mechadolls.inc
index 69d0118bd..7edd1f1be 100644
--- a/data/text/trick_house_mechadolls.inc
+++ b/data/text/trick_house_mechadolls.inc
@@ -1,134 +1,134 @@
-gTrickHouse_Mechadoll_Oddish:: @ 27ECBC
+gTrickHouse_Mechadoll_Oddish::
 	.string "ODDISH$"
 
-gTrickHouse_Mechadoll_Poochyena:: @ 27ECC3
+gTrickHouse_Mechadoll_Poochyena::
 	.string "POOCHYENA$"
 
-gTrickHouse_Mechadoll_Taillow:: @ 27ECCD
+gTrickHouse_Mechadoll_Taillow::
 	.string "TAILLOW$"
 
-gTrickHouse_Mechadoll_Azurill:: @ 27ECD5
+gTrickHouse_Mechadoll_Azurill::
 	.string "AZURILL$"
 
-gTrickHouse_Mechadoll_Lotad:: @ 27ECDD
+gTrickHouse_Mechadoll_Lotad::
 	.string "LOTAD$"
 
-gTrickHouse_Mechadoll_Wingull:: @ 27ECE3
+gTrickHouse_Mechadoll_Wingull::
 	.string "WINGULL$"
 
-gTrickHouse_Mechadoll_Dustox:: @ 27ECEB
+gTrickHouse_Mechadoll_Dustox::
 	.string "DUSTOX$"
 
-gTrickHouse_Mechadoll_Zubat:: @ 27ECF2
+gTrickHouse_Mechadoll_Zubat::
 	.string "ZUBAT$"
 
-gTrickHouse_Mechadoll_Nincada:: @ 27ECF8
+gTrickHouse_Mechadoll_Nincada::
 	.string "NINCADA$"
 
-gTrickHouse_Mechadoll_Ralts:: @ 27ED00
+gTrickHouse_Mechadoll_Ralts::
 	.string "RALTS$"
 
-gTrickHouse_Mechadoll_Zigzagoon:: @ 27ED06
+gTrickHouse_Mechadoll_Zigzagoon::
 	.string "ZIGZAGOON$"
 
-gTrickHouse_Mechadoll_Slakoth:: @ 27ED10
+gTrickHouse_Mechadoll_Slakoth::
 	.string "SLAKOTH$"
 
-gTrickHouse_Mechadoll_Poochyena2:: @ 27ED18
+gTrickHouse_Mechadoll_Poochyena2::
 	.string "POOCHYENA$"
 
-gTrickHouse_Mechadoll_Shroomish:: @ 27ED22
+gTrickHouse_Mechadoll_Shroomish::
 	.string "SHROOMISH$"
 
-gTrickHouse_Mechadoll_Zigzagoon2:: @ 27ED2C
+gTrickHouse_Mechadoll_Zigzagoon2::
 	.string "ZIGZAGOON$"
 
-gTrickHouse_Mechadoll_Poochyena3:: @ 27ED36
+gTrickHouse_Mechadoll_Poochyena3::
 	.string "POOCHYENA$"
 
-gTrickHouse_Mechadoll_Zubat2:: @ 27ED40
+gTrickHouse_Mechadoll_Zubat2::
 	.string "ZUBAT$"
 
-gTrickHouse_Mechadoll_Carvanha:: @ 27ED46
+gTrickHouse_Mechadoll_Carvanha::
 	.string "CARVANHA$"
 
-gTrickHouse_Mechadoll_BurnHeal:: @ 27ED4F
+gTrickHouse_Mechadoll_BurnHeal::
 	.string "BURN HEAL$"
 
-gTrickHouse_Mechadoll_HarborMail:: @ 27ED59
+gTrickHouse_Mechadoll_HarborMail::
 	.string "HARBOR MAIL$"
 
-gTrickHouse_Mechadoll_SamePrice:: @ 27ED65
+gTrickHouse_Mechadoll_SamePrice::
 	.string "Same price$"
 
-gTrickHouse_Mechadoll_60Yen:: @ 27ED70
+gTrickHouse_Mechadoll_60Yen::
 	.string "¥60$"
 
-gTrickHouse_Mechadoll_55Yen:: @ 27ED74
+gTrickHouse_Mechadoll_55Yen::
 	.string "¥55$"
 
-gTrickHouse_Mechadoll_Nothing:: @ 27ED78
+gTrickHouse_Mechadoll_Nothing::
 	.string "Nothing$"
 
-gTrickHouse_Mechadoll_CostMore:: @ 27ED80
+gTrickHouse_Mechadoll_CostMore::
 	.string "They will cost more.$"
 
-gTrickHouse_Mechadoll_CostLess:: @ 27ED95
+gTrickHouse_Mechadoll_CostLess::
 	.string "They will cost less.$"
 
-gTrickHouse_Mechadoll_SamePrice2:: @ 27EDAA
+gTrickHouse_Mechadoll_SamePrice2::
 	.string "Same price$"
 
-gTrickHouse_Mechadoll_Male:: @ 27EDB5
+gTrickHouse_Mechadoll_Male::
 	.string "Male$"
 
-gTrickHouse_Mechadoll_Female:: @ 27EDBA
+gTrickHouse_Mechadoll_Female::
 	.string "Female$"
 
-gTrickHouse_Mechadoll_Neither:: @ 27EDC1
+gTrickHouse_Mechadoll_Neither::
 	.string "Neither$"
 
-gTrickHouse_Mechadoll_ElderlyMen:: @ 27EDC9
+gTrickHouse_Mechadoll_ElderlyMen::
 	.string "Elderly men$"
 
-gTrickHouse_Mechadoll_ElderlyLadies:: @ 27EDD5
+gTrickHouse_Mechadoll_ElderlyLadies::
 	.string "Elderly ladies$"
 
-gTrickHouse_Mechadoll_SameNumber:: @ 27EDE4
+gTrickHouse_Mechadoll_SameNumber::
 	.string "Same number$"
 
-gTrickHouse_Mechadoll_None:: @ 27EDF0
+gTrickHouse_Mechadoll_None::
 	.string "None$"
 
-gTrickHouse_Mechadoll_One:: @ 27EDF5
+gTrickHouse_Mechadoll_One::
 	.string "1$"
 
-gTrickHouse_Mechadoll_Two:: @ 27EDF7
+gTrickHouse_Mechadoll_Two::
 	.string "2$"
 
-gTrickHouse_Mechadoll_Two2:: @ 27EDF9
+gTrickHouse_Mechadoll_Two2::
 	.string "2$"
 
-gTrickHouse_Mechadoll_Three:: @ 27EDFB
+gTrickHouse_Mechadoll_Three::
 	.string "3$"
 
-gTrickHouse_Mechadoll_Four:: @ 27EDFD
+gTrickHouse_Mechadoll_Four::
 	.string "4$"
 
-gTrickHouse_Mechadoll_Six:: @ 27EDFF
+gTrickHouse_Mechadoll_Six::
 	.string "6$"
 
-gTrickHouse_Mechadoll_Seven:: @ 27EE01
+gTrickHouse_Mechadoll_Seven::
 	.string "7$"
 
-gTrickHouse_Mechadoll_Eight:: @ 27EE03
+gTrickHouse_Mechadoll_Eight::
 	.string "8$"
 
-gTrickHouse_Mechadoll_Six2:: @ 27EE05
+gTrickHouse_Mechadoll_Six2::
 	.string "6$"
 
-gTrickHouse_Mechadoll_Seven2:: @ 27EE07
+gTrickHouse_Mechadoll_Seven2::
 	.string "7$"
 
-gTrickHouse_Mechadoll_Eight2:: @ 27EE09
+gTrickHouse_Mechadoll_Eight2::
 	.string "8$"
diff --git a/data/text/tv.inc b/data/text/tv.inc
index 311f2ddd2..68b842158 100644
--- a/data/text/tv.inc
+++ b/data/text/tv.inc
@@ -1,4 +1,4 @@
-LilycoveCity_ContestLobby_Text_InterviewRequest: @ 827EF15
+LilycoveCity_ContestLobby_Text_InterviewRequest:
 	.string "Oh, hello! You were in a POKéMON\n"
 	.string "CONTEST, weren't you?\l"
 	.string "It's easy to tell from your POKéMON.\p"
@@ -7,13 +7,13 @@ LilycoveCity_ContestLobby_Text_InterviewRequest: @ 827EF15
 	.string "If I may, would you be willing to answer\n"
 	.string "a few questions?$"
 
-LilycoveCity_ContestLobby_Text_DescribeContest: @ 827EFE7
+LilycoveCity_ContestLobby_Text_DescribeContest:
 	.string "Oh, you will?\n"
 	.string "Thank you.\p"
 	.string "Briefly, how would you describe the\n"
 	.string "CONTEST you just entered?$"
 
-LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX: @ 827F03E
+LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX:
 	.string "Ah, I see.\n"
 	.string "That's a very edifying comment.\p"
 	.string "You get a good feel for what\n"
@@ -22,7 +22,7 @@ LilycoveCity_ContestLobby_Text_WhatImageWhenYouHearX: @ 827F03E
 	.string "When you hear the word “{STR_VAR_2},”\n"
 	.string "what image do you get?$"
 
-LilycoveCity_ContestLobby_Text_ThatsAllForInterview: @ 827F0EC
+LilycoveCity_ContestLobby_Text_ThatsAllForInterview:
 	.string "I see!\p"
 	.string "So that's how you imagine the concept\n"
 	.string "of “{STR_VAR_2}” to be.\p"
@@ -34,16 +34,16 @@ LilycoveCity_ContestLobby_Text_ThatsAllForInterview: @ 827F0EC
 	.string "make it to television.\l"
 	.string "I hope you'll look forward to it!$"
 
-LilycoveCity_ContestLobby_Text_PleaseDoShareStoryWithMe: @ 827F1EF
+LilycoveCity_ContestLobby_Text_PleaseDoShareStoryWithMe:
 	.string "Oh, too bad…\p"
 	.string "Well, if you come across a good story,\n"
 	.string "please do share it with me.$"
 
-LilycoveCity_ContestLobby_Text_LookingForwardToNextContest: @ 827F23F
+LilycoveCity_ContestLobby_Text_LookingForwardToNextContest:
 	.string "I'll be looking forward to your next\n"
 	.string "POKéMON CONTEST.$"
 
-gTVBravoTrainerText00:: @ 0827F275
+gTVBravoTrainerText00::
 	.string "Yeah!\n"
 	.string "It's BRAVO TRAINER time!\p"
 	.string "Today, we're going to profile a POKéMON\n"
@@ -51,20 +51,20 @@ gTVBravoTrainerText00:: @ 0827F275
 	.string "Now, this POKéMON boasts a {STR_VAR_3}\n"
 	.string "Rank in the {STR_VAR_2} Category.$"
 
-gTVBravoTrainerText01:: @ 0827F304
+gTVBravoTrainerText01::
 	.string "Introducing {STR_VAR_2} the\n"
 	.string "{STR_VAR_1}!\p"
 	.string "The nickname {STR_VAR_2}…\p"
 	.string "Even the nickname exudes an air that\n"
 	.string "proclaims “{STR_VAR_3}”!$"
 
-gTVBravoTrainerText02:: @ 0827F361
+gTVBravoTrainerText02::
 	.string "Anyway, when the TRAINER {STR_VAR_1}\n"
 	.string "entered the POKéMON in a CONTEST,\l"
 	.string "we managed to get a few impassioned\l"
 	.string "quotes about the trusty partner.$"
 
-gTVBravoTrainerText03:: @ 0827F3E4
+gTVBravoTrainerText03::
 	.string "Asked about the CONTEST afterwards,\n"
 	.string "{STR_VAR_1} happily replied with a huge\l"
 	.string "grin, “{STR_VAR_2}!”\p"
@@ -73,7 +73,7 @@ gTVBravoTrainerText03:: @ 0827F3E4
 	.string "That line perfectly suits {STR_VAR_1}\n"
 	.string "right now, I'd say!$"
 
-gTVBravoTrainerText04:: @ 0827F49F
+gTVBravoTrainerText04::
 	.string "Asked about the CONTEST afterwards,\n"
 	.string "{STR_VAR_1} replied with a tinge of\l"
 	.string "bitterness, “{STR_VAR_2}.”\p"
@@ -82,7 +82,7 @@ gTVBravoTrainerText04:: @ 0827F49F
 	.string "{STR_VAR_1}'s disappointment comes across\n"
 	.string "loud and clear, I'd say!$"
 
-gTVBravoTrainerText05:: @ 0827F565
+gTVBravoTrainerText05::
 	.string "Wouldn't you also like to know what\n"
 	.string "{STR_VAR_1} imagines {STR_VAR_2} to be?\p"
 	.string "You bet we did!\n"
@@ -92,12 +92,12 @@ gTVBravoTrainerText05:: @ 0827F565
 	.string "That's what the concept of {STR_VAR_2}\n"
 	.string "represents to {STR_VAR_1}!$"
 
-gTVBravoTrainerText06:: @ 0827F624
+gTVBravoTrainerText06::
 	.string "The last move {STR_VAR_2} used by\n"
 	.string "the {STR_VAR_1} is entirely about\l"
 	.string "“{STR_VAR_3}”!$"
 
-gTVBravoTrainerText07:: @ 0827F65C
+gTVBravoTrainerText07::
 	.string "Bravo, {STR_VAR_1}!\n"
 	.string "Bravo, {STR_VAR_2}!\p"
 	.string "I hope we can count on seeing\n"
@@ -105,10 +105,10 @@ gTVBravoTrainerText07:: @ 0827F65C
 	.string "That's all the time we have!\n"
 	.string "Until next time, see you!$"
 
-gTVBravoTrainerText08:: @ 0827F6E6
+gTVBravoTrainerText08::
 	.string "Introducing the TRAINER's {STR_VAR_1}!$"
 
-BattleFrontier_BattleTowerLobby_Text_InterviewRequest:: @ 0827F704
+BattleFrontier_BattleTowerLobby_Text_InterviewRequest::
 	.string "Hello! You're the TRAINER who just had\n"
 	.string "a battle, right?\p"
 	.string "I'm gathering interviews with TRAINERS\n"
@@ -116,7 +116,7 @@ BattleFrontier_BattleTowerLobby_Text_InterviewRequest:: @ 0827F704
 	.string "May I get a few words from you about\n"
 	.string "your impressions on battling?$"
 
-BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut:: @ 0827F7BA
+BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut::
 	.string "You will? Really?\n"
 	.string "Thank you!\l"
 	.string "Then, uh…\p"
@@ -125,48 +125,48 @@ BattleFrontier_BattleTowerLobby_Text_HowDidBattleTowerTurnOut:: @ 0827F7BA
 	.string "Were you satisfied with the battle?\n"
 	.string "Or are you unhappy?$"
 
-BattleFrontier_BattleTowerLobby_Text_SorryWeDisturbedYou:: @ 0827F84C
+BattleFrontier_BattleTowerLobby_Text_SorryWeDisturbedYou::
 	.string "Oh…\n"
 	.string "Sorry we disturbed you.\p"
 	.string "Please give us an interview the next\n"
 	.string "time you visit the BATTLE TOWER.$"
 
-BattleFrontier_BattleTowerLobby_Text_ObviousYouHadGreatBattle:: @ 0827F8AE
+BattleFrontier_BattleTowerLobby_Text_ObviousYouHadGreatBattle::
 	.string "Well, of course!\p"
 	.string "That unmistakable look of satisfaction\n"
 	.string "on your face…\p"
 	.string "It's obvious that you've had a great\n"
 	.string "battle.$"
 
-BattleFrontier_BattleTowerLobby_Text_DifficultToMakeBattleTurnOutAsPlanned:: @ 0827F921
+BattleFrontier_BattleTowerLobby_Text_DifficultToMakeBattleTurnOutAsPlanned::
 	.string "Oh, I see…\p"
 	.string "Well, it certainly is difficult to make a\n"
 	.string "battle turn out exactly as planned.$"
 
-BattleFrontier_BattleTowerLobby_Text_DescribeYourBattle:: @ 0827F97A
+BattleFrontier_BattleTowerLobby_Text_DescribeYourBattle::
 	.string "Oh, oh, may I ask one more question?\p"
 	.string "If you were to describe your\n"
 	.string "impressions about this battle with\l"
 	.string "one saying, what would it be?$"
 
-BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine:: @ 0827F9FD
+BattleFrontier_BattleTowerLobby_Text_ThatsGreatLine::
 	.string "Oh, that is stunningly cool!\p"
 	.string "That's a great line!\n"
 	.string "I hope you'll do great next time, too.\p"
 	.string "I hope to see you again!$"
 
-BattleFrontier_BattleTowerLobby_Text_SilentType:: @ 0827FA6F
+BattleFrontier_BattleTowerLobby_Text_SilentType::
 	.string "Oh, I see…\p"
 	.string "Still, being the silent type is also\n"
 	.string "cool, isn't it?\p"
 	.string "I hope you'll give me the opportunity\n"
 	.string "to share your thoughts again!$"
 
-BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle:: @ 0827FAF3
+BattleFrontier_BattleTowerLobby_Text_LookingForwardToNextBattle::
 	.string "I'll be looking forward to your\n"
 	.string "next battle!$"
 
-gTVBravoTrainerBattleTowerText00:: @ 0827FB20
+gTVBravoTrainerBattleTowerText00::
 	.string "Yeah!\n"
 	.string "It's BRAVO TRAINER time!\p"
 	.string "Today, we're going to profile {STR_VAR_1},\n"
@@ -174,12 +174,12 @@ gTVBravoTrainerBattleTowerText00:: @ 0827FB20
 	.string "For the challenge, {STR_VAR_1} entered\n"
 	.string "one wicked {STR_VAR_2}.$"
 
-gTVBravoTrainerBattleTowerText01:: @ 0827FBB3
+gTVBravoTrainerBattleTowerText01::
 	.string "The pair set a new record of {STR_VAR_2} wins\n"
 	.string "in a row in {STR_VAR_1} competition!\l"
 	.string "Bravo, TRAINER!$"
 
-gTVBravoTrainerBattleTowerText02:: @ 0827FC04
+gTVBravoTrainerBattleTowerText02::
 	.string "The twosome finally succumbed to\n"
 	.string "{STR_VAR_1} in match number {STR_VAR_2}.\l"
 	.string "Nice try, TRAINER!\p"
@@ -188,7 +188,7 @@ gTVBravoTrainerBattleTowerText02:: @ 0827FC04
 	.string "We asked the TRAINER for impressions\n"
 	.string "on the match with {STR_VAR_1}.$"
 
-gTVBravoTrainerBattleTowerText03:: @ 0827FCD1
+gTVBravoTrainerBattleTowerText03::
 	.string "The twosome won it all by defeating\n"
 	.string "{STR_VAR_1}'s {STR_VAR_2} thoroughly.\l"
 	.string "Bravo, TRAINER!\p"
@@ -197,7 +197,7 @@ gTVBravoTrainerBattleTowerText03:: @ 0827FCD1
 	.string "We asked the TRAINER for impressions\n"
 	.string "on the moment of glory.$"
 
-gTVBravoTrainerBattleTowerText04:: @ 0827FD91
+gTVBravoTrainerBattleTowerText04::
 	.string "After a string of wins, the pair finally\n"
 	.string "succumbed to {STR_VAR_1}'s {STR_VAR_2},\l"
 	.string "their final hurdle.\p"
@@ -208,7 +208,7 @@ gTVBravoTrainerBattleTowerText04:: @ 0827FD91
 	.string "We asked the TRAINER for impressions\n"
 	.string "on battling the celebrity pair.$"
 
-gTVBravoTrainerBattleTowerText05:: @ 0827FE93
+gTVBravoTrainerBattleTowerText05::
 	.string "This is what the TRAINER had to say:\n"
 	.string "“I'm satisfied!”\p"
 	.string "Now isn't that a refreshing reply?\n"
@@ -218,7 +218,7 @@ gTVBravoTrainerBattleTowerText05:: @ 0827FE93
 	.string "I found out exactly how satisfied\n"
 	.string "when I heard the TRAINER say this:$"
 
-gTVBravoTrainerBattleTowerText06:: @ 0827FF89
+gTVBravoTrainerBattleTowerText06::
 	.string "This is what the TRAINER had to say:\n"
 	.string "“I'm not satisfied…”\p"
 	.string "Our TRAINER was obviously a little down\n"
@@ -228,22 +228,22 @@ gTVBravoTrainerBattleTowerText06:: @ 0827FF89
 	.string "Anyway, I found out how dissatisfied\n"
 	.string "our TRAINER was when I heard this:$"
 
-gTVBravoTrainerBattleTowerText07:: @ 0828009C
+gTVBravoTrainerBattleTowerText07::
 	.string "None$"
 
-gTVBravoTrainerBattleTowerText08:: @ 082800A1
+gTVBravoTrainerBattleTowerText08::
 	.string "None$"
 
-gTVBravoTrainerBattleTowerText09:: @ 082800A6
+gTVBravoTrainerBattleTowerText09::
 	.string "None$"
 
-gTVBravoTrainerBattleTowerText10:: @ 082800AB
+gTVBravoTrainerBattleTowerText10::
 	.string "None$"
 
-gTVBravoTrainerBattleTowerText11:: @ 082800B0
+gTVBravoTrainerBattleTowerText11::
 	.string "“{STR_VAR_1}.”$"
 
-gTVBravoTrainerBattleTowerText12:: @ 082800B6
+gTVBravoTrainerBattleTowerText12::
 	.string "“{STR_VAR_1}.”\n"
 	.string "Now isn't that great?\p"
 	.string "It really expresses {STR_VAR_2}'s joy,\n"
@@ -252,7 +252,7 @@ gTVBravoTrainerBattleTowerText12:: @ 082800B6
 	.string "end… It really was what you'd call\l"
 	.string "“{STR_VAR_1}”!$"
 
-gTVBravoTrainerBattleTowerText13:: @ 0828013D
+gTVBravoTrainerBattleTowerText13::
 	.string "“{STR_VAR_1}.”\n"
 	.string "Now isn't that fitting?\p"
 	.string "That battle with {STR_VAR_3} at the\n"
@@ -261,7 +261,7 @@ gTVBravoTrainerBattleTowerText13:: @ 0828013D
 	.string "{STR_VAR_2}'s disappointment comes across\n"
 	.string "loud and clear, I'd say!$"
 
-gTVBravoTrainerBattleTowerText14:: @ 082801E6
+gTVBravoTrainerBattleTowerText14::
 	.string "Bravo, {STR_VAR_1}!\n"
 	.string "Bravo, {STR_VAR_2}!\p"
 	.string "I hope we can count on seeing\n"
@@ -269,7 +269,7 @@ gTVBravoTrainerBattleTowerText14:: @ 082801E6
 	.string "That's all the time we have!\n"
 	.string "Until next time, see you!$"
 
-SlateportCity_PokemonFanClub_Text_InterviewRequestHasName: @ 08280270
+SlateportCity_PokemonFanClub_Text_InterviewRequestHasName:
 	.string "Wow!\p"
 	.string "It's plain to see that you lavish your\n"
 	.string "love on your {STR_VAR_1}.\p"
@@ -280,36 +280,36 @@ SlateportCity_PokemonFanClub_Text_InterviewRequestHasName: @ 08280270
 	.string "Would you be willing to answer a few\n"
 	.string "simple questions for me?$"
 
-SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers: @ 0828034F
+SlateportCity_PokemonFanClub_Text_HereGoesQuickAnswers:
 	.string "Great! Thank you!\p"
 	.string "Okay, here goes.\n"
 	.string "I just need quick answers, okay?$"
 
-SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon: @ 08280393
+SlateportCity_PokemonFanClub_Text_DescribeFeelingsFirstMetMon:
 	.string "When you first met {STR_VAR_1},\n"
 	.string "what did you feel?\p"
 	.string "How would you describe your feelings\n"
 	.string "at the time?$"
 
-SlateportCity_PokemonFanClub_Text_LikenMonToSomethingYouLike: @ 082803EF
+SlateportCity_PokemonFanClub_Text_LikenMonToSomethingYouLike:
 	.string "Your {STR_VAR_1} is cared for lovingly.\p"
 	.string "If you were to liken it to something\n"
 	.string "that you like, what would it be?$"
 
-SlateportCity_PokemonFanClub_Text_WhatAttractedYouAboutMon: @ 08280454
+SlateportCity_PokemonFanClub_Text_WhatAttractedYouAboutMon:
 	.string "This question also relates to your\n"
 	.string "beloved {STR_VAR_1}.\p"
 	.string "What was it about {STR_VAR_1} that\n"
 	.string "attracted you?$"
 
-SlateportCity_PokemonFanClub_Text_WhatDoPokemonMeanToYou: @ 082804AC
+SlateportCity_PokemonFanClub_Text_WhatDoPokemonMeanToYou:
 	.string "Okay, that makes sense.\p"
 	.string "The next question might be a little\n"
 	.string "on the tough side.\p"
 	.string "Here goes…\p"
 	.string "What do POKéMON mean to you?$"
 
-SlateportCity_PokemonFanClub_Text_ThatsAllForInterview: @ 08280523
+SlateportCity_PokemonFanClub_Text_ThatsAllForInterview:
 	.string "I see!\p"
 	.string "Hmhm…\p"
 	.string "Okay!\n"
@@ -321,16 +321,16 @@ SlateportCity_PokemonFanClub_Text_ThatsAllForInterview: @ 08280523
 	.string "Okay, that's all.\n"
 	.string "Bye-bye!$"
 
-SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe: @ 082805E2
+SlateportCity_PokemonFanClub_Text_HereIfYouGetUrgeToTellMe:
 	.string "Oh, okay…\p"
 	.string "Well, if you get the urge to tell me\n"
 	.string "about POKéMON, I'll be here!$"
 
-SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews: @ 0828062E
+SlateportCity_PokemonFanClub_Text_EnjoyDoingInterviews:
 	.string "I enjoy this job--you get to learn\n"
 	.string "about POKéMON by doing interviews.$"
 
-SlateportCity_PokemonFanClub_Text_InterviewRequest: @ 08280674
+SlateportCity_PokemonFanClub_Text_InterviewRequest:
 	.string "Hi, you seem to be very close to your\n"
 	.string "{STR_VAR_1}.\p"
 	.string "Do you know what?\n"
@@ -340,12 +340,12 @@ SlateportCity_PokemonFanClub_Text_InterviewRequest: @ 08280674
 	.string "I'm wondering if you'd be willing to tell\n"
 	.string "me a little about your {STR_VAR_1}?$"
 
-SlateportCity_PokemonFanClub_Text_TellMeAnythingAboutYourMon: @ 0828073B
+SlateportCity_PokemonFanClub_Text_TellMeAnythingAboutYourMon:
 	.string "Wow, thank you!\p"
 	.string "Okay, then, please tell me anything\n"
 	.string "you'd like about your {STR_VAR_1}.$"
 
-SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2: @ 08280789
+SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2:
 	.string "Wow…\n"
 	.string "That's an interesting account.\p"
 	.string "You really are tight with {STR_VAR_1},\n"
@@ -358,7 +358,7 @@ SlateportCity_PokemonFanClub_Text_ThatsAllForInterview2: @ 08280789
 	.string "Okay, that's all.\n"
 	.string "Bye-bye!$"
 
-gTVFanClubOpinionsText00:: @ 08280886
+gTVFanClubOpinionsText00::
 	.string "WE ARE THE POKéMON FAN CLUB!\p"
 	.string "We're on the air!\p"
 	.string "On this program, we get your opinions,\n"
@@ -378,7 +378,7 @@ gTVFanClubOpinionsText00:: @ 08280886
 	.string "Hoo-hah!\p"
 	.string "Let's shout!$"
 
-gTVFanClubOpinionsText01:: @ 08280A44
+gTVFanClubOpinionsText01::
 	.string "We asked {STR_VAR_1}, “When you first\n"
 	.string "laid eyes on your {STR_VAR_2}, what was\l"
 	.string "your initial thought?”\p"
@@ -387,7 +387,7 @@ gTVFanClubOpinionsText01:: @ 08280A44
 	.string "Doesn't it bring back memories of those\n"
 	.string "days long gone by?$"
 
-gTVFanClubOpinionsText02:: @ 08280AFC
+gTVFanClubOpinionsText02::
 	.string "We asked {STR_VAR_1}, “If you were to\n"
 	.string "liken your {STR_VAR_2} to something,\l"
 	.string "it would be…”\p"
@@ -398,7 +398,7 @@ gTVFanClubOpinionsText02:: @ 08280AFC
 	.string "feeling the TRAINER has for\l"
 	.string "{STR_VAR_2}.$"
 
-gTVFanClubOpinionsText03:: @ 08280BC4
+gTVFanClubOpinionsText03::
 	.string "And let's see…\n"
 	.string "What was it about that {STR_VAR_2}\l"
 	.string "that so attracted {STR_VAR_1}?\p"
@@ -408,7 +408,7 @@ gTVFanClubOpinionsText03:: @ 08280BC4
 	.string "The TRAINER's love for the {STR_VAR_2}\n"
 	.string "comes across loud and clear!$"
 
-gTVFanClubOpinionsText04:: @ 08280C7A
+gTVFanClubOpinionsText04::
 	.string "Hm? Oh, there's still more.\n"
 	.string "Let's check it out!\p"
 	.string "Let me see, now…\p"
@@ -427,7 +427,7 @@ gTVFanClubOpinionsText04:: @ 08280C7A
 	.string "All together now…\p"
 	.string "“{STR_VAR_3}!”$"
 
-gTVFanClubText00:: @ 08280DEE
+gTVFanClubText00::
 	.string "WE ARE THE POKéMON FAN CLUB!\p"
 	.string "We're on the air!\p"
 	.string "Today, we'll get rolling with the\n"
@@ -444,34 +444,34 @@ gTVFanClubText00:: @ 08280DEE
 	.string "can express love for the {STR_VAR_2}!\l"
 	.string "Hmhm…$"
 
-gTVFanClubText01:: @ 08280F69
+gTVFanClubText01::
 	.string "Whoah!\n"
 	.string "What an amazing letter!$"
 
-gTVFanClubText02:: @ 08280F88
+gTVFanClubText02::
 	.string "I loved it, so here it is again!$"
 
-gTVFanClubText03:: @ 08280FA9
+gTVFanClubText03::
 	.string "A great letter bears reading over\n"
 	.string "and over!$"
 
-gTVFanClubText04:: @ 08280FD5
+gTVFanClubText04::
 	.string "The bit “{STR_VAR_3},” that really\n"
 	.string "accentuates emotional impact!\p"
 	.string "It's a great letter that has real\n"
 	.string "heartfelt depth!$"
 
-gTVFanClubText05:: @ 08281040
+gTVFanClubText05::
 	.string "Especially that “{STR_VAR_3}” bit!\p"
 	.string "I love how “{STR_VAR_3}” is used!$"
 
-gTVFanClubText06:: @ 08281073
+gTVFanClubText06::
 	.string "By the way, and it's not important,\n"
 	.string "but “{STR_VAR_3}” is a great saying.\p"
 	.string "I've been using “{STR_VAR_3}” a lot\n"
 	.string "in conversations lately.$"
 
-gTVFanClubText07:: @ 082810E7
+gTVFanClubText07::
 	.string "If I had to score this letter,\n"
 	.string "I'd give it {STR_VAR_3} points.\p"
 	.string "Next time, I'll be expecting an even\n"
@@ -479,7 +479,7 @@ gTVFanClubText07:: @ 082810E7
 	.string "A-whoops, will you look at the time?\n"
 	.string "Time to say good-bye until next time!$"
 
-SlateportCity_OceanicMuseum_1F_Text_InterviewRequest: @ 082811A0
+SlateportCity_OceanicMuseum_1F_Text_InterviewRequest:
 	.string "Oh?\n"
 	.string "Do you perhaps like POKéMON?\p"
 	.string "I'm on assignment with the TV network.\p"
@@ -488,37 +488,37 @@ SlateportCity_OceanicMuseum_1F_Text_InterviewRequest: @ 082811A0
 	.string "If you don't mind, could you tell me\n"
 	.string "something about yourself?$"
 
-SlateportCity_OceanicMuseum_1F_Text_InterviewRequestShort: @ 0828126D
+SlateportCity_OceanicMuseum_1F_Text_InterviewRequestShort:
 	.string "I'm gathering stories on POKéMON and\n"
 	.string "TRAINERS that occurred recently.\p"
 	.string "If you don't mind, could you tell me\n"
 	.string "something about yourself?$"
 
-SlateportCity_OceanicMuseum_1F_Text_TellMeExperienceInvolvingPokemon: @ 082812F2
+SlateportCity_OceanicMuseum_1F_Text_TellMeExperienceInvolvingPokemon:
 	.string "Oh, you will?\n"
 	.string "Thank you!\p"
 	.string "Then, please, tell me anything of\n"
 	.string "interest that you experienced recently\l"
 	.string "involving POKéMON.$"
 
-SlateportCity_OceanicMuseum_1F_Text_LetMeKnowIfYouHaveStory: @ 08281367
+SlateportCity_OceanicMuseum_1F_Text_LetMeKnowIfYouHaveStory:
 	.string "Oh, I see…\p"
 	.string "Well, if you do have an interesting\n"
 	.string "story to tell, please let me know.$"
 
-SlateportCity_OceanicMuseum_1F_Text_ThatsAllForInterview: @ 082813B9
+SlateportCity_OceanicMuseum_1F_Text_ThatsAllForInterview:
 	.string "Oh, what an uplifting story!\p"
 	.string "I'll be sure to get your story told\n"
 	.string "on television.\p"
 	.string "It should be aired sometime, I think,\n"
 	.string "so please look forward to it.$"
 
-SlateportCity_OceanicMuseum_1F_Text_BetterWriteUpStory: @ 0828144D
+SlateportCity_OceanicMuseum_1F_Text_BetterWriteUpStory:
 	.string "Hmmm…\n"
 	.string "I've got a good story for a TV program.\p"
 	.string "I'd better write it up in a hurry!$"
 
-gTVRecentHappeningsText00:: @ 0828149E
+gTVRecentHappeningsText00::
 	.string "Hello, it's time for RECENT HAPPENINGS.\p"
 	.string "For POKéMON TRAINERS, every day\n"
 	.string "is a storybook tale.\p"
@@ -530,26 +530,26 @@ gTVRecentHappeningsText00:: @ 0828149E
 	.string "Let's find out.\p"
 	.string "Let's see…$"
 
-gTVRecentHappeningsText01:: @ 082815AF
+gTVRecentHappeningsText01::
 	.string "Wasn't that enlightening?\p"
 	.string "The story gives you a clear idea of what\n"
 	.string "{STR_VAR_1} has experienced recently.\l"
 	.string "It's as if we were there as witnesses!$"
 
-gTVRecentHappeningsText02:: @ 08281636
+gTVRecentHappeningsText02::
 	.string "“{STR_VAR_3}.” That\n"
 	.string "accents the tale and gives it depth.$"
 
-gTVRecentHappeningsText03:: @ 08281666
+gTVRecentHappeningsText03::
 	.string "“{STR_VAR_3}.”\n"
 	.string "That gives the tale a sense of place.\l"
 	.string "It lets us envision the tale's setting.$"
 
-gTVRecentHappeningsText04:: @ 082816BA
+gTVRecentHappeningsText04::
 	.string "The “{STR_VAR_3}”\n"
 	.string "section of the tale is very expressive.$"
 
-gTVRecentHappeningsText05:: @ 082816EB
+gTVRecentHappeningsText05::
 	.string "{STR_VAR_1} has recounted a wonderful\n"
 	.string "tale involving POKéMON.\p"
 	.string "And now {STR_VAR_1}'s tale is indelibly\n"
@@ -557,7 +557,7 @@ gTVRecentHappeningsText05:: @ 082816EB
 	.string "That's it for today.\n"
 	.string "Please tune in next time.$"
 
-gTVMassOutbreakText00:: @ 0828178A
+gTVMassOutbreakText00::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "We've just received word of a very\n"
@@ -573,7 +573,7 @@ gTVMassOutbreakText00:: @ 0828178A
 	.string "{STR_VAR_2} in the wild.\p"
 	.string "That's the news on POKéMON NEWS.$"
 
-gTV3CheersForPokeblocksText00:: @ 082818F4
+gTV3CheersForPokeblocksText00::
 	.string "MC: We hope you're in good cheer,\n"
 	.string "“3 CHEERS FOR {POKEBLOCK}S” is here!\p"
 	.string "Today, we examine the {POKEBLOCK} blended\n"
@@ -583,78 +583,78 @@ gTV3CheersForPokeblocksText00:: @ 082818F4
 	.string "… … … … … …\n"
 	.string "… … … … … …$"
 
-gTV3CheersForPokeblocksText01:: @ 082819C7
+gTV3CheersForPokeblocksText01::
 	.string "GULPIN: Gubi! Gubii!\p"
 	.string "MC: And the verdict is very {STR_VAR_1}!\n"
 	.string "GULPIN says it tastes “{STR_VAR_2}!”\p"
 	.string "Thank you so much, {STR_VAR_3}!$"
 
-gTV3CheersForPokeblocksText02:: @ 08281A2F
+gTV3CheersForPokeblocksText02::
 	.string "{STR_VAR_1}'s blending performance\n"
 	.string "left something to be desired.\p"
 	.string "If this TRAINER could blend better,\n"
 	.string "the {POKEBLOCK} would be much tastier.$"
 
-gTV3CheersForPokeblocksText03:: @ 08281AAC
+gTV3CheersForPokeblocksText03::
 	.string "GULPIN: Gubi! Gubii!\p"
 	.string "MC: Hmm… It's too {STR_VAR_1}.\n"
 	.string "GULPIN says it tastes “{STR_VAR_2}!”\p"
 	.string "It looks like {STR_VAR_3}'s errors\n"
 	.string "hurt the blending quality…$"
 
-gTV3CheersForPokeblocksText04:: @ 08281B28
+gTV3CheersForPokeblocksText04::
 	.string "It's too bad that {STR_VAR_1}'s\n"
 	.string "leading effort went to waste.\p"
 	.string "Let's hope {STR_VAR_2} can turn in\n"
 	.string "a better showing next time!$"
 
-gTV3CheersForPokeblocksText05:: @ 08281B93
+gTV3CheersForPokeblocksText05::
 	.string "Tune in next time!\n"
 	.string "Our slogan is “3 CHEERS FOR {POKEBLOCK}S!”$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer:: @ 8281BCB
+LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer::
 	.string "Hi, there!\p"
 	.string "I'm a big fan of {STR_VAR_1}.\n"
 	.string "What's your opinion of {STR_VAR_1}?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_ThatsWhatYouThink:: @ 8281C06
+LilycoveCity_PokemonTrainerFanClub_Text_ThatsWhatYouThink::
 	.string "I see, I see. That's what you think\n"
 	.string "about the TRAINER.$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer:: @ 8281C3D
+LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer::
 	.string "Have you completely forgotten\n"
 	.string "about {STR_VAR_1}?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer2:: @ 8281C65
+LilycoveCity_PokemonTrainerFanClub_Text_WhatsYourOpinionOfTrainer2::
 	.string "I'm a big fan of {STR_VAR_1}.\n"
 	.string "What's your opinion of {STR_VAR_1}?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_HowStrongRateTrainer:: @ 8281C95
+LilycoveCity_PokemonTrainerFanClub_Text_HowStrongRateTrainer::
 	.string "How strong would you rate {STR_VAR_1}\n"
 	.string "on a scale of one hundred?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer2:: @ 8281CCD
+LilycoveCity_PokemonTrainerFanClub_Text_HaveYouForgottenTrainer2::
 	.string "Have you completely forgotten\n"
 	.string "about {STR_VAR_1}?$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_YouShouldMeetTrainer:: @ 8281CF5
+LilycoveCity_PokemonTrainerFanClub_Text_YouShouldMeetTrainer::
 	.string "Oh, I see!\n"
 	.string "You should meet {STR_VAR_1} sometime.\l"
 	.string "I'm sure you'll become a fan, too!$"
 
-LilycoveCity_PokemonTrainerFanClub_Text_ThankYouIllShareThisInfo:: @ 8281D40
+LilycoveCity_PokemonTrainerFanClub_Text_ThankYouIllShareThisInfo::
 	.string "I see, I see.\p"
 	.string "Thank you!\n"
 	.string "That's very useful to know.\p"
 	.string "I'll share this information with other\n"
 	.string "{STR_VAR_1} fans and discuss it.$"
 
-LilycoveCity_PokemonTrainerFanClub_HopeYouCatchTVSpecial:: @ 8281DB4
+LilycoveCity_PokemonTrainerFanClub_HopeYouCatchTVSpecial::
 	.string "There's going to be a TV special on\n"
 	.string "{STR_VAR_1} very soon.\p"
 	.string "I hope you catch it!$"
 
-gTVTrainerFanClubSpecialText00:: @ 08281DFB
+gTVTrainerFanClubSpecialText00::
 	.string "TRAINER FAN CLUB\n"
 	.string "{STR_VAR_1} SPECIAL!\p"
 	.string "This is a special presentation for\n"
@@ -673,31 +673,31 @@ gTVTrainerFanClubSpecialText00:: @ 08281DFB
 	.string "{STR_VAR_2} also scored {STR_VAR_1}'s\n"
 	.string "strength from 0 to 100.$"
 
-gTVTrainerFanClubSpecialText01:: @ 08281F90
+gTVTrainerFanClubSpecialText01::
 	.string "The score was {STR_VAR_3} points!\n"
 	.string "That is a very high score indeed!\p"
 	.string "{STR_VAR_2} must obviously hold\n"
 	.string "{STR_VAR_1} in very high esteem.$"
 
-gTVTrainerFanClubSpecialText02:: @ 08281FFA
+gTVTrainerFanClubSpecialText02::
 	.string "The score was {STR_VAR_3} points!\n"
 	.string "That is quite a good score.\p"
 	.string "{STR_VAR_2} must consider\n"
 	.string "{STR_VAR_1} to be a rival.$"
 
-gTVTrainerFanClubSpecialText03:: @ 08282052
+gTVTrainerFanClubSpecialText03::
 	.string "The score was {STR_VAR_3} points!\n"
 	.string "That's a rather weak score.\p"
 	.string "{STR_VAR_2} must consider\n"
 	.string "{STR_VAR_1} to be a mere sidekick.$"
 
-gTVTrainerFanClubSpecialText04:: @ 082820B2
+gTVTrainerFanClubSpecialText04::
 	.string "The score was {STR_VAR_3} point(s)!\n"
 	.string "That's a terrible score.\p"
 	.string "{STR_VAR_2} must consider\n"
 	.string "{STR_VAR_1} to be an underling.$"
 
-gTVTrainerFanClubSpecialText05:: @ 0828210E
+gTVTrainerFanClubSpecialText05::
 	.string "There you have it, folks!\p"
 	.string "I think we all learned something\n"
 	.string "new about {STR_VAR_1}.\p"
@@ -705,7 +705,7 @@ gTVTrainerFanClubSpecialText05:: @ 0828210E
 	.string "{STR_VAR_2}'s words.\p"
 	.string "{STR_VAR_3} {STR_VAR_1}!$"
 
-gTVNameRaterText00:: @ 0828218A
+gTVNameRaterText00::
 	.string "And now, it's time for…\n"
 	.string "THE NAME RATER SHOW.\p"
 	.string "I tell your POKéMON's fortune from\n"
@@ -719,103 +719,103 @@ gTVNameRaterText00:: @ 0828218A
 	.string "Hmm…\n"
 	.string "This nickname is…$"
 
-gTVNameRaterText01:: @ 0828229E
+gTVNameRaterText01::
 	.string "A nickname that hints at talent in many\n"
 	.string "different ways.\p"
 	.string "I urge this TRAINER to take courage\n"
 	.string "and take on many challenges.$"
 
-gTVNameRaterText02:: @ 08282317
+gTVNameRaterText02::
 	.string "A nickname that perfectly complements\n"
 	.string "{STR_VAR_1}, the TRAINER's name.\p"
 	.string "It suggests that you will forge a fine\n"
 	.string "partnership with precise timing.$"
 
-gTVNameRaterText03:: @ 0828239D
+gTVNameRaterText03::
 	.string "A nickname fit for a unique individual\n"
 	.string "of a POKéMON!\p"
 	.string "If raised properly, this POKéMON's\n"
 	.string "uniqueness will bloom excessively!$"
 
-gTVNameRaterText04:: @ 08282418
+gTVNameRaterText04::
 	.string "A nickname that will nurture the caring\n"
 	.string "and compassionate side of POKéMON.\p"
 	.string "If raised properly, this POKéMON will\n"
 	.string "come to exhibit real warmth!$"
 
-gTVNameRaterText05:: @ 082824A6
+gTVNameRaterText05::
 	.string "A very fine nickname that hints at\n"
 	.string "greatness to come.\p"
 	.string "I am intrigued about what the future\n"
 	.string "holds in store for this POKéMON.$"
 
-gTVNameRaterText06:: @ 08282522
+gTVNameRaterText06::
 	.string "A good nickname that should make the\n"
 	.string "POKéMON hale and hearty!\p"
 	.string "That POKéMON should remain fit and\n"
 	.string "robust for a long, long time.$"
 
-gTVNameRaterText07:: @ 082825A1
+gTVNameRaterText07::
 	.string "A good nickname that should make the\n"
 	.string "POKéMON very active!\p"
 	.string "I should think that this POKéMON will be\n"
 	.string "a strong performer in battles.$"
 
-gTVNameRaterText08:: @ 08282623
+gTVNameRaterText08::
 	.string "An appealing nickname that should make\n"
 	.string "the POKéMON very charming!\p"
 	.string "I don't doubt that this POKéMON will be\n"
 	.string "quite the charmer in POKéMON CONTESTS.$"
 
-gTVNameRaterText09:: @ 082826B4
+gTVNameRaterText09::
 	.string "The nickname {STR_VAR_1} is rooted by\n"
 	.string "the letter “{STR_VAR_3}.”\p"
 	.string "That letter is supported by the first\n"
 	.string "letter “{STR_VAR_2},” which gives it a solid sense\l"
 	.string "of presence as a nickname.$"
 
-gTVNameRaterText10:: @ 0828274D
+gTVNameRaterText10::
 	.string "The nickname {STR_VAR_1} is very\n"
 	.string "shapely in a pleasing manner.\p"
 	.string "The presence of the letters “{STR_VAR_2}” and\n"
 	.string "“{STR_VAR_3}”--now that is remarkably good!$"
 
-gTVNameRaterText11:: @ 082827CB
+gTVNameRaterText11::
 	.string "The nickname {STR_VAR_1}--it has a\n"
 	.string "sublime, flowing feel to it.\p"
 	.string "The flow from the initial letter “{STR_VAR_2}” to\n"
 	.string "“{STR_VAR_3}” is especially wonderful.$"
 
-gTVNameRaterText12:: @ 08282849
+gTVNameRaterText12::
 	.string "Let's examine other examples of fine\n"
 	.string "nicknames, shall we?$"
 
-gTVNameRaterText13:: @ 08282883
+gTVNameRaterText13::
 	.string "Try this example. Take a part of the\n"
 	.string "TRAINER name of {STR_VAR_1}, and end\l"
 	.string "up with the fine nickname {STR_VAR_2}{STR_VAR_3}.$"
 
-gTVNameRaterText14:: @ 082828E4
+gTVNameRaterText14::
 	.string "The nickname {STR_VAR_2}{STR_VAR_3} would also work\n"
 	.string "quite well.$"
 
-gTVNameRaterText15:: @ 08282912
+gTVNameRaterText15::
 	.string "The POKéMON's species name of\n"
 	.string "{STR_VAR_2} could be used as the basis\l"
 	.string "for making the nickname {STR_VAR_1}{STR_VAR_3}.$"
 
-gTVNameRaterText16:: @ 0828296C
+gTVNameRaterText16::
 	.string "{STR_VAR_1}{STR_VAR_3} would also be an effective\n"
 	.string "nickname.$"
 
-gTVNameRaterText17:: @ 08282996
+gTVNameRaterText17::
 	.string "What should always be avoided is using\n"
 	.string "another POKéMON species name.\p"
 	.string "For instance, avoid taking the name of\n"
 	.string "{STR_VAR_2} to make the nickname {STR_VAR_1}{STR_VAR_3}.\l"
 	.string "That is unacceptable.$"
 
-gTVNameRaterText18:: @ 08282A36
+gTVNameRaterText18::
 	.string "I must say that {STR_VAR_1} is quite\n"
 	.string "a good nickname.\p"
 	.string "I hope that the TRAINER will continue\n"
@@ -823,7 +823,7 @@ gTVNameRaterText18:: @ 08282A36
 	.string "That's it for today's show.\n"
 	.string "May we meet again.$"
 
-gTVPokemonAnglerText00:: @ 08282ACF
+gTVPokemonAnglerText00::
 	.string "{STR_VAR_2} ANGLER\p"
 	.string "ANNOUNCER: Hello! Today, we'll get tips\n"
 	.string "on fishing for {STR_VAR_2}.\p"
@@ -850,7 +850,7 @@ gTVPokemonAnglerText00:: @ 08282ACF
 	.string "Until our next broadcast, farewell and\n"
 	.string "good fishing to you all!$"
 
-gTVPokemonAnglerText01:: @ 08282D7C
+gTVPokemonAnglerText01::
 	.string "{STR_VAR_2} ANGLER\p"
 	.string "ANNOUNCER: Hello! Today, we'll get tips\n"
 	.string "on fishing for {STR_VAR_2}.\p"
@@ -872,7 +872,7 @@ gTVPokemonAnglerText01:: @ 08282D7C
 	.string "Until our next broadcast, farewell and\n"
 	.string "good fishing to you all!$"
 
-gTVPokemonTodayFailedText00:: @ 08282F9B
+gTVPokemonTodayFailedText00::
 	.string "Hello!\p"
 	.string "It's time for POKéMON TODAY!\p"
 	.string "BIG SIS: Hi! Is everyone peachy and\n"
@@ -882,7 +882,7 @@ gTVPokemonTodayFailedText00:: @ 08282F9B
 	.string "BIG BRO: Yeah! That's what we're going\n"
 	.string "to do!$"
 
-gTVPokemonTodayFailedText01:: @ 0828304D
+gTVPokemonTodayFailedText01::
 	.string "Oh!\n"
 	.string "Speaking of {STR_VAR_1}…\p"
 	.string "BIG SIS, I saw the TRAINER with my very\n"
@@ -894,7 +894,7 @@ gTVPokemonTodayFailedText01:: @ 0828304D
 	.string "{STR_VAR_1}, who was trying to catch the\l"
 	.string "POKéMON {STR_VAR_3}, but…$"
 
-gTVPokemonTodayFailedText02:: @ 08283135
+gTVPokemonTodayFailedText02::
 	.string "The POKéMON managed to get away!\p"
 	.string "It ended up wasting this many\n"
 	.string "POKé BALLS: {STR_VAR_2}!\p"
@@ -902,7 +902,7 @@ gTVPokemonTodayFailedText02:: @ 08283135
 	.string "of frustration on {STR_VAR_1}'s face when\l"
 	.string "the POKéMON took off!$"
 
-gTVPokemonTodayFailedText03:: @ 082831DF
+gTVPokemonTodayFailedText03::
 	.string "But {STR_VAR_1} goofed and made the\n"
 	.string "POKéMON faint!\p"
 	.string "It ended up wasting this many\n"
@@ -911,7 +911,7 @@ gTVPokemonTodayFailedText03:: @ 082831DF
 	.string "of stunned dismay on {STR_VAR_1}'s face\l"
 	.string "when the POKéMON fainted!$"
 
-gTVPokemonTodayFailedText04:: @ 08283294
+gTVPokemonTodayFailedText04::
 	.string "BIG SIS: Hey, there!\n"
 	.string "That's not nice!\p"
 	.string "You shouldn't be laughing at other\n"
@@ -921,7 +921,7 @@ gTVPokemonTodayFailedText04:: @ 08283294
 	.string "BIG BRO: That's true!\n"
 	.string "Sorry for laughing.$"
 
-gTVPokemonTodayFailedText05:: @ 08283337
+gTVPokemonTodayFailedText05::
 	.string "BIG SIS: Bufufu…\p"
 	.string "BIG BRO: Hey!\n"
 	.string "You just laughed, too!\p"
@@ -932,7 +932,7 @@ gTVPokemonTodayFailedText05:: @ 08283337
 	.string "What a shame!\p"
 	.string "BIG BRO: …$"
 
-gTVPokemonTodayFailedText06:: @ 082833C6
+gTVPokemonTodayFailedText06::
 	.string "BIG SIS: That's enough silliness!\n"
 	.string "Let's look at today's POKéMON…\p"
 	.string "Huh?\n"
@@ -943,7 +943,7 @@ gTVPokemonTodayFailedText06:: @ 082833C6
 	.string "BIG SIS: Hey, don't end the show\n"
 	.string "without me!$"
 
-gTVPokemonTodaySuccessfulText00:: @ 082834A0
+gTVPokemonTodaySuccessfulText00::
 	.string "Hello!\p"
 	.string "It's time for POKéMON TODAY!\p"
 	.string "BIG SIS: Hi! Is everyone peachy and\n"
@@ -953,30 +953,30 @@ gTVPokemonTodaySuccessfulText00:: @ 082834A0
 	.string "BIG BRO: Yeah! That's what we're going\n"
 	.string "to do!$"
 
-gTVPokemonTodaySuccessfulText01:: @ 08283552
+gTVPokemonTodaySuccessfulText01::
 	.string "BIG SIS: {STR_VAR_1} gave the nickname\n"
 	.string "{STR_VAR_3} to the {STR_VAR_2}!\p"
 	.string "It sounds like {STR_VAR_3} is getting\n"
 	.string "good, loving care!$"
 
-gTVPokemonTodaySuccessfulText02:: @ 082835AE
+gTVPokemonTodaySuccessfulText02::
 	.string "BIG BRO: The TRAINER had to throw this\n"
 	.string "many POKé BALLS to catch it: {STR_VAR_3}!\p"
 	.string "It finally took a single {STR_VAR_2}\n"
 	.string "to catch it!$"
 
-gTVPokemonTodaySuccessfulText03:: @ 0828361F
+gTVPokemonTodaySuccessfulText03::
 	.string "BIG SIS: If it was that easy to catch,\n"
 	.string "it must have been destiny that brought\l"
 	.string "{STR_VAR_1} and the {STR_VAR_2} together!$"
 
-gTVPokemonTodaySuccessfulText04:: @ 08283685
+gTVPokemonTodaySuccessfulText04::
 	.string "BIG SIS: Wow! That's so neat!\p"
 	.string "But you know what they say, a POKéMON\n"
 	.string "that takes a lot of effort to catch\l"
 	.string "earns the love of its TRAINER!$"
 
-gTVPokemonTodaySuccessfulText05:: @ 0828370C
+gTVPokemonTodaySuccessfulText05::
 	.string "BIG SIS: {STR_VAR_1}'s {STR_VAR_2} is a\n"
 	.string "memorable POKéMON because it took an\l"
 	.string "invaluable MASTER BALL to catch!\p"
@@ -984,20 +984,20 @@ gTVPokemonTodaySuccessfulText05:: @ 0828370C
 	.string "BIG SIS: {STR_VAR_1} must have really\n"
 	.string "wanted that {STR_VAR_2}, for sure!$"
 
-gTVPokemonTodaySuccessfulText06:: @ 082837C2
+gTVPokemonTodaySuccessfulText06::
 	.string "BIG BRO: Then to give the nickname\n"
 	.string "{STR_VAR_3} to that {STR_VAR_2}…\p"
 	.string "You really get a good idea about\n"
 	.string "{STR_VAR_1}'s TRAINER sense.\p"
 	.string "BIG SIS: I second that notion!$"
 
-gTVPokemonTodaySuccessfulText07:: @ 08283848
+gTVPokemonTodaySuccessfulText07::
 	.string "If it were me, I'd give that nickname\n"
 	.string "to something like this {STR_VAR_3}!\p"
 	.string "BIG BRO: Whoa! That could be the start\n"
 	.string "of something new!$"
 
-gTVPokemonTodaySuccessfulText08:: @ 082838C2
+gTVPokemonTodaySuccessfulText08::
 	.string "{STR_VAR_2} the {STR_VAR_1}?\n"
 	.string "Doesn't that sound perfect?\p"
 	.string "The letters and everything--they\n"
@@ -1005,7 +1005,7 @@ gTVPokemonTodaySuccessfulText08:: @ 082838C2
 	.string "{STR_VAR_1}!\p"
 	.string "BIG BRO: Yeah, true, that!$"
 
-gTVPokemonTodaySuccessfulText09:: @ 0828394A
+gTVPokemonTodaySuccessfulText09::
 	.string "As far as I know, no TRAINER has ever\n"
 	.string "given the nickname {STR_VAR_2} to their\l"
 	.string "{STR_VAR_1}!\p"
@@ -1013,13 +1013,13 @@ gTVPokemonTodaySuccessfulText09:: @ 0828394A
 	.string "great taste the TRAINER has in picking\l"
 	.string "nicknames!$"
 
-gTVPokemonTodaySuccessfulText10:: @ 082839EA
+gTVPokemonTodaySuccessfulText10::
 	.string "The next time I catch a POKéMON,\n"
 	.string "I should give it the name {STR_VAR_2}.\p"
 	.string "BIG BRO: Huh? Me, too!\n"
 	.string "I'll use the nickname {STR_VAR_2}, too!$"
 
-gTVPokemonTodaySuccessfulText11:: @ 08283A5F
+gTVPokemonTodaySuccessfulText11::
 	.string "BIG SIS: Oh, no!\n"
 	.string "Look at the time!\p"
 	.string "Well, gang, this is it for today.\n"
@@ -1027,7 +1027,7 @@ gTVPokemonTodaySuccessfulText11:: @ 08283A5F
 	.string "BIG BRO: Remember, it could be your\n"
 	.string "POKéMON in the spotlight next time!$"
 
-SmartShopper_Text_Intro:: @ 08283B05
+SmartShopper_Text_Intro::
 	.string "Hello!\p"
 	.string "It's time for TODAY'S SMART SHOPPER.\p"
 	.string "INTERVIEWER: How are you, viewers?\p"
@@ -1036,7 +1036,7 @@ SmartShopper_Text_Intro:: @ 08283B05
 	.string "Let's check on what the hot sellers\n"
 	.string "have been recently.$"
 
-SmartShopper_Text_ClerkNormal:: @ 08283BAF
+SmartShopper_Text_ClerkNormal::
 	.string "Let's interview the clerk to get the\n"
 	.string "lowdown.\p"
 	.string "Hi, how's your business?\p"
@@ -1046,7 +1046,7 @@ SmartShopper_Text_ClerkNormal:: @ 08283BAF
 	.string "Why, just the other day a TRAINER\n"
 	.string "named {STR_VAR_1} bought {STR_VAR_3}.$"
 
-SmartShopper_Text_RandomComment1:: @ 08283C81
+SmartShopper_Text_RandomComment1::
 	.string "INTERVIEWER: The TRAINER bought\n"
 	.string "{STR_VAR_3} {STR_VAR_2}S? That's a haul!\p"
 	.string "If I may say so, {STR_VAR_1} must have\n"
@@ -1055,13 +1055,13 @@ SmartShopper_Text_RandomComment1:: @ 08283C81
 	.string "For traveling, {STR_VAR_2}S are so\n"
 	.string "important!$"
 
-SmartShopper_Text_RandomComment2:: @ 08283D32
+SmartShopper_Text_RandomComment2::
 	.string "INTERVIEWER: Speaking of the item\n"
 	.string "{STR_VAR_2}, I just bought {STR_VAR_3} of\l"
 	.string "them recently.\p"
 	.string "After all, {STR_VAR_2}'s a great item!$"
 
-SmartShopper_Text_RandomComment3:: @ 08283D99
+SmartShopper_Text_RandomComment3::
 	.string "INTERVIEWER: {STR_VAR_2}?!\n"
 	.string "But {STR_VAR_3} of them?!\p"
 	.string "I didn't think there would be anyone\n"
@@ -1069,7 +1069,7 @@ SmartShopper_Text_RandomComment3:: @ 08283D99
 	.string "My goodness, I can only afford one or\n"
 	.string "two at a time…$"
 
-SmartShopper_Text_RandomComment4:: @ 08283E28
+SmartShopper_Text_RandomComment4::
 	.string "INTERVIEWER: One time, I bought\n"
 	.string "a whole lot of the item {STR_VAR_2}.\p"
 	.string "But it turned out to be too many.\n"
@@ -1079,21 +1079,21 @@ SmartShopper_Text_RandomComment4:: @ 08283E28
 	.string "Oops!\p"
 	.string "There's no point talking about me!$"
 
-SmartShopper_Text_SecondItem:: @ 08283F01
+SmartShopper_Text_SecondItem::
 	.string "CLERK: {STR_VAR_1} also bought the item\n"
 	.string "{STR_VAR_2} in bulk, taking {STR_VAR_3}.\p"
 	.string "INTERVIEWER: Oh, that's smart.\n"
 	.string "{STR_VAR_2}'s a very good item, too.$"
 
-SmartShopper_Text_ThirdItem:: @ 08283F72
+SmartShopper_Text_ThirdItem::
 	.string "CLERK: And, the TRAINER also bought\n"
 	.string "{STR_VAR_3} of the item {STR_VAR_2}.$"
 
-SmartShopper_Text_DuringSale:: @ 08283FA9
+SmartShopper_Text_DuringSale::
 	.string "CLERK: Plus, it was during a big sale.\n"
 	.string "That's smart shopping.$"
 
-SmartShopper_Text_OutroNormal:: @ 08283FE7
+SmartShopper_Text_OutroNormal::
 	.string "INTERVIEWER: Hmm… {STR_VAR_1} sounds like\n"
 	.string "quite the shrewd bargain hunter!\p"
 	.string "In total, {STR_VAR_1}'s purchases came to…\p"
@@ -1102,11 +1102,11 @@ SmartShopper_Text_OutroNormal:: @ 08283FE7
 	.string "Oops! We're out of time!\n"
 	.string "See you on our next broadcast!$"
 
-SmartShopper_Text_IsVIP:: @ 0828409E
+SmartShopper_Text_IsVIP::
 	.string "CLERK: {STR_VAR_1} is a VIP customer,\n"
 	.string "no doubt about it.$"
 
-SmartShopper_Text_ClerkMax:: @ 082840CE
+SmartShopper_Text_ClerkMax::
 	.string "Let's interview the clerk to get the\n"
 	.string "lowdown.\p"
 	.string "Hi, how's your business?\p"
@@ -1127,7 +1127,7 @@ SmartShopper_Text_ClerkMax:: @ 082840CE
 	.string "CLERK: {STR_VAR_1} is a VIP customer,\n"
 	.string "no doubt about it.$"
 
-SmartShopper_Text_OutroMax:: @ 082842E6
+SmartShopper_Text_OutroMax::
 	.string "INTERVIEWER: Hmm…\n"
 	.string "That is amazing.\p"
 	.string "But why would the TRAINER need to buy\n"
@@ -1138,7 +1138,7 @@ SmartShopper_Text_OutroMax:: @ 082842E6
 	.string "See you on our next broadcast!\p"
 	.string "Still, {STR_VAR_1} is certainly an enigma…$"
 
-gTVWorldOfMastersText00:: @ 082843BA
+gTVWorldOfMastersText00::
 	.string "THE WORLD OF MASTERS\p"
 	.string "Hello, viewers.\p"
 	.string "Perhaps you are aware of a TRAINER\n"
@@ -1152,12 +1152,12 @@ gTVWorldOfMastersText00:: @ 082843BA
 	.string "The total number of POKéMON caught\n"
 	.string "that day reached an impressive {STR_VAR_3}!$"
 
-gTVWorldOfMastersText01:: @ 082844FD
+gTVWorldOfMastersText01::
 	.string "That remarkable feat must have been\n"
 	.string "possible because of the trust between\l"
 	.string "the TRAINER and {STR_VAR_1}.$"
 
-gTVWorldOfMastersText02:: @ 0828455B
+gTVWorldOfMastersText02::
 	.string "The master caught the day's last\n"
 	.string "{STR_VAR_3} near {STR_VAR_2}.\p"
 	.string "That POKéMON apparently enjoys\n"
@@ -1167,31 +1167,31 @@ gTVWorldOfMastersText02:: @ 0828455B
 	.string "That's all for today.\n"
 	.string "Please tune in next time.$"
 
-gTVTodaysRivalTrainerText00:: @ 08284641
+gTVTodaysRivalTrainerText00::
 	.string "TODAY'S RIVAL TRAINER!\p"
 	.string "Hello, fellow POKéMON TRAINERS!\n"
 	.string "How are we all doing today?\p"
 	.string "Today, like every other day,\n"
 	.string "we'll examine one of our rivals!$"
 
-gTVTodaysRivalTrainerText07:: @ 082846D2
+gTVTodaysRivalTrainerText07::
 	.string "Today's rival TRAINER is {STR_VAR_1},\n"
 	.string "who's around {STR_VAR_3} now.\p"
 	.string "{STR_VAR_1} has so far registered\n"
 	.string "{STR_VAR_2} POKéMON in the POKéDEX.$"
 
-gTVTodaysRivalTrainerText08:: @ 08284738
+gTVTodaysRivalTrainerText08::
 	.string "Today's rival TRAINER is {STR_VAR_1},\n"
 	.string "who's in a SECRET BASE now.\p"
 	.string "{STR_VAR_1} has so far registered\n"
 	.string "{STR_VAR_2} POKéMON in the POKéDEX.$"
 
-gTVTodaysRivalTrainerText09:: @ 082847A5
+gTVTodaysRivalTrainerText09::
 	.string "Today's rival TRAINER is {STR_VAR_1}.\p"
 	.string "So far, {STR_VAR_1} has registered\n"
 	.string "{STR_VAR_2} POKéMON in the POKéDEX.$"
 
-gTVTodaysRivalTrainerText10:: @ 082847F7
+gTVTodaysRivalTrainerText10::
 	.string "Today's rival TRAINER is {STR_VAR_1},\n"
 	.string "who's on a ferry now.\p"
 	.string "{STR_VAR_1} has so far registered\n"
@@ -1199,29 +1199,29 @@ gTVTodaysRivalTrainerText10:: @ 082847F7
 
 	.string "$"
 
-gTVTodaysRivalTrainerText01:: @ 0828485F
+gTVTodaysRivalTrainerText01::
 	.string "And how many BADGES does our rival\n"
 	.string "have? The number is {STR_VAR_1}!$"
 
-gTVTodaysRivalTrainerText02:: @ 0828489A
+gTVTodaysRivalTrainerText02::
 	.string "But our rival hasn't obtained\n"
 	.string "a single BADGE yet!$"
 
-gTVTodaysRivalTrainerText03:: @ 082848CC
+gTVTodaysRivalTrainerText03::
 	.string "Our rival hasn't obtained a single\n"
 	.string "BATTLE FRONTIER Symbol yet.$"
 
-gTVTodaysRivalTrainerText04:: @ 0828490B
+gTVTodaysRivalTrainerText04::
 	.string "Let's see how many BATTLE FRONTIER\n"
 	.string "Symbols our rival has.\p"
 	.string "Gold Symbols: {STR_VAR_1}!\n"
 	.string "Silver Symbols: {STR_VAR_2}!$"
 
-gTVTodaysRivalTrainerText05:: @ 0828496B
+gTVTodaysRivalTrainerText05::
 	.string "Our rival has collected {STR_VAR_1} Battle\n"
 	.string "Point(s) at the BATTLE FRONTIER.$"
 
-gTVTodaysRivalTrainerText06:: @ 082849AE
+gTVTodaysRivalTrainerText06::
 	.string "So, how did you measure up in\n"
 	.string "comparison to {STR_VAR_1}?\p"
 	.string "The adventure rolls on!\p"
@@ -1229,7 +1229,7 @@ gTVTodaysRivalTrainerText06:: @ 082849AE
 	.string "Let's all keep moving forward\n"
 	.string "and ahead of our rivals!$"
 
-TrendWatcher_Text_Intro:: @ 08284A3E
+TrendWatcher_Text_Intro::
 	.string "DEWFORD TREND-WATCHER NETWORK!\p"
 	.string "MC: Wassup?\n"
 	.string "We'll keep it real with the latest on\l"
@@ -1252,17 +1252,17 @@ TrendWatcher_Text_Intro:: @ 08284A3E
 	.string "what's the in thing of the moment…$"
 
 @ Identical to below, may have been different in other languages
-TrendWatcher_Text_MaleTaughtMePhrase:: @ 08284C55
+TrendWatcher_Text_MaleTaughtMePhrase::
 	.string "Old man: {STR_VAR_1} {STR_VAR_2}\n"
 	.string "was what {STR_VAR_3} from LITTLEROOT\l"
 	.string "taught me as being trendy…$"
 
-TrendWatcher_Text_FemaleTaughtMePhrase:: @ 08284C9B
+TrendWatcher_Text_FemaleTaughtMePhrase::
 	.string "Old man: {STR_VAR_1} {STR_VAR_2}\n"
 	.string "was what {STR_VAR_3} from LITTLEROOT\l"
 	.string "taught me as being trendy…$"
 
-TrendWatcher_Text_PhraseWasHopeless:: @ 08284CE1
+TrendWatcher_Text_PhraseWasHopeless::
 	.string "But it was utterly hopeless.\p"
 	.string "{STR_VAR_1} {STR_VAR_2} festival!\p"
 	.string "{STR_VAR_1} {STR_VAR_2} contest!\p"
@@ -1274,17 +1274,17 @@ TrendWatcher_Text_PhraseWasHopeless:: @ 08284CE1
 	.string "to hear about what's in now…$"
 
 @ Identical to below, may have been different in other languages
-TrendWatcher_Text_MaleTellMeBigger:: @ 08284DB6
+TrendWatcher_Text_MaleTellMeBigger::
 	.string "Old man: {STR_VAR_3}!\n"
 	.string "Please, tell me something bigger than\l"
 	.string "that {STR_VAR_1} {STR_VAR_2}!$"
 
-TrendWatcher_Text_FemaleTellMeBigger:: @ 08284DF5
+TrendWatcher_Text_FemaleTellMeBigger::
 	.string "Old man: {STR_VAR_3}!\n"
 	.string "Please, tell me something bigger than\l"
 	.string "that {STR_VAR_1} {STR_VAR_2}!$"
 
-TrendWatcher_Text_Outro:: @ 08284E34
+TrendWatcher_Text_Outro::
 	.string "MC: …Uh… So, there you have it,\n"
 	.string "all you trendy, hep cats out there!\p"
 	.string "{STR_VAR_1} {STR_VAR_2}…uh…\n"
@@ -1292,7 +1292,7 @@ TrendWatcher_Text_Outro:: @ 08284E34
 	.string "My time is up. Catch you on the fly!\p"
 	.string "Old man: {STR_VAR_1} {STR_VAR_2}!$"
 
-gTVHoennTreasureInvestigatorsText00:: @ 08284EDF
+gTVHoennTreasureInvestigatorsText00::
 	.string "HOENN TREASURE INVESTIGATORS!\p"
 	.string "Hi, gang!\n"
 	.string "Score any secret items lately?\p"
@@ -1301,7 +1301,7 @@ gTVHoennTreasureInvestigatorsText00:: @ 08284EDF
 	.string "Let's start with a letter.\n"
 	.string "It says, “{STR_VAR_1} discovered!”$"
 
-gTVHoennTreasureInvestigatorsText01:: @ 08284FA1
+gTVHoennTreasureInvestigatorsText01::
 	.string "Wow, we'd better check this letter\n"
 	.string "out! Let me read it to you.\p"
 	.string "…Dear INVESTIGATORS,\n"
@@ -1316,7 +1316,7 @@ gTVHoennTreasureInvestigatorsText01:: @ 08284FA1
 	.string "I'll be waiting for exciting news\n"
 	.string "from all of you!$"
 
-gTVHoennTreasureInvestigatorsText02:: @ 082850F5
+gTVHoennTreasureInvestigatorsText02::
 	.string "Wow, we'd better check this letter\n"
 	.string "out! Let me read it to you.\p"
 	.string "…Dear INVESTIGATORS,\n"
@@ -1330,7 +1330,7 @@ gTVHoennTreasureInvestigatorsText02:: @ 082850F5
 	.string "I'll be waiting for exciting news\n"
 	.string "from all of you!$"
 
-gTVFindThatGamerText00:: @ 08285240
+gTVFindThatGamerText00::
 	.string "FIND THAT GAMER!\p"
 	.string "Hey, all you gamers!\n"
 	.string "How's your {STR_VAR_2} spinning?\p"
@@ -1340,7 +1340,7 @@ gTVFindThatGamerText00:: @ 08285240
 	.string "Today, our no. 1 gamer is…\n"
 	.string "{STR_VAR_1}!$"
 
-gTVFindThatGamerText01:: @ 082852F4
+gTVFindThatGamerText01::
 	.string "{STR_VAR_1} played the {STR_VAR_2} game\n"
 	.string "and won a rare {STR_VAR_3} COINS.\p"
 	.string "“When {STR_VAR_1} comes, we need to\n"
@@ -1354,7 +1354,7 @@ gTVFindThatGamerText01:: @ 082852F4
 	.string "where you can feel the excitement!\p"
 	.string "That's all for today!$"
 
-gTVFindThatGamerText02:: @ 08285463
+gTVFindThatGamerText02::
 	.string "{STR_VAR_1} played the {STR_VAR_2} game\n"
 	.string "and lost {STR_VAR_3} COINS.\p"
 	.string "“When {STR_VAR_1} comes, our COIN\n"
@@ -1362,7 +1362,7 @@ gTVFindThatGamerText02:: @ 08285463
 	.string "That's what the GAME CORNER clerks\n"
 	.string "say when our gamer is in play!$"
 
-gTVFindThatGamerText03:: @ 08285500
+gTVFindThatGamerText03::
 	.string "Viewers, it's best to watch your COINS\n"
 	.string "like {STR_VAR_1} if you visit the GAME\l"
 	.string "CORNER and play the {STR_VAR_2} game.\p"
@@ -1370,10 +1370,10 @@ gTVFindThatGamerText03:: @ 08285500
 	.string "where you can feel the excitement!\p"
 	.string "That's all for today!$"
 
-gTVBreakingNewsText00:: @ 082855BF
+gTVBreakingNewsText00::
 	.string "BREAKING NEWS TV!$"
 
-gTVBreakingNewsText01:: @ 082855D1
+gTVBreakingNewsText01::
 	.string "Rare {STR_VAR_2} caught by\n"
 	.string "{STR_VAR_1}!\p"
 	.string "We're live from the vicinity of\n"
@@ -1381,18 +1381,18 @@ gTVBreakingNewsText01:: @ 082855D1
 	.string "{STR_VAR_1} successfully captured\n"
 	.string "a rare {STR_VAR_2} earlier here!$"
 
-gTVBreakingNewsText02:: @ 0828563C
+gTVBreakingNewsText02::
 	.string "When {STR_VAR_1} encountered the rare\n"
 	.string "{STR_VAR_2}, the TRAINER sent out\l"
 	.string "the POKéMON {STR_VAR_3}.$"
 
-gTVBreakingNewsText03:: @ 08285682
+gTVBreakingNewsText03::
 	.string "In the battle, the number of POKé\n"
 	.string "BALLS thrown by the TRAINER was {STR_VAR_1}.\p"
 	.string "Ultimately, the rare POKéMON was\n"
 	.string "caught by the {STR_VAR_2} used last.$"
 
-gTVBreakingNewsText04:: @ 08285705
+gTVBreakingNewsText04::
 	.string "In that instant, {STR_VAR_2}\n"
 	.string "echoed with {STR_VAR_1}'s roars of\l"
 	.string "triumphant joy.\p"
@@ -1401,7 +1401,7 @@ gTVBreakingNewsText04:: @ 08285705
 	.string "…That ends the live feed from\n"
 	.string "the happy scene!$"
 
-gTVBreakingNewsText05:: @ 082857B0
+gTVBreakingNewsText05::
 	.string "{STR_VAR_1} fails to capture a rare\n"
 	.string "{STR_VAR_2}!\p"
 	.string "We're live from the vicinity of\n"
@@ -1409,18 +1409,18 @@ gTVBreakingNewsText05:: @ 082857B0
 	.string "It was here that {STR_VAR_1} failed\n"
 	.string "to capture a rare {STR_VAR_2}!$"
 
-gTVBreakingNewsText06:: @ 08285824
+gTVBreakingNewsText06::
 	.string "When {STR_VAR_1} encountered the rare\n"
 	.string "{STR_VAR_2}, the TRAINER sent out\l"
 	.string "the POKéMON {STR_VAR_3}.$"
 
-gTVBreakingNewsText07:: @ 0828586A
+gTVBreakingNewsText07::
 	.string "The TRAINER made the {STR_VAR_2}\n"
 	.string "use the move {STR_VAR_1}.\p"
 	.string "Without meaning to, the TRAINER\n"
 	.string "made the rare POKéMON faint…$"
 
-gTVBreakingNewsText12:: @ 082858D0
+gTVBreakingNewsText12::
 	.string "However, {STR_VAR_1} panicked at\n"
 	.string "the sight of the rare {STR_VAR_2}.\p"
 	.string "In confusion, the TRAINER ordered\n"
@@ -1428,12 +1428,12 @@ gTVBreakingNewsText12:: @ 082858D0
 	.string "Without meaning to, the TRAINER\n"
 	.string "made the rare POKéMON faint.$"
 
-gTVBreakingNewsText08:: @ 0828596F
+gTVBreakingNewsText08::
 	.string "In that instant, {STR_VAR_2}\n"
 	.string "echoed with {STR_VAR_1}'s shrieks of\l"
 	.string "frustration…$"
 
-gTVBreakingNewsText09:: @ 082859AC
+gTVBreakingNewsText09::
 	.string "However, {STR_VAR_1} seemed to run\n"
 	.string "out of POKé BALLS.\p"
 	.string "The TRAINER had to break off\n"
@@ -1442,20 +1442,20 @@ gTVBreakingNewsText09:: @ 082859AC
 	.string "echoed with {STR_VAR_1}'s shrieks of\l"
 	.string "frustration…$"
 
-gTVBreakingNewsText10:: @ 08285A50
+gTVBreakingNewsText10::
 	.string "However, the {STR_VAR_2} fled without\n"
 	.string "warning.\p"
 	.string "In that instant, {STR_VAR_3}\n"
 	.string "echoed with {STR_VAR_1}'s shrieks of\l"
 	.string "frustration…$"
 
-gTVBreakingNewsText11:: @ 08285AB3
+gTVBreakingNewsText11::
 	.string "I must say I feel for {STR_VAR_1}.\n"
 	.string "Why, it makes me want to shriek, too.\p"
 	.string "…That ends the live feed from\n"
 	.string "the melancholy scene!$"
 
-gTVSecretBaseVisitText00:: @ 08285B27
+gTVSecretBaseVisitText00::
 	.string "Hello, folks!\n"
 	.string "It's time again for\l"
 	.string "a SECRET BASE VISIT.\p"
@@ -1466,14 +1466,14 @@ gTVSecretBaseVisitText00:: @ 08285B27
 	.string "Let's find out!\n"
 	.string "… … … … … …$"
 
-gTVSecretBaseVisitText01:: @ 08285BCA
+gTVSecretBaseVisitText01::
 	.string "Oh!\n"
 	.string "How marvelous!\p"
 	.string "This {STR_VAR_2}…\n"
 	.string "It's not what one would expect to\l"
 	.string "find here!$"
 
-gTVSecretBaseVisitText02:: @ 08285C13
+gTVSecretBaseVisitText02::
 	.string "Oh!\n"
 	.string "How remarkable!\p"
 	.string "There isn't a single piece\n"
@@ -1485,47 +1485,47 @@ gTVSecretBaseVisitText02:: @ 08285C13
 	.string "My hat's off to you, {STR_VAR_1}.\n"
 	.string "It had to be you!$"
 
-gTVSecretBaseVisitText03:: @ 08285CFF
+gTVSecretBaseVisitText03::
 	.string "Oh! I see!\n"
 	.string "With perfect clarity, I see it!\p"
 	.string "This {STR_VAR_2} being here…\n"
 	.string "It sends an effective message!$"
 
-gTVSecretBaseVisitText04:: @ 08285D5D
+gTVSecretBaseVisitText04::
 	.string "Oh! I see!\n"
 	.string "With perfect clarity, I see it!\p"
 	.string "This space is kept deliberately\n"
 	.string "clear of interior items!\p"
 	.string "It sends an effective message!$"
 
-gTVSecretBaseVisitText05:: @ 08285DE0
+gTVSecretBaseVisitText05::
 	.string "Wheeew!\p"
 	.string "The pairing of the {STR_VAR_2}\n"
 	.string "with the {STR_VAR_3}!\p"
 	.string "It's a dream combination if there\n"
 	.string "ever was one!$"
 
-gTVSecretBaseVisitText06:: @ 08285E3B
+gTVSecretBaseVisitText06::
 	.string "Wheeew!\p"
 	.string "The placement of this {STR_VAR_2}\n"
 	.string "right here…\p"
 	.string "It has a presence that fills\n"
 	.string "the entire SECRET BASE!$"
 
-gTVSecretBaseVisitText07:: @ 08285E9D
+gTVSecretBaseVisitText07::
 	.string "Wheeew!\p"
 	.string "There's nothing in place here.\p"
 	.string "This empty space has an effect on\n"
 	.string "the entire SECRET BASE.$"
 
-gTVSecretBaseVisitText08:: @ 08285EFE
+gTVSecretBaseVisitText08::
 	.string "Oh!\n"
 	.string "Here comes {STR_VAR_1}!\l"
 	.string "Let's challenge the TRAINER!\p"
 	.string "… … … … … …\n"
 	.string "… … … … … …$"
 
-gTVSecretBaseVisitText09:: @ 08285F46
+gTVSecretBaseVisitText09::
 	.string "Sigh…\n"
 	.string "I've got to hand it to {STR_VAR_1}.\p"
 	.string "The TRAINER's POKéMON were truly\n"
@@ -1538,7 +1538,7 @@ gTVSecretBaseVisitText09:: @ 08285F46
 	.string "{STR_VAR_1} is.\p"
 	.string "Certainly, it was quite a lesson!$"
 
-gTVSecretBaseVisitText10:: @ 08286049
+gTVSecretBaseVisitText10::
 	.string "Aiyeeh!\n"
 	.string "I've got to hand it to {STR_VAR_1}.\p"
 	.string "The TRAINER's POKéMON were\n"
@@ -1551,7 +1551,7 @@ gTVSecretBaseVisitText10:: @ 08286049
 	.string "{STR_VAR_1} is.\p"
 	.string "Certainly, it was quite a lesson!$"
 
-gTVSecretBaseVisitText11:: @ 0828613A
+gTVSecretBaseVisitText11::
 	.string "Wheeew!\n"
 	.string "I've got to hand it to {STR_VAR_1}.\p"
 	.string "The TRAINER's POKéMON were clearly\n"
@@ -1564,7 +1564,7 @@ gTVSecretBaseVisitText11:: @ 0828613A
 	.string "{STR_VAR_1} is.\p"
 	.string "Certainly, it was quite a lesson!$"
 
-gTVSecretBaseVisitText12:: @ 08286248
+gTVSecretBaseVisitText12::
 	.string "Well, well!\n"
 	.string "I've got to hand it to {STR_VAR_1}.\p"
 	.string "The TRAINER's POKéMON showed\n"
@@ -1577,14 +1577,14 @@ gTVSecretBaseVisitText12:: @ 08286248
 	.string "{STR_VAR_1} is.\p"
 	.string "Certainly, it was quite a lesson!$"
 
-gTVSecretBaseVisitText13:: @ 08286340
+gTVSecretBaseVisitText13::
 	.string "I must say, what a superb SECRET BASE\n"
 	.string "it was!\p"
 	.string "Viewers, if you have the chance,\n"
 	.string "do visit {STR_VAR_1}'s SECRET BASE.\p"
 	.string "Until next time, I bid you adieu!$"
 
-gTVPokemonLotteryWinnerFlashReportText00:: @ 082863CC
+gTVPokemonLotteryWinnerFlashReportText00::
 	.string "It's exciting!\n"
 	.string "It's dramatic!\p"
 	.string "It's the POKéMON LOTTERY\n"
@@ -1610,7 +1610,7 @@ gTVPokemonLotteryWinnerFlashReportText00:: @ 082863CC
 	.string "offering you the greatest selection\l"
 	.string "in all HOENN!$"
 
-gTVThePokemonBattleSeminarText00:: @ 08286616
+gTVThePokemonBattleSeminarText00::
 	.string "THE POKéMON BATTLE SEMINAR!\p"
 	.string "We examine battles to see what\n"
 	.string "lessons we may learn from others.\p"
@@ -1619,28 +1619,28 @@ gTVThePokemonBattleSeminarText00:: @ 08286616
 	.string "{STR_VAR_1}'s {STR_VAR_2} was\n"
 	.string "battling one {STR_VAR_3}…$"
 
-gTVThePokemonBattleSeminarText01:: @ 082866B6
+gTVThePokemonBattleSeminarText01::
 	.string "And it used the move {STR_VAR_3}\n"
 	.string "on the {STR_VAR_2}…\p"
 	.string "Hmm… {STR_VAR_1}!\n"
 	.string "That's the wrong thing to do!$"
 
-gTVThePokemonBattleSeminarText02:: @ 08286700
+gTVThePokemonBattleSeminarText02::
 	.string "In addition to the doomed move,\n"
 	.string "the TRAINER's {STR_VAR_1} also knew$"
 
-gTVThePokemonBattleSeminarText03:: @ 0828673B
+gTVThePokemonBattleSeminarText03::
 	.string "the moves {STR_VAR_1}, {STR_VAR_2},\n"
 	.string "and {STR_VAR_3}.$"
 
-gTVThePokemonBattleSeminarText04:: @ 08286755
+gTVThePokemonBattleSeminarText04::
 	.string "the moves {STR_VAR_1} and\n"
 	.string "{STR_VAR_2}.$"
 
-gTVThePokemonBattleSeminarText05:: @ 0828676A
+gTVThePokemonBattleSeminarText05::
 	.string "the move {STR_VAR_2}.$"
 
-gTVThePokemonBattleSeminarText06:: @ 08286777
+gTVThePokemonBattleSeminarText06::
 	.string "So, in this situation, what should\n"
 	.string "the TRAINER have used?\p"
 	.string "… … … … … …\n"
@@ -1651,7 +1651,7 @@ gTVThePokemonBattleSeminarText06:: @ 08286777
 	.string "case and battle with intelligence!\p"
 	.string "Until next time, farewell!$"
 
-gTVTrainerFanClubText00:: @ 08286866
+gTVTrainerFanClubText00::
 	.string "All together now!\n"
 	.string "TRAINER FAN CLUB!\p"
 	.string "MC: How's everyone groovin'?\n"
@@ -1665,46 +1665,46 @@ gTVTrainerFanClubText00:: @ 08286866
 	.string "MC: What do you love about\n"
 	.string "{STR_VAR_1}?!$"
 
-gTVTrainerFanClubText01:: @ 0828695E
+gTVTrainerFanClubText01::
 	.string "FANS: Their cool way of throwing\n"
 	.string "POKé BALLS!$"
 
-gTVTrainerFanClubText02:: @ 0828698B
+gTVTrainerFanClubText02::
 	.string "FANS: Their adorable way of running!$"
 
-gTVTrainerFanClubText03:: @ 082869B0
+gTVTrainerFanClubText03::
 	.string "FANS: How the TRAINER turns tough\n"
 	.string "when the going gets tough!$"
 
-gTVTrainerFanClubText04:: @ 082869ED
+gTVTrainerFanClubText04::
 	.string "FANS: The TRAINER's knowledge of\n"
 	.string "POKéMON!$"
 
-gTVTrainerFanClubText05:: @ 08286A17
+gTVTrainerFanClubText05::
 	.string "FANS: The TRAINER's kindness toward\n"
 	.string "all POKéMON!$"
 
-gTVTrainerFanClubText06:: @ 08286A48
+gTVTrainerFanClubText06::
 	.string "FANS: The TRAINER's amazing\n"
 	.string "BIKE-riding techniques!$"
 
-gTVTrainerFanClubText07:: @ 08286A7C
+gTVTrainerFanClubText07::
 	.string "FANS: The TRAINER's impressive\n"
 	.string "item-buying style!$"
 
-gTVTrainerFanClubText08:: @ 08286AAE
+gTVTrainerFanClubText08::
 	.string "FANS: The TRAINER's charming way\n"
 	.string "of nicknaming POKéMON!$"
 
-gTVTrainerFanClubText09:: @ 08286AE6
+gTVTrainerFanClubText09::
 	.string "FANS: The TRAINER's nifty style of\n"
 	.string "decorating a SECRET BASE!$"
 
-gTVTrainerFanClubText10:: @ 08286B23
+gTVTrainerFanClubText10::
 	.string "FANS: The TRAINER's bold ways of\n"
 	.string "using TMs!$"
 
-gTVTrainerFanClubText11:: @ 08286B4F
+gTVTrainerFanClubText11::
 	.string "MC: As you've just seen, {STR_VAR_1}\n"
 	.string "is hot! Like, too hot to touch, yow!\p"
 	.string "Among {STR_VAR_1}'s FANS\n"
@@ -1738,7 +1738,7 @@ gTVTrainerFanClubText11:: @ 08286B4F
 	.string "FANS: {STR_VAR_2}!\p"
 	.string "FANS: {STR_VAR_3}!$"
 
-TVSpotTheCuties_Text_Intro:: @ 08286D8F
+TVSpotTheCuties_Text_Intro::
 	.string "SPOT THE CUTIES!\n"
 	.string "POKéMON IN RIBBONS!\p"
 	.string "Hello, my sweet viewers!\p"
@@ -1750,29 +1750,29 @@ TVSpotTheCuties_Text_Intro:: @ 08286D8F
 	.string "Today's featured pretty POKéMON\n"
 	.string "is {STR_VAR_1}'s {STR_VAR_2}.$"
 
-TVSpotTheCuties_Text_RibbonsLow:: @ 08286E9D
+TVSpotTheCuties_Text_RibbonsLow::
 	.string "The number of RIBBONS that\n"
 	.string "{STR_VAR_2} wears is {STR_VAR_3}.\p"
 	.string "It says a lot about how much\n"
 	.string "{STR_VAR_1} adores the POKéMON.$"
 
-TVSpotTheCuties_Text_RibbonsMid:: @ 08286EFC
+TVSpotTheCuties_Text_RibbonsMid::
 	.string "{STR_VAR_2} wears an amazing\n"
 	.string "{STR_VAR_3} RIBBONS!\p"
 	.string "It speaks volumes about {STR_VAR_1}'s\n"
 	.string "commitment to the POKéMON!$"
 
-TVSpotTheCuties_Text_RibbonsHigh:: @ 08286F54
+TVSpotTheCuties_Text_RibbonsHigh::
 	.string "{STR_VAR_2} wears an incredible\n"
 	.string "{STR_VAR_3} RIBBONS!\p"
 	.string "It shows you {STR_VAR_1}'s total\n"
 	.string "dedication as a collector!$"
 
-TVSpotTheCuties_Text_RibbonIntro:: @ 08286FAA
+TVSpotTheCuties_Text_RibbonIntro::
 	.string "Let us take a closer look at the many\n"
 	.string "RIBBONS worn by {STR_VAR_2}.$"
 
-TVSpotTheCuties_Text_RibbonChampion:: @ 08286FE4
+TVSpotTheCuties_Text_RibbonChampion::
 	.string "The CHAMPION RIBBON is especially\n"
 	.string "fetching.\p"
 	.string "{STR_VAR_2} received it upon entering\n"
@@ -1782,7 +1782,7 @@ TVSpotTheCuties_Text_RibbonChampion:: @ 08286FE4
 	.string "{STR_VAR_2} and the CHAMP RIBBON!\n"
 	.string "The combination is super effective!$"
 
-TVSpotTheCuties_Text_RibbonCool:: @ 082870A3
+TVSpotTheCuties_Text_RibbonCool::
 	.string "The COOL RIBBON is especially\n"
 	.string "fetching.\p"
 	.string "{STR_VAR_2} received it for winning\n"
@@ -1792,7 +1792,7 @@ TVSpotTheCuties_Text_RibbonCool:: @ 082870A3
 	.string "{STR_VAR_2} and the COOL RIBBON!\n"
 	.string "The combination is super effective!$"
 
-TVSpotTheCuties_Text_RibbonBeauty:: @ 0828715A
+TVSpotTheCuties_Text_RibbonBeauty::
 	.string "The BEAUTY RIBBON is especially\n"
 	.string "fetching.\p"
 	.string "{STR_VAR_2} received it for winning\n"
@@ -1802,7 +1802,7 @@ TVSpotTheCuties_Text_RibbonBeauty:: @ 0828715A
 	.string "{STR_VAR_2} and the BEAUTY RIBBON!\n"
 	.string "The combination is super effective!$"
 
-TVSpotTheCuties_Text_RibbonCute:: @ 08287215
+TVSpotTheCuties_Text_RibbonCute::
 	.string "The CUTE RIBBON is especially\n"
 	.string "fetching.\p"
 	.string "{STR_VAR_2} received it for winning\n"
@@ -1812,7 +1812,7 @@ TVSpotTheCuties_Text_RibbonCute:: @ 08287215
 	.string "{STR_VAR_2} and the CUTE RIBBON!\n"
 	.string "The combination is super effective!$"
 
-TVSpotTheCuties_Text_RibbonSmart:: @ 082872CC
+TVSpotTheCuties_Text_RibbonSmart::
 	.string "The SMART RIBBON is especially\n"
 	.string "fetching.\p"
 	.string "{STR_VAR_2} received it for winning\n"
@@ -1822,7 +1822,7 @@ TVSpotTheCuties_Text_RibbonSmart:: @ 082872CC
 	.string "{STR_VAR_2} and the SMART RIBBON!\n"
 	.string "The combination is super effective!$"
 
-TVSpotTheCuties_Text_RibbonTough:: @ 08287387
+TVSpotTheCuties_Text_RibbonTough::
 	.string "The TOUGH RIBBON is especially\n"
 	.string "fetching.\p"
 	.string "{STR_VAR_2} received it for winning\n"
@@ -1832,7 +1832,7 @@ TVSpotTheCuties_Text_RibbonTough:: @ 08287387
 	.string "{STR_VAR_2} and the TOUGH RIBBON!\n"
 	.string "The combination is super effective!$"
 
-TVSpotTheCuties_Text_RibbonWinning:: @ 08287442
+TVSpotTheCuties_Text_RibbonWinning::
 	.string "The WINNING RIBBON is especially\n"
 	.string "fetching.\p"
 	.string "{STR_VAR_2} received it for its feats\n"
@@ -1842,7 +1842,7 @@ TVSpotTheCuties_Text_RibbonWinning:: @ 08287442
 	.string "{STR_VAR_2} and the WINNING RIBBON!\n"
 	.string "The combination is super effective!$"
 
-TVSpotTheCuties_Text_RibbonVictory:: @ 08287508
+TVSpotTheCuties_Text_RibbonVictory::
 	.string "The VICTORY RIBBON is especially\n"
 	.string "fetching.\p"
 	.string "{STR_VAR_2} received it for its feats\n"
@@ -1852,7 +1852,7 @@ TVSpotTheCuties_Text_RibbonVictory:: @ 08287508
 	.string "{STR_VAR_2} and the VICTORY RIBBON!\n"
 	.string "The combination is super effective!$"
 
-TVSpotTheCuties_Text_RibbonArtist:: @ 082875D9
+TVSpotTheCuties_Text_RibbonArtist::
 	.string "The ARTIST RIBBON is especially\n"
 	.string "fetching.\p"
 	.string "{STR_VAR_2} received it for being\n"
@@ -1862,7 +1862,7 @@ TVSpotTheCuties_Text_RibbonArtist:: @ 082875D9
 	.string "{STR_VAR_2} and the ARTIST RIBBON!\n"
 	.string "The combination is super effective!$"
 
-TVSpotTheCuties_Text_RibbonEffort:: @ 082876A1
+TVSpotTheCuties_Text_RibbonEffort::
 	.string "The Hard Worker RIBBON is\n"
 	.string "especially fetching.\p"
 	.string "{STR_VAR_2} received it for being\n"
@@ -1872,139 +1872,139 @@ TVSpotTheCuties_Text_RibbonEffort:: @ 082876A1
 	.string "{STR_VAR_2} and the Hard Worker RIBBON!\n"
 	.string "The combination is super effective!$"
 
-TVSpotTheCuties_Text_Outro:: @ 08287779
+TVSpotTheCuties_Text_Outro::
 	.string "…Sigh…\p"
 	.string "RIBBONS and POKéMON…\n"
 	.string "They go so wonderfully together!\p"
 	.string "Before I swoon,\n"
 	.string "I bid you all farewell!$"
 
-gTVPokemonNewsBattleFrontierText00:: @ 082877DE
+gTVPokemonNewsBattleFrontierText00::
 	.string "Greetings!\n"
 	.string "It's time for POKéMON NEWS.\p"
 	.string "We've got some uplifting news from\n"
 	.string "the BATTLE FRONTIER.$"
 
-gTVPokemonNewsBattleFrontierText01:: @ 0828783D
+gTVPokemonNewsBattleFrontierText01::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-win-streak record while on\l"
 	.string "the BATTLE TOWER's SINGLE BATTLE\l"
 	.string "ROOM challenge.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText02:: @ 082878B3
+gTVPokemonNewsBattleFrontierText02::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-win-streak record while on\l"
 	.string "the BATTLE TOWER's DOUBLE BATTLE\l"
 	.string "ROOM challenge.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText03:: @ 08287929
+gTVPokemonNewsBattleFrontierText03::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-win-streak record while on\l"
 	.string "the BATTLE TOWER's MULTI BATTLE\l"
 	.string "ROOM challenge.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText04:: @ 0828799E
+gTVPokemonNewsBattleFrontierText04::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-win-streak record while on\l"
 	.string "the BATTLE TOWER's LINK MULTI BATTLE\l"
 	.string "ROOM challenge.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText05:: @ 08287A18
+gTVPokemonNewsBattleFrontierText05::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-championship-streak record\l"
 	.string "competing in the BATTLE DOME's\l"
 	.string "SINGLE BATTLE Tournaments.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText06:: @ 08287A97
+gTVPokemonNewsBattleFrontierText06::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-championship-streak record\l"
 	.string "competing in the BATTLE DOME's\l"
 	.string "DOUBLE BATTLE Tournaments.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText07:: @ 08287B16
+gTVPokemonNewsBattleFrontierText07::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-win-streak record while on\l"
 	.string "the BATTLE FACTORY's Battle\l"
 	.string "Swap Single challenge.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText08:: @ 08287B8E
+gTVPokemonNewsBattleFrontierText08::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-win-streak record while on\l"
 	.string "the BATTLE FACTORY's Battle\l"
 	.string "Swap Double challenge.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText09:: @ 08287C06
+gTVPokemonNewsBattleFrontierText09::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "record of clearing {STR_VAR_2} rooms\l"
 	.string "while on the BATTLE PIKE's Battle\l"
 	.string "Choice challenge.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText10:: @ 08287C7D
+gTVPokemonNewsBattleFrontierText10::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-win-streak record while\l"
 	.string "competing in the BATTLE ARENA's\l"
 	.string "Set KO Tournaments.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText11:: @ 08287CF3
+gTVPokemonNewsBattleFrontierText11::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-win-streak record while on\l"
 	.string "the BATTLE PALACE's SINGLE BATTLE\l"
 	.string "HALL challenge.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText12:: @ 08287D6A
+gTVPokemonNewsBattleFrontierText12::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "{STR_VAR_2}-win-streak record while on\l"
 	.string "the BATTLE PALACE's DOUBLE BATTLE\l"
 	.string "HALL challenge.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText13:: @ 08287DE1
+gTVPokemonNewsBattleFrontierText13::
 	.string "The TRAINER {STR_VAR_1} set a new\n"
 	.string "record of clearing {STR_VAR_2} floors\l"
 	.string "while on the BATTLE PYRAMID's\l"
 	.string "Battle Quest challenge.\p"
 	.string "Here's to {STR_VAR_1}!$"
 
-gTVPokemonNewsBattleFrontierText14:: @ 08287E5B
+gTVPokemonNewsBattleFrontierText14::
 	.string "And to the three POKéMON, {STR_VAR_1},\n"
 	.string "{STR_VAR_2}, and {STR_VAR_3}!\p"
 	.string "Congratulations for your\n"
 	.string "record-breaking performance!$"
 
-gTVPokemonNewsBattleFrontierText15:: @ 08287EBB
+gTVPokemonNewsBattleFrontierText15::
 	.string "And to the two POKéMON, {STR_VAR_1}\n"
 	.string "and {STR_VAR_2}!\p"
 	.string "Congratulations for your\n"
 	.string "record-breaking performance!$"
 
-gTVPokemonNewsBattleFrontierText16:: @ 08287F14
+gTVPokemonNewsBattleFrontierText16::
 	.string "And to the four POKéMON: {STR_VAR_1}!\p"
 	.string "{STR_VAR_2}!\p"
 	.string "{STR_VAR_3}!$"
 
-gTVPokemonNewsBattleFrontierText17:: @ 08287F39
+gTVPokemonNewsBattleFrontierText17::
 	.string "And {STR_VAR_1}!\p"
 	.string "Congratulations for your\n"
 	.string "record-breaking performance!$"
 
-gTVPokemonNewsBattleFrontierText18:: @ 08287F77
+gTVPokemonNewsBattleFrontierText18::
 	.string "Let's hope for more record-setting\n"
 	.string "feats from {STR_VAR_1} and the loyal\l"
 	.string "POKéMON!\p"
 	.string "That's the news on POKéMON NEWS!$"
 
-gTVWhatsNo1InHoennTodayText00:: @ 08287FE0
+gTVWhatsNo1InHoennTodayText00::
 	.string "WHAT'S NO. 1 IN HOENN TODAY?\n"
 	.string "Yes, it's that time again!\p"
 	.string "Hello, viewers! Are you giving your\n"
@@ -2014,7 +2014,7 @@ gTVWhatsNo1InHoennTodayText00:: @ 08287FE0
 	.string "Today's no. 1 TRAINER is none other\n"
 	.string "than {STR_VAR_1}!$"
 
-gTVWhatsNo1InHoennTodayText01:: @ 082880C0
+gTVWhatsNo1InHoennTodayText01::
 	.string "In one day, {STR_VAR_1} spun the SLOTS\n"
 	.string "at the GAME CORNER {STR_VAR_2} times.\p"
 	.string "While playing, {STR_VAR_1} was heard\n"
@@ -2022,7 +2022,7 @@ gTVWhatsNo1InHoennTodayText01:: @ 082880C0
 	.string "even move…”\l"
 	.string "Isn't that interesting?$"
 
-gTVWhatsNo1InHoennTodayText02:: @ 0828815F
+gTVWhatsNo1InHoennTodayText02::
 	.string "In one day, {STR_VAR_1} played\n"
 	.string "the ROULETTE game at the GAME\l"
 	.string "CORNER {STR_VAR_2} times.\p"
@@ -2031,7 +2031,7 @@ gTVWhatsNo1InHoennTodayText02:: @ 0828815F
 	.string "The TRAINER's eyes were focused and\n"
 	.string "the face showed concentration.$"
 
-gTVWhatsNo1InHoennTodayText03:: @ 0828821A
+gTVWhatsNo1InHoennTodayText03::
 	.string "In one day, {STR_VAR_1} battled\n"
 	.string "wild POKéMON {STR_VAR_2} times!\p"
 	.string "Apparently, {STR_VAR_1}'s POKéMON\n"
@@ -2039,7 +2039,7 @@ gTVWhatsNo1InHoennTodayText03:: @ 0828821A
 	.string "They appear eager to battle anywhere,\n"
 	.string "anytime, and anyhow!$"
 
-gTVWhatsNo1InHoennTodayText04:: @ 082882BE
+gTVWhatsNo1InHoennTodayText04::
 	.string "In just one day, {STR_VAR_1} spun\n"
 	.string "the BERRY BLENDER {STR_VAR_2} times!\p"
 	.string "Toward the end, even {STR_VAR_1}\n"
@@ -2047,7 +2047,7 @@ gTVWhatsNo1InHoennTodayText04:: @ 082882BE
 	.string "The TRAINER appeared to totter\n"
 	.string "around like a SPINDA!$"
 
-gTVWhatsNo1InHoennTodayText05:: @ 08288355
+gTVWhatsNo1InHoennTodayText05::
 	.string "In just one day, {STR_VAR_1} planted\n"
 	.string "{STR_VAR_2} BERRIES!\p"
 	.string "As a result, {STR_VAR_1}'s clothes\n"
@@ -2057,14 +2057,14 @@ gTVWhatsNo1InHoennTodayText05:: @ 08288355
 	.string "The flowers are said to soothe\n"
 	.string "the emotions of people.$"
 
-gTVWhatsNo1InHoennTodayText06:: @ 0828842B
+gTVWhatsNo1InHoennTodayText06::
 	.string "In just one day, {STR_VAR_1} picked\n"
 	.string "{STR_VAR_2} BERRIES!\p"
 	.string "{STR_VAR_1}'s BAG became so filled\n"
 	.string "with BERRIES, the TRAINER had trouble\l"
 	.string "walking afterward!$"
 
-gTVWhatsNo1InHoennTodayText07:: @ 082884A5
+gTVWhatsNo1InHoennTodayText07::
 	.string "In just one day, {STR_VAR_1} obtained\n"
 	.string "{STR_VAR_2} Battle Points!\p"
 	.string "{STR_VAR_1} was later seen wrestling\n"
@@ -2074,14 +2074,14 @@ gTVWhatsNo1InHoennTodayText07:: @ 082884A5
 	.string "The TRAINER reportedly was grinning\n"
 	.string "while mulling options.$"
 
-gTVWhatsNo1InHoennTodayText08:: @ 0828858B
+gTVWhatsNo1InHoennTodayText08::
 	.string "Well, isn't that something!\p"
 	.string "{STR_VAR_1}!\n"
 	.string "You're today's no. 1 TRAINER!\p"
 	.string "Viewers, take heart from {STR_VAR_1}!\n"
 	.string "You, too, can be no. 1 every day!$"
 
-TVSecretBaseSecrets_Text_Intro:: @ 08288608
+TVSecretBaseSecrets_Text_Intro::
 	.string "SECRET BASE SECRETS!\p"
 	.string "What do TRAINERS do in the secrecy\n"
 	.string "of SECRET BASES?\p"
@@ -2092,88 +2092,88 @@ TVSecretBaseSecrets_Text_Intro:: @ 08288608
 	.string "Let's have a peek!\p"
 	.string "What will {STR_VAR_2} do?$"
 
-TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1:: @ 082886C8
+TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1::
 	.string "What will {STR_VAR_2} do next?$"
 
-TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2:: @ 082886DE
+TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2::
 	.string "And now, what will {STR_VAR_2} do?$"
 
-TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving:: @ 082886F8
+TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving::
 	.string "In the end, {STR_VAR_2} took {STR_VAR_3} steps\n"
 	.string "in {STR_VAR_1}'s SECRET BASE before\l"
 	.string "leaving.$"
 
-TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer:: @ 08288739
+TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer::
 	.string "Hmm…\p"
 	.string "It appears as if {STR_VAR_1}'s SECRET\n"
 	.string "BASE failed to interest {STR_VAR_2}…$"
 
-TVSecretBaseSecrets_Text_PlayerEnjoyedBase:: @ 08288777
+TVSecretBaseSecrets_Text_PlayerEnjoyedBase::
 	.string "{STR_VAR_2} appears to have enjoyed\n"
 	.string "{STR_VAR_1}'s SECRET BASE thoroughly.$"
 
-TVSecretBaseSecrets_Text_PlayerHugeFanOfBase:: @ 082887AF
+TVSecretBaseSecrets_Text_PlayerHugeFanOfBase::
 	.string "{STR_VAR_2} appears to have become\n"
 	.string "a huge fan of {STR_VAR_1}'s\l"
 	.string "SECRET BASE.$"
 
-TVSecretBaseSecrets_Text_Outro:: @ 082887E9
+TVSecretBaseSecrets_Text_Outro::
 	.string "Viewers may want to check out\n"
 	.string "{STR_VAR_1}'s SECRET BASE, too.\p"
 	.string "Tune in next time as we visit another\n"
 	.string "SECRET BASE! Thanks for joining us!$"
 
-TVSecretBaseSecrets_Text_StoppedMoving1:: @ 08288868
+TVSecretBaseSecrets_Text_StoppedMoving1::
 	.string "The visitor has stopped!\p"
 	.string "The visitor isn't moving at all!\p"
 	.string "Was {STR_VAR_1}'s SECRET BASE\n"
 	.string "that unimpressive?$"
 
-TVSecretBaseSecrets_Text_StoppedMoving2:: @ 082888CA
+TVSecretBaseSecrets_Text_StoppedMoving2::
 	.string "The visitor has stopped!\p"
 	.string "The visitor isn't moving at all!\p"
 	.string "Is it fatigue?\n"
 	.string "Has the visitor grown weary?$"
 
-TVSecretBaseSecrets_Text_UsedChair:: @ 08288930
+TVSecretBaseSecrets_Text_UsedChair::
 	.string "The visitor sat down on a chair!\n"
 	.string "The visitor is seated!\p"
 	.string "Look at that look of delight!\p"
 	.string "That chair must be very comfortable\n"
 	.string "to get that response!$"
 
-TVSecretBaseSecrets_Text_UsedBalloon:: @ 082889C0
+TVSecretBaseSecrets_Text_UsedBalloon::
 	.string "The visitor charged at a balloon!\p"
 	.string "It burst!\n"
 	.string "Oh, my goodness, it popped!\p"
 	.string "The visitor appears startled by\n"
 	.string "the sudden noise!$"
 
-TVSecretBaseSecrets_Text_UsedTent:: @ 08288A3A
+TVSecretBaseSecrets_Text_UsedTent::
 	.string "The visitor entered a TENT!\p"
 	.string "The visitor is running around!\p"
 	.string "Oh, my, the visitor is frolicking!\p"
 	.string "The visitor appears surprised by\n"
 	.string "the TENT's size!$"
 
-TVSecretBaseSecrets_Text_UsedPlant:: @ 08288ACA
+TVSecretBaseSecrets_Text_UsedPlant::
 	.string "The visitor is examining\n"
 	.string "a potted plant!\p"
 	.string "The visitor has surprisingly\n"
 	.string "mature taste!$"
 
-TVSecretBaseSecrets_Text_UsedGoldShield:: @ 08288B1E
+TVSecretBaseSecrets_Text_UsedGoldShield::
 	.string "The visitor is examining\n"
 	.string "a GOLD SHIELD!\p"
 	.string "The visitor's eyes appear to be\n"
 	.string "lit up with wonder!$"
 
-TVSecretBaseSecrets_Text_UsedSilverShield:: @ 08288B7A
+TVSecretBaseSecrets_Text_UsedSilverShield::
 	.string "The visitor is examining\n"
 	.string "a SILVER SHIELD!\p"
 	.string "The visitor appears to be wide-eyed!$"
 
-TVSecretBaseSecrets_Text_UsedGlassOrnament:: @ 08288BC9
+TVSecretBaseSecrets_Text_UsedGlassOrnament::
 	.string "The visitor is examining\n"
 	.string "a GLASS ORNAMENT!\p"
 	.string "Oh, no!\p"
@@ -2181,15 +2181,15 @@ TVSecretBaseSecrets_Text_UsedGlassOrnament:: @ 08288BC9
 	.string "It's getting covered with\n"
 	.string "fingerprints…$"
 
-TVSecretBaseSecrets_Text_UsedTV:: @ 08288C40
+TVSecretBaseSecrets_Text_UsedTV::
 	.string "The visitor is watching television!\p"
 	.string "Looks like we have a big fan of TV!$"
 
-TVSecretBaseSecrets_Text_UsedMudBall:: @ 08288C88
+TVSecretBaseSecrets_Text_UsedMudBall::
 	.string "The visitor stomped on a MUD BALL!\p"
 	.string "The visitor looks delighted!$"
 
-TVSecretBaseSecrets_Text_UsedBag:: @ 08288CC8
+TVSecretBaseSecrets_Text_UsedBag::
 	.string "…Oh?\p"
 	.string "The visitor is reaching for their own\n"
 	.string "BAG and rummaging about in it!\p"
@@ -2199,19 +2199,19 @@ TVSecretBaseSecrets_Text_UsedBag:: @ 08288CC8
 	.string "holding up the {STR_VAR_2}!\p"
 	.string "It's like a TV commercial!$"
 
-TVSecretBaseSecrets_Text_UsedCushion:: @ 08288D7F
+TVSecretBaseSecrets_Text_UsedCushion::
 	.string "The visitor grabs a cushion and…$"
 
-TVSecretBaseSecrets_Text_HitCushion:: @ 08288DA0
+TVSecretBaseSecrets_Text_HitCushion::
 	.string "…begins hitting it!\p"
 	.string "Is the visitor under a lot of stress?$"
 
-TVSecretBaseSecrets_Text_HuggedCushion:: @ 08288DDA
+TVSecretBaseSecrets_Text_HuggedCushion::
 	.string "…hugs it tight!\p"
 	.string "Could the visitor be feeling happy\n"
 	.string "about something?$"
 
-TVSecretBaseSecrets_Text_BattledWon:: @ 08288E1E
+TVSecretBaseSecrets_Text_BattledWon::
 	.string "The visitor is chatting with\n"
 	.string "{STR_VAR_1}!\p"
 	.string "It looks like they're going to\n"
@@ -2222,7 +2222,7 @@ TVSecretBaseSecrets_Text_BattledWon:: @ 08288E1E
 	.string "The visitor is doing\n"
 	.string "a victory dance!$"
 
-TVSecretBaseSecrets_Text_BattledLost:: @ 08288EC9
+TVSecretBaseSecrets_Text_BattledLost::
 	.string "The visitor is chatting with\n"
 	.string "{STR_VAR_1}!\p"
 	.string "It looks like they're going to\n"
@@ -2232,7 +2232,7 @@ TVSecretBaseSecrets_Text_BattledLost:: @ 08288EC9
 	.string "The visitor has lost!\p"
 	.string "The visitor looks dejected!$"
 
-TVSecretBaseSecrets_Text_DeclinedBattle:: @ 08288F58
+TVSecretBaseSecrets_Text_DeclinedBattle::
 	.string "The visitor is chatting with\n"
 	.string "{STR_VAR_1}!\p"
 	.string "It looks like they're going to\n"
@@ -2243,7 +2243,7 @@ TVSecretBaseSecrets_Text_DeclinedBattle:: @ 08288F58
 	.string "Did the visitor find {STR_VAR_1}\n"
 	.string "unappealing?$"
 
-TVSecretBaseSecrets_Text_UsedPoster:: @ 08289011
+TVSecretBaseSecrets_Text_UsedPoster::
 	.string "The visitor is staring intently\n"
 	.string "at a poster!\p"
 	.string "Is the poster to the visitor's\n"
@@ -2251,12 +2251,12 @@ TVSecretBaseSecrets_Text_UsedPoster:: @ 08289011
 	.string "…But… There's something disturbing\n"
 	.string "about the visitor's stares.$"
 
-TVSecretBaseSecrets_Text_UsedNoteMat:: @ 082890A4
+TVSecretBaseSecrets_Text_UsedNoteMat::
 	.string "The visitor stepped on a NOTE MAT!\p"
 	.string "…Hmm…\n"
 	.string "The visitor composed a funny tune!$"
 
-TVSecretBaseSecrets_Text_BattledDraw:: @ 082890F0
+TVSecretBaseSecrets_Text_BattledDraw::
 	.string "The visitor is chatting with\n"
 	.string "{STR_VAR_1}!\p"
 	.string "It looks like they're going to\n"
@@ -2267,14 +2267,14 @@ TVSecretBaseSecrets_Text_BattledDraw:: @ 082890F0
 	.string "Both TRAINERS appear to be very\n"
 	.string "disappointed!$"
 
-TVSecretBaseSecrets_Text_UsedSpinMat:: @ 08289193
+TVSecretBaseSecrets_Text_UsedSpinMat::
 	.string "The visitor stepped on\n"
 	.string "a SPIN MAT!\p"
 	.string "It looks like the visitor is dizzy!\p"
 	.string "The visitor is tottering about!\n"
 	.string "Look out!$"
 
-TVSecretBaseSecrets_Text_UsedSandOrnament:: @ 08289204
+TVSecretBaseSecrets_Text_UsedSandOrnament::
 	.string "The visitor is reaching for\n"
 	.string "a SAND ORNAMENT!\p"
 	.string "Oh!\p"
@@ -2283,7 +2283,7 @@ TVSecretBaseSecrets_Text_UsedSandOrnament:: @ 08289204
 	.string "The visitor looks sheepish\n"
 	.string "and guilty!$"
 
-TVSecretBaseSecrets_Text_UsedDesk:: @ 0828927C
+TVSecretBaseSecrets_Text_UsedDesk::
 	.string "The visitor is rubbing a desktop\n"
 	.string "with their finger!\p"
 	.string "Apparently, the visitor disapproves\n"
@@ -2291,25 +2291,25 @@ TVSecretBaseSecrets_Text_UsedDesk:: @ 0828927C
 	.string "The visitor is surprisingly concerned\n"
 	.string "about neatness!$"
 
-TVSecretBaseSecrets_Text_UsedBrick:: @ 08289313
+TVSecretBaseSecrets_Text_UsedBrick::
 	.string "The visitor is staring at a BRICK!\p"
 	.string "Perhaps the visitor is thinking about\n"
 	.string "the object on the BRICK.$"
 
-TVSecretBaseSecrets_Text_UsedSolidBoard:: @ 08289375
+TVSecretBaseSecrets_Text_UsedSolidBoard::
 	.string "The visitor is walking across\n"
 	.string "the SOLID BOARD.\p"
 	.string "The visitor keeps looking down.\p"
 	.string "The visitor appears to be surprisingly\n"
 	.string "timid and cautious!$"
 
-TVSecretBaseSecrets_Text_UsedFence:: @ 082893FF
+TVSecretBaseSecrets_Text_UsedFence::
 	.string "The visitor is looking intently\n"
 	.string "at a FENCE!\p"
 	.string "Has a new idea for a trap popped\n"
 	.string "into the visitor's head?$"
 
-TVSecretBaseSecrets_Text_UsedGlitterMat:: @ 08289465
+TVSecretBaseSecrets_Text_UsedGlitterMat::
 	.string "The visitor stepped on\n"
 	.string "a GLITTER MAT!\p"
 	.string "The visitor is striking a variety\n"
@@ -2317,13 +2317,13 @@ TVSecretBaseSecrets_Text_UsedGlitterMat:: @ 08289465
 	.string "The visitor appears to be fantasizing\n"
 	.string "about being an idol!$"
 
-TVSecretBaseSecrets_Text_UsedTire:: @ 082894F2
+TVSecretBaseSecrets_Text_UsedTire::
 	.string "The visitor is staring intently\n"
 	.string "at a TIRE!\p"
 	.string "Could the visitor be thinking about\n"
 	.string "the kind of car that would use it?$"
 
-TVSecretBaseSecrets_Text_UsedStand:: @ 08289564
+TVSecretBaseSecrets_Text_UsedStand::
 	.string "The visitor climbed a STAND!\p"
 	.string "The visitor is looking out across\n"
 	.string "{STR_VAR_1}'s BASE from high up!\p"
@@ -2331,16 +2331,16 @@ TVSecretBaseSecrets_Text_UsedStand:: @ 08289564
 	.string "Lets loose a roar!\n"
 	.string "The visitor is roaring!$"
 
-TVSecretBaseSecrets_Text_BrokeDoor:: @ 082895EB
+TVSecretBaseSecrets_Text_BrokeDoor::
 	.string "The visitor charged headlong into\n"
 	.string "a BREAKABLE DOOR!\p"
 	.string "The visitor is laughing uproariously!$"
 
-TVSecretBaseSecrets_Text_UsedDoll:: @ 08289645
+TVSecretBaseSecrets_Text_UsedDoll::
 	.string "The visitor is talking to a DOLL!\p"
 	.string "…It's a little creepy…$"
 
-TVSecretBaseSecrets_Text_UsedSlide:: @ 0828967E
+TVSecretBaseSecrets_Text_UsedSlide::
 	.string "The visitor is climbing the ladder\n"
 	.string "on a SLIDE!\p"
 	.string "And…\p"
@@ -2348,7 +2348,7 @@ TVSecretBaseSecrets_Text_UsedSlide:: @ 0828967E
 	.string "Looks like the visitor is having\n"
 	.string "a grand old time!$"
 
-TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown:: @ 082896FC
+TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown::
 	.string "The visitor is climbing the ladder\n"
 	.string "on a SLIDE!\p"
 	.string "And…\p"
@@ -2356,7 +2356,7 @@ TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown:: @ 082896FC
 	.string "the ladder!\p"
 	.string "Did the visitor suddenly chicken out?$"
 
-TVSecretBaseSecrets_Text_UsedJumpMat:: @ 0828977D
+TVSecretBaseSecrets_Text_UsedJumpMat::
 	.string "The visitor stepped on\n"
 	.string "a JUMP MAT!\p"
 	.string "The visitor jumped once!\p"
@@ -2365,7 +2365,7 @@ TVSecretBaseSecrets_Text_UsedJumpMat:: @ 0828977D
 	.string "The visitor is clapping!\n"
 	.string "What a solo performance!$"
 
-gTVSafariFanClubText00:: @ 08289813
+gTVSafariFanClubText00::
 	.string "SAFARI FAN CLUB!\p"
 	.string "REPORTER: All right, mates!\n"
 	.string "Tossing them SAFARI BALLS, are you?\p"
@@ -2376,69 +2376,69 @@ gTVSafariFanClubText00:: @ 08289813
 	.string "All right, mate, how are the visiting\n"
 	.string "TRAINERS looking?$"
 
-gTVSafariFanClubText01:: @ 0828992F
+gTVSafariFanClubText01::
 	.string "GUIDE: Everyone seems to be going\n"
 	.string "hard at it.\p"
 	.string "{STR_VAR_1} is doing especially well.\p"
 	.string "Why, before, {STR_VAR_1} caught\n"
 	.string "{STR_VAR_2} POKéMON.$"
 
-gTVSafariFanClubText02:: @ 0828999D
+gTVSafariFanClubText02::
 	.string "The TRAINER is clever with {POKEBLOCK}S.\n"
 	.string "Used {STR_VAR_2} that time, I think.$"
 
-gTVSafariFanClubText03:: @ 082899DC
+gTVSafariFanClubText03::
 	.string "The TRAINER didn't use a single\n"
 	.string "{POKEBLOCK}! Not a one!\p"
 	.string "There's an expert for you.$"
 
-gTVSafariFanClubText04:: @ 08289A29
+gTVSafariFanClubText04::
 	.string "REPORTER: Is that right, then?\p"
 	.string "Sounds like our mate {STR_VAR_1}\n"
 	.string "is a stout SAFARI master!\p"
 	.string "GUIDE: I hope the TRAINER comes back\n"
 	.string "and shows us that great technique.$"
 
-gTVSafariFanClubText05:: @ 08289AC2
+gTVSafariFanClubText05::
 	.string "GUIDE: No one seems to be doing\n"
 	.string "very well.\p"
 	.string "{STR_VAR_1} had it especially bad.\p"
 	.string "Why, before, the TRAINER only\n"
 	.string "managed to catch {STR_VAR_2} POKéMON.$"
 
-gTVSafariFanClubText06:: @ 08289B42
+gTVSafariFanClubText06::
 	.string "GUIDE: No one seems to be doing\n"
 	.string "very well.\p"
 	.string "{STR_VAR_1} had it especially bad.\p"
 	.string "Why, before, the TRAINER didn't\n"
 	.string "catch one POKéMON. Not a one!$"
 
-gTVSafariFanClubText07:: @ 08289BC5
+gTVSafariFanClubText07::
 	.string "The TRAINER does use {POKEBLOCK}S.\n"
 	.string "Used {STR_VAR_2} that time, I think.\p"
 	.string "But, boy, I wish the TRAINER would\n"
 	.string "get a bit better at this.$"
 
-gTVSafariFanClubText08:: @ 08289C3B
+gTVSafariFanClubText08::
 	.string "I think the TRAINER would have better\n"
 	.string "luck using {POKEBLOCK}S, which weren't\l"
 	.string "used at all that time.$"
 
-gTVSafariFanClubText09:: @ 08289C99
+gTVSafariFanClubText09::
 	.string "REPORTER: Is that right, then?\p"
 	.string "Sounds like our mate {STR_VAR_1}\n"
 	.string "needs more SAFARI seasoning.\p"
 	.string "GUIDE: I hope the TRAINER visits\n"
 	.string "over and over to get the hang of it.$"
 
-gTVSafariFanClubText10:: @ 08289D33
+gTVSafariFanClubText10::
 	.string "REPORTER: Quite right, it is!\n"
 	.string "Facing up to challenges is important!\p"
 	.string "Viewers, come on down to the SAFARI\n"
 	.string "and make the challenge yourself!\p"
 	.string "Until next time, cheerio!$"
 
-ContestLiveUpdates_Text_Intro:: @ 08289DD6
+ContestLiveUpdates_Text_Intro::
 	.string "“POKéMON CONTEST LIVE UPDATES!”\p"
 	.string "MC: Thanks for joining us!\p"
 	.string "We're live from the just-ended\n"
@@ -2457,117 +2457,117 @@ ContestLiveUpdates_Text_Intro:: @ 08289DD6
 	.string "MC: Let's hear what the fans have\n"
 	.string "to say about this CONTEST.$"
 
-ContestLiveUpdates_Text_WonBothRounds:: @ 08289F53
+ContestLiveUpdates_Text_WonBothRounds::
 	.string "Spectator: The {STR_VAR_2} was tops in\n"
 	.string "both primary and secondary judging!\p"
 	.string "That {STR_VAR_2} will keep winning!$"
 
-ContestLiveUpdates_Text_BetterRound2:: @ 08289FB0
+ContestLiveUpdates_Text_BetterRound2::
 	.string "Spectator: The {STR_VAR_2} didn't do\n"
 	.string "well in the primary judging, but it\l"
 	.string "cleaned up in the secondary judging!\p"
 	.string "It was a miraculous comeback\n"
 	.string "for that {STR_VAR_2}. Yippee!$"
 
-ContestLiveUpdates_Text_EqualRounds:: @ 0828A047
+ContestLiveUpdates_Text_EqualRounds::
 	.string "Spectator: The {STR_VAR_2} remained\n"
 	.string "consistent throughout both primary\l"
 	.string "and secondary judging.\p"
 	.string "{STR_VAR_3} and the {STR_VAR_2},\n"
 	.string "they're no ordinary combo!$"
 
-ContestLiveUpdates_Text_BetterRound1:: @ 0828A0C6
+ContestLiveUpdates_Text_BetterRound1::
 	.string "Spectator: In terms of being {STR_VAR_1},\n"
 	.string "that {STR_VAR_2} was outstanding.\p"
 	.string "I hope it makes better appeals\n"
 	.string "next time, though.$"
 
-ContestLiveUpdates_Text_GotNervous:: @ 0828A132
+ContestLiveUpdates_Text_GotNervous::
 	.string "Spectator: When the {STR_VAR_2} got\n"
 	.string "nervous, I couldn't stop myself from\l"
 	.string "shouting encouragement.\p"
 	.string "I'd like to say this to that\n"
 	.string "{STR_VAR_2}, “Congratulations!”$"
 
-ContestLiveUpdates_Text_StartledFoes:: @ 0828A1BE
+ContestLiveUpdates_Text_StartledFoes::
 	.string "Spectator: That {STR_VAR_2}'s appeal\n"
 	.string "startled even me!\p"
 	.string "{STR_VAR_2}, you were awesome!$"
 
-ContestLiveUpdates_Text_UsedCombo:: @ 0828A202
+ContestLiveUpdates_Text_UsedCombo::
 	.string "Spectator: That {STR_VAR_2}'s combo\n"
 	.string "appeal was stunning!\p"
 	.string "It's shaken me to the core!$"
 
-ContestLiveUpdates_Text_ExcitingAppeal:: @ 0828A24E
+ContestLiveUpdates_Text_ExcitingAppeal::
 	.string "Spectator: The winning {STR_VAR_2}'s\n"
 	.string "appeal got my heart pounding!$"
 
-ContestLiveUpdates_Text_WasCool:: @ 0828A288
+ContestLiveUpdates_Text_WasCool::
 	.string "{STR_VAR_2}!\n"
 	.string "You were cool!$"
 
-ContestLiveUpdates_Text_WasBeautiful:: @ 0828A29B
+ContestLiveUpdates_Text_WasBeautiful::
 	.string "{STR_VAR_2}!\n"
 	.string "You were beautiful!$"
 
-ContestLiveUpdates_Text_WasCute:: @ 0828A2B3
+ContestLiveUpdates_Text_WasCute::
 	.string "{STR_VAR_2}!\n"
 	.string "You were cute!$"
 
-ContestLiveUpdates_Text_WasSmart:: @ 0828A2C6
+ContestLiveUpdates_Text_WasSmart::
 	.string "{STR_VAR_2}!\n"
 	.string "You were smart!$"
 
-ContestLiveUpdates_Text_WasTough:: @ 0828A2DA
+ContestLiveUpdates_Text_WasTough::
 	.string "{STR_VAR_2}!\n"
 	.string "You were tough!$"
 
-ContestLiveUpdates_Text_VeryExcitingAppeal:: @ 0828A2EE
+ContestLiveUpdates_Text_VeryExcitingAppeal::
 	.string "Spectator: The winning {STR_VAR_2}'s\n"
 	.string "appeal still has my heart pounding!$"
 
-ContestLiveUpdates_Text_VeryCool:: @ 0828A32E
+ContestLiveUpdates_Text_VeryCool::
 	.string "{STR_VAR_2}!\n"
 	.string "You're the last word in cool!$"
 
-ContestLiveUpdates_Text_VeryBeautiful:: @ 0828A350
+ContestLiveUpdates_Text_VeryBeautiful::
 	.string "{STR_VAR_2}!\n"
 	.string "You're the most beautiful!$"
 
-ContestLiveUpdates_Text_VeryCute:: @ 0828A36F
+ContestLiveUpdates_Text_VeryCute::
 	.string "{STR_VAR_2}!\n"
 	.string "You're simply the cutest!$"
 
-ContestLiveUpdates_Text_VerySmart:: @ 0828A38D
+ContestLiveUpdates_Text_VerySmart::
 	.string "{STR_VAR_2}!\n"
 	.string "You're the smartest among the smart!$"
 
-ContestLiveUpdates_Text_VeryTough:: @ 0828A3B6
+ContestLiveUpdates_Text_VeryTough::
 	.string "{STR_VAR_2}!\n"
 	.string "You're the toughest of the tough!$"
 
-ContestLiveUpdates_Text_TookBreak:: @ 0828A3DC
+ContestLiveUpdates_Text_TookBreak::
 	.string "Spectator: Even when the {STR_VAR_2}\n"
 	.string "took a break from making appeals,\l"
 	.string "I couldn't take my eyes off it.\p"
 	.string "I'm captivated by that {STR_VAR_2}.$"
 
-ContestLiveUpdates_Text_GotStartled:: @ 0828A455
+ContestLiveUpdates_Text_GotStartled::
 	.string "Spectator: When the {STR_VAR_2} was\n"
 	.string "startled by another POKéMON's appeal,\l"
 	.string "I was close to tears.\p"
 	.string "{STR_VAR_2}, you were resilient!\n"
 	.string "Way to go!$"
 
-ContestLiveUpdates_Text_MoveWonderful:: @ 0828A4CF
+ContestLiveUpdates_Text_MoveWonderful::
 	.string "Spectator: Oh…\n"
 	.string "That {STR_VAR_2}'s {STR_VAR_3}!\l"
 	.string "{STR_VAR_2}'s {STR_VAR_3}!\l"
 	.string "{STR_VAR_2}'s {STR_VAR_3}!\l"
 	.string "How could it be so wonderful?$"
 
-ContestLiveUpdates_Text_TalkAboutAnotherMon:: @ 0828A51C
+ContestLiveUpdates_Text_TalkAboutAnotherMon::
 	.string "MC: Well, there you have it. This place\n"
 	.string "is full of the {STR_VAR_1}'s fans!\p"
 	.string "I should also mention that another\n"
@@ -2575,20 +2575,20 @@ ContestLiveUpdates_Text_TalkAboutAnotherMon:: @ 0828A51C
 	.string "caught my eye.\p"
 	.string "{STR_VAR_2}'s {STR_VAR_3}…$"
 
-ContestLiveUpdates_Text_FailedToAppeal:: @ 0828A5AC
+ContestLiveUpdates_Text_FailedToAppeal::
 	.string "It failed to make a single appeal during\n"
 	.string "secondary judging out of nervousness.\p"
 	.string "Next time, I would like to see this\n"
 	.string "{STR_VAR_1} make even one appeal.$"
 
-ContestLiveUpdates_Text_LastInBothRounds:: @ 0828A638
+ContestLiveUpdates_Text_LastInBothRounds::
 	.string "It came dead last in both primary\n"
 	.string "and secondary judging.\p"
 	.string "I hope that {STR_VAR_1} will retrain this\n"
 	.string "{STR_VAR_2} and erase the shame of\l"
 	.string "this undisputed last-place finish.$"
 
-ContestLiveUpdates_Text_NotExcitingEnough:: @ 0828A6CF
+ContestLiveUpdates_Text_NotExcitingEnough::
 	.string "It failed to take advantage of\n"
 	.string "the audience's excitement and make\l"
 	.string "an appropriate appeal.\p"
@@ -2596,7 +2596,7 @@ ContestLiveUpdates_Text_NotExcitingEnough:: @ 0828A6CF
 	.string "a feel for the audience and whip their\l"
 	.string "excitement to a fever pitch next time.$"
 
-ContestLiveUpdates_Text_LostAfterWinningRound1:: @ 0828A797
+ContestLiveUpdates_Text_LostAfterWinningRound1::
 	.string "While finishing first in the primary\n"
 	.string "judging, its appeals in the secondary\l"
 	.string "judging failed to click.\p"
@@ -2605,14 +2605,14 @@ ContestLiveUpdates_Text_LostAfterWinningRound1:: @ 0828A797
 	.string "I'm sure {STR_VAR_1} is studying how to\n"
 	.string "make more effective appeals now.$"
 
-ContestLiveUpdates_Text_NeverExciting:: @ 0828A86D
+ContestLiveUpdates_Text_NeverExciting::
 	.string "The audience never got excited by its\n"
 	.string "appeals during the secondary judging.\p"
 	.string "We hope it will stop worrying about\n"
 	.string "other POKéMON and learn to pitch\l"
 	.string "its appeals to the audience more.$"
 
-ContestLiveUpdates_Text_LostBySmallMargin:: @ 0828A920
+ContestLiveUpdates_Text_LostBySmallMargin::
 	.string "It lost to {STR_VAR_1}'s {STR_VAR_2}\n"
 	.string "by only a small margin.\p"
 	.string "It must be heartbreaking to come\n"
@@ -2620,7 +2620,7 @@ ContestLiveUpdates_Text_LostBySmallMargin:: @ 0828A920
 	.string "I wouldn't be surprised if {STR_VAR_3}\n"
 	.string "were weeping over this outcome.$"
 
-ContestLiveUpdates_Text_RepeatedAppeals:: @ 0828A9CC
+ContestLiveUpdates_Text_RepeatedAppeals::
 	.string "It disappointed the JUDGE by\n"
 	.string "repeating the same appeals.\p"
 	.string "It's an unforgivable error in any\n"
@@ -2628,14 +2628,14 @@ ContestLiveUpdates_Text_RepeatedAppeals:: @ 0828A9CC
 	.string "{STR_VAR_1} should feel guilty for\n"
 	.string "this sorry showing.$"
 
-ContestLiveUpdates_Text_ValiantEffortButLost:: @ 0828AA74
+ContestLiveUpdates_Text_ValiantEffortButLost::
 	.string "{STR_VAR_1} turned in a valiant effort,\n"
 	.string "but…\p"
 	.string "It was all for naught, finishing last.\p"
 	.string "{STR_VAR_1} should learn from this loss\n"
 	.string "and put the knowledge to good use.$"
 
-ContestLiveUpdates_Text_Outro:: @ 0828AB01
+ContestLiveUpdates_Text_Outro::
 	.string "I'd like to end this program with our\n"
 	.string "usual farewell to the winners.\p"
 	.string "This time, it's {STR_VAR_1} and\n"
@@ -2646,28 +2646,28 @@ ContestLiveUpdates_Text_Outro:: @ 0828AB01
 	.string "Congratulations!\l"
 	.string "You're the CONTEST winner!$"
 
-gTVPokemonBattleUpdateText00:: @ 0828ABCC
+gTVPokemonBattleUpdateText00::
 	.string "“POKéMON BATTLE UPDATE!”\p"
 	.string "Bringing you the results of POKéMON\n"
 	.string "battles as they come in!$"
 
-gTVPokemonBattleUpdateText01:: @ 0828AC22
+gTVPokemonBattleUpdateText01::
 	.string "The TRAINERS {STR_VAR_1} and\n"
 	.string "{STR_VAR_2} faced each other in\l"
 	.string "a {STR_VAR_3} BATTLE.\p"
 	.string "This match ended in victory for\n"
 	.string "{STR_VAR_1}!$"
 
-gTVPokemonBattleUpdateText02:: @ 0828AC7E
+gTVPokemonBattleUpdateText02::
 	.string "In the battle, {STR_VAR_1}'s\n"
 	.string "{STR_VAR_2} was a formidable force\l"
 	.string "using {STR_VAR_3}!$"
 
-gTVPokemonBattleUpdateText03:: @ 0828ACB6
+gTVPokemonBattleUpdateText03::
 	.string "{STR_VAR_1}'s {STR_VAR_2} had a weak\n"
 	.string "showing that really hurt.$"
 
-gTVPokemonBattleUpdateText04:: @ 0828ACE3
+gTVPokemonBattleUpdateText04::
 	.string "Congratulations on your victory,\n"
 	.string "{STR_VAR_1}!\p"
 	.string "And for the defeated {STR_VAR_2},\n"
@@ -2675,18 +2675,18 @@ gTVPokemonBattleUpdateText04:: @ 0828ACE3
 	.string "This concludes this episode of\n"
 	.string "“POKéMON BATTLE UPDATE!”$"
 
-gTVPokemonBattleUpdateText05:: @ 0828AD80
+gTVPokemonBattleUpdateText05::
 	.string "The teams of TRAINERS {STR_VAR_1} and\n"
 	.string "{STR_VAR_2} met in a MULTI BATTLE.\p"
 	.string "This match ended in victory for\n"
 	.string "{STR_VAR_1}'s team.$"
 
-gTVPokemonBattleUpdateText06:: @ 0828ADE2
+gTVPokemonBattleUpdateText06::
 	.string "In the battle, the {STR_VAR_2} on\n"
 	.string "{STR_VAR_1}'s team was a formidable\l"
 	.string "force using {STR_VAR_3}.$"
 
-gTVPokemonBattleUpdateText07:: @ 0828AE26
+gTVPokemonBattleUpdateText07::
 	.string "The weak showing by the {STR_VAR_3}\n"
 	.string "on {STR_VAR_2}'s team really hurt.\p"
 	.string "Congratulations on your team's\n"
@@ -2696,23 +2696,23 @@ gTVPokemonBattleUpdateText07:: @ 0828AE26
 	.string "This concludes this episode of\n"
 	.string "“POKéMON BATTLE UPDATE!”$"
 
-GabbyAndTy_Text_GabbyPreFirstBattle: @ 0828AF05
+GabbyAndTy_Text_GabbyPreFirstBattle:
 	.string "GABBY: Oh! We've just spotted a tough-\n"
 	.string "looking TRAINER here of all places!\p"
 	.string "Okay, roll camera!\n"
 	.string "Let's get this interview.$"
 
-GabbyAndTy_Text_GabbyIntro: @ 0828AF7D
+GabbyAndTy_Text_GabbyIntro:
 	.string "GABBY: Oh! You're {PLAYER}! Hi!\n"
 	.string "Do you remember us from last time?\p"
 	.string "Can you show us how much stronger\n"
 	.string "you've become? Okay, cue interview!$"
 
-GabbyAndTy_Text_GabbyDefeatFirstTime: @ 0828B000
+GabbyAndTy_Text_GabbyDefeatFirstTime:
 	.string "GABBY: My eyes didn't lie!\n"
 	.string "I did discover an astonishing TRAINER!$"
 
-GabbyAndTy_Text_WhoAreYouInterview: @ 0828B042
+GabbyAndTy_Text_WhoAreYouInterview:
 	.string "GABBY: Awesome! Awesome!\n"
 	.string "Who are you?!\p"
 	.string "I knew we were onto something wild\n"
@@ -2723,19 +2723,19 @@ GabbyAndTy_Text_WhoAreYouInterview: @ 0828B042
 	.string "So, would you give us a bit of your time\n"
 	.string "for an interview?$"
 
-GabbyAndTy_Text_QuoteFromLastInterview: @ 0828B137
+GabbyAndTy_Text_QuoteFromLastInterview:
 	.string "GABBY: “{STR_VAR_1}!”\p"
 	.string "Remember? That's the quote you gave\n"
 	.string "us as the battle clincher last time.\p"
 	.string "I never, ever forget stuff like that!$"
 
-GabbyAndTy_Text_YouStompedUsInterviewAgain: @ 0828B1B3
+GabbyAndTy_Text_YouStompedUsInterviewAgain:
 	.string "The last time we battled, you stomped\n"
 	.string "us before we could brace ourselves…\p"
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain: @ 0828B23D
+GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain:
 	.string "The last time we battled, didn't you\n"
 	.string "throw a POKé BALL at us?\p"
 	.string "We were shocked! So we told everyone,\n"
@@ -2743,30 +2743,30 @@ GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain: @ 0828B23D
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-GabbyAndTy_Text_CleverItemSkillsInterviewAgain: @ 0828B2FA
+GabbyAndTy_Text_CleverItemSkillsInterviewAgain:
 	.string "The last time we battled, your item\n"
 	.string "skills cleverly did us in.\p"
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-GabbyAndTy_Text_WeLookedRespectableInterviewAgain: @ 0828B379
+GabbyAndTy_Text_WeLookedRespectableInterviewAgain:
 	.string "The last time we battled, we managed\n"
 	.string "to look respectable.\p"
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-GabbyAndTy_Text_InterviewAgain: @ 0828B3F3
+GabbyAndTy_Text_InterviewAgain:
 	.string "Anyway, what do you think?\n"
 	.string "Do you want to be interviewed again?$"
 
-GabbyAndTy_Text_DescribeYourFeelings: @ 0828B433
+GabbyAndTy_Text_DescribeYourFeelings:
 	.string "You will?\n"
 	.string "Thank you!\p"
 	.string "Okay, I need you to describe your\n"
 	.string "feelings about our battle, but it\l"
 	.string "has to be short and sweet. Go!$"
 
-GabbyAndTy_Text_PerfectWellBeSeeingYou: @ 0828B4AB
+GabbyAndTy_Text_PerfectWellBeSeeingYou:
 	.string "GABBY: Mmm, yeah!\n"
 	.string "That's the perfect clincher!\p"
 	.string "I get the feeling that this will make\n"
@@ -2776,20 +2776,20 @@ GabbyAndTy_Text_PerfectWellBeSeeingYou: @ 0828B4AB
 	.string "Okay!\n"
 	.string "We'll be seeing you!$"
 
-GabbyAndTy_Text_DontGiveUpKeepingEyeOut: @ 0828B577
+GabbyAndTy_Text_DontGiveUpKeepingEyeOut:
 	.string "GABBY: Oh…\p"
 	.string "Okay, but don't give up!\n"
 	.string "We'll be keeping an eye out for you!$"
 
-GabbyAndTy_Text_KeepingAnEyeOutForYou: @ 0828B5C0
+GabbyAndTy_Text_KeepingAnEyeOutForYou:
 	.string "GABBY: We'll be keeping an eye out\n"
 	.string "for you!$"
 
-GabbyAndTy_Text_GabbyNotEnoughMons: @ 0828B5EC
+GabbyAndTy_Text_GabbyNotEnoughMons:
 	.string "GABBY: Is there a strong TRAINER\n"
 	.string "anywhere with a lot of POKéMON?$"
 
-GabbyAndTy_Text_GiveUsAnInterviewThisTime: @ 0828B62D
+GabbyAndTy_Text_GiveUsAnInterviewThisTime:
 	.string "GABBY: Wow, you are something!\p"
 	.string "You've gotten a lot stronger--a lot--\n"
 	.string "since we last battled.\p"
@@ -2799,40 +2799,40 @@ GabbyAndTy_Text_GiveUsAnInterviewThisTime: @ 0828B62D
 	.string "Are you willing to give us an interview\l"
 	.string "this time?$"
 
-GabbyAndTy_Text_GabbyDefeat: @ 0828B719
+GabbyAndTy_Text_GabbyDefeat:
 	.string "GABBY: That was an intense battle!\n"
 	.string "Did you get all that on camera?$"
 
-GabbyAndTy_Text_TyPreFirstBattle: @ 0828B75C
+GabbyAndTy_Text_TyPreFirstBattle:
 	.string "TY: Hey, lookie here! A tough-looking\n"
 	.string "TRAINER here, of all places!\l"
 	.string "Camera's rolling!$"
 
-GabbyAndTy_Text_TyIntro: @ 0828B7B1
+GabbyAndTy_Text_TyIntro:
 	.string "TY: Hey, lookie here!\n"
 	.string "I remember you!\p"
 	.string "I'll get this battle all on this\n"
 	.string "here camera!$"
 
-GabbyAndTy_Text_TyPostBattle: @ 0828B805
+GabbyAndTy_Text_TyPostBattle:
 	.string "TY: You're a natural!\n"
 	.string "Got me some prime footage right here!$"
 
-GabbyAndTy_Text_TyNotEnoughMons: @ 0828B841
+GabbyAndTy_Text_TyNotEnoughMons:
 	.string "TY: Do you only have the one POKéMON\n"
 	.string "and that's it?\p"
 	.string "If you had more POKéMON, it'd make for\n"
 	.string "better footage, but…$"
 
-GabbyAndTy_Text_TyDefeatFirstTime: @ 0828B8B1
+GabbyAndTy_Text_TyDefeatFirstTime:
 	.string "TY: Yep, we sure spotted a hot TRAINER.\n"
 	.string "This is a huge scoop for us!$"
 
-GabbyAndTy_Text_TyDefeat: @ 0828B8F6
+GabbyAndTy_Text_TyDefeat:
 	.string "TY: Yep, I got it all.\n"
 	.string "That whole battle's on camera.$"
 
-gTVInSearchOfTrainersText00:: @ 0828B92C
+gTVInSearchOfTrainersText00::
 	.string "IN SEARCH OF TRAINERS…\p"
 	.string "GABBY: Hi! Today I'm visiting an area\n"
 	.string "near {STR_VAR_1}.\p"
@@ -2843,14 +2843,14 @@ gTVInSearchOfTrainersText00:: @ 0828B92C
 	.string "There's something about this TRAINER\n"
 	.string "that piqued our interest.$"
 
-gTVInSearchOfTrainersText01:: @ 0828BA20
+gTVInSearchOfTrainersText01::
 	.string "We've battled {PLAYER} before, but we\n"
 	.string "can attest that the TRAINER has most\l"
 	.string "definitely improved from before.\p"
 	.string "I knew we were onto someone special\n"
 	.string "when we spotted this TRAINER!$"
 
-gTVInSearchOfTrainersText02:: @ 0828BAC8
+gTVInSearchOfTrainersText02::
 	.string "The best way to determine how strong\n"
 	.string "a TRAINER is…\p"
 	.string "Well, the fastest way is to battle.\n"
@@ -2864,7 +2864,7 @@ gTVInSearchOfTrainersText02:: @ 0828BAC8
 	.string "Here's our impressions after having\n"
 	.string "battled our featured TRAINER.$"
 
-gTVInSearchOfTrainersText03:: @ 0828BC18
+gTVInSearchOfTrainersText03::
 	.string "The combination of {STR_VAR_1} and\n"
 	.string "{STR_VAR_3} was divine!\p"
 	.string "The sight of them--{STR_VAR_1} and\n"
@@ -2876,7 +2876,7 @@ gTVInSearchOfTrainersText03:: @ 0828BC18
 	.string "The move {STR_VAR_2} is {STR_VAR_1}\n"
 	.string "and {STR_VAR_3}'s sign of friendship!$"
 
-gTVInSearchOfTrainersText04:: @ 0828BD20
+gTVInSearchOfTrainersText04::
 	.string "…I lost confidence in myself as\n"
 	.string "a result of our encounter.\p"
 	.string "We were beaten before we could launch\n"
@@ -2887,7 +2887,7 @@ gTVInSearchOfTrainersText04:: @ 0828BD20
 	.string "I recommend confident TRAINERS to\n"
 	.string "challenge {PLAYER}.$"
 
-gTVInSearchOfTrainersText05:: @ 0828BE01
+gTVInSearchOfTrainersText05::
 	.string "There's only one thing to be said.\n"
 	.string "Don't you dare throw a POKé BALL during\l"
 	.string "a TRAINER battle!\p"
@@ -2897,13 +2897,13 @@ gTVInSearchOfTrainersText05:: @ 0828BE01
 	.string "If you see {PLAYER}, please caution\n"
 	.string "the TRAINER!$"
 
-gTVInSearchOfTrainersText06:: @ 0828BEEE
+gTVInSearchOfTrainersText06::
 	.string "{PLAYER} is adept at reading the\n"
 	.string "opponent's actions.\p"
 	.string "The timing of item usage was remarkably\n"
 	.string "effective!$"
 
-gTVInSearchOfTrainersText07:: @ 0828BF50
+gTVInSearchOfTrainersText07::
 	.string "Honestly speaking, I thought that\n"
 	.string "I might even be pretty good.\p"
 	.string "While we did end up losing, we did have\n"
@@ -2911,7 +2911,7 @@ gTVInSearchOfTrainersText07:: @ 0828BF50
 	.string "But if you're struggling against me,\n"
 	.string "you have a ways to go, {PLAYER}!$"
 
-gTVInSearchOfTrainersText08:: @ 0828C011
+gTVInSearchOfTrainersText08::
 	.string "After our battle, we asked {PLAYER} for\n"
 	.string "a succinct summary.\p"
 	.string "The TRAINER replied, “{STR_VAR_1}.”\p"
@@ -2925,7 +2925,7 @@ gTVInSearchOfTrainersText08:: @ 0828C011
 	.string "That's all for today!\n"
 	.string "See you again on our next broadcast!$"
 
-ContestLadyShow_Text_Intro:: @ 0828C137
+ContestLadyShow_Text_Intro::
 	.string "“POKéMON CONTEST LIVE UPDATES!”\p"
 	.string "MC: Sorry to interrupt the regular\n"
 	.string "programming, and thanks for joining us!\p"
@@ -2940,7 +2940,7 @@ ContestLadyShow_Text_Intro:: @ 0828C137
 	.string "Spectators: ?!!!!\n"
 	.string "?!!!!$"
 
-ContestLadyShow_Text_Won:: @ 0828C28C
+ContestLadyShow_Text_Won::
 	.string "MC: Excuse me!\n"
 	.string "Thanks for joining us on live TV!\p"
 	.string "May I congratulate you on your win?\p"
@@ -2959,7 +2959,7 @@ ContestLadyShow_Text_Won:: @ 0828C28C
 	.string "We did it!\l"
 	.string "Thank you!$"
 
-ContestLadyShow_Text_Lost:: @ 0828C45B
+ContestLadyShow_Text_Lost::
 	.string "MC: Excuse me!\n"
 	.string "Thanks for joining us on live TV!\p"
 	.string "You must be disappointed by that turn\n"
@@ -2979,7 +2979,7 @@ ContestLadyShow_Text_Lost:: @ 0828C45B
 	.string "Uh… That's all the time we have today!\n"
 	.string "Thanks for tuning in!$"
 
-ContestLadyShow_Text_LostBadly:: @ 0828C662
+ContestLadyShow_Text_LostBadly::
 	.string "MC: Excuse me!\n"
 	.string "Thanks for joining us on live TV!\p"
 	.string "How did your CONTEST appearance go?\p"
diff --git a/data/tilesets/graphics.inc b/data/tilesets/graphics.inc
index c7e6d15b0..c85bd249e 100644
--- a/data/tilesets/graphics.inc
+++ b/data/tilesets/graphics.inc
@@ -1,9 +1,9 @@
 	.align 2
-gTilesetTiles_Petalburg:: @ 8339E08
+gTilesetTiles_Petalburg::
 	.incbin "data/tilesets/secondary/petalburg/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Petalburg:: @ 833A704
+gTilesetPalettes_Petalburg::
 	.incbin "data/tilesets/secondary/petalburg/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/petalburg/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/petalburg/palettes/02.gbapal"
@@ -22,11 +22,11 @@ gTilesetPalettes_Petalburg:: @ 833A704
 	.incbin "data/tilesets/secondary/petalburg/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Rustboro:: @ 833A904
+gTilesetTiles_Rustboro::
 	.incbin "data/tilesets/secondary/rustboro/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Rustboro:: @ 833BEC0
+gTilesetPalettes_Rustboro::
 	.incbin "data/tilesets/secondary/rustboro/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/rustboro/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/rustboro/palettes/02.gbapal"
@@ -45,11 +45,11 @@ gTilesetPalettes_Rustboro:: @ 833BEC0
 	.incbin "data/tilesets/secondary/rustboro/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Dewford:: @ 833C0C0
+gTilesetTiles_Dewford::
 	.incbin "data/tilesets/secondary/dewford/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Dewford:: @ 833D540
+gTilesetPalettes_Dewford::
 	.incbin "data/tilesets/secondary/dewford/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/dewford/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/dewford/palettes/02.gbapal"
@@ -68,11 +68,11 @@ gTilesetPalettes_Dewford:: @ 833D540
 	.incbin "data/tilesets/secondary/dewford/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Slateport:: @ 833D740
+gTilesetTiles_Slateport::
 	.incbin "data/tilesets/secondary/slateport/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Slateport:: @ 833F708
+gTilesetPalettes_Slateport::
 	.incbin "data/tilesets/secondary/slateport/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/slateport/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/slateport/palettes/02.gbapal"
@@ -91,11 +91,11 @@ gTilesetPalettes_Slateport:: @ 833F708
 	.incbin "data/tilesets/secondary/slateport/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Mauville:: @ 833F908
+gTilesetTiles_Mauville::
 	.incbin "data/tilesets/secondary/mauville/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Mauville:: @ 834172C
+gTilesetPalettes_Mauville::
 	.incbin "data/tilesets/secondary/mauville/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mauville/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mauville/palettes/02.gbapal"
@@ -114,11 +114,11 @@ gTilesetPalettes_Mauville:: @ 834172C
 	.incbin "data/tilesets/secondary/mauville/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Lavaridge:: @ 834192C
+gTilesetTiles_Lavaridge::
 	.incbin "data/tilesets/secondary/lavaridge/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Lavaridge:: @ 8342E28
+gTilesetPalettes_Lavaridge::
 	.incbin "data/tilesets/secondary/lavaridge/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/lavaridge/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/lavaridge/palettes/02.gbapal"
@@ -137,11 +137,11 @@ gTilesetPalettes_Lavaridge:: @ 8342E28
 	.incbin "data/tilesets/secondary/lavaridge/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Fallarbor:: @ 8343028
+gTilesetTiles_Fallarbor::
 	.incbin "data/tilesets/secondary/fallarbor/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Fallarbor:: @ 83447A0
+gTilesetPalettes_Fallarbor::
 	.incbin "data/tilesets/secondary/fallarbor/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/fallarbor/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/fallarbor/palettes/02.gbapal"
@@ -160,11 +160,11 @@ gTilesetPalettes_Fallarbor:: @ 83447A0
 	.incbin "data/tilesets/secondary/fallarbor/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Fortree:: @ 83449A0
+gTilesetTiles_Fortree::
 	.incbin "data/tilesets/secondary/fortree/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Fortree:: @ 8346020
+gTilesetPalettes_Fortree::
 	.incbin "data/tilesets/secondary/fortree/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/fortree/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/fortree/palettes/02.gbapal"
@@ -183,11 +183,11 @@ gTilesetPalettes_Fortree:: @ 8346020
 	.incbin "data/tilesets/secondary/fortree/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Lilycove:: @ 8346220
+gTilesetTiles_Lilycove::
 	.incbin "data/tilesets/secondary/lilycove/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Lilycove:: @ 83475C0
+gTilesetPalettes_Lilycove::
 	.incbin "data/tilesets/secondary/lilycove/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/lilycove/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/lilycove/palettes/02.gbapal"
@@ -206,11 +206,11 @@ gTilesetPalettes_Lilycove:: @ 83475C0
 	.incbin "data/tilesets/secondary/lilycove/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Mossdeep:: @ 83477C0
+gTilesetTiles_Mossdeep::
 	.incbin "data/tilesets/secondary/mossdeep/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Mossdeep:: @ 8348E10
+gTilesetPalettes_Mossdeep::
 	.incbin "data/tilesets/secondary/mossdeep/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep/palettes/02.gbapal"
@@ -229,11 +229,11 @@ gTilesetPalettes_Mossdeep:: @ 8348E10
 	.incbin "data/tilesets/secondary/mossdeep/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_EverGrande:: @ 8349010
+gTilesetTiles_EverGrande::
 	.incbin "data/tilesets/secondary/ever_grande/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_EverGrande:: @ 8349C28
+gTilesetPalettes_EverGrande::
 	.incbin "data/tilesets/secondary/ever_grande/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/ever_grande/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/ever_grande/palettes/02.gbapal"
@@ -252,11 +252,11 @@ gTilesetPalettes_EverGrande:: @ 8349C28
 	.incbin "data/tilesets/secondary/ever_grande/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Pacifidlog:: @ 8349E28
+gTilesetTiles_Pacifidlog::
 	.incbin "data/tilesets/secondary/pacifidlog/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Pacifidlog:: @ 834B5B4
+gTilesetPalettes_Pacifidlog::
 	.incbin "data/tilesets/secondary/pacifidlog/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pacifidlog/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pacifidlog/palettes/02.gbapal"
@@ -275,11 +275,11 @@ gTilesetPalettes_Pacifidlog:: @ 834B5B4
 	.incbin "data/tilesets/secondary/pacifidlog/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Sootopolis:: @ 834B7B4
+gTilesetTiles_Sootopolis::
 	.incbin "data/tilesets/secondary/sootopolis/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Sootopolis:: @ 834C6B4
+gTilesetPalettes_Sootopolis::
 	.incbin "data/tilesets/secondary/sootopolis/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/sootopolis/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/sootopolis/palettes/02.gbapal"
@@ -298,11 +298,11 @@ gTilesetPalettes_Sootopolis:: @ 834C6B4
 	.incbin "data/tilesets/secondary/sootopolis/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleFrontierOutsideWest:: @ 834C8B4
+gTilesetTiles_BattleFrontierOutsideWest::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleFrontierOutsideWest:: @ 834E3E4
+gTilesetPalettes_BattleFrontierOutsideWest::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/02.gbapal"
@@ -321,11 +321,11 @@ gTilesetPalettes_BattleFrontierOutsideWest:: @ 834E3E4
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleFrontierOutsideEast:: @ 834E5E4
+gTilesetTiles_BattleFrontierOutsideEast::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984
+gTilesetPalettes_BattleFrontierOutsideEast::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/02.gbapal"
@@ -344,11 +344,11 @@ gTilesetPalettes_BattleFrontierOutsideEast:: @ 834F984
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_InsideBuilding:: @ 834FB84
+gTilesetTiles_InsideBuilding::
 	.incbin "data/tilesets/primary/building/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_InsideBuilding:: @ 83508BC
+gTilesetPalettes_InsideBuilding::
 	.incbin "data/tilesets/primary/building/palettes/00.gbapal"
 	.incbin "data/tilesets/primary/building/palettes/01.gbapal"
 	.incbin "data/tilesets/primary/building/palettes/02.gbapal"
@@ -367,11 +367,11 @@ gTilesetPalettes_InsideBuilding:: @ 83508BC
 	.incbin "data/tilesets/primary/building/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Shop:: @ 8350ABC
+gTilesetTiles_Shop::
 	.incbin "data/tilesets/secondary/shop/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Shop:: @ 83520DC
+gTilesetPalettes_Shop::
 	.incbin "data/tilesets/secondary/shop/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/shop/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/shop/palettes/02.gbapal"
@@ -390,11 +390,11 @@ gTilesetPalettes_Shop:: @ 83520DC
 	.incbin "data/tilesets/secondary/shop/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PokemonCenter:: @ 83522DC
+gTilesetTiles_PokemonCenter::
 	.incbin "data/tilesets/secondary/pokemon_center/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PokemonCenter:: @ 8353574
+gTilesetPalettes_PokemonCenter::
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/02.gbapal"
@@ -413,11 +413,11 @@ gTilesetPalettes_PokemonCenter:: @ 8353574
 	.incbin "data/tilesets/secondary/pokemon_center/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Cave:: @ 8353774
+gTilesetTiles_Cave::
 	.incbin "data/tilesets/secondary/cave/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Cave:: @ 8355260
+gTilesetPalettes_Cave::
 	.incbin "data/tilesets/secondary/cave/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/cave/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/cave/palettes/02.gbapal"
@@ -436,11 +436,11 @@ gTilesetPalettes_Cave:: @ 8355260
 	.incbin "data/tilesets/secondary/cave/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PokemonSchool:: @ 8355460
+gTilesetTiles_PokemonSchool::
 	.incbin "data/tilesets/secondary/pokemon_school/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PokemonSchool:: @ 8355BA8
+gTilesetPalettes_PokemonSchool::
 	.incbin "data/tilesets/secondary/pokemon_school/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_school/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_school/palettes/02.gbapal"
@@ -459,11 +459,11 @@ gTilesetPalettes_PokemonSchool:: @ 8355BA8
 	.incbin "data/tilesets/secondary/pokemon_school/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PokemonFanClub:: @ 8355DA8
+gTilesetTiles_PokemonFanClub::
 	.incbin "data/tilesets/secondary/pokemon_fan_club/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PokemonFanClub:: @ 83566D4
+gTilesetPalettes_PokemonFanClub::
 	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/02.gbapal"
@@ -482,11 +482,11 @@ gTilesetPalettes_PokemonFanClub:: @ 83566D4
 	.incbin "data/tilesets/secondary/pokemon_fan_club/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Unused1:: @ 83568D4
+gTilesetTiles_Unused1::
 	.incbin "data/tilesets/secondary/unused_1/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Unused1:: @ 8356920
+gTilesetPalettes_Unused1::
 	.incbin "data/tilesets/secondary/unused_1/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/unused_1/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/unused_1/palettes/02.gbapal"
@@ -505,11 +505,11 @@ gTilesetPalettes_Unused1:: @ 8356920
 	.incbin "data/tilesets/secondary/unused_1/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MeteorFalls:: @ 8356B20
+gTilesetTiles_MeteorFalls::
 	.incbin "data/tilesets/secondary/meteor_falls/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MeteorFalls:: @ 8358840
+gTilesetPalettes_MeteorFalls::
 	.incbin "data/tilesets/secondary/meteor_falls/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/meteor_falls/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/meteor_falls/palettes/02.gbapal"
@@ -528,11 +528,11 @@ gTilesetPalettes_MeteorFalls:: @ 8358840
 	.incbin "data/tilesets/secondary/meteor_falls/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_OceanicMuseum:: @ 8358A40
+gTilesetTiles_OceanicMuseum::
 	.incbin "data/tilesets/secondary/oceanic_museum/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_OceanicMuseum:: @ 83599CC
+gTilesetPalettes_OceanicMuseum::
 	.incbin "data/tilesets/secondary/oceanic_museum/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/oceanic_museum/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/oceanic_museum/palettes/02.gbapal"
@@ -551,14 +551,14 @@ gTilesetPalettes_OceanicMuseum:: @ 83599CC
 	.incbin "data/tilesets/secondary/oceanic_museum/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_CableClub:: @ 8359BCC
+gTilesetTiles_CableClub::
 	.incbin "data/tilesets/secondary/cable_club/tiles.4bpp"
 
 	.align 2
 	.incbin "data/tilesets/secondary/cable_club/unknown_tiles.4bpp"
 
 	.align 2
-gTilesetPalettes_CableClub:: @ 835EACC
+gTilesetPalettes_CableClub::
 	.incbin "data/tilesets/secondary/cable_club/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/cable_club/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/cable_club/palettes/02.gbapal"
@@ -577,11 +577,11 @@ gTilesetPalettes_CableClub:: @ 835EACC
 	.incbin "data/tilesets/secondary/cable_club/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_SeashoreHouse:: @ 835ECCC
+gTilesetTiles_SeashoreHouse::
 	.incbin "data/tilesets/secondary/seashore_house/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SeashoreHouse:: @ 835F5A8
+gTilesetPalettes_SeashoreHouse::
 	.incbin "data/tilesets/secondary/seashore_house/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/seashore_house/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/seashore_house/palettes/02.gbapal"
@@ -600,11 +600,11 @@ gTilesetPalettes_SeashoreHouse:: @ 835F5A8
 	.incbin "data/tilesets/secondary/seashore_house/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PrettyPetalFlowerShop:: @ 835F7A8
+gTilesetTiles_PrettyPetalFlowerShop::
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PrettyPetalFlowerShop:: @ 83603A0
+gTilesetPalettes_PrettyPetalFlowerShop::
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/02.gbapal"
@@ -623,11 +623,11 @@ gTilesetPalettes_PrettyPetalFlowerShop:: @ 83603A0
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PokemonDayCare:: @ 83605A0
+gTilesetTiles_PokemonDayCare::
 	.incbin "data/tilesets/secondary/pokemon_day_care/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PokemonDayCare:: @ 8360FDC
+gTilesetPalettes_PokemonDayCare::
 	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/02.gbapal"
@@ -646,11 +646,11 @@ gTilesetPalettes_PokemonDayCare:: @ 8360FDC
 	.incbin "data/tilesets/secondary/pokemon_day_care/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Facility:: @ 83611DC
+gTilesetTiles_Facility::
 	.incbin "data/tilesets/secondary/facility/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Facility:: @ 8362E90
+gTilesetPalettes_Facility::
 	.incbin "data/tilesets/secondary/facility/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/facility/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/facility/palettes/02.gbapal"
@@ -669,11 +669,11 @@ gTilesetPalettes_Facility:: @ 8362E90
 	.incbin "data/tilesets/secondary/facility/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BikeShop:: @ 8363090
+gTilesetTiles_BikeShop::
 	.incbin "data/tilesets/secondary/bike_shop/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BikeShop:: @ 83643C0
+gTilesetPalettes_BikeShop::
 	.incbin "data/tilesets/secondary/bike_shop/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/bike_shop/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/bike_shop/palettes/02.gbapal"
@@ -692,11 +692,11 @@ gTilesetPalettes_BikeShop:: @ 83643C0
 	.incbin "data/tilesets/secondary/bike_shop/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_RusturfTunnel:: @ 83645C0
+gTilesetTiles_RusturfTunnel::
 	.incbin "data/tilesets/secondary/rusturf_tunnel/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_RusturfTunnel:: @ 8365008
+gTilesetPalettes_RusturfTunnel::
 	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/rusturf_tunnel/palettes/02.gbapal"
@@ -719,7 +719,7 @@ gTilesetPalettes_RusturfTunnel:: @ 8365008
 	.incbin "data/tilesets/secondary/secret_base/brown_cave/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseBrownCave:: @ 8365788
+gTilesetPalettes_SecretBaseBrownCave::
 	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/brown_cave/palettes/02.gbapal"
@@ -742,7 +742,7 @@ gTilesetPalettes_SecretBaseBrownCave:: @ 8365788
 	.incbin "data/tilesets/secondary/secret_base/tree/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseTree:: @ 8365EAC
+gTilesetPalettes_SecretBaseTree::
 	.incbin "data/tilesets/secondary/secret_base/tree/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/tree/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/tree/palettes/02.gbapal"
@@ -765,7 +765,7 @@ gTilesetPalettes_SecretBaseTree:: @ 8365EAC
 	.incbin "data/tilesets/secondary/secret_base/shrub/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseShrub:: @ 8366614
+gTilesetPalettes_SecretBaseShrub::
 	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/shrub/palettes/02.gbapal"
@@ -788,7 +788,7 @@ gTilesetPalettes_SecretBaseShrub:: @ 8366614
 	.incbin "data/tilesets/secondary/secret_base/blue_cave/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseBlueCave:: @ 8366C30
+gTilesetPalettes_SecretBaseBlueCave::
 	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/blue_cave/palettes/02.gbapal"
@@ -811,7 +811,7 @@ gTilesetPalettes_SecretBaseBlueCave:: @ 8366C30
 	.incbin "data/tilesets/secondary/secret_base/yellow_cave/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseYellowCave:: @ 8367368
+gTilesetPalettes_SecretBaseYellowCave::
 	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/yellow_cave/palettes/02.gbapal"
@@ -834,7 +834,7 @@ gTilesetPalettes_SecretBaseYellowCave:: @ 8367368
 	.incbin "data/tilesets/secondary/secret_base/red_cave/unused_tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SecretBaseRedCave:: @ 83679A0
+gTilesetPalettes_SecretBaseRedCave::
 	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/02.gbapal"
@@ -853,35 +853,35 @@ gTilesetPalettes_SecretBaseRedCave:: @ 83679A0
 	.incbin "data/tilesets/secondary/secret_base/red_cave/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_SecretBaseBrownCave:: @ 8367BA0
+gTilesetTiles_SecretBaseBrownCave::
 	.incbin "data/tilesets/secondary/secret_base/brown_cave/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_SecretBaseTree:: @ 8368600
+gTilesetTiles_SecretBaseTree::
 	.incbin "data/tilesets/secondary/secret_base/tree/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_SecretBaseShrub:: @ 8369060
+gTilesetTiles_SecretBaseShrub::
 	.incbin "data/tilesets/secondary/secret_base/shrub/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_SecretBaseBlueCave:: @ 8369AC0
+gTilesetTiles_SecretBaseBlueCave::
 	.incbin "data/tilesets/secondary/secret_base/blue_cave/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_SecretBaseYellowCave:: @ 836A520
+gTilesetTiles_SecretBaseYellowCave::
 	.incbin "data/tilesets/secondary/secret_base/yellow_cave/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_SecretBaseRedCave:: @ 836AF80
+gTilesetTiles_SecretBaseRedCave::
 	.incbin "data/tilesets/secondary/secret_base/red_cave/tiles.4bpp"
 
 	.align 2
-gTilesetTiles_InsideOfTruck:: @ 836B9E0
+gTilesetTiles_InsideOfTruck::
 	.incbin "data/tilesets/secondary/inside_of_truck/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_InsideOfTruck:: @ 836BC3C
+gTilesetPalettes_InsideOfTruck::
 	.incbin "data/tilesets/secondary/inside_of_truck/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/inside_of_truck/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/inside_of_truck/palettes/02.gbapal"
@@ -900,11 +900,11 @@ gTilesetPalettes_InsideOfTruck:: @ 836BC3C
 	.incbin "data/tilesets/secondary/inside_of_truck/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Contest:: @ 836BE3C
+gTilesetTiles_Contest::
 	.incbin "data/tilesets/secondary/contest/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Contest:: @ 836C990
+gTilesetPalettes_Contest::
 	.incbin "data/tilesets/secondary/contest/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/contest/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/contest/palettes/02.gbapal"
@@ -923,11 +923,11 @@ gTilesetPalettes_Contest:: @ 836C990
 	.incbin "data/tilesets/secondary/contest/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_LilycoveMuseum:: @ 836CB90
+gTilesetTiles_LilycoveMuseum::
 	.incbin "data/tilesets/secondary/lilycove_museum/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_LilycoveMuseum:: @ 836DEAC
+gTilesetPalettes_LilycoveMuseum::
 	.incbin "data/tilesets/secondary/lilycove_museum/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/lilycove_museum/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/lilycove_museum/palettes/02.gbapal"
@@ -946,11 +946,11 @@ gTilesetPalettes_LilycoveMuseum:: @ 836DEAC
 	.incbin "data/tilesets/secondary/lilycove_museum/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BrendansMaysHouse:: @ 836E0AC
+gTilesetTiles_BrendansMaysHouse::
 	.incbin "data/tilesets/secondary/brendans_mays_house/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BrendansMaysHouse:: @ 836F178
+gTilesetPalettes_BrendansMaysHouse::
 	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/02.gbapal"
@@ -969,11 +969,11 @@ gTilesetPalettes_BrendansMaysHouse:: @ 836F178
 	.incbin "data/tilesets/secondary/brendans_mays_house/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Lab:: @ 836F378
+gTilesetTiles_Lab::
 	.incbin "data/tilesets/secondary/lab/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Lab:: @ 83703DC
+gTilesetPalettes_Lab::
 	.incbin "data/tilesets/secondary/lab/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/lab/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/lab/palettes/02.gbapal"
@@ -992,11 +992,11 @@ gTilesetPalettes_Lab:: @ 83703DC
 	.incbin "data/tilesets/secondary/lab/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Underwater:: @ 83705DC
+gTilesetTiles_Underwater::
 	.incbin "data/tilesets/secondary/underwater/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Underwater:: @ 8371798
+gTilesetPalettes_Underwater::
 	.incbin "data/tilesets/secondary/underwater/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/underwater/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/underwater/palettes/02.gbapal"
@@ -1015,11 +1015,11 @@ gTilesetPalettes_Underwater:: @ 8371798
 	.incbin "data/tilesets/secondary/underwater/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_GenericBuilding:: @ 8371998
+gTilesetTiles_GenericBuilding::
 	.incbin "data/tilesets/secondary/generic_building/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_GenericBuilding:: @ 83733C4
+gTilesetPalettes_GenericBuilding::
 	.incbin "data/tilesets/secondary/generic_building/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/generic_building/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/generic_building/palettes/02.gbapal"
@@ -1038,11 +1038,11 @@ gTilesetPalettes_GenericBuilding:: @ 83733C4
 	.incbin "data/tilesets/secondary/generic_building/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MauvilleGameCorner:: @ 83735C4
+gTilesetTiles_MauvilleGameCorner::
 	.incbin "data/tilesets/secondary/mauville_game_corner/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MauvilleGameCorner:: @ 8374288
+gTilesetPalettes_MauvilleGameCorner::
 	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/02.gbapal"
@@ -1061,11 +1061,11 @@ gTilesetPalettes_MauvilleGameCorner:: @ 8374288
 	.incbin "data/tilesets/secondary/mauville_game_corner/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_Unused2:: @ 8374488
+gTilesetTiles_Unused2::
 	.incbin "data/tilesets/secondary/unused_2/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_Unused2:: @ 83749B0
+gTilesetPalettes_Unused2::
 	.incbin "data/tilesets/secondary/unused_2/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/unused_2/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/unused_2/palettes/02.gbapal"
@@ -1084,11 +1084,11 @@ gTilesetPalettes_Unused2:: @ 83749B0
 	.incbin "data/tilesets/secondary/unused_2/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_RustboroGym:: @ 8374BB0
+gTilesetTiles_RustboroGym::
 	.incbin "data/tilesets/secondary/rustboro_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_RustboroGym:: @ 8374F34
+gTilesetPalettes_RustboroGym::
 	.incbin "data/tilesets/secondary/rustboro_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/rustboro_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/rustboro_gym/palettes/02.gbapal"
@@ -1107,11 +1107,11 @@ gTilesetPalettes_RustboroGym:: @ 8374F34
 	.incbin "data/tilesets/secondary/rustboro_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_DewfordGym:: @ 8375134
+gTilesetTiles_DewfordGym::
 	.incbin "data/tilesets/secondary/dewford_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_DewfordGym:: @ 8375400
+gTilesetPalettes_DewfordGym::
 	.incbin "data/tilesets/secondary/dewford_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/dewford_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/dewford_gym/palettes/02.gbapal"
@@ -1130,11 +1130,11 @@ gTilesetPalettes_DewfordGym:: @ 8375400
 	.incbin "data/tilesets/secondary/dewford_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MauvilleGym:: @ 8375600
+gTilesetTiles_MauvilleGym::
 	.incbin "data/tilesets/secondary/mauville_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MauvilleGym:: @ 8375D84
+gTilesetPalettes_MauvilleGym::
 	.incbin "data/tilesets/secondary/mauville_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mauville_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mauville_gym/palettes/02.gbapal"
@@ -1153,11 +1153,11 @@ gTilesetPalettes_MauvilleGym:: @ 8375D84
 	.incbin "data/tilesets/secondary/mauville_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_LavaridgeGym:: @ 8375F84
+gTilesetTiles_LavaridgeGym::
 	.incbin "data/tilesets/secondary/lavaridge_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_LavaridgeGym:: @ 83762AC
+gTilesetPalettes_LavaridgeGym::
 	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/02.gbapal"
@@ -1176,11 +1176,11 @@ gTilesetPalettes_LavaridgeGym:: @ 83762AC
 	.incbin "data/tilesets/secondary/lavaridge_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_PetalburgGym:: @ 83764AC
+gTilesetTiles_PetalburgGym::
 	.incbin "data/tilesets/secondary/petalburg_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_PetalburgGym:: @ 8376B50
+gTilesetPalettes_PetalburgGym::
 	.incbin "data/tilesets/secondary/petalburg_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/petalburg_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/petalburg_gym/palettes/02.gbapal"
@@ -1199,11 +1199,11 @@ gTilesetPalettes_PetalburgGym:: @ 8376B50
 	.incbin "data/tilesets/secondary/petalburg_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_FortreeGym:: @ 8376D50
+gTilesetTiles_FortreeGym::
 	.incbin "data/tilesets/secondary/fortree_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_FortreeGym:: @ 83770C4
+gTilesetPalettes_FortreeGym::
 	.incbin "data/tilesets/secondary/fortree_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/fortree_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/fortree_gym/palettes/02.gbapal"
@@ -1222,11 +1222,11 @@ gTilesetPalettes_FortreeGym:: @ 83770C4
 	.incbin "data/tilesets/secondary/fortree_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MossdeepGym:: @ 83772C4
+gTilesetTiles_MossdeepGym::
 	.incbin "data/tilesets/secondary/mossdeep_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MossdeepGym:: @ 8377730
+gTilesetPalettes_MossdeepGym::
 	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/02.gbapal"
@@ -1245,11 +1245,11 @@ gTilesetPalettes_MossdeepGym:: @ 8377730
 	.incbin "data/tilesets/secondary/mossdeep_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_SootopolisGym:: @ 8377930
+gTilesetTiles_SootopolisGym::
 	.incbin "data/tilesets/secondary/sootopolis_gym/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_SootopolisGym:: @ 8378AC4
+gTilesetPalettes_SootopolisGym::
 	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/02.gbapal"
@@ -1268,11 +1268,11 @@ gTilesetPalettes_SootopolisGym:: @ 8378AC4
 	.incbin "data/tilesets/secondary/sootopolis_gym/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_TrickHousePuzzle:: @ 8378CC4
+gTilesetTiles_TrickHousePuzzle::
 	.incbin "data/tilesets/secondary/trick_house_puzzle/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_TrickHousePuzzle:: @ 8379A78
+gTilesetPalettes_TrickHousePuzzle::
 	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/02.gbapal"
@@ -1291,11 +1291,11 @@ gTilesetPalettes_TrickHousePuzzle:: @ 8379A78
 	.incbin "data/tilesets/secondary/trick_house_puzzle/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_InsideShip:: @ 8379C78
+gTilesetTiles_InsideShip::
 	.incbin "data/tilesets/secondary/inside_ship/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_InsideShip:: @ 837A848
+gTilesetPalettes_InsideShip::
 	.incbin "data/tilesets/secondary/inside_ship/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/inside_ship/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/inside_ship/palettes/02.gbapal"
@@ -1314,14 +1314,14 @@ gTilesetPalettes_InsideShip:: @ 837A848
 	.incbin "data/tilesets/secondary/inside_ship/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_SecretBase:: @ 837AA48
+gTilesetTiles_SecretBase::
 	.incbin "data/tilesets/primary/secret_base/tiles.4bpp"
 
 	.align 2
 	.incbin "data/tilesets/primary/secret_base/unknown_tiles.4bpp"
 
 	.align 2
-gTilesetPalettes_SecretBase:: @ 8382A48
+gTilesetPalettes_SecretBase::
 	.incbin "data/tilesets/primary/secret_base/palettes/00.gbapal"
 	.incbin "data/tilesets/primary/secret_base/palettes/01.gbapal"
 	.incbin "data/tilesets/primary/secret_base/palettes/02.gbapal"
@@ -1340,11 +1340,11 @@ gTilesetPalettes_SecretBase:: @ 8382A48
 	.incbin "data/tilesets/primary/secret_base/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_EliteFour:: @ 8382C48
+gTilesetTiles_EliteFour::
 	.incbin "data/tilesets/secondary/elite_four/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_EliteFour:: @ 8383CC4
+gTilesetPalettes_EliteFour::
 	.incbin "data/tilesets/secondary/elite_four/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/elite_four/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/elite_four/palettes/02.gbapal"
@@ -1363,11 +1363,11 @@ gTilesetPalettes_EliteFour:: @ 8383CC4
 	.incbin "data/tilesets/secondary/elite_four/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleFrontier:: @ 8383EC4
+gTilesetTiles_BattleFrontier::
 	.incbin "data/tilesets/secondary/battle_frontier/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleFrontier:: @ 8384BC8
+gTilesetPalettes_BattleFrontier::
 	.incbin "data/tilesets/secondary/battle_frontier/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier/palettes/02.gbapal"
@@ -1386,11 +1386,11 @@ gTilesetPalettes_BattleFrontier:: @ 8384BC8
 	.incbin "data/tilesets/secondary/battle_frontier/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattlePalace:: @ 8384DC8
+gTilesetTiles_BattlePalace::
 	.incbin "data/tilesets/secondary/battle_palace/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattlePalace:: @ 8385540
+gTilesetPalettes_BattlePalace::
 	.incbin "data/tilesets/secondary/battle_palace/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_palace/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_palace/palettes/02.gbapal"
@@ -1409,11 +1409,11 @@ gTilesetPalettes_BattlePalace:: @ 8385540
 	.incbin "data/tilesets/secondary/battle_palace/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleDome:: @ 8385740
+gTilesetTiles_BattleDome::
 	.incbin "data/tilesets/secondary/battle_dome/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleDome:: @ 8386990
+gTilesetPalettes_BattleDome::
 	.incbin "data/tilesets/secondary/battle_dome/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_dome/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_dome/palettes/02.gbapal"
@@ -1432,11 +1432,11 @@ gTilesetPalettes_BattleDome:: @ 8386990
 	.incbin "data/tilesets/secondary/battle_dome/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleFactory:: @ 8386B90
+gTilesetTiles_BattleFactory::
 	.incbin "data/tilesets/secondary/battle_factory/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleFactory:: @ 8387D7C
+gTilesetPalettes_BattleFactory::
 	.incbin "data/tilesets/secondary/battle_factory/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_factory/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_factory/palettes/02.gbapal"
@@ -1455,11 +1455,11 @@ gTilesetPalettes_BattleFactory:: @ 8387D7C
 	.incbin "data/tilesets/secondary/battle_factory/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattlePike:: @ 8387F7C
+gTilesetTiles_BattlePike::
 	.incbin "data/tilesets/secondary/battle_pike/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattlePike:: @ 8389250
+gTilesetPalettes_BattlePike::
 	.incbin "data/tilesets/secondary/battle_pike/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_pike/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_pike/palettes/02.gbapal"
@@ -1478,11 +1478,11 @@ gTilesetPalettes_BattlePike:: @ 8389250
 	.incbin "data/tilesets/secondary/battle_pike/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleArena:: @ 8389450
+gTilesetTiles_BattleArena::
 	.incbin "data/tilesets/secondary/battle_arena/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleArena:: @ 8389F8C
+gTilesetPalettes_BattleArena::
 	.incbin "data/tilesets/secondary/battle_arena/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_arena/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_arena/palettes/02.gbapal"
@@ -1501,11 +1501,11 @@ gTilesetPalettes_BattleArena:: @ 8389F8C
 	.incbin "data/tilesets/secondary/battle_arena/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattlePyramid:: @ 838A18C
+gTilesetTiles_BattlePyramid::
 	.incbin "data/tilesets/secondary/battle_pyramid/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattlePyramid:: @ 838B39C
+gTilesetPalettes_BattlePyramid::
 	.incbin "data/tilesets/secondary/battle_pyramid/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_pyramid/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_pyramid/palettes/02.gbapal"
@@ -1524,11 +1524,11 @@ gTilesetPalettes_BattlePyramid:: @ 838B39C
 	.incbin "data/tilesets/secondary/battle_pyramid/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MirageTower:: @ 838B59C
+gTilesetTiles_MirageTower::
 	.incbin "data/tilesets/secondary/mirage_tower/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MirageTower:: @ 838CFE4
+gTilesetPalettes_MirageTower::
 	.incbin "data/tilesets/secondary/mirage_tower/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mirage_tower/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mirage_tower/palettes/02.gbapal"
@@ -1547,11 +1547,11 @@ gTilesetPalettes_MirageTower:: @ 838CFE4
 	.incbin "data/tilesets/secondary/mirage_tower/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MossdeepGameCorner:: @ 838D1E4
+gTilesetTiles_MossdeepGameCorner::
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MossdeepGameCorner:: @ 838D604
+gTilesetPalettes_MossdeepGameCorner::
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/02.gbapal"
@@ -1570,11 +1570,11 @@ gTilesetPalettes_MossdeepGameCorner:: @ 838D604
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_IslandHarbor:: @ 838D804
+gTilesetTiles_IslandHarbor::
 	.incbin "data/tilesets/secondary/island_harbor/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_IslandHarbor:: @ 838F1D4
+gTilesetPalettes_IslandHarbor::
 	.incbin "data/tilesets/secondary/island_harbor/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/island_harbor/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/island_harbor/palettes/02.gbapal"
@@ -1593,11 +1593,11 @@ gTilesetPalettes_IslandHarbor:: @ 838F1D4
 	.incbin "data/tilesets/secondary/island_harbor/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_TrainerHill:: @ 838F3D4
+gTilesetTiles_TrainerHill::
 	.incbin "data/tilesets/secondary/trainer_hill/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_TrainerHill:: @ 83904C4
+gTilesetPalettes_TrainerHill::
 	.incbin "data/tilesets/secondary/trainer_hill/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/trainer_hill/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/trainer_hill/palettes/02.gbapal"
@@ -1616,11 +1616,11 @@ gTilesetPalettes_TrainerHill:: @ 83904C4
 	.incbin "data/tilesets/secondary/trainer_hill/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_NavelRock:: @ 83906C4
+gTilesetTiles_NavelRock::
 	.incbin "data/tilesets/secondary/navel_rock/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_NavelRock:: @ 8392258
+gTilesetPalettes_NavelRock::
 	.incbin "data/tilesets/secondary/navel_rock/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/navel_rock/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/navel_rock/palettes/02.gbapal"
@@ -1639,11 +1639,11 @@ gTilesetPalettes_NavelRock:: @ 8392258
 	.incbin "data/tilesets/secondary/navel_rock/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleFrontierRankingHall:: @ 8392458
+gTilesetTiles_BattleFrontierRankingHall::
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleFrontierRankingHall:: @ 8392CAC
+gTilesetPalettes_BattleFrontierRankingHall::
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/02.gbapal"
@@ -1662,11 +1662,11 @@ gTilesetPalettes_BattleFrontierRankingHall:: @ 8392CAC
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_BattleTent:: @ 8392EAC
+gTilesetTiles_BattleTent::
 	.incbin "data/tilesets/secondary/battle_tent/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_BattleTent:: @ 8393910
+gTilesetPalettes_BattleTent::
 	.incbin "data/tilesets/secondary/battle_tent/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/battle_tent/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/battle_tent/palettes/02.gbapal"
@@ -1685,11 +1685,11 @@ gTilesetPalettes_BattleTent:: @ 8393910
 	.incbin "data/tilesets/secondary/battle_tent/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_MysteryEventsHouse:: @ 8393B10
+gTilesetTiles_MysteryEventsHouse::
 	.incbin "data/tilesets/secondary/mystery_events_house/tiles.4bpp.lz"
 
 	.align 2
-gTilesetPalettes_MysteryEventsHouse:: @ 8395478
+gTilesetPalettes_MysteryEventsHouse::
 	.incbin "data/tilesets/secondary/mystery_events_house/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/mystery_events_house/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/mystery_events_house/palettes/02.gbapal"
@@ -1708,7 +1708,7 @@ gTilesetPalettes_MysteryEventsHouse:: @ 8395478
 	.incbin "data/tilesets/secondary/mystery_events_house/palettes/15.gbapal"
 
 	.align 2
-gTilesetPalettes_UnionRoom:: @ 8395678
+gTilesetPalettes_UnionRoom::
 	.incbin "data/tilesets/secondary/union_room/palettes/00.gbapal"
 	.incbin "data/tilesets/secondary/union_room/palettes/01.gbapal"
 	.incbin "data/tilesets/secondary/union_room/palettes/02.gbapal"
@@ -1727,5 +1727,5 @@ gTilesetPalettes_UnionRoom:: @ 8395678
 	.incbin "data/tilesets/secondary/union_room/palettes/15.gbapal"
 
 	.align 2
-gTilesetTiles_UnionRoom:: @ 8395878
+gTilesetTiles_UnionRoom::
 	.incbin "data/tilesets/secondary/union_room/tiles.4bpp.lz"
diff --git a/data/tilesets/headers.inc b/data/tilesets/headers.inc
index c56234b13..6324e943c 100644
--- a/data/tilesets/headers.inc
+++ b/data/tilesets/headers.inc
@@ -1,5 +1,5 @@
 	.align 2
-gTileset_General:: @ 83DF704
+gTileset_General::
 	.byte TRUE @ is compressed
 	.byte FALSE @ is secondary tileset
 	.2byte 0 @ padding
@@ -10,7 +10,7 @@ gTileset_General:: @ 83DF704
 	.4byte InitTilesetAnim_General
 
 	.align 2
-gTileset_Petalburg:: @ 83DF71C
+gTileset_Petalburg::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -21,7 +21,7 @@ gTileset_Petalburg:: @ 83DF71C
 	.4byte InitTilesetAnim_Petalburg
 
 	.align 2
-gTileset_Rustboro:: @ 83DF734
+gTileset_Rustboro::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -32,7 +32,7 @@ gTileset_Rustboro:: @ 83DF734
 	.4byte InitTilesetAnim_Rustboro
 
 	.align 2
-gTileset_Dewford:: @ 83DF74C
+gTileset_Dewford::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -43,7 +43,7 @@ gTileset_Dewford:: @ 83DF74C
 	.4byte InitTilesetAnim_Dewford
 
 	.align 2
-gTileset_Slateport:: @ 83DF764
+gTileset_Slateport::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -54,7 +54,7 @@ gTileset_Slateport:: @ 83DF764
 	.4byte InitTilesetAnim_Slateport
 
 	.align 2
-gTileset_Mauville:: @ 83DF77C
+gTileset_Mauville::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -65,7 +65,7 @@ gTileset_Mauville:: @ 83DF77C
 	.4byte InitTilesetAnim_Mauville
 
 	.align 2
-gTileset_Lavaridge:: @ 83DF794
+gTileset_Lavaridge::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -76,7 +76,7 @@ gTileset_Lavaridge:: @ 83DF794
 	.4byte InitTilesetAnim_Lavaridge
 
 	.align 2
-gTileset_Fallarbor:: @ 83DF7AC
+gTileset_Fallarbor::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -87,7 +87,7 @@ gTileset_Fallarbor:: @ 83DF7AC
 	.4byte InitTilesetAnim_Fallarbor
 
 	.align 2
-gTileset_Fortree:: @ 83DF7C4
+gTileset_Fortree::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -98,7 +98,7 @@ gTileset_Fortree:: @ 83DF7C4
 	.4byte InitTilesetAnim_Fortree
 
 	.align 2
-gTileset_Lilycove:: @ 83DF7DC
+gTileset_Lilycove::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -109,7 +109,7 @@ gTileset_Lilycove:: @ 83DF7DC
 	.4byte InitTilesetAnim_Lilycove
 
 	.align 2
-gTileset_Mossdeep:: @ 83DF7F4
+gTileset_Mossdeep::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -120,7 +120,7 @@ gTileset_Mossdeep:: @ 83DF7F4
 	.4byte InitTilesetAnim_Mossdeep
 
 	.align 2
-gTileset_EverGrande:: @ 83DF80C
+gTileset_EverGrande::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -131,7 +131,7 @@ gTileset_EverGrande:: @ 83DF80C
 	.4byte InitTilesetAnim_EverGrande
 
 	.align 2
-gTileset_Pacifidlog:: @ 83DF824
+gTileset_Pacifidlog::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -142,7 +142,7 @@ gTileset_Pacifidlog:: @ 83DF824
 	.4byte InitTilesetAnim_Pacifidlog
 
 	.align 2
-gTileset_Sootopolis:: @ 83DF83C
+gTileset_Sootopolis::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -153,7 +153,7 @@ gTileset_Sootopolis:: @ 83DF83C
 	.4byte InitTilesetAnim_Sootopolis
 
 	.align 2
-gTileset_BattleFrontierOutsideWest:: @ 83DF854
+gTileset_BattleFrontierOutsideWest::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -164,7 +164,7 @@ gTileset_BattleFrontierOutsideWest:: @ 83DF854
 	.4byte InitTilesetAnim_BattleFrontierOutsideWest
 
 	.align 2
-gTileset_BattleFrontierOutsideEast:: @ 83DF86C
+gTileset_BattleFrontierOutsideEast::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -175,7 +175,7 @@ gTileset_BattleFrontierOutsideEast:: @ 83DF86C
 	.4byte InitTilesetAnim_BattleFrontierOutsideEast
 
 	.align 2
-gTileset_Building:: @ 83DF884
+gTileset_Building::
 	.byte TRUE @ is compressed
 	.byte FALSE @ is secondary tileset
 	.2byte 0 @ padding
@@ -186,7 +186,7 @@ gTileset_Building:: @ 83DF884
 	.4byte InitTilesetAnim_Building
 
 	.align 2
-gTileset_Shop:: @ 83DF89C
+gTileset_Shop::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -197,7 +197,7 @@ gTileset_Shop:: @ 83DF89C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_PokemonCenter:: @ 83DF8B4
+gTileset_PokemonCenter::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -208,7 +208,7 @@ gTileset_PokemonCenter:: @ 83DF8B4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Cave:: @ 83DF8CC
+gTileset_Cave::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -219,7 +219,7 @@ gTileset_Cave:: @ 83DF8CC
 	.4byte InitTilesetAnim_Cave
 
 	.align 2
-gTileset_PokemonSchool:: @ 83DF8E4
+gTileset_PokemonSchool::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -230,7 +230,7 @@ gTileset_PokemonSchool:: @ 83DF8E4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_PokemonFanClub:: @ 83DF8FC
+gTileset_PokemonFanClub::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -241,7 +241,7 @@ gTileset_PokemonFanClub:: @ 83DF8FC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Unused1:: @ 83DF914
+gTileset_Unused1::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -252,7 +252,7 @@ gTileset_Unused1:: @ 83DF914
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MeteorFalls:: @ 83DF92C
+gTileset_MeteorFalls::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -263,7 +263,7 @@ gTileset_MeteorFalls:: @ 83DF92C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_OceanicMuseum:: @ 83DF944
+gTileset_OceanicMuseum::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -274,7 +274,7 @@ gTileset_OceanicMuseum:: @ 83DF944
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_CableClub:: @ 83DF95C
+gTileset_CableClub::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -285,7 +285,7 @@ gTileset_CableClub:: @ 83DF95C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SeashoreHouse:: @ 83DF974
+gTileset_SeashoreHouse::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -296,7 +296,7 @@ gTileset_SeashoreHouse:: @ 83DF974
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_PrettyPetalFlowerShop:: @ 83DF98C
+gTileset_PrettyPetalFlowerShop::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -307,7 +307,7 @@ gTileset_PrettyPetalFlowerShop:: @ 83DF98C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_PokemonDayCare:: @ 83DF9A4
+gTileset_PokemonDayCare::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -318,7 +318,7 @@ gTileset_PokemonDayCare:: @ 83DF9A4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Facility:: @ 83DF9BC
+gTileset_Facility::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -329,7 +329,7 @@ gTileset_Facility:: @ 83DF9BC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BikeShop:: @ 83DF9D4
+gTileset_BikeShop::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -340,7 +340,7 @@ gTileset_BikeShop:: @ 83DF9D4
 	.4byte InitTilesetAnim_BikeShop
 
 	.align 2
-gTileset_RusturfTunnel:: @ 83DF9EC
+gTileset_RusturfTunnel::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -351,7 +351,7 @@ gTileset_RusturfTunnel:: @ 83DF9EC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseBrownCave:: @ 83DFA04
+gTileset_SecretBaseBrownCave::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -362,7 +362,7 @@ gTileset_SecretBaseBrownCave:: @ 83DFA04
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseTree:: @ 83DFA1C
+gTileset_SecretBaseTree::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -373,7 +373,7 @@ gTileset_SecretBaseTree:: @ 83DFA1C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseShrub:: @ 83DFA34
+gTileset_SecretBaseShrub::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -384,7 +384,7 @@ gTileset_SecretBaseShrub:: @ 83DFA34
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseBlueCave:: @ 83DFA4C
+gTileset_SecretBaseBlueCave::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -395,7 +395,7 @@ gTileset_SecretBaseBlueCave:: @ 83DFA4C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseYellowCave:: @ 83DFA64
+gTileset_SecretBaseYellowCave::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -406,7 +406,7 @@ gTileset_SecretBaseYellowCave:: @ 83DFA64
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBaseRedCave:: @ 83DFA7C
+gTileset_SecretBaseRedCave::
 	.byte FALSE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -417,7 +417,7 @@ gTileset_SecretBaseRedCave:: @ 83DFA7C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_InsideOfTruck:: @ 83DFA94
+gTileset_InsideOfTruck::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -428,7 +428,7 @@ gTileset_InsideOfTruck:: @ 83DFA94
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Unused2:: @ 83DFAAC
+gTileset_Unused2::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -439,7 +439,7 @@ gTileset_Unused2:: @ 83DFAAC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Contest:: @ 83DFAC4
+gTileset_Contest::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -450,7 +450,7 @@ gTileset_Contest:: @ 83DFAC4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_LilycoveMuseum:: @ 83DFADC
+gTileset_LilycoveMuseum::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -461,7 +461,7 @@ gTileset_LilycoveMuseum:: @ 83DFADC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BrendansMaysHouse:: @ 83DFAF4
+gTileset_BrendansMaysHouse::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -472,7 +472,7 @@ gTileset_BrendansMaysHouse:: @ 83DFAF4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Lab:: @ 83DFB0C
+gTileset_Lab::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -483,7 +483,7 @@ gTileset_Lab:: @ 83DFB0C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_Underwater:: @ 83DFB24
+gTileset_Underwater::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -494,7 +494,7 @@ gTileset_Underwater:: @ 83DFB24
 	.4byte InitTilesetAnim_Underwater
 
 	.align 2
-gTileset_PetalburgGym:: @ 83DFB3C
+gTileset_PetalburgGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -505,7 +505,7 @@ gTileset_PetalburgGym:: @ 83DFB3C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SootopolisGym:: @ 83DFB54
+gTileset_SootopolisGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -516,7 +516,7 @@ gTileset_SootopolisGym:: @ 83DFB54
 	.4byte InitTilesetAnim_SootopolisGym
 
 	.align 2
-gTileset_GenericBuilding:: @ 83DFB6C
+gTileset_GenericBuilding::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -527,7 +527,7 @@ gTileset_GenericBuilding:: @ 83DFB6C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MauvilleGameCorner:: @ 83DFB84
+gTileset_MauvilleGameCorner::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -538,7 +538,7 @@ gTileset_MauvilleGameCorner:: @ 83DFB84
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_RustboroGym:: @ 83DFB9C
+gTileset_RustboroGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -549,7 +549,7 @@ gTileset_RustboroGym:: @ 83DFB9C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_DewfordGym:: @ 83DFBB4
+gTileset_DewfordGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -560,7 +560,7 @@ gTileset_DewfordGym:: @ 83DFBB4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MauvilleGym:: @ 83DFBCC
+gTileset_MauvilleGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -571,7 +571,7 @@ gTileset_MauvilleGym:: @ 83DFBCC
 	.4byte InitTilesetAnim_MauvilleGym
 
 	.align 2
-gTileset_LavaridgeGym:: @ 83DFBE4
+gTileset_LavaridgeGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -582,7 +582,7 @@ gTileset_LavaridgeGym:: @ 83DFBE4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_TrickHousePuzzle:: @ 83DFBFC
+gTileset_TrickHousePuzzle::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -593,7 +593,7 @@ gTileset_TrickHousePuzzle:: @ 83DFBFC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_FortreeGym:: @ 83DFC14
+gTileset_FortreeGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -604,7 +604,7 @@ gTileset_FortreeGym:: @ 83DFC14
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MossdeepGym:: @ 83DFC2C
+gTileset_MossdeepGym::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -615,7 +615,7 @@ gTileset_MossdeepGym:: @ 83DFC2C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_InsideShip:: @ 83DFC44
+gTileset_InsideShip::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -626,7 +626,7 @@ gTileset_InsideShip:: @ 83DFC44
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_SecretBase:: @ 83DFC5C
+gTileset_SecretBase::
 	.byte FALSE @ is compressed
 	.byte FALSE @ is secondary tileset
 	.2byte 0 @ padding
@@ -637,15 +637,15 @@ gTileset_SecretBase:: @ 83DFC5C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTilesetPointer_SecretBase:: @ 83DFC74
+gTilesetPointer_SecretBase::
 	.4byte gTileset_SecretBase
 
 	.align 2
-gTilesetPointer_SecretBaseRedCave:: @ 83DFC78
+gTilesetPointer_SecretBaseRedCave::
 	.4byte gTileset_SecretBaseRedCave
 
 	.align 2
-gTileset_EliteFour:: @ 83DFC7C
+gTileset_EliteFour::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -656,7 +656,7 @@ gTileset_EliteFour:: @ 83DFC7C
 	.4byte InitTilesetAnim_EliteFour
 
 	.align 2
-gTileset_BattleFrontier:: @ 83DFC94
+gTileset_BattleFrontier::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -667,7 +667,7 @@ gTileset_BattleFrontier:: @ 83DFC94
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattlePalace:: @ 83DFCAC
+gTileset_BattlePalace::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -678,7 +678,7 @@ gTileset_BattlePalace:: @ 83DFCAC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattleDome:: @ 83DFCC4
+gTileset_BattleDome::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -689,7 +689,7 @@ gTileset_BattleDome:: @ 83DFCC4
 	.4byte InitTilesetAnim_BattleDome
 
 	.align 2
-gTileset_BattleFactory:: @ 83DFCDC
+gTileset_BattleFactory::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -700,7 +700,7 @@ gTileset_BattleFactory:: @ 83DFCDC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattlePike:: @ 83DFCF4
+gTileset_BattlePike::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -711,7 +711,7 @@ gTileset_BattlePike:: @ 83DFCF4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattleArena:: @ 83DFD0C
+gTileset_BattleArena::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -722,7 +722,7 @@ gTileset_BattleArena:: @ 83DFD0C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattlePyramid:: @ 83DFD24
+gTileset_BattlePyramid::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -733,7 +733,7 @@ gTileset_BattlePyramid:: @ 83DFD24
 	.4byte InitTilesetAnim_BattlePyramid
 
 	.align 2
-gTileset_MirageTower:: @ 83DFD3C
+gTileset_MirageTower::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -744,7 +744,7 @@ gTileset_MirageTower:: @ 83DFD3C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MossdeepGameCorner:: @ 83DFD54
+gTileset_MossdeepGameCorner::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -755,7 +755,7 @@ gTileset_MossdeepGameCorner:: @ 83DFD54
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_IslandHarbor:: @ 83DFD6C
+gTileset_IslandHarbor::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -766,7 +766,7 @@ gTileset_IslandHarbor:: @ 83DFD6C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_TrainerHill:: @ 83DFD84
+gTileset_TrainerHill::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -777,7 +777,7 @@ gTileset_TrainerHill:: @ 83DFD84
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_NavelRock:: @ 83DFD9C
+gTileset_NavelRock::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -788,7 +788,7 @@ gTileset_NavelRock:: @ 83DFD9C
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattleFrontierRankingHall:: @ 83DFDB4
+gTileset_BattleFrontierRankingHall::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -799,7 +799,7 @@ gTileset_BattleFrontierRankingHall:: @ 83DFDB4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_BattleTent:: @ 83DFDCC
+gTileset_BattleTent::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -810,7 +810,7 @@ gTileset_BattleTent:: @ 83DFDCC
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_MysteryEventsHouse:: @ 83DFDE4
+gTileset_MysteryEventsHouse::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
@@ -821,7 +821,7 @@ gTileset_MysteryEventsHouse:: @ 83DFDE4
 	.4byte NULL @ animation callback
 
 	.align 2
-gTileset_UnionRoom:: @ 83DFDFC
+gTileset_UnionRoom::
 	.byte TRUE @ is compressed
 	.byte TRUE @ is secondary tileset
 	.2byte 0 @ padding
diff --git a/data/tilesets/metatiles.inc b/data/tilesets/metatiles.inc
index 1d0875147..5fbb529d0 100644
--- a/data/tilesets/metatiles.inc
+++ b/data/tilesets/metatiles.inc
@@ -1,559 +1,559 @@
 	.align 1
-gMetatiles_General:: @ 83960F0
+gMetatiles_General::
 	.incbin "data/tilesets/primary/general/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_General:: @ 83980F0
+gMetatileAttributes_General::
 	.incbin "data/tilesets/primary/general/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Petalburg:: @ 83984F0
+gMetatiles_Petalburg::
 	.incbin "data/tilesets/secondary/petalburg/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Petalburg:: @ 8398DF0
+gMetatileAttributes_Petalburg::
 	.incbin "data/tilesets/secondary/petalburg/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Rustboro:: @ 8398F10
+gMetatiles_Rustboro::
 	.incbin "data/tilesets/secondary/rustboro/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Rustboro:: @ 839A4F0
+gMetatileAttributes_Rustboro::
 	.incbin "data/tilesets/secondary/rustboro/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Dewford:: @ 839A7AC
+gMetatiles_Dewford::
 	.incbin "data/tilesets/secondary/dewford/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Dewford:: @ 839BF5C
+gMetatileAttributes_Dewford::
 	.incbin "data/tilesets/secondary/dewford/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Slateport:: @ 839C252
+gMetatiles_Slateport::
 	.incbin "data/tilesets/secondary/slateport/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Slateport:: @ 839DBB2
+gMetatileAttributes_Slateport::
 	.incbin "data/tilesets/secondary/slateport/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Mauville:: @ 839DEDE
+gMetatiles_Mauville::
 	.incbin "data/tilesets/secondary/mauville/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Mauville:: @ 839FEBE
+gMetatileAttributes_Mauville::
 	.incbin "data/tilesets/secondary/mauville/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Lavaridge:: @ 83A02BA
+gMetatiles_Lavaridge::
 	.incbin "data/tilesets/secondary/lavaridge/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Lavaridge:: @ 83A1E4A
+gMetatileAttributes_Lavaridge::
 	.incbin "data/tilesets/secondary/lavaridge/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Fallarbor:: @ 83A21BC
+gMetatiles_Fallarbor::
 	.incbin "data/tilesets/secondary/fallarbor/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Fallarbor:: @ 83A38AC
+gMetatileAttributes_Fallarbor::
 	.incbin "data/tilesets/secondary/fallarbor/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Fortree:: @ 83A3B8A
+gMetatiles_Fortree::
 	.incbin "data/tilesets/secondary/fortree/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Fortree:: @ 83A4D0A
+gMetatileAttributes_Fortree::
 	.incbin "data/tilesets/secondary/fortree/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Lilycove:: @ 83A4F3A
+gMetatiles_Lilycove::
 	.incbin "data/tilesets/secondary/lilycove/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Lilycove:: @ 83A652A
+gMetatileAttributes_Lilycove::
 	.incbin "data/tilesets/secondary/lilycove/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Mossdeep:: @ 83A67E8
+gMetatiles_Mossdeep::
 	.incbin "data/tilesets/secondary/mossdeep/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Mossdeep:: @ 83A8448
+gMetatileAttributes_Mossdeep::
 	.incbin "data/tilesets/secondary/mossdeep/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_EverGrande:: @ 83A87D4
+gMetatiles_EverGrande::
 	.incbin "data/tilesets/secondary/ever_grande/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_EverGrande:: @ 83A9254
+gMetatileAttributes_EverGrande::
 	.incbin "data/tilesets/secondary/ever_grande/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Pacifidlog:: @ 83A93A4
+gMetatiles_Pacifidlog::
 	.incbin "data/tilesets/secondary/pacifidlog/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Pacifidlog:: @ 83AA054
+gMetatileAttributes_Pacifidlog::
 	.incbin "data/tilesets/secondary/pacifidlog/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Sootopolis:: @ 83AA1EA
+gMetatiles_Sootopolis::
 	.incbin "data/tilesets/secondary/sootopolis/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Sootopolis:: @ 83AB1CA
+gMetatileAttributes_Sootopolis::
 	.incbin "data/tilesets/secondary/sootopolis/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleFrontierOutsideWest:: @ 83AB3C6
+gMetatiles_BattleFrontierOutsideWest::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleFrontierOutsideWest:: @ 83AD3A6
+gMetatileAttributes_BattleFrontierOutsideWest::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_west/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleFrontierOutsideEast:: @ 83AD7A2
+gMetatiles_BattleFrontierOutsideEast::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleFrontierOutsideEast:: @ 83AF782
+gMetatileAttributes_BattleFrontierOutsideEast::
 	.incbin "data/tilesets/secondary/battle_frontier_outside_east/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_InsideBuilding:: @ 83AFB7E
+gMetatiles_InsideBuilding::
 	.incbin "data/tilesets/primary/building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_InsideBuilding:: @ 83AFBFE
+gMetatileAttributes_InsideBuilding::
 	.incbin "data/tilesets/primary/building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Shop:: @ 83AFC0E
+gMetatiles_Shop::
 	.incbin "data/tilesets/secondary/shop/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Shop:: @ 83B0E1E
+gMetatileAttributes_Shop::
 	.incbin "data/tilesets/secondary/shop/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PokemonCenter:: @ 83B1060
+gMetatiles_PokemonCenter::
 	.incbin "data/tilesets/secondary/pokemon_center/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PokemonCenter:: @ 83B1EE0
+gMetatileAttributes_PokemonCenter::
 	.incbin "data/tilesets/secondary/pokemon_center/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Cave:: @ 83B20B0
+gMetatiles_Cave::
 	.incbin "data/tilesets/secondary/cave/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Cave:: @ 83B3A90
+gMetatileAttributes_Cave::
 	.incbin "data/tilesets/secondary/cave/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PokemonSchool:: @ 83B3DCC
+gMetatiles_PokemonSchool::
 	.incbin "data/tilesets/secondary/pokemon_school/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PokemonSchool:: @ 83B416C
+gMetatileAttributes_PokemonSchool::
 	.incbin "data/tilesets/secondary/pokemon_school/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PokemonFanClub:: @ 83B41E0
+gMetatiles_PokemonFanClub::
 	.incbin "data/tilesets/secondary/pokemon_fan_club/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PokemonFanClub:: @ 83B4860
+gMetatileAttributes_PokemonFanClub::
 	.incbin "data/tilesets/secondary/pokemon_fan_club/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Unused1:: @ 83B4930
+gMetatiles_Unused1::
 	.incbin "data/tilesets/secondary/unused_1/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Unused1:: @ 83B4950
+gMetatileAttributes_Unused1::
 	.incbin "data/tilesets/secondary/unused_1/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MeteorFalls:: @ 83B4954
+gMetatiles_MeteorFalls::
 	.incbin "data/tilesets/secondary/meteor_falls/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MeteorFalls:: @ 83B5344
+gMetatileAttributes_MeteorFalls::
 	.incbin "data/tilesets/secondary/meteor_falls/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_OceanicMuseum:: @ 83B5482
+gMetatiles_OceanicMuseum::
 	.incbin "data/tilesets/secondary/oceanic_museum/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_OceanicMuseum:: @ 83B5C22
+gMetatileAttributes_OceanicMuseum::
 	.incbin "data/tilesets/secondary/oceanic_museum/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_CableClub:: @ 83B5D16
+gMetatiles_CableClub::
 	.incbin "data/tilesets/secondary/cable_club/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_CableClub:: @ 83B6D16
+gMetatileAttributes_CableClub::
 	.incbin "data/tilesets/secondary/cable_club/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_SeashoreHouse:: @ 83B6F16
+gMetatiles_SeashoreHouse::
 	.incbin "data/tilesets/secondary/seashore_house/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_SeashoreHouse:: @ 83B7296
+gMetatileAttributes_SeashoreHouse::
 	.incbin "data/tilesets/secondary/seashore_house/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PrettyPetalFlowerShop:: @ 83B7306
+gMetatiles_PrettyPetalFlowerShop::
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PrettyPetalFlowerShop:: @ 83B7786
+gMetatileAttributes_PrettyPetalFlowerShop::
 	.incbin "data/tilesets/secondary/pretty_petal_flower_shop/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PokemonDayCare:: @ 83B7816
+gMetatiles_PokemonDayCare::
 	.incbin "data/tilesets/secondary/pokemon_day_care/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PokemonDayCare:: @ 83B7C56
+gMetatileAttributes_PokemonDayCare::
 	.incbin "data/tilesets/secondary/pokemon_day_care/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Facility:: @ 83B7CDE
+gMetatiles_Facility::
 	.incbin "data/tilesets/secondary/facility/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Facility:: @ 83B9CCE
+gMetatileAttributes_Facility::
 	.incbin "data/tilesets/secondary/facility/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BikeShop:: @ 83BA0CC
+gMetatiles_BikeShop::
 	.incbin "data/tilesets/secondary/bike_shop/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BikeShop:: @ 83BB04C
+gMetatileAttributes_BikeShop::
 	.incbin "data/tilesets/secondary/bike_shop/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_RusturfTunnel:: @ 83BB23C
+gMetatiles_RusturfTunnel::
 	.incbin "data/tilesets/secondary/rusturf_tunnel/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_RusturfTunnel:: @ 83BB76C
+gMetatileAttributes_RusturfTunnel::
 	.incbin "data/tilesets/secondary/rusturf_tunnel/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_SecretBaseSecondary:: @ 83BB812
+gMetatiles_SecretBaseSecondary::
 	.incbin "data/tilesets/secondary/secret_base/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_SecretBaseSecondary:: @ 83BCC52
+gMetatileAttributes_SecretBaseSecondary::
 	.incbin "data/tilesets/secondary/secret_base/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_InsideOfTruck:: @ 83BCEDA
+gMetatiles_InsideOfTruck::
 	.incbin "data/tilesets/secondary/inside_of_truck/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_InsideOfTruck:: @ 83BD13A
+gMetatileAttributes_InsideOfTruck::
 	.incbin "data/tilesets/secondary/inside_of_truck/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Contest:: @ 83BD186
+gMetatiles_Contest::
 	.incbin "data/tilesets/secondary/contest/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Contest:: @ 83BE016
+gMetatileAttributes_Contest::
 	.incbin "data/tilesets/secondary/contest/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_LilycoveMuseum:: @ 83BE1E8
+gMetatiles_LilycoveMuseum::
 	.incbin "data/tilesets/secondary/lilycove_museum/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_LilycoveMuseum:: @ 83BEAD8
+gMetatileAttributes_LilycoveMuseum::
 	.incbin "data/tilesets/secondary/lilycove_museum/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BrendansMaysHouse:: @ 83BEBF6
+gMetatiles_BrendansMaysHouse::
 	.incbin "data/tilesets/secondary/brendans_mays_house/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BrendansMaysHouse:: @ 83BF836
+gMetatileAttributes_BrendansMaysHouse::
 	.incbin "data/tilesets/secondary/brendans_mays_house/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Lab:: @ 83BF9BE
+gMetatiles_Lab::
 	.incbin "data/tilesets/secondary/lab/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Lab:: @ 83C039E
+gMetatileAttributes_Lab::
 	.incbin "data/tilesets/secondary/lab/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Underwater:: @ 83C04DA
+gMetatiles_Underwater::
 	.incbin "data/tilesets/secondary/underwater/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Underwater:: @ 83C139A
+gMetatileAttributes_Underwater::
 	.incbin "data/tilesets/secondary/underwater/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_GenericBuilding:: @ 83C1572
+gMetatiles_GenericBuilding::
 	.incbin "data/tilesets/secondary/generic_building/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_GenericBuilding:: @ 83C3572
+gMetatileAttributes_GenericBuilding::
 	.incbin "data/tilesets/secondary/generic_building/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MauvilleGameCorner:: @ 83C3972
+gMetatiles_MauvilleGameCorner::
 	.incbin "data/tilesets/secondary/mauville_game_corner/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MauvilleGameCorner:: @ 83C3F72
+gMetatileAttributes_MauvilleGameCorner::
 	.incbin "data/tilesets/secondary/mauville_game_corner/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_Unused2:: @ 83C4032
+gMetatiles_Unused2::
 	.incbin "data/tilesets/secondary/unused_2/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_Unused2:: @ 83C43D2
+gMetatileAttributes_Unused2::
 	.incbin "data/tilesets/secondary/unused_2/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_RustboroGym:: @ 83C4446
+gMetatiles_RustboroGym::
 	.incbin "data/tilesets/secondary/rustboro_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_RustboroGym:: @ 83C47C6
+gMetatileAttributes_RustboroGym::
 	.incbin "data/tilesets/secondary/rustboro_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_DewfordGym:: @ 83C4836
+gMetatiles_DewfordGym::
 	.incbin "data/tilesets/secondary/dewford_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_DewfordGym:: @ 83C4C86
+gMetatileAttributes_DewfordGym::
 	.incbin "data/tilesets/secondary/dewford_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MauvilleGym:: @ 83C4D10
+gMetatiles_MauvilleGym::
 	.incbin "data/tilesets/secondary/mauville_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MauvilleGym:: @ 83C5460
+gMetatileAttributes_MauvilleGym::
 	.incbin "data/tilesets/secondary/mauville_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_LavaridgeGym:: @ 83C554A
+gMetatiles_LavaridgeGym::
 	.incbin "data/tilesets/secondary/lavaridge_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_LavaridgeGym:: @ 83C591A
+gMetatileAttributes_LavaridgeGym::
 	.incbin "data/tilesets/secondary/lavaridge_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_PetalburgGym:: @ 83C5994
+gMetatiles_PetalburgGym::
 	.incbin "data/tilesets/secondary/petalburg_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_PetalburgGym:: @ 83C6794
+gMetatileAttributes_PetalburgGym::
 	.incbin "data/tilesets/secondary/petalburg_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_FortreeGym:: @ 83C6954
+gMetatiles_FortreeGym::
 	.incbin "data/tilesets/secondary/fortree_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_FortreeGym:: @ 83C6E54
+gMetatileAttributes_FortreeGym::
 	.incbin "data/tilesets/secondary/fortree_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MossdeepGym:: @ 83C6EF4
+gMetatiles_MossdeepGym::
 	.incbin "data/tilesets/secondary/mossdeep_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MossdeepGym:: @ 83C7644
+gMetatileAttributes_MossdeepGym::
 	.incbin "data/tilesets/secondary/mossdeep_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_SootopolisGym:: @ 83C772E
+gMetatiles_SootopolisGym::
 	.incbin "data/tilesets/secondary/sootopolis_gym/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_SootopolisGym:: @ 83C7ECE
+gMetatileAttributes_SootopolisGym::
 	.incbin "data/tilesets/secondary/sootopolis_gym/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_TrickHousePuzzle:: @ 83C7FC2
+gMetatiles_TrickHousePuzzle::
 	.incbin "data/tilesets/secondary/trick_house_puzzle/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_TrickHousePuzzle:: @ 83C8B92
+gMetatileAttributes_TrickHousePuzzle::
 	.incbin "data/tilesets/secondary/trick_house_puzzle/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_InsideShip:: @ 83C8D0C
+gMetatiles_InsideShip::
 	.incbin "data/tilesets/secondary/inside_ship/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_InsideShip:: @ 83C9CCC
+gMetatileAttributes_InsideShip::
 	.incbin "data/tilesets/secondary/inside_ship/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_SecretBasePrimary:: @ 83C9EC4
+gMetatiles_SecretBasePrimary::
 	.incbin "data/tilesets/primary/secret_base/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_SecretBasePrimary:: @ 83C9EE4
+gMetatileAttributes_SecretBasePrimary::
 	.incbin "data/tilesets/primary/secret_base/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_EliteFour:: @ 83C9EE8
+gMetatiles_EliteFour::
 	.incbin "data/tilesets/secondary/elite_four/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_EliteFour:: @ 83CB3A8
+gMetatileAttributes_EliteFour::
 	.incbin "data/tilesets/secondary/elite_four/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleFrontier:: @ 83CB640
+gMetatiles_BattleFrontier::
 	.incbin "data/tilesets/secondary/battle_frontier/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleFrontier:: @ 83CD610
+gMetatileAttributes_BattleFrontier::
 	.incbin "data/tilesets/secondary/battle_frontier/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattlePalace:: @ 83CDA0A
+gMetatiles_BattlePalace::
 	.incbin "data/tilesets/secondary/battle_palace/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattlePalace:: @ 83CE4EA
+gMetatileAttributes_BattlePalace::
 	.incbin "data/tilesets/secondary/battle_palace/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleDome:: @ 83CE646
+gMetatiles_BattleDome::
 	.incbin "data/tilesets/secondary/battle_dome/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleDome:: @ 83D00F6
+gMetatileAttributes_BattleDome::
 	.incbin "data/tilesets/secondary/battle_dome/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleFactory:: @ 83D044C
+gMetatiles_BattleFactory::
 	.incbin "data/tilesets/secondary/battle_factory/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleFactory:: @ 83D1A6C
+gMetatileAttributes_BattleFactory::
 	.incbin "data/tilesets/secondary/battle_factory/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattlePike:: @ 83D1D30
+gMetatiles_BattlePike::
 	.incbin "data/tilesets/secondary/battle_pike/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattlePike:: @ 83D32E0
+gMetatileAttributes_BattlePike::
 	.incbin "data/tilesets/secondary/battle_pike/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleArena:: @ 83D3596
+gMetatiles_BattleArena::
 	.incbin "data/tilesets/secondary/battle_arena/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleArena:: @ 83D40A6
+gMetatileAttributes_BattleArena::
 	.incbin "data/tilesets/secondary/battle_arena/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattlePyramid:: @ 83D4208
+gMetatiles_BattlePyramid::
 	.incbin "data/tilesets/secondary/battle_pyramid/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattlePyramid:: @ 83D4FD8
+gMetatileAttributes_BattlePyramid::
 	.incbin "data/tilesets/secondary/battle_pyramid/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MirageTower:: @ 83D5192
+gMetatiles_MirageTower::
 	.incbin "data/tilesets/secondary/mirage_tower/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MirageTower:: @ 83D6B72
+gMetatileAttributes_MirageTower::
 	.incbin "data/tilesets/secondary/mirage_tower/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MossdeepGameCorner:: @ 83D6EAE
+gMetatiles_MossdeepGameCorner::
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MossdeepGameCorner:: @ 83D71FE
+gMetatileAttributes_MossdeepGameCorner::
 	.incbin "data/tilesets/secondary/mossdeep_game_corner/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_IslandHarbor:: @ 83D7268
+gMetatiles_IslandHarbor::
 	.incbin "data/tilesets/secondary/island_harbor/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_IslandHarbor:: @ 83D8FC8
+gMetatileAttributes_IslandHarbor::
 	.incbin "data/tilesets/secondary/island_harbor/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_TrainerHill:: @ 83D9374
+gMetatiles_TrainerHill::
 	.incbin "data/tilesets/secondary/trainer_hill/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_TrainerHill:: @ 83DB1D4
+gMetatileAttributes_TrainerHill::
 	.incbin "data/tilesets/secondary/trainer_hill/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_NavelRock:: @ 83DB5A0
+gMetatiles_NavelRock::
 	.incbin "data/tilesets/secondary/navel_rock/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_NavelRock:: @ 83DD1D0
+gMetatileAttributes_NavelRock::
 	.incbin "data/tilesets/secondary/navel_rock/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleFrontierRankingHall:: @ 83DD556
+gMetatiles_BattleFrontierRankingHall::
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleFrontierRankingHall:: @ 83DDB36
+gMetatileAttributes_BattleFrontierRankingHall::
 	.incbin "data/tilesets/secondary/battle_frontier_ranking_hall/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_BattleTent:: @ 83DDBF2
+gMetatiles_BattleTent::
 	.incbin "data/tilesets/secondary/battle_tent/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_BattleTent:: @ 83DECC2
+gMetatileAttributes_BattleTent::
 	.incbin "data/tilesets/secondary/battle_tent/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_MysteryEventsHouse:: @ 83DEEDC
+gMetatiles_MysteryEventsHouse::
 	.incbin "data/tilesets/secondary/mystery_events_house/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_MysteryEventsHouse:: @ 83DF30C
+gMetatileAttributes_MysteryEventsHouse::
 	.incbin "data/tilesets/secondary/mystery_events_house/metatile_attributes.bin"
 
 	.align 1
-gMetatiles_UnionRoom:: @ 83DF392
+gMetatiles_UnionRoom::
 	.incbin "data/tilesets/secondary/union_room/metatiles.bin"
 
 	.align 1
-gMetatileAttributes_UnionRoom:: @ 83DF6A2
+gMetatileAttributes_UnionRoom::
 	.incbin "data/tilesets/secondary/union_room/metatile_attributes.bin"
diff --git a/data/unknown_serial_data.s b/data/unknown_serial_data.s
index 42eb5c31e..2fb1ba42b 100644
--- a/data/unknown_serial_data.s
+++ b/data/unknown_serial_data.s
@@ -1,5 +1,5 @@
 	.section .rodata
 
 	.align 2
-gUnknown_089A3470:: @ 89A3470
+gUnknown_089A3470::
 	.incbin "data/unknown_serial_data.bin"
diff --git a/gflib/bg.c b/gflib/bg.c
index ec7c2113b..283a87ce0 100644
--- a/gflib/bg.c
+++ b/gflib/bg.c
@@ -42,10 +42,12 @@ static struct BgControl sGpuBgConfigs;
 static struct BgConfig2 sGpuBgConfigs2[NUM_BACKGROUNDS];
 static u32 sDmaBusyBitfield[NUM_BACKGROUNDS];
 
-u32 gUnneededFireRedVariable;
+u32 gWindowTileAutoAllocEnabled;
 
 static const struct BgConfig sZeroedBgControlStruct = { 0 };
 
+static u32 GetBgType(u8 bg);
+
 void ResetBgs(void)
 {
     ResetBgControlStructs();
@@ -288,7 +290,8 @@ bool8 IsInvalidBg(u8 bg)
         return FALSE;
 }
 
-int DummiedOutFireRedLeafGreenTileAllocFunc(int a1, int a2, int a3, int a4)
+// From FRLG. Dummied out.
+int BgTileAllocOp(int bg, int offset, int count, int mode)
 {
     return 0;
 }
@@ -303,7 +306,7 @@ void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable)
         sDmaBusyBitfield[i] = 0;
     }
 
-    gUnneededFireRedVariable = leftoverFireRedLeafGreenVariable;
+    gWindowTileAutoAllocEnabled = leftoverFireRedLeafGreenVariable;
 }
 
 void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates)
@@ -392,10 +395,8 @@ u16 LoadBgTiles(u8 bg, const void* src, u16 size, u16 destOffset)
 
     sDmaBusyBitfield[cursor / 0x20] |= (1 << (cursor % 0x20));
 
-    if (gUnneededFireRedVariable == 1)
-    {
-        DummiedOutFireRedLeafGreenTileAllocFunc(bg, tileOffset / 0x20, size / 0x20, 1);
-    }
+    if (gWindowTileAutoAllocEnabled == TRUE)
+        BgTileAllocOp(bg, tileOffset / 0x20, size / 0x20, 1);
 
     return cursor;
 }
@@ -523,9 +524,9 @@ u16 GetBgAttribute(u8 bg, u8 attributeId)
     case BG_ATTR_METRIC:
         switch (GetBgType(bg))
         {
-        case 0:
+        case BG_TYPE_NORMAL:
             return GetBgMetricTextMode(bg, 0) * 0x800;
-        case 1:
+        case BG_TYPE_AFFINE:
             return GetBgMetricAffineMode(bg, 0) * 0x100;
         default:
             return 0;
@@ -891,10 +892,10 @@ void CopyBgTilemapBufferToVram(u8 bg)
     {
         switch (GetBgType(bg))
         {
-        case 0:
+        case BG_TYPE_NORMAL:
             sizeToLoad = GetBgMetricTextMode(bg, 0) * 0x800;
             break;
-        case 1:
+        case BG_TYPE_AFFINE:
             sizeToLoad = GetBgMetricAffineMode(bg, 0) * 0x100;
             break;
         default:
@@ -915,7 +916,7 @@ void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 wi
     {
         switch (GetBgType(bg))
         {
-        case 0:
+        case BG_TYPE_NORMAL:
         {
             const u16 * srcCopy = src;
             for (destY16 = destY; destY16 < (destY + height); destY16++)
@@ -927,7 +928,7 @@ void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 wi
             }
             break;
         }
-        case 1:
+        case BG_TYPE_AFFINE:
         {
             const u8 * srcCopy = src;
             mode = GetBgMetricAffineMode(bg, 0x1);
@@ -963,7 +964,7 @@ void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8
         screenHeight = GetBgMetricTextMode(bg, 0x2) * 0x20;
         switch (GetBgType(bg))
         {
-        case 0:
+        case BG_TYPE_NORMAL:
             srcPtr = src + ((srcY * srcWidth) + srcX) * 2;
             for (i = destX; i < (destX + rectWidth); i++)
             {
@@ -976,7 +977,7 @@ void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8
                 srcPtr += (srcWidth - destY) * 2;
             }
             break;
-        case 1:
+        case BG_TYPE_AFFINE:
             srcPtr = src + ((srcY * srcWidth) + srcX);
             var = GetBgMetricAffineMode(bg, 0x1);
             for (i = destX; i < (destX + rectWidth); i++)
@@ -1003,7 +1004,7 @@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width,
     {
         switch (GetBgType(bg))
         {
-        case 0:
+        case BG_TYPE_NORMAL:
             for (y16 = y; y16 < (y + height); y16++)
             {
                 for (x16 = x; x16 < (x + width); x16++)
@@ -1012,7 +1013,7 @@ void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width,
                 }
             }
             break;
-        case 1:
+        case BG_TYPE_AFFINE:
             mode = GetBgMetricAffineMode(bg, 0x1);
             for (y16 = y; y16 < (y + height); y16++)
             {
@@ -1046,7 +1047,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
         mode2 = GetBgMetricTextMode(bg, 0x2) * 0x20;
         switch (GetBgType(bg))
         {
-        case 0:
+        case BG_TYPE_NORMAL:
             for (y16 = y; y16 < (y + height); y16++)
             {
                 for (x16 = x; x16 < (x + width); x16++)
@@ -1056,7 +1057,7 @@ void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 widt
                 }
             }
             break;
-        case 1:
+        case BG_TYPE_AFFINE:
             mode3 = GetBgMetricAffineMode(bg, 0x1);
             for (y16 = y; y16 < (y + height); y16++)
             {
@@ -1190,7 +1191,7 @@ void CopyTileMapEntry(const u16 *src, u16 *dest, s32 palette1, s32 tileOffset, s
     *dest = var;
 }
 
-u32 GetBgType(u8 bg)
+static u32 GetBgType(u8 bg)
 {
     u8 mode = GetBgMode();
 
@@ -1202,31 +1203,31 @@ u32 GetBgType(u8 bg)
         {
         case 0:
         case 1:
-            return 0;
+            return BG_TYPE_NORMAL;
         }
         break;
     case 2:
         switch (mode)
         {
         case 0:
-            return 0;
+            return BG_TYPE_NORMAL;
         case 1:
         case 2:
-            return 1;
+            return BG_TYPE_AFFINE;
         }
         break;
     case 3:
         switch (mode)
         {
         case 0:
-            return 0;
+            return BG_TYPE_NORMAL;
         case 2:
-            return 1;
+            return BG_TYPE_AFFINE;
         }
         break;
     }
 
-    return 0xFFFF;
+    return BG_TYPE_NONE;
 }
 
 bool32 IsInvalidBg32(u8 bg)
diff --git a/gflib/bg.h b/gflib/bg.h
index 58fd1282c..60327eab3 100644
--- a/gflib/bg.h
+++ b/gflib/bg.h
@@ -25,6 +25,12 @@ enum
 	BG_ATTR_BASETILE,
 };
 
+enum {
+	BG_TYPE_NORMAL,
+	BG_TYPE_AFFINE,
+	BG_TYPE_NONE = 0xFFFF
+};
+
 struct BgTemplate
 {
     u16 bg:2;                   // 0x1, 0x2 -> 0x3
@@ -43,7 +49,7 @@ void Unused_ResetBgControlStruct(u8 bg);
 u8 LoadBgVram(u8 bg, const void *src, u16 size, u16 destOffset, u8 mode);
 void SetTextModeAndHideBgs(void);
 bool8 IsInvalidBg(u8 bg);
-int DummiedOutFireRedLeafGreenTileAllocFunc(int a1, int a2, int a3, int a4);
+int BgTileAllocOp(int bg, int offset, int count, int mode);
 void ResetBgsAndClearDma3BusyFlags(u32 leftoverFireRedLeafGreenVariable);
 void InitBgsFromTemplates(u8 bgMode, const struct BgTemplate *templates, u8 numTemplates);
 void InitBgFromTemplate(const struct BgTemplate *template);
@@ -78,7 +84,6 @@ u16 GetBgMetricTextMode(u8 bg, u8 whichMetric);
 u32 GetBgMetricAffineMode(u8 bg, u8 whichMetric);
 u32 GetTileMapIndexFromCoords(s32 x, s32 y, s32 screenSize, u32 screenWidth, u32 screenHeight);
 void CopyTileMapEntry(const u16 *src, u16 *dest, s32 palette1, s32 tileOffset, s32 palette2);
-u32 GetBgType(u8 bg);
 bool32 IsInvalidBg32(u8 bg);
 bool32 IsTileMapOutsideWram(u8 bg);
 
diff --git a/gflib/io_reg.c b/gflib/io_reg.c
index 44364349d..66b8dbe64 100644
--- a/gflib/io_reg.c
+++ b/gflib/io_reg.c
@@ -17,8 +17,8 @@ static const u32 sUnused[] = {
     (1 << 26) | (1 << 4) | (1 << 2) | (1 << 1),
     (1 << 26) | (1 << 4) | (1 << 3) | (1 << 1),
     (1 << 26) | (1 << 4) | (1 << 3) | (1 << 2) | (1 << 1),
-    (1 << 25) | (1 << 8), 
-    (1 << 27) | (1 << 10), 
+    (1 << 25) | (1 << 8),
+    (1 << 27) | (1 << 10),
 };
 
 const u16 gOverworldBackgroundLayerFlags[] = {
diff --git a/gflib/malloc.h b/gflib/malloc.h
index f2dcf6d46..8d49e0be7 100644
--- a/gflib/malloc.h
+++ b/gflib/malloc.h
@@ -12,6 +12,8 @@
     ptr = NULL;                         \
 }
 
+#define TRY_FREE_AND_SET_NULL(ptr) if (ptr != NULL) FREE_AND_SET_NULL(ptr)
+
 extern u8 gHeap[];
 
 void *Alloc(u32 size);
diff --git a/gflib/sprite.c b/gflib/sprite.c
index f97ecc712..9629fc31b 100644
--- a/gflib/sprite.c
+++ b/gflib/sprite.c
@@ -164,8 +164,8 @@ static const struct Sprite sDummySprite =
     .template = &gDummySpriteTemplate,
     .subspriteTables = NULL,
     .callback = SpriteCallbackDummy,
-    .pos1 = { 304, 160 },
-    .pos2 = {   0,   0 },
+    .x = 304, .y = 160,
+    .x2 =  0, .y2 =  0,
     .centerToCornerVecX = 0,
     .centerToCornerVecY = 0,
     .animNum = 0,
@@ -210,7 +210,7 @@ const union AffineAnimCmd * const gDummySpriteAffineAnimTable[] = { &sDummyAffin
 const struct SpriteTemplate gDummySpriteTemplate =
 {
     .tileTag = 0,
-    .paletteTag = 0xFFFF,
+    .paletteTag = TAG_NONE,
     .oam = &gDummyOamData,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -248,7 +248,7 @@ static const AffineAnimCmdFunc sAffineAnimCmdFuncs[] =
 
 static const struct OamDimensions32 sOamDimensions32[3][4] =
 {
-    [ST_OAM_SQUARE] = 
+    [ST_OAM_SQUARE] =
     {
         [SPRITE_SIZE(8x8)]   = {  8,  8 },
         [SPRITE_SIZE(16x16)] = { 16, 16 },
@@ -262,7 +262,7 @@ static const struct OamDimensions32 sOamDimensions32[3][4] =
         [SPRITE_SIZE(32x16)] = { 32, 16 },
         [SPRITE_SIZE(64x32)] = { 64, 32 },
     },
-    [ST_OAM_V_RECTANGLE] = 
+    [ST_OAM_V_RECTANGLE] =
     {
         [SPRITE_SIZE(8x16)]  = {  8, 16 },
         [SPRITE_SIZE(8x32)]  = {  8, 32 },
@@ -273,7 +273,7 @@ static const struct OamDimensions32 sOamDimensions32[3][4] =
 
 static const struct OamDimensions sOamDimensions[3][4] =
 {
-    [ST_OAM_SQUARE] = 
+    [ST_OAM_SQUARE] =
     {
         [SPRITE_SIZE(8x8)]   = {  8,  8 },
         [SPRITE_SIZE(16x16)] = { 16, 16 },
@@ -287,7 +287,7 @@ static const struct OamDimensions sOamDimensions[3][4] =
         [SPRITE_SIZE(32x16)] = { 32, 16 },
         [SPRITE_SIZE(64x32)] = { 64, 32 },
     },
-    [ST_OAM_V_RECTANGLE] = 
+    [ST_OAM_V_RECTANGLE] =
     {
         [SPRITE_SIZE(8x16)]  = {  8, 16 },
         [SPRITE_SIZE(8x32)]  = {  8, 32 },
@@ -375,13 +375,13 @@ void UpdateOamCoords(void)
         {
             if (sprite->coordOffsetEnabled)
             {
-                sprite->oam.x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
-                sprite->oam.y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
+                sprite->oam.x = sprite->x + sprite->x2 + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
+                sprite->oam.y = sprite->y + sprite->y2 + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
             }
             else
             {
-                sprite->oam.x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
-                sprite->oam.y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+                sprite->oam.x = sprite->x + sprite->x2 + sprite->centerToCornerVecX;
+                sprite->oam.y = sprite->y + sprite->y2 + sprite->centerToCornerVecY;
             }
         }
     }
@@ -583,12 +583,12 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y,
     sprite->affineAnims = template->affineAnims;
     sprite->template = template;
     sprite->callback = template->callback;
-    sprite->pos1.x = x;
-    sprite->pos1.y = y;
+    sprite->x = x;
+    sprite->y = y;
 
     CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, sprite->oam.affineMode);
 
-    if (template->tileTag == 0xFFFF)
+    if (template->tileTag == TAG_NONE)
     {
         s16 tileNum;
         sprite->images = template->images;
@@ -611,7 +611,7 @@ u8 CreateSpriteAt(u8 index, const struct SpriteTemplate *template, s16 x, s16 y,
     if (sprite->oam.affineMode & ST_OAM_AFFINE_ON_MASK)
         InitSpriteAffineAnim(sprite);
 
-    if (template->paletteTag != 0xFFFF)
+    if (template->paletteTag != TAG_NONE)
         sprite->oam.paletteNum = IndexOfSpritePaletteTag(template->paletteTag);
 
     return index;
@@ -893,7 +893,7 @@ void ResetAllSprites(void)
 // UB: template pointer may point to freed temporary storage
 void FreeSpriteTiles(struct Sprite *sprite)
 {
-    if (sprite->template->tileTag != 0xFFFF)
+    if (sprite->template->tileTag != TAG_NONE)
         FreeSpriteTilesByTag(sprite->template->tileTag);
 }
 
@@ -1248,14 +1248,14 @@ void obj_update_pos2(struct Sprite *sprite, s32 a1, s32 a2)
         var0 = sOamDimensions32[sprite->oam.shape][sprite->oam.size].width;
         var1 = var0 << 8;
         var2 = (var0 << 16) / gOamMatrices[matrixNum].a;
-        sprite->pos2.x = sub_8007E28(var1, var2, a1);
+        sprite->x2 = sub_8007E28(var1, var2, a1);
     }
     if (a2 != 0x800)
     {
         var0 = sOamDimensions32[sprite->oam.shape][sprite->oam.size].height;
         var1 = var0 << 8;
         var2 = (var0 << 16) / gOamMatrices[matrixNum].d;
-        sprite->pos2.y = sub_8007E28(var1, var2, a2);
+        sprite->y2 = sub_8007E28(var1, var2, a2);
     }
 }
 
@@ -1540,7 +1540,7 @@ void FreeSpriteTilesByTag(u16 tag)
         for (i = start; i < start + count; i++)
             FREE_SPRITE_TILE(i);
 
-        sSpriteTileRangeTags[index] = 0xFFFF;
+        sSpriteTileRangeTags[index] = TAG_NONE;
     }
 }
 
@@ -1550,7 +1550,7 @@ void FreeSpriteTileRanges(void)
 
     for (i = 0; i < MAX_SPRITES; i++)
     {
-        sSpriteTileRangeTags[i] = 0xFFFF;
+        sSpriteTileRangeTags[i] = TAG_NONE;
         SET_SPRITE_TILE_RANGE(i, 0, 0);
     }
 }
@@ -1580,16 +1580,16 @@ u16 GetSpriteTileTagByTileStart(u16 start)
 
     for (i = 0; i < MAX_SPRITES; i++)
     {
-        if (sSpriteTileRangeTags[i] != 0xFFFF && sSpriteTileRanges[i * 2] == start)
+        if (sSpriteTileRangeTags[i] != TAG_NONE && sSpriteTileRanges[i * 2] == start)
             return sSpriteTileRangeTags[i];
     }
 
-    return 0xFFFF;
+    return TAG_NONE;
 }
 
 void AllocSpriteTileRange(u16 tag, u16 start, u16 count)
 {
-    u8 freeIndex = IndexOfSpriteTileTag(0xFFFF);
+    u8 freeIndex = IndexOfSpriteTileTag(TAG_NONE);
     sSpriteTileRangeTags[freeIndex] = tag;
     SET_SPRITE_TILE_RANGE(freeIndex, start, count);
 }
@@ -1599,7 +1599,7 @@ void FreeAllSpritePalettes(void)
     u8 i;
     gReservedSpritePaletteCount = 0;
     for (i = 0; i < 16; i++)
-        sSpritePaletteTags[i] = 0xFFFF;
+        sSpritePaletteTags[i] = TAG_NONE;
 }
 
 u8 LoadSpritePalette(const struct SpritePalette *palette)
@@ -1609,7 +1609,7 @@ u8 LoadSpritePalette(const struct SpritePalette *palette)
     if (index != 0xFF)
         return index;
 
-    index = IndexOfSpritePaletteTag(0xFFFF);
+    index = IndexOfSpritePaletteTag(TAG_NONE);
 
     if (index == 0xFF)
     {
@@ -1638,7 +1638,7 @@ void DoLoadSpritePalette(const u16 *src, u16 paletteOffset)
 
 u8 AllocSpritePalette(u16 tag)
 {
-    u8 index = IndexOfSpritePaletteTag(0xFFFF);
+    u8 index = IndexOfSpritePaletteTag(TAG_NONE);
     if (index == 0xFF)
     {
         return 0xFF;
@@ -1669,7 +1669,7 @@ void FreeSpritePaletteByTag(u16 tag)
 {
     u8 index = IndexOfSpritePaletteTag(tag);
     if (index != 0xFF)
-        sSpritePaletteTags[index] = 0xFFFF;
+        sSpritePaletteTags[index] = TAG_NONE;
 }
 
 void SetSubspriteTables(struct Sprite *sprite, const struct SubspriteTable *subspriteTables)
diff --git a/gflib/sprite.h b/gflib/sprite.h
index 4a3b48225..89299d43e 100644
--- a/gflib/sprite.h
+++ b/gflib/sprite.h
@@ -3,7 +3,7 @@
 
 #define MAX_SPRITES 64
 #define SPRITE_NONE 0xFF
-#define SPRITE_INVALID_TAG 0xFFFF
+#define TAG_NONE 0xFFFF
 
 struct SpriteSheet
 {
@@ -197,8 +197,8 @@ struct Sprite
     /*0x18*/ const struct SubspriteTable *subspriteTables;
     /*0x1C*/ SpriteCallback callback;
 
-    /*0x20*/ struct Coords16 pos1;
-    /*0x24*/ struct Coords16 pos2;
+    /*0x20*/ s16 x, y;
+    /*0x24*/ s16 x2, y2;
     /*0x28*/ s8 centerToCornerVecX;
     /*0x29*/ s8 centerToCornerVecY;
 
diff --git a/gflib/string_util.c b/gflib/string_util.c
index 92f8eea5a..b7485184a 100644
--- a/gflib/string_util.c
+++ b/gflib/string_util.c
@@ -384,18 +384,18 @@ u8 *StringExpandPlaceholders(u8 *dest, const u8 *src)
 
 u8 *StringBraille(u8 *dest, const u8 *src)
 {
-    const u8 setBrailleFont[] = { 
-        EXT_CTRL_CODE_BEGIN, 
-        EXT_CTRL_CODE_SIZE, 
-        6, 
-        EOS 
+    const u8 setBrailleFont[] = {
+        EXT_CTRL_CODE_BEGIN,
+        EXT_CTRL_CODE_SIZE,
+        6,
+        EOS
     };
-    const u8 gotoLine2[] = { 
-        CHAR_NEWLINE, 
-        EXT_CTRL_CODE_BEGIN, 
-        EXT_CTRL_CODE_SHIFT_DOWN, 
-        2, 
-        EOS 
+    const u8 gotoLine2[] = {
+        CHAR_NEWLINE,
+        EXT_CTRL_CODE_BEGIN,
+        EXT_CTRL_CODE_SHIFT_DOWN,
+        2,
+        EOS
     };
 
     dest = StringCopy(dest, setBrailleFont);
@@ -630,7 +630,7 @@ bool32 IsStringJapanese(u8 *str)
 {
     while (*str != EOS)
     {
-        if (*str < CHAR_0)
+        if (*str <= JAPANESE_CHAR_END)
             if (*str != CHAR_SPACE)
                 return TRUE;
         str++;
@@ -639,13 +639,13 @@ bool32 IsStringJapanese(u8 *str)
     return FALSE;
 }
 
-bool32 sub_800924C(u8 *str, s32 n)
+bool32 IsStringNJapanese(u8 *str, s32 n)
 {
     s32 i;
 
     for (i = 0; *str != EOS && i < n; i++)
     {
-        if (*str < CHAR_0)
+        if (*str <= JAPANESE_CHAR_END)
             if (*str != CHAR_SPACE)
                 return TRUE;
         str++;
diff --git a/gflib/string_util.h b/gflib/string_util.h
index 229193d52..7f3b64add 100644
--- a/gflib/string_util.h
+++ b/gflib/string_util.h
@@ -37,7 +37,7 @@ u8 *StringCopyN_Multibyte(u8 *dest, u8 *src, u32 n);
 u32 StringLength_Multibyte(const u8 *str);
 u8 *WriteColorChangeControlCode(u8 *dest, u32 colorType, u8 color);
 bool32 IsStringJapanese(u8 *str);
-bool32 sub_800924C(u8 *str, s32 n);
+bool32 IsStringNJapanese(u8 *str, s32 n);
 u8 GetExtCtrlCodeLength(u8 code);
 s32 StringCompareWithoutExtCtrlCodes(const u8 *str1, const u8 *str2);
 void ConvertInternationalString(u8 *s, u8 language);
diff --git a/gflib/text.h b/gflib/text.h
index 3edd0fc62..f71cd557f 100644
--- a/gflib/text.h
+++ b/gflib/text.h
@@ -18,7 +18,7 @@
 #define CHAR_O_ACUTE           0x0E
 #define CHAR_O_CIRCUMFLEX      0x0F
 #define CHAR_OE                0x10
-#define CHAR_U_GRAVE           0x11    
+#define CHAR_U_GRAVE           0x11
 #define CHAR_U_ACUTE           0x12
 #define CHAR_U_CIRCUMFLEX      0x13
 #define CHAR_N_TILDE           0x14
@@ -258,13 +258,17 @@
 #define PLACEHOLDER_ID_VERSION       0x7
 #define PLACEHOLDER_ID_AQUA          0x8
 #define PLACEHOLDER_ID_MAGMA         0x9
-#define PLACEHOLDER_ID_ARCHIE        0xA 
+#define PLACEHOLDER_ID_ARCHIE        0xA
 #define PLACEHOLDER_ID_MAXIE         0xB
 #define PLACEHOLDER_ID_KYOGRE        0xC
 #define PLACEHOLDER_ID_GROUDON       0xD
 
 // battle placeholders are located in battle_message.h
 
+// Hiragana from 0x1-0x50, Katakana from 0x51-0xA0.
+// This excludes Japanese punctuation, which end at 0xB0
+#define JAPANESE_CHAR_END 0xA0
+
 #define NUM_TEXT_PRINTERS 32
 
 #define TEXT_SPEED_FF 0xFF
diff --git a/gflib/window.c b/gflib/window.c
index b03b513da..c7b8c8917 100644
--- a/gflib/window.c
+++ b/gflib/window.c
@@ -10,7 +10,7 @@ u32 gUnusedWindowVar2;
 u8 gTransparentTileNumber;
 u32 gUnusedWindowVar3;
 void *gWindowBgTilemapBuffers[NUM_BACKGROUNDS];
-extern u32 gUnneededFireRedVariable;
+extern u32 gWindowTileAutoAllocEnabled;
 
 #define WINDOWS_MAX  32
 
@@ -55,9 +55,9 @@ bool16 InitWindows(const struct WindowTemplate *templates)
 
     for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != 0xFF && i < WINDOWS_MAX; ++i, bgLayer = templates[i].bg)
     {
-        if (gUnneededFireRedVariable == 1)
+        if (gWindowTileAutoAllocEnabled == TRUE)
         {
-            allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, templates[i].width * templates[i].height, 0);
+            allocatedBaseBlock = BgTileAllocOp(bgLayer, 0, templates[i].width * templates[i].height, 0);
             if (allocatedBaseBlock == -1)
                 return FALSE;
         }
@@ -100,10 +100,10 @@ bool16 InitWindows(const struct WindowTemplate *templates)
         gWindows[i].tileData = allocatedTilemapBuffer;
         gWindows[i].window = templates[i];
 
-        if (gUnneededFireRedVariable == 1)
+        if (gWindowTileAutoAllocEnabled == TRUE)
         {
             gWindows[i].window.baseBlock = allocatedBaseBlock;
-            DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, allocatedBaseBlock, templates[i].width * templates[i].height, 1);
+            BgTileAllocOp(bgLayer, allocatedBaseBlock, templates[i].width * templates[i].height, 1);
         }
     }
 
@@ -132,9 +132,9 @@ u16 AddWindow(const struct WindowTemplate *template)
     bgLayer = template->bg;
     allocatedBaseBlock = 0;
 
-    if (gUnneededFireRedVariable == 1)
+    if (gWindowTileAutoAllocEnabled == TRUE)
     {
-        allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0);
+        allocatedBaseBlock = BgTileAllocOp(bgLayer, 0, template->width * template->height, 0);
 
         if (allocatedBaseBlock == -1)
             return WINDOW_NONE;
@@ -174,10 +174,10 @@ u16 AddWindow(const struct WindowTemplate *template)
     gWindows[win].tileData = allocatedTilemapBuffer;
     gWindows[win].window = *template;
 
-    if (gUnneededFireRedVariable == 1)
+    if (gWindowTileAutoAllocEnabled == TRUE)
     {
         gWindows[win].window.baseBlock = allocatedBaseBlock;
-        DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, allocatedBaseBlock, gWindows[win].window.width * gWindows[win].window.height, 1);
+        BgTileAllocOp(bgLayer, allocatedBaseBlock, gWindows[win].window.width * gWindows[win].window.height, 1);
     }
 
     return win;
@@ -201,9 +201,9 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template)
     bgLayer = template->bg;
     allocatedBaseBlock = 0;
 
-    if (gUnneededFireRedVariable == 1)
+    if (gWindowTileAutoAllocEnabled == TRUE)
     {
-        allocatedBaseBlock = DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, 0, template->width * template->height, 0);
+        allocatedBaseBlock = BgTileAllocOp(bgLayer, 0, template->width * template->height, 0);
 
         if (allocatedBaseBlock == -1)
             return WINDOW_NONE;
@@ -211,10 +211,10 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template)
 
     gWindows[win].window = *template;
 
-    if (gUnneededFireRedVariable == 1)
+    if (gWindowTileAutoAllocEnabled == TRUE)
     {
         gWindows[win].window.baseBlock = allocatedBaseBlock;
-        DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, allocatedBaseBlock, gWindows[win].window.width * gWindows[win].window.height, 1);
+        BgTileAllocOp(bgLayer, allocatedBaseBlock, gWindows[win].window.width * gWindows[win].window.height, 1);
     }
 
     return win;
@@ -224,10 +224,8 @@ void RemoveWindow(u8 windowId)
 {
     u8 bgLayer = gWindows[windowId].window.bg;
 
-    if (gUnneededFireRedVariable == 1)
-    {
-        DummiedOutFireRedLeafGreenTileAllocFunc(bgLayer, gWindows[windowId].window.baseBlock, gWindows[windowId].window.width * gWindows[windowId].window.height, 2);
-    }
+    if (gWindowTileAutoAllocEnabled == TRUE)
+        BgTileAllocOp(bgLayer, gWindows[windowId].window.baseBlock, gWindows[windowId].window.width * gWindows[windowId].window.height, 2);
 
     gWindows[windowId].window = sDummyWindowTemplate;
 
diff --git a/graphics/battle_interface/healthbox_doubles_frameend.png b/graphics/battle_interface/healthbox_doubles_frameend.png
new file mode 100644
index 000000000..812a6c2c4
--- /dev/null
+++ b/graphics/battle_interface/healthbox_doubles_frameend.png
diff --git a/graphics/battle_interface/healthbox_doubles_frameend_bar.png b/graphics/battle_interface/healthbox_doubles_frameend_bar.png
new file mode 100644
index 000000000..7bb1f0d4c
--- /dev/null
+++ b/graphics/battle_interface/healthbox_doubles_frameend_bar.png
diff --git a/graphics/frontier_pass/tiles.bin b/graphics/frontier_pass/bg.bin
index e4e066ebe..e4e066ebe 100644
--- a/graphics/frontier_pass/tiles.bin
+++ b/graphics/frontier_pass/bg.bin
diff --git a/graphics/frontier_pass/tiles.pal b/graphics/frontier_pass/bg.pal
index 2bfcff098..2bfcff098 100644
--- a/graphics/frontier_pass/tiles.pal
+++ b/graphics/frontier_pass/bg.pal
diff --git a/graphics/frontier_pass/tiles.png b/graphics/frontier_pass/bg.png
index 520c34b3d..520c34b3d 100644
--- a/graphics/frontier_pass/tiles.png
+++ b/graphics/frontier_pass/bg.png
diff --git a/graphics/frontier_pass/tilemap1.bin b/graphics/frontier_pass/cancel.bin
index c2aa0dc9a..c2aa0dc9a 100644
--- a/graphics/frontier_pass/tilemap1.bin
+++ b/graphics/frontier_pass/cancel.bin
diff --git a/graphics/frontier_pass/tilemap2.bin b/graphics/frontier_pass/cancel_highlighted.bin
index 63c2f9b14..63c2f9b14 100644
--- a/graphics/frontier_pass/tilemap2.bin
+++ b/graphics/frontier_pass/cancel_highlighted.bin
diff --git a/graphics/frontier_pass/tiles2.png b/graphics/frontier_pass/map_and_card.png
index 6bd420a8d..6bd420a8d 100644
--- a/graphics/frontier_pass/tiles2.png
+++ b/graphics/frontier_pass/map_and_card.png
diff --git a/graphics/frontier_pass/unknown_571298.bin b/graphics/frontier_pass/unused.bin
index a781f0b39..a781f0b39 100644
--- a/graphics/frontier_pass/unknown_571298.bin
+++ b/graphics/frontier_pass/unused.bin
diff --git a/graphics/unknown/unknown_D12FEC.png b/graphics/unknown/unknown_D12FEC.png
deleted file mode 100644
index 96c49a992..000000000
--- a/graphics/unknown/unknown_D12FEC.png
+++ /dev/null
diff --git a/graphics/unknown/unknown_D1300C.png b/graphics/unknown/unknown_D1300C.png
deleted file mode 100644
index 0c077dd0b..000000000
--- a/graphics/unknown/unknown_D1300C.png
+++ /dev/null
diff --git a/include/battle_arena.h b/include/battle_arena.h
index c3bdd4ea7..b55fc39b0 100644
--- a/include/battle_arena.h
+++ b/include/battle_arena.h
@@ -9,6 +9,6 @@ void BattleArena_AddSkillPoints(u8 battler);
 void BattleArena_DeductMindPoints(u8 battler, u16 stringId);
 void sub_81A586C(u8 battler);
 void DrawArenaRefereeTextBox(void);
-void RemoveArenaRefereeTextBox(void);
+void EraseArenaRefereeTextBox(void);
 
 #endif //GUARD_BATTLE_ARENA_H
diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h
index 3288204d1..a367bc043 100644
--- a/include/battle_gfx_sfx_util.h
+++ b/include/battle_gfx_sfx_util.h
@@ -39,7 +39,7 @@ void LoadAndCreateEnemyShadowSprites(void);
 void SpriteCB_SetInvisible(struct Sprite *sprite);
 void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species);
 void HideBattlerShadowSprite(u8 battlerId);
-void sub_805EF14(void);
+void FillAroundBattleWindows(void);
 void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute);
 void AllocateMonSpritesGfx(void);
 void FreeMonSpritesGfx(void);
diff --git a/include/battle_pyramid_bag.h b/include/battle_pyramid_bag.h
index de571714c..b8b3eb20f 100644
--- a/include/battle_pyramid_bag.h
+++ b/include/battle_pyramid_bag.h
@@ -29,7 +29,7 @@ enum {
 
 struct PyramidBagMenu
 {
-    void (*exitCallback)(void);
+    void (*newScreenCallback)(void);
     u8 tilemapBuffer[BG_SCREEN_SIZE];
     u8 spriteIds[PBAG_SPRITE_COUNT];
     u8 windowIds[5];
@@ -49,7 +49,7 @@ struct PyramidBagMenu
 
 struct PyramidBagMenuState
 {
-    void (*callback)(void);
+    void (*exitCallback)(void);
     u8 location;
     u16 cursorPosition;
     u16 scrollPosition;
@@ -64,7 +64,7 @@ void CB2_ReturnToPyramidBagMenu(void);
 void UpdatePyramidBagList(void);
 void UpdatePyramidBagCursorPos(void);
 void sub_81C4EFC(void);
-void GoToBattlePyramidBagMenu(u8 a0, void (*callback)(void));
+void GoToBattlePyramidBagMenu(u8 location, void (*exitCallback)(void));
 void Task_CloseBattlePyramidBagMessage(u8 taskId);
 void TryStoreHeldItemsInPyramidBag(void);
 void ChooseItemsToTossFromPyramidBag(void);
diff --git a/include/battle_util2.h b/include/battle_util2.h
index fe767ea4b..51c9c0363 100644
--- a/include/battle_util2.h
+++ b/include/battle_util2.h
@@ -5,6 +5,6 @@ void AllocateBattleResources(void);
 void FreeBattleResources(void);
 void AdjustFriendshipOnBattleFaint(u8 battler);
 void SwitchPartyOrderInGameMulti(u8 battler, u8 arg1);
-u32 sub_805725C(u8 battler);
+u32 BattlePalace_TryEscapeStatus(u8 battler);
 
 #endif // GUARD_BATTLE_UTIL_H
diff --git a/include/constants/battle.h b/include/constants/battle.h
index 3dbd83255..f1ce757e7 100644
--- a/include/constants/battle.h
+++ b/include/constants/battle.h
@@ -161,8 +161,8 @@
 #define STATUS3_SEMI_INVULNERABLE       (STATUS3_UNDERGROUND | STATUS3_ON_AIR | STATUS3_UNDERWATER)
 
 // Not really sure what a "hitmarker" is.
-#define HITMARKER_x10                   (1 << 4)
-#define HITMARKER_x20                   (1 << 5)
+#define HITMARKER_WAKE_UP_CLEAR         (1 << 4) // Cleared when waking up. Never set or checked.
+#define HITMARKER_SKIP_DMG_TRACK        (1 << 5)
 #define HITMARKER_DESTINYBOND           (1 << 6)
 #define HITMARKER_NO_ANIMATIONS         (1 << 7)
 #define HITMARKER_IGNORE_SUBSTITUTE     (1 << 8)
@@ -177,13 +177,13 @@
 #define HITMARKER_IGNORE_UNDERGROUND    (1 << 17)
 #define HITMARKER_IGNORE_UNDERWATER     (1 << 18)
 #define HITMARKER_UNABLE_TO_USE_MOVE    (1 << 19)
-#define HITMARKER_x100000               (1 << 20)
-#define HITMARKER_x200000               (1 << 21)
-#define HITMARKER_x400000               (1 << 22)
-#define HITMARKER_x800000               (1 << 23)
+#define HITMARKER_PASSIVE_DAMAGE        (1 << 20)
+#define HITMARKER_DISOBEDIENT_MOVE      (1 << 21)
+#define HITMARKER_PLAYER_FAINTED        (1 << 22)
+#define HITMARKER_ALLOW_NO_PP           (1 << 23)
 #define HITMARKER_GRUDGE                (1 << 24)
 #define HITMARKER_OBEYS                 (1 << 25)
-#define HITMARKER_x4000000              (1 << 26)
+#define HITMARKER_NEVER_SET             (1 << 26) // Cleared as part of a large group. Never set or checked
 #define HITMARKER_CHARGING              (1 << 27)
 #define HITMARKER_FAINTED(battler)      (gBitTable[battler] << 28)
 #define HITMARKER_FAINTED2(battler)     ((1 << 28) << battler)
@@ -210,19 +210,19 @@
 #define MOVE_RESULT_NO_EFFECT          (MOVE_RESULT_MISSED | MOVE_RESULT_DOESNT_AFFECT_FOE | MOVE_RESULT_FAILED)
 
 // Battle Weather flags
-#define WEATHER_RAIN_TEMPORARY      (1 << 0)
-#define WEATHER_RAIN_DOWNPOUR       (1 << 1)  // unused
-#define WEATHER_RAIN_PERMANENT      (1 << 2)
-#define WEATHER_RAIN_ANY            (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_DOWNPOUR | WEATHER_RAIN_PERMANENT)
-#define WEATHER_SANDSTORM_TEMPORARY (1 << 3)
-#define WEATHER_SANDSTORM_PERMANENT (1 << 4)
-#define WEATHER_SANDSTORM_ANY       (WEATHER_SANDSTORM_TEMPORARY | WEATHER_SANDSTORM_PERMANENT)
-#define WEATHER_SUN_TEMPORARY       (1 << 5)
-#define WEATHER_SUN_PERMANENT       (1 << 6)
-#define WEATHER_SUN_ANY             (WEATHER_SUN_TEMPORARY | WEATHER_SUN_PERMANENT)
-#define WEATHER_HAIL                (1 << 7)
-#define WEATHER_HAIL_ANY            (WEATHER_HAIL)
-#define WEATHER_ANY                 (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)
+#define B_WEATHER_RAIN_TEMPORARY      (1 << 0)
+#define B_WEATHER_RAIN_DOWNPOUR       (1 << 1)  // unused
+#define B_WEATHER_RAIN_PERMANENT      (1 << 2)
+#define B_WEATHER_RAIN                (B_WEATHER_RAIN_TEMPORARY | B_WEATHER_RAIN_DOWNPOUR | B_WEATHER_RAIN_PERMANENT)
+#define B_WEATHER_SANDSTORM_TEMPORARY (1 << 3)
+#define B_WEATHER_SANDSTORM_PERMANENT (1 << 4)
+#define B_WEATHER_SANDSTORM           (B_WEATHER_SANDSTORM_TEMPORARY | B_WEATHER_SANDSTORM_PERMANENT)
+#define B_WEATHER_SUN_TEMPORARY       (1 << 5)
+#define B_WEATHER_SUN_PERMANENT       (1 << 6)
+#define B_WEATHER_SUN                 (B_WEATHER_SUN_TEMPORARY | B_WEATHER_SUN_PERMANENT)
+#define B_WEATHER_HAIL_TEMPORARY      (1 << 7)
+#define B_WEATHER_HAIL                (B_WEATHER_HAIL_TEMPORARY)
+#define B_WEATHER_ANY                 (B_WEATHER_RAIN | B_WEATHER_SANDSTORM | B_WEATHER_SUN | B_WEATHER_HAIL)
 
 // Move Effects
 #define MOVE_EFFECT_SLEEP               1
diff --git a/include/constants/battle_dome.h b/include/constants/battle_dome.h
index ea7310e55..adac0a938 100644
--- a/include/constants/battle_dome.h
+++ b/include/constants/battle_dome.h
@@ -118,7 +118,7 @@
 #define MOVE_POINTS_ACCURATE   9
 #define MOVE_POINTS_POWERFUL   10  // Most of the moves that are >= 100 power
 #define MOVE_POINTS_POPULAR    11  // Group seems arbitrary. All using it are TM/HMs, but its only 11/58
-#define MOVE_POINTS_LUCK       12  
+#define MOVE_POINTS_LUCK       12
 #define MOVE_POINTS_STRONG     13  // Most of the moves that are >= 90 power
 #define MOVE_POINTS_LOW_PP     14
 #define MOVE_POINTS_EFFECT     15  // Moves with additional effects
diff --git a/include/constants/battle_frontier_trainers.h b/include/constants/battle_frontier_trainers.h
index 2914b153f..af530a759 100644
--- a/include/constants/battle_frontier_trainers.h
+++ b/include/constants/battle_frontier_trainers.h
@@ -2,7 +2,7 @@
 #define GUARD_CONSTANTS_BATTLE_FRONTIER_TRAINERS_H
 
 #define FRONTIER_TRAINER_BRADY          0
-#define FRONTIER_TRAINER_CONNER         1    
+#define FRONTIER_TRAINER_CONNER         1
 #define FRONTIER_TRAINER_BRADLEY        2
 #define FRONTIER_TRAINER_CYBIL          3
 #define FRONTIER_TRAINER_RODETTE        4
diff --git a/include/constants/battle_pyramid.h b/include/constants/battle_pyramid.h
index 004df7155..1be3c1115 100644
--- a/include/constants/battle_pyramid.h
+++ b/include/constants/battle_pyramid.h
@@ -23,7 +23,7 @@
 #define OBJ_POSITIONS_UNIFORM               0
 #define OBJ_POSITIONS_IN_AND_NEAR_ENTRANCE  1
 #define OBJ_POSITIONS_IN_AND_NEAR_EXIT      2
-#define OBJ_POSITIONS_NEAR_ENTRANCE         3         
+#define OBJ_POSITIONS_NEAR_ENTRANCE         3
 #define OBJ_POSITIONS_NEAR_EXIT             4
 
 // Functions IDs for sBattlePyramidFunctions / CallBattlePyramidFunction
diff --git a/include/constants/battle_script_commands.h b/include/constants/battle_script_commands.h
index 9794589af..d5e3eb7bb 100644
--- a/include/constants/battle_script_commands.h
+++ b/include/constants/battle_script_commands.h
@@ -72,12 +72,15 @@
 #define VARIOUS_GET_BATTLER_FAINTED             4
 #define VARIOUS_RESET_INTIMIDATE_TRACE_BITS     5
 #define VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP    6
+#define VARIOUS_RESET_PLAYER_FAINTED            7
 #define VARIOUS_PALACE_FLAVOR_TEXT              8
 #define VARIOUS_ARENA_JUDGMENT_WINDOW           9
 #define VARIOUS_ARENA_OPPONENT_MON_LOST         10
 #define VARIOUS_ARENA_PLAYER_MON_LOST           11
 #define VARIOUS_ARENA_BOTH_MONS_LOST            12
 #define VARIOUS_EMIT_YESNOBOX                   13
+#define VARIOUS_DRAW_ARENA_REF_TEXT_BOX         14
+#define VARIOUS_ERASE_ARENA_REF_TEXT_BOX        15
 #define VARIOUS_ARENA_JUDGMENT_STRING           16
 #define VARIOUS_ARENA_WAIT_STRING               17
 #define VARIOUS_WAIT_CRY                        18
@@ -86,6 +89,7 @@
 #define VARIOUS_VOLUME_DOWN                     21
 #define VARIOUS_VOLUME_UP                       22
 #define VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT 23
+#define VARIOUS_PALACE_TRY_ESCAPE_STATUS        24
 #define VARIOUS_SET_TELEPORT_OUTCOME            25
 #define VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC     26
 
diff --git a/include/constants/field_effects.h b/include/constants/field_effects.h
index dc1085f7c..e02e01efb 100644
--- a/include/constants/field_effects.h
+++ b/include/constants/field_effects.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_FIELD_EFFECT_CONSTANTS_H
 #define GUARD_FIELD_EFFECT_CONSTANTS_H
 
-#define FLDEFF_EXCLAMATION_MARK_ICON     0 
+#define FLDEFF_EXCLAMATION_MARK_ICON     0
 #define FLDEFF_USE_CUT_ON_GRASS          1
 #define FLDEFF_USE_CUT_ON_TREE           2
 #define FLDEFF_SHADOW                    3
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 48606962a..ef5a9a75e 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -337,7 +337,7 @@
 #define FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS    0x139
 #define FLAG_RECEIVED_AURORA_TICKET          0x13A
 #define FLAG_RECEIVED_MYSTIC_TICKET          0x13B
-#define FLAG_RECEIVED_OLD_SEA_MAP            0x13C 
+#define FLAG_RECEIVED_OLD_SEA_MAP            0x13C
 #define FLAG_UNUSED_MYSTERY_GIFT_0x13D       0x13D
 #define FLAG_UNUSED_MYSTERY_GIFT_0x13E       0x13E
 #define FLAG_UNUSED_MYSTERY_GIFT_0x13F       0x13F
@@ -535,120 +535,120 @@
 #define FLAG_MYSTERY_EVENT_14                0x1F2
 #define FLAG_MYSTERY_EVENT_15                0x1F3
 
-// Hidden Items -- sorted by location
+// Hidden Items
 #define FLAG_HIDDEN_ITEMS_START                                                         0x1F4
+#define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL             (FLAG_HIDDEN_ITEMS_START + 0x00)
 #define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET                  (FLAG_HIDDEN_ITEMS_START + 0x01)
+#define FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST                  (FLAG_HIDDEN_ITEMS_START + 0x02)
+#define FLAG_HIDDEN_ITEM_ROUTE_113_ETHER                     (FLAG_HIDDEN_ITEMS_START + 0x03)
+#define FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS                    (FLAG_HIDDEN_ITEMS_START + 0x04)
+#define FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM                   (FLAG_HIDDEN_ITEMS_START + 0x05)
+#define FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL                (FLAG_HIDDEN_ITEMS_START + 0x06)
+#define FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL               (FLAG_HIDDEN_ITEMS_START + 0x07)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS               (FLAG_HIDDEN_ITEMS_START + 0x08)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD          (FLAG_HIDDEN_ITEMS_START + 0x09)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL                (FLAG_HIDDEN_ITEMS_START + 0x0A)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL            (FLAG_HIDDEN_ITEMS_START + 0x0B)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD           (FLAG_HIDDEN_ITEMS_START + 0x0C)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1        (FLAG_HIDDEN_ITEMS_START + 0x0D)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM              (FLAG_HIDDEN_ITEMS_START + 0x24)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2        (FLAG_HIDDEN_ITEMS_START + 0x26)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE          (FLAG_HIDDEN_ITEMS_START + 0x0E)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL           (FLAG_HIDDEN_ITEMS_START + 0x0F)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST             (FLAG_HIDDEN_ITEMS_START + 0x10)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL                (FLAG_HIDDEN_ITEMS_START + 0x11)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON                 (FLAG_HIDDEN_ITEMS_START + 0x13)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD         (FLAG_HIDDEN_ITEMS_START + 0x12)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON                 (FLAG_HIDDEN_ITEMS_START + 0x13)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL            (FLAG_HIDDEN_ITEMS_START + 0x14)
-#define FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD           (FLAG_HIDDEN_ITEMS_START + 0x0C)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE           (FLAG_HIDDEN_ITEMS_START + 0x15)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP                (FLAG_HIDDEN_ITEMS_START + 0x16)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE          (FLAG_HIDDEN_ITEMS_START + 0x17)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD            (FLAG_HIDDEN_ITEMS_START + 0x18)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN              (FLAG_HIDDEN_ITEMS_START + 0x19)
 #define FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL                (FLAG_HIDDEN_ITEMS_START + 0x1A)
+#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE           (FLAG_HIDDEN_ITEMS_START + 0x1B)
 #define FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET               (FLAG_HIDDEN_ITEMS_START + 0x1C)
-#define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL             (FLAG_HIDDEN_ITEMS_START + 0x00)
+#define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL         (FLAG_HIDDEN_ITEMS_START + 0x1D)
+#define FLAG_HIDDEN_ITEM_ROUTE_113_TM_32                     (FLAG_HIDDEN_ITEMS_START + 0x1E)
 #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY             (FLAG_HIDDEN_ITEMS_START + 0x1F)
 #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY             (FLAG_HIDDEN_ITEMS_START + 0x20)
 #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY             (FLAG_HIDDEN_ITEMS_START + 0x21)
 #define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY             (FLAG_HIDDEN_ITEMS_START + 0x22)
-#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM            (FLAG_HIDDEN_ITEMS_START + 0x65)
-#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC               (FLAG_HIDDEN_ITEMS_START + 0x66)
-#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN            (FLAG_HIDDEN_ITEMS_START + 0x67)
-#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON               (FLAG_HIDDEN_ITEMS_START + 0x68)
-#define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1        (FLAG_HIDDEN_ITEMS_START + 0x30)
-#define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2        (FLAG_HIDDEN_ITEMS_START + 0x31)
-#define FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL              (FLAG_HIDDEN_ITEMS_START + 0x4C)
-#define FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL               (FLAG_HIDDEN_ITEMS_START + 0x4D)
-#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_HEART_SCALE           (FLAG_HIDDEN_ITEMS_START + 0x1B)
-#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP                 (FLAG_HIDDEN_ITEMS_START + 0x2B)
-#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL             (FLAG_HIDDEN_ITEMS_START + 0x4B)
-#define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL         (FLAG_HIDDEN_ITEMS_START + 0x1D)
-#define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER          (FLAG_HIDDEN_ITEMS_START + 0x4E)
-#define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC                 (FLAG_HIDDEN_ITEMS_START + 0x4F)
-#define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY           (FLAG_HIDDEN_ITEMS_START + 0x50)
-#define FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH           (FLAG_HIDDEN_ITEMS_START + 0x6D)
-#define FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY           (FLAG_HIDDEN_ITEMS_START + 0x5F)
-#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION              (FLAG_HIDDEN_ITEMS_START + 0x3A)
-#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1     (FLAG_HIDDEN_ITEMS_START + 0x3B)
-#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2     (FLAG_HIDDEN_ITEMS_START + 0x3C)
-#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL           (FLAG_HIDDEN_ITEMS_START + 0x3D)
-#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR             (FLAG_HIDDEN_ITEMS_START + 0x52)
-#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL          (FLAG_HIDDEN_ITEMS_START + 0x53)
-#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY   (FLAG_HIDDEN_ITEMS_START + 0x6A)
-#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC         (FLAG_HIDDEN_ITEMS_START + 0x6B)
-#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP        (FLAG_HIDDEN_ITEMS_START + 0x6C)
-#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE (FLAG_HIDDEN_ITEMS_START + 0x69)
 #define FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS       (FLAG_HIDDEN_ITEMS_START + 0x23)
-#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL          (FLAG_HIDDEN_ITEMS_START + 0x51)
-#define FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION              (FLAG_HIDDEN_ITEMS_START + 0x2C)
-#define FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL                 (FLAG_HIDDEN_ITEMS_START + 0x3E)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM              (FLAG_HIDDEN_ITEMS_START + 0x24)
 #define FLAG_HIDDEN_ITEM_ROUTE_104_POTION                    (FLAG_HIDDEN_ITEMS_START + 0x25)
-#define FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE                  (FLAG_HIDDEN_ITEMS_START + 0x55)
-#define FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x58)
-#define FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x59)
-#define FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL                 (FLAG_HIDDEN_ITEMS_START + 0x6F)
-#define FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL                 (FLAG_HIDDEN_ITEMS_START + 0x3F)
+#define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2        (FLAG_HIDDEN_ITEMS_START + 0x26)
+#define FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP                     (FLAG_HIDDEN_ITEMS_START + 0x27)
+#define FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET                    (FLAG_HIDDEN_ITEMS_START + 0x28)
+#define FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x29)
+#define FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x2A)
+#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP                 (FLAG_HIDDEN_ITEMS_START + 0x2B)
+#define FLAG_HIDDEN_ITEM_ROUTE_104_SUPER_POTION              (FLAG_HIDDEN_ITEMS_START + 0x2C)
+#define FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION              (FLAG_HIDDEN_ITEMS_START + 0x2D)
 #define FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST                  (FLAG_HIDDEN_ITEMS_START + 0x2E)
 #define FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x2F)
-#define FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY                (FLAG_HIDDEN_ITEMS_START + 0x56)
+#define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1        (FLAG_HIDDEN_ITEMS_START + 0x30)
+#define FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2        (FLAG_HIDDEN_ITEMS_START + 0x31)
 #define FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x32)
-#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1             (FLAG_HIDDEN_ITEMS_START + 0x34)
 #define FLAG_HIDDEN_ITEM_ROUTE_109_GREAT_BALL                (FLAG_HIDDEN_ITEMS_START + 0x33)
-#define FLAG_HIDDEN_ITEM_ROUTE_109_ETHER                     (FLAG_HIDDEN_ITEMS_START + 0x40)
-#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2             (FLAG_HIDDEN_ITEMS_START + 0x5A)
-#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3             (FLAG_HIDDEN_ITEMS_START + 0x5B)
-#define FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x36)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_1             (FLAG_HIDDEN_ITEMS_START + 0x34)
 #define FLAG_HIDDEN_ITEM_ROUTE_110_GREAT_BALL                (FLAG_HIDDEN_ITEMS_START + 0x35)
-#define FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL                 (FLAG_HIDDEN_ITEMS_START + 0x41)
+#define FLAG_HIDDEN_ITEM_ROUTE_110_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x36)
 #define FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL                 (FLAG_HIDDEN_ITEMS_START + 0x37)
-#define FLAG_HIDDEN_ITEM_ROUTE_111_STARDUST                  (FLAG_HIDDEN_ITEMS_START + 0x02)
 #define FLAG_HIDDEN_ITEM_ROUTE_111_PROTEIN                   (FLAG_HIDDEN_ITEMS_START + 0x38)
 #define FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY                (FLAG_HIDDEN_ITEMS_START + 0x39)
-#define FLAG_HIDDEN_ITEM_ROUTE_113_ETHER                     (FLAG_HIDDEN_ITEMS_START + 0x03)
-#define FLAG_HIDDEN_ITEM_ROUTE_113_TM_32                     (FLAG_HIDDEN_ITEMS_START + 0x1E)
-#define FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET                    (FLAG_HIDDEN_ITEMS_START + 0x62)
-#define FLAG_HIDDEN_ITEM_ROUTE_114_CARBOS                    (FLAG_HIDDEN_ITEMS_START + 0x04)
-#define FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x2A)
-#define FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x61)
-#define FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION              (FLAG_HIDDEN_ITEMS_START + 0x2D)
-#define FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES             (FLAG_HIDDEN_ITEMS_START + 0x60)
-#define FLAG_HIDDEN_ITEM_ROUTE_117_REPEL                     (FLAG_HIDDEN_ITEMS_START + 0x48)
+#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION              (FLAG_HIDDEN_ITEMS_START + 0x3A)
+#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1     (FLAG_HIDDEN_ITEMS_START + 0x3B)
+#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_2     (FLAG_HIDDEN_ITEMS_START + 0x3C)
+#define FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL           (FLAG_HIDDEN_ITEMS_START + 0x3D)
+#define FLAG_HIDDEN_ITEM_ROUTE_104_POKE_BALL                 (FLAG_HIDDEN_ITEMS_START + 0x3E)
+#define FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL                 (FLAG_HIDDEN_ITEMS_START + 0x3F)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_ETHER                     (FLAG_HIDDEN_ITEMS_START + 0x40)
+#define FLAG_HIDDEN_ITEM_ROUTE_110_POKE_BALL                 (FLAG_HIDDEN_ITEMS_START + 0x41)
 #define FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x42)
 #define FLAG_HIDDEN_ITEM_ROUTE_118_IRON                      (FLAG_HIDDEN_ITEMS_START + 0x43)
-#define FLAG_HIDDEN_ITEM_ROUTE_119_CALCIUM                   (FLAG_HIDDEN_ITEMS_START + 0x05)
-#define FLAG_HIDDEN_ITEM_ROUTE_119_ULTRA_BALL                (FLAG_HIDDEN_ITEMS_START + 0x06)
 #define FLAG_HIDDEN_ITEM_ROUTE_119_FULL_HEAL                 (FLAG_HIDDEN_ITEMS_START + 0x44)
-#define FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER                 (FLAG_HIDDEN_ITEMS_START + 0x57)
-#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1              (FLAG_HIDDEN_ITEMS_START + 0x47)
-#define FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x54)
 #define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_2              (FLAG_HIDDEN_ITEMS_START + 0x45)
 #define FLAG_HIDDEN_ITEM_ROUTE_120_ZINC                      (FLAG_HIDDEN_ITEMS_START + 0x46)
-#define FLAG_HIDDEN_ITEM_ROUTE_121_HP_UP                     (FLAG_HIDDEN_ITEMS_START + 0x27)
-#define FLAG_HIDDEN_ITEM_ROUTE_121_NUGGET                    (FLAG_HIDDEN_ITEMS_START + 0x28)
+#define FLAG_HIDDEN_ITEM_ROUTE_120_RARE_CANDY_1              (FLAG_HIDDEN_ITEMS_START + 0x47)
+#define FLAG_HIDDEN_ITEM_ROUTE_117_REPEL                     (FLAG_HIDDEN_ITEMS_START + 0x48)
 #define FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL                 (FLAG_HIDDEN_ITEMS_START + 0x49)
-#define FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE                (FLAG_HIDDEN_ITEMS_START + 0x64)
-#define FLAG_HIDDEN_ITEM_ROUTE_123_SUPER_REPEL               (FLAG_HIDDEN_ITEMS_START + 0x07)
-#define FLAG_HIDDEN_ITEM_ROUTE_123_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x29)
 #define FLAG_HIDDEN_ITEM_ROUTE_123_HYPER_POTION              (FLAG_HIDDEN_ITEMS_START + 0x4A)
-#define FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP                     (FLAG_HIDDEN_ITEMS_START + 0x63)
-#define FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY                (FLAG_HIDDEN_ITEMS_START + 0x6E)
+#define FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL             (FLAG_HIDDEN_ITEMS_START + 0x4B)
+#define FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL              (FLAG_HIDDEN_ITEMS_START + 0x4C)
+#define FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL               (FLAG_HIDDEN_ITEMS_START + 0x4D)
+#define FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER          (FLAG_HIDDEN_ITEMS_START + 0x4E)
+#define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC                 (FLAG_HIDDEN_ITEMS_START + 0x4F)
+#define FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY           (FLAG_HIDDEN_ITEMS_START + 0x50)
+#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL          (FLAG_HIDDEN_ITEMS_START + 0x51)
+#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR             (FLAG_HIDDEN_ITEMS_START + 0x52)
+#define FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL          (FLAG_HIDDEN_ITEMS_START + 0x53)
+#define FLAG_HIDDEN_ITEM_ROUTE_120_REVIVE                    (FLAG_HIDDEN_ITEMS_START + 0x54)
+#define FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE                  (FLAG_HIDDEN_ITEMS_START + 0x55)
+#define FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY                (FLAG_HIDDEN_ITEMS_START + 0x56)
+#define FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER                 (FLAG_HIDDEN_ITEMS_START + 0x57)
+#define FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x58)
+#define FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x59)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2             (FLAG_HIDDEN_ITEMS_START + 0x5A)
+#define FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3             (FLAG_HIDDEN_ITEMS_START + 0x5B)
 #define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1             (FLAG_HIDDEN_ITEMS_START + 0x5C)
 #define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2             (FLAG_HIDDEN_ITEMS_START + 0x5D)
 #define FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3             (FLAG_HIDDEN_ITEMS_START + 0x5E)
+#define FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY           (FLAG_HIDDEN_ITEMS_START + 0x5F)
+#define FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES             (FLAG_HIDDEN_ITEMS_START + 0x60)
+#define FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE               (FLAG_HIDDEN_ITEMS_START + 0x61)
+#define FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET                    (FLAG_HIDDEN_ITEMS_START + 0x62)
+#define FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP                     (FLAG_HIDDEN_ITEMS_START + 0x63)
+#define FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE                (FLAG_HIDDEN_ITEMS_START + 0x64)
+#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM            (FLAG_HIDDEN_ITEMS_START + 0x65)
+#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC               (FLAG_HIDDEN_ITEMS_START + 0x66)
+#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN            (FLAG_HIDDEN_ITEMS_START + 0x67)
+#define FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON               (FLAG_HIDDEN_ITEMS_START + 0x68)
+#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE (FLAG_HIDDEN_ITEMS_START + 0x69)
+#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY   (FLAG_HIDDEN_ITEMS_START + 0x6A)
+#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC         (FLAG_HIDDEN_ITEMS_START + 0x6B)
+#define FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP        (FLAG_HIDDEN_ITEMS_START + 0x6C)
+#define FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH           (FLAG_HIDDEN_ITEMS_START + 0x6D)
+#define FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY                (FLAG_HIDDEN_ITEMS_START + 0x6E)
+#define FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL                 (FLAG_HIDDEN_ITEMS_START + 0x6F)
 
 #define FLAG_UNUSED_0x264  0x264 // Unused Flag
 #define FLAG_UNUSED_0x265  0x265 // Unused Flag
@@ -799,7 +799,7 @@
 #define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1          0x2F2
 #define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2          0x2F3
 #define FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_TEAM_MAGMA          0x2F4
-#define FLAG_HIDE_LITTLE_ROOT_TOWN_PLAYERS_BEDROOM_MOM              0x2F5
+#define FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_BEDROOM_MOM               0x2F5
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM                0x2F6
 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM                    0x2F7
 #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM      0x2F8
@@ -1135,18 +1135,18 @@
 #define FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL                        0x440
 #define FLAG_ITEM_MT_PYRE_6F_TM_30                                  0x441
 #define FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26                      0x442
-#define FLAG_ITEM_FIERY_PATH_TM06                                   0x443 
-#define FLAG_ITEM_ROUTE_124_RED_SHARD                               0x444 
-#define FLAG_ITEM_ROUTE_124_BLUE_SHARD                              0x445 
-#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22                      0x446 
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL               0x447 
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE              0x448 
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL              0x449 
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13                    0x44A 
-#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE                  0x44B 
-#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY        0x44C 
-#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE    0x44D 
-#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18          0x44E 
+#define FLAG_ITEM_FIERY_PATH_TM06                                   0x443
+#define FLAG_ITEM_ROUTE_124_RED_SHARD                               0x444
+#define FLAG_ITEM_ROUTE_124_BLUE_SHARD                              0x445
+#define FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22                      0x446
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL               0x447
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE              0x448
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL              0x449
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13                    0x44A
+#define FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE                  0x44B
+#define FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY        0x44C
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE    0x44D
+#define FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18          0x44E
 #define FLAG_ITEM_ROUTE_121_CARBOS                                  0x44F
 #define FLAG_ITEM_ROUTE_123_ULTRA_BALL                              0x450
 #define FLAG_ITEM_ROUTE_126_GREEN_SHARD                             0x451
diff --git a/include/constants/global.h b/include/constants/global.h
index 9b0c46ce4..1cece7975 100644
--- a/include/constants/global.h
+++ b/include/constants/global.h
@@ -86,6 +86,7 @@
 #define EASY_CHAT_BATTLE_WORDS_COUNT 6
 #define MOVE_NAME_LENGTH 12
 #define NUM_QUESTIONNAIRE_WORDS 4
+#define QUIZ_QUESTION_LEN 9
 
 #define MALE 0
 #define FEMALE 1
diff --git a/include/constants/item.h b/include/constants/item.h
index 3277f2379..a224291fa 100644
--- a/include/constants/item.h
+++ b/include/constants/item.h
@@ -16,9 +16,4 @@
 #define KEYITEMS_POCKET    4
 #define POCKETS_COUNT      5
 
-// The TM/HM pocket is the largest pocket, so the maximum amount of items
-// in a pocket is its count + 1 for the cancel option
-#define MAX_POCKET_ITEMS   (BAG_TMHM_COUNT + 1)
-
-
 #endif // GUARD_ITEM_CONSTANTS_H
diff --git a/include/constants/item_effects.h b/include/constants/item_effects.h
index 9a6bcd05e..f08b17ee9 100644
--- a/include/constants/item_effects.h
+++ b/include/constants/item_effects.h
@@ -23,7 +23,7 @@
 #define ITEM3_POISON            0x10
 #define ITEM3_SLEEP             0x20
 #define ITEM3_LEVEL_UP          0x40
-#define ITEM3_GUARD_SPEC        0x80 // Works the same way as the move Mist.   
+#define ITEM3_GUARD_SPEC        0x80 // Works the same way as the move Mist.
 
 #define ITEM3_STATUS_ALL        (ITEM3_CONFUSION | ITEM3_PARALYSIS | ITEM3_FREEZE | ITEM3_BURN | ITEM3_POISON | ITEM3_SLEEP)
 
diff --git a/include/constants/items.h b/include/constants/items.h
index 8f77e80de..c596dd3b8 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -199,9 +199,11 @@
 #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
 #define LAST_BERRY_INDEX  ITEM_ENIGMA_BERRY
 
-#define ITEM_0B0 176
-#define ITEM_0B1 177
-#define ITEM_0B2 178
+#define ITEM_UNUSED_BERRY_1 176
+#define ITEM_UNUSED_BERRY_2 177
+#define ITEM_UNUSED_BERRY_3 178
+
+#define MAX_BERRY_INDEX ITEM_UNUSED_BERRY_3
 
 // Battle Held items
 #define ITEM_BRIGHT_POWDER 179
@@ -531,6 +533,6 @@
 #define ITEM_B_USE_OTHER    2
 
 // Check if the item is one that can be used on a Pokemon.
-#define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
+#define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= MAX_BERRY_INDEX)
 
 #endif  // GUARD_CONSTANTS_ITEMS_H
diff --git a/include/constants/lilycove_lady.h b/include/constants/lilycove_lady.h
index 11b9b31e9..5b1e7d7b4 100644
--- a/include/constants/lilycove_lady.h
+++ b/include/constants/lilycove_lady.h
@@ -10,7 +10,7 @@
 #define LILYCOVE_LADY_STATE_COMPLETED   1
 #define LILYCOVE_LADY_STATE_PRIZE       2
 
-#define LILYCOVE_LADY_GIFT_THRESHOLD    5  
+#define LILYCOVE_LADY_GIFT_THRESHOLD    5
 
 #define QUIZ_AUTHOR_PLAYER           0
 #define QUIZ_AUTHOR_OTHER_PLAYER     1
@@ -20,8 +20,6 @@
 #define QUIZ_AUTHOR_NAME_LADY            0
 #define QUIZ_AUTHOR_NAME_PLAYER          1
 #define QUIZ_AUTHOR_NAME_OTHER_PLAYER    2
-   
-#define QUIZ_QUESTION_LEN 9
 
 // Constants for how many good Pokéblocks the Contest Lady was given
 // This determines how her performance is described when her TV show comes on
diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h
index 68d360955..7a56cc908 100644
--- a/include/constants/map_scripts.h
+++ b/include/constants/map_scripts.h
@@ -9,7 +9,7 @@
     They are numbered in the order that they will be called when entering a map (from a warp or camera transition).
     NOTE: These descriptions are just of what they generally do, not what they always or have to do
 
-    3. ON_LOAD: Run after the layout is loaded (but not drawn yet). 
+    3. ON_LOAD: Run after the layout is loaded (but not drawn yet).
                 Almost exclusively used to set metatiles on the map before it's first drawn
 
     6. ON_FRAME_TABLE: Run every frame after the map has faded in, before player input is processed.
diff --git a/include/constants/metatile_labels.h b/include/constants/metatile_labels.h
index b5ef69046..6159bf6cb 100644
--- a/include/constants/metatile_labels.h
+++ b/include/constants/metatile_labels.h
@@ -16,7 +16,7 @@
 #define METATILE_General_MuddySlope_Frame2    0x0EA
 #define METATILE_General_MuddySlope_Frame3    0x0EB
 #define METATILE_General_SandPit_Center       0x121
-#define METATILE_General_Door                 0x021   
+#define METATILE_General_Door                 0x021
 #define METATILE_General_Door_PokeMart        0x041
 #define METATILE_General_Door_PokeCenter      0x061
 #define METATILE_General_Door_Gym             0x1CD
@@ -35,7 +35,7 @@
 #define METATILE_General_SecretBase_VineLeft  0x036
 #define METATILE_General_SecretBase_VineRight 0x037
 #define METATILE_General_RedCaveIndent        0x1A0
-#define METATILE_General_RedCaveOpen          0x1A1 
+#define METATILE_General_RedCaveOpen          0x1A1
 #define METATILE_General_YellowCaveIndent     0x1A8
 #define METATILE_General_YellowCaveOpen       0x1A9
 #define METATILE_General_BlueCaveIndent       0x1B0
diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h
index 7953967ed..e31debb49 100644
--- a/include/constants/party_menu.h
+++ b/include/constants/party_menu.h
@@ -49,14 +49,14 @@
 #define PARTY_LAYOUT_COUNT           4
 #define KEEP_PARTY_LAYOUT            0xFF
 
-#define PARTY_MENU_TYPE_FIELD                     0 
-#define PARTY_MENU_TYPE_IN_BATTLE                 1 
-#define PARTY_MENU_TYPE_CONTEST                   2 
-#define PARTY_MENU_TYPE_CHOOSE_MON                3 
+#define PARTY_MENU_TYPE_FIELD                     0
+#define PARTY_MENU_TYPE_IN_BATTLE                 1
+#define PARTY_MENU_TYPE_CONTEST                   2
+#define PARTY_MENU_TYPE_CHOOSE_MON                3
 #define PARTY_MENU_TYPE_CHOOSE_HALF               4  // multi battles, eReader battles, and some battle facilities
 #define PARTY_MENU_TYPE_MULTI_SHOWCASE            5
-#define PARTY_MENU_TYPE_DAYCARE                   6 
-#define PARTY_MENU_TYPE_MOVE_RELEARNER            7 
+#define PARTY_MENU_TYPE_DAYCARE                   6
+#define PARTY_MENU_TYPE_MOVE_RELEARNER            7
 #define PARTY_MENU_TYPE_UNION_ROOM_REGISTER       8  // trading board
 #define PARTY_MENU_TYPE_UNION_ROOM_TRADE          9  // trading board
 #define PARTY_MENU_TYPE_SPIN_TRADE                10 // Unused beta for Gen IV's Spin Trade
@@ -68,7 +68,7 @@
 #define PARTY_ACTION_CANT_SWITCH        2
 #define PARTY_ACTION_USE_ITEM           3
 #define PARTY_ACTION_ABILITY_PREVENTS   4
-#define PARTY_ACTION_GIVE_ITEM          5  
+#define PARTY_ACTION_GIVE_ITEM          5
 #define PARTY_ACTION_GIVE_PC_ITEM       6   // Unused. Not possible to give non-mail items directly from PC
 #define PARTY_ACTION_GIVE_MAILBOX_MAIL  7
 #define PARTY_ACTION_SWITCH             8
@@ -83,7 +83,7 @@
 #define PARTY_MSG_CHOOSE_MON                0
 #define PARTY_MSG_CHOOSE_MON_OR_CANCEL      1
 #define PARTY_MSG_CHOOSE_MON_AND_CONFIRM    2
-#define PARTY_MSG_MOVE_TO_WHERE             3 
+#define PARTY_MSG_MOVE_TO_WHERE             3
 #define PARTY_MSG_TEACH_WHICH_MON           4
 #define PARTY_MSG_USE_ON_WHICH_MON          5
 #define PARTY_MSG_GIVE_TO_WHICH_MON         6
diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h
index 51ef0c015..9bafa0a0b 100644
--- a/include/constants/pokemon.h
+++ b/include/constants/pokemon.h
@@ -225,7 +225,7 @@
 // 1 bit each in the Pokémon struct. Gen 4 hard-codes
 // each of these to the given name. In Gen 3 they're
 // used to get an index into giftRibbons in the save block,
-// which can have a value 0-64 (0 is 'no ribbon') that 
+// which can have a value 0-64 (0 is 'no ribbon') that
 // corresponds to one of the special ribbons listed
 // in gGiftRibbonDescriptionPointers. Most of these were
 // never distributed
@@ -272,15 +272,6 @@
 
 #define MAX_FRIENDSHIP  0xFF
 
-#define STATUS_PRIMARY_NONE      0
-#define STATUS_PRIMARY_POISON    1
-#define STATUS_PRIMARY_PARALYSIS 2
-#define STATUS_PRIMARY_SLEEP     3
-#define STATUS_PRIMARY_FREEZE    4
-#define STATUS_PRIMARY_BURN      5
-#define STATUS_PRIMARY_POKERUS   6
-#define STATUS_PRIMARY_FAINTED   7
-
 #define MAX_PER_STAT_IVS 31
 #define MAX_IV_MASK 31
 #define USE_RANDOM_IVS (MAX_PER_STAT_IVS + 1)
diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h
index 928ca00e0..c58df7335 100644
--- a/include/constants/script_menu.h
+++ b/include/constants/script_menu.h
@@ -65,7 +65,7 @@
 #define MULTI_RIGHTLEFT                    54
 #define MULTI_GAME_CORNER_TMS              55
 #define MULTI_SSTIDAL_SLATEPORT_NO_BF      56
-#define MULTI_FLOORS                       57 
+#define MULTI_FLOORS                       57
 #define MULTI_SHARDS_R                     58
 #define MULTI_SHARDS_Y                     59
 #define MULTI_SHARDS_RY                    60
@@ -82,9 +82,9 @@
 #define MULTI_SHARDS_YBG                   71
 #define MULTI_SHARDS_RYBG                  72
 #define MULTI_TOURNEY_WITH_RECORD          73
-#define MULTI_CABLE_CLUB_NO_RECORD_MIX     74 
+#define MULTI_CABLE_CLUB_NO_RECORD_MIX     74
 #define MULTI_WIRELESS_NO_RECORD_BERRY     75
-#define MULTI_CABLE_CLUB_WITH_RECORD_MIX   76 
+#define MULTI_CABLE_CLUB_WITH_RECORD_MIX   76
 #define MULTI_WIRELESS_NO_BERRY            77
 #define MULTI_WIRELESS_NO_RECORD           78
 #define MULTI_WIRELESS_ALL_SERVICES        79
diff --git a/include/constants/songs.h b/include/constants/songs.h
index a78ee6faf..d6a418495 100644
--- a/include/constants/songs.h
+++ b/include/constants/songs.h
@@ -267,7 +267,7 @@
 #define SE_RG_HELP_ERROR            259 // SE_RG_HELP_NG
 #define SE_RG_DEOXYS_MOVE           260 // SE_RG_DEOMOV
 #define SE_RG_POKE_JUMP_SUCCESS     261 // SE_RG_EXCELLENT
-#define SE_RG_POKE_JUMP_FAILURE     262 // SE_RG_NAWAMISS 
+#define SE_RG_POKE_JUMP_FAILURE     262 // SE_RG_NAWAMISS
 // New Emerald SFX
 #define SE_POKENAV_CALL             263 // SE_TOREEYE
 #define SE_POKENAV_HANG_UP          264 // SE_TOREOFF
diff --git a/include/constants/tv.h b/include/constants/tv.h
index 095a6ddca..3fe6c57b2 100644
--- a/include/constants/tv.h
+++ b/include/constants/tv.h
@@ -35,7 +35,7 @@
 
 // TVGROUP_RECORD_MIX
 #define TVGROUP_RECORD_MIX_START                    21
-#define TVSHOW_POKEMON_TODAY_CAUGHT                 21 
+#define TVSHOW_POKEMON_TODAY_CAUGHT                 21
 #define TVSHOW_SMART_SHOPPER                        22
 #define TVSHOW_POKEMON_TODAY_FAILED                 23
 #define TVSHOW_FISHING_ADVICE                       24
diff --git a/include/constants/vars.h b/include/constants/vars.h
index d3d1aba87..2cbe3e9b8 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -149,7 +149,7 @@
 #define VAR_LITTLEROOT_HOUSES_STATE_MAY      0x4082
 #define VAR_UNUSED_0x4083                    0x4083 // Unused Var
 #define VAR_BIRCH_LAB_STATE                  0x4084
-#define VAR_PETALBURG_GYM_STATE              0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman 
+#define VAR_PETALBURG_GYM_STATE              0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman
 #define VAR_CONTEST_HALL_STATE               0x4086
 #define VAR_CABLE_CLUB_STATE                 0x4087
 #define VAR_CONTEST_TYPE                     0x4088
diff --git a/include/constants/weather.h b/include/constants/weather.h
index becbdda87..c4a23a18b 100644
--- a/include/constants/weather.h
+++ b/include/constants/weather.h
@@ -16,7 +16,7 @@
 #define WEATHER_DROUGHT                 12
 #define WEATHER_DOWNPOUR                13
 #define WEATHER_UNDERWATER_BUBBLES      14
-#define WEATHER_ABNORMAL                15  // The alternating weather during Groudon/Kyogre conflict 
+#define WEATHER_ABNORMAL                15  // The alternating weather during Groudon/Kyogre conflict
 #define WEATHER_ROUTE119_CYCLE          20
 #define WEATHER_ROUTE123_CYCLE          21
 
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 3340da6f5..1a24aa59d 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -240,48 +240,48 @@ extern const u8 gTVWhatsNo1InHoennTodayText05[];
 extern const u8 gTVWhatsNo1InHoennTodayText06[];
 extern const u8 gTVWhatsNo1InHoennTodayText07[];
 extern const u8 gTVWhatsNo1InHoennTodayText08[];
-extern const u8 TVSecretBaseSecrets_Text_Intro[]; 
+extern const u8 TVSecretBaseSecrets_Text_Intro[];
 extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1[];
 extern const u8 TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2[];
 extern const u8 TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving[];
-extern const u8 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer[]; 
-extern const u8 TVSecretBaseSecrets_Text_PlayerEnjoyedBase[]; 
+extern const u8 TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer[];
+extern const u8 TVSecretBaseSecrets_Text_PlayerEnjoyedBase[];
 extern const u8 TVSecretBaseSecrets_Text_PlayerHugeFanOfBase[];
-extern const u8 TVSecretBaseSecrets_Text_Outro[]; 
-extern const u8 TVSecretBaseSecrets_Text_StoppedMoving1[]; 
-extern const u8 TVSecretBaseSecrets_Text_StoppedMoving2[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedChair[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedBalloon[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedTent[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedPlant[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedGoldShield[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSilverShield[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedGlassOrnament[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedTV[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedMudBall[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedBag[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedCushion[]; 
-extern const u8 TVSecretBaseSecrets_Text_HitCushion[]; 
-extern const u8 TVSecretBaseSecrets_Text_HuggedCushion[]; 
-extern const u8 TVSecretBaseSecrets_Text_BattledWon[]; 
-extern const u8 TVSecretBaseSecrets_Text_BattledLost[]; 
-extern const u8 TVSecretBaseSecrets_Text_DeclinedBattle[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedPoster[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedNoteMat[]; 
-extern const u8 TVSecretBaseSecrets_Text_BattledDraw[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSpinMat[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSandOrnament[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedDesk[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedBrick[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSolidBoard[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedFence[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedGlitterMat[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedTire[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedStand[]; 
+extern const u8 TVSecretBaseSecrets_Text_Outro[];
+extern const u8 TVSecretBaseSecrets_Text_StoppedMoving1[];
+extern const u8 TVSecretBaseSecrets_Text_StoppedMoving2[];
+extern const u8 TVSecretBaseSecrets_Text_UsedChair[];
+extern const u8 TVSecretBaseSecrets_Text_UsedBalloon[];
+extern const u8 TVSecretBaseSecrets_Text_UsedTent[];
+extern const u8 TVSecretBaseSecrets_Text_UsedPlant[];
+extern const u8 TVSecretBaseSecrets_Text_UsedGoldShield[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSilverShield[];
+extern const u8 TVSecretBaseSecrets_Text_UsedGlassOrnament[];
+extern const u8 TVSecretBaseSecrets_Text_UsedTV[];
+extern const u8 TVSecretBaseSecrets_Text_UsedMudBall[];
+extern const u8 TVSecretBaseSecrets_Text_UsedBag[];
+extern const u8 TVSecretBaseSecrets_Text_UsedCushion[];
+extern const u8 TVSecretBaseSecrets_Text_HitCushion[];
+extern const u8 TVSecretBaseSecrets_Text_HuggedCushion[];
+extern const u8 TVSecretBaseSecrets_Text_BattledWon[];
+extern const u8 TVSecretBaseSecrets_Text_BattledLost[];
+extern const u8 TVSecretBaseSecrets_Text_DeclinedBattle[];
+extern const u8 TVSecretBaseSecrets_Text_UsedPoster[];
+extern const u8 TVSecretBaseSecrets_Text_UsedNoteMat[];
+extern const u8 TVSecretBaseSecrets_Text_BattledDraw[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSpinMat[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSandOrnament[];
+extern const u8 TVSecretBaseSecrets_Text_UsedDesk[];
+extern const u8 TVSecretBaseSecrets_Text_UsedBrick[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSolidBoard[];
+extern const u8 TVSecretBaseSecrets_Text_UsedFence[];
+extern const u8 TVSecretBaseSecrets_Text_UsedGlitterMat[];
+extern const u8 TVSecretBaseSecrets_Text_UsedTire[];
+extern const u8 TVSecretBaseSecrets_Text_UsedStand[];
 extern const u8 TVSecretBaseSecrets_Text_BrokeDoor[];
-extern const u8 TVSecretBaseSecrets_Text_UsedDoll[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSlide[]; 
-extern const u8 TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown[]; 
+extern const u8 TVSecretBaseSecrets_Text_UsedDoll[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSlide[];
+extern const u8 TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown[];
 extern const u8 TVSecretBaseSecrets_Text_UsedJumpMat[];
 extern const u8 gTVSafariFanClubText00[];
 extern const u8 gTVSafariFanClubText01[];
@@ -584,9 +584,11 @@ extern const u8 SecretBase_EventScript_ShrubUseSecretPower[];
 extern const u8 TrainerHill_EventScript_TrainerBattle[];
 
 // Item Use
-extern u8 BerryTree_EventScript_ItemUsePlantBerry[];
-extern u8 BerryTree_EventScript_ItemUseWailmerPail[];
-extern u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[];
+extern const u8 BerryTree_EventScript_ItemUsePlantBerry[];
+extern const u8 BerryTree_EventScript_ItemUseWailmerPail[];
+extern const u8 BattleFrontier_OutsideEast_EventScript_WaterSudowoodo[];
+
+extern const u8 EventScript_SelectWithoutRegisteredItem[];
 
 // overworld
 extern const u8 EventScript_WhiteOut[];
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 6bafa9747..41b8539ff 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -146,7 +146,7 @@ struct MapHeader
     /* 0x1A */ bool8 allowCycling:1;
                bool8 allowEscaping:1; // Escape Rope and Dig
                bool8 allowRunning:1;
-               bool8 showMapName:5; // the last 4 bits are unused 
+               bool8 showMapName:5; // the last 4 bits are unused
                                     // but the 5 bit sized bitfield is required to match
     /* 0x1B */ u8 battleType;
 };
diff --git a/include/global.h b/include/global.h
index e4c11f9ef..d14aa60f4 100644
--- a/include/global.h
+++ b/include/global.h
@@ -312,7 +312,7 @@ struct BattleTowerEReaderTrainer
     /*0xB8*/ u32 checksum;
 };
 
-// For displaying party information on the player's Battle Dome tourney page 
+// For displaying party information on the player's Battle Dome tourney page
 struct DomeMonData
 {
     u16 moves[MAX_MON_MOVES];
@@ -436,7 +436,7 @@ struct PlayersApprentice
     /*0xB1*/ u8 questionsAnswered:4;
     /*0xB1*/ u8 leadMonId:2;
     /*0xB2*/ u8 party:3;
-    /*0xB2*/ u8 saveId:2; 
+    /*0xB2*/ u8 saveId:2;
     /*0xB3*/ u8 unused;
     /*0xB4*/ u8 speciesIds[MULTI_PARTY_SIZE];
     /*0xB8*/ struct ApprenticeQuestion questions[APPRENTICE_MAX_QUESTIONS];
@@ -761,7 +761,7 @@ struct LilycoveLadyQuiz
 {
     /*0x000*/ u8 id;
     /*0x001*/ u8 state;
-    /*0x002*/ u16 question[9];
+    /*0x002*/ u16 question[QUIZ_QUESTION_LEN];
     /*0x014*/ u16 correctAnswer;
     /*0x016*/ u16 playerAnswer;
     /*0x018*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
diff --git a/include/graphics.h b/include/graphics.h
index 1f40cda01..dcb47a226 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4955,13 +4955,13 @@ extern const u32 gKantoTrainerCardFrontLink_Tilemap[];
 extern const u32 gHoennTrainerCardBg_Tilemap[];
 
 // Frontier Pass
-extern const u32 gUnknown_08DE08C8[];
-extern const u32 gUnknown_08DE2084[];
-extern const u32 gUnknown_08DE3350[];
-extern const u32 gUnknown_08DE3374[];
-extern const u32 gUnknown_08DE3060[];
+extern const u32 gFrontierPassBg_Gfx[];
+extern const u32 gFrontierPassBg_Tilemap[];
+extern const u16 gFrontierPassBg_Pal[][16];
+extern const u32 gFrontierPassMapAndCard_Gfx[];
+extern const u32 gFrontierPassCancelButton_Tilemap[];
+extern const u32 gFrontierPassCancelButtonHighlighted_Tilemap[];
 extern const u32 gFrontierPassMedals_Gfx[];
-extern const u16 gUnknown_08DE07C8[][16];
 extern const u16 gFrontierPassCursor_Pal[];
 extern const u16 gFrontierPassMedalsGold_Pal[];
 extern const u16 gFrontierPassMedalsSilver_Pal[];
diff --git a/include/item_menu.h b/include/item_menu.h
index a99272b0c..fd576c3b5 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -1,107 +1,111 @@
-#ifndef GUARD_item_menu_H
-#define GUARD_item_menu_H
+#ifndef GUARD_ITEM_MENU_H
+#define GUARD_ITEM_MENU_H
 
 #include "item.h"
 #include "menu_helpers.h"
 
-#define ITEMMENULOCATION_FIELD 0
-#define ITEMMENULOCATION_BATTLE 1
-#define ITEMMENULOCATION_PARTY 2
-#define ITEMMENULOCATION_SHOP 3
-#define ITEMMENULOCATION_BERRY_TREE 4
-#define ITEMMENULOCATION_BERRY_BLENDER_CRUSH 5
-#define ITEMMENULOCATION_ITEMPC 6
-#define ITEMMENULOCATION_FAVOR_LADY 7
-#define ITEMMENULOCATION_QUIZ_LADY 8
-#define ITEMMENULOCATION_APPRENTICE 9
-#define ITEMMENULOCATION_WALLY 10
-#define ITEMMENULOCATION_PCBOX 11
-#define ITEMMENULOCATION_LAST 12
+enum {
+    ITEMMENULOCATION_FIELD,
+    ITEMMENULOCATION_BATTLE,
+    ITEMMENULOCATION_PARTY,
+    ITEMMENULOCATION_SHOP,
+    ITEMMENULOCATION_BERRY_TREE,
+    ITEMMENULOCATION_BERRY_BLENDER_CRUSH,
+    ITEMMENULOCATION_ITEMPC,
+    ITEMMENULOCATION_FAVOR_LADY,
+    ITEMMENULOCATION_QUIZ_LADY,
+    ITEMMENULOCATION_APPRENTICE,
+    ITEMMENULOCATION_WALLY,
+    ITEMMENULOCATION_PCBOX,
+    ITEMMENULOCATION_LAST,
+};
 
-#define ITEMMENUACTION_USE           0
-#define ITEMMENUACTION_TOSS          1
-#define ITEMMENUACTION_REGISTER      2
-#define ITEMMENUACTION_GIVE          3
-#define ITEMMENUACTION_CANCEL        4
-#define ITEMMENUACTION_BATTLE_USE    5
-#define ITEMMENUACTION_CHECK         6
-#define ITEMMENUACTION_WALK          7
-#define ITEMMENUACTION_DESELECT      8
-#define ITEMMENUACTION_CHECK_TAG     9
-#define ITEMMENUACTION_CONFIRM      10
-#define ITEMMENUACTION_SHOW         11
-#define ITEMMENUACTION_GIVE_2       12
-#define ITEMMENUACTION_CONFIRM_2    13
-#define ITEMMENUACTION_DUMMY        14
+// Window IDs for the item menu
+enum {
+    ITEMWIN_1x1,
+    ITEMWIN_1x2,
+    ITEMWIN_2x2,
+    ITEMWIN_2x3,
+    ITEMWIN_MESSAGE,
+    ITEMWIN_YESNO_LOW,
+    ITEMWIN_YESNO_HIGH,
+    ITEMWIN_QUANTITY,
+    ITEMWIN_QUANTITY_WIDE,
+    ITEMWIN_MONEY,
+    ITEMWIN_COUNT
+};
 
-// Exported type declarations
-struct BagStruct
+#define ITEMMENU_SWAP_LINE_LENGTH 8  // Swap line is 8 sprites long
+enum {
+    ITEMMENUSPRITE_BAG,
+    ITEMMENUSPRITE_BALL,
+    ITEMMENUSPRITE_ITEM,
+    ITEMMENUSPRITE_ITEM_ALT, // Need two when selecting new item
+    ITEMMENUSPRITE_SWAP_LINE,
+    ITEMMENUSPRITE_COUNT = ITEMMENUSPRITE_SWAP_LINE + ITEMMENU_SWAP_LINE_LENGTH,
+};
+
+struct BagPosition
 {
-    void (*bagCallback)(void);
+    void (*exitCallback)(void);
     u8 location;
     u8 pocket;
-    u16 unk6;
+    u16 pocketSwitchArrowPos;
     u16 cursorPosition[POCKETS_COUNT];
     u16 scrollPosition[POCKETS_COUNT];
 };
 
-extern struct BagStruct gBagPositionStruct;
+extern struct BagPosition gBagPosition;
 
-struct BagMenuStruct
+struct BagMenu
 {
-    void (*exitCallback)(void);
-    u8 tilemapBuffer[0x800];
-    u8 spriteId[12];
-    u8 windowPointers[10];
-    u8 itemOriginalLocation;
+    void (*newScreenCallback)(void);
+    u8 tilemapBuffer[BG_SCREEN_SIZE];
+    u8 spriteIds[ITEMMENUSPRITE_COUNT];
+    u8 windowIds[ITEMWIN_COUNT];
+    u8 toSwapPos;
     u8 pocketSwitchDisabled:4;
     u8 itemIconSlot:2;
     u8 inhibitItemDescriptionPrint:1;
     u8 hideCloseBagText:1;
-    u8 filler3[2];
+    u8 unused1[2];
     u8 pocketScrollArrowsTask;
     u8 pocketSwitchArrowsTask;
     const u8* contextMenuItemsPtr;
     u8 contextMenuItemsBuffer[4];
     u8 contextMenuNumItems;
     u8 numItemStacks[POCKETS_COUNT];
-    u8 numShownItems[6];
+    u8 numShownItems[POCKETS_COUNT];
     s16 graphicsLoadState;
-    u8 filler4[0xE];
+    u8 unused2[14];
     u8 pocketNameBuffer[32][32];
-    u8 filler2[4];
+    u8 unused3[4];
 };
 
-extern struct BagMenuStruct *gBagMenu;
-
-// Exported RAM declarations
-
+extern struct BagMenu *gBagMenu;
 extern u16 gSpecialVar_ItemId;
 
-// Exported ROM declarations
 void CB2_GoToItemDepositMenu(void);
 void FavorLadyOpenBagMenu(void);
 void QuizLadyOpenBagMenu(void);
 void ApprenticeOpenBagMenu(void);
 void CB2_BagMenuFromBattle(void);
-void SetInitialScrollAndCursorPositions(u8 pocketId);
+void UpdatePocketListPosition(u8 pocketId);
 void CB2_ReturnToBagMenuPocket(void);
 void CB2_BagMenuFromStartMenu(void);
 u8 GetItemListPosition(u8 pocketId);
 bool8 UseRegisteredKeyItemOnField(void);
 void CB2_GoToSellMenu(void);
-void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *postExitMenuMainCallback2)());
+void GoToBagMenu(u8 bagMenuType, u8 pocketId, void ( *exitCallback)());
 void DoWallyTutorialBagMenu(void);
 void ResetBagScrollPositions(void);
 void ChooseBerryForMachine(void (*exitCallback)(void));
 void CB2_ChooseBerry(void);
 void Task_FadeAndCloseBagMenu(u8 taskId);
-void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*);
-void BagMenu_InitListsMenu(u8 taskId);
+void BagMenu_YesNo(u8 taskId, u8 windowType, const struct YesNoFuncTable* funcTable);
 void UpdatePocketItemList(u8 pocketId);
 void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u8 taskId));
 void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
+void CloseItemMessage(u8 taskId);
 
-
-
-#endif //GUARD_item_menu_H
+#endif //GUARD_ITEM_MENU_H
diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h
index 50e11dfd9..d01dcccf5 100644
--- a/include/item_menu_icons.h
+++ b/include/item_menu_icons.h
@@ -22,10 +22,4 @@ void FreeBerryTagSpritePalette(void);
 u8 CreateSpinningBerrySprite(u8 berryId, u8 x, u8 y, bool8 startAffine);
 u8 CreateBerryFlavorCircleSprite(s16 x);
 
-#define TAG_BAG_GFX 100
-#define TAG_ROTATING_BALL_GFX 101
-#define TAG_BERRY_CHECK_CIRCLE_GFX 10000
-#define TAG_BERRY_PIC_TILE 0xFFFF
-#define TAG_BERRY_PIC_PAL 0x7544
-
 #endif // GUARD_ITEM_MENU_ICONS_H
diff --git a/include/librfu.h b/include/librfu.h
index 69c696172..0026adece 100644
--- a/include/librfu.h
+++ b/include/librfu.h
@@ -30,12 +30,12 @@
     Calculate the number of the transferable DMA count based on this 42 cycles and the access cycles of the destination and source.
     For example, if both the CPU internal RAM --> VRAM have a one cycle access, then a 21 count DMA can occur.
 
-  
-  If RFU is used outside of these restrictions, problems, such as the loss of data caused by the failure of the AGB, as a clock slave, 
+
+  If RFU is used outside of these restrictions, problems, such as the loss of data caused by the failure of the AGB, as a clock slave,
   to notify that data has been received from the RFU, will occur.
   When this problem occurs, the REQ callback will send a REQ_commandID=ID_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA_REQ notification.
    (When using Link Manager, the LMAN call back will send a LMAN_msg=LMAN_MSG_CLOCK_SLAVE_MS_CHANGE_ERROR_BY_DMA notification.)
-  
+
 */
 
 // REQ-COMMAND (STWI) ID CODE LIST
@@ -137,7 +137,7 @@
 // Definition Data Returned by Return Values for Library Functions
 // *******************************************************
 
-// The function doesn't have return value. 
+// The function doesn't have return value.
 // Value of u8 *status for rfu_REQ_pollConnectParent (Connection Trial Status)
 // #define CP_STATUS_DONE                  0x00               // Connection successful
 // #define CP_STATUS_IN_PROCESS            0x01               // Connecting
@@ -145,7 +145,7 @@
 // #define CP_STATUS_DISCONNECTED          0x03               // Disconnected by parent device while connecting
 // #define CP_STATUS_UNKNOWN               0xff               // Cannot read status due to REQ-API execution error
 
-// The function doesn't exist. 
+// The function doesn't exist.
 // Value of u8 *status argument for rfu_REQ_pollRecoveryConnect (Link Restore Status)
 // #define RC_STATUS_DONE                  0x00               // Connection restore successful
 // #define RC_STATUS_FAILED                0x01               // Connection restore failure (meaningless to try anymore)
@@ -324,7 +324,7 @@ struct STWIStatus
     vu8 sending;
 };
 
-// This struct is used as u8 array in SDK. 
+// This struct is used as u8 array in SDK.
 struct RfuIntrStruct
 {
     union RfuPacket rxPacketAlloc;
@@ -475,7 +475,7 @@ extern struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX];
 // librfu_sio32id
 s32 AgbRFU_checkID(u8 maxTries);
 
-// Arguments with "bm..." specify slots of the form (0x01 << slot number) that are the object of a function operation. 
+// Arguments with "bm..." specify slots of the form (0x01 << slot number) that are the object of a function operation.
 
 // librfu_rfu
 // API Initialization and Initial Settings
diff --git a/include/link.h b/include/link.h
index 5b7ace5e1..4e0491356 100644
--- a/include/link.h
+++ b/include/link.h
@@ -75,7 +75,7 @@
 #define LINKCMD_SEND_BLOCK_REQ          0xCCCC
 #define LINKCMD_START_TRADE             0xCCDD
 #define LINKCMD_CONFIRM_FINISH_TRADE    0xDCBA
-#define LINKCMD_SET_MONS_TO_TRADE       0xDDDD 
+#define LINKCMD_SET_MONS_TO_TRADE       0xDDDD
 #define LINKCMD_PLAYER_CANCEL_TRADE     0xDDEE
 #define LINKCMD_REQUEST_CANCEL          0xEEAA
 #define LINKCMD_BOTH_CANCEL_TRADE       0xEEBB
@@ -92,7 +92,7 @@
 #define LINKTYPE_DOUBLE_BATTLE         0x2244
 #define LINKTYPE_MULTI_BATTLE          0x2255
 #define LINKTYPE_BATTLE_TOWER_50       0x2266
-#define LINKTYPE_BATTLE_TOWER_OPEN     0x2277 
+#define LINKTYPE_BATTLE_TOWER_OPEN     0x2277
 #define LINKTYPE_BATTLE_TOWER          0x2288
 #define LINKTYPE_RECORD_MIX_BEFORE     0x3311
 #define LINKTYPE_RECORD_MIX_AFTER      0x3322
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 9909437a2..df71ce252 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -7,7 +7,7 @@
 #define MENU_L_PRESSED 1
 #define MENU_R_PRESSED 2
 
-// Exported type declarations
+#define SWAP_LINE_HAS_MARGIN (1 << 7)
 
 struct YesNoFuncTable
 {
@@ -15,9 +15,6 @@ struct YesNoFuncTable
     TaskFunc noFunc;
 };
 
-// Exported RAM declarations
-
-// Exported ROM declarations
 void ResetVramOamAndBgCntRegs(void);
 void ResetAllBgsCoordinates(void);
 void SetVBlankHBlankCallbacksToNull(void);
@@ -28,13 +25,13 @@ void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *templa
 bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1);
 u8 GetLRKeysPressed(void);
 u8 GetLRKeysPressedAndHeld(void);
-bool8 sub_8122148(u16 itemId);
+bool8 IsHoldingItemAllowed(u16 itemId);
 bool8 IsWritingMailAllowed(u16 itemId);
 bool8 MenuHelpers_LinkSomething(void);
 bool8 MenuHelpers_CallLinkSomething(void);
-void sub_812220C(struct ItemSlot *slots, u8 count, u8 *arg2, u8 *usedSlotsCount, u8 maxUsedSlotsCount);
-void sub_812225C(u16 *scrollOffset, u16 *cursorPos, u8 maxShownItems, u8 numItems);
-void sub_8122298(u16 *arg0, u16 *arg1, u8 arg2, u8 arg3, u8 arg4);
+void SetItemListPerPageCount(struct ItemSlot *slots, u8 slotsCount, u8 *pageItems, u8 *totalItems, u8 maxPerPage);
+void SetCursorWithinListBounds(u16 *scrollOffset, u16 *cursorPos, u8 maxShownItems, u8 totalItems);
+void SetCursorScrollWithinListBounds(u16 *scrollOffset, u16 *cursorPos, u8 shownItems, u8 totalItems, u8 maxShownItems);
 void LoadListMenuSwapLineGfx(void);
 void CreateSwapLineSprites(u8 *spriteIds, u8 count);
 void DestroySwapLineSprites(u8 *spriteIds, u8 count);
diff --git a/include/menu_specialized.h b/include/menu_specialized.h
index 987fca9fc..c29110662 100644
--- a/include/menu_specialized.h
+++ b/include/menu_specialized.h
@@ -15,6 +15,14 @@
 
 #define MAX_CONDITION_SPARKLES 10
 
+// Window IDs for the Player PC Mailbox
+enum {
+    MAILBOXWIN_TITLE,
+    MAILBOXWIN_LIST,
+    MAILBOXWIN_OPTIONS,
+    MAILBOXWIN_COUNT
+};
+
 struct UnknownSubStruct_81D1ED4
 {
     u16 unk0;
@@ -35,12 +43,12 @@ struct ConditionGraph
     /*0x355*/ u8 state;
 };
 
-bool8 sub_81D1C44(u8 count);
-u8 sub_81D1C84(u8 a0);
-u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page);
-void sub_81D1E90(struct PlayerPCItemPageStruct *page);
-void sub_81D1EC0(void);
-void sub_81D1D04(u8 a0);
+bool8 MailboxMenu_Alloc(u8 count);
+u8 MailboxMenu_AddWindow(u8 windowIdx);
+u8 MailboxMenu_CreateList(struct PlayerPCItemPageStruct *page);
+void MailboxMenu_AddScrollArrows(struct PlayerPCItemPageStruct *page);
+void MailboxMenu_Free(void);
+void MailboxMenu_RemoveWindow(u8 windowIdx);
 void InitConditionGraphData(struct ConditionGraph *graph);
 void sub_81D2108(struct ConditionGraph *graph);
 void SetConditionGraphIOWindows(u8 bg);
diff --git a/include/overworld.h b/include/overworld.h
index 16c75861c..8005a2222 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -15,7 +15,7 @@
 
 // These two are a hack to stop user input until link stuff can be
 // resolved.
-#define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B 
+#define LINK_KEY_CODE_HANDLE_RECV_QUEUE 0x1B
 #define LINK_KEY_CODE_HANDLE_SEND_QUEUE 0x1C
 #define LINK_KEY_CODE_EXIT_SEAT 0x1D
 #define LINK_KEY_CODE_UNK_8 0x1E
diff --git a/include/player_pc.h b/include/player_pc.h
index bdf4a4e0e..2521eac13 100644
--- a/include/player_pc.h
+++ b/include/player_pc.h
@@ -3,69 +3,6 @@
 
 #include "menu.h"
 
-// local task defines
-#define PAGE_INDEX data[0]
-#define ITEMS_ABOVE_TOP data[1]
-#define NUM_ITEMS data[1]
-#define NUM_QUANTITY_ROLLER data[3]
-#define NUM_PAGE_ITEMS data[4]
-// not used
-#define CURRENT_ITEM_STORAGE_MENU data[3]
-// not used
-#define SWAP_ITEM_INDEX data[8]
-#define SWITCH_MODE_ACTIVE data[9]
-
-// this is potentially an ewram access occuring in high ewram. TODO: investigate this further.
-#define NEW_GAME_PC_ITEMS(i, type) ((u16)((u16 *)gNewGamePCItems + type)[i * 2])
-
-// defined and used in the above macro
-enum
-{
-    PC_ITEM_ID,
-    PC_QUANTITY
-};
-
-// player PC menu options
-enum
-{
-    PLAYERPC_MENU_ITEMSTORAGE,
-    PLAYERPC_MENU_MAILBOX,
-    PLAYERPC_MENU_DECORATION,
-    PLAYERPC_MENU_TURNOFF
-};
-
-// item storage menus
-enum
-{
-    ITEMPC_MENU_WITHDRAW,
-    ITEMPC_MENU_DEPOSIT,
-    ITEMPC_MENU_TOSS,
-    ITEMPC_MENU_EXIT
-};
-
-// mailbox mail options
-enum
-{
-    MAILBOX_READ,
-    MAILBOX_MOVE_TO_BAG,
-    MAILBOX_GIVE,
-    MAILBOX_CANCEL,
-};
-
-// special item description handlers
-enum
-{
-    ITEMPC_SWITCH_WHICH_ITEM = 0xFFF7,
-    ITEMPC_OKAY_TO_THROW_AWAY,
-    ITEMPC_TOO_IMPORTANT,
-    ITEMPC_NO_MORE_ROOM,
-    ITEMPC_THREW_AWAY_ITEM,
-    ITEMPC_HOW_MANY_TO_TOSS,
-    ITEMPC_WITHDREW_THING,
-    ITEMPC_HOW_MANY_TO_WITHDRAW,
-    ITEMPC_GO_BACK_TO_PREV
-};
-
 struct PlayerPCItemPageStruct
 {
     u16 cursorPos;
@@ -76,16 +13,12 @@ struct PlayerPCItemPageStruct
     u8 scrollIndicatorTaskId;
 };
 
-// Exported type declarations
-
-// Exported RAM declarations
-extern struct PlayerPCItemPageStruct playerPCItemPageInfo;
+extern struct PlayerPCItemPageStruct gPlayerPCItemPageInfo;
 
-// Exported ROM declarations
 extern const struct MenuAction gMailboxMailOptions[];
 
 void ReshowPlayerPC(u8 taskId);
-void sub_816B31C(void);
+void CB2_PlayerPCExitBagMenu(void);
 void Mailbox_ReturnToMailListAfterDeposit(void);
 void NewGameInitPCItems(void);
 
diff --git a/include/pokeball.h b/include/pokeball.h
index 8ea675ce4..d88e80173 100644
--- a/include/pokeball.h
+++ b/include/pokeball.h
@@ -21,7 +21,7 @@ enum
 enum {
     BALL_AFFINE_ANIM_0,
     BALL_ROTATE_RIGHT,
-    BALL_ROTATE_LEFT, 
+    BALL_ROTATE_LEFT,
     BALL_AFFINE_ANIM_3,
     BALL_AFFINE_ANIM_4
 };
diff --git a/include/pokedex_area_region_map.h b/include/pokedex_area_region_map.h
index 175f60c74..6526d7b45 100755
--- a/include/pokedex_area_region_map.h
+++ b/include/pokedex_area_region_map.h
@@ -10,7 +10,7 @@ struct PokedexAreaMapTemplate
 };
 
 void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *);
-bool32 sub_81C4E90(void);
+bool32 TryShowPokedexAreaMap(void);
 void PokedexAreaMapChangeBgY(u32);
 void FreePokedexAreaMapBgNum(void);
 
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index 73a7833ee..b7fca2331 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -5,9 +5,10 @@
 #define IN_BOX_ROWS             5 // Number of rows, 6 Pokémon per row
 #define IN_BOX_COLUMNS          6 // Number of columns, 5 Pokémon per column
 #define IN_BOX_COUNT            (IN_BOX_ROWS * IN_BOX_COLUMNS)
+#define BOX_NAME_LENGTH         8
 
-/* 
-            COLUMNS         
+/*
+            COLUMNS
 ROWS        0   1   2   3   4   5
             6   7   8   9   10  11
             12  13  14  15  16  17
@@ -19,7 +20,7 @@ struct PokemonStorage
 {
     /*0x0000*/ u8 currentBox;
     /*0x0001*/ struct BoxPokemon boxes[TOTAL_BOXES_COUNT][IN_BOX_COUNT];
-    /*0x8344*/ u8 boxNames[TOTAL_BOXES_COUNT][9];
+    /*0x8344*/ u8 boxNames[TOTAL_BOXES_COUNT][BOX_NAME_LENGTH + 1];
     /*0x83C2*/ u8 boxWallpapers[TOTAL_BOXES_COUNT];
 };
 
diff --git a/include/strings.h b/include/strings.h
index 9b3be0538..7317f8aac 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -419,8 +419,8 @@ extern const u8 gText_FirmSlash[];
 
 // item menu screen text
 extern const u8 gText_CloseBag[];
-extern const u8 gText_ClearTo11Var1Clear5Var2[];
-extern const u8 gText_NumberVar1Clear7Var2[];
+extern const u8 gText_NumberItem_HM[];
+extern const u8 gText_NumberItem_TMBerry[];
 extern const u8 gText_xVar1[];
 extern const u8 gText_ReturnToVar1[];
 extern const u8 gText_SelectorArrow2[];
@@ -442,6 +442,7 @@ extern const u8 gText_CantStoreImportantItems[];
 extern const u8 gText_DepositedVar2Var1s[];
 extern const u8 gText_NoRoomForItems[];
 extern const u8 gText_ThreeDashes[];
+extern const u8 *const gPocketNamesStringsTable[];
 
 // party menu text
 extern const u8 gText_PkmnHPRestoredByVar2[];
@@ -1606,10 +1607,10 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon1[]
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BirdKeeperReject[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_NinjaBoyReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyMon1[];
@@ -1619,8 +1620,8 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_ParasolLadyRejec
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacAccept[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_BugManiacReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SailorMon2Ask[];
@@ -1633,13 +1634,13 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorAccept[
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CollectorReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerMReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnRangerFReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyMon1[];
@@ -1648,20 +1649,20 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyAccept[
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_AromaLadyReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_RuinManiacReject[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerMReject[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFIntro[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CoolTrainerFReject[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokemaniacAccept[];
@@ -1672,28 +1673,28 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerMon2Ask[]
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_KindlerReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon1[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperMon2Ask[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperAccept[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_CamperReject[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerIntro[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PicnickerReject[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicMReject[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFIntro[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PsychicFReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon1[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SchoolKidFReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PkmnBreederFIntro[];
@@ -1705,27 +1706,27 @@ extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_PokefanFReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFIntro[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerFReject[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMMon2Ask[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteMReject[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro[]; 
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFIntro[];
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon1[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFAccept[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmingTriathleteFReject[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMIntro[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon1[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMMon2Ask[];
 extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMAccept[];
-extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[]; 
+extern const u8 BattleFrontier_BattleTowerMultiPartnerRoom_Text_SwimmerMReject[];
 
 // Battle Dome.
 extern const u8 BattleDome_Text_Potential1[];
diff --git a/include/trainer_hill.h b/include/trainer_hill.h
index acf8facca..647ba9647 100644
--- a/include/trainer_hill.h
+++ b/include/trainer_hill.h
@@ -23,19 +23,19 @@ struct TrHillRoomTrainers
 
 struct TrHillDisplay
 {
-    // Metatile data. Add 0x200 to the values in this array to get metatiles. 
+    // Metatile data. Add 0x200 to the values in this array to get metatiles.
     // This data then overwrites the metatiles in the map starting at (0,5)
-    u8 metatileData[0x100]; 
-    // Collision data. One bit for each tile in column-major order, 
+    u8 metatileData[0x100];
+    // Collision data. One bit for each tile in column-major order,
     // so every array entry is one row. 1 = impassable, 0 = passable
     u16 collisionData[16];
     // Trainer coordinates, starting at (0,6). Format is 0bYYYYXXXX.
     u8 coords[2];
-    // Trainer facing directions. Same as (DIR_* - 1). 
+    // Trainer facing directions. Same as (DIR_* - 1).
     // Effectively an array of nibbles, one for each trainer.
     u8 direction;
     // Trainer sight ranges. Effectively an array of nibbles, one for each trainer.
-    u8 range; 
+    u8 range;
 };
 
 struct TrHillFloor
diff --git a/include/walda_phrase.h b/include/walda_phrase.h
index 3d7701123..1cfd8af48 100644
--- a/include/walda_phrase.h
+++ b/include/walda_phrase.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_WALDA_PHRASE_H
 #define GUARD_WALDA_PHRASE_H
 
+#define WALDA_PHRASE_LENGTH 15
+
 u16 TryBufferWaldaPhrase(void);
 void DoWaldaNamingScreen(void);
 u16 TryGetWallpaperWithWaldaPhrase(void);
diff --git a/sound/cry_tables.inc b/sound/cry_tables.inc
index 3eb3731a8..bceb1ccb4 100644
--- a/sound/cry_tables.inc
+++ b/sound/cry_tables.inc
@@ -1,781 +1,781 @@
 	.align 2
-gCryTable:: @ 869DCF4
-	cry Cry_Bulbasaur  @ 869DCF4
-	cry Cry_Ivysaur  @ 869DD00
-	cry Cry_Venusaur  @ 869DD0C
-	cry Cry_Charmander  @ 869DD18
-	cry Cry_Charmeleon  @ 869DD24
-	cry Cry_Charizard  @ 869DD30
-	cry Cry_Squirtle  @ 869DD3C
-	cry Cry_Wartortle  @ 869DD48
-	cry Cry_Blastoise  @ 869DD54
-	cry Cry_Caterpie  @ 869DD60
-	cry Cry_Metapod  @ 869DD6C
-	cry Cry_Butterfree  @ 869DD78
-	cry Cry_Weedle  @ 869DD84
-	cry Cry_Kakuna  @ 869DD90
-	cry Cry_Beedrill  @ 869DD9C
-	cry Cry_Pidgey  @ 869DDA8
-	cry Cry_Pidgeotto  @ 869DDB4
-	cry Cry_Pidgeot  @ 869DDC0
-	cry Cry_Rattata  @ 869DDCC
-	cry Cry_Raticate  @ 869DDD8
-	cry Cry_Spearow  @ 869DDE4
-	cry Cry_Fearow  @ 869DDF0
-	cry Cry_Ekans  @ 869DDFC
-	cry Cry_Arbok  @ 869DE08
-	cry Cry_Pikachu  @ 869DE14
-	cry Cry_Raichu  @ 869DE20
-	cry Cry_Sandshrew  @ 869DE2C
-	cry Cry_Sandslash  @ 869DE38
-	cry Cry_NidoranF  @ 869DE44
-	cry Cry_Nidorina  @ 869DE50
-	cry Cry_Nidoqueen  @ 869DE5C
-	cry Cry_NidoranM  @ 869DE68
-	cry Cry_Nidorino  @ 869DE74
-	cry Cry_Nidoking  @ 869DE80
-	cry Cry_Clefairy  @ 869DE8C
-	cry Cry_Clefable  @ 869DE98
-	cry Cry_Vulpix  @ 869DEA4
-	cry Cry_Ninetales  @ 869DEB0
-	cry Cry_Jigglypuff  @ 869DEBC
-	cry Cry_Wigglytuff  @ 869DEC8
-	cry Cry_Zubat  @ 869DED4
-	cry Cry_Golbat  @ 869DEE0
-	cry Cry_Oddish  @ 869DEEC
-	cry Cry_Gloom  @ 869DEF8
-	cry Cry_Vileplume  @ 869DF04
-	cry Cry_Paras  @ 869DF10
-	cry Cry_Parasect  @ 869DF1C
-	cry Cry_Venonat  @ 869DF28
-	cry Cry_Venomoth  @ 869DF34
-	cry Cry_Diglett  @ 869DF40
-	cry Cry_Dugtrio  @ 869DF4C
-	cry Cry_Meowth  @ 869DF58
-	cry Cry_Persian  @ 869DF64
-	cry Cry_Psyduck  @ 869DF70
-	cry Cry_Golduck  @ 869DF7C
-	cry Cry_Mankey  @ 869DF88
-	cry Cry_Primeape  @ 869DF94
-	cry Cry_Growlithe  @ 869DFA0
-	cry Cry_Arcanine  @ 869DFAC
-	cry Cry_Poliwag  @ 869DFB8
-	cry Cry_Poliwhirl  @ 869DFC4
-	cry Cry_Poliwrath  @ 869DFD0
-	cry Cry_Abra  @ 869DFDC
-	cry Cry_Kadabra  @ 869DFE8
-	cry Cry_Alakazam  @ 869DFF4
-	cry Cry_Machop  @ 869E000
-	cry Cry_Machoke  @ 869E00C
-	cry Cry_Machamp  @ 869E018
-	cry Cry_Bellsprout  @ 869E024
-	cry Cry_Weepinbell  @ 869E030
-	cry Cry_Victreebel  @ 869E03C
-	cry Cry_Tentacool  @ 869E048
-	cry Cry_Tentacruel  @ 869E054
-	cry Cry_Geodude  @ 869E060
-	cry Cry_Graveler  @ 869E06C
-	cry Cry_Golem  @ 869E078
-	cry Cry_Ponyta  @ 869E084
-	cry Cry_Rapidash  @ 869E090
-	cry Cry_Slowpoke  @ 869E09C
-	cry Cry_Slowbro  @ 869E0A8
-	cry Cry_Magnemite  @ 869E0B4
-	cry Cry_Magneton  @ 869E0C0
-	cry Cry_Farfetchd  @ 869E0CC
-	cry Cry_Doduo  @ 869E0D8
-	cry Cry_Dodrio  @ 869E0E4
-	cry Cry_Seel  @ 869E0F0
-	cry Cry_Dewgong  @ 869E0FC
-	cry Cry_Grimer  @ 869E108
-	cry Cry_Muk  @ 869E114
-	cry Cry_Shellder  @ 869E120
-	cry Cry_Cloyster  @ 869E12C
-	cry Cry_Gastly  @ 869E138
-	cry Cry_Haunter  @ 869E144
-	cry Cry_Gengar  @ 869E150
-	cry Cry_Onix  @ 869E15C
-	cry Cry_Drowzee  @ 869E168
-	cry Cry_Hypno  @ 869E174
-	cry Cry_Krabby  @ 869E180
-	cry Cry_Kingler  @ 869E18C
-	cry Cry_Voltorb  @ 869E198
-	cry Cry_Electrode  @ 869E1A4
-	cry Cry_Exeggcute  @ 869E1B0
-	cry Cry_Exeggutor  @ 869E1BC
-	cry Cry_Cubone  @ 869E1C8
-	cry Cry_Marowak  @ 869E1D4
-	cry Cry_Hitmonlee  @ 869E1E0
-	cry Cry_Hitmonchan  @ 869E1EC
-	cry Cry_Lickitung  @ 869E1F8
-	cry Cry_Koffing  @ 869E204
-	cry Cry_Weezing  @ 869E210
-	cry Cry_Rhyhorn  @ 869E21C
-	cry Cry_Rhydon  @ 869E228
-	cry Cry_Chansey  @ 869E234
-	cry Cry_Tangela  @ 869E240
-	cry Cry_Kangaskhan  @ 869E24C
-	cry Cry_Horsea  @ 869E258
-	cry Cry_Seadra  @ 869E264
-	cry Cry_Goldeen  @ 869E270
-	cry Cry_Seaking  @ 869E27C
-	cry Cry_Staryu  @ 869E288
-	cry Cry_Starmie  @ 869E294
-	cry Cry_MrMime  @ 869E2A0
-	cry Cry_Scyther  @ 869E2AC
-	cry Cry_Jynx  @ 869E2B8
-	cry Cry_Electabuzz  @ 869E2C4
-	cry Cry_Magmar  @ 869E2D0
-	cry Cry_Pinsir  @ 869E2DC
-	cry Cry_Tauros  @ 869E2E8
-	cry Cry_Magikarp  @ 869E2F4
-	cry Cry_Gyarados  @ 869E300
-	cry Cry_Lapras  @ 869E30C
-	cry Cry_Ditto  @ 869E318
-	cry Cry_Eevee  @ 869E324
-	cry Cry_Vaporeon  @ 869E330
-	cry Cry_Jolteon  @ 869E33C
-	cry Cry_Flareon  @ 869E348
-	cry Cry_Porygon  @ 869E354
-	cry Cry_Omanyte  @ 869E360
-	cry Cry_Omastar  @ 869E36C
-	cry Cry_Kabuto  @ 869E378
-	cry Cry_Kabutops  @ 869E384
-	cry Cry_Aerodactyl  @ 869E390
-	cry Cry_Snorlax  @ 869E39C
-	cry Cry_Articuno  @ 869E3A8
-	cry Cry_Zapdos  @ 869E3B4
-	cry Cry_Moltres  @ 869E3C0
-	cry Cry_Dratini  @ 869E3CC
-	cry Cry_Dragonair  @ 869E3D8
-	cry Cry_Dragonite  @ 869E3E4
-	cry Cry_Mewtwo  @ 869E3F0
-	cry Cry_Mew  @ 869E3FC
-	cry Cry_Chikorita  @ 869E408
-	cry Cry_Bayleef  @ 869E414
-	cry Cry_Meganium  @ 869E420
-	cry Cry_Cyndaquil  @ 869E42C
-	cry Cry_Quilava  @ 869E438
-	cry Cry_Typhlosion  @ 869E444
-	cry Cry_Totodile  @ 869E450
-	cry Cry_Croconaw  @ 869E45C
-	cry Cry_Feraligatr  @ 869E468
-	cry Cry_Sentret  @ 869E474
-	cry Cry_Furret  @ 869E480
-	cry Cry_Hoothoot  @ 869E48C
-	cry Cry_Noctowl  @ 869E498
-	cry Cry_Ledyba  @ 869E4A4
-	cry Cry_Ledian  @ 869E4B0
-	cry Cry_Spinarak  @ 869E4BC
-	cry Cry_Ariados  @ 869E4C8
-	cry Cry_Crobat  @ 869E4D4
-	cry Cry_Chinchou  @ 869E4E0
-	cry Cry_Lanturn  @ 869E4EC
-	cry Cry_Pichu  @ 869E4F8
-	cry Cry_Cleffa  @ 869E504
-	cry Cry_Igglybuff  @ 869E510
-	cry Cry_Togepi  @ 869E51C
-	cry Cry_Togetic  @ 869E528
-	cry Cry_Natu  @ 869E534
-	cry Cry_Xatu  @ 869E540
-	cry Cry_Mareep  @ 869E54C
-	cry Cry_Flaaffy  @ 869E558
-	cry Cry_Ampharos  @ 869E564
-	cry Cry_Bellossom  @ 869E570
-	cry Cry_Marill  @ 869E57C
-	cry Cry_Azumarill  @ 869E588
-	cry Cry_Sudowoodo  @ 869E594
-	cry Cry_Politoed  @ 869E5A0
-	cry Cry_Hoppip  @ 869E5AC
-	cry Cry_Skiploom  @ 869E5B8
-	cry Cry_Jumpluff  @ 869E5C4
-	cry Cry_Aipom  @ 869E5D0
-	cry Cry_Sunkern  @ 869E5DC
-	cry Cry_Sunflora  @ 869E5E8
-	cry Cry_Yanma  @ 869E5F4
-	cry Cry_Wooper  @ 869E600
-	cry Cry_Quagsire  @ 869E60C
-	cry Cry_Espeon  @ 869E618
-	cry Cry_Umbreon  @ 869E624
-	cry Cry_Murkrow  @ 869E630
-	cry Cry_Slowking  @ 869E63C
-	cry Cry_Misdreavus  @ 869E648
-	cry Cry_Unown  @ 869E654
-	cry Cry_Wobbuffet  @ 869E660
-	cry Cry_Girafarig  @ 869E66C
-	cry Cry_Pineco  @ 869E678
-	cry Cry_Forretress  @ 869E684
-	cry Cry_Dunsparce  @ 869E690
-	cry Cry_Gligar  @ 869E69C
-	cry Cry_Steelix  @ 869E6A8
-	cry Cry_Snubbull  @ 869E6B4
-	cry Cry_Granbull  @ 869E6C0
-	cry Cry_Qwilfish  @ 869E6CC
-	cry Cry_Scizor  @ 869E6D8
-	cry Cry_Shuckle  @ 869E6E4
-	cry Cry_Heracross  @ 869E6F0
-	cry Cry_Sneasel  @ 869E6FC
-	cry Cry_Teddiursa  @ 869E708
-	cry Cry_Ursaring  @ 869E714
-	cry Cry_Slugma  @ 869E720
-	cry Cry_Magcargo  @ 869E72C
-	cry Cry_Swinub  @ 869E738
-	cry Cry_Piloswine  @ 869E744
-	cry Cry_Corsola  @ 869E750
-	cry Cry_Remoraid  @ 869E75C
-	cry Cry_Octillery  @ 869E768
-	cry Cry_Delibird  @ 869E774
-	cry Cry_Mantine  @ 869E780
-	cry Cry_Skarmory  @ 869E78C
-	cry Cry_Houndour  @ 869E798
-	cry Cry_Houndoom  @ 869E7A4
-	cry Cry_Kingdra  @ 869E7B0
-	cry Cry_Phanpy  @ 869E7BC
-	cry Cry_Donphan  @ 869E7C8
-	cry Cry_Porygon2  @ 869E7D4
-	cry Cry_Stantler  @ 869E7E0
-	cry Cry_Smeargle  @ 869E7EC
-	cry Cry_Tyrogue  @ 869E7F8
-	cry Cry_Hitmontop  @ 869E804
-	cry Cry_Smoochum  @ 869E810
-	cry Cry_Elekid  @ 869E81C
-	cry Cry_Magby  @ 869E828
-	cry Cry_Miltank  @ 869E834
-	cry Cry_Blissey  @ 869E840
-	cry Cry_Raikou  @ 869E84C
-	cry Cry_Entei  @ 869E858
-	cry Cry_Suicune  @ 869E864
-	cry Cry_Larvitar  @ 869E870
-	cry Cry_Pupitar  @ 869E87C
-	cry Cry_Tyranitar  @ 869E888
-	cry Cry_Lugia  @ 869E894
-	cry Cry_HoOh  @ 869E8A0
-	cry Cry_Celebi  @ 869E8AC
-	cry Cry_Kecleon  @ 869E8B8
-	cry Cry_Roselia  @ 869E8C4
-	cry Cry_Torkoal  @ 869E8D0
-	cry Cry_Electrike  @ 869E8DC
-	cry Cry_Manectric  @ 869E8E8
-	cry Cry_Duskull  @ 869E8F4
-	cry Cry_Latias  @ 869E900
-	cry Cry_Wynaut  @ 869E90C
-	cry Cry_Seviper  @ 869E918
-	cry Cry_Sharpedo  @ 869E924
-	cry Cry_Zangoose  @ 869E930
-	cry Cry_Azurill  @ 869E93C
-	cry Cry_Swablu  @ 869E948
-	cry Cry_Altaria  @ 869E954
-	cry Cry_Unused265  @ 869E960
-	cry Cry_Taillow  @ 869E96C
-	cry Cry_Swellow  @ 869E978
-	cry Cry_Unused268  @ 869E984
-	cry Cry_Spinda  @ 869E990
-	cry Cry_Torchic  @ 869E99C
-	cry Cry_Combusken  @ 869E9A8
-	cry Cry_Blaziken  @ 869E9B4
-	cry Cry_Treecko  @ 869E9C0
-	cry Cry_Grovyle  @ 869E9CC
-	cry Cry_Sceptile  @ 869E9D8
-	cry Cry_Mudkip  @ 869E9E4
-	cry Cry_Marshtomp  @ 869E9F0
-	cry Cry_Swampert  @ 869E9FC
-	cry Cry_Pelipper  @ 869EA08
-	cry Cry_Wingull  @ 869EA14
-	cry Cry_Banette  @ 869EA20
-	cry Cry_Shuppet  @ 869EA2C
-	cry Cry_Lotad  @ 869EA38
-	cry Cry_Lombre  @ 869EA44
-	cry Cry_Ludicolo  @ 869EA50
-	cry Cry_Seedot  @ 869EA5C
-	cry Cry_Nuzleaf  @ 869EA68
-	cry Cry_Shiftry  @ 869EA74
-	cry Cry_Carvanha  @ 869EA80
-	cry Cry_Wurmple  @ 869EA8C
-	cry Cry_Silcoon  @ 869EA98
-	cry Cry_Beautifly  @ 869EAA4
-	cry Cry_Cascoon  @ 869EAB0
-	cry Cry_Dustox  @ 869EABC
-	cry Cry_Ralts  @ 869EAC8
-	cry Cry_Kirlia  @ 869EAD4
-	cry Cry_Gardevoir  @ 869EAE0
-	cry Cry_Slakoth  @ 869EAEC
-	cry Cry_Vigoroth  @ 869EAF8
-	cry Cry_Slaking  @ 869EB04
-	cry Cry_Nincada  @ 869EB10
-	cry Cry_Ninjask  @ 869EB1C
-	cry Cry_Shedinja  @ 869EB28
-	cry Cry_Makuhita  @ 869EB34
-	cry Cry_Hariyama  @ 869EB40
-	cry Cry_Nosepass  @ 869EB4C
-	cry Cry_Glalie  @ 869EB58
-	cry Cry_Plusle  @ 869EB64
-	cry Cry_Minun  @ 869EB70
-	cry Cry_Surskit  @ 869EB7C
-	cry Cry_Masquerain  @ 869EB88
-	cry Cry_Skitty  @ 869EB94
-	cry Cry_Delcatty  @ 869EBA0
-	cry Cry_Gulpin  @ 869EBAC
-	cry Cry_Swalot  @ 869EBB8
-	cry Cry_Numel  @ 869EBC4
-	cry Cry_Camerupt  @ 869EBD0
-	cry Cry_Barboach  @ 869EBDC
-	cry Cry_Whiscash  @ 869EBE8
-	cry Cry_Corphish  @ 869EBF4
-	cry Cry_Crawdaunt  @ 869EC00
-	cry Cry_Spoink  @ 869EC0C
-	cry Cry_Grumpig  @ 869EC18
-	cry Cry_Trapinch  @ 869EC24
-	cry Cry_Vibrava  @ 869EC30
-	cry Cry_Flygon  @ 869EC3C
-	cry Cry_Cacnea  @ 869EC48
-	cry Cry_Cacturne  @ 869EC54
-	cry Cry_Baltoy  @ 869EC60
-	cry Cry_Claydol  @ 869EC6C
-	cry Cry_Lunatone  @ 869EC78
-	cry Cry_Solrock  @ 869EC84
-	cry Cry_Feebas  @ 869EC90
-	cry Cry_Milotic  @ 869EC9C
-	cry Cry_Absol  @ 869ECA8
-	cry Cry_Meditite  @ 869ECB4
-	cry Cry_Medicham  @ 869ECC0
-	cry Cry_Spheal  @ 869ECCC
-	cry Cry_Sealeo  @ 869ECD8
-	cry Cry_Walrein  @ 869ECE4
-	cry Cry_Clamperl  @ 869ECF0
-	cry Cry_Huntail  @ 869ECFC
-	cry Cry_Gorebyss  @ 869ED08
-	cry Cry_Lileep  @ 869ED14
-	cry Cry_Cradily  @ 869ED20
-	cry Cry_Anorith  @ 869ED2C
-	cry Cry_Armaldo  @ 869ED38
-	cry Cry_Beldum  @ 869ED44
-	cry Cry_Metang  @ 869ED50
-	cry Cry_Metagross  @ 869ED5C
-	cry Cry_Bagon  @ 869ED68
-	cry Cry_Shelgon  @ 869ED74
-	cry Cry_Regirock  @ 869ED80
-	cry Cry_Regice  @ 869ED8C
-	cry Cry_Registeel  @ 869ED98
-	cry Cry_Castform  @ 869EDA4
-	cry Cry_Volbeat  @ 869EDB0
-	cry Cry_Illumise  @ 869EDBC
-	cry Cry_Poochyena  @ 869EDC8
-	cry Cry_Mightyena  @ 869EDD4
-	cry Cry_Dusclops  @ 869EDE0
-	cry Cry_Sableye  @ 869EDEC
-	cry Cry_Mawile  @ 869EDF8
-	cry Cry_Aron  @ 869EE04
-	cry Cry_Lairon  @ 869EE10
-	cry Cry_Aggron  @ 869EE1C
-	cry Cry_Relicanth  @ 869EE28
-	cry Cry_Luvdisc  @ 869EE34
-	cry Cry_Groudon  @ 869EE40
-	cry Cry_Kyogre  @ 869EE4C
-	cry Cry_Rayquaza  @ 869EE58
-	cry Cry_Salamence  @ 869EE64
-	cry Cry_Breloom  @ 869EE70
-	cry Cry_Shroomish  @ 869EE7C
-	cry Cry_Linoone  @ 869EE88
-	cry Cry_Tropius  @ 869EE94
-	cry Cry_Wailmer  @ 869EEA0
-	cry Cry_Zigzagoon  @ 869EEAC
-	cry Cry_Exploud  @ 869EEB8
-	cry Cry_Loudred  @ 869EEC4
-	cry Cry_Wailord  @ 869EED0
-	cry Cry_Whismur  @ 869EEDC
-	cry Cry_Snorunt  @ 869EEE8
-	cry Cry_Latios  @ 869EEF4
-	cry Cry_Jirachi  @ 869EF00
-	cry Cry_Deoxys  @ 869EF0C
-	cry Cry_Chimecho  @ 869EF18
+gCryTable::
+	cry Cry_Bulbasaur
+	cry Cry_Ivysaur
+	cry Cry_Venusaur
+	cry Cry_Charmander
+	cry Cry_Charmeleon
+	cry Cry_Charizard
+	cry Cry_Squirtle
+	cry Cry_Wartortle
+	cry Cry_Blastoise
+	cry Cry_Caterpie
+	cry Cry_Metapod
+	cry Cry_Butterfree
+	cry Cry_Weedle
+	cry Cry_Kakuna
+	cry Cry_Beedrill
+	cry Cry_Pidgey
+	cry Cry_Pidgeotto
+	cry Cry_Pidgeot
+	cry Cry_Rattata
+	cry Cry_Raticate
+	cry Cry_Spearow
+	cry Cry_Fearow
+	cry Cry_Ekans
+	cry Cry_Arbok
+	cry Cry_Pikachu
+	cry Cry_Raichu
+	cry Cry_Sandshrew
+	cry Cry_Sandslash
+	cry Cry_NidoranF
+	cry Cry_Nidorina
+	cry Cry_Nidoqueen
+	cry Cry_NidoranM
+	cry Cry_Nidorino
+	cry Cry_Nidoking
+	cry Cry_Clefairy
+	cry Cry_Clefable
+	cry Cry_Vulpix
+	cry Cry_Ninetales
+	cry Cry_Jigglypuff
+	cry Cry_Wigglytuff
+	cry Cry_Zubat
+	cry Cry_Golbat
+	cry Cry_Oddish
+	cry Cry_Gloom
+	cry Cry_Vileplume
+	cry Cry_Paras
+	cry Cry_Parasect
+	cry Cry_Venonat
+	cry Cry_Venomoth
+	cry Cry_Diglett
+	cry Cry_Dugtrio
+	cry Cry_Meowth
+	cry Cry_Persian
+	cry Cry_Psyduck
+	cry Cry_Golduck
+	cry Cry_Mankey
+	cry Cry_Primeape
+	cry Cry_Growlithe
+	cry Cry_Arcanine
+	cry Cry_Poliwag
+	cry Cry_Poliwhirl
+	cry Cry_Poliwrath
+	cry Cry_Abra
+	cry Cry_Kadabra
+	cry Cry_Alakazam
+	cry Cry_Machop
+	cry Cry_Machoke
+	cry Cry_Machamp
+	cry Cry_Bellsprout
+	cry Cry_Weepinbell
+	cry Cry_Victreebel
+	cry Cry_Tentacool
+	cry Cry_Tentacruel
+	cry Cry_Geodude
+	cry Cry_Graveler
+	cry Cry_Golem
+	cry Cry_Ponyta
+	cry Cry_Rapidash
+	cry Cry_Slowpoke
+	cry Cry_Slowbro
+	cry Cry_Magnemite
+	cry Cry_Magneton
+	cry Cry_Farfetchd
+	cry Cry_Doduo
+	cry Cry_Dodrio
+	cry Cry_Seel
+	cry Cry_Dewgong
+	cry Cry_Grimer
+	cry Cry_Muk
+	cry Cry_Shellder
+	cry Cry_Cloyster
+	cry Cry_Gastly
+	cry Cry_Haunter
+	cry Cry_Gengar
+	cry Cry_Onix
+	cry Cry_Drowzee
+	cry Cry_Hypno
+	cry Cry_Krabby
+	cry Cry_Kingler
+	cry Cry_Voltorb
+	cry Cry_Electrode
+	cry Cry_Exeggcute
+	cry Cry_Exeggutor
+	cry Cry_Cubone
+	cry Cry_Marowak
+	cry Cry_Hitmonlee
+	cry Cry_Hitmonchan
+	cry Cry_Lickitung
+	cry Cry_Koffing
+	cry Cry_Weezing
+	cry Cry_Rhyhorn
+	cry Cry_Rhydon
+	cry Cry_Chansey
+	cry Cry_Tangela
+	cry Cry_Kangaskhan
+	cry Cry_Horsea
+	cry Cry_Seadra
+	cry Cry_Goldeen
+	cry Cry_Seaking
+	cry Cry_Staryu
+	cry Cry_Starmie
+	cry Cry_MrMime
+	cry Cry_Scyther
+	cry Cry_Jynx
+	cry Cry_Electabuzz
+	cry Cry_Magmar
+	cry Cry_Pinsir
+	cry Cry_Tauros
+	cry Cry_Magikarp
+	cry Cry_Gyarados
+	cry Cry_Lapras
+	cry Cry_Ditto
+	cry Cry_Eevee
+	cry Cry_Vaporeon
+	cry Cry_Jolteon
+	cry Cry_Flareon
+	cry Cry_Porygon
+	cry Cry_Omanyte
+	cry Cry_Omastar
+	cry Cry_Kabuto
+	cry Cry_Kabutops
+	cry Cry_Aerodactyl
+	cry Cry_Snorlax
+	cry Cry_Articuno
+	cry Cry_Zapdos
+	cry Cry_Moltres
+	cry Cry_Dratini
+	cry Cry_Dragonair
+	cry Cry_Dragonite
+	cry Cry_Mewtwo
+	cry Cry_Mew
+	cry Cry_Chikorita
+	cry Cry_Bayleef
+	cry Cry_Meganium
+	cry Cry_Cyndaquil
+	cry Cry_Quilava
+	cry Cry_Typhlosion
+	cry Cry_Totodile
+	cry Cry_Croconaw
+	cry Cry_Feraligatr
+	cry Cry_Sentret
+	cry Cry_Furret
+	cry Cry_Hoothoot
+	cry Cry_Noctowl
+	cry Cry_Ledyba
+	cry Cry_Ledian
+	cry Cry_Spinarak
+	cry Cry_Ariados
+	cry Cry_Crobat
+	cry Cry_Chinchou
+	cry Cry_Lanturn
+	cry Cry_Pichu
+	cry Cry_Cleffa
+	cry Cry_Igglybuff
+	cry Cry_Togepi
+	cry Cry_Togetic
+	cry Cry_Natu
+	cry Cry_Xatu
+	cry Cry_Mareep
+	cry Cry_Flaaffy
+	cry Cry_Ampharos
+	cry Cry_Bellossom
+	cry Cry_Marill
+	cry Cry_Azumarill
+	cry Cry_Sudowoodo
+	cry Cry_Politoed
+	cry Cry_Hoppip
+	cry Cry_Skiploom
+	cry Cry_Jumpluff
+	cry Cry_Aipom
+	cry Cry_Sunkern
+	cry Cry_Sunflora
+	cry Cry_Yanma
+	cry Cry_Wooper
+	cry Cry_Quagsire
+	cry Cry_Espeon
+	cry Cry_Umbreon
+	cry Cry_Murkrow
+	cry Cry_Slowking
+	cry Cry_Misdreavus
+	cry Cry_Unown
+	cry Cry_Wobbuffet
+	cry Cry_Girafarig
+	cry Cry_Pineco
+	cry Cry_Forretress
+	cry Cry_Dunsparce
+	cry Cry_Gligar
+	cry Cry_Steelix
+	cry Cry_Snubbull
+	cry Cry_Granbull
+	cry Cry_Qwilfish
+	cry Cry_Scizor
+	cry Cry_Shuckle
+	cry Cry_Heracross
+	cry Cry_Sneasel
+	cry Cry_Teddiursa
+	cry Cry_Ursaring
+	cry Cry_Slugma
+	cry Cry_Magcargo
+	cry Cry_Swinub
+	cry Cry_Piloswine
+	cry Cry_Corsola
+	cry Cry_Remoraid
+	cry Cry_Octillery
+	cry Cry_Delibird
+	cry Cry_Mantine
+	cry Cry_Skarmory
+	cry Cry_Houndour
+	cry Cry_Houndoom
+	cry Cry_Kingdra
+	cry Cry_Phanpy
+	cry Cry_Donphan
+	cry Cry_Porygon2
+	cry Cry_Stantler
+	cry Cry_Smeargle
+	cry Cry_Tyrogue
+	cry Cry_Hitmontop
+	cry Cry_Smoochum
+	cry Cry_Elekid
+	cry Cry_Magby
+	cry Cry_Miltank
+	cry Cry_Blissey
+	cry Cry_Raikou
+	cry Cry_Entei
+	cry Cry_Suicune
+	cry Cry_Larvitar
+	cry Cry_Pupitar
+	cry Cry_Tyranitar
+	cry Cry_Lugia
+	cry Cry_HoOh
+	cry Cry_Celebi
+	cry Cry_Kecleon
+	cry Cry_Roselia
+	cry Cry_Torkoal
+	cry Cry_Electrike
+	cry Cry_Manectric
+	cry Cry_Duskull
+	cry Cry_Latias
+	cry Cry_Wynaut
+	cry Cry_Seviper
+	cry Cry_Sharpedo
+	cry Cry_Zangoose
+	cry Cry_Azurill
+	cry Cry_Swablu
+	cry Cry_Altaria
+	cry Cry_Unused265
+	cry Cry_Taillow
+	cry Cry_Swellow
+	cry Cry_Unused268
+	cry Cry_Spinda
+	cry Cry_Torchic
+	cry Cry_Combusken
+	cry Cry_Blaziken
+	cry Cry_Treecko
+	cry Cry_Grovyle
+	cry Cry_Sceptile
+	cry Cry_Mudkip
+	cry Cry_Marshtomp
+	cry Cry_Swampert
+	cry Cry_Pelipper
+	cry Cry_Wingull
+	cry Cry_Banette
+	cry Cry_Shuppet
+	cry Cry_Lotad
+	cry Cry_Lombre
+	cry Cry_Ludicolo
+	cry Cry_Seedot
+	cry Cry_Nuzleaf
+	cry Cry_Shiftry
+	cry Cry_Carvanha
+	cry Cry_Wurmple
+	cry Cry_Silcoon
+	cry Cry_Beautifly
+	cry Cry_Cascoon
+	cry Cry_Dustox
+	cry Cry_Ralts
+	cry Cry_Kirlia
+	cry Cry_Gardevoir
+	cry Cry_Slakoth
+	cry Cry_Vigoroth
+	cry Cry_Slaking
+	cry Cry_Nincada
+	cry Cry_Ninjask
+	cry Cry_Shedinja
+	cry Cry_Makuhita
+	cry Cry_Hariyama
+	cry Cry_Nosepass
+	cry Cry_Glalie
+	cry Cry_Plusle
+	cry Cry_Minun
+	cry Cry_Surskit
+	cry Cry_Masquerain
+	cry Cry_Skitty
+	cry Cry_Delcatty
+	cry Cry_Gulpin
+	cry Cry_Swalot
+	cry Cry_Numel
+	cry Cry_Camerupt
+	cry Cry_Barboach
+	cry Cry_Whiscash
+	cry Cry_Corphish
+	cry Cry_Crawdaunt
+	cry Cry_Spoink
+	cry Cry_Grumpig
+	cry Cry_Trapinch
+	cry Cry_Vibrava
+	cry Cry_Flygon
+	cry Cry_Cacnea
+	cry Cry_Cacturne
+	cry Cry_Baltoy
+	cry Cry_Claydol
+	cry Cry_Lunatone
+	cry Cry_Solrock
+	cry Cry_Feebas
+	cry Cry_Milotic
+	cry Cry_Absol
+	cry Cry_Meditite
+	cry Cry_Medicham
+	cry Cry_Spheal
+	cry Cry_Sealeo
+	cry Cry_Walrein
+	cry Cry_Clamperl
+	cry Cry_Huntail
+	cry Cry_Gorebyss
+	cry Cry_Lileep
+	cry Cry_Cradily
+	cry Cry_Anorith
+	cry Cry_Armaldo
+	cry Cry_Beldum
+	cry Cry_Metang
+	cry Cry_Metagross
+	cry Cry_Bagon
+	cry Cry_Shelgon
+	cry Cry_Regirock
+	cry Cry_Regice
+	cry Cry_Registeel
+	cry Cry_Castform
+	cry Cry_Volbeat
+	cry Cry_Illumise
+	cry Cry_Poochyena
+	cry Cry_Mightyena
+	cry Cry_Dusclops
+	cry Cry_Sableye
+	cry Cry_Mawile
+	cry Cry_Aron
+	cry Cry_Lairon
+	cry Cry_Aggron
+	cry Cry_Relicanth
+	cry Cry_Luvdisc
+	cry Cry_Groudon
+	cry Cry_Kyogre
+	cry Cry_Rayquaza
+	cry Cry_Salamence
+	cry Cry_Breloom
+	cry Cry_Shroomish
+	cry Cry_Linoone
+	cry Cry_Tropius
+	cry Cry_Wailmer
+	cry Cry_Zigzagoon
+	cry Cry_Exploud
+	cry Cry_Loudred
+	cry Cry_Wailord
+	cry Cry_Whismur
+	cry Cry_Snorunt
+	cry Cry_Latios
+	cry Cry_Jirachi
+	cry Cry_Deoxys
+	cry Cry_Chimecho
 
 	.align 2
-gCryTable2:: @ 869EF24
-	cry2 Cry_Bulbasaur  @ 869EF24
-	cry2 Cry_Ivysaur  @ 869EF30
-	cry2 Cry_Venusaur  @ 869EF3C
-	cry2 Cry_Charmander  @ 869EF48
-	cry2 Cry_Charmeleon  @ 869EF54
-	cry2 Cry_Charizard  @ 869EF60
-	cry2 Cry_Squirtle  @ 869EF6C
-	cry2 Cry_Wartortle  @ 869EF78
-	cry2 Cry_Blastoise  @ 869EF84
-	cry2 Cry_Caterpie  @ 869EF90
-	cry2 Cry_Metapod  @ 869EF9C
-	cry2 Cry_Butterfree  @ 869EFA8
-	cry2 Cry_Weedle  @ 869EFB4
-	cry2 Cry_Kakuna  @ 869EFC0
-	cry2 Cry_Beedrill  @ 869EFCC
-	cry2 Cry_Pidgey  @ 869EFD8
-	cry2 Cry_Pidgeotto  @ 869EFE4
-	cry2 Cry_Pidgeot  @ 869EFF0
-	cry2 Cry_Rattata  @ 869EFFC
-	cry2 Cry_Raticate  @ 869F008
-	cry2 Cry_Spearow  @ 869F014
-	cry2 Cry_Fearow  @ 869F020
-	cry2 Cry_Ekans  @ 869F02C
-	cry2 Cry_Arbok  @ 869F038
-	cry2 Cry_Pikachu  @ 869F044
-	cry2 Cry_Raichu  @ 869F050
-	cry2 Cry_Sandshrew  @ 869F05C
-	cry2 Cry_Sandslash  @ 869F068
-	cry2 Cry_NidoranF  @ 869F074
-	cry2 Cry_Nidorina  @ 869F080
-	cry2 Cry_Nidoqueen  @ 869F08C
-	cry2 Cry_NidoranM  @ 869F098
-	cry2 Cry_Nidorino  @ 869F0A4
-	cry2 Cry_Nidoking  @ 869F0B0
-	cry2 Cry_Clefairy  @ 869F0BC
-	cry2 Cry_Clefable  @ 869F0C8
-	cry2 Cry_Vulpix  @ 869F0D4
-	cry2 Cry_Ninetales  @ 869F0E0
-	cry2 Cry_Jigglypuff  @ 869F0EC
-	cry2 Cry_Wigglytuff  @ 869F0F8
-	cry2 Cry_Zubat  @ 869F104
-	cry2 Cry_Golbat  @ 869F110
-	cry2 Cry_Oddish  @ 869F11C
-	cry2 Cry_Gloom  @ 869F128
-	cry2 Cry_Vileplume  @ 869F134
-	cry2 Cry_Paras  @ 869F140
-	cry2 Cry_Parasect  @ 869F14C
-	cry2 Cry_Venonat  @ 869F158
-	cry2 Cry_Venomoth  @ 869F164
-	cry2 Cry_Diglett  @ 869F170
-	cry2 Cry_Dugtrio  @ 869F17C
-	cry2 Cry_Meowth  @ 869F188
-	cry2 Cry_Persian  @ 869F194
-	cry2 Cry_Psyduck  @ 869F1A0
-	cry2 Cry_Golduck  @ 869F1AC
-	cry2 Cry_Mankey  @ 869F1B8
-	cry2 Cry_Primeape  @ 869F1C4
-	cry2 Cry_Growlithe  @ 869F1D0
-	cry2 Cry_Arcanine  @ 869F1DC
-	cry2 Cry_Poliwag  @ 869F1E8
-	cry2 Cry_Poliwhirl  @ 869F1F4
-	cry2 Cry_Poliwrath  @ 869F200
-	cry2 Cry_Abra  @ 869F20C
-	cry2 Cry_Kadabra  @ 869F218
-	cry2 Cry_Alakazam  @ 869F224
-	cry2 Cry_Machop  @ 869F230
-	cry2 Cry_Machoke  @ 869F23C
-	cry2 Cry_Machamp  @ 869F248
-	cry2 Cry_Bellsprout  @ 869F254
-	cry2 Cry_Weepinbell  @ 869F260
-	cry2 Cry_Victreebel  @ 869F26C
-	cry2 Cry_Tentacool  @ 869F278
-	cry2 Cry_Tentacruel  @ 869F284
-	cry2 Cry_Geodude  @ 869F290
-	cry2 Cry_Graveler  @ 869F29C
-	cry2 Cry_Golem  @ 869F2A8
-	cry2 Cry_Ponyta  @ 869F2B4
-	cry2 Cry_Rapidash  @ 869F2C0
-	cry2 Cry_Slowpoke  @ 869F2CC
-	cry2 Cry_Slowbro  @ 869F2D8
-	cry2 Cry_Magnemite  @ 869F2E4
-	cry2 Cry_Magneton  @ 869F2F0
-	cry2 Cry_Farfetchd  @ 869F2FC
-	cry2 Cry_Doduo  @ 869F308
-	cry2 Cry_Dodrio  @ 869F314
-	cry2 Cry_Seel  @ 869F320
-	cry2 Cry_Dewgong  @ 869F32C
-	cry2 Cry_Grimer  @ 869F338
-	cry2 Cry_Muk  @ 869F344
-	cry2 Cry_Shellder  @ 869F350
-	cry2 Cry_Cloyster  @ 869F35C
-	cry2 Cry_Gastly  @ 869F368
-	cry2 Cry_Haunter  @ 869F374
-	cry2 Cry_Gengar  @ 869F380
-	cry2 Cry_Onix  @ 869F38C
-	cry2 Cry_Drowzee  @ 869F398
-	cry2 Cry_Hypno  @ 869F3A4
-	cry2 Cry_Krabby  @ 869F3B0
-	cry2 Cry_Kingler  @ 869F3BC
-	cry2 Cry_Voltorb  @ 869F3C8
-	cry2 Cry_Electrode  @ 869F3D4
-	cry2 Cry_Exeggcute  @ 869F3E0
-	cry2 Cry_Exeggutor  @ 869F3EC
-	cry2 Cry_Cubone  @ 869F3F8
-	cry2 Cry_Marowak  @ 869F404
-	cry2 Cry_Hitmonlee  @ 869F410
-	cry2 Cry_Hitmonchan  @ 869F41C
-	cry2 Cry_Lickitung  @ 869F428
-	cry2 Cry_Koffing  @ 869F434
-	cry2 Cry_Weezing  @ 869F440
-	cry2 Cry_Rhyhorn  @ 869F44C
-	cry2 Cry_Rhydon  @ 869F458
-	cry2 Cry_Chansey  @ 869F464
-	cry2 Cry_Tangela  @ 869F470
-	cry2 Cry_Kangaskhan  @ 869F47C
-	cry2 Cry_Horsea  @ 869F488
-	cry2 Cry_Seadra  @ 869F494
-	cry2 Cry_Goldeen  @ 869F4A0
-	cry2 Cry_Seaking  @ 869F4AC
-	cry2 Cry_Staryu  @ 869F4B8
-	cry2 Cry_Starmie  @ 869F4C4
-	cry2 Cry_MrMime  @ 869F4D0
-	cry2 Cry_Scyther  @ 869F4DC
-	cry2 Cry_Jynx  @ 869F4E8
-	cry2 Cry_Electabuzz  @ 869F4F4
-	cry2 Cry_Magmar  @ 869F500
-	cry2 Cry_Pinsir  @ 869F50C
-	cry2 Cry_Tauros  @ 869F518
-	cry2 Cry_Magikarp  @ 869F524
-	cry2 Cry_Gyarados  @ 869F530
-	cry2 Cry_Lapras  @ 869F53C
-	cry2 Cry_Ditto  @ 869F548
-	cry2 Cry_Eevee  @ 869F554
-	cry2 Cry_Vaporeon  @ 869F560
-	cry2 Cry_Jolteon  @ 869F56C
-	cry2 Cry_Flareon  @ 869F578
-	cry2 Cry_Porygon  @ 869F584
-	cry2 Cry_Omanyte  @ 869F590
-	cry2 Cry_Omastar  @ 869F59C
-	cry2 Cry_Kabuto  @ 869F5A8
-	cry2 Cry_Kabutops  @ 869F5B4
-	cry2 Cry_Aerodactyl  @ 869F5C0
-	cry2 Cry_Snorlax  @ 869F5CC
-	cry2 Cry_Articuno  @ 869F5D8
-	cry2 Cry_Zapdos  @ 869F5E4
-	cry2 Cry_Moltres  @ 869F5F0
-	cry2 Cry_Dratini  @ 869F5FC
-	cry2 Cry_Dragonair  @ 869F608
-	cry2 Cry_Dragonite  @ 869F614
-	cry2 Cry_Mewtwo  @ 869F620
-	cry2 Cry_Mew  @ 869F62C
-	cry2 Cry_Chikorita  @ 869F638
-	cry2 Cry_Bayleef  @ 869F644
-	cry2 Cry_Meganium  @ 869F650
-	cry2 Cry_Cyndaquil  @ 869F65C
-	cry2 Cry_Quilava  @ 869F668
-	cry2 Cry_Typhlosion  @ 869F674
-	cry2 Cry_Totodile  @ 869F680
-	cry2 Cry_Croconaw  @ 869F68C
-	cry2 Cry_Feraligatr  @ 869F698
-	cry2 Cry_Sentret  @ 869F6A4
-	cry2 Cry_Furret  @ 869F6B0
-	cry2 Cry_Hoothoot  @ 869F6BC
-	cry2 Cry_Noctowl  @ 869F6C8
-	cry2 Cry_Ledyba  @ 869F6D4
-	cry2 Cry_Ledian  @ 869F6E0
-	cry2 Cry_Spinarak  @ 869F6EC
-	cry2 Cry_Ariados  @ 869F6F8
-	cry2 Cry_Crobat  @ 869F704
-	cry2 Cry_Chinchou  @ 869F710
-	cry2 Cry_Lanturn  @ 869F71C
-	cry2 Cry_Pichu  @ 869F728
-	cry2 Cry_Cleffa  @ 869F734
-	cry2 Cry_Igglybuff  @ 869F740
-	cry2 Cry_Togepi  @ 869F74C
-	cry2 Cry_Togetic  @ 869F758
-	cry2 Cry_Natu  @ 869F764
-	cry2 Cry_Xatu  @ 869F770
-	cry2 Cry_Mareep  @ 869F77C
-	cry2 Cry_Flaaffy  @ 869F788
-	cry2 Cry_Ampharos  @ 869F794
-	cry2 Cry_Bellossom  @ 869F7A0
-	cry2 Cry_Marill  @ 869F7AC
-	cry2 Cry_Azumarill  @ 869F7B8
-	cry2 Cry_Sudowoodo  @ 869F7C4
-	cry2 Cry_Politoed  @ 869F7D0
-	cry2 Cry_Hoppip  @ 869F7DC
-	cry2 Cry_Skiploom  @ 869F7E8
-	cry2 Cry_Jumpluff  @ 869F7F4
-	cry2 Cry_Aipom  @ 869F800
-	cry2 Cry_Sunkern  @ 869F80C
-	cry2 Cry_Sunflora  @ 869F818
-	cry2 Cry_Yanma  @ 869F824
-	cry2 Cry_Wooper  @ 869F830
-	cry2 Cry_Quagsire  @ 869F83C
-	cry2 Cry_Espeon  @ 869F848
-	cry2 Cry_Umbreon  @ 869F854
-	cry2 Cry_Murkrow  @ 869F860
-	cry2 Cry_Slowking  @ 869F86C
-	cry2 Cry_Misdreavus  @ 869F878
-	cry2 Cry_Unown  @ 869F884
-	cry2 Cry_Wobbuffet  @ 869F890
-	cry2 Cry_Girafarig  @ 869F89C
-	cry2 Cry_Pineco  @ 869F8A8
-	cry2 Cry_Forretress  @ 869F8B4
-	cry2 Cry_Dunsparce  @ 869F8C0
-	cry2 Cry_Gligar  @ 869F8CC
-	cry2 Cry_Steelix  @ 869F8D8
-	cry2 Cry_Snubbull  @ 869F8E4
-	cry2 Cry_Granbull  @ 869F8F0
-	cry2 Cry_Qwilfish  @ 869F8FC
-	cry2 Cry_Scizor  @ 869F908
-	cry2 Cry_Shuckle  @ 869F914
-	cry2 Cry_Heracross  @ 869F920
-	cry2 Cry_Sneasel  @ 869F92C
-	cry2 Cry_Teddiursa  @ 869F938
-	cry2 Cry_Ursaring  @ 869F944
-	cry2 Cry_Slugma  @ 869F950
-	cry2 Cry_Magcargo  @ 869F95C
-	cry2 Cry_Swinub  @ 869F968
-	cry2 Cry_Piloswine  @ 869F974
-	cry2 Cry_Corsola  @ 869F980
-	cry2 Cry_Remoraid  @ 869F98C
-	cry2 Cry_Octillery  @ 869F998
-	cry2 Cry_Delibird  @ 869F9A4
-	cry2 Cry_Mantine  @ 869F9B0
-	cry2 Cry_Skarmory  @ 869F9BC
-	cry2 Cry_Houndour  @ 869F9C8
-	cry2 Cry_Houndoom  @ 869F9D4
-	cry2 Cry_Kingdra  @ 869F9E0
-	cry2 Cry_Phanpy  @ 869F9EC
-	cry2 Cry_Donphan  @ 869F9F8
-	cry2 Cry_Porygon2  @ 869FA04
-	cry2 Cry_Stantler  @ 869FA10
-	cry2 Cry_Smeargle  @ 869FA1C
-	cry2 Cry_Tyrogue  @ 869FA28
-	cry2 Cry_Hitmontop  @ 869FA34
-	cry2 Cry_Smoochum  @ 869FA40
-	cry2 Cry_Elekid  @ 869FA4C
-	cry2 Cry_Magby  @ 869FA58
-	cry2 Cry_Miltank  @ 869FA64
-	cry2 Cry_Blissey  @ 869FA70
-	cry2 Cry_Raikou  @ 869FA7C
-	cry2 Cry_Entei  @ 869FA88
-	cry2 Cry_Suicune  @ 869FA94
-	cry2 Cry_Larvitar  @ 869FAA0
-	cry2 Cry_Pupitar  @ 869FAAC
-	cry2 Cry_Tyranitar  @ 869FAB8
-	cry2 Cry_Lugia  @ 869FAC4
-	cry2 Cry_HoOh  @ 869FAD0
-	cry2 Cry_Celebi  @ 869FADC
-	cry2 Cry_Kecleon  @ 869FAE8
-	cry2 Cry_Roselia  @ 869FAF4
-	cry2 Cry_Torkoal  @ 869FB00
-	cry2 Cry_Electrike  @ 869FB0C
-	cry2 Cry_Manectric  @ 869FB18
-	cry2 Cry_Duskull  @ 869FB24
-	cry2 Cry_Latias  @ 869FB30
-	cry2 Cry_Wynaut  @ 869FB3C
-	cry2 Cry_Seviper  @ 869FB48
-	cry2 Cry_Sharpedo  @ 869FB54
-	cry2 Cry_Zangoose  @ 869FB60
-	cry2 Cry_Azurill  @ 869FB6C
-	cry2 Cry_Swablu  @ 869FB78
-	cry2 Cry_Altaria  @ 869FB84
-	cry2 Cry_Unused265  @ 869FB90
-	cry2 Cry_Taillow  @ 869FB9C
-	cry2 Cry_Swellow  @ 869FBA8
-	cry2 Cry_Unused268  @ 869FBB4
-	cry2 Cry_Spinda  @ 869FBC0
-	cry2 Cry_Torchic  @ 869FBCC
-	cry2 Cry_Combusken  @ 869FBD8
-	cry2 Cry_Blaziken  @ 869FBE4
-	cry2 Cry_Treecko  @ 869FBF0
-	cry2 Cry_Grovyle  @ 869FBFC
-	cry2 Cry_Sceptile  @ 869FC08
-	cry2 Cry_Mudkip  @ 869FC14
-	cry2 Cry_Marshtomp  @ 869FC20
-	cry2 Cry_Swampert  @ 869FC2C
-	cry2 Cry_Pelipper  @ 869FC38
-	cry2 Cry_Wingull  @ 869FC44
-	cry2 Cry_Banette  @ 869FC50
-	cry2 Cry_Shuppet  @ 869FC5C
-	cry2 Cry_Lotad  @ 869FC68
-	cry2 Cry_Lombre  @ 869FC74
-	cry2 Cry_Ludicolo  @ 869FC80
-	cry2 Cry_Seedot  @ 869FC8C
-	cry2 Cry_Nuzleaf  @ 869FC98
-	cry2 Cry_Shiftry  @ 869FCA4
-	cry2 Cry_Carvanha  @ 869FCB0
-	cry2 Cry_Wurmple  @ 869FCBC
-	cry2 Cry_Silcoon  @ 869FCC8
-	cry2 Cry_Beautifly  @ 869FCD4
-	cry2 Cry_Cascoon  @ 869FCE0
-	cry2 Cry_Dustox  @ 869FCEC
-	cry2 Cry_Ralts  @ 869FCF8
-	cry2 Cry_Kirlia  @ 869FD04
-	cry2 Cry_Gardevoir  @ 869FD10
-	cry2 Cry_Slakoth  @ 869FD1C
-	cry2 Cry_Vigoroth  @ 869FD28
-	cry2 Cry_Slaking  @ 869FD34
-	cry2 Cry_Nincada  @ 869FD40
-	cry2 Cry_Ninjask  @ 869FD4C
-	cry2 Cry_Shedinja  @ 869FD58
-	cry2 Cry_Makuhita  @ 869FD64
-	cry2 Cry_Hariyama  @ 869FD70
-	cry2 Cry_Nosepass  @ 869FD7C
-	cry2 Cry_Glalie  @ 869FD88
-	cry2 Cry_Plusle  @ 869FD94
-	cry2 Cry_Minun  @ 869FDA0
-	cry2 Cry_Surskit  @ 869FDAC
-	cry2 Cry_Masquerain  @ 869FDB8
-	cry2 Cry_Skitty  @ 869FDC4
-	cry2 Cry_Delcatty  @ 869FDD0
-	cry2 Cry_Gulpin  @ 869FDDC
-	cry2 Cry_Swalot  @ 869FDE8
-	cry2 Cry_Numel  @ 869FDF4
-	cry2 Cry_Camerupt  @ 869FE00
-	cry2 Cry_Barboach  @ 869FE0C
-	cry2 Cry_Whiscash  @ 869FE18
-	cry2 Cry_Corphish  @ 869FE24
-	cry2 Cry_Crawdaunt  @ 869FE30
-	cry2 Cry_Spoink  @ 869FE3C
-	cry2 Cry_Grumpig  @ 869FE48
-	cry2 Cry_Trapinch  @ 869FE54
-	cry2 Cry_Vibrava  @ 869FE60
-	cry2 Cry_Flygon  @ 869FE6C
-	cry2 Cry_Cacnea  @ 869FE78
-	cry2 Cry_Cacturne  @ 869FE84
-	cry2 Cry_Baltoy  @ 869FE90
-	cry2 Cry_Claydol  @ 869FE9C
-	cry2 Cry_Lunatone  @ 869FEA8
-	cry2 Cry_Solrock  @ 869FEB4
-	cry2 Cry_Feebas  @ 869FEC0
-	cry2 Cry_Milotic  @ 869FECC
-	cry2 Cry_Absol  @ 869FED8
-	cry2 Cry_Meditite  @ 869FEE4
-	cry2 Cry_Medicham  @ 869FEF0
-	cry2 Cry_Spheal  @ 869FEFC
-	cry2 Cry_Sealeo  @ 869FF08
-	cry2 Cry_Walrein  @ 869FF14
-	cry2 Cry_Clamperl  @ 869FF20
-	cry2 Cry_Huntail  @ 869FF2C
-	cry2 Cry_Gorebyss  @ 869FF38
-	cry2 Cry_Lileep  @ 869FF44
-	cry2 Cry_Cradily  @ 869FF50
-	cry2 Cry_Anorith  @ 869FF5C
-	cry2 Cry_Armaldo  @ 869FF68
-	cry2 Cry_Beldum  @ 869FF74
-	cry2 Cry_Metang  @ 869FF80
-	cry2 Cry_Metagross  @ 869FF8C
-	cry2 Cry_Bagon  @ 869FF98
-	cry2 Cry_Shelgon  @ 869FFA4
-	cry2 Cry_Regirock  @ 869FFB0
-	cry2 Cry_Regice  @ 869FFBC
-	cry2 Cry_Registeel  @ 869FFC8
-	cry2 Cry_Castform  @ 869FFD4
-	cry2 Cry_Volbeat  @ 869FFE0
-	cry2 Cry_Illumise  @ 869FFEC
-	cry2 Cry_Poochyena  @ 869FFF8
-	cry2 Cry_Mightyena  @ 86A0004
-	cry2 Cry_Dusclops  @ 86A0010
-	cry2 Cry_Sableye  @ 86A001C
-	cry2 Cry_Mawile  @ 86A0028
-	cry2 Cry_Aron  @ 86A0034
-	cry2 Cry_Lairon  @ 86A0040
-	cry2 Cry_Aggron  @ 86A004C
-	cry2 Cry_Relicanth  @ 86A0058
-	cry2 Cry_Luvdisc  @ 86A0064
-	cry2 Cry_Groudon  @ 86A0070
-	cry2 Cry_Kyogre  @ 86A007C
-	cry2 Cry_Rayquaza  @ 86A0088
-	cry2 Cry_Salamence  @ 86A0094
-	cry2 Cry_Breloom  @ 86A00A0
-	cry2 Cry_Shroomish  @ 86A00AC
-	cry2 Cry_Linoone  @ 86A00B8
-	cry2 Cry_Tropius  @ 86A00C4
-	cry2 Cry_Wailmer  @ 86A00D0
-	cry2 Cry_Zigzagoon  @ 86A00DC
-	cry2 Cry_Exploud  @ 86A00E8
-	cry2 Cry_Loudred  @ 86A00F4
-	cry2 Cry_Wailord  @ 86A0100
-	cry2 Cry_Whismur  @ 86A010C
-	cry2 Cry_Snorunt  @ 86A0118
-	cry2 Cry_Latios  @ 86A0124
-	cry2 Cry_Jirachi  @ 86A0130
-	cry2 Cry_Deoxys  @ 86A013C
-	cry2 Cry_Chimecho  @ 86A0148
+gCryTable2::
+	cry2 Cry_Bulbasaur
+	cry2 Cry_Ivysaur
+	cry2 Cry_Venusaur
+	cry2 Cry_Charmander
+	cry2 Cry_Charmeleon
+	cry2 Cry_Charizard
+	cry2 Cry_Squirtle
+	cry2 Cry_Wartortle
+	cry2 Cry_Blastoise
+	cry2 Cry_Caterpie
+	cry2 Cry_Metapod
+	cry2 Cry_Butterfree
+	cry2 Cry_Weedle
+	cry2 Cry_Kakuna
+	cry2 Cry_Beedrill
+	cry2 Cry_Pidgey
+	cry2 Cry_Pidgeotto
+	cry2 Cry_Pidgeot
+	cry2 Cry_Rattata
+	cry2 Cry_Raticate
+	cry2 Cry_Spearow
+	cry2 Cry_Fearow
+	cry2 Cry_Ekans
+	cry2 Cry_Arbok
+	cry2 Cry_Pikachu
+	cry2 Cry_Raichu
+	cry2 Cry_Sandshrew
+	cry2 Cry_Sandslash
+	cry2 Cry_NidoranF
+	cry2 Cry_Nidorina
+	cry2 Cry_Nidoqueen
+	cry2 Cry_NidoranM
+	cry2 Cry_Nidorino
+	cry2 Cry_Nidoking
+	cry2 Cry_Clefairy
+	cry2 Cry_Clefable
+	cry2 Cry_Vulpix
+	cry2 Cry_Ninetales
+	cry2 Cry_Jigglypuff
+	cry2 Cry_Wigglytuff
+	cry2 Cry_Zubat
+	cry2 Cry_Golbat
+	cry2 Cry_Oddish
+	cry2 Cry_Gloom
+	cry2 Cry_Vileplume
+	cry2 Cry_Paras
+	cry2 Cry_Parasect
+	cry2 Cry_Venonat
+	cry2 Cry_Venomoth
+	cry2 Cry_Diglett
+	cry2 Cry_Dugtrio
+	cry2 Cry_Meowth
+	cry2 Cry_Persian
+	cry2 Cry_Psyduck
+	cry2 Cry_Golduck
+	cry2 Cry_Mankey
+	cry2 Cry_Primeape
+	cry2 Cry_Growlithe
+	cry2 Cry_Arcanine
+	cry2 Cry_Poliwag
+	cry2 Cry_Poliwhirl
+	cry2 Cry_Poliwrath
+	cry2 Cry_Abra
+	cry2 Cry_Kadabra
+	cry2 Cry_Alakazam
+	cry2 Cry_Machop
+	cry2 Cry_Machoke
+	cry2 Cry_Machamp
+	cry2 Cry_Bellsprout
+	cry2 Cry_Weepinbell
+	cry2 Cry_Victreebel
+	cry2 Cry_Tentacool
+	cry2 Cry_Tentacruel
+	cry2 Cry_Geodude
+	cry2 Cry_Graveler
+	cry2 Cry_Golem
+	cry2 Cry_Ponyta
+	cry2 Cry_Rapidash
+	cry2 Cry_Slowpoke
+	cry2 Cry_Slowbro
+	cry2 Cry_Magnemite
+	cry2 Cry_Magneton
+	cry2 Cry_Farfetchd
+	cry2 Cry_Doduo
+	cry2 Cry_Dodrio
+	cry2 Cry_Seel
+	cry2 Cry_Dewgong
+	cry2 Cry_Grimer
+	cry2 Cry_Muk
+	cry2 Cry_Shellder
+	cry2 Cry_Cloyster
+	cry2 Cry_Gastly
+	cry2 Cry_Haunter
+	cry2 Cry_Gengar
+	cry2 Cry_Onix
+	cry2 Cry_Drowzee
+	cry2 Cry_Hypno
+	cry2 Cry_Krabby
+	cry2 Cry_Kingler
+	cry2 Cry_Voltorb
+	cry2 Cry_Electrode
+	cry2 Cry_Exeggcute
+	cry2 Cry_Exeggutor
+	cry2 Cry_Cubone
+	cry2 Cry_Marowak
+	cry2 Cry_Hitmonlee
+	cry2 Cry_Hitmonchan
+	cry2 Cry_Lickitung
+	cry2 Cry_Koffing
+	cry2 Cry_Weezing
+	cry2 Cry_Rhyhorn
+	cry2 Cry_Rhydon
+	cry2 Cry_Chansey
+	cry2 Cry_Tangela
+	cry2 Cry_Kangaskhan
+	cry2 Cry_Horsea
+	cry2 Cry_Seadra
+	cry2 Cry_Goldeen
+	cry2 Cry_Seaking
+	cry2 Cry_Staryu
+	cry2 Cry_Starmie
+	cry2 Cry_MrMime
+	cry2 Cry_Scyther
+	cry2 Cry_Jynx
+	cry2 Cry_Electabuzz
+	cry2 Cry_Magmar
+	cry2 Cry_Pinsir
+	cry2 Cry_Tauros
+	cry2 Cry_Magikarp
+	cry2 Cry_Gyarados
+	cry2 Cry_Lapras
+	cry2 Cry_Ditto
+	cry2 Cry_Eevee
+	cry2 Cry_Vaporeon
+	cry2 Cry_Jolteon
+	cry2 Cry_Flareon
+	cry2 Cry_Porygon
+	cry2 Cry_Omanyte
+	cry2 Cry_Omastar
+	cry2 Cry_Kabuto
+	cry2 Cry_Kabutops
+	cry2 Cry_Aerodactyl
+	cry2 Cry_Snorlax
+	cry2 Cry_Articuno
+	cry2 Cry_Zapdos
+	cry2 Cry_Moltres
+	cry2 Cry_Dratini
+	cry2 Cry_Dragonair
+	cry2 Cry_Dragonite
+	cry2 Cry_Mewtwo
+	cry2 Cry_Mew
+	cry2 Cry_Chikorita
+	cry2 Cry_Bayleef
+	cry2 Cry_Meganium
+	cry2 Cry_Cyndaquil
+	cry2 Cry_Quilava
+	cry2 Cry_Typhlosion
+	cry2 Cry_Totodile
+	cry2 Cry_Croconaw
+	cry2 Cry_Feraligatr
+	cry2 Cry_Sentret
+	cry2 Cry_Furret
+	cry2 Cry_Hoothoot
+	cry2 Cry_Noctowl
+	cry2 Cry_Ledyba
+	cry2 Cry_Ledian
+	cry2 Cry_Spinarak
+	cry2 Cry_Ariados
+	cry2 Cry_Crobat
+	cry2 Cry_Chinchou
+	cry2 Cry_Lanturn
+	cry2 Cry_Pichu
+	cry2 Cry_Cleffa
+	cry2 Cry_Igglybuff
+	cry2 Cry_Togepi
+	cry2 Cry_Togetic
+	cry2 Cry_Natu
+	cry2 Cry_Xatu
+	cry2 Cry_Mareep
+	cry2 Cry_Flaaffy
+	cry2 Cry_Ampharos
+	cry2 Cry_Bellossom
+	cry2 Cry_Marill
+	cry2 Cry_Azumarill
+	cry2 Cry_Sudowoodo
+	cry2 Cry_Politoed
+	cry2 Cry_Hoppip
+	cry2 Cry_Skiploom
+	cry2 Cry_Jumpluff
+	cry2 Cry_Aipom
+	cry2 Cry_Sunkern
+	cry2 Cry_Sunflora
+	cry2 Cry_Yanma
+	cry2 Cry_Wooper
+	cry2 Cry_Quagsire
+	cry2 Cry_Espeon
+	cry2 Cry_Umbreon
+	cry2 Cry_Murkrow
+	cry2 Cry_Slowking
+	cry2 Cry_Misdreavus
+	cry2 Cry_Unown
+	cry2 Cry_Wobbuffet
+	cry2 Cry_Girafarig
+	cry2 Cry_Pineco
+	cry2 Cry_Forretress
+	cry2 Cry_Dunsparce
+	cry2 Cry_Gligar
+	cry2 Cry_Steelix
+	cry2 Cry_Snubbull
+	cry2 Cry_Granbull
+	cry2 Cry_Qwilfish
+	cry2 Cry_Scizor
+	cry2 Cry_Shuckle
+	cry2 Cry_Heracross
+	cry2 Cry_Sneasel
+	cry2 Cry_Teddiursa
+	cry2 Cry_Ursaring
+	cry2 Cry_Slugma
+	cry2 Cry_Magcargo
+	cry2 Cry_Swinub
+	cry2 Cry_Piloswine
+	cry2 Cry_Corsola
+	cry2 Cry_Remoraid
+	cry2 Cry_Octillery
+	cry2 Cry_Delibird
+	cry2 Cry_Mantine
+	cry2 Cry_Skarmory
+	cry2 Cry_Houndour
+	cry2 Cry_Houndoom
+	cry2 Cry_Kingdra
+	cry2 Cry_Phanpy
+	cry2 Cry_Donphan
+	cry2 Cry_Porygon2
+	cry2 Cry_Stantler
+	cry2 Cry_Smeargle
+	cry2 Cry_Tyrogue
+	cry2 Cry_Hitmontop
+	cry2 Cry_Smoochum
+	cry2 Cry_Elekid
+	cry2 Cry_Magby
+	cry2 Cry_Miltank
+	cry2 Cry_Blissey
+	cry2 Cry_Raikou
+	cry2 Cry_Entei
+	cry2 Cry_Suicune
+	cry2 Cry_Larvitar
+	cry2 Cry_Pupitar
+	cry2 Cry_Tyranitar
+	cry2 Cry_Lugia
+	cry2 Cry_HoOh
+	cry2 Cry_Celebi
+	cry2 Cry_Kecleon
+	cry2 Cry_Roselia
+	cry2 Cry_Torkoal
+	cry2 Cry_Electrike
+	cry2 Cry_Manectric
+	cry2 Cry_Duskull
+	cry2 Cry_Latias
+	cry2 Cry_Wynaut
+	cry2 Cry_Seviper
+	cry2 Cry_Sharpedo
+	cry2 Cry_Zangoose
+	cry2 Cry_Azurill
+	cry2 Cry_Swablu
+	cry2 Cry_Altaria
+	cry2 Cry_Unused265
+	cry2 Cry_Taillow
+	cry2 Cry_Swellow
+	cry2 Cry_Unused268
+	cry2 Cry_Spinda
+	cry2 Cry_Torchic
+	cry2 Cry_Combusken
+	cry2 Cry_Blaziken
+	cry2 Cry_Treecko
+	cry2 Cry_Grovyle
+	cry2 Cry_Sceptile
+	cry2 Cry_Mudkip
+	cry2 Cry_Marshtomp
+	cry2 Cry_Swampert
+	cry2 Cry_Pelipper
+	cry2 Cry_Wingull
+	cry2 Cry_Banette
+	cry2 Cry_Shuppet
+	cry2 Cry_Lotad
+	cry2 Cry_Lombre
+	cry2 Cry_Ludicolo
+	cry2 Cry_Seedot
+	cry2 Cry_Nuzleaf
+	cry2 Cry_Shiftry
+	cry2 Cry_Carvanha
+	cry2 Cry_Wurmple
+	cry2 Cry_Silcoon
+	cry2 Cry_Beautifly
+	cry2 Cry_Cascoon
+	cry2 Cry_Dustox
+	cry2 Cry_Ralts
+	cry2 Cry_Kirlia
+	cry2 Cry_Gardevoir
+	cry2 Cry_Slakoth
+	cry2 Cry_Vigoroth
+	cry2 Cry_Slaking
+	cry2 Cry_Nincada
+	cry2 Cry_Ninjask
+	cry2 Cry_Shedinja
+	cry2 Cry_Makuhita
+	cry2 Cry_Hariyama
+	cry2 Cry_Nosepass
+	cry2 Cry_Glalie
+	cry2 Cry_Plusle
+	cry2 Cry_Minun
+	cry2 Cry_Surskit
+	cry2 Cry_Masquerain
+	cry2 Cry_Skitty
+	cry2 Cry_Delcatty
+	cry2 Cry_Gulpin
+	cry2 Cry_Swalot
+	cry2 Cry_Numel
+	cry2 Cry_Camerupt
+	cry2 Cry_Barboach
+	cry2 Cry_Whiscash
+	cry2 Cry_Corphish
+	cry2 Cry_Crawdaunt
+	cry2 Cry_Spoink
+	cry2 Cry_Grumpig
+	cry2 Cry_Trapinch
+	cry2 Cry_Vibrava
+	cry2 Cry_Flygon
+	cry2 Cry_Cacnea
+	cry2 Cry_Cacturne
+	cry2 Cry_Baltoy
+	cry2 Cry_Claydol
+	cry2 Cry_Lunatone
+	cry2 Cry_Solrock
+	cry2 Cry_Feebas
+	cry2 Cry_Milotic
+	cry2 Cry_Absol
+	cry2 Cry_Meditite
+	cry2 Cry_Medicham
+	cry2 Cry_Spheal
+	cry2 Cry_Sealeo
+	cry2 Cry_Walrein
+	cry2 Cry_Clamperl
+	cry2 Cry_Huntail
+	cry2 Cry_Gorebyss
+	cry2 Cry_Lileep
+	cry2 Cry_Cradily
+	cry2 Cry_Anorith
+	cry2 Cry_Armaldo
+	cry2 Cry_Beldum
+	cry2 Cry_Metang
+	cry2 Cry_Metagross
+	cry2 Cry_Bagon
+	cry2 Cry_Shelgon
+	cry2 Cry_Regirock
+	cry2 Cry_Regice
+	cry2 Cry_Registeel
+	cry2 Cry_Castform
+	cry2 Cry_Volbeat
+	cry2 Cry_Illumise
+	cry2 Cry_Poochyena
+	cry2 Cry_Mightyena
+	cry2 Cry_Dusclops
+	cry2 Cry_Sableye
+	cry2 Cry_Mawile
+	cry2 Cry_Aron
+	cry2 Cry_Lairon
+	cry2 Cry_Aggron
+	cry2 Cry_Relicanth
+	cry2 Cry_Luvdisc
+	cry2 Cry_Groudon
+	cry2 Cry_Kyogre
+	cry2 Cry_Rayquaza
+	cry2 Cry_Salamence
+	cry2 Cry_Breloom
+	cry2 Cry_Shroomish
+	cry2 Cry_Linoone
+	cry2 Cry_Tropius
+	cry2 Cry_Wailmer
+	cry2 Cry_Zigzagoon
+	cry2 Cry_Exploud
+	cry2 Cry_Loudred
+	cry2 Cry_Wailord
+	cry2 Cry_Whismur
+	cry2 Cry_Snorunt
+	cry2 Cry_Latios
+	cry2 Cry_Jirachi
+	cry2 Cry_Deoxys
+	cry2 Cry_Chimecho
diff --git a/sound/music_player_table.inc b/sound/music_player_table.inc
index de987c978..6c74a1352 100644
--- a/sound/music_player_table.inc
+++ b/sound/music_player_table.inc
@@ -1,5 +1,5 @@
 	.align 2
-gMPlayTable:: @ 86B49C0
+gMPlayTable::
 	music_player gMPlayInfo_BGM, gMPlayTrack_BGM, 10, 0
 	music_player gMPlayInfo_SE1, gMPlayTrack_SE1,  3, 1
 	music_player gMPlayInfo_SE2, gMPlayTrack_SE2,  9, 1
diff --git a/sound/programmable_wave_data.inc b/sound/programmable_wave_data.inc
index d984f4fac..45da43b00 100644
--- a/sound/programmable_wave_data.inc
+++ b/sound/programmable_wave_data.inc
@@ -1,74 +1,74 @@
-ProgrammableWaveData_86B4830:: @ 86B4830
+ProgrammableWaveData_86B4830::
 	.incbin "sound/programmable_wave_samples/86B4830.pcm"
 
-ProgrammableWaveData_86B4840:: @ 86B4840
+ProgrammableWaveData_86B4840::
 	.incbin "sound/programmable_wave_samples/86B4840.pcm"
 
-ProgrammableWaveData_86B4850:: @ 86B4850
+ProgrammableWaveData_86B4850::
 	.incbin "sound/programmable_wave_samples/86B4850.pcm"
 
-ProgrammableWaveData_86B4860:: @ 86B4860
+ProgrammableWaveData_86B4860::
 	.incbin "sound/programmable_wave_samples/86B4860.pcm"
 
-ProgrammableWaveData_86B4870:: @ 86B4870
+ProgrammableWaveData_86B4870::
 	.incbin "sound/programmable_wave_samples/86B4870.pcm"
 
-ProgrammableWaveData_86B4880:: @ 86B4880
+ProgrammableWaveData_86B4880::
 	.incbin "sound/programmable_wave_samples/86B4880.pcm"
 
-ProgrammableWaveData_86B4890:: @ 86B4890
+ProgrammableWaveData_86B4890::
 	.incbin "sound/programmable_wave_samples/86B4890.pcm"
 
-ProgrammableWaveData_86B48A0:: @ 86B48A0
+ProgrammableWaveData_86B48A0::
 	.incbin "sound/programmable_wave_samples/86B48A0.pcm"
 
-ProgrammableWaveData_86B48B0:: @ 86B48B0
+ProgrammableWaveData_86B48B0::
 	.incbin "sound/programmable_wave_samples/86B48B0.pcm"
 
-ProgrammableWaveData_86B48C0:: @ 86B48C0
+ProgrammableWaveData_86B48C0::
 	.incbin "sound/programmable_wave_samples/86B48C0.pcm"
 
-ProgrammableWaveData_86B48D0:: @ 86B48D0
+ProgrammableWaveData_86B48D0::
 	.incbin "sound/programmable_wave_samples/86B48D0.pcm"
 
-ProgrammableWaveData_86B48E0:: @ 86B48E0
+ProgrammableWaveData_86B48E0::
 	.incbin "sound/programmable_wave_samples/86B48E0.pcm"
 
-ProgrammableWaveData_86B48F0:: @ 86B48F0
+ProgrammableWaveData_86B48F0::
 	.incbin "sound/programmable_wave_samples/86B48F0.pcm"
 
-ProgrammableWaveData_86B4900:: @ 86B4900
+ProgrammableWaveData_86B4900::
 	.incbin "sound/programmable_wave_samples/86B4900.pcm"
 
-ProgrammableWaveData_86B4910:: @ 86B4910
+ProgrammableWaveData_86B4910::
 	.incbin "sound/programmable_wave_samples/86B4910.pcm"
 
-ProgrammableWaveData_86B4920:: @ 86B4920
+ProgrammableWaveData_86B4920::
 	.incbin "sound/programmable_wave_samples/86B4920.pcm"
 
-ProgrammableWaveData_Unused_86B4930:: @ 86B4930
+ProgrammableWaveData_Unused_86B4930::
 	.incbin "sound/programmable_wave_samples/unused_86B4930.pcm"
 
-ProgrammableWaveData_Unused_86B4940:: @ 86B4940
+ProgrammableWaveData_Unused_86B4940::
 	.incbin "sound/programmable_wave_samples/unused_86B4940.pcm"
 
-ProgrammableWaveData_Unused_86B4950:: @ 86B4950
+ProgrammableWaveData_Unused_86B4950::
 	.incbin "sound/programmable_wave_samples/unused_86B4950.pcm"
 
-ProgrammableWaveData_Unused_86B4960:: @ 86B4960
+ProgrammableWaveData_Unused_86B4960::
 	.incbin "sound/programmable_wave_samples/unused_86B4960.pcm"
 
-ProgrammableWaveData_86B4970:: @ 86B4970
+ProgrammableWaveData_86B4970::
 	.incbin "sound/programmable_wave_samples/86B4970.pcm"
 
-ProgrammableWaveData_86B4980:: @ 86B4980
+ProgrammableWaveData_86B4980::
 	.incbin "sound/programmable_wave_samples/86B4980.pcm"
 
-ProgrammableWaveData_86B4990:: @ 86B4990
+ProgrammableWaveData_86B4990::
 	.incbin "sound/programmable_wave_samples/86B4990.pcm"
 
-ProgrammableWaveData_86B49A0:: @ 86B49A0
+ProgrammableWaveData_86B49A0::
 	.incbin "sound/programmable_wave_samples/86B49A0.pcm"
 
-ProgrammableWaveData_86B49B0:: @ 86B49B0
+ProgrammableWaveData_86B49B0::
 	.incbin "sound/programmable_wave_samples/86B49B0.pcm"
diff --git a/sound/song_table.inc b/sound/song_table.inc
index ef5b4b48e..c551a656b 100644
--- a/sound/song_table.inc
+++ b/sound/song_table.inc
@@ -1,6 +1,6 @@
 	.align 2
 
-gSongTable:: @ 86B49F0
+gSongTable::
 	song mus_dummy, 0, 0
 	song se_use_item, 1, 1
 	song se_pc_login, 1, 1
@@ -613,5 +613,5 @@ gSongTable:: @ 86B49F0
 	song ph_nurse_solo, 2, 2
 
 	.align 2
-dummy_song_header: @ 86B5D00
+dummy_song_header:
 	.byte 0, 0, 0, 0
diff --git a/sound/songs/se_m_absorb.s b/sound/songs/se_m_absorb.s
index 35213fdaa..6cd622366 100644
--- a/sound/songs/se_m_absorb.s
+++ b/sound/songs/se_m_absorb.s
@@ -29,7 +29,7 @@ se_m_absorb_1:
 	.byte	W01
 	.byte		VOICE , 38
 	.byte		VOL   , 58*se_m_absorb_mvl/mxv
-	.byte		N08   , Gn4 
+	.byte		N08   , Gn4
 	.byte	W01
 	.byte		VOL   , 68*se_m_absorb_mvl/mxv
 	.byte		PAN   , c_v+8
diff --git a/sound/songs/se_m_absorb_2.s b/sound/songs/se_m_absorb_2.s
index 3f9df6dc4..619201333 100644
--- a/sound/songs/se_m_absorb_2.s
+++ b/sound/songs/se_m_absorb_2.s
@@ -26,15 +26,15 @@ se_m_absorb_2_1:
 	.byte	W01
 	.byte		N02   , Dn6 , v112
 	.byte	W02
-	.byte		        Cs6 
+	.byte		        Cs6
 	.byte	W03
 	.byte		PAN   , c_v+8
-	.byte		N02   , An5 
+	.byte		N02   , An5
 	.byte	W02
-	.byte		        Fs5 
+	.byte		        Fs5
 	.byte	W01
 	.byte	W01
-	.byte		        Dn5 
+	.byte		        Dn5
 	.byte	W02
 	.byte		PAN   , c_v-7
 	.byte	W01
@@ -52,7 +52,7 @@ se_m_absorb_2_1:
 	.byte	W02
 	.byte		PAN   , c_v+15
 	.byte	W01
-	.byte		N02   , Dn6 
+	.byte		N02   , Dn6
 	.byte	W02
 	.byte		        Cs6 , v084
 	.byte	W03
@@ -89,17 +89,17 @@ se_m_absorb_2_2:
 	.byte		BEND  , c_v+15
 	.byte		N02   , An6 , v112
 	.byte	W02
-	.byte		        Fs6 
+	.byte		        Fs6
 	.byte	W01
 	.byte	W01
-	.byte		        Dn6 
+	.byte		        Dn6
 	.byte	W02
 	.byte	W01
-	.byte		        Cs6 
+	.byte		        Cs6
 	.byte	W02
-	.byte		        An5 
+	.byte		        An5
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W02
 	.byte		        Fs5 , v104
 	.byte	W01
diff --git a/sound/songs/se_m_acid_armor.s b/sound/songs/se_m_acid_armor.s
index c7f350a9b..346c76604 100644
--- a/sound/songs/se_m_acid_armor.s
+++ b/sound/songs/se_m_acid_armor.s
@@ -35,15 +35,15 @@ se_m_acid_armor_1:
 	.byte	W02
 	.byte		VOICE , 23
 	.byte		PAN   , c_v+11
-	.byte		N01   , Cn1 
+	.byte		N01   , Cn1
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		N01   , Cn2 
+	.byte		N01   , Cn2
 	.byte	W01
 	.byte		VOICE , 31
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-37
-	.byte		N06   , Dn1 
+	.byte		N06   , Dn1
 	.byte	W01
 	.byte		BEND  , c_v-16
 	.byte	W01
@@ -55,15 +55,15 @@ se_m_acid_armor_1:
 	.byte	W01
 	.byte		VOICE , 23
 	.byte		PAN   , c_v-1
-	.byte		N01   , Fn1 
+	.byte		N01   , Fn1
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		N01   , Fn2 
+	.byte		N01   , Fn2
 	.byte	W01
 	.byte		VOICE , 31
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-37
-	.byte		N02   , Gn0 
+	.byte		N02   , Gn0
 	.byte	W02
 	.byte		BEND  , c_v-16
 	.byte	W01
@@ -71,21 +71,21 @@ se_m_acid_armor_1:
 	.byte	W01
 	.byte		PAN   , c_v+5
 	.byte		BEND  , c_v+27
-	.byte		N02   
+	.byte		N02
 	.byte	W01
 	.byte		BEND  , c_v+46
 	.byte	W01
 	.byte		VOICE , 23
 	.byte		PAN   , c_v+10
-	.byte		N01   , Cn1 
+	.byte		N01   , Cn1
 	.byte	W02
 	.byte		PAN   , c_v-9
-	.byte		N01   , Cn2 
+	.byte		N01   , Cn2
 	.byte	W01
 	.byte		VOICE , 31
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-37
-	.byte		N06   , Dn1 
+	.byte		N06   , Dn1
 	.byte	W01
 	.byte		BEND  , c_v-16
 	.byte	W01
@@ -97,10 +97,10 @@ se_m_acid_armor_1:
 	.byte	W01
 	.byte		VOICE , 23
 	.byte		PAN   , c_v+5
-	.byte		N01   , Cn1 
+	.byte		N01   , Cn1
 	.byte	W01
 	.byte		PAN   , c_v-8
-	.byte		N01   , Cn2 
+	.byte		N01   , Cn2
 	.byte	W01
 	.byte		VOICE , 31
 	.byte		PAN   , c_v+0
@@ -125,7 +125,7 @@ se_m_acid_armor_1:
 	.byte		VOICE , 31
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-37
-	.byte		N06   , Dn1 
+	.byte		N06   , Dn1
 	.byte	W01
 	.byte		BEND  , c_v-16
 	.byte	W01
@@ -140,7 +140,7 @@ se_m_acid_armor_1:
 	.byte		N01   , Fn1 , v084
 	.byte	W01
 	.byte		PAN   , c_v-10
-	.byte		N01   , Fn2 
+	.byte		N01   , Fn2
 	.byte	W01
 	.byte		VOICE , 31
 	.byte		PAN   , c_v+0
@@ -162,7 +162,7 @@ se_m_acid_armor_1:
 	.byte		N01   , Cn1 , v068
 	.byte	W01
 	.byte		PAN   , c_v-9
-	.byte		N01   , Cn2 
+	.byte		N01   , Cn2
 	.byte	W01
 	.byte		VOICE , 31
 	.byte		PAN   , c_v+0
diff --git a/sound/songs/se_m_attract2.s b/sound/songs/se_m_attract2.s
index 7d3d6f3c5..9b846f13e 100644
--- a/sound/songs/se_m_attract2.s
+++ b/sound/songs/se_m_attract2.s
@@ -34,7 +34,7 @@ se_m_attract2_1:
 	.byte	W12
 	.byte		        c_v+0
 	.byte	W06
-	.byte		N54   , Cn4 
+	.byte		N54   , Cn4
 	.byte	W06
 	.byte		PAN   , c_v+6
 	.byte	W12
@@ -45,7 +45,7 @@ se_m_attract2_1:
 	.byte		        c_v+0
 	.byte	W12
 	.byte		        c_v-4
-	.byte		N54   , Dn4 
+	.byte		N54   , Dn4
 	.byte	W12
 	.byte		PAN   , c_v-10
 	.byte	W12
@@ -55,7 +55,7 @@ se_m_attract2_1:
 	.byte	W12
 	.byte		        c_v+6
 	.byte	W06
-	.byte		N54   , Cn4 
+	.byte		N54   , Cn4
 	.byte	W06
 	.byte		PAN   , c_v+9
 	.byte	W12
diff --git a/sound/songs/se_m_bite.s b/sound/songs/se_m_bite.s
index 3c51a8f2f..15d690e2e 100644
--- a/sound/songs/se_m_bite.s
+++ b/sound/songs/se_m_bite.s
@@ -25,11 +25,11 @@ se_m_bite_1:
 	.byte		BEND  , c_v+0
 	.byte		N02   , Gn3 , v112
 	.byte	W02
-	.byte		        Gs3 
+	.byte		        Gs3
 	.byte	W01
 	.byte		PAN   , c_v-7
 	.byte	W01
-	.byte		N02   , An3 
+	.byte		N02   , An3
 	.byte	W02
 	.byte		PAN   , c_v+7
 	.byte	W02
@@ -79,7 +79,7 @@ se_m_bite_2:
 	.byte	W10
 	.byte		N01   , Gn2 , v040
 	.byte	W08
-	.byte		N01   
+	.byte		N01
 	.byte	W06
 	.byte	FINE
 
diff --git a/sound/songs/se_m_bonemerang.s b/sound/songs/se_m_bonemerang.s
index 11f035347..933980936 100644
--- a/sound/songs/se_m_bonemerang.s
+++ b/sound/songs/se_m_bonemerang.s
@@ -26,18 +26,18 @@ se_m_bonemerang_1:
 	.byte		N01   , Cn5 , v127
 	.byte	W01
 	.byte		PAN   , c_v+10
-	.byte		N01   , Cn6 
+	.byte		N01   , Cn6
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		N01   , Cn5 
+	.byte		N01   , Cn5
 	.byte	W04
-	.byte		N01   
+	.byte		N01
 	.byte	W01
 	.byte		PAN   , c_v-11
-	.byte		N01   , Cn6 
+	.byte		N01   , Cn6
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		N01   , Cn5 
+	.byte		N01   , Cn5
 	.byte	W04
 	.byte	FINE
 
diff --git a/sound/songs/se_m_brick_break.s b/sound/songs/se_m_brick_break.s
index 08058089f..ce13218d2 100644
--- a/sound/songs/se_m_brick_break.s
+++ b/sound/songs/se_m_brick_break.s
@@ -23,7 +23,7 @@ se_m_brick_break_1:
 	.byte		PAN   , c_v+0
 	.byte		N01   , Cn4 , v127
 	.byte	W01
-	.byte		N03   , Cn5 
+	.byte		N03   , Cn5
 	.byte	W01
 	.byte		PAN   , c_v+5
 	.byte	W01
@@ -63,23 +63,23 @@ se_m_brick_break_2:
 	.byte		PAN   , c_v+0
 	.byte		N01   , Cn3 , v064
 	.byte	W01
-	.byte		N03   , Gn3 
+	.byte		N03   , Gn3
 	.byte	W05
 	.byte	W01
 	.byte		N02   , En4 , v040
 	.byte	W05
-	.byte		        Gn3 
+	.byte		        Gn3
 	.byte	W04
 	.byte		        En4 , v032
 	.byte	W02
 	.byte	W03
-	.byte		        Gn3 
+	.byte		        Gn3
 	.byte	W03
 	.byte	W02
 	.byte		        En4 , v020
 	.byte	W04
 	.byte	W01
-	.byte		        Gn3 
+	.byte		        Gn3
 	.byte	W05
 	.byte	FINE
 
diff --git a/sound/songs/se_m_bubble.s b/sound/songs/se_m_bubble.s
index ee31a176b..4e1b988d5 100644
--- a/sound/songs/se_m_bubble.s
+++ b/sound/songs/se_m_bubble.s
@@ -37,7 +37,7 @@ se_m_bubble_1:
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-1
-	.byte		N03   , En3 
+	.byte		N03   , En3
 	.byte	W15
 	.byte	FINE
 
diff --git a/sound/songs/se_m_bubble3.s b/sound/songs/se_m_bubble3.s
index c14badb5a..d9a7f1e82 100644
--- a/sound/songs/se_m_bubble3.s
+++ b/sound/songs/se_m_bubble3.s
@@ -38,7 +38,7 @@ se_m_bubble3_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-1
 	.byte	W03
-	.byte		N06   
+	.byte		N06
 	.byte	W03
 	.byte		BEND  , c_v+6
 	.byte	W01
diff --git a/sound/songs/se_m_charm.s b/sound/songs/se_m_charm.s
index ef10cb3e3..2bb2e0ef3 100644
--- a/sound/songs/se_m_charm.s
+++ b/sound/songs/se_m_charm.s
@@ -32,7 +32,7 @@ se_m_charm_1:
 	.byte		VOL   , 62*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+0
-	.byte		N15   
+	.byte		N15
 	.byte	W01
 	.byte		VOL   , 77*se_m_charm_mvl/mxv
 	.byte		PAN   , c_v+0
diff --git a/sound/songs/se_m_confuse_ray.s b/sound/songs/se_m_confuse_ray.s
index 12aea8ab8..78407b8c1 100644
--- a/sound/songs/se_m_confuse_ray.s
+++ b/sound/songs/se_m_confuse_ray.s
@@ -56,7 +56,7 @@ se_m_confuse_ray_1:
 	.byte		        c_v-17
 	.byte	W01
 	.byte		        c_v-1
-	.byte		N12   , As2 
+	.byte		N12   , As2
 	.byte	W02
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+8
@@ -82,7 +82,7 @@ se_m_confuse_ray_1:
 	.byte		        c_v-16
 	.byte	W01
 	.byte		        c_v-1
-	.byte		N12   , As2 
+	.byte		N12   , As2
 	.byte	W03
 	.byte		PAN   , c_v+4
 	.byte		BEND  , c_v+8
diff --git a/sound/songs/se_m_cosmic_power.s b/sound/songs/se_m_cosmic_power.s
index 76812478b..3e3f53c5e 100644
--- a/sound/songs/se_m_cosmic_power.s
+++ b/sound/songs/se_m_cosmic_power.s
@@ -27,24 +27,24 @@ se_m_cosmic_power_1:
 	.byte	W06
 	.byte	W03
 	.byte		PAN   , c_v-5
-	.byte		N08   , Cn5 
+	.byte		N08   , Cn5
 	.byte	W03
 	.byte	W06
 	.byte		PAN   , c_v-9
-	.byte		N10   , Gn5 
+	.byte		N10   , Gn5
 	.byte	W06
 	.byte	W04
 	.byte		PAN   , c_v-5
-	.byte		N09   , Fn6 
+	.byte		N09   , Fn6
 	.byte	W02
 	.byte	W06
 	.byte	W02
 	.byte		PAN   , c_v+0
-	.byte		N09   , An5 
+	.byte		N09   , An5
 	.byte	W04
 	.byte	W06
 	.byte		PAN   , c_v+4
-	.byte		N09   , As5 
+	.byte		N09   , As5
 	.byte	W06
 	.byte	W03
 	.byte		PAN   , c_v+9
@@ -129,19 +129,19 @@ se_m_cosmic_power_2:
 	.byte	W02
 	.byte	W06
 	.byte	W01
-	.byte		N10   , Ds5 
+	.byte		N10   , Ds5
 	.byte	W05
 	.byte	W06
-	.byte		N09   , As6 
+	.byte		N09   , As6
 	.byte	W06
 	.byte	W03
-	.byte		        Cn6 
+	.byte		        Cn6
 	.byte	W03
 	.byte	W06
-	.byte		N10   , Fn5 
+	.byte		N10   , Fn5
 	.byte	W06
 	.byte	W04
-	.byte		N08   
+	.byte		N08
 	.byte	W02
 	.byte	W06
 	.byte	W01
diff --git a/sound/songs/se_m_detect.s b/sound/songs/se_m_detect.s
index 181fb4079..f06802802 100644
--- a/sound/songs/se_m_detect.s
+++ b/sound/songs/se_m_detect.s
@@ -31,7 +31,7 @@ se_m_detect_1:
 	.byte		        c_v+4
 	.byte	W01
 	.byte		        c_v+1
-	.byte		N06   , Bn5 
+	.byte		N06   , Bn5
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W02
@@ -45,7 +45,7 @@ se_m_detect_1:
 	.byte		        c_v+4
 	.byte	W01
 	.byte		        c_v+1
-	.byte		N06   , Bn5 
+	.byte		N06   , Bn5
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W04
@@ -59,7 +59,7 @@ se_m_detect_1:
 	.byte		        c_v+4
 	.byte	W01
 	.byte		        c_v+1
-	.byte		N06   , Bn5 
+	.byte		N06   , Bn5
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte	W04
@@ -72,7 +72,7 @@ se_m_detect_1:
 	.byte		        c_v+4
 	.byte	W01
 	.byte		        c_v+1
-	.byte		N06   , Bn5 
+	.byte		N06   , Bn5
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W03
diff --git a/sound/songs/se_m_dig.s b/sound/songs/se_m_dig.s
index 42fed8ab5..f8d3597d9 100644
--- a/sound/songs/se_m_dig.s
+++ b/sound/songs/se_m_dig.s
@@ -32,7 +32,7 @@ se_m_dig_1:
 	.byte		BEND  , c_v+4
 	.byte	W01
 	.byte		        c_v+16
-	.byte		N03   
+	.byte		N03
 	.byte	W01
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v+28
diff --git a/sound/songs/se_m_dive.s b/sound/songs/se_m_dive.s
index 2313667fc..83cc42356 100644
--- a/sound/songs/se_m_dive.s
+++ b/sound/songs/se_m_dive.s
@@ -30,7 +30,7 @@ se_m_dive_1:
 	.byte	W04
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-14
-	.byte		N04   
+	.byte		N04
 	.byte	W03
 	.byte		PAN   , c_v+3
 	.byte		BEND  , c_v-11
@@ -90,7 +90,7 @@ se_m_dive_2:
 	.byte		VOL   , 105*se_m_dive_mvl/mxv
 	.byte		N06   , An2 , v040
 	.byte	W06
-	.byte		        Gn2 
+	.byte		        Gn2
 	.byte	W06
 	.byte		        Gs3 , v044
 	.byte	W07
diff --git a/sound/songs/se_m_dizzy_punch.s b/sound/songs/se_m_dizzy_punch.s
index 886a4bc4e..31ab74a77 100644
--- a/sound/songs/se_m_dizzy_punch.s
+++ b/sound/songs/se_m_dizzy_punch.s
@@ -46,7 +46,7 @@ se_m_dizzy_punch_1:
 	.byte	W01
 	.byte		PAN   , c_v-13
 	.byte		BEND  , c_v+0
-	.byte		N04   , Cn6 
+	.byte		N04   , Cn6
 	.byte	W01
 	.byte		VOL   , 66*se_m_dizzy_punch_mvl/mxv
 	.byte		PAN   , c_v+0
diff --git a/sound/songs/se_m_dragon_rage.s b/sound/songs/se_m_dragon_rage.s
index e9eaefca0..608d92611 100644
--- a/sound/songs/se_m_dragon_rage.s
+++ b/sound/songs/se_m_dragon_rage.s
@@ -39,7 +39,7 @@ se_m_dragon_rage_1:
 	.byte	W01
 	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
 	.byte		BEND  , c_v+10
-	.byte		N10   , Bn2 
+	.byte		N10   , Bn2
 	.byte	W02
 	.byte		PAN   , c_v+5
 	.byte	W01
@@ -54,7 +54,7 @@ se_m_dragon_rage_1:
 	.byte		PAN   , c_v-2
 	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
 	.byte		BEND  , c_v+18
-	.byte		N10   , Cs3 
+	.byte		N10   , Cs3
 	.byte	W03
 	.byte		PAN   , c_v+5
 	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
@@ -69,7 +69,7 @@ se_m_dragon_rage_1:
 	.byte	W02
 	.byte		VOL   , 20*se_m_dragon_rage_mvl/mxv
 	.byte		BEND  , c_v+29
-	.byte		N10   , Dn3 
+	.byte		N10   , Dn3
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte	W01
@@ -86,7 +86,7 @@ se_m_dragon_rage_1:
 	.byte	W01
 	.byte		VOL   , 21*se_m_dragon_rage_mvl/mxv
 	.byte		BEND  , c_v+37
-	.byte		N10   , En3 
+	.byte		N10   , En3
 	.byte	W02
 	.byte		PAN   , c_v-2
 	.byte		VOL   , 46*se_m_dragon_rage_mvl/mxv
@@ -101,7 +101,7 @@ se_m_dragon_rage_1:
 	.byte		        c_v-5
 	.byte		VOL   , 20*se_m_dragon_rage_mvl/mxv
 	.byte		BEND  , c_v+42
-	.byte		N20   , Fs3 
+	.byte		N20   , Fs3
 	.byte	W02
 	.byte		VOL   , 47*se_m_dragon_rage_mvl/mxv
 	.byte	W01
diff --git a/sound/songs/se_m_earthquake.s b/sound/songs/se_m_earthquake.s
index 104eb1bef..928ddfacd 100644
--- a/sound/songs/se_m_earthquake.s
+++ b/sound/songs/se_m_earthquake.s
@@ -209,9 +209,9 @@ se_m_earthquake_2:
 	.byte		VOL   , 110*se_m_earthquake_mvl/mxv
 	.byte		N02   , Fn2 , v072
 	.byte	W02
-	.byte		N01   
+	.byte		N01
 	.byte	W01
-	.byte		N02   , Gn2 
+	.byte		N02   , Gn2
 	.byte	W03
 	.byte		N01   , Gs2 , v060
 	.byte	W06
@@ -223,87 +223,87 @@ se_m_earthquake_2_000:
 	.byte		N06   , Bn1 , v080
 	.byte	W06
 	.byte	PEND
-	.byte		N06   
+	.byte		N06
 	.byte	W06
-	.byte		N06   
+	.byte		N06
 	.byte	W06
 	.byte	PATT
 	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
-	.byte		N06   
+	.byte		N06
 	.byte	W06
 	.byte	PATT
 	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
-	.byte		N06   
+	.byte		N06
 	.byte	W06
 	.byte	PATT
 	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
-	.byte		N06   
+	.byte		N06
 	.byte	W06
 	.byte	PATT
 	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
-	.byte		N06   
+	.byte		N06
 	.byte	W06
 	.byte	PATT
 	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
-	.byte		N06   
+	.byte		N06
 	.byte	W06
 	.byte	PATT
 	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
-	.byte		N06   
+	.byte		N06
 	.byte	W06
 	.byte	PATT
 	 .word	se_m_earthquake_2_000
 	.byte		N06   , Bn1 , v080
 	.byte	W06
-	.byte		N06   
+	.byte		N06
 	.byte	W06
 	.byte		VOL   , 106*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
-	.byte		N06   
+	.byte		N06
 	.byte	W03
 	.byte		VOL   , 103*se_m_earthquake_mvl/mxv
 	.byte	W03
-	.byte		N06   
+	.byte		N06
 	.byte	W01
 	.byte		VOL   , 97*se_m_earthquake_mvl/mxv
 	.byte	W03
 	.byte		        89*se_m_earthquake_mvl/mxv
 	.byte	W02
-	.byte		N06   
+	.byte		N06
 	.byte	W02
 	.byte		VOL   , 85*se_m_earthquake_mvl/mxv
 	.byte	W04
 	.byte		        78*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
-	.byte		N06   
+	.byte		N06
 	.byte	W03
 	.byte		VOL   , 72*se_m_earthquake_mvl/mxv
 	.byte	W03
-	.byte		N06   
+	.byte		N06
 	.byte	W01
 	.byte		VOL   , 66*se_m_earthquake_mvl/mxv
 	.byte	W03
 	.byte		        58*se_m_earthquake_mvl/mxv
 	.byte	W02
-	.byte		N06   
+	.byte		N06
 	.byte	W02
 	.byte		VOL   , 46*se_m_earthquake_mvl/mxv
 	.byte	W04
 	.byte		        30*se_m_earthquake_mvl/mxv
 	.byte		PAN   , c_v+0
-	.byte		N06   
+	.byte		N06
 	.byte	W03
 	.byte		VOL   , 12*se_m_earthquake_mvl/mxv
 	.byte	W03
diff --git a/sound/songs/se_m_encore2.s b/sound/songs/se_m_encore2.s
index 9c53cdfe3..61e522aca 100644
--- a/sound/songs/se_m_encore2.s
+++ b/sound/songs/se_m_encore2.s
@@ -154,7 +154,7 @@ se_m_encore2_1_000:
 	.byte		        12*se_m_encore2_mvl/mxv
 	.byte		PAN   , c_v-2
 	.byte	W02
-	.byte		EOT   , Cn3 
+	.byte		EOT   , Cn3
 	.byte	FINE
 
 @******************************************************@
diff --git a/sound/songs/se_m_explosion.s b/sound/songs/se_m_explosion.s
index c93f485b8..039c563f7 100644
--- a/sound/songs/se_m_explosion.s
+++ b/sound/songs/se_m_explosion.s
@@ -25,19 +25,19 @@ se_m_explosion_1:
 	.byte		BEND  , c_v+0
 	.byte		N01   , Ds3 , v127
 	.byte	W01
-	.byte		        As2 
+	.byte		        As2
 	.byte	W02
 	.byte		PAN   , c_v-8
-	.byte		N02   , Gn3 
+	.byte		N02   , Gn3
 	.byte	W01
 	.byte		PAN   , c_v+7
 	.byte	W03
 	.byte		        c_v+0
-	.byte		N01   , Ds3 
+	.byte		N01   , Ds3
 	.byte	W01
-	.byte		        As2 
+	.byte		        As2
 	.byte	W02
-	.byte		N54   , Fn3 
+	.byte		N54   , Fn3
 	.byte	W11
 	.byte		BEND  , c_v+3
 	.byte	W03
@@ -93,7 +93,7 @@ se_m_explosion_2:
 	.byte		VOL   , 74*se_m_explosion_mvl/mxv
 	.byte	W06
 	.byte		        125*se_m_explosion_mvl/mxv
-	.byte		N02   
+	.byte		N02
 	.byte	W01
 	.byte		VOL   , 74*se_m_explosion_mvl/mxv
 	.byte	W16
diff --git a/sound/songs/se_m_flamethrower.s b/sound/songs/se_m_flamethrower.s
index 29438337f..4c0c892c1 100644
--- a/sound/songs/se_m_flamethrower.s
+++ b/sound/songs/se_m_flamethrower.s
@@ -129,7 +129,7 @@ se_m_flamethrower_1_000:
 	.byte	W03
 	.byte		        c_v+0
 	.byte	W03
-	.byte		EOT   , Cn3 
+	.byte		EOT   , Cn3
 	.byte	FINE
 
 @********************** Track  2 **********************@
diff --git a/sound/songs/se_m_flatter.s b/sound/songs/se_m_flatter.s
index e3746c990..799fdba91 100644
--- a/sound/songs/se_m_flatter.s
+++ b/sound/songs/se_m_flatter.s
@@ -25,9 +25,9 @@ se_m_flatter_1:
 	.byte		BEND  , c_v+0
 	.byte		N01   , Dn5 , v127
 	.byte	W01
-	.byte		        Gn4 
+	.byte		        Gn4
 	.byte	W01
-	.byte		N09   , En5 
+	.byte		N09   , En5
 	.byte	W02
 	.byte		PAN   , c_v+6
 	.byte	W02
diff --git a/sound/songs/se_m_grasswhistle.s b/sound/songs/se_m_grasswhistle.s
index 111bc2166..10c744787 100644
--- a/sound/songs/se_m_grasswhistle.s
+++ b/sound/songs/se_m_grasswhistle.s
@@ -35,12 +35,12 @@ se_m_grasswhistle_1:
 	.byte	W09
 	.byte		        0
 	.byte	W03
-	.byte		N09   , An5 
+	.byte		N09   , An5
 	.byte	W12
-	.byte		        En5 
+	.byte		        En5
 	.byte	W12
 	.byte		BEND  , c_v-14
-	.byte		N66   , Gn5 
+	.byte		N66   , Gn5
 	.byte	W06
 	.byte		BEND  , c_v-8
 	.byte	W06
@@ -85,14 +85,14 @@ se_m_grasswhistle_2:
 	.byte		        0
 	.byte	W03
 	.byte		PAN   , c_v-12
-	.byte		N09   , An5 
+	.byte		N09   , An5
 	.byte	W12
 	.byte		PAN   , c_v+14
-	.byte		N09   , En5 
+	.byte		N09   , En5
 	.byte	W12
 	.byte		PAN   , c_v-15
 	.byte		BEND  , c_v-14
-	.byte		N66   , Gn5 
+	.byte		N66   , Gn5
 	.byte	W06
 	.byte		BEND  , c_v-8
 	.byte	W06
diff --git a/sound/songs/se_m_hail.s b/sound/songs/se_m_hail.s
index 0c04af212..7f1d1c67d 100644
--- a/sound/songs/se_m_hail.s
+++ b/sound/songs/se_m_hail.s
@@ -31,7 +31,7 @@ se_m_hail_1:
 	.byte		N01   , Gn4 , v112
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		N01   , Ds5 
+	.byte		N01   , Ds5
 	.byte	W03
 	.byte	W01
 	.byte		PAN   , c_v+6
@@ -41,7 +41,7 @@ se_m_hail_1:
 	.byte		N01   , Gn4 , v064
 	.byte	W02
 	.byte		PAN   , c_v+0
-	.byte		N01   , Ds5 
+	.byte		N01   , Ds5
 	.byte	W03
 	.byte		PAN   , c_v+11
 	.byte		N02   , Ds5 , v020
@@ -51,7 +51,7 @@ se_m_hail_1:
 	.byte		N01   , Gn4 , v064
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		N01   , Ds5 
+	.byte		N01   , Ds5
 	.byte	W04
 	.byte	FINE
 
@@ -64,20 +64,20 @@ se_m_hail_2:
 	.byte		PAN   , c_v+0
 	.byte		N01   , Dn4 , v040
 	.byte	W04
-	.byte		        Bn3 
+	.byte		        Bn3
 	.byte	W02
 	.byte	W03
-	.byte		        Dn4 
+	.byte		        Dn4
 	.byte	W03
 	.byte	W01
 	.byte		        Bn3 , v032
 	.byte	W05
-	.byte		        Dn4 
+	.byte		        Dn4
 	.byte	W03
 	.byte		        Bn3 , v012
 	.byte	W03
 	.byte	W02
-	.byte		        Dn4 
+	.byte		        Dn4
 	.byte	W04
 	.byte	FINE
 
diff --git a/sound/songs/se_m_haze.s b/sound/songs/se_m_haze.s
index 4bf61faa6..11497c846 100644
--- a/sound/songs/se_m_haze.s
+++ b/sound/songs/se_m_haze.s
@@ -175,7 +175,7 @@ se_m_haze_1:
 	.byte	W03
 	.byte		        6*se_m_haze_mvl/mxv
 	.byte	W02
-	.byte		EOT   
+	.byte		EOT
 	.byte	FINE
 
 @********************** Track  2 **********************@
@@ -192,42 +192,42 @@ se_m_haze_2:
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		        Fs4 
+	.byte		        Fs4
 	.byte	W06
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		        Gn4 
+	.byte		        Gn4
 	.byte	W06
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		        Gs4 
+	.byte		        Gs4
 	.byte	W06
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		        Gn4 
+	.byte		        Gn4
 	.byte	W06
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		        Fs4 
+	.byte		        Fs4
 	.byte	W06
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		        Fn4 
+	.byte		        Fn4
 	.byte	W06
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		        En4 
+	.byte		        En4
 	.byte	W06
 	.byte	W06
 	.byte	W06
 	.byte	W06
-	.byte		N18   , Ds4 
+	.byte		N18   , Ds4
 	.byte	W06
 	.byte	W06
 	.byte	W06
diff --git a/sound/songs/se_m_heal_bell.s b/sound/songs/se_m_heal_bell.s
index b2b17f7d8..fbe315c87 100644
--- a/sound/songs/se_m_heal_bell.s
+++ b/sound/songs/se_m_heal_bell.s
@@ -30,10 +30,10 @@ se_m_heal_bell_1:
 	.byte		        c_v+11
 	.byte	W01
 	.byte		        c_v+1
-	.byte		N01   , An5 
+	.byte		N01   , An5
 	.byte	W01
 	.byte		MOD   , 7
-	.byte		N18   , Bn5 
+	.byte		N18   , Bn5
 	.byte	W02
 	.byte		PAN   , c_v+11
 	.byte	W01
diff --git a/sound/songs/se_m_heat_wave.s b/sound/songs/se_m_heat_wave.s
index a4b5cc896..da5842f8f 100644
--- a/sound/songs/se_m_heat_wave.s
+++ b/sound/songs/se_m_heat_wave.s
@@ -145,7 +145,7 @@ se_m_heat_wave_1:
 	.byte	W02
 	.byte		VOL   , 17*se_m_heat_wave_mvl/mxv
 	.byte	W03
-	.byte		EOT   
+	.byte		EOT
 	.byte	FINE
 
 @********************** Track  2 **********************@
diff --git a/sound/songs/se_m_hydro_pump.s b/sound/songs/se_m_hydro_pump.s
index 050f6281b..c214985e4 100644
--- a/sound/songs/se_m_hydro_pump.s
+++ b/sound/songs/se_m_hydro_pump.s
@@ -76,7 +76,7 @@ se_m_hydro_pump_1:
 	.byte	W01
 	.byte		VOL   , 6*se_m_hydro_pump_mvl/mxv
 	.byte	W05
-	.byte		EOT   
+	.byte		EOT
 	.byte	FINE
 
 @********************** Track  2 **********************@
diff --git a/sound/songs/se_m_hyper_beam.s b/sound/songs/se_m_hyper_beam.s
index bce85a21a..b6ffcfc2f 100644
--- a/sound/songs/se_m_hyper_beam.s
+++ b/sound/songs/se_m_hyper_beam.s
@@ -25,21 +25,21 @@ se_m_hyper_beam_1:
 	.byte		BEND  , c_v+0
 	.byte		N02   , En3 , v127
 	.byte	W03
-	.byte		N01   , As3 
+	.byte		N01   , As3
 	.byte	W03
-	.byte		N02   , Gn3 
+	.byte		N02   , Gn3
 	.byte	W03
-	.byte		N01   , Cs4 
+	.byte		N01   , Cs4
 	.byte	W03
 	.byte		PAN   , c_v+7
 	.byte		N02   , En3 , v072
 	.byte	W03
-	.byte		N01   , As3 
+	.byte		N01   , As3
 	.byte	W03
 	.byte		PAN   , c_v-7
 	.byte		N02   , Gn3 , v040
 	.byte	W03
-	.byte		N01   , Cs4 
+	.byte		N01   , Cs4
 	.byte	W03
 	.byte	FINE
 
@@ -51,16 +51,16 @@ se_m_hyper_beam_2:
 	.byte		VOL   , 110*se_m_hyper_beam_mvl/mxv
 	.byte		N01   , Cn3 , v040
 	.byte	W02
-	.byte		N01   
+	.byte		N01
 	.byte	W04
-	.byte		N01   
+	.byte		N01
 	.byte	W02
-	.byte		N01   
+	.byte		N01
 	.byte	W04
 se_m_hyper_beam_2_000:
 	.byte		N01   , Cn3 , v020
 	.byte	W02
-	.byte		N01   
+	.byte		N01
 	.byte	W04
 	.byte	PEND
 	.byte	PATT
diff --git a/sound/songs/se_m_hyper_beam2.s b/sound/songs/se_m_hyper_beam2.s
index 304fa7b3f..fb2183422 100644
--- a/sound/songs/se_m_hyper_beam2.s
+++ b/sound/songs/se_m_hyper_beam2.s
@@ -30,19 +30,19 @@ se_m_hyper_beam2_1:
 	.byte		        c_v+28
 	.byte	W01
 	.byte		        c_v+0
-	.byte		N02   , Cs4 
+	.byte		N02   , Cs4
 	.byte	W01
 	.byte		BEND  , c_v+30
 	.byte	W02
 	.byte		        c_v+0
-	.byte		N03   , As3 
+	.byte		N03   , As3
 	.byte	W01
 	.byte		BEND  , c_v+11
 	.byte	W01
 	.byte		        c_v+28
 	.byte	W01
 	.byte		        c_v+0
-	.byte		N02   , En4 
+	.byte		N02   , En4
 	.byte	W01
 	.byte		BEND  , c_v+30
 	.byte	W02
@@ -55,7 +55,7 @@ se_m_hyper_beam2_1:
 	.byte		        c_v+28
 	.byte	W01
 	.byte		        c_v+0
-	.byte		N02   , Cs4 
+	.byte		N02   , Cs4
 	.byte	W01
 	.byte		BEND  , c_v+30
 	.byte	W02
@@ -68,7 +68,7 @@ se_m_hyper_beam2_1:
 	.byte		        c_v+28
 	.byte	W01
 	.byte		        c_v+0
-	.byte		N02   , En4 
+	.byte		N02   , En4
 	.byte	W01
 	.byte		BEND  , c_v+30
 	.byte	W02
@@ -82,16 +82,16 @@ se_m_hyper_beam2_2:
 	.byte		VOL   , 110*se_m_hyper_beam2_mvl/mxv
 	.byte		N01   , Cn3 , v032
 	.byte	W02
-	.byte		N01   
+	.byte		N01
 	.byte	W04
-	.byte		N01   
+	.byte		N01
 	.byte	W02
-	.byte		N01   
+	.byte		N01
 	.byte	W04
 se_m_hyper_beam2_2_000:
 	.byte		N01   , Cn3 , v020
 	.byte	W02
-	.byte		N01   
+	.byte		N01
 	.byte	W04
 	.byte	PEND
 	.byte	PATT
diff --git a/sound/songs/se_m_icy_wind.s b/sound/songs/se_m_icy_wind.s
index d15350525..b7e83e032 100644
--- a/sound/songs/se_m_icy_wind.s
+++ b/sound/songs/se_m_icy_wind.s
@@ -30,7 +30,7 @@ se_m_icy_wind_1:
 	.byte		N01   , Ds4 , v112
 	.byte	W01
 	.byte		PAN   , c_v+0
-	.byte		N01   , Bn4 
+	.byte		N01   , Bn4
 	.byte	W03
 	.byte	FINE
 
@@ -43,13 +43,13 @@ se_m_icy_wind_2:
 	.byte		PAN   , c_v+0
 	.byte		N01   , Dn4 , v040
 	.byte	W04
-	.byte		        Bn3 
+	.byte		        Bn3
 	.byte	W02
 	.byte		PAN   , c_v-7
 	.byte	W02
 	.byte		        c_v+9
 	.byte	W01
-	.byte		N01   , Dn4 
+	.byte		N01   , Dn4
 	.byte	W01
 	.byte		PAN   , c_v-7
 	.byte	W02
diff --git a/sound/songs/se_m_lock_on.s b/sound/songs/se_m_lock_on.s
index d8e1de5b0..9c9576d97 100644
--- a/sound/songs/se_m_lock_on.s
+++ b/sound/songs/se_m_lock_on.s
@@ -37,7 +37,7 @@ se_m_lock_on_1:
 	.byte	W02
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+6
-	.byte		N01   , Cn4 
+	.byte		N01   , Cn4
 	.byte	W01
 	.byte		        Gn3 , v064
 	.byte	W02
diff --git a/sound/songs/se_m_milk_drink.s b/sound/songs/se_m_milk_drink.s
index 30a051540..57e3a581d 100644
--- a/sound/songs/se_m_milk_drink.s
+++ b/sound/songs/se_m_milk_drink.s
@@ -103,7 +103,7 @@ se_m_milk_drink_2:
 	.byte		N06   , Fs6 , v040
 	.byte	W04
 	.byte	W04
-	.byte		N06   
+	.byte		N06
 	.byte	W02
 	.byte	W06
 	.byte	W01
diff --git a/sound/songs/se_m_minimize.s b/sound/songs/se_m_minimize.s
index 565450b2b..778e0ec7c 100644
--- a/sound/songs/se_m_minimize.s
+++ b/sound/songs/se_m_minimize.s
@@ -68,7 +68,7 @@ se_m_minimize_1:
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+28
-	.byte		N06   , An3 
+	.byte		N06   , An3
 	.byte	W01
 	.byte		BEND  , c_v+20
 	.byte	W01
diff --git a/sound/songs/se_m_moonlight.s b/sound/songs/se_m_moonlight.s
index bd4410b32..f76181a87 100644
--- a/sound/songs/se_m_moonlight.s
+++ b/sound/songs/se_m_moonlight.s
@@ -26,18 +26,18 @@ se_m_moonlight_1:
 	.byte		BEND  , c_v+3
 	.byte		N01   , Ds6 , v092
 	.byte	W01
-	.byte		        Dn6 
+	.byte		        Dn6
 	.byte	W01
-	.byte		        Gn5 
+	.byte		        Gn5
 	.byte	W01
 	.byte		N20   , Gn6 , v100
 	.byte	W21
 se_m_moonlight_1_000:
 	.byte		N01   , Ds6 , v056
 	.byte	W01
-	.byte		        Dn6 
+	.byte		        Dn6
 	.byte	W01
-	.byte		        Gn5 
+	.byte		        Gn5
 	.byte	W01
 	.byte		N20   , Gn6 , v064
 	.byte	W03
@@ -54,9 +54,9 @@ se_m_moonlight_1_001:
 	.byte		PAN   , c_v+0
 	.byte		N01   , Gs5 , v092
 	.byte	W01
-	.byte		        Gn5 
+	.byte		        Gn5
 	.byte	W01
-	.byte		        Cn5 
+	.byte		        Cn5
 	.byte	W01
 	.byte		N20   , Cn6 , v100
 	.byte	W21
@@ -65,9 +65,9 @@ se_m_moonlight_1_002:
 	.byte		PAN   , c_v+16
 	.byte		N01   , Gs5 , v056
 	.byte	W01
-	.byte		        Gn5 
+	.byte		        Gn5
 	.byte	W01
-	.byte		        Cn5 
+	.byte		        Cn5
 	.byte	W01
 	.byte		N20   , Cn6 , v064
 	.byte	W21
@@ -76,31 +76,31 @@ se_m_moonlight_1_003:
 	.byte		PAN   , c_v-16
 	.byte		N01   , Gs5 , v040
 	.byte	W01
-	.byte		        Gn5 
+	.byte		        Gn5
 	.byte	W01
-	.byte		        Cn5 
+	.byte		        Cn5
 	.byte	W01
-	.byte		N20   , Cn6 
+	.byte		N20   , Cn6
 	.byte	W21
 	.byte	PEND
 se_m_moonlight_1_004:
 	.byte		PAN   , c_v+32
 	.byte		N01   , Gs5 , v020
 	.byte	W01
-	.byte		        Gn5 
+	.byte		        Gn5
 	.byte	W01
-	.byte		        Cn5 
+	.byte		        Cn5
 	.byte	W01
 	.byte		PAN   , c_v-32
-	.byte		N20   , Cn6 
+	.byte		N20   , Cn6
 	.byte	W21
 	.byte	PEND
 	.byte		PAN   , c_v+0
 	.byte		N01   , Ds6 , v092
 	.byte	W01
-	.byte		        Dn6 
+	.byte		        Dn6
 	.byte	W01
-	.byte		        Gn5 
+	.byte		        Gn5
 	.byte	W01
 	.byte		N20   , Gn6 , v100
 	.byte	W21
@@ -127,11 +127,11 @@ se_m_moonlight_2:
 	.byte	W10
 	.byte		N01   , Ds6 , v112
 	.byte	W02
-	.byte		        Dn6 
+	.byte		        Dn6
 	.byte	W01
-	.byte		        Gn5 
+	.byte		        Gn5
 	.byte	W01
-	.byte		N04   , Gn6 
+	.byte		N04   , Gn6
 	.byte	W05
 	.byte		        Gn6 , v096
 	.byte	W05
@@ -154,11 +154,11 @@ se_m_moonlight_2_001:
 	.byte	W10
 	.byte		N01   , Gs5 , v112
 	.byte	W02
-	.byte		        Gn5 
+	.byte		        Gn5
 	.byte	W01
-	.byte		        Cn5 
+	.byte		        Cn5
 	.byte	W01
-	.byte		N04   , Cn6 
+	.byte		N04   , Cn6
 	.byte	W05
 	.byte		        Cn6 , v096
 	.byte	W05
@@ -183,11 +183,11 @@ se_m_moonlight_2_002:
 	.byte	W10
 	.byte		N01   , Ds6 , v112
 	.byte	W02
-	.byte		        Dn6 
+	.byte		        Dn6
 	.byte	W01
-	.byte		        Gn5 
+	.byte		        Gn5
 	.byte	W01
-	.byte		N04   , Gn6 
+	.byte		N04   , Gn6
 	.byte	W05
 	.byte		        Gn6 , v096
 	.byte	W05
diff --git a/sound/songs/se_m_morning_sun.s b/sound/songs/se_m_morning_sun.s
index ac7667246..227098da1 100644
--- a/sound/songs/se_m_morning_sun.s
+++ b/sound/songs/se_m_morning_sun.s
@@ -82,7 +82,7 @@ se_m_morning_sun_2:
 	.byte		N06   , Gs6 , v108
 	.byte	W03
 	.byte	W03
-	.byte		        Bn5 
+	.byte		        Bn5
 	.byte	W03
 	.byte	W03
 	.byte		        Gs6 , v100
diff --git a/sound/songs/se_m_nightmare.s b/sound/songs/se_m_nightmare.s
index 825bfaea2..f995d1310 100644
--- a/sound/songs/se_m_nightmare.s
+++ b/sound/songs/se_m_nightmare.s
@@ -37,10 +37,10 @@ se_m_nightmare_1:
 	.byte		N03   , Fs3 , v088
 	.byte	W06
 	.byte		PAN   , c_v+0
-	.byte		N03   , Ds3 
+	.byte		N03   , Ds3
 	.byte	W06
 	.byte		PAN   , c_v-16
-	.byte		N03   
+	.byte		N03
 	.byte	W09
 	.byte		PAN   , c_v-1
 	.byte		N03   , An2 , v096
@@ -56,10 +56,10 @@ se_m_nightmare_1:
 	.byte	W03
 	.byte	W03
 	.byte		PAN   , c_v-1
-	.byte		N03   , Fn3 
+	.byte		N03   , Fn3
 	.byte	W06
 	.byte		PAN   , c_v+16
-	.byte		N03   
+	.byte		N03
 	.byte	W15
 	.byte	FINE
 
@@ -77,55 +77,55 @@ se_m_nightmare_2:
 	.byte	W06
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+36
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v+17
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+2
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v-8
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+12
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v+6
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+0
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v-6
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-19
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v-31
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-44
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v-55
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-64
-	.byte		N03   
+	.byte		N03
 	.byte	W18
 	.byte	FINE
 
diff --git a/sound/songs/se_m_petal_dance.s b/sound/songs/se_m_petal_dance.s
index c8ad2810d..df5752e4b 100644
--- a/sound/songs/se_m_petal_dance.s
+++ b/sound/songs/se_m_petal_dance.s
@@ -33,7 +33,7 @@ se_m_petal_dance_1:
 	.byte		        Dn6 , v100
 	.byte	W03
 	.byte	W03
-	.byte		        An5 
+	.byte		        An5
 	.byte	W03
 	.byte	W03
 	.byte		PAN   , c_v-4
@@ -61,7 +61,7 @@ se_m_petal_dance_1:
 	.byte	W03
 	.byte	W03
 	.byte		PAN   , c_v+4
-	.byte		N06   , Dn6 
+	.byte		N06   , Dn6
 	.byte	W03
 	.byte	W03
 	.byte		PAN   , c_v+0
@@ -137,7 +137,7 @@ se_m_petal_dance_2:
 	.byte		        Bn5 , v088
 	.byte	W03
 	.byte	W03
-	.byte		        En6 
+	.byte		        En6
 	.byte	W03
 	.byte	W03
 	.byte		        Bn5 , v084
@@ -158,7 +158,7 @@ se_m_petal_dance_2:
 	.byte		        En6 , v064
 	.byte	W03
 	.byte	W03
-	.byte		        Bn5 
+	.byte		        Bn5
 	.byte	W03
 	.byte	W03
 	.byte		        En6 , v060
diff --git a/sound/songs/se_m_rain_dance.s b/sound/songs/se_m_rain_dance.s
index 810be0663..bba4dc2b0 100644
--- a/sound/songs/se_m_rain_dance.s
+++ b/sound/songs/se_m_rain_dance.s
@@ -97,7 +97,7 @@ se_m_rain_dance_1:
 	.byte		        1*se_m_rain_dance_mvl/mxv
 	.byte		PAN   , c_v+4
 	.byte	W06
-	.byte		EOT   
+	.byte		EOT
 	.byte	FINE
 
 @******************************************************@
diff --git a/sound/songs/se_m_reversal.s b/sound/songs/se_m_reversal.s
index 609c399f5..5b62d7156 100644
--- a/sound/songs/se_m_reversal.s
+++ b/sound/songs/se_m_reversal.s
@@ -232,35 +232,35 @@ se_m_reversal_2:
 	.byte	W02
 	.byte	W01
 	.byte		        c_v+31
-	.byte		N03   , Cs5 
+	.byte		N03   , Cs5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
 	.byte		        c_v-33
 	.byte	W03
 	.byte		        c_v+31
-	.byte		N03   , Dn5 
+	.byte		N03   , Dn5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
 	.byte		        c_v-33
 	.byte	W02
 	.byte		        c_v+31
-	.byte		N03   , Ds5 
+	.byte		N03   , Ds5
 	.byte	W02
 	.byte		BEND  , c_v+0
 	.byte	W01
 	.byte		        c_v-33
 	.byte	W02
 	.byte		        c_v+31
-	.byte		N03   , En5 
+	.byte		N03   , En5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W02
 	.byte		        c_v-33
 	.byte	W02
 	.byte		        c_v+31
-	.byte		N03   , Fn5 
+	.byte		N03   , Fn5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
@@ -268,35 +268,35 @@ se_m_reversal_2:
 	.byte	W02
 	.byte	W01
 	.byte		        c_v+31
-	.byte		N03   , Fs5 
+	.byte		N03   , Fs5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
 	.byte		        c_v-33
 	.byte	W03
 	.byte		        c_v+31
-	.byte		N03   , Gn5 
+	.byte		N03   , Gn5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
 	.byte		        c_v-33
 	.byte	W02
 	.byte		        c_v+31
-	.byte		N03   , Gs5 
+	.byte		N03   , Gs5
 	.byte	W02
 	.byte		BEND  , c_v+0
 	.byte	W01
 	.byte		        c_v-33
 	.byte	W02
 	.byte		        c_v+31
-	.byte		N03   , An5 
+	.byte		N03   , An5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W02
 	.byte		        c_v-33
 	.byte	W02
 	.byte		        c_v+31
-	.byte		N03   , As5 
+	.byte		N03   , As5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
@@ -304,7 +304,7 @@ se_m_reversal_2:
 	.byte	W02
 	.byte	W01
 	.byte		        c_v+31
-	.byte		N03   , Bn5 
+	.byte		N03   , Bn5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
diff --git a/sound/songs/se_m_sacred_fire.s b/sound/songs/se_m_sacred_fire.s
index 5e6c864e2..0fda9c757 100644
--- a/sound/songs/se_m_sacred_fire.s
+++ b/sound/songs/se_m_sacred_fire.s
@@ -27,7 +27,7 @@ se_m_sacred_fire_1:
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte	W01
-	.byte		N18   , Gn4 
+	.byte		N18   , Gn4
 	.byte	W02
 	.byte		PAN   , c_v-5
 	.byte	W01
@@ -70,9 +70,9 @@ se_m_sacred_fire_2:
 	.byte		VOL   , 110*se_m_sacred_fire_mvl/mxv
 	.byte		N01   , Gn2 , v032
 	.byte	W02
-	.byte		N01   
+	.byte		N01
 	.byte	W02
-	.byte		N18   
+	.byte		N18
 	.byte	W03
 	.byte		VOL   , 98*se_m_sacred_fire_mvl/mxv
 	.byte	W03
diff --git a/sound/songs/se_m_sand_tomb.s b/sound/songs/se_m_sand_tomb.s
index 8edf0abf8..4c14aabcc 100644
--- a/sound/songs/se_m_sand_tomb.s
+++ b/sound/songs/se_m_sand_tomb.s
@@ -126,45 +126,45 @@ se_m_sand_tomb_2:
 	.byte	W03
 	.byte		        En3 , v080
 	.byte	W04
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte		        Cn3 , v100
 	.byte	W04
 	.byte		        En3 , v080
 	.byte	W04
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte		        Cn3 , v100
 	.byte	W03
 	.byte	W01
 	.byte		        En3 , v080
 	.byte	W03
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W04
 	.byte		        Cn3 , v100
 	.byte	W04
 	.byte		        En3 , v080
 	.byte	W03
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W04
 	.byte		        Cn3 , v100
 	.byte	W03
 	.byte		        En3 , v080
 	.byte	W02
 	.byte	W02
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W04
 	.byte		        Cn3 , v100
 	.byte	W03
 	.byte		        En3 , v080
 	.byte	W04
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte		        Cn3 , v100
 	.byte	W04
 	.byte		        En3 , v080
 	.byte	W04
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte		        Cn3 , v092
 	.byte	W04
diff --git a/sound/songs/se_m_sandstorm.s b/sound/songs/se_m_sandstorm.s
index 9674cd043..4cb12a389 100644
--- a/sound/songs/se_m_sandstorm.s
+++ b/sound/songs/se_m_sandstorm.s
@@ -161,7 +161,7 @@ se_m_sandstorm_1:
 	.byte		        13*se_m_sandstorm_mvl/mxv
 	.byte		BEND  , c_v-6
 	.byte	W03
-	.byte		EOT   
+	.byte		EOT
 	.byte	FINE
 
 @********************** Track  2 **********************@
@@ -175,13 +175,13 @@ se_m_sandstorm_2:
 	.byte	W03
 	.byte		        En3 , v080
 	.byte	W04
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte		        Cn3 , v100
 	.byte	W04
 	.byte		        En3 , v080
 	.byte	W04
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte		        Cn3 , v100
 	.byte	W03
@@ -189,13 +189,13 @@ se_m_sandstorm_2_000:
 	.byte	W01
 	.byte		N03   , En3 , v080
 	.byte	W03
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W04
 	.byte		        Cn3 , v100
 	.byte	W04
 	.byte		        En3 , v080
 	.byte	W03
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W04
 	.byte		        Cn3 , v100
 	.byte	W03
@@ -203,13 +203,13 @@ se_m_sandstorm_2_000:
 	.byte	W02
 	.byte	PEND
 	.byte	W02
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W04
 	.byte		        Cn3 , v100
 	.byte	W03
 	.byte		        En3 , v080
 	.byte	W04
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte		        Cn3 , v100
 	.byte	W04
@@ -219,13 +219,13 @@ se_m_sandstorm_2_000:
 	.byte	W03
 	.byte		        En3 , v080
 	.byte	W04
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte		        Cn3 , v100
 	.byte	W04
 	.byte		        En3 , v080
 	.byte	W04
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte		        Cn3 , v100
 	.byte	W03
@@ -254,7 +254,7 @@ se_m_sandstorm_2_000:
 	.byte	W04
 	.byte		        En3 , v032
 	.byte	W04
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte		        Cn3 , v048
 	.byte	W03
diff --git a/sound/songs/se_m_self_destruct.s b/sound/songs/se_m_self_destruct.s
index f2ab617ca..645085e1e 100644
--- a/sound/songs/se_m_self_destruct.s
+++ b/sound/songs/se_m_self_destruct.s
@@ -25,9 +25,9 @@ se_m_self_destruct_1:
 	.byte		BEND  , c_v+0
 	.byte		N01   , Gn3 , v127
 	.byte	W01
-	.byte		        Cn3 
+	.byte		        Cn3
 	.byte	W01
-	.byte		N24   , An3 
+	.byte		N24   , An3
 	.byte	W06
 	.byte		PAN   , c_v+6
 	.byte	W04
diff --git a/sound/songs/se_m_sing.s b/sound/songs/se_m_sing.s
index f12509f56..8c48c8224 100644
--- a/sound/songs/se_m_sing.s
+++ b/sound/songs/se_m_sing.s
@@ -46,7 +46,7 @@ se_m_sing_1:
 	.byte		MOD   , 0
 	.byte	W03
 	.byte		VOL   , 95*se_m_sing_mvl/mxv
-	.byte		N21   , Fn5 
+	.byte		N21   , Fn5
 	.byte	W06
 	.byte	W06
 se_m_sing_1_000:
@@ -128,7 +128,7 @@ se_m_sing_2:
 	.byte	W03
 	.byte		VOL   , 95*se_m_sing_mvl/mxv
 	.byte		PAN   , c_v-12
-	.byte		N21   , Fn5 
+	.byte		N21   , Fn5
 	.byte	W06
 	.byte	W06
 se_m_sing_2_000:
diff --git a/sound/songs/se_m_sketch.s b/sound/songs/se_m_sketch.s
index 3657d2009..c17c4056f 100644
--- a/sound/songs/se_m_sketch.s
+++ b/sound/songs/se_m_sketch.s
@@ -31,7 +31,7 @@ se_m_sketch_1:
 	.byte		VOICE , 31
 	.byte		VOL   , 40*se_m_sketch_mvl/mxv
 	.byte		BEND  , c_v-1
-	.byte		N03   , Cs5 
+	.byte		N03   , Cs5
 	.byte	W01
 	.byte		VOL   , 64*se_m_sketch_mvl/mxv
 	.byte		PAN   , c_v-6
@@ -44,7 +44,7 @@ se_m_sketch_1:
 	.byte		VOL   , 110*se_m_sketch_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N02   , As5 
+	.byte		N02   , As5
 	.byte	W01
 	.byte		BEND  , c_v+12
 	.byte	W01
diff --git a/sound/songs/se_m_sky_uppercut.s b/sound/songs/se_m_sky_uppercut.s
index 66a791f96..bed6c19c5 100644
--- a/sound/songs/se_m_sky_uppercut.s
+++ b/sound/songs/se_m_sky_uppercut.s
@@ -29,7 +29,7 @@ se_m_sky_uppercut_1:
 	.byte	W03
 	.byte		        93*se_m_sky_uppercut_mvl/mxv
 	.byte		PAN   , c_v-6
-	.byte		N02   , Cn5 
+	.byte		N02   , Cn5
 	.byte	W03
 	.byte		VOL   , 110*se_m_sky_uppercut_mvl/mxv
 	.byte	W01
@@ -74,9 +74,9 @@ se_m_sky_uppercut_2:
 	.byte		VOL   , 110*se_m_sky_uppercut_mvl/mxv
 	.byte		N02   , Cn3 , v060
 	.byte	W03
-	.byte		        Gn2 
+	.byte		        Gn2
 	.byte	W03
-	.byte		        Gs4 
+	.byte		        Gs4
 	.byte	W04
 	.byte		        Gs4 , v020
 	.byte	W02
diff --git a/sound/songs/se_m_snore.s b/sound/songs/se_m_snore.s
index aff9ef5e3..13e2f6f52 100644
--- a/sound/songs/se_m_snore.s
+++ b/sound/songs/se_m_snore.s
@@ -63,28 +63,28 @@ se_m_snore_2:
 	.byte		VOICE , 27
 	.byte		N01   , En2 , v052
 	.byte	W02
-	.byte		        Dn2 
+	.byte		        Dn2
 	.byte	W02
-	.byte		        En2 
+	.byte		        En2
 	.byte	W02
 	.byte	W01
-	.byte		        Dn2 
+	.byte		        Dn2
 	.byte	W02
-	.byte		        En2 
+	.byte		        En2
 	.byte	W03
 	.byte	W01
 	.byte		        En2 , v064
 	.byte	W02
-	.byte		        Gs2 
+	.byte		        Gs2
 	.byte	W03
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W02
-	.byte		        En2 
+	.byte		        En2
 	.byte	W02
-	.byte		        Gs2 
+	.byte		        Gs2
 	.byte	W02
 	.byte	W01
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W05
 	.byte	FINE
 
diff --git a/sound/songs/se_m_solar_beam.s b/sound/songs/se_m_solar_beam.s
index c260c332a..6a12b4a10 100644
--- a/sound/songs/se_m_solar_beam.s
+++ b/sound/songs/se_m_solar_beam.s
@@ -145,7 +145,7 @@ se_m_solar_beam_1:
 	.byte	W02
 	.byte		VOL   , 5*se_m_solar_beam_mvl/mxv
 	.byte	W04
-	.byte		EOT   
+	.byte		EOT
 	.byte	FINE
 
 @******************************************************@
diff --git a/sound/songs/se_m_spit_up.s b/sound/songs/se_m_spit_up.s
index 5d96c7b86..1073ad01f 100644
--- a/sound/songs/se_m_spit_up.s
+++ b/sound/songs/se_m_spit_up.s
@@ -34,7 +34,7 @@ se_m_spit_up_1:
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N03   , Gn4 
+	.byte		N03   , Gn4
 	.byte	W02
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v+15
@@ -63,7 +63,7 @@ se_m_spit_up_2:
 	.byte		N03   , En3 , v052
 	.byte	W03
 	.byte	W01
-	.byte		N03   
+	.byte		N03
 	.byte	W02
 	.byte	W03
 	.byte		        En3 , v032
diff --git a/sound/songs/se_m_stat_decrease.s b/sound/songs/se_m_stat_decrease.s
index 5cdf8ac36..51218db1e 100644
--- a/sound/songs/se_m_stat_decrease.s
+++ b/sound/songs/se_m_stat_decrease.s
@@ -30,13 +30,13 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+16
-	.byte		N02   , Cs5 
+	.byte		N02   , Cs5
 	.byte	W01
 	.byte		BEND  , c_v+12
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+8
-	.byte		N02   , Fs5 
+	.byte		N02   , Fs5
 	.byte	W01
 	.byte		BEND  , c_v+5
 	.byte	W01
@@ -44,11 +44,11 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+0
-	.byte		N02   , Fs4 
+	.byte		N02   , Fs4
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+42
-	.byte		N02   , Cn6 
+	.byte		N02   , Cn6
 	.byte	W01
 	.byte		BEND  , c_v+31
 	.byte	W01
@@ -56,13 +56,13 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+16
-	.byte		N02   , Cn5 
+	.byte		N02   , Cn5
 	.byte	W01
 	.byte		BEND  , c_v+12
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+8
-	.byte		N02   , Fn5 
+	.byte		N02   , Fn5
 	.byte	W01
 	.byte		BEND  , c_v+5
 	.byte	W01
@@ -70,11 +70,11 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+0
-	.byte		N02   , Fn4 
+	.byte		N02   , Fn4
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+42
-	.byte		N02   , Bn5 
+	.byte		N02   , Bn5
 	.byte	W01
 	.byte		BEND  , c_v+31
 	.byte	W01
@@ -82,13 +82,13 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+16
-	.byte		N02   , Bn4 
+	.byte		N02   , Bn4
 	.byte	W01
 	.byte		BEND  , c_v+12
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+8
-	.byte		N02   , En5 
+	.byte		N02   , En5
 	.byte	W01
 	.byte		BEND  , c_v+5
 	.byte	W01
@@ -96,11 +96,11 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+0
-	.byte		N02   , En4 
+	.byte		N02   , En4
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+42
-	.byte		N02   , As5 
+	.byte		N02   , As5
 	.byte	W01
 	.byte		BEND  , c_v+31
 	.byte	W01
@@ -108,13 +108,13 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+16
-	.byte		N02   , As4 
+	.byte		N02   , As4
 	.byte	W01
 	.byte		BEND  , c_v+12
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+8
-	.byte		N02   , Ds5 
+	.byte		N02   , Ds5
 	.byte	W01
 	.byte		BEND  , c_v+5
 	.byte	W01
@@ -122,11 +122,11 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+0
-	.byte		N02   , Ds4 
+	.byte		N02   , Ds4
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+42
-	.byte		N02   , An5 
+	.byte		N02   , An5
 	.byte	W01
 	.byte		BEND  , c_v+31
 	.byte	W01
@@ -134,7 +134,7 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+16
-	.byte		N02   , An4 
+	.byte		N02   , An4
 	.byte	W01
 	.byte		BEND  , c_v+12
 	.byte	W02
@@ -148,11 +148,11 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v-12
 	.byte		BEND  , c_v+0
-	.byte		N02   , Cs4 
+	.byte		N02   , Cs4
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+42
-	.byte		N02   , An5 
+	.byte		N02   , An5
 	.byte	W01
 	.byte		BEND  , c_v+31
 	.byte	W01
@@ -160,7 +160,7 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v+12
 	.byte		BEND  , c_v+16
-	.byte		N02   , An4 
+	.byte		N02   , An4
 	.byte	W01
 	.byte		BEND  , c_v+12
 	.byte	W02
@@ -174,11 +174,11 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v-16
 	.byte		BEND  , c_v+0
-	.byte		N02   , Cs4 
+	.byte		N02   , Cs4
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+42
-	.byte		N02   , An5 
+	.byte		N02   , An5
 	.byte	W01
 	.byte		BEND  , c_v+31
 	.byte	W01
@@ -186,7 +186,7 @@ se_m_stat_decrease_1:
 	.byte	W01
 	.byte		PAN   , c_v+16
 	.byte		BEND  , c_v+16
-	.byte		N02   , An4 
+	.byte		N02   , An4
 	.byte	W01
 	.byte		BEND  , c_v+12
 	.byte	W02
@@ -202,55 +202,55 @@ se_m_stat_decrease_2:
 	.byte		VOL   , 70*se_m_stat_decrease_mvl/mxv
 	.byte		N02   , As3 , v052
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W03
 	.byte	W01
-	.byte		        An3 
+	.byte		        An3
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W02
 	.byte	W02
-	.byte		        Gs3 
+	.byte		        Gs3
 	.byte	W04
-	.byte		N02   
+	.byte		N02
 	.byte	W03
-	.byte		        Gn3 
+	.byte		        Gn3
 	.byte	W03
 	.byte	W01
-	.byte		N02   
+	.byte		N02
 	.byte	W03
-	.byte		        Fs3 
+	.byte		        Fs3
 	.byte	W02
 	.byte	W02
-	.byte		N02   
+	.byte		N02
 	.byte	W04
-	.byte		        Fn3 
+	.byte		        Fn3
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W03
 	.byte	W01
-	.byte		        En3 
+	.byte		        En3
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W02
 	.byte	W02
-	.byte		        Ds3 
+	.byte		        Ds3
 	.byte	W04
 	.byte		        Ds3 , v032
 	.byte	W03
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
 	.byte	W01
-	.byte		N02   
+	.byte		N02
 	.byte	W03
 	.byte		        Cs3 , v020
 	.byte	W02
 	.byte	W02
-	.byte		N02   
+	.byte		N02
 	.byte	W04
 	.byte		        Cn3 , v012
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W03
 	.byte	FINE
 
diff --git a/sound/songs/se_m_stat_increase.s b/sound/songs/se_m_stat_increase.s
index e9eea563a..2556b6afa 100644
--- a/sound/songs/se_m_stat_increase.s
+++ b/sound/songs/se_m_stat_increase.s
@@ -30,13 +30,13 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+5
-	.byte		N02   , An4 
+	.byte		N02   , An4
 	.byte	W01
 	.byte		BEND  , c_v+8
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+12
-	.byte		N02   , Dn5 
+	.byte		N02   , Dn5
 	.byte	W01
 	.byte		BEND  , c_v+16
 	.byte	W01
@@ -44,13 +44,13 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+32
-	.byte		N02   , Dn4 
+	.byte		N02   , Dn4
 	.byte	W01
 	.byte		BEND  , c_v+42
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N02   , As5 
+	.byte		N02   , As5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
@@ -58,13 +58,13 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+5
-	.byte		N02   , As4 
+	.byte		N02   , As4
 	.byte	W01
 	.byte		BEND  , c_v+8
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+12
-	.byte		N02   , Ds5 
+	.byte		N02   , Ds5
 	.byte	W01
 	.byte		BEND  , c_v+16
 	.byte	W01
@@ -72,13 +72,13 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+32
-	.byte		N02   , Ds4 
+	.byte		N02   , Ds4
 	.byte	W01
 	.byte		BEND  , c_v+42
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N02   , Bn5 
+	.byte		N02   , Bn5
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
@@ -86,13 +86,13 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+5
-	.byte		N02   , Bn4 
+	.byte		N02   , Bn4
 	.byte	W01
 	.byte		BEND  , c_v+8
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+12
-	.byte		N02   , En5 
+	.byte		N02   , En5
 	.byte	W01
 	.byte		BEND  , c_v+16
 	.byte	W01
@@ -100,13 +100,13 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+32
-	.byte		N02   , En4 
+	.byte		N02   , En4
 	.byte	W01
 	.byte		BEND  , c_v+42
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N02   , Cn6 
+	.byte		N02   , Cn6
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
@@ -114,13 +114,13 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+5
-	.byte		N02   , Cn5 
+	.byte		N02   , Cn5
 	.byte	W01
 	.byte		BEND  , c_v+8
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+12
-	.byte		N02   , Fn5 
+	.byte		N02   , Fn5
 	.byte	W01
 	.byte		BEND  , c_v+16
 	.byte	W01
@@ -128,13 +128,13 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v-6
 	.byte		BEND  , c_v+32
-	.byte		N02   , Fn4 
+	.byte		N02   , Fn4
 	.byte	W01
 	.byte		BEND  , c_v+42
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N02   , Cs6 
+	.byte		N02   , Cs6
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
@@ -142,7 +142,7 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v+5
-	.byte		N02   , Cs5 
+	.byte		N02   , Cs5
 	.byte	W01
 	.byte		BEND  , c_v+8
 	.byte	W02
@@ -156,13 +156,13 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v-12
 	.byte		BEND  , c_v+32
-	.byte		N02   , Fn4 
+	.byte		N02   , Fn4
 	.byte	W01
 	.byte		BEND  , c_v+42
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N02   , Cs6 
+	.byte		N02   , Cs6
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
@@ -170,7 +170,7 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v+12
 	.byte		BEND  , c_v+5
-	.byte		N02   , Cs5 
+	.byte		N02   , Cs5
 	.byte	W01
 	.byte		BEND  , c_v+8
 	.byte	W02
@@ -184,13 +184,13 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v-16
 	.byte		BEND  , c_v+32
-	.byte		N02   , Fn4 
+	.byte		N02   , Fn4
 	.byte	W01
 	.byte		BEND  , c_v+42
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N02   , Cs6 
+	.byte		N02   , Cs6
 	.byte	W01
 	.byte		BEND  , c_v+0
 	.byte	W01
@@ -198,7 +198,7 @@ se_m_stat_increase_1:
 	.byte	W01
 	.byte		PAN   , c_v+16
 	.byte		BEND  , c_v+5
-	.byte		N02   , Cs5 
+	.byte		N02   , Cs5
 	.byte	W01
 	.byte		BEND  , c_v+8
 	.byte	W02
@@ -214,55 +214,55 @@ se_m_stat_increase_2:
 	.byte		VOL   , 70*se_m_stat_increase_mvl/mxv
 	.byte		N02   , Cn3 , v052
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W03
 	.byte	W01
-	.byte		        Cs3 
+	.byte		        Cs3
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W02
 	.byte	W02
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W04
-	.byte		N02   
+	.byte		N02
 	.byte	W03
-	.byte		        Ds3 
+	.byte		        Ds3
 	.byte	W03
 	.byte	W01
-	.byte		N02   
+	.byte		N02
 	.byte	W03
-	.byte		        En3 
+	.byte		        En3
 	.byte	W02
 	.byte	W02
-	.byte		N02   
+	.byte		N02
 	.byte	W04
-	.byte		        Fn3 
+	.byte		        Fn3
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W03
 	.byte	W01
-	.byte		        Fs3 
+	.byte		        Fs3
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W02
 	.byte	W02
-	.byte		        Gn3 
+	.byte		        Gn3
 	.byte	W04
 	.byte		        Gn3 , v032
 	.byte	W03
-	.byte		        Gs3 
+	.byte		        Gs3
 	.byte	W03
 	.byte	W01
-	.byte		N02   
+	.byte		N02
 	.byte	W03
 	.byte		        An3 , v020
 	.byte	W02
 	.byte	W02
-	.byte		N02   
+	.byte		N02
 	.byte	W04
 	.byte		        As3 , v012
 	.byte	W03
-	.byte		N02   
+	.byte		N02
 	.byte	W03
 	.byte	FINE
 
diff --git a/sound/songs/se_m_strength.s b/sound/songs/se_m_strength.s
index 0fca48906..bda5fc61e 100644
--- a/sound/songs/se_m_strength.s
+++ b/sound/songs/se_m_strength.s
@@ -51,9 +51,9 @@ se_m_strength_2:
 	.byte		VOL   , 110*se_m_strength_mvl/mxv
 	.byte		N02   , Fn2 , v072
 	.byte	W02
-	.byte		N01   
+	.byte		N01
 	.byte	W01
-	.byte		N02   , Gn2 
+	.byte		N02   , Gn2
 	.byte	W03
 	.byte		N01   , Gs2 , v060
 	.byte	W01
diff --git a/sound/songs/se_m_string_shot2.s b/sound/songs/se_m_string_shot2.s
index 7bd0a7427..b885a7d1a 100644
--- a/sound/songs/se_m_string_shot2.s
+++ b/sound/songs/se_m_string_shot2.s
@@ -32,7 +32,7 @@ se_m_string_shot2_1:
 	.byte		        c_v+8
 	.byte	W01
 	.byte		PAN   , c_v+16
-	.byte		N09   , Gn4 
+	.byte		N09   , Gn4
 	.byte	W03
 	.byte		BEND  , c_v-8
 	.byte	W03
@@ -40,7 +40,7 @@ se_m_string_shot2_1:
 	.byte	W06
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-11
-	.byte		N09   , En4 
+	.byte		N09   , En4
 	.byte	W03
 	.byte		BEND  , c_v-5
 	.byte	W03
@@ -49,7 +49,7 @@ se_m_string_shot2_1:
 	.byte		        c_v-3
 	.byte	W01
 	.byte		PAN   , c_v-16
-	.byte		N09   , Gn4 
+	.byte		N09   , Gn4
 	.byte	W03
 	.byte		BEND  , c_v-19
 	.byte	W03
@@ -57,7 +57,7 @@ se_m_string_shot2_1:
 	.byte	W06
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-19
-	.byte		N09   , En4 
+	.byte		N09   , En4
 	.byte	W03
 	.byte		BEND  , c_v-13
 	.byte	W03
@@ -101,14 +101,14 @@ se_m_string_shot2_2:
 	.byte		N09   , Cn3 , v052
 	.byte	W12
 	.byte		PAN   , c_v-7
-	.byte		N09   , Gn2 
+	.byte		N09   , Gn2
 	.byte	W12
 se_m_string_shot2_2_000:
 	.byte		PAN   , c_v+9
 	.byte		N09   , Cn3 , v052
 	.byte	W12
 	.byte		PAN   , c_v-6
-	.byte		N09   , Gn2 
+	.byte		N09   , Gn2
 	.byte	W12
 	.byte	PEND
 	.byte	PATT
diff --git a/sound/songs/se_m_supersonic.s b/sound/songs/se_m_supersonic.s
index f791c9b15..c975dad4b 100644
--- a/sound/songs/se_m_supersonic.s
+++ b/sound/songs/se_m_supersonic.s
@@ -44,7 +44,7 @@ se_m_supersonic_1:
 	.byte		VOL   , 0*se_m_supersonic_mvl/mxv
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v-4
-	.byte		N32   
+	.byte		N32
 	.byte	W01
 	.byte		PAN   , c_v+6
 	.byte		BEND  , c_v-1
diff --git a/sound/songs/se_m_sweet_scent.s b/sound/songs/se_m_sweet_scent.s
index 0abf858d2..3b9bd527c 100644
--- a/sound/songs/se_m_sweet_scent.s
+++ b/sound/songs/se_m_sweet_scent.s
@@ -33,7 +33,7 @@ se_m_sweet_scent_1:
 	.byte	W12
 	.byte		PAN   , c_v-4
 	.byte		BEND  , c_v+5
-	.byte		N36   , Fn3 
+	.byte		N36   , Fn3
 	.byte	W12
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+6
@@ -172,7 +172,7 @@ se_m_sweet_scent_2:
 	.byte	W02
 	.byte		VOL   , 12*se_m_sweet_scent_mvl/mxv
 	.byte	W03
-	.byte		EOT   
+	.byte		EOT
 	.byte	FINE
 
 @******************************************************@
diff --git a/sound/songs/se_m_swift.s b/sound/songs/se_m_swift.s
index 10649a80e..c87cbea41 100644
--- a/sound/songs/se_m_swift.s
+++ b/sound/songs/se_m_swift.s
@@ -41,7 +41,7 @@ se_m_swift_1:
 	.byte	W02
 	.byte		VOL   , 100*se_m_swift_mvl/mxv
 	.byte		BEND  , c_v+0
-	.byte		N06   
+	.byte		N06
 	.byte	W01
 	.byte		PAN   , c_v+5
 	.byte		BEND  , c_v-11
diff --git a/sound/songs/se_m_teleport.s b/sound/songs/se_m_teleport.s
index 2c4ad40e8..60f7945d7 100644
--- a/sound/songs/se_m_teleport.s
+++ b/sound/songs/se_m_teleport.s
@@ -68,7 +68,7 @@ se_m_teleport_1:
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+6
-	.byte		N06   , Fn3 
+	.byte		N06   , Fn3
 	.byte	W01
 	.byte		BEND  , c_v+11
 	.byte	W01
diff --git a/sound/songs/se_m_thunder_wave.s b/sound/songs/se_m_thunder_wave.s
index c26535500..a0b06cb5d 100644
--- a/sound/songs/se_m_thunder_wave.s
+++ b/sound/songs/se_m_thunder_wave.s
@@ -31,7 +31,7 @@ se_m_thunder_wave_1:
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+32
-	.byte		N04   , Cn3 
+	.byte		N04   , Cn3
 	.byte	W02
 	.byte		PAN   , c_v+9
 	.byte	W01
@@ -39,11 +39,11 @@ se_m_thunder_wave_1:
 	.byte	W03
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N01   , Gn3 
+	.byte		N01   , Gn3
 	.byte	W02
-	.byte		        Bn2 
+	.byte		        Bn2
 	.byte	W02
-	.byte		N13   , Gn3 
+	.byte		N13   , Gn3
 	.byte	W02
 	.byte		VOL   , 96*se_m_thunder_wave_mvl/mxv
 	.byte	W01
diff --git a/sound/songs/se_m_toxic.s b/sound/songs/se_m_toxic.s
index 0e3ebe220..ae460ad77 100644
--- a/sound/songs/se_m_toxic.s
+++ b/sound/songs/se_m_toxic.s
@@ -36,7 +36,7 @@ se_m_toxic_1:
 	.byte	W01
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N02   , Cn2 
+	.byte		N02   , Cn2
 	.byte	W02
 	.byte		PAN   , c_v-7
 	.byte		BEND  , c_v+16
@@ -44,18 +44,18 @@ se_m_toxic_1:
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
 	.byte	W01
-	.byte		N01   
+	.byte		N01
 	.byte	W01
 	.byte		PAN   , c_v+8
-	.byte		N01   , Cn3 
+	.byte		N01   , Cn3
 	.byte	W01
 	.byte		VOICE , 31
 	.byte		PAN   , c_v-16
-	.byte		N01   , Dn2 
+	.byte		N01   , Dn2
 	.byte	W02
 	.byte		VOICE , 23
 	.byte		PAN   , c_v+0
-	.byte		N01   , Cn2 
+	.byte		N01   , Cn2
 	.byte	W01
 	.byte		VOICE , 31
 	.byte		PAN   , c_v+16
@@ -64,10 +64,10 @@ se_m_toxic_1:
 	.byte		VOICE , 23
 	.byte		PAN   , c_v-8
 	.byte		BEND  , c_v+16
-	.byte		N01   , Cn3 
+	.byte		N01   , Cn3
 	.byte	W02
 	.byte		PAN   , c_v+8
-	.byte		N01   , Cn2 
+	.byte		N01   , Cn2
 	.byte	W08
 	.byte	FINE
 
diff --git a/sound/songs/se_m_tri_attack.s b/sound/songs/se_m_tri_attack.s
index 448998e77..13947e6f1 100644
--- a/sound/songs/se_m_tri_attack.s
+++ b/sound/songs/se_m_tri_attack.s
@@ -68,17 +68,17 @@ se_m_tri_attack_2:
 	.byte		VOL   , 110*se_m_tri_attack_mvl/mxv
 	.byte		N02   , Gs3 , v032
 	.byte	W02
-	.byte		        Gn3 
+	.byte		        Gn3
 	.byte	W02
-	.byte		        Fn3 
+	.byte		        Fn3
 	.byte	W03
-	.byte		        En3 
+	.byte		        En3
 	.byte	W02
-	.byte		        Dn3 
+	.byte		        Dn3
 	.byte	W03
-	.byte		        Cn3 
+	.byte		        Cn3
 	.byte	W02
-	.byte		        Gs2 
+	.byte		        Gs2
 	.byte	W10
 	.byte	FINE
 
diff --git a/sound/songs/se_m_tri_attack2.s b/sound/songs/se_m_tri_attack2.s
index 0afade13c..61f11c396 100644
--- a/sound/songs/se_m_tri_attack2.s
+++ b/sound/songs/se_m_tri_attack2.s
@@ -100,7 +100,7 @@ se_m_tri_attack2_2:
 	.byte		VOL   , 110*se_m_tri_attack2_mvl/mxv
 	.byte		N06   , Cn3 , v060
 	.byte	W09
-	.byte		N15   
+	.byte		N15
 	.byte	W15
 	.byte	W24
 	.byte	W24
diff --git a/sound/songs/se_m_twister.s b/sound/songs/se_m_twister.s
index e95e9b322..bbb4f1ec0 100644
--- a/sound/songs/se_m_twister.s
+++ b/sound/songs/se_m_twister.s
@@ -147,7 +147,7 @@ se_m_twister_1:
 	.byte	W02
 	.byte		PAN   , c_v-11
 	.byte	W03
-	.byte		EOT   
+	.byte		EOT
 	.byte	FINE
 
 @********************** Track  2 **********************@
@@ -190,7 +190,7 @@ se_m_twister_2:
 	.byte	W05
 	.byte		        18*se_m_twister_mvl/mxv
 	.byte	W05
-	.byte		EOT   
+	.byte		EOT
 	.byte	FINE
 
 @******************************************************@
diff --git a/sound/songs/se_m_vital_throw.s b/sound/songs/se_m_vital_throw.s
index c89d003b6..3e04b43e5 100644
--- a/sound/songs/se_m_vital_throw.s
+++ b/sound/songs/se_m_vital_throw.s
@@ -36,10 +36,10 @@ se_m_vital_throw_1:
 	.byte		VOICE , 21
 	.byte		VOL   , 110*se_m_vital_throw_mvl/mxv
 	.byte		BEND  , c_v+0
-	.byte		N03   , Gn4 
+	.byte		N03   , Gn4
 	.byte	W06
 	.byte		PAN   , c_v+16
-	.byte		N03   , Cn5 
+	.byte		N03   , Cn5
 	.byte	W09
 	.byte	FINE
 
@@ -54,7 +54,7 @@ se_m_vital_throw_2:
 	.byte		N03   , Cn3 , v052
 	.byte	W06
 	.byte		PAN   , c_v-7
-	.byte		N03   
+	.byte		N03
 	.byte	W09
 	.byte	FINE
 
diff --git a/sound/songs/se_m_vital_throw2.s b/sound/songs/se_m_vital_throw2.s
index 3bffdeb25..0d1e64ecb 100644
--- a/sound/songs/se_m_vital_throw2.s
+++ b/sound/songs/se_m_vital_throw2.s
@@ -36,7 +36,7 @@ se_m_vital_throw2_1:
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N06   , En3 
+	.byte		N06   , En3
 	.byte	W01
 	.byte		BEND  , c_v-9
 	.byte	W01
@@ -49,7 +49,7 @@ se_m_vital_throw2_1:
 	.byte	W02
 	.byte		PAN   , c_v+0
 	.byte		BEND  , c_v+0
-	.byte		N09   , An2 
+	.byte		N09   , An2
 	.byte	W01
 	.byte		BEND  , c_v-9
 	.byte	W01
@@ -84,10 +84,10 @@ se_m_vital_throw2_2:
 	.byte		N03   , Gs2 , v052
 	.byte	W06
 	.byte		PAN   , c_v-7
-	.byte		N03   
+	.byte		N03
 	.byte	W06
 	.byte		PAN   , c_v+0
-	.byte		N03   
+	.byte		N03
 	.byte	W12
 	.byte	FINE
 
diff --git a/sound/songs/se_m_waterfall.s b/sound/songs/se_m_waterfall.s
index a07e7e971..9e16b9ee7 100644
--- a/sound/songs/se_m_waterfall.s
+++ b/sound/songs/se_m_waterfall.s
@@ -100,23 +100,23 @@ se_m_waterfall_2:
 	.byte		VOL   , 115*se_m_waterfall_mvl/mxv
 	.byte		N06   , Cn3 , v040
 	.byte	W06
-	.byte		        Gn2 
+	.byte		        Gn2
 	.byte	W06
 se_m_waterfall_2_000:
 	.byte		N06   , Cn3 , v040
 	.byte	W06
-	.byte		        Gn2 
+	.byte		        Gn2
 	.byte	W06
 	.byte	PEND
 	.byte	PATT
 	 .word	se_m_waterfall_2_000
 	.byte		N06   , Cn3 , v032
 	.byte	W06
-	.byte		        Gn2 
+	.byte		        Gn2
 	.byte	W06
 	.byte		        Cn3 , v012
 	.byte	W06
-	.byte		        Gn2 
+	.byte		        Gn2
 	.byte	W06
 	.byte	FINE
 
diff --git a/sound/songs/se_m_whirlpool.s b/sound/songs/se_m_whirlpool.s
index bac3fa5bc..bf0b9cc72 100644
--- a/sound/songs/se_m_whirlpool.s
+++ b/sound/songs/se_m_whirlpool.s
@@ -106,7 +106,7 @@ se_m_whirlpool_1:
 	.byte	W01
 	.byte		BEND  , c_v-28
 	.byte	W04
-	.byte		EOT   
+	.byte		EOT
 	.byte	FINE
 
 @******************************************************@
diff --git a/sound/songs/se_win_open.s b/sound/songs/se_win_open.s
index 74656e9c0..b5d582a8d 100644
--- a/sound/songs/se_win_open.s
+++ b/sound/songs/se_win_open.s
@@ -22,7 +22,7 @@ se_win_open_1:
 	.byte		VOL   , 110*se_win_open_mvl/mxv
 	.byte		N03   , Ds3 , v127
 	.byte	W03
-	.byte		N15   , Gn4 
+	.byte		N15   , Gn4
 	.byte	W21
 	.byte	FINE
 
diff --git a/sound/voicegroups/voicegroup000.inc b/sound/voicegroups/voicegroup000.inc
index 96dc02dfb..7a2c5772f 100644
--- a/sound/voicegroups/voicegroup000.inc
+++ b/sound/voicegroups/voicegroup000.inc
@@ -1,65 +1,65 @@
 	.align 2
-voicegroup000:: @ 8675D04
-	voice_keysplit_all voicegroup001  @ 8675D04
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8675D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D40
-	voice_square_2 60, 0, 2, 0, 0, 9, 2  @ 8675D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D64
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235  @ 8675D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DC4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 8675DD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E78
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 8675E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675EA8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115  @ 8675EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675EC0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8675ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675EE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F2C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239  @ 8675F38
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8675F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675F98
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8675FA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675FB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675FE0
+voicegroup000::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 0, 9, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 
diff --git a/sound/voicegroups/voicegroup001.inc b/sound/voicegroups/voicegroup001.inc
index 1a2447e41..9960daf4a 100644
--- a/sound/voicegroups/voicegroup001.inc
+++ b/sound/voicegroups/voicegroup001.inc
@@ -1,32 +1,32 @@
 	.align 2
-voicegroup001:: @ 8675FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8675FF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867601C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676040
-	voice_square_1 60, 0, 0, 2, 0, 1, 6, 0  @ 867604C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676064
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 8676070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867607C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86760A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86760AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86760B8
-	voice_square_2 60, 0, 2, 0, 1, 6, 0  @ 86760C4
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1  @ 86760D0
-	voice_square_1 60, 0, 0, 2, 0, 1, 6, 0  @ 86760DC
-	voice_square_2 60, 0, 3, 0, 1, 6, 0  @ 86760E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86760F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867610C
-	voice_square_1 60, 0, 0, 0, 0, 1, 6, 0  @ 8676118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676130
-	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0  @ 867613C
+voicegroup001::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 1, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 6, 0
+	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 1, 6, 0
+	voice_square_2 60, 0, 3, 0, 1, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 0, 0, 1, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0
 
diff --git a/sound/voicegroups/voicegroup002.inc b/sound/voicegroups/voicegroup002.inc
index 4a727f8e0..bd6f080aa 100644
--- a/sound/voicegroups/voicegroup002.inc
+++ b/sound/voicegroups/voicegroup002.inc
@@ -1,57 +1,57 @@
 	.align 2
-voicegroup002:: @ 8676148
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127  @ 8676148
-	voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127  @ 8676154
-	voice_directsound 60, 0, DirectSoundWaveData_unused_guitar_separates_power_chord, 255, 165, 206, 127  @ 8676160
-	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 206, 127  @ 867616C
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_snare, 255, 0, 255, 0  @ 8676178
-	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0  @ 8676184
-	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0  @ 8676190
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242  @ 867619C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86761A8
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 86761B4
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 86761C0
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 86761CC
-	voice_directsound 48, 44, DirectSoundWaveData_unused_sc55_tom, 255, 210, 77, 204  @ 86761D8
-	voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188  @ 86761E4
-	voice_directsound 51, 54, DirectSoundWaveData_unused_sc55_tom, 255, 216, 77, 204  @ 86761F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86761FC
-	voice_directsound 54, 64, DirectSoundWaveData_unused_sc55_tom, 255, 216, 77, 204  @ 8676208
-	voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_open_hihat, 255, 242, 141, 0  @ 8676214
-	voice_directsound 57, 69, DirectSoundWaveData_unused_sc55_tom, 255, 210, 77, 204  @ 8676220
-	voice_directsound 60, 79, DirectSoundWaveData_unused_sc55_tom, 255, 204, 77, 204  @ 867622C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676238
-	voice_directsound 62, 84, DirectSoundWaveData_unused_sc55_tom, 255, 204, 77, 204  @ 8676244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867625C
-	voice_directsound_no_resample 70, 49, DirectSoundWaveData_unknown_bell, 255, 165, 103, 231  @ 8676268
-	voice_directsound_no_resample 32, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 8676274
-	voice_directsound_no_resample 60, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 235, 0, 165  @ 8676280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867628C
-	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216  @ 8676298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86762A4
-	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216  @ 86762B0
-	voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 86762BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86762C8
-	voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 86762D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86762E0
-	voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86762EC
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0  @ 86762F8
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228  @ 8676304
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242  @ 8676310
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 867631C
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 8676328
-	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676334
-	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 8676340
-	voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 867634C
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 8676358
-	voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676364
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 8676370
-	voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 867637C
-	voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676388
-	voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676394
-	voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235  @ 86763A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86763AC
-	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86763B8
-	voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231  @ 86763C4
+voicegroup002::
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 255, 165, 154, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 255, 165, 154, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unused_guitar_separates_power_chord, 255, 165, 206, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 206, 127
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_snare, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_directsound 48, 44, DirectSoundWaveData_unused_sc55_tom, 255, 210, 77, 204
+	voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188
+	voice_directsound 51, 54, DirectSoundWaveData_unused_sc55_tom, 255, 216, 77, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 54, 64, DirectSoundWaveData_unused_sc55_tom, 255, 216, 77, 204
+	voice_directsound_no_resample 60, 79, DirectSoundWaveData_unknown_open_hihat, 255, 242, 141, 0
+	voice_directsound 57, 69, DirectSoundWaveData_unused_sc55_tom, 255, 210, 77, 204
+	voice_directsound 60, 79, DirectSoundWaveData_unused_sc55_tom, 255, 204, 77, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 62, 84, DirectSoundWaveData_unused_sc55_tom, 255, 204, 77, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 70, 49, DirectSoundWaveData_unknown_bell, 255, 165, 103, 231
+	voice_directsound_no_resample 32, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204
+	voice_directsound_no_resample 60, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 235, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216
+	voice_directsound_no_resample 30, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 72, 104, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 72, 94, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242
+	voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242
+	voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231
 
diff --git a/sound/voicegroups/voicegroup003.inc b/sound/voicegroups/voicegroup003.inc
index cef9cb577..d77150fc1 100644
--- a/sound/voicegroups/voicegroup003.inc
+++ b/sound/voicegroups/voicegroup003.inc
@@ -1,57 +1,57 @@
 	.align 2
-voicegroup003:: @ 86763D0
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 86763D0
-	voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188  @ 86763DC
-	voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242  @ 86763E8
-	voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86763F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676400
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867640C
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 8676418
-	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0  @ 8676424
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 8676430
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 867643C
-	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 8676448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867646C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867649C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86764FC
-	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 8676508
-	voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 8676514
-	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188  @ 8676520
-	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0  @ 867652C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676544
-	voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 8676550
-	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0  @ 867655C
-	voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 8676568
-	voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 8676574
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0  @ 8676580
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228  @ 867658C
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242  @ 8676598
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 86765A4
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 86765B0
-	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86765BC
-	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 86765C8
-	voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86765D4
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 86765E0
-	voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86765EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86765F8
-	voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676604
-	voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676610
-	voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867661C
-	voice_directsound 64, 104, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 235  @ 8676628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676634
-	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676640
-	voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231  @ 867664C
+voicegroup003::
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204
+	voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188
+	voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242
+	voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216
+	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188
+	voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0
+	voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0
+	voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242
+	voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 33, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound 64, 104, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231
 
diff --git a/sound/voicegroups/voicegroup004.inc b/sound/voicegroups/voicegroup004.inc
index 367aafa15..6aa28d6a9 100644
--- a/sound/voicegroups/voicegroup004.inc
+++ b/sound/voicegroups/voicegroup004.inc
@@ -1,93 +1,93 @@
 	.align 2
-voicegroup004:: @ 8676658
-	voice_directsound_no_resample 66, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 8676658
-	voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188  @ 8676664
-	voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242  @ 8676670
-	voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867667C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676688
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676694
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 86766A0
-	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0  @ 86766AC
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 86766B8
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86766C4
-	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86766D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86766DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86766E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86766F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867670C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867673C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676748
-	voice_directsound_no_resample 61, 84, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0  @ 8676754
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0  @ 8676760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867676C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676784
-	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 8676790
-	voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 867679C
-	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188  @ 86767A8
-	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0  @ 86767B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86767C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86767CC
-	voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 86767D8
-	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0  @ 86767E4
-	voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 86767F0
-	voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 86767FC
-	voice_directsound 62, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0  @ 8676808
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228  @ 8676814
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242  @ 8676820
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 867682C
-	voice_directsound 65, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 8676838
-	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676844
-	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 8676850
-	voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 867685C
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 8676868
-	voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676880
-	voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 867688C
-	voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 8676898
-	voice_directsound 56, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86768A4
-	voice_directsound 64, 104, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 235  @ 86768B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86768BC
-	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86768C8
-	voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231  @ 86768D4
-	voice_directsound_no_resample 66, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 86768E0
-	voice_directsound 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188  @ 86768EC
-	voice_directsound 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242  @ 86768F8
-	voice_directsound 60, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 8676904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676910
-	voice_directsound 58, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 867691C
-	voice_directsound 62, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 8676928
-	voice_directsound 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0  @ 8676934
-	voice_directsound 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 8676940
-	voice_directsound 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 867694C
-	voice_directsound 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 8676958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867697C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86769A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86769AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86769B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86769C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86769D0
-	voice_directsound 61, 84, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0  @ 86769DC
-	voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0  @ 86769E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86769F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676A0C
-	voice_directsound 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 8676A18
-	voice_directsound 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 8676A24
-	voice_directsound 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188  @ 8676A30
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0  @ 8676A3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676A48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676A54
-	voice_directsound 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 8676A60
-	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0  @ 8676A6C
-	voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 8676A78
-	voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 8676A84
+voicegroup004::
+	voice_directsound_no_resample 66, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204
+	voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188
+	voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242
+	voice_directsound_no_resample 64, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216
+	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 61, 84, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188
+	voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0
+	voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0
+	voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0
+	voice_directsound 62, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
+	voice_directsound 65, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 64, 80, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_directsound 68, 34, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242
+	voice_directsound 72, 44, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 76, 84, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound 80, 94, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound 56, 89, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound 64, 104, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231
+	voice_directsound_no_resample 66, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204
+	voice_directsound 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188
+	voice_directsound 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242
+	voice_directsound 60, 29, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 58, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound 62, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216
+	voice_directsound 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0
+	voice_directsound 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0
+	voice_directsound 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_directsound 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 61, 84, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 255, 0
+	voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188
+	voice_directsound 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188
+	voice_directsound 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0
+	voice_directsound 50, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0
+	voice_directsound 64, 84, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0
 
diff --git a/sound/voicegroups/voicegroup005.inc b/sound/voicegroups/voicegroup005.inc
index cd5c2d766..584451a62 100644
--- a/sound/voicegroups/voicegroup005.inc
+++ b/sound/voicegroups/voicegroup005.inc
@@ -1,7 +1,7 @@
 	.align 2
-voicegroup005:: @ 8676A90
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_48, 255, 252, 0, 239  @ 8676A90
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_60, 255, 250, 0, 221  @ 8676A9C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_72, 255, 250, 0, 221  @ 8676AA8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_84, 255, 247, 0, 221  @ 8676AB4
+voicegroup005::
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_48, 255, 252, 0, 239
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_60, 255, 250, 0, 221
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_72, 255, 250, 0, 221
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_piano1_84, 255, 247, 0, 221
 
diff --git a/sound/voicegroups/voicegroup006.inc b/sound/voicegroups/voicegroup006.inc
index fc030a26c..52b2b335f 100644
--- a/sound/voicegroups/voicegroup006.inc
+++ b/sound/voicegroups/voicegroup006.inc
@@ -1,6 +1,6 @@
 	.align 2
-voicegroup006:: @ 8676AC0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_60, 255, 0, 255, 196  @ 8676AC0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 196  @ 8676ACC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_84, 255, 0, 255, 196  @ 8676AD8
+voicegroup006::
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_60, 255, 0, 255, 196
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 196
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_84, 255, 0, 255, 196
 
diff --git a/sound/voicegroups/voicegroup007.inc b/sound/voicegroups/voicegroup007.inc
index 1214ddd4e..66bcd3fa6 100644
--- a/sound/voicegroups/voicegroup007.inc
+++ b/sound/voicegroups/voicegroup007.inc
@@ -1,134 +1,134 @@
 	.align 2
-voicegroup007:: @ 8676AE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_60, 255, 0, 193, 127  @ 8676AE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_72, 255, 0, 193, 127  @ 8676AF0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_84, 255, 0, 193, 127  @ 8676AFC
-	voice_square_1_alt 60, 0, 38, 2, 1, 0, 0, 0  @ 8676B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676BD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676CC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676E98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676EB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8676FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867700C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867703C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867706C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867709C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86770A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86770B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86770C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86770CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86770D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86770E4
-	voice_square_1_alt 60, 0, 36, 2, 0, 1, 4, 2  @ 86770F0
-	voice_square_1_alt 60, 0, 21, 2, 0, 0, 15, 2  @ 86770FC
+voicegroup007::
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_60, 255, 0, 193, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_72, 255, 0, 193, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_trumpet_84, 255, 0, 193, 127
+	voice_square_1_alt 60, 0, 38, 2, 1, 0, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 36, 2, 0, 1, 4, 2
+	voice_square_1_alt 60, 0, 21, 2, 0, 0, 15, 2
 
diff --git a/sound/voicegroups/voicegroup008.inc b/sound/voicegroups/voicegroup008.inc
index c0d87ce5d..7fc874e87 100644
--- a/sound/voicegroups/voicegroup008.inc
+++ b/sound/voicegroups/voicegroup008.inc
@@ -1,5 +1,5 @@
 	.align 2
-voicegroup008:: @ 8677108
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_39, 255, 0, 255, 165  @ 8677108
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_51, 255, 0, 255, 165  @ 8677114
+voicegroup008::
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_39, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tuba_51, 255, 0, 255, 165
 
diff --git a/sound/voicegroups/voicegroup009.inc b/sound/voicegroups/voicegroup009.inc
index ebf550a03..4a51a02ca 100644
--- a/sound/voicegroups/voicegroup009.inc
+++ b/sound/voicegroups/voicegroup009.inc
@@ -1,5 +1,5 @@
 	.align 2
-voicegroup009:: @ 8677120
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_60, 255, 0, 224, 165  @ 8677120
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 255, 0, 218, 165  @ 867712C
+voicegroup009::
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_60, 255, 0, 224, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 255, 0, 218, 165
 
diff --git a/sound/voicegroups/voicegroup010.inc b/sound/voicegroups/voicegroup010.inc
index f4fe73e93..e2b38fcbd 100644
--- a/sound/voicegroups/voicegroup010.inc
+++ b/sound/voicegroups/voicegroup010.inc
@@ -1,87 +1,87 @@
 	.align 2
-voicegroup010:: @ 8677138
-	voice_keysplit_all voicegroup031  @ 8677138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867715C
-	voice_square_2 60, 0, 3, 0, 4, 0, 1  @ 8677168
-	voice_square_1 60, 0, 0, 3, 0, 4, 0, 1  @ 8677174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867718C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242  @ 86771E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86771F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867721C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867724C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867727C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86772A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86772AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86772B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86772C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86772D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86772DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86772E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86772F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867730C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867733C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677354
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204  @ 8677360
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867736C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8677378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867739C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86773A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86773B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86773C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86773CC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86773D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86773E4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86773F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86773FC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8677408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867742C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867745C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867748C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86774A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86774B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86774BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86774C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86774D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86774E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86774EC
-	voice_square_2 60, 0, 3, 0, 1, 7, 1  @ 86774F8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2  @ 8677504
-	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1  @ 8677510
-	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1  @ 867751C
+voicegroup010::
+	voice_keysplit_all voicegroup031
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 3, 0, 4, 0, 1
+	voice_square_1 60, 0, 0, 3, 0, 4, 0, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 3, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup011.inc b/sound/voicegroups/voicegroup011.inc
index 8102d59f4..a8655cb8c 100644
--- a/sound/voicegroups/voicegroup011.inc
+++ b/sound/voicegroups/voicegroup011.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup011:: @ 8677528
-	voice_keysplit_all voicegroup022  @ 8677528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867754C
-	voice_square_1_alt 60, 0, 0, 3, 0, 2, 4, 0  @ 8677558
-	voice_square_2_alt 60, 0, 3, 0, 2, 4, 0  @ 8677564
-	voice_square_2_alt 60, 0, 2, 0, 3, 0, 0  @ 8677570
-	voice_square_2_alt 60, 0, 2, 0, 3, 0, 0  @ 867757C
-	voice_square_1_alt 60, 0, 0, 2, 0, 3, 0, 0  @ 8677588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86775A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86775AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86775B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86775C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86775D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86775DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86775E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86775F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867760C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867763C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 149  @ 8677648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867766C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867769C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 86776CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86776FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867772C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867775C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8677768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867778C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86777A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86777B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86777BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86777C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86777D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86777E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86777EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86777F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867781C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867784C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867787C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677888
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8677894
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 86778A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86778AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86778B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86778C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86778D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86778DC
-	voice_square_2_alt 60, 0, 2, 1, 1, 7, 1  @ 86778E8
-	voice_square_1_alt 60, 0, 0, 2, 1, 1, 7, 1  @ 86778F4
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1  @ 8677900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867790C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867793C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867796C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867799C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86779A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86779B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86779C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86779CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86779D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86779E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86779F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86779FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B10
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8677B1C
+voicegroup011::
+	voice_keysplit_all voicegroup022
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 2, 4, 0
+	voice_square_2_alt 60, 0, 3, 0, 2, 4, 0
+	voice_square_2_alt 60, 0, 2, 0, 3, 0, 0
+	voice_square_2_alt 60, 0, 2, 0, 3, 0, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 3, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 1, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 2, 1, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup012.inc b/sound/voicegroups/voicegroup012.inc
index 670ae6553..d92c270cb 100644
--- a/sound/voicegroups/voicegroup012.inc
+++ b/sound/voicegroups/voicegroup012.inc
@@ -1,105 +1,105 @@
 	.align 2
-voicegroup012:: @ 8677B28
-	voice_keysplit_all voicegroup001  @ 8677B28
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8677B34
-	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 178, 180, 165  @ 8677B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677B88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235  @ 8677B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BB8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8677BC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8677CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D44
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204  @ 8677D50
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 8677D5C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8677D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677DBC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8677DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677DD4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8677DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677DEC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8677DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677E88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8677E94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677EDC
-	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1  @ 8677EE8
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1  @ 8677EF4
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1  @ 8677F00
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1  @ 8677F0C
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 8677F18
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 8677F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677F30
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2  @ 8677F3C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2  @ 8677F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677F54
-	voice_square_2 60, 0, 2, 0, 1, 4, 1  @ 8677F60
-	voice_square_1 60, 0, 0, 2, 0, 1, 4, 1  @ 8677F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677F90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677FA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677FCC
-	voice_square_1_alt 60, 0, 29, 2, 0, 2, 0, 0  @ 8677FD8
-	voice_square_1_alt 60, 0, 22, 2, 0, 2, 0, 0  @ 8677FE4
+voicegroup012::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 178, 180, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 29, 2, 0, 2, 0, 0
+	voice_square_1_alt 60, 0, 22, 2, 0, 2, 0, 0
 
diff --git a/sound/voicegroups/voicegroup013.inc b/sound/voicegroups/voicegroup013.inc
index b8a05c59e..f17ad599a 100644
--- a/sound/voicegroups/voicegroup013.inc
+++ b/sound/voicegroups/voicegroup013.inc
@@ -1,93 +1,93 @@
 	.align 2
-voicegroup013:: @ 8677FF0
-	voice_keysplit_all voicegroup001  @ 8677FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8677FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867802C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867805C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867808C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86780A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86780B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86780BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86780C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86780D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86780E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86780EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86780F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867811C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867814C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867817C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86781A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86781AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86781B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86781C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86781D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86781DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86781E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86781F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867820C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678218
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 8678224
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8678230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867823C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867826C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678284
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8678290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867829C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86782A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86782B4
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86782C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86782CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86782D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86782E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86782F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86782FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867832C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867835C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867838C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86783A4
-	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1  @ 86783B0
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1  @ 86783BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86783C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86783D4
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1  @ 86783E0
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1  @ 86783EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86783F8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1  @ 8678404
-	voice_square_1_alt 60, 0, 0, 1, 0, 0, 7, 1  @ 8678410
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 1  @ 867841C
+voicegroup013::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 1, 0, 0, 7, 1
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup014.inc b/sound/voicegroups/voicegroup014.inc
index 6506a7e48..c3136f2fd 100644
--- a/sound/voicegroups/voicegroup014.inc
+++ b/sound/voicegroups/voicegroup014.inc
@@ -1,88 +1,88 @@
 	.align 2
-voicegroup014:: @ 8678428
-	voice_keysplit_all voicegroup001  @ 8678428
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8678434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867844C
-	voice_square_2_alt 60, 0, 3, 0, 1, 6, 1  @ 8678458
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 6, 1  @ 8678464
-	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1  @ 8678470
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 1  @ 867847C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86784A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86784AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86784B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86784C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86784D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86784DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86784E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86784F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867850C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867853C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 149  @ 8678548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867856C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867859C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86785A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86785B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86785C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86785CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86785D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86785E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86785F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86785FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867862C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678644
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 8678650
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867865C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8678668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867868C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86786A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86786B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86786BC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86786C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86786D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86786E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86786EC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86786F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867871C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867874C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867877C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678788
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8678794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86787A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86787AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86787B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86787C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86787D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86787DC
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1  @ 86787E8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1  @ 86787F4
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1  @ 8678800
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0  @ 867880C
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0  @ 8678818
+voicegroup014::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 6, 1
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 6, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0
 
diff --git a/sound/voicegroups/voicegroup015.inc b/sound/voicegroups/voicegroup015.inc
index a1dc7899c..81e200180 100644
--- a/sound/voicegroups/voicegroup015.inc
+++ b/sound/voicegroups/voicegroup015.inc
@@ -1,95 +1,95 @@
 	.align 2
-voicegroup015:: @ 8678824
-	voice_keysplit_all voicegroup016  @ 8678824
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8678830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867883C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867886C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867889C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86788A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86788B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86788C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86788CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86788D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86788E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86788F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86788FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867892C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678938
-	voice_square_2 60, 0, 3, 0, 2, 0, 0  @ 8678944
-	voice_square_1 60, 0, 0, 3, 0, 2, 0, 0  @ 8678950
-	voice_square_2 60, 0, 3, 0, 6, 0, 0  @ 867895C
-	voice_square_1 60, 0, 0, 3, 0, 6, 0, 0  @ 8678968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867898C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789BC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 86789C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86789F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A58
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8678A64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678A94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AB8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 8678AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678B84
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8678B90
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 8678B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678BA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678BE4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2  @ 8678BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C68
+voicegroup015::
+	voice_keysplit_all voicegroup016
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 3, 0, 2, 0, 0
+	voice_square_1 60, 0, 0, 3, 0, 2, 0, 0
+	voice_square_2 60, 0, 3, 0, 6, 0, 0
+	voice_square_1 60, 0, 0, 3, 0, 6, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 
diff --git a/sound/voicegroups/voicegroup016.inc b/sound/voicegroups/voicegroup016.inc
index ca495e050..1b17ac49c 100644
--- a/sound/voicegroups/voicegroup016.inc
+++ b/sound/voicegroups/voicegroup016.inc
@@ -1,68 +1,68 @@
 	.align 2
-voicegroup016:: @ 8678C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678C98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678CA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678CB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678CE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678DD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678DDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678DE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E00
-	voice_noise_alt 60, 0, 0, 0, 2, 0, 2  @ 8678E0C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 1  @ 8678E18
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242  @ 8678E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E30
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 8678E3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E48
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 8678E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678EE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678EF0
-	voice_directsound_no_resample 32, 74, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 8678EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F50
-	voice_directsound_no_resample 72, 66, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 8678F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678F68
-	voice_directsound_no_resample 72, 62, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 8678F74
+voicegroup016::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 0, 2
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 1
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 32, 74, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 72, 66, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 72, 62, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
 
diff --git a/sound/voicegroups/voicegroup017.inc b/sound/voicegroups/voicegroup017.inc
index 3064a4bd1..f963fb77e 100644
--- a/sound/voicegroups/voicegroup017.inc
+++ b/sound/voicegroups/voicegroup017.inc
@@ -1,94 +1,94 @@
 	.align 2
-voicegroup017:: @ 8678F80
-	voice_keysplit_all voicegroup001  @ 8678F80
-	voice_square_2_alt 60, 0, 2, 0, 3, 3, 1  @ 8678F8C
-	voice_square_1_alt 60, 0, 0, 2, 0, 3, 3, 1  @ 8678F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678FA4
-	voice_square_2_alt 60, 0, 2, 0, 1, 7, 2  @ 8678FB0
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 2  @ 8678FBC
-	voice_square_2_alt 60, 0, 2, 1, 1, 0, 0  @ 8678FC8
-	voice_square_1_alt 60, 0, 0, 2, 1, 1, 0, 0  @ 8678FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8678FF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867901C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867904C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867907C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86790A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86790AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86790B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86790C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86790D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86790DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86790E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86790F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867910C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867913C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867916C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679190
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 867919C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204  @ 86791A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86791B4
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86791C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86791CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86791D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86791E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86791F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86791FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867922C
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8679238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679244
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8679250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867925C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867928C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86792A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86792B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86792BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86792C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86792D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86792E0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86792EC
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 86792F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867931C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679334
-	voice_square_2_alt 60, 0, 2, 1, 1, 7, 2  @ 8679340
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2  @ 867934C
-	voice_square_1_alt 60, 0, 0, 2, 1, 1, 7, 2  @ 8679358
-	voice_square_2_alt 60, 0, 3, 1, 1, 7, 2  @ 8679364
-	voice_square_1_alt 60, 0, 0, 3, 1, 1, 7, 2  @ 8679370
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 3  @ 867937C
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 2  @ 8679388
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 2  @ 8679394
-	voice_square_2_alt 60, 0, 1, 1, 2, 6, 2  @ 86793A0
-	voice_square_1_alt 60, 0, 0, 1, 1, 2, 6, 2  @ 86793AC
-	voice_square_1_alt 60, 0, 0, 1, 0, 0, 6, 2  @ 86793B8
+voicegroup017::
+	voice_keysplit_all voicegroup001
+	voice_square_2_alt 60, 0, 2, 0, 3, 3, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 3, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 7, 2
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 2
+	voice_square_2_alt 60, 0, 2, 1, 1, 0, 0
+	voice_square_1_alt 60, 0, 0, 2, 1, 1, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 1, 1, 7, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_square_1_alt 60, 0, 0, 2, 1, 1, 7, 2
+	voice_square_2_alt 60, 0, 3, 1, 1, 7, 2
+	voice_square_1_alt 60, 0, 0, 3, 1, 1, 7, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 3
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 2
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 2
+	voice_square_2_alt 60, 0, 1, 1, 2, 6, 2
+	voice_square_1_alt 60, 0, 0, 1, 1, 2, 6, 2
+	voice_square_1_alt 60, 0, 0, 1, 0, 0, 6, 2
 
diff --git a/sound/voicegroups/voicegroup018.inc b/sound/voicegroups/voicegroup018.inc
index 58f9d1b48..0364349f0 100644
--- a/sound/voicegroups/voicegroup018.inc
+++ b/sound/voicegroups/voicegroup018.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup018:: @ 86793C4
-	voice_keysplit_all voicegroup001  @ 86793C4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86793D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86793DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86793E8
-	voice_square_2_alt 60, 0, 0, 0, 1, 7, 1  @ 86793F4
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 1  @ 8679400
-	voice_square_1_alt 60, 0, 0, 0, 0, 0, 7, 1  @ 867940C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867943C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867946C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867949C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86794A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86794B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86794C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86794CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86794D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86794E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86794F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86794FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867952C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867955C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867958C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 86795E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86795F8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8679604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867961C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867964C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867967C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86796A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86796AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86796B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86796C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86796D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86796DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86796E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86796F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867970C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679724
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8679730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867973C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867976C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679778
-	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1  @ 8679784
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2  @ 8679790
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1  @ 867979C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86797A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86797B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86797C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86797CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86797D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86797E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86797F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86797FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867982C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867985C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867988C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86798A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86798B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86798BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86798C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86798D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86798E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86798EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86798F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867991C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867994C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867997C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86799A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86799AC
-	voice_noise_alt 60, 0, 1, 0, 1, 0, 3  @ 86799B8
+voicegroup018::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 0, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 1, 0, 1, 0, 3
 
diff --git a/sound/voicegroups/voicegroup019.inc b/sound/voicegroups/voicegroup019.inc
index 31f17c73d..d15be40a1 100644
--- a/sound/voicegroups/voicegroup019.inc
+++ b/sound/voicegroups/voicegroup019.inc
@@ -1,88 +1,88 @@
 	.align 2
-voicegroup019:: @ 86799C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86799C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86799D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86799DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86799E8
-	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1  @ 86799F4
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1  @ 8679A00
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 1  @ 8679A0C
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 1  @ 8679A18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679AA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679AF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BD4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 8679BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679BF8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8679C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679C34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679C40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679C58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679C64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679C70
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8679C7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679C88
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8679C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679CC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D24
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 8679D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679D78
-	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1  @ 8679D84
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 2  @ 8679D90
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1  @ 8679D9C
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1  @ 8679DA8
-	voice_square_1_alt 60, 0, 0, 1, 0, 0, 7, 1  @ 8679DB4
+voicegroup019::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 2
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1
+	voice_square_1_alt 60, 0, 0, 1, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup020.inc b/sound/voicegroups/voicegroup020.inc
index a0e51c67d..8449fbdd6 100644
--- a/sound/voicegroups/voicegroup020.inc
+++ b/sound/voicegroups/voicegroup020.inc
@@ -1,90 +1,90 @@
 	.align 2
-voicegroup020:: @ 8679DC0
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8679DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679E98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679EB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FD0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 8679FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8679FF4
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867A000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A00C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A03C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A06C
-	voice_keysplit voicegroup008, KeySplitTable4  @ 867A078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A09C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A0A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A0B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A0C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A0CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A0D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A0E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A0F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A0FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A12C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A15C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A174
-	voice_square_2 60, 0, 2, 0, 1, 7, 1  @ 867A180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A18C
-	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1  @ 867A198
-	voice_square_2_alt 60, 0, 1, 0, 1, 6, 2  @ 867A1A4
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 6, 2  @ 867A1B0
-	voice_square_1_alt 60, 0, 0, 1, 0, 0, 6, 2  @ 867A1BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 7, 1  @ 867A1C8
+voicegroup020::
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 6, 2
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 6, 2
+	voice_square_1_alt 60, 0, 0, 1, 0, 0, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup021.inc b/sound/voicegroups/voicegroup021.inc
index 8ae95ef43..43aa9150e 100644
--- a/sound/voicegroups/voicegroup021.inc
+++ b/sound/voicegroups/voicegroup021.inc
@@ -1,54 +1,54 @@
 	.align 2
-voicegroup021:: @ 867A1D4
-	voice_keysplit_all voicegroup001  @ 867A1D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A1E0
-	voice_square_2_alt 60, 0, 3, 0, 2, 0, 0  @ 867A1EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A1F8
-	voice_square_2_alt 60, 0, 3, 0, 1, 6, 0  @ 867A204
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 6, 0  @ 867A210
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 6, 0  @ 867A21C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A24C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A27C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A2A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A2AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A2B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A2C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A2D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A2DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A2E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A2F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A30C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A33C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A36C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A39C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A3FC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867A408
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867A414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A42C
+voicegroup021::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 2, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 6, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 6, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 
diff --git a/sound/voicegroups/voicegroup022.inc b/sound/voicegroups/voicegroup022.inc
index c30a74351..2a1bba75d 100644
--- a/sound/voicegroups/voicegroup022.inc
+++ b/sound/voicegroups/voicegroup022.inc
@@ -1,68 +1,68 @@
 	.align 2
-voicegroup022:: @ 867A438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A45C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A468
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867A474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A480
-	voice_keysplit voicegroup008, KeySplitTable4  @ 867A48C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A498
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867A4A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A4B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A4BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A4C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A4D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A4E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A4EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A4F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A51C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A534
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867A540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A54C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A57C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A588
-	voice_square_2_alt 60, 0, 0, 0, 1, 7, 0  @ 867A594
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1  @ 867A5A0
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 0  @ 867A5AC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0  @ 867A5B8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 867A5C4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 1  @ 867A5D0
-	voice_square_1_alt 60, 0, 0, 0, 0, 0, 7, 0  @ 867A5DC
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242  @ 867A5E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A5F4
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 867A600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A60C
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 867A618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A63C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A66C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A69C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6B4
-	voice_directsound_no_resample 32, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 867A6C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A6FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A714
-	voice_directsound_no_resample 72, 67, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 867A720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A72C
-	voice_directsound_no_resample 72, 61, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 867A738
+voicegroup022::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 0, 7, 0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_kick, 255, 0, 255, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 32, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 72, 67, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 72, 61, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
 
diff --git a/sound/voicegroups/voicegroup023.inc b/sound/voicegroups/voicegroup023.inc
index 543ba1795..df0f663a7 100644
--- a/sound/voicegroups/voicegroup023.inc
+++ b/sound/voicegroups/voicegroup023.inc
@@ -1,92 +1,92 @@
 	.align 2
-voicegroup023:: @ 867A744
-	voice_keysplit voicegroup005, KeySplitTable1  @ 867A744
-	voice_keysplit_all voicegroup001  @ 867A750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A75C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A78C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A7A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A7B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A7BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A7C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A7D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A7E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A7EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A7F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A81C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A84C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A87C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 867A8E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A8F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A90C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A93C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A960
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 867A96C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A978
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867A984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A99C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A9A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A9B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A9C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A9CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A9D8
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867A9E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A9F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867A9FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AA98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AAA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AAB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AAC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AAD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AAE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AAEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AAF8
-	voice_square_2_alt 60, 0, 2, 0, 1, 7, 0  @ 867AB04
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1  @ 867AB10
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0  @ 867AB1C
-	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1  @ 867AB28
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 1  @ 867AB34
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0  @ 867AB40
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0  @ 867AB4C
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 0  @ 867AB58
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0  @ 867AB64
+voicegroup023::
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 1
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0
 
diff --git a/sound/voicegroups/voicegroup024.inc b/sound/voicegroups/voicegroup024.inc
index db85541cd..d4e139704 100644
--- a/sound/voicegroups/voicegroup024.inc
+++ b/sound/voicegroups/voicegroup024.inc
@@ -1,94 +1,94 @@
 	.align 2
-voicegroup024:: @ 867AB70
-	voice_keysplit_all voicegroup001  @ 867AB70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AB7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AB88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AB94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ABA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ABAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ABB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ABC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ABD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ABDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ABE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ABF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AC9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ACA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ACB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ACC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ACCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ACD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ACE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ACF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ACFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD80
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 867AD8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AD98
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867ADA4
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867ADB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ADBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ADC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ADD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ADE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ADEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ADF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE04
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867AE10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE34
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867AE40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AE94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AEA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AEAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AEB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AEC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AED0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867AEDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AEE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AEF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AF00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AF0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AF18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AF24
-	voice_square_2_alt 60, 0, 2, 0, 1, 7, 0  @ 867AF30
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1  @ 867AF3C
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0  @ 867AF48
-	voice_square_2_alt 60, 0, 2, 0, 2, 0, 0  @ 867AF54
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0  @ 867AF60
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0  @ 867AF6C
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0  @ 867AF78
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0  @ 867AF84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AF90
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0  @ 867AF9C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1  @ 867AFA8
+voicegroup024::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 0, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
 
diff --git a/sound/voicegroups/voicegroup025.inc b/sound/voicegroups/voicegroup025.inc
index e9d68d30a..1be1beea6 100644
--- a/sound/voicegroups/voicegroup025.inc
+++ b/sound/voicegroups/voicegroup025.inc
@@ -1,87 +1,87 @@
 	.align 2
-voicegroup025:: @ 867AFB4
-	voice_keysplit_all voicegroup001  @ 867AFB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AFC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AFCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AFD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AFE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AFF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867AFFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B02C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B05C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B08C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B0A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B0B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B0BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B0C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B0D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B0E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B0EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B0F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B11C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B14C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B17C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867B1E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B1F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B20C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B23C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B248
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867B254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B260
-	voice_keysplit voicegroup008, KeySplitTable4  @ 867B26C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B29C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B2A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B2B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B2C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B2CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B2D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B2E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B2F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B2FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B314
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867B320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B32C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B35C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B368
-	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1  @ 867B374
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 867B380
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1  @ 867B38C
-	voice_square_2_alt 60, 0, 2, 0, 1, 0, 0  @ 867B398
+voicegroup025::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup026.inc b/sound/voicegroups/voicegroup026.inc
index 77f308ed9..501241166 100644
--- a/sound/voicegroups/voicegroup026.inc
+++ b/sound/voicegroups/voicegroup026.inc
@@ -1,88 +1,88 @@
 	.align 2
-voicegroup026:: @ 867B3A4
-	voice_keysplit_all voicegroup001  @ 867B3A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B3B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B3BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B3C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B3D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B3E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B3EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B3F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B41C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B44C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B47C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B4A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B4AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B4B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B4C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B4D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B4DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B4E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B4F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B50C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B53C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B56C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B59C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5CC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867B5D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B5FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B62C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B65C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B668
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867B674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B68C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B6A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B6B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B6BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B6C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B6D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B6E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B6EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B6F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B71C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B74C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B758
-	voice_square_2_alt 60, 0, 2, 0, 1, 9, 0  @ 867B764
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0  @ 867B770
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 9, 0  @ 867B77C
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0  @ 867B788
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0  @ 867B794
+voicegroup026::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 9, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 9, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0
 
diff --git a/sound/voicegroups/voicegroup027.inc b/sound/voicegroups/voicegroup027.inc
index 1747fbe67..ef84f846e 100644
--- a/sound/voicegroups/voicegroup027.inc
+++ b/sound/voicegroups/voicegroup027.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup027:: @ 867B7A0
-	voice_keysplit_all voicegroup001  @ 867B7A0
-	voice_keysplit voicegroup005, KeySplitTable1  @ 867B7AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B7B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B7C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B7D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B7DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B7E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B7F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B80C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B830
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 867B83C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B86C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B89C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B8A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B8B4
-	voice_square_2 60, 0, 1, 0, 2, 0, 0  @ 867B8C0
-	voice_square_1 60, 0, 0, 1, 0, 2, 0, 0  @ 867B8CC
-	voice_square_2 60, 0, 1, 0, 6, 0, 0  @ 867B8D8
-	voice_square_1 60, 0, 0, 1, 0, 6, 0, 0  @ 867B8E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B8F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B8FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B92C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B95C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 867B968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B98C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B9A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B9B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B9BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B9C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B9D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B9E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B9EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867B9F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BA94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BAA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BAAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BAB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BAC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BAD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BAE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BAF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB00
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 867BB0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB60
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 867BB6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BB9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BBA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BBB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BBC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BBCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BBD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BBE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BBF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BBFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BC98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BCA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BCB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BCBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BCC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BCD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BCE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BCEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BCF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BD7C
-	voice_noise_alt 60, 0, 0, 0, 4, 1, 4  @ 867BD88
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 2  @ 867BD94
+voicegroup027::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 1, 0, 2, 0, 0
+	voice_square_1 60, 0, 0, 1, 0, 2, 0, 0
+	voice_square_2 60, 0, 1, 0, 6, 0, 0
+	voice_square_1 60, 0, 0, 1, 0, 6, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 4, 1, 4
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 2
 
diff --git a/sound/voicegroups/voicegroup028.inc b/sound/voicegroups/voicegroup028.inc
index 2b64c6b31..6d1071850 100644
--- a/sound/voicegroups/voicegroup028.inc
+++ b/sound/voicegroups/voicegroup028.inc
@@ -1,86 +1,86 @@
 	.align 2
-voicegroup028:: @ 867BDA0
-	voice_keysplit_all voicegroup001  @ 867BDA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BDAC
-	voice_square_1 60, 0, 0, 3, 0, 1, 0, 0  @ 867BDB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BDC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BDD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BDDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BDE8
-	voice_square_2 60, 0, 0, 0, 2, 0, 0  @ 867BDF4
-	voice_square_1 60, 0, 0, 0, 0, 2, 0, 0  @ 867BE00
-	voice_square_2 60, 0, 0, 0, 6, 0, 0  @ 867BE0C
-	voice_square_1 60, 0, 0, 0, 0, 6, 0, 0  @ 867BE18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE60
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 867BE6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BE9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BEA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BEB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BEC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BEE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BEF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BEFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF44
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 867BF50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BF98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BFA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BFB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BFBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BFC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BFD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BFE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BFEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867BFF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C01C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C034
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867C040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C04C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C07C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C0A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C0AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C0B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C0C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C0D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C0DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C0E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C0F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C10C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C13C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C154
-	voice_square_2 60, 0, 2, 0, 2, 0, 0  @ 867C160
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 867C16C
-	voice_square_2 60, 0, 3, 0, 4, 0, 0  @ 867C178
+voicegroup028::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 3, 0, 1, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 0, 0, 2, 0, 0
+	voice_square_1 60, 0, 0, 0, 0, 2, 0, 0
+	voice_square_2 60, 0, 0, 0, 6, 0, 0
+	voice_square_1 60, 0, 0, 0, 0, 6, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 2, 0, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_2 60, 0, 3, 0, 4, 0, 0
 
diff --git a/sound/voicegroups/voicegroup029.inc b/sound/voicegroups/voicegroup029.inc
index e41307873..e65818f90 100644
--- a/sound/voicegroups/voicegroup029.inc
+++ b/sound/voicegroups/voicegroup029.inc
@@ -1,91 +1,91 @@
 	.align 2
-voicegroup029:: @ 867C184
-	voice_keysplit_all voicegroup001  @ 867C184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C19C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C1A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C1B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C1C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C1CC
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0  @ 867C1D8
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 0  @ 867C1E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C1F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C1FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C208
-	voice_square_2_alt 60, 0, 2, 0, 2, 0, 0  @ 867C214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C220
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242  @ 867C22C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C25C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C28C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C2A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C2B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C2BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C2C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C2D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C2E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C2EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C2F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C31C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C34C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C37C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C394
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 867C3A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C3AC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867C3B8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867C3C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C3D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C3DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C3E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C3F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C40C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C418
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867C424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C43C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C448
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867C454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C46C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C49C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4E4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867C4F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C4FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C52C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C538
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0  @ 867C544
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1  @ 867C550
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0  @ 867C55C
-	voice_square_2_alt 60, 0, 3, 0, 1, 0, 0  @ 867C568
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 0, 0  @ 867C574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C58C
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 0  @ 867C598
+voicegroup029::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 0, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 0
 
diff --git a/sound/voicegroups/voicegroup030.inc b/sound/voicegroups/voicegroup030.inc
index ba7a81612..1e1b5088d 100644
--- a/sound/voicegroups/voicegroup030.inc
+++ b/sound/voicegroups/voicegroup030.inc
@@ -1,58 +1,58 @@
 	.align 2
-voicegroup030:: @ 867C5A4
-	voice_keysplit_all voicegroup031  @ 867C5A4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 867C5B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C5BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C5C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C5D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C5E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C5EC
-	voice_square_2_alt 60, 0, 3, 0, 2, 4, 0  @ 867C5F8
-	voice_square_1_alt 60, 0, 0, 3, 0, 2, 4, 0  @ 867C604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C61C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C640
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242  @ 867C64C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C664
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 37, 165, 180, 127  @ 867C670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C67C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C6A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C6AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C6B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C6C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C6D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C6DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C6E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C6F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C70C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C73C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C76C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C79C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 867C7CC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867C7D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C7FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C82C
+voicegroup030::
+	voice_keysplit_all voicegroup031
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 2, 4, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 2, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 37, 165, 180, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 
diff --git a/sound/voicegroups/voicegroup031.inc b/sound/voicegroups/voicegroup031.inc
index e0d8691db..a24251c78 100644
--- a/sound/voicegroups/voicegroup031.inc
+++ b/sound/voicegroups/voicegroup031.inc
@@ -1,68 +1,68 @@
 	.align 2
-voicegroup031:: @ 867C838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C85C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C868
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867C874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C88C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C8A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C8B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C8BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C8C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C8D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C8E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C8EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C8F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C91C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C94C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C964
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1  @ 867C970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C97C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9D0
-	voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 165, 154, 127  @ 867C9DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867C9F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA0C
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 867CA18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CA9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CAA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CAB4
-	voice_directsound_no_resample 32, 49, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 867CAC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CAD8
-	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 867CAE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CAF0
-	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216  @ 867CAFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB14
-	voice_directsound_no_resample 72, 79, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 867CB20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB2C
-	voice_directsound_no_resample 72, 74, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 867CB38
+voicegroup031::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 165, 154, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 32, 49, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 30, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 72, 79, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 72, 74, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
 
diff --git a/sound/voicegroups/voicegroup032.inc b/sound/voicegroups/voicegroup032.inc
index 75e305f6e..f50eb844b 100644
--- a/sound/voicegroups/voicegroup032.inc
+++ b/sound/voicegroups/voicegroup032.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup032:: @ 867CB44
-	voice_keysplit_all voicegroup016  @ 867CB44
-	voice_keysplit voicegroup005, KeySplitTable1  @ 867CB50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CB8C
-	voice_square_2_alt 60, 0, 3, 0, 3, 4, 0  @ 867CB98
-	voice_square_1_alt 60, 0, 0, 3, 0, 3, 4, 0  @ 867CBA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CBB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CBBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CBC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CBD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CBE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CBEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CBF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CC94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCDC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 250, 0, 149  @ 867CCE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CCF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CD9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CDA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CDB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CDC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CDCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CDD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CDE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CDF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CDFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CE98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CEA4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867CEB0
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 867CEBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CEC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CEE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CEEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CEF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF04
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2  @ 867CF10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CF94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CFA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CFAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CFB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CFC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CFD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CFDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CFE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867CFF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D00C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D03C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D06C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D09C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D0A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D0B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D0C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D0CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D0D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D0E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D0F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D0FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D114
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 867D120
-	voice_noise_alt 60, 0, 0, 0, 4, 1, 4  @ 867D12C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 2  @ 867D138
+voicegroup032::
+	voice_keysplit_all voicegroup016
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 3, 4, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 3, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 250, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
+	voice_noise_alt 60, 0, 0, 0, 4, 1, 4
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 2
 
diff --git a/sound/voicegroups/voicegroup033.inc b/sound/voicegroups/voicegroup033.inc
index 21d1b108f..34e7e43b7 100644
--- a/sound/voicegroups/voicegroup033.inc
+++ b/sound/voicegroups/voicegroup033.inc
@@ -1,86 +1,86 @@
 	.align 2
-voicegroup033:: @ 867D144
-	voice_keysplit_all voicegroup001  @ 867D144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D15C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D18C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D1A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D1B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D1BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D1C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D1D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D1E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D1EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D1F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D21C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D24C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D27C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 867D2E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D2F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D30C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D33C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D360
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 867D36C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D378
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867D384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D39C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D3A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D3B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D3C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D3CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D3D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D3E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D3F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D3FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D408
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867D414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D42C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D45C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D48C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4A4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 867D4B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D4F8
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 867D504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D510
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 867D51C
+voicegroup033::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
 
diff --git a/sound/voicegroups/voicegroup034.inc b/sound/voicegroups/voicegroup034.inc
index 6ca2ded87..6dc04e97a 100644
--- a/sound/voicegroups/voicegroup034.inc
+++ b/sound/voicegroups/voicegroup034.inc
@@ -1,87 +1,87 @@
 	.align 2
-voicegroup034:: @ 867D528
-	voice_keysplit_all voicegroup001  @ 867D528
-	voice_keysplit voicegroup005, KeySplitTable1  @ 867D534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D54C
-	voice_square_2 60, 0, 2, 0, 1, 4, 2  @ 867D558
-	voice_square_1 60, 0, 0, 2, 0, 1, 4, 1  @ 867D564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D57C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D5A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D5AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D5B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D5C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D5D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D5DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D5E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D5F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D60C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D63C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D66C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D69C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 867D6CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D6FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D72C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D738
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 867D744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D75C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867D768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D78C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D7A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D7B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D7BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D7C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D7D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D7E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D7EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D7F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D81C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D84C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D87C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D888
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 867D894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D8F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D900
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 2  @ 867D90C
+voicegroup034::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 4, 2
+	voice_square_1 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 2
 
diff --git a/sound/voicegroups/voicegroup035.inc b/sound/voicegroups/voicegroup035.inc
index ebcdf744f..359a43a8c 100644
--- a/sound/voicegroups/voicegroup035.inc
+++ b/sound/voicegroups/voicegroup035.inc
@@ -1,88 +1,88 @@
 	.align 2
-voicegroup035:: @ 867D918
-	voice_keysplit_all voicegroup031  @ 867D918
-	voice_keysplit voicegroup005, KeySplitTable1  @ 867D924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D93C
-	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1  @ 867D948
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1  @ 867D954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D96C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D99C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D9A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D9B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D9C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D9CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D9D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D9E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D9F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867D9FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DA98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DAA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DAB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DAC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DAD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DAE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DAEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DAF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB40
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867DB4C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867DB58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DB94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DBA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DBAC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867DBB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DBC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DBD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DBDC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867DBE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DBF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DC9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DCA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DCB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DCC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DCCC
-	voice_square_2_alt 60, 0, 3, 0, 1, 6, 1  @ 867DCD8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2  @ 867DCE4
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 6, 1  @ 867DCF0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0  @ 867DCFC
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 6, 1  @ 867DD08
+voicegroup035::
+	voice_keysplit_all voicegroup031
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 6, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 6, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 6, 1
 
diff --git a/sound/voicegroups/voicegroup036.inc b/sound/voicegroups/voicegroup036.inc
index 8799f251c..b3ef9cfbc 100644
--- a/sound/voicegroups/voicegroup036.inc
+++ b/sound/voicegroups/voicegroup036.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup036:: @ 867DD14
-	voice_keysplit_all voicegroup001  @ 867DD14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DD20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DD2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DD38
-	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1  @ 867DD44
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 1  @ 867DD50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DD5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DD68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DD74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DD80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DD8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DD98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DDA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DDB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DDBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DDC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DDD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DDE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DDEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DDF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DE94
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 867DEA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DEAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DEB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DEC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DEDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DEE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DEF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF24
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 867DF30
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 867DF3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF48
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867DF54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DF9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DFA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DFB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DFC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DFCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DFD8
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867DFE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DFF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867DFFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E02C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E05C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E074
-	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 867E080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E08C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E0A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E0B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E0BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E0C8
-	voice_square_2_alt 60, 0, 2, 0, 2, 4, 1  @ 867E0D4
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1  @ 867E0E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E0EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E0F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E11C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E14C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E17C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E1A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E1AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E1B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E1C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E1D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E1DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E1E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E1F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E20C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E23C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E26C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E29C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E2A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E2B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E2C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E2CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E2D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E2E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E2F0
-	voice_noise_alt 60, 0, 0, 0, 4, 1, 4  @ 867E2FC
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 2  @ 867E308
+voicegroup036::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 4, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 4, 1, 4
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 2
 
diff --git a/sound/voicegroups/voicegroup037.inc b/sound/voicegroups/voicegroup037.inc
index 9e52dc02e..d05a4c6e2 100644
--- a/sound/voicegroups/voicegroup037.inc
+++ b/sound/voicegroups/voicegroup037.inc
@@ -1,92 +1,92 @@
 	.align 2
-voicegroup037:: @ 867E314
-	voice_keysplit_all voicegroup031  @ 867E314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E32C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E338
-	voice_square_2_alt 60, 0, 2, 0, 2, 4, 1  @ 867E344
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1  @ 867E350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E35C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E38C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3B0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242  @ 867E3BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E3F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E41C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E44C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E47C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E4A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E4AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E4B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E4C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E4D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E4DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E4E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E4F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E50C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E530
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 867E53C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 867E548
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867E554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E56C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E59C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E5A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E5B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E5C0
-	voice_keysplit voicegroup008, KeySplitTable4  @ 867E5CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E5D8
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867E5E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E5F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E5FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E62C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E65C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E68C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E6A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E6B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E6BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E6C8
-	voice_square_2_alt 60, 0, 0, 0, 1, 7, 1  @ 867E6D4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2  @ 867E6E0
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 1  @ 867E6EC
-	voice_square_1_alt 60, 0, 0, 0, 0, 0, 7, 1  @ 867E6F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E71C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E728
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2  @ 867E734
+voicegroup037::
+	voice_keysplit_all voicegroup031
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 4, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 0, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
 
diff --git a/sound/voicegroups/voicegroup038.inc b/sound/voicegroups/voicegroup038.inc
index 2b7f62f95..61ecc6746 100644
--- a/sound/voicegroups/voicegroup038.inc
+++ b/sound/voicegroups/voicegroup038.inc
@@ -1,85 +1,85 @@
 	.align 2
-voicegroup038:: @ 867E740
-	voice_keysplit_all voicegroup001  @ 867E740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E74C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E764
-	voice_square_2 60, 0, 2, 0, 1, 4, 1  @ 867E770
-	voice_square_1 60, 0, 0, 2, 0, 1, 4, 1  @ 867E77C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E7A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E7AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E7B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E7C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E7D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E7DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E7E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E7F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E800
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 867E80C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E83C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E86C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E89C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E8FC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 867E908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E92C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E95C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E98C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E9A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E9B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E9BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E9C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E9D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E9E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E9EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867E9F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EA94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EAA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EAAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EAB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EAC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EAD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EAE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EAF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB00
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0  @ 867EB0C
+voicegroup038::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup039.inc b/sound/voicegroups/voicegroup039.inc
index 580eb4fe7..887f238dc 100644
--- a/sound/voicegroups/voicegroup039.inc
+++ b/sound/voicegroups/voicegroup039.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup039:: @ 867EB18
-	voice_keysplit_all voicegroup001  @ 867EB18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EB9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBD8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 867EBE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EBFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC2C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 867EC38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EC98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECBC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 867ECC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ECF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED4C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867ED58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867ED94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EDA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EDAC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867EDB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EDC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EDD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EDDC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867EDE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EDF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE78
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 867EE84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EE9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EEA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EEB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EEC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EECC
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0  @ 867EED8
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0  @ 867EEE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EEF0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 867EEFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EF98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EFA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EFB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EFBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EFC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EFD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EFE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EFEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867EFF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F01C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F04C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F07C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F0A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F0AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F0B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F0C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F0D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F0DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F0E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F0F4
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 867F100
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 867F10C
+voicegroup039::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup040.inc b/sound/voicegroups/voicegroup040.inc
index 78cc9167a..4e523072a 100644
--- a/sound/voicegroups/voicegroup040.inc
+++ b/sound/voicegroups/voicegroup040.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup040:: @ 867F118
-	voice_keysplit_all voicegroup001  @ 867F118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F13C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F16C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F19C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1D8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 867F1E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F1FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F22C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 867F238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F25C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F28C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2BC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 867F2C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F2F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F31C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F34C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867F358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F37C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F3A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F3AC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867F3B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F3C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F3D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F3DC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867F3E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F3F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F40C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F43C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F46C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F478
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 867F484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F49C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F4A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F4B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F4C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F4CC
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0  @ 867F4D8
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0  @ 867F4E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F4F0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 867F4FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F52C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F55C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F58C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F5A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F5B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F5BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F5C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F5D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F5E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F5EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F5F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F61C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F64C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F67C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F6A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F6AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F6B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F6C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F6D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F6DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F6E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F6F4
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 867F700
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 867F70C
+voicegroup040::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup041.inc b/sound/voicegroups/voicegroup041.inc
index f5a1d6d16..101a6ddb7 100644
--- a/sound/voicegroups/voicegroup041.inc
+++ b/sound/voicegroups/voicegroup041.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup041:: @ 867F718
-	voice_keysplit_all voicegroup001  @ 867F718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F73C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F76C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F79C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7D8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 867F7E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F7FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F82C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 867F838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F85C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F88C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8BC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 867F8C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F8F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F91C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F94C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867F958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F97C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F9A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F9AC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867F9B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F9C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F9D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F9DC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867F9E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867F9F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA78
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 867FA84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FA9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FAA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FAB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FAC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FACC
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0  @ 867FAD8
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0  @ 867FAE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FAF0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 867FAFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FB98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FBA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FBB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FBBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FBC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FBD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FBE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FBEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FBF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FC94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FCA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FCAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FCB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FCC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FCD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FCDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FCE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FCF4
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 867FD00
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 867FD0C
+voicegroup041::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup042.inc b/sound/voicegroups/voicegroup042.inc
index 764ce1c61..55fa84d60 100644
--- a/sound/voicegroups/voicegroup042.inc
+++ b/sound/voicegroups/voicegroup042.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup042:: @ 867FD18
-	voice_keysplit_all voicegroup001  @ 867FD18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FD9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDD8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 867FDE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FDFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE2C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 867FE38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FE98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEBC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 867FEC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FEF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF4C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 867FF58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FF94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FFA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FFAC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 867FFB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FFC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FFD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FFDC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 867FFE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 867FFF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868000C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868003C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868006C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680078
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 8680084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868009C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86800A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86800B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86800C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86800CC
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0  @ 86800D8
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0  @ 86800E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86800F0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 86800FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868012C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868015C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868018C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86801A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86801B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86801BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86801C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86801D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86801E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86801EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86801F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868021C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868024C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868027C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86802A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86802AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86802B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86802C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86802D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86802DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86802E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86802F4
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8680300
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868030C
+voicegroup042::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup043.inc b/sound/voicegroups/voicegroup043.inc
index 6e4c76dfc..d6bd30bcb 100644
--- a/sound/voicegroups/voicegroup043.inc
+++ b/sound/voicegroups/voicegroup043.inc
@@ -1,84 +1,84 @@
 	.align 2
-voicegroup043:: @ 8680318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680318
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8680324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868033C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868036C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868039C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86803A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86803B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86803C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86803CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86803D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86803E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86803F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86803FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868042C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868045C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868048C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149  @ 8680498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86804A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86804B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86804BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86804C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86804D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86804E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86804EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86804F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868051C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868054C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8680558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868057C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86805A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86805AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86805B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86805C4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86805D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86805DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86805E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86805F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868060C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868063C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868066C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680678
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 8680684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868069C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86806A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86806B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86806C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86806CC
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0  @ 86806D8
+voicegroup043::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
 
diff --git a/sound/voicegroups/voicegroup044.inc b/sound/voicegroups/voicegroup044.inc
index 5c848d94d..838f58fbd 100644
--- a/sound/voicegroups/voicegroup044.inc
+++ b/sound/voicegroups/voicegroup044.inc
@@ -1,84 +1,84 @@
 	.align 2
-voicegroup044:: @ 86806E4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86806E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86806F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86806FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680708
-	voice_square_1_alt 60, 0, 0, 2, 0, 5, 1, 7  @ 8680714
-	voice_square_2_alt 60, 0, 3, 0, 4, 3, 6  @ 8680720
-	voice_square_2_alt 60, 0, 2, 1, 1, 4, 0  @ 868072C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868075C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868078C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86807A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86807B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86807BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86807C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86807D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86807E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86807EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86807F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868081C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868084C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868087C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 224  @ 8680888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86808A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86808AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86808B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86808C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86808D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86808DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86808E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86808F4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 8680900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868090C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680918
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8680924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868093C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868096C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868099C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86809A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86809B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86809C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86809CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86809D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86809E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86809F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86809FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A44
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 8680A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680A98
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1  @ 8680AA4
+voicegroup044::
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 5, 1, 7
+	voice_square_2_alt 60, 0, 3, 0, 4, 3, 6
+	voice_square_2_alt 60, 0, 2, 1, 1, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 224
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
 
diff --git a/sound/voicegroups/voicegroup045.inc b/sound/voicegroups/voicegroup045.inc
index bb904e5ca..9647f7e45 100644
--- a/sound/voicegroups/voicegroup045.inc
+++ b/sound/voicegroups/voicegroup045.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup045:: @ 8680AB0
-	voice_keysplit_all voicegroup001  @ 8680AB0
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 0, 1  @ 8680ABC
-	voice_square_1_alt 60, 0, 0, 3, 1, 2, 6, 0  @ 8680AC8
-	voice_square_2_alt 60, 0, 3, 1, 2, 6, 0  @ 8680AD4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 8680AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680AEC
-	voice_square_2_alt 60, 0, 1, 0, 2, 0, 1  @ 8680AF8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 1, 7, 15, 1  @ 8680B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680B1C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8680B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680B70
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8680B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680BB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680BC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680BDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C6C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216  @ 8680C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680CE4
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8680CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680DEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E10
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 8680E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680E94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680EE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680EF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680FA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680FE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8680FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868102C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868105C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868108C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681098
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 86810A4
+voicegroup045::
+	voice_keysplit_all voicegroup001
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 0, 1
+	voice_square_1_alt 60, 0, 0, 3, 1, 2, 6, 0
+	voice_square_2_alt 60, 0, 3, 1, 2, 6, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 0, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 1, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup046.inc b/sound/voicegroups/voicegroup046.inc
index 07889819a..e8165dcc6 100644
--- a/sound/voicegroups/voicegroup046.inc
+++ b/sound/voicegroups/voicegroup046.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup046:: @ 86810B0
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86810B0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 1, 12, 0  @ 86810BC
-	voice_square_1_alt 60, 0, 0, 0, 1, 1, 9, 0  @ 86810C8
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3  @ 86810D4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1  @ 86810E0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216  @ 86810EC
-	voice_square_2_alt 60, 0, 1, 0, 2, 6, 3  @ 86810F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868111C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868114C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868117C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86811A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86811AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86811B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86811C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86811D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86811DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86811E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86811F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868120C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868123C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868126C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868129C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86812A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86812B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86812C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 165  @ 86812CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86812D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86812E4
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86812F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86812FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868132C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868135C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868138C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86813A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86813B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86813BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86813C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86813D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86813E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86813EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86813F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681410
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 868141C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868144C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868147C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86814A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86814AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86814B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86814C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86814D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86814DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86814E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86814F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868150C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868153C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868156C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868159C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86815A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86815B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86815C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86815CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86815D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86815E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86815F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86815FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868162C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868165C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868168C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681698
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 86816A4
+voicegroup046::
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 1, 12, 0
+	voice_square_1_alt 60, 0, 0, 0, 1, 1, 9, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216
+	voice_square_2_alt 60, 0, 1, 0, 2, 6, 3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup047.inc b/sound/voicegroups/voicegroup047.inc
index c045c1dd3..80faa09c3 100644
--- a/sound/voicegroups/voicegroup047.inc
+++ b/sound/voicegroups/voicegroup047.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup047:: @ 86816B0
-	voice_keysplit_all voicegroup001  @ 86816B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86816BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86816C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86816D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86816E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86816EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86816F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868171C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868174C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868177C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86817A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86817AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86817B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86817C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86817D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86817DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86817E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86817F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868180C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868183C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868186C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8681878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868189C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86818A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86818B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86818C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86818CC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204  @ 86818D8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239  @ 86818E4
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86818F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86818FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868192C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681944
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8681950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868195C
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8681968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681974
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8681980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868198C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86819A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86819B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86819BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86819C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86819D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86819E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86819EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86819F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681A10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681A28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681A4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681A58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681A64
-	voice_square_2_alt 60, 0, 2, 0, 1, 6, 2  @ 8681A70
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0  @ 8681A7C
-	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1  @ 8681A88
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 1, 7, 15, 2  @ 8681A94
-	voice_square_2_alt 60, 0, 1, 1, 1, 4, 1  @ 8681AA0
-	voice_square_1_alt 60, 0, 0, 1, 1, 2, 4, 1  @ 8681AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681AB8
-	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1  @ 8681AC4
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 1  @ 8681AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681AE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681BA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681BE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681C98
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8681CA4
+voicegroup047::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 6, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 1, 7, 15, 2
+	voice_square_2_alt 60, 0, 1, 1, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 1, 1, 2, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup048.inc b/sound/voicegroups/voicegroup048.inc
index 151c725d1..c81ebf39f 100644
--- a/sound/voicegroups/voicegroup048.inc
+++ b/sound/voicegroups/voicegroup048.inc
@@ -1,91 +1,91 @@
 	.align 2
-voicegroup048:: @ 8681CB0
-	voice_keysplit_all voicegroup001  @ 8681CB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681CD4
-	voice_square_1_alt 60, 0, 0, 2, 0, 7, 3, 3  @ 8681CE0
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 8681CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D10
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 204, 51, 242  @ 8681D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681DD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681DDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681DE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681ECC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242  @ 8681ED8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 239  @ 8681EE4
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8681EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681F44
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8681F50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681F5C
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8681F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681F74
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8681F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681FA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681FB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8681FF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682010
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 868201C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868204C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682064
-	voice_square_2_alt 60, 0, 3, 0, 4, 4, 0  @ 8682070
-	voice_square_1_alt 60, 0, 0, 3, 0, 3, 6, 0  @ 868207C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682088
-	voice_square_1_alt 60, 0, 0, 0, 0, 3, 3, 0  @ 8682094
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 12, 1  @ 86820A0
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 3  @ 86820AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86820B8
-	voice_square_2_alt 60, 0, 0, 0, 2, 4, 0  @ 86820C4
+voicegroup048::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 7, 3, 3
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 204, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 239
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 4, 4, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 3, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 3, 3, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 12, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 2, 4, 0
 
diff --git a/sound/voicegroups/voicegroup049.inc b/sound/voicegroups/voicegroup049.inc
index a3700ecf3..4ece4cb76 100644
--- a/sound/voicegroups/voicegroup049.inc
+++ b/sound/voicegroups/voicegroup049.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup049:: @ 86820D0
-	voice_keysplit_all voicegroup001  @ 86820D0
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86820DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86820E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86820F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868210C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682130
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242  @ 868213C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868216C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868219C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86821A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86821B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86821C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86821CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86821D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86821E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86821F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86821FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868222C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868225C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682268
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8682274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868228C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86822A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86822B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86822BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86822C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86822D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86822E0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 86822EC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242  @ 86822F8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 226  @ 8682304
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8682310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868231C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868234C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682364
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8682370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868237C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682394
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86823A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86823AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86823B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86823C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86823D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86823DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86823E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86823F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868240C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682430
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 868243C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868246C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682484
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1  @ 8682490
-	voice_square_2_alt 60, 0, 1, 1, 3, 4, 2  @ 868249C
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1  @ 86824A8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 1, 7, 15, 0  @ 86824B4
-	voice_square_2_alt 60, 0, 2, 0, 2, 4, 2  @ 86824C0
-	voice_square_2_alt 60, 0, 1, 1, 3, 4, 2  @ 86824CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86824D8
-	voice_square_1_alt 60, 0, 0, 2, 1, 4, 4, 2  @ 86824E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86824F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86824FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868252C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868255C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868258C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86825A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86825B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86825BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86825C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86825D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86825E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86825EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86825F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868261C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868264C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868267C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86826A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86826AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86826B8
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 86826C4
+voicegroup049::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1
+	voice_square_2_alt 60, 0, 1, 1, 3, 4, 2
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 1, 7, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 4, 2
+	voice_square_2_alt 60, 0, 1, 1, 3, 4, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 1, 4, 4, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup050.inc b/sound/voicegroups/voicegroup050.inc
index dbbe02cfc..6f401b959 100644
--- a/sound/voicegroups/voicegroup050.inc
+++ b/sound/voicegroups/voicegroup050.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup050:: @ 86826D0
-	voice_keysplit_all voicegroup001  @ 86826D0
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86826DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86826E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86826F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868270C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868273C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868276C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682790
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 868279C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86827A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86827B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86827C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86827CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86827D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86827E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86827F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86827FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868282C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868285C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682868
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8682874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868288C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86828A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86828B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86828BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86828C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86828D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86828E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86828EC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242  @ 86828F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868291C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868294C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868297C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86829A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86829AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86829B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86829C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86829D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86829DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86829E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86829F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A84
-	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1  @ 8682A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682AA8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1  @ 8682AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682AD8
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 1  @ 8682AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682AF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682BD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682CB8
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8682CC4
+voicegroup050::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup051.inc b/sound/voicegroups/voicegroup051.inc
index ceafb4d4d..d3a144622 100644
--- a/sound/voicegroups/voicegroup051.inc
+++ b/sound/voicegroups/voicegroup051.inc
@@ -1,77 +1,77 @@
 	.align 2
-voicegroup051:: @ 8682CD0
-	voice_keysplit_all voicegroup001  @ 8682CD0
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8682CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682CF4
-	voice_square_2_alt 60, 0, 2, 1, 4, 4, 2  @ 8682D00
-	voice_square_1_alt 60, 0, 0, 2, 0, 3, 4, 1  @ 8682D0C
-	voice_square_2_alt 60, 0, 2, 1, 3, 4, 2  @ 8682D18
-	voice_square_1_alt 60, 0, 0, 2, 0, 3, 4, 1  @ 8682D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E68
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8682E74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682E98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682EB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682EE0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 99  @ 8682EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F04
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8682F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8682FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868300C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683030
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 868303C
+voicegroup051::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 1, 4, 4, 2
+	voice_square_1_alt 60, 0, 0, 2, 0, 3, 4, 1
+	voice_square_2_alt 60, 0, 2, 1, 3, 4, 2
+	voice_square_1_alt 60, 0, 0, 2, 0, 3, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
 
diff --git a/sound/voicegroups/voicegroup052.inc b/sound/voicegroups/voicegroup052.inc
index efddac28a..ce6c19e3a 100644
--- a/sound/voicegroups/voicegroup052.inc
+++ b/sound/voicegroups/voicegroup052.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup052:: @ 8683048
-	voice_keysplit_all voicegroup001  @ 8683048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683054
-	voice_square_1 60, 0, 0, 3, 1, 2, 6, 0  @ 8683060
-	voice_square_2 60, 0, 3, 1, 2, 6, 0  @ 868306C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868309C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86830A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86830B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86830C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86830CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86830D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86830E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86830F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86830FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868312C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868315C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868318C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683198
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 7, 15, 0  @ 86831A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86831B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86831BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86831C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86831D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86831E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86831EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86831F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868321C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868324C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683270
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 226  @ 868327C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8683288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86832A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86832AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86832B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86832C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86832D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86832DC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86832E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86832F4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8683300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868330C
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8683318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868333C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868336C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868339C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86833A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86833B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86833C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86833CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86833D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86833E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86833F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86833FC
-	voice_square_2_alt 60, 0, 1, 0, 1, 6, 1  @ 8683408
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 1  @ 8683414
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1  @ 8683420
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 2  @ 868342C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1  @ 8683438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683450
-	voice_square_1_alt 60, 0, 0, 1, 0, 7, 6, 1  @ 868345C
-	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1  @ 8683468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868348C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86834A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86834B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86834BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86834C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86834D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86834E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86834EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86834F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868351C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868354C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868357C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86835A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86835AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86835B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86835C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86835D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86835DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86835E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86835F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868360C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683618
-	voice_noise_alt 60, 0, 0, 0, 1, 9, 4  @ 8683624
-	voice_noise_alt 60, 0, 0, 3, 1, 10, 0  @ 8683630
-	voice_noise_alt 60, 0, 0, 0, 2, 0, 0  @ 868363C
+voicegroup052::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 3, 1, 2, 6, 0
+	voice_square_2 60, 0, 3, 1, 2, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 1, 6, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 7, 6, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 9, 4
+	voice_noise_alt 60, 0, 0, 3, 1, 10, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 0, 0
 
diff --git a/sound/voicegroups/voicegroup053.inc b/sound/voicegroups/voicegroup053.inc
index 559f7efa3..f9c21afe3 100644
--- a/sound/voicegroups/voicegroup053.inc
+++ b/sound/voicegroups/voicegroup053.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup053:: @ 8683648
-	voice_keysplit_all voicegroup001  @ 8683648
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8683654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868366C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868369C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86836A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86836B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86836C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86836CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86836D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86836E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86836F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86836FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868372C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868375C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868378C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86837A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86837B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86837BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86837C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86837D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86837E0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86837EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86837F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868381C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868384C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683858
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 8683864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868387C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8683888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86838A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86838AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86838B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86838C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86838D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86838DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86838E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86838F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868390C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868393C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868396C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868399C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86839A8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86839B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86839C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86839CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86839D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86839E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86839F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86839FC
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 2  @ 8683A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683A14
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1  @ 8683A20
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 12, 0  @ 8683A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683A68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683BB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683BC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683BDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C30
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8683C3C
+voicegroup053::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup054.inc b/sound/voicegroups/voicegroup054.inc
index 1a300444e..4cd90843c 100644
--- a/sound/voicegroups/voicegroup054.inc
+++ b/sound/voicegroups/voicegroup054.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup054:: @ 8683C48
-	voice_keysplit_all voicegroup001  @ 8683C48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683CE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683DEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683E28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683E34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683E4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683E58
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 8683E64
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242  @ 8683E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683E7C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8683E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683E94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683EE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683EF4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8683F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F0C
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8683F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683FA8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 8683FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683FE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8683FFC
-	voice_square_2_alt 60, 0, 2, 0, 1, 5, 2  @ 8684008
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1  @ 8684014
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 8684020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868402C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868405C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868408C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86840A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86840B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86840BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86840C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86840D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86840E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86840EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86840F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868411C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868414C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868417C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86841A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86841AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86841B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86841C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86841D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86841DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86841E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86841F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868420C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684230
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868423C
+voicegroup054::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 5, 2
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup055.inc b/sound/voicegroups/voicegroup055.inc
index 71556fc57..aa9f7d113 100644
--- a/sound/voicegroups/voicegroup055.inc
+++ b/sound/voicegroups/voicegroup055.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup055:: @ 8684248
-	voice_keysplit_all voicegroup001  @ 8684248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868426C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868429C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86842A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86842B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86842C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86842CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86842D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86842E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86842F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86842FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868432C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868435C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868438C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86843A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86843B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86843BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86843C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86843D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86843E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86843EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86843F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684404
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8684410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868441C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868444C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684464
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204  @ 8684470
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239  @ 868447C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8684488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86844A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86844AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86844B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86844C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86844D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86844DC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86844E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86844F4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8684500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868450C
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8684518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868453C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868456C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868459C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86845A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86845B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86845C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86845CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86845D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86845E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86845F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86845FC
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 8684608
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 6, 0  @ 8684614
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8684620
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 7, 15, 2  @ 868462C
-	voice_square_2_alt 60, 0, 1, 1, 1, 4, 1  @ 8684638
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 2  @ 8684644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684650
-	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1  @ 868465C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868468C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86846A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86846B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86846BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86846C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86846D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86846E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86846EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86846F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868471C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868474C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868477C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86847A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86847AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86847B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86847C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86847D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86847DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86847E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86847F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868480C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684830
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868483C
+voicegroup055::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 204
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 204, 193, 239
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 6, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 7, 15, 2
+	voice_square_2_alt 60, 0, 1, 1, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup056.inc b/sound/voicegroups/voicegroup056.inc
index 56538a65b..42f779100 100644
--- a/sound/voicegroups/voicegroup056.inc
+++ b/sound/voicegroups/voicegroup056.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup056:: @ 8684848
-	voice_keysplit_all voicegroup001  @ 8684848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868486C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868489C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86848A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86848B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86848C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86848CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86848D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86848E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86848F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86848FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868492C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868495C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868498C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86849A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86849B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86849BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86849C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86849D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86849E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86849EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86849F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A04
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8684A10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A7C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8684A88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684A94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684AB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684AE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B0C
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8684B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684BA8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 8684BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684BE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684BFC
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8684C08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684C14
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 8684C20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684C2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684C38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684C50
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1  @ 8684C5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684C68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684C98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684CA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684CB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684CE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684DD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684DDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684DE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E30
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8684E3C
+voicegroup056::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup057.inc b/sound/voicegroups/voicegroup057.inc
index 0a8b037b4..6bd58e87e 100644
--- a/sound/voicegroups/voicegroup057.inc
+++ b/sound/voicegroups/voicegroup057.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup057:: @ 8684E48
-	voice_keysplit_all voicegroup001  @ 8684E48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684EA8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 188, 51, 242  @ 8684EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684EE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 128, 165, 90, 216  @ 8684EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F50
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_bubbles, 255, 0, 255, 127  @ 8684F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684FA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684FB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684FE0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8684FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8684FF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868501C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868504C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685058
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 8685064
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242  @ 8685070
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 226  @ 868507C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8685088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86850A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86850AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86850B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86850C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86850D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86850DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86850E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86850F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868510C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868513C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868516C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868519C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86851A8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86851B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86851C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86851CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86851D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86851E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86851F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86851FC
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 8685208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685214
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 1, 4, 10, 1  @ 8685220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868522C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868525C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868528C
-	voice_square_2_alt 60, 0, 2, 1, 5, 9, 1  @ 8685298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86852A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86852B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86852BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86852C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86852D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86852E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86852EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86852F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868531C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868534C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868537C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86853A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86853AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86853B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86853C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86853D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86853DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86853E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86853F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868540C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685424
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8685430
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868543C
+voicegroup057::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 188, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 128, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_bubbles, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 1, 4, 10, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 1, 5, 9, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup058.inc b/sound/voicegroups/voicegroup058.inc
index 1e50a0b3a..af043d943 100644
--- a/sound/voicegroups/voicegroup058.inc
+++ b/sound/voicegroups/voicegroup058.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup058:: @ 8685448
-	voice_keysplit_all voicegroup001  @ 8685448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868546C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868549C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86854A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86854B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86854C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86854CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86854D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86854E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86854F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86854FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685508
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8685514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868552C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868555C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868558C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86855A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86855B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86855BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86855C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86855D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86855E0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86855EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86855F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868561C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868564C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868567C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86856A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86856AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86856B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86856C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86856D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86856DC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86856E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86856F4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8685700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868570C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868573C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868576C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868579C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86857A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86857B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86857C0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 86857CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86857D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86857E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86857F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86857FC
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 8685808
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 8685814
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8685820
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 868582C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868585C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868588C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86858A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86858B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86858BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86858C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86858D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86858E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86858EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86858F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868591C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868594C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868597C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86859A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86859AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86859B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86859C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86859D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86859DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86859E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86859F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685A0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685A18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685A24
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 8685A30
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8685A3C
+voicegroup058::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup059.inc b/sound/voicegroups/voicegroup059.inc
index 20b91da5d..f0c4d3415 100644
--- a/sound/voicegroups/voicegroup059.inc
+++ b/sound/voicegroups/voicegroup059.inc
@@ -1,92 +1,92 @@
 	.align 2
-voicegroup059:: @ 8685A48
-	voice_keysplit_all voicegroup001  @ 8685A48
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8685A54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685A6C
-	voice_square_2_alt 60, 0, 1, 1, 1, 6, 2  @ 8685A78
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 8685A84
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 8685A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685AA8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242  @ 8685AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685AE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8685AF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685BD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685C34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685C40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685C58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685C64
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 8685C70
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239  @ 8685C7C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8685C88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685CC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685CDC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8685CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685CF4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8685D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D0C
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8685D18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685DA8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 8685DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685DFC
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 2  @ 8685E08
-	voice_square_2_alt 60, 0, 2, 0, 1, 6, 0  @ 8685E14
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 8685E20
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 8685E2C
-	voice_square_1_alt 60, 0, 0, 1, 1, 2, 4, 0  @ 8685E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685E50
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8685E5C
-	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2  @ 8685E68
+voicegroup059::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 1, 1, 6, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 6, 2
+	voice_square_2_alt 60, 0, 2, 0, 1, 6, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 1, 1, 2, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2
 
diff --git a/sound/voicegroups/voicegroup060.inc b/sound/voicegroups/voicegroup060.inc
index 02569e1ca..448841e62 100644
--- a/sound/voicegroups/voicegroup060.inc
+++ b/sound/voicegroups/voicegroup060.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup060:: @ 8685E74
-	voice_keysplit_all voicegroup001  @ 8685E74
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8685E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685E98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685EB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F04
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8685F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8685FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868600C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868603C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868606C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686084
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 128, 226, 0, 38  @ 8686090
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 868609C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 86860A8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86860B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86860C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86860CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86860D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86860E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86860F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86860FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686108
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8686114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686120
-	voice_keysplit voicegroup008, KeySplitTable4  @ 868612C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686138
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8686144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868615C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868618C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86861A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86861B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86861BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86861C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86861D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 86861E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86861EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86861F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868621C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686228
-	voice_square_2_alt 60, 0, 1, 1, 1, 6, 1  @ 8686234
-	voice_square_1_alt 60, 0, 0, 1, 0, 4, 4, 1  @ 8686240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868624C
-	voice_square_2_alt 60, 0, 2, 0, 7, 3, 3  @ 8686258
-	voice_square_1_alt 60, 0, 0, 2, 0, 7, 3, 3  @ 8686264
-	voice_square_1_alt 60, 0, 0, 3, 2, 2, 7, 0  @ 8686270
-	voice_square_2_alt 60, 0, 1, 1, 2, 3, 0  @ 868627C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86862A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86862AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86862B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86862C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86862D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86862DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86862E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86862F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868630C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868633C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868636C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868639C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86863A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86863B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86863C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86863CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86863D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86863E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86863F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86863FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868642C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868645C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8686468
+voicegroup060::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 128, 226, 0, 38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 1, 1, 6, 1
+	voice_square_1_alt 60, 0, 0, 1, 0, 4, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 7, 3, 3
+	voice_square_1_alt 60, 0, 0, 2, 0, 7, 3, 3
+	voice_square_1_alt 60, 0, 0, 3, 2, 2, 7, 0
+	voice_square_2_alt 60, 0, 1, 1, 2, 3, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup061.inc b/sound/voicegroups/voicegroup061.inc
index d4b8a50b3..af4640094 100644
--- a/sound/voicegroups/voicegroup061.inc
+++ b/sound/voicegroups/voicegroup061.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup061:: @ 8686474
-	voice_keysplit_all voicegroup001  @ 8686474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868648C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86864A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86864B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86864BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86864C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86864D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86864E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86864EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86864F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868651C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686534
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8686540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868654C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868657C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86865A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86865AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86865B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86865C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86865D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86865DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86865E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86865F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868660C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686618
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115  @ 8686624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868663C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868666C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868669C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86866A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86866B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86866C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86866CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86866D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86866E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86866F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86866FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686708
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8686714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868672C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868675C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868678C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86867A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86867B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86867BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86867C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86867D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 86867E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86867EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86867F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868681C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686828
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 8686834
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 8686840
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 868684C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 8686858
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8686864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868687C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86868A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86868AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86868B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86868C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86868D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86868DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86868E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86868F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868690C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868693C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868696C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868699C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86869A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86869B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86869C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86869CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86869D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86869E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86869F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86869FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686A50
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8686A5C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8686A68
+voicegroup061::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup062.inc b/sound/voicegroups/voicegroup062.inc
index 7415e7090..d3745820e 100644
--- a/sound/voicegroups/voicegroup062.inc
+++ b/sound/voicegroups/voicegroup062.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup062:: @ 8686A74
-	voice_keysplit_all voicegroup001  @ 8686A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686BB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686BC4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0  @ 8686BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686BDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C30
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8686C3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686CE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D08
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8686D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686DEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E34
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8686E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E4C
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 8686E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686E94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686EE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686EF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686FA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686FE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8686FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868702C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687050
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868705C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8687068
+voicegroup062::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup063.inc b/sound/voicegroups/voicegroup063.inc
index 98ac82176..bd316ea2c 100644
--- a/sound/voicegroups/voicegroup063.inc
+++ b/sound/voicegroups/voicegroup063.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup063:: @ 8687074
-	voice_keysplit_all voicegroup001  @ 8687074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868708C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86870A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86870B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86870BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86870C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86870D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86870E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86870EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86870F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868711C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687134
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 8687140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868714C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868717C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86871A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86871AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86871B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86871C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86871D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86871DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86871E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86871F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868720C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687218
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 8687224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868723C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868726C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868729C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86872A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86872B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86872C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86872CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86872D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86872E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86872F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86872FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687308
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8687314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868732C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868735C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868738C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86873A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86873B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86873BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86873C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86873D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86873E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86873EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86873F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868741C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687428
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 8687434
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 8687440
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 868744C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 8687458
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8687464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868747C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86874A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86874AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86874B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86874C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86874D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86874DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86874E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86874F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868750C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868753C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868756C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868759C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86875A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86875B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86875C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86875CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86875D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86875E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86875F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86875FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868762C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687650
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868765C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8687668
+voicegroup063::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup064.inc b/sound/voicegroups/voicegroup064.inc
index f52f45699..e617f0ffd 100644
--- a/sound/voicegroups/voicegroup064.inc
+++ b/sound/voicegroups/voicegroup064.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup064:: @ 8687674
-	voice_keysplit_all voicegroup001  @ 8687674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868768C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86876A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86876B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86876BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86876C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86876D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86876E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86876EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86876F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868771C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868774C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868777C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687788
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 8687794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86877A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86877AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86877B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86877C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86877D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86877DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86877E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86877F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868780C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868783C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868786C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687890
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 868789C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 86878A8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86878B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86878C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86878CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86878D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86878E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86878F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86878FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868792C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687938
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8687944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868795C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868798C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86879A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86879B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86879BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86879C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86879D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 86879E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86879EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86879F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687A10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687A28
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 8687A34
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8687A40
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 8687A4C
-	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1  @ 8687A58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687A64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687A70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687A7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687A88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687A94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687AB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687AE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687BA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687BE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687C08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687C14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687C20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687C2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687C38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687C50
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8687C5C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8687C68
+voicegroup064::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup065.inc b/sound/voicegroups/voicegroup065.inc
index d4a604867..d435a0a30 100644
--- a/sound/voicegroups/voicegroup065.inc
+++ b/sound/voicegroups/voicegroup065.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup065:: @ 8687C74
-	voice_keysplit_all voicegroup001  @ 8687C74
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8687C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687C98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687CA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687CB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687CE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D34
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 8687D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687DD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687DDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687DE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E18
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 8687E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687EE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F08
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8687F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687FA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687FB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8687FF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868801C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688028
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 8688034
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 8688040
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 868804C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0  @ 8688058
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8688064
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 8688070
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 868807C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0  @ 8688088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86880A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86880AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86880B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86880C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86880D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86880DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86880E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86880F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868810C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868813C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868816C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868819C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86881A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86881B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86881C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86881CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86881D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86881E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86881F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86881FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868822C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688250
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868825C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8688268
+voicegroup065::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup066.inc b/sound/voicegroups/voicegroup066.inc
index ba3f16703..d5bffde63 100644
--- a/sound/voicegroups/voicegroup066.inc
+++ b/sound/voicegroups/voicegroup066.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup066:: @ 8688274
-	voice_keysplit_all voicegroup001  @ 8688274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868828C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86882A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86882B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86882BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86882C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86882D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86882E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86882EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86882F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868831C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868834C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868837C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688388
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 8688394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86883A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86883AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86883B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86883C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86883D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86883DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86883E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86883F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868840C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8688418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688430
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 868843C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868846C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688484
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 8688490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868849C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86884A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86884B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86884C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86884CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86884D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86884E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86884F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86884FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868852C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868855C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868858C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86885A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86885B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86885BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86885C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86885D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 86885E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86885EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86885F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868861C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688628
-	voice_square_1 60, 0, 0, 1, 0, 1, 4, 1  @ 8688634
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 8688640
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 3  @ 868864C
-	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1  @ 8688658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868867C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86886A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86886AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86886B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86886C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86886D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86886DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86886E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86886F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868870C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868873C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868876C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868879C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86887A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86887B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86887C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86887CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86887D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86887E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86887F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86887FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868882C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688850
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868885C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8688868
+voicegroup066::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 3
+	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup067.inc b/sound/voicegroups/voicegroup067.inc
index b2ecd0927..dffd21a70 100644
--- a/sound/voicegroups/voicegroup067.inc
+++ b/sound/voicegroups/voicegroup067.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup067:: @ 8688874
-	voice_keysplit_all voicegroup001  @ 8688874
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8688880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868888C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86888A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86888B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86888BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86888C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86888D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86888E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86888EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86888F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868891C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688934
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8688940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868894C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868897C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688988
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 8688994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86889A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86889AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86889B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86889C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86889D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86889DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86889E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86889F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A30
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8688A3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688AA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688AF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B08
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8688B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688BD4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 8688BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688C28
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 8688C34
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 8688C40
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8688C4C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 8688C58
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8688C64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688C70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688C7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688C88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688CC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688E08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688E20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688E2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688E50
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8688E5C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8688E68
+voicegroup067::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup068.inc b/sound/voicegroups/voicegroup068.inc
index 1d7f97cd5..fc3f7246d 100644
--- a/sound/voicegroups/voicegroup068.inc
+++ b/sound/voicegroups/voicegroup068.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup068:: @ 8688E74
-	voice_keysplit_all voicegroup001  @ 8688E74
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8688E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688E98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688EB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688F10
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8688F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688F28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688F34
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8688F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688F88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 8688F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8688FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868900C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8689018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689030
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 868903C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868906C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868909C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86890A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86890B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86890C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86890CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86890D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86890E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86890F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86890FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689108
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8689114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868912C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868915C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868918C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86891A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86891B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86891BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86891C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86891D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 86891E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86891EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86891F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868921C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689228
-	voice_square_1 60, 0, 0, 2, 0, 2, 3, 1  @ 8689234
-	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1  @ 8689240
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 868924C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 8689258
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8689264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868927C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86892A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86892AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86892B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86892C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86892D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86892DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86892E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86892F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868930C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868933C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868936C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868939C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86893A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86893B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86893C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86893CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86893D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86893E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86893F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86893FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868942C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689450
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868945C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8689468
+voicegroup068::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 2, 3, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup069.inc b/sound/voicegroups/voicegroup069.inc
index 952ebff66..477fd538b 100644
--- a/sound/voicegroups/voicegroup069.inc
+++ b/sound/voicegroups/voicegroup069.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup069:: @ 8689474
-	voice_keysplit_all voicegroup001  @ 8689474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868948C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86894A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86894B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86894BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86894C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86894D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86894E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86894EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86894F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868951C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689534
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8689540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868954C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868957C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689588
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 8689594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86895A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86895AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86895B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86895C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86895D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86895DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86895E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86895F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868960C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8689618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689630
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 868963C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868966C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689684
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 8689690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868969C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86896A8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86896B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86896C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86896CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86896D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86896E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86896F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86896FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689720
-	voice_keysplit voicegroup008, KeySplitTable4  @ 868972C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868975C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868978C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86897A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86897B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86897BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86897C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86897D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 86897E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86897EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86897F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868981C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689828
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 8689834
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8689840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868984C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 3  @ 8689858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868987C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86898A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86898AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86898B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86898C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86898D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86898DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86898E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86898F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868990C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868993C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868996C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868999C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86899A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86899B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86899C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86899CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86899D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86899E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86899F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86899FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689A50
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8689A5C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8689A68
+voicegroup069::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup070.inc b/sound/voicegroups/voicegroup070.inc
index 6d80b556a..aaa407802 100644
--- a/sound/voicegroups/voicegroup070.inc
+++ b/sound/voicegroups/voicegroup070.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup070:: @ 8689A74
-	voice_keysplit_all voicegroup001  @ 8689A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689B88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 8689B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689BB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689BC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689BDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C0C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8689C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689C90
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 8689C9C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 8689CA8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8689CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689CE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D08
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8689D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689DEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689E28
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 8689E34
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 8689E40
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8689E4C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 8689E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689E64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689E7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689E94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689EE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689EF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689FA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689FE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8689FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A02C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A050
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 868A05C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868A068
+voicegroup070::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup071.inc b/sound/voicegroups/voicegroup071.inc
index a1592a6e8..c6c7414e3 100644
--- a/sound/voicegroups/voicegroup071.inc
+++ b/sound/voicegroups/voicegroup071.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup071:: @ 868A074
-	voice_keysplit_all voicegroup001  @ 868A074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A08C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A0A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A0B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A0BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A0C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A0D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A0E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A0EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A0F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A11C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A14C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A17C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A1A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A1AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A1B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A1C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A1D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A1DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A1E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A1F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A20C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A23C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A26C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A29C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A2A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A2B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A2C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A2CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A2D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A2E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A2F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A2FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A308
-	voice_keysplit voicegroup007, KeySplitTable3  @ 868A314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A320
-	voice_keysplit voicegroup008, KeySplitTable4  @ 868A32C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A338
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868A344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A35C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A38C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A3A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A3B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A3BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A3C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A3D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A3E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A3EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A3F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A41C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A428
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 868A434
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 868A440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A44C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2  @ 868A458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A47C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A4A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A4AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A4B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A4C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A4D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A4DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A4E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A4F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A50C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A53C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A56C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A59C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A5A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A5B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A5C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A5CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A5D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A5E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A5F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A5FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A62C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A65C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868A668
+voicegroup071::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup072.inc b/sound/voicegroups/voicegroup072.inc
index deb467dbf..7c040a3e7 100644
--- a/sound/voicegroups/voicegroup072.inc
+++ b/sound/voicegroups/voicegroup072.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup072:: @ 868A674
-	voice_keysplit_all voicegroup001  @ 868A674
-	voice_keysplit voicegroup005, KeySplitTable1  @ 868A680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A68C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A6A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A6B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A6BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A6C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A6D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A6E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A6EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A6F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A704
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 868A710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A71C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A734
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 868A740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A74C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A77C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A788
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 868A794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A7A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A7AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A7B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A7C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A7D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A7DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A7E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A7F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A80C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 868A818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A83C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A86C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A890
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 868A89C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A8A8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868A8B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A8C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A8CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A8D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A8E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A8F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A8FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A908
-	voice_keysplit voicegroup007, KeySplitTable3  @ 868A914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A92C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A938
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868A944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A95C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A98C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A9A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A9B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A9BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A9C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A9D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A9E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A9EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868A9F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AA04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AA10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AA1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AA28
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 868AA34
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 868AA40
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 868AA4C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 868AA58
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0  @ 868AA64
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0  @ 868AA70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AA7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AA88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AA94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AAA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AAAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AAB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AAC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AAD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AAE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AAF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AB9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ABA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ABB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ABC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ABCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ABD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ABE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ABF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ABFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AC08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AC14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AC20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AC2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AC38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AC44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AC50
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 868AC5C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868AC68
+voicegroup072::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup073.inc b/sound/voicegroups/voicegroup073.inc
index 2701b5c79..9692cc87d 100644
--- a/sound/voicegroups/voicegroup073.inc
+++ b/sound/voicegroups/voicegroup073.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup073:: @ 868AC74
-	voice_keysplit_all voicegroup001  @ 868AC74
-	voice_keysplit voicegroup005, KeySplitTable1  @ 868AC80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AC8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AC98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ACA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ACB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ACBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ACC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ACD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ACE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ACEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ACF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AD04
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 868AD10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AD1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AD28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AD34
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 868AD40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AD4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AD58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AD64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AD70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AD7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AD88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 868AD94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ADA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ADAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ADB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ADC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ADD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ADDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ADE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ADF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE0C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 868AE18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE30
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 868AE3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AE90
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 868AE9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AEA8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868AEB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AEC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AEE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AEF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AEFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF08
-	voice_keysplit voicegroup007, KeySplitTable3  @ 868AF14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF38
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868AF44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AF98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AFA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AFB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AFBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AFC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AFD4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 868AFE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AFEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868AFF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B01C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B028
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1  @ 868B034
-	voice_square_2_alt 60, 0, 2, 0, 2, 4, 1  @ 868B040
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 868B04C
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0  @ 868B058
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0  @ 868B064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B07C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B0A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B0AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B0B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B0C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B0D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B0DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B0E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B0F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B10C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B13C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B16C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B19C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B1A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B1B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B1C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B1CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B1D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B1E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B1F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B1FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B22C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B250
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 868B25C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868B268
+voicegroup073::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup074.inc b/sound/voicegroups/voicegroup074.inc
index 6b9dcfb51..5be06711b 100644
--- a/sound/voicegroups/voicegroup074.inc
+++ b/sound/voicegroups/voicegroup074.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup074:: @ 868B274
-	voice_keysplit_all voicegroup001  @ 868B274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B28C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B2A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B2B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B2BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B2C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B2D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B2E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B2EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B2F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B304
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 868B310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B31C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B34C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B37C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B3A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B3AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B3B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B3C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B3D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B3DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B3E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B3F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B40C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 868B418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B43C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B46C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B49C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 216  @ 868B4A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B4B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B4C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B4CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B4D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B4E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B4F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B4FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B52C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B55C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B58C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B5A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B5B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B5BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B5C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B5D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B5E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B5EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B5F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B61C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B628
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 0  @ 868B634
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 0  @ 868B640
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 868B64C
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 868B658
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 868B664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B67C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 868B688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B6A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B6AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B6B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B6C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B6D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B6DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B6E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B6F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B70C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B73C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B76C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B79C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B7A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B7B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B7C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B7CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B7D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B7E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B7F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B7FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B82C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B850
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 868B85C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868B868
+voicegroup074::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup075.inc b/sound/voicegroups/voicegroup075.inc
index cd8ed9250..72b144a13 100644
--- a/sound/voicegroups/voicegroup075.inc
+++ b/sound/voicegroups/voicegroup075.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup075:: @ 868B874
-	voice_keysplit_all voicegroup001  @ 868B874
-	voice_keysplit voicegroup005, KeySplitTable1  @ 868B880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B88C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B8A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B8B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B8BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B8C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B8D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B8E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B8EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B8F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B910
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 868B91C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B94C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B97C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B9A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B9AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B9B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B9C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B9D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B9DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B9E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868B9F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA0C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 868BA18
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 868BA24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BA9C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 868BAA8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868BAB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BAC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BAD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BAE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BAF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BAFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BB08
-	voice_keysplit voicegroup007, KeySplitTable3  @ 868BB14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BB20
-	voice_keysplit voicegroup008, KeySplitTable4  @ 868BB2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BB38
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868BB44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BB50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BB5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BB68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BB74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BB80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BB8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BB98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BBA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BBB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BBBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BBC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BBD4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 868BBE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BBEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BBF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BC04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BC10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BC1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BC28
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 1  @ 868BC34
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 868BC40
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 868BC4C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0  @ 868BC58
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 868BC64
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 1  @ 868BC70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BC7C
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1  @ 868BC88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BC94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BCA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BCAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BCB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BCC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BCD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BCDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BCE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BCF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BD9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BDA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BDB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BDC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BDCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BDD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BDE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BDF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BDFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BE08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BE14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BE20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BE2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BE38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BE44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BE50
-	voice_noise_alt 60, 0, 0, 0, 3, 4, 0  @ 868BE5C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868BE68
+voicegroup075::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 3, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup076.inc b/sound/voicegroups/voicegroup076.inc
index 3148389b2..a4eadcef3 100644
--- a/sound/voicegroups/voicegroup076.inc
+++ b/sound/voicegroups/voicegroup076.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup076:: @ 868BE74
-	voice_keysplit_all voicegroup001  @ 868BE74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BE80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BE8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BE98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BEA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BEB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BEBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BEC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BEE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BEEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BEF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF34
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 868BF40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BF94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BFA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BFAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BFB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BFC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BFD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BFDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BFE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868BFF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C00C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 868C018
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 868C024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C03C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C06C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C09C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C0A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C0B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C0C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C0CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C0D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C0E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C0F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C0FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C108
-	voice_keysplit voicegroup007, KeySplitTable3  @ 868C114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C12C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C15C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C18C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C1A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C1B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C1BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C1C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C1D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C1E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C1EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C1F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C21C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C228
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 868C234
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 868C240
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 868C24C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0  @ 868C258
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 868C264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C27C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C2A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C2AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C2B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C2C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C2D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C2DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C2E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C2F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C30C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C33C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C36C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C39C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C3A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C3B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C3C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C3CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C3D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C3E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C3F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C3FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C42C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C450
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868C45C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868C468
+voicegroup076::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup077.inc b/sound/voicegroups/voicegroup077.inc
index bc174e895..08f0e5e38 100644
--- a/sound/voicegroups/voicegroup077.inc
+++ b/sound/voicegroups/voicegroup077.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup077:: @ 868C474
-	voice_keysplit_all voicegroup001  @ 868C474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C48C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C4A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C4B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C4BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C4C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C4D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C4E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C4EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C4F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C504
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 868C510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C51C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C534
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 868C540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C54C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C57C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C588
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 868C594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C5A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C5AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C5B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C5C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C5D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C5DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C5E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C5F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C60C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 196  @ 868C618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C63C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C66C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C690
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 868C69C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C6A8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868C6B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C6C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C6CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C6D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C6E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C6F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C6FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C72C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C75C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C78C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C7A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C7B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C7BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C7C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C7D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 868C7E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C7EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C7F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C81C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C828
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 868C834
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 868C840
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 868C84C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C87C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C8A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C8AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C8B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C8C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C8D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C8DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C8E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C8F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C90C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C93C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C96C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C99C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C9A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C9B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C9C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C9CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C9D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C9E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C9F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868C9FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CA08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CA14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CA20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CA2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CA38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CA44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CA50
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 868CA5C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868CA68
+voicegroup077::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 196
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup078.inc b/sound/voicegroups/voicegroup078.inc
index 29fc345c8..b6dba9dca 100644
--- a/sound/voicegroups/voicegroup078.inc
+++ b/sound/voicegroups/voicegroup078.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup078:: @ 868CA74
-	voice_keysplit_all voicegroup001  @ 868CA74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CA80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CA8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CA98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CAA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CAB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CAC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CAD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CAE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CAEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CAF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB10
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 868CB1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CB88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 868CB94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CBA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CBAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CBB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CBC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CBD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CBDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CBE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CBF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC0C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 196  @ 868CC18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC84
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 868CC90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CC9C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 868CCA8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868CCB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CCC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CCCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CCD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CCE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CCF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CCFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD38
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868CD44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CD98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CDA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CDB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CDBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CDC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CDD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CDE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CDEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CDF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CE04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CE10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CE1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CE28
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 868CE34
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 868CE40
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 868CE4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CE58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CE64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CE70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CE7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CE88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CE94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CEA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CEAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CEB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CEC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CEDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CEE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CEF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CF9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CFA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CFB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CFC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CFCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CFD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CFE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CFF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868CFFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D02C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D050
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 868D05C
-	voice_noise_alt 60, 0, 0, 0, 2, 0, 2  @ 868D068
+voicegroup078::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 196
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 0, 2
 
diff --git a/sound/voicegroups/voicegroup079.inc b/sound/voicegroups/voicegroup079.inc
index 8aa13f41e..ecea4eca1 100644
--- a/sound/voicegroups/voicegroup079.inc
+++ b/sound/voicegroups/voicegroup079.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup079:: @ 868D074
-	voice_keysplit_all voicegroup001  @ 868D074
-	voice_keysplit voicegroup005, KeySplitTable1  @ 868D080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D08C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D0A4
-	voice_square_2_alt 60, 0, 3, 0, 2, 4, 1  @ 868D0B0
-	voice_square_2_alt 60, 0, 0, 0, 1, 6, 2  @ 868D0BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D0C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D0D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D0E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D0EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D0F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D110
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 868D11C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D134
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 868D140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D14C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D17C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D188
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 868D194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D1A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D1AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D1B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D1C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D1D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D1DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D1E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D1F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D20C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D23C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 6, 2  @ 868D248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D26C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D284
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 868D290
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 868D29C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D2A8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868D2B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D2C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D2CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D2D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D2E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D2F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D2FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D32C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D35C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D38C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D3A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D3B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D3BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D3C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D3D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 868D3E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D3EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D3F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D41C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D428
-	voice_square_1_alt 60, 0, 0, 3, 0, 2, 4, 1  @ 868D434
-	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2  @ 868D440
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0  @ 868D44C
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 5  @ 868D458
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 4, 4  @ 868D464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D47C
-	voice_square_2_alt 60, 0, 2, 0, 1, 6, 2  @ 868D488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D4A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D4AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D4B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D4C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D4D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D4DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D4E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D4F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D50C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D53C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D56C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D59C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D5A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D5B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D5C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D5CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D5D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D5E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D5F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D5FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D62C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D650
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868D65C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868D668
+voicegroup079::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 2, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 2, 4, 1
+	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 5
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 4, 4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup080.inc b/sound/voicegroups/voicegroup080.inc
index 1d0a21b32..a6827083c 100644
--- a/sound/voicegroups/voicegroup080.inc
+++ b/sound/voicegroups/voicegroup080.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup080:: @ 868D674
-	voice_keysplit_all voicegroup001  @ 868D674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D68C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D6A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D6B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D6BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D6C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D6D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D6E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D6EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D6F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D71C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D74C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D77C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D788
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 868D794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D7A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D7AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D7B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D7C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D7D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D7DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D7E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D7F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D80C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D830
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 868D83C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D86C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D884
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 868D890
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 868D89C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 868D8A8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868D8B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D8C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D8CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D8D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D8E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D8F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D8FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D92C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D938
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868D944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D95C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D98C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D9A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D9B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D9BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D9C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D9D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 868D9E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D9EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868D9F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DA04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DA10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DA1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DA28
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 868DA34
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 868DA40
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 868DA4C
-	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1  @ 868DA58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DA64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DA70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DA7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DA88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DA94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DAA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DAAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DAB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DAC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DAD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DAE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DAF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DB9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DBA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DBB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DBC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DBCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DBD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DBE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DBF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DBFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DC08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DC14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DC20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DC2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DC38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DC44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DC50
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868DC5C
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868DC68
+voicegroup080::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup081.inc b/sound/voicegroups/voicegroup081.inc
index 4ecddbf36..e9c2011e4 100644
--- a/sound/voicegroups/voicegroup081.inc
+++ b/sound/voicegroups/voicegroup081.inc
@@ -1,5 +1,5 @@
 	.align 2
-voicegroup081:: @ 868DC74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DC74
-	voice_keysplit voicegroup005, KeySplitTable1  @ 868DC80
+voicegroup081::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup005, KeySplitTable1
 
diff --git a/sound/voicegroups/voicegroup082.inc b/sound/voicegroups/voicegroup082.inc
index 0e3886eb1..9aa1d7c5b 100644
--- a/sound/voicegroups/voicegroup082.inc
+++ b/sound/voicegroups/voicegroup082.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup082:: @ 868DC8C
-	voice_keysplit_all voicegroup001  @ 868DC8C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 868DC98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DCA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DCB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DCBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DCC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DCD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DCE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DCEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DCF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD28
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 868DD34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DD94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DDA0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 868DDAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DDB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DDC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DDD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DDDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DDE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DDF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DE9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DEA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DEB4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 868DEC0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868DECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DEE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DEF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DEFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF20
-	voice_keysplit voicegroup007, KeySplitTable3  @ 868DF2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF50
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868DF5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DF98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DFA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DFB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DFBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DFC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DFD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DFE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DFEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868DFF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E01C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E040
-	voice_square_1_alt 60, 0, 0, 3, 0, 2, 4, 1  @ 868E04C
-	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2  @ 868E058
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 868E064
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 4, 4  @ 868E070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E07C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E0A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E0AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E0B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E0C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E0D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E0DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E0E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E0F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E10C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E13C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E16C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E19C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E1A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E1B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E1C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E1CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E1D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E1E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E1F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E1FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E22C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E25C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E268
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868E274
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868E280
+voicegroup082::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 2, 4, 1
+	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 4, 4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup083.inc b/sound/voicegroups/voicegroup083.inc
index 4a7a6f942..09cee33e1 100644
--- a/sound/voicegroups/voicegroup083.inc
+++ b/sound/voicegroups/voicegroup083.inc
@@ -1,87 +1,87 @@
 	.align 2
-voicegroup083:: @ 868E28C
-	voice_keysplit_all voicegroup001  @ 868E28C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 868E298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E2A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E2B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E2BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E2C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E2D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E2E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E2EC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 72, 249  @ 868E2F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E31C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E34C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E37C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E3A0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76  @ 868E3AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E3B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E3C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E3D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E3DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E3E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E3F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E40C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E424
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 868E430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E43C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E46C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E49C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 868E4A8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242  @ 868E4B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E4C0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868E4CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E4D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E4E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E4F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E4FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E52C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E538
-	voice_keysplit voicegroup008, KeySplitTable4  @ 868E544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E550
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868E55C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E58C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E5A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E5B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E5BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E5C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E5D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E5E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E5EC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 868E5F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E61C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E640
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 868E64C
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 2  @ 868E658
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 6, 4  @ 868E664
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 2, 6, 1  @ 868E670
+voicegroup083::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 72, 249
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 6, 4
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 2, 6, 1
 
diff --git a/sound/voicegroups/voicegroup084.inc b/sound/voicegroups/voicegroup084.inc
index ea44d4722..ee994d84d 100644
--- a/sound/voicegroups/voicegroup084.inc
+++ b/sound/voicegroups/voicegroup084.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup084:: @ 868E67C
-	voice_keysplit_all voicegroup001  @ 868E67C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E6A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E6AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E6B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E6C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E6D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E6DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E6E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E6F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E70C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E718
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 868E724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E73C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E76C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E790
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 868E79C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E7A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E7B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E7C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E7CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E7D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E7E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E7F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E7FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E82C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E85C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E88C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E898
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 868E8A4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 868E8B0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868E8BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E8C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E8D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E8E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E8EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E8F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E91C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E940
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868E94C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E97C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E9A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E9AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E9B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E9C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E9D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E9DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 868E9E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868E9F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA30
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 0  @ 868EA3C
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0  @ 868EA48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA84
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1  @ 868EA90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EA9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EAA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EAB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EAC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EAD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EAE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EAF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EAFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EB98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EBA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EBB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EBBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EBC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EBD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EBE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EBEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EBF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EC04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EC10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EC1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EC28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EC34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EC40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EC4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EC58
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868EC64
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868EC70
+voicegroup084::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup085.inc b/sound/voicegroups/voicegroup085.inc
index fee99d5fc..bd2cc348f 100644
--- a/sound/voicegroups/voicegroup085.inc
+++ b/sound/voicegroups/voicegroup085.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup085:: @ 868EC7C
-	voice_keysplit_all voicegroup001  @ 868EC7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EC88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EC94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ECA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ECAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ECB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ECC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ECD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ECDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ECE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ECF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868ED90
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 868ED9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EDA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EDB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EDC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EDCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EDD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EDE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EDF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EDFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EE98
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 868EEA4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 868EEB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EEBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EEC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EEE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EEEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EEF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF10
-	voice_keysplit voicegroup007, KeySplitTable3  @ 868EF1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EF94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EFA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EFAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EFB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EFC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EFD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EFDC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 868EFE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868EFF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F00C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F030
-	voice_square_1_alt 60, 0, 0, 2, 1, 2, 4, 0  @ 868F03C
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0  @ 868F048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F054
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 868F060
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 13, 1  @ 868F06C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F09C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F0A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F0B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F0C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F0CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F0D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F0E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F0F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F0FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F12C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F15C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F18C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F1A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F1B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F1BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F1C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F1D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F1E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F1EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F1F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F21C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F24C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F258
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868F264
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868F270
+voicegroup085::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 1, 2, 4, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 13, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup086.inc b/sound/voicegroups/voicegroup086.inc
index 88e475777..482a7729e 100644
--- a/sound/voicegroups/voicegroup086.inc
+++ b/sound/voicegroups/voicegroup086.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup086:: @ 868F27C
-	voice_keysplit_all voicegroup001  @ 868F27C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F2A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F2AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F2B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F2C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F2D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F2DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F2E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F2F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F30C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F318
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 868F324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F33C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 868F348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F36C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F390
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 868F39C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F3A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F3B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F3C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F3CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F3D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F3E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F3F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F3FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F414
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 868F420
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 868F42C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F45C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F48C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F498
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 868F4A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F4B0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 868F4BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F4C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F4D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F4E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F4EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F4F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F510
-	voice_keysplit voicegroup007, KeySplitTable3  @ 868F51C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F540
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868F54C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F57C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F5A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F5AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F5B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F5C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F5D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F5DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 868F5E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F5F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F60C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F630
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0  @ 868F63C
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0  @ 868F648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F654
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 868F660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F66C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F69C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F6A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F6B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F6C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F6CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F6D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F6E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F6F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F6FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F72C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F75C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F78C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F7A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F7B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F7BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F7C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F7D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F7E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F7EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F7F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F81C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F84C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F858
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868F864
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868F870
+voicegroup086::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup087.inc b/sound/voicegroups/voicegroup087.inc
index f71016d5d..d9295b3fe 100644
--- a/sound/voicegroups/voicegroup087.inc
+++ b/sound/voicegroups/voicegroup087.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup087:: @ 868F87C
-	voice_keysplit_all voicegroup001  @ 868F87C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F8A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F8AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F8B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F8C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F8D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F8DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F8E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F8F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F90C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F93C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F96C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F99C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F9A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F9B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F9C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F9CC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0  @ 868F9D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F9E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F9F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868F9FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA20
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 868FA2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA38
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 868FA44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FA98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FAA4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 868FAB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FAC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FAD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FAE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FAEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FAF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB10
-	voice_keysplit voicegroup007, KeySplitTable3  @ 868FB1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB40
-	voice_keysplit voicegroup009, KeySplitTable5  @ 868FB4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FB94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FBA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FBAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FBB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FBC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FBD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FBDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FBE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FBF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC30
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 868FC3C
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 868FC48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC54
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0  @ 868FC60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FC9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FCA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FCB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FCC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FCCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FCD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FCE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FCF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FCFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FD98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FDA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FDB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FDBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FDC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FDD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FDE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FDEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FDF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FE04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FE10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FE1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FE28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FE34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FE40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FE4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FE58
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 868FE64
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 868FE70
+voicegroup087::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup088.inc b/sound/voicegroups/voicegroup088.inc
index 6b0ecee98..82afd10f6 100644
--- a/sound/voicegroups/voicegroup088.inc
+++ b/sound/voicegroups/voicegroup088.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup088:: @ 868FE7C
-	voice_keysplit_all voicegroup001  @ 868FE7C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 868FE88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FE94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FEA0
-	voice_square_2_alt 60, 0, 1, 1, 1, 6, 2  @ 868FEAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FEB8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 868FEC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FEDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FEE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FEF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF18
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 868FF24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FF9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FFA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FFB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FFC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FFCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FFD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FFE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FFF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 868FFFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869002C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869005C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869008C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690098
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 86900A4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239  @ 86900B0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86900BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86900C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86900D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86900E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86900EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86900F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690110
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869011C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690128
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8690134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690140
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869014C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869017C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86901A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86901AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86901B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86901C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86901D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86901DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86901E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86901F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869020C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690230
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 6, 2  @ 869023C
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0  @ 8690248
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 8690254
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 8690260
-	voice_square_1_alt 60, 0, 0, 1, 1, 1, 6, 0  @ 869026C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690284
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0  @ 8690290
-	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2  @ 869029C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86902A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86902B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86902C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86902CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86902D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86902E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86902F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86902FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869032C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869035C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869038C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86903A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86903B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86903BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86903C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86903D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86903E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86903EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86903F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869041C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869044C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690464
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8690470
+voicegroup088::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 1, 1, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 6, 2
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 1, 1, 1, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup089.inc b/sound/voicegroups/voicegroup089.inc
index 82e565444..7d71119ba 100644
--- a/sound/voicegroups/voicegroup089.inc
+++ b/sound/voicegroups/voicegroup089.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup089:: @ 869047C
-	voice_keysplit_all voicegroup001  @ 869047C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86904A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86904AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86904B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86904C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86904D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86904DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86904E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86904F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869050C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690518
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8690524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869053C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869056C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869059C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86905A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86905B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86905C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86905CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86905D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86905E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86905F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86905FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869062C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869065C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869068C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86906A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86906B0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86906BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86906C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86906D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86906E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86906EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86906F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869071C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690740
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869074C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869077C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86907A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86907AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86907B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86907C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86907D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86907DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 86907E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86907F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869080C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690830
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 3  @ 869083C
-	voice_square_2_alt 60, 0, 2, 0, 2, 4, 0  @ 8690848
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 8690854
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0  @ 8690860
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 869086C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869089C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86908A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86908B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86908C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86908CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86908D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86908E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86908F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86908FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869092C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869095C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869098C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86909A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86909B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86909BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86909C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86909D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86909E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86909EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86909F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690A10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690A28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690A4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690A58
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8690A64
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8690A70
+voicegroup089::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 3
+	voice_square_2_alt 60, 0, 2, 0, 2, 4, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup090.inc b/sound/voicegroups/voicegroup090.inc
index 68499a86b..f66d09b65 100644
--- a/sound/voicegroups/voicegroup090.inc
+++ b/sound/voicegroups/voicegroup090.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup090:: @ 8690A7C
-	voice_keysplit_all voicegroup001  @ 8690A7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690A88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690A94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690AB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690AE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690BA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690BE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690C98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690CA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690CB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690CE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690DD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690DDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690DE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E30
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 4, 1  @ 8690E3C
-	voice_square_2_alt 60, 0, 0, 0, 2, 4, 1  @ 8690E48
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8690E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690EE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690FA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690FB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8690FF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869101C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869104C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691058
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8691064
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8691070
+voicegroup090::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 2, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup091.inc b/sound/voicegroups/voicegroup091.inc
index 399735e84..df866235e 100644
--- a/sound/voicegroups/voicegroup091.inc
+++ b/sound/voicegroups/voicegroup091.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup091:: @ 869107C
-	voice_keysplit_all voicegroup001  @ 869107C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8691088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86910A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86910AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86910B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86910C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86910D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86910DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 72, 249  @ 86910E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86910F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869110C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8691118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869113C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165  @ 8691148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869116C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691190
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76  @ 869119C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86911A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86911B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86911C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86911CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86911D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86911E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86911F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86911FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691214
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8691220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869122C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869125C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869128C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38  @ 8691298
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242  @ 86912A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86912B0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86912BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86912C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86912D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86912E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86912EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86912F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869131C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691328
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8691334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691340
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869134C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869137C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86913A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86913AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86913B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86913C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86913D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86913DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86913E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86913F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869140C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691430
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 5, 2  @ 869143C
-	voice_square_2_alt 60, 0, 2, 0, 1, 5, 2  @ 8691448
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 7, 0  @ 8691454
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 2, 6, 1  @ 8691460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869146C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869149C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86914A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86914B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86914C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86914CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86914D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86914E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86914F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86914FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869152C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869155C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869158C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86915A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86915B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86915BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86915C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86915D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86915E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86915EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86915F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869161C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869164C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691658
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8691664
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8691670
+voicegroup091::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 72, 249
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 226, 0, 38
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 5, 2
+	voice_square_2_alt 60, 0, 2, 0, 1, 5, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 2, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup092.inc b/sound/voicegroups/voicegroup092.inc
index 2bafc4853..9b91a44aa 100644
--- a/sound/voicegroups/voicegroup092.inc
+++ b/sound/voicegroups/voicegroup092.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup092:: @ 869167C
-	voice_keysplit_all voicegroup001  @ 869167C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86916A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86916AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86916B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86916C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86916D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86916DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86916E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86916F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869170C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8691718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869173C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869176C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691790
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76  @ 869179C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86917A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86917B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86917C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86917CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86917D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86917E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86917F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86917FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869182C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691838
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8691844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869185C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869188C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691898
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242  @ 86918A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86918B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86918BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86918C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86918D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86918E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86918EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86918F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869191C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869194C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869197C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86919A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86919AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86919B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86919C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86919D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86919DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86919E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86919F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A30
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 8691A3C
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 2  @ 8691A48
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 7, 0  @ 8691A54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691AA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691AF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691BD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691C34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691C40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691C58
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8691C64
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8691C70
+voicegroup092::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 7, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup093.inc b/sound/voicegroups/voicegroup093.inc
index 35fd8ccf5..44149b083 100644
--- a/sound/voicegroups/voicegroup093.inc
+++ b/sound/voicegroups/voicegroup093.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup093:: @ 8691C7C
-	voice_keysplit_all voicegroup001  @ 8691C7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691C88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691CC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D0C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8691D18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691D90
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76  @ 8691D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E20
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 8691E2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E38
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8691E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691E98
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242  @ 8691EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691EB0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8691EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F28
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8691F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F40
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8691F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691FDC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 8691FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8691FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869200C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692030
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 869203C
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 8692048
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 7, 0  @ 8692054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869206C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869209C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86920A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86920B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86920C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86920CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86920D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86920E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86920F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86920FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869212C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869215C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869218C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86921A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86921B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86921BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86921C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86921D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86921E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86921EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86921F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869221C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869224C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692258
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8692264
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8692270
+voicegroup093::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 7, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup094.inc b/sound/voicegroups/voicegroup094.inc
index 92f5d1f3d..21cab6cd2 100644
--- a/sound/voicegroups/voicegroup094.inc
+++ b/sound/voicegroups/voicegroup094.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup094:: @ 869227C
-	voice_keysplit_all voicegroup001  @ 869227C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86922A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86922AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86922B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86922C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86922D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86922DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 72, 249  @ 86922E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86922F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869230C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8692318
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8692324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869233C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8692348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869236C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 8692378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692390
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76  @ 869239C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86923A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86923B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86923C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86923CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86923D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86923E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86923F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86923FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869242C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869245C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869248C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86924A4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 86924B0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86924BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86924C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86924D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86924E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86924EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86924F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692510
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869251C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692540
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869254C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869257C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86925A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86925AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86925B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86925C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86925D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86925DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86925E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86925F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869260C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692630
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 869263C
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8692648
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 7, 0  @ 8692654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869266C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869269C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86926A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86926B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86926C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86926CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86926D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86926E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86926F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86926FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869272C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869275C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869278C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86927A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86927B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86927BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86927C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86927D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86927E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86927EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86927F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869281C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869284C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692858
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8692864
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8692870
+voicegroup094::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 72, 249
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 7, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup095.inc b/sound/voicegroups/voicegroup095.inc
index feec67d53..0c791dc9e 100644
--- a/sound/voicegroups/voicegroup095.inc
+++ b/sound/voicegroups/voicegroup095.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup095:: @ 869287C
-	voice_keysplit_all voicegroup001  @ 869287C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86928A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86928AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86928B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86928C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86928D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86928DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86928E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86928F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869290C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869293C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8692948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869296C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692990
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 869299C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86929A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86929B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86929C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86929CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86929D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86929E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86929F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86929FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A38
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8692A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692BB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692BC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692BDC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 8692BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692C30
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1  @ 8692C3C
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 8692C48
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 3  @ 8692C54
-	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1  @ 8692C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692C90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692CE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692DEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692E28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692E34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692E4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692E58
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8692E64
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8692E70
+voicegroup095::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 3
+	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup096.inc b/sound/voicegroups/voicegroup096.inc
index 495b5b2f5..8fe0892e6 100644
--- a/sound/voicegroups/voicegroup096.inc
+++ b/sound/voicegroups/voicegroup096.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup096:: @ 8692E7C
-	voice_keysplit_all voicegroup001  @ 8692E7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692E94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692EE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692EF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F0C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8692F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F3C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8692F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692F90
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 8692F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692FA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692FE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8692FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693020
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 869302C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693038
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8693044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869305C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869308C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86930A4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 86930B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86930BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86930C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86930D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86930E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86930EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86930F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693110
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869311C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869314C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869317C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86931A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86931AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86931B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86931C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86931D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86931DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86931E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86931F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869320C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869323C
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8693248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693254
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 8693260
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0  @ 869326C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869329C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86932A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86932B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86932C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86932CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86932D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86932E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86932F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86932FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869332C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869335C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869338C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86933A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86933B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86933BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86933C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86933D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86933E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86933EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86933F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869341C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869344C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693458
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8693464
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8693470
+voicegroup096::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup097.inc b/sound/voicegroups/voicegroup097.inc
index dfb094bc7..e18409347 100644
--- a/sound/voicegroups/voicegroup097.inc
+++ b/sound/voicegroups/voicegroup097.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup097:: @ 869347C
-	voice_keysplit_all voicegroup001  @ 869347C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8693488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86934A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86934AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86934B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86934C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86934D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86934DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86934E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86934F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869350C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693518
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8693524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869353C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869356C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869359C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86935A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86935B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86935C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86935CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86935D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86935E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86935F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86935FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869362C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869365C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869368C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86936A4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 249  @ 86936B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86936BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86936C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86936D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86936E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86936EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86936F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869371C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693728
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8693734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693740
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869374C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869377C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86937A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86937AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86937B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86937C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86937D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86937DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86937E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86937F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869380C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693830
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1  @ 869383C
-	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1  @ 8693848
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 7, 0  @ 8693854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869386C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869389C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86938A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86938B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86938C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86938CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86938D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86938E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86938F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86938FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869392C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869395C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869398C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86939A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86939B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86939BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86939C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86939D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86939E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86939EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86939F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693A10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693A28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693A4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693A58
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8693A64
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8693A70
+voicegroup097::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 249
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 7, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup098.inc b/sound/voicegroups/voicegroup098.inc
index 4814b93d0..001bd5222 100644
--- a/sound/voicegroups/voicegroup098.inc
+++ b/sound/voicegroups/voicegroup098.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup098:: @ 8693A7C
-	voice_keysplit_all voicegroup001  @ 8693A7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693A88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693A94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693AB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693AE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693BA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693BE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693C98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693CA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693CB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693CE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D10
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8693D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D28
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8693D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693DD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693DDC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 8693DE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E30
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0  @ 8693E3C
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0  @ 8693E48
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 7, 0  @ 8693E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693EE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693FA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693FB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8693FF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869401C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869404C
-	voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127  @ 8694058
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 8694064
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8694070
+voicegroup098::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 7, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup099.inc b/sound/voicegroups/voicegroup099.inc
index 87793e90e..f4031beeb 100644
--- a/sound/voicegroups/voicegroup099.inc
+++ b/sound/voicegroups/voicegroup099.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup099:: @ 869407C
-	voice_keysplit_all voicegroup001  @ 869407C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86940A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86940AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86940B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86940C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86940D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86940DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86940E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86940F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869410C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8694118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869413C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869416C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869419C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86941A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86941B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86941C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86941CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86941D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86941E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86941F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86941FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694220
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 869422C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694238
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8694244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869425C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869428C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86942A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86942B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86942BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86942C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86942D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86942E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86942EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86942F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694310
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869431C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869434C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869437C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86943A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86943AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86943B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86943C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86943D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86943DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86943E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86943F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869440C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694430
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0  @ 869443C
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0  @ 8694448
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 7, 0  @ 8694454
-	voice_square_1_alt 60, 0, 0, 1, 2, 1, 5, 0  @ 8694460
-	voice_square_2_alt 60, 0, 1, 2, 1, 5, 0  @ 869446C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869449C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86944A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86944B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86944C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86944CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86944D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86944E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86944F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86944FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869452C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869455C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869458C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86945A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86945B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86945BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86945C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86945D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86945E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86945EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86945F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869461C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869464C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694658
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8694664
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8694670
+voicegroup099::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 7, 0
+	voice_square_1_alt 60, 0, 0, 1, 2, 1, 5, 0
+	voice_square_2_alt 60, 0, 1, 2, 1, 5, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup100.inc b/sound/voicegroups/voicegroup100.inc
index f39cc41ed..fa936e959 100644
--- a/sound/voicegroups/voicegroup100.inc
+++ b/sound/voicegroups/voicegroup100.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup100:: @ 869467C
-	voice_keysplit_all voicegroup001  @ 869467C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86946A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86946AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86946B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86946C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86946D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86946DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86946E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86946F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869470C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8694718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869473C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8694748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869476C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694790
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 869479C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86947A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86947B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86947C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86947CC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0  @ 86947D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86947E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86947F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86947FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694820
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 869482C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694838
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8694844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869485C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869488C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86948A4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 86948B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86948BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86948C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86948D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86948E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86948EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86948F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694910
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869491C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869494C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869497C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86949A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86949AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86949B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86949C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86949D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86949DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 86949E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86949F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694A0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694A18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694A24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694A30
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 8694A3C
-	voice_square_1_alt 60, 0, 0, 2, 1, 1, 4, 1  @ 8694A48
-	voice_square_2_alt 60, 0, 2, 1, 1, 4, 1  @ 8694A54
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1  @ 8694A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694A6C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 8694A78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694A84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694AA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694AF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694BD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694C34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694C40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694C58
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8694C64
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8694C70
+voicegroup100::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 2, 1, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 1, 1, 4, 1
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup101.inc b/sound/voicegroups/voicegroup101.inc
index 1909e8ae3..5527ec796 100644
--- a/sound/voicegroups/voicegroup101.inc
+++ b/sound/voicegroups/voicegroup101.inc
@@ -1,113 +1,113 @@
 	.align 2
-voicegroup101:: @ 8694C7C
-	voice_keysplit_all voicegroup001  @ 8694C7C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8694C88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694CA0
-	voice_square_1_alt 60, 0, 0, 1, 1, 5, 2, 4  @ 8694CAC
-	voice_square_2_alt 60, 0, 1, 1, 5, 2, 4  @ 8694CB8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 8694CC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D18
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8694D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694E98
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 8694EA4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239  @ 8694EB0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8694EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694F10
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8694F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694F28
-	voice_keysplit voicegroup008, KeySplitTable4  @ 8694F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694F40
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8694F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694FA0
-	voice_square_1_alt 60, 0, 0, 1, 1, 2, 4, 1  @ 8694FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8694FDC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 8694FE8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8694FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869500C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695030
-	voice_square_2_alt 60, 0, 1, 1, 1, 6, 0  @ 869503C
-	voice_square_1_alt 60, 0, 0, 0, 0, 4, 6, 2  @ 8695048
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 8695054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695060
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 6, 0  @ 869506C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695078
-	voice_square_2_alt 60, 0, 1, 1, 4, 6, 1  @ 8695084
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8695090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869509C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86950A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86950B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86950C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86950CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86950D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86950E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86950F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86950FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869512C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869515C
-	voice_square_2_alt 60, 0, 0, 1, 2, 4, 1  @ 8695168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869518C
-	voice_square_2_alt 60, 0, 0, 1, 1, 6, 1  @ 8695198
+voicegroup101::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 1, 5, 2, 4
+	voice_square_2_alt 60, 0, 1, 1, 5, 2, 4
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 1, 2, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 1, 1, 6, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 4, 6, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 1, 4, 6, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 1, 2, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 1, 1, 6, 1
 
diff --git a/sound/voicegroups/voicegroup102.inc b/sound/voicegroups/voicegroup102.inc
index 22aa8393a..197ed891b 100644
--- a/sound/voicegroups/voicegroup102.inc
+++ b/sound/voicegroups/voicegroup102.inc
@@ -1,85 +1,85 @@
 	.align 2
-voicegroup102:: @ 86951A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86951A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86951B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86951BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86951C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86951D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86951E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86951EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86951F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869521C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869524C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869527C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86952A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86952AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86952B8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 248  @ 86952C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86952D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86952DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86952E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86952F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869530C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869533C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869536C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869539C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86953A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86953B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86953C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 165  @ 86953CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86953D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86953E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86953F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86953FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869542C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869545C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869548C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86954A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86954B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86954BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86954C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86954D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86954E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86954EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86954F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869551C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869554C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695558
-	voice_square_1_alt 60, 0, 0, 2, 0, 6, 0, 6  @ 8695564
-	voice_square_2_alt 60, 0, 2, 0, 6, 0, 6  @ 8695570
+voicegroup102::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 248
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 6, 0, 6
+	voice_square_2_alt 60, 0, 2, 0, 6, 0, 6
 
diff --git a/sound/voicegroups/voicegroup103.inc b/sound/voicegroups/voicegroup103.inc
index 62780a9ab..e60c3c1aa 100644
--- a/sound/voicegroups/voicegroup103.inc
+++ b/sound/voicegroups/voicegroup103.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup103:: @ 869557C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869557C
-	voice_keysplit_all voicegroup002  @ 8695588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86955A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86955AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86955B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86955C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86955D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86955DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86955E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86955F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869560C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695618
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8695624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869563C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869566C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695690
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 869569C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86956A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86956B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86956C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86956CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86956D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86956E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86956F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86956FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869572C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869575C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869578C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695798
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 86957A4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239  @ 86957B0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86957BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86957C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86957D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86957E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86957EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86957F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695810
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869581C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695840
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869584C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869587C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86958A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86958AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86958B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86958C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86958D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86958DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86958E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86958F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869590C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695930
-	voice_square_1_alt 60, 0, 0, 1, 1, 1, 6, 0  @ 869593C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695954
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1  @ 8695960
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 1  @ 869596C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695984
-	voice_square_2_alt 60, 0, 1, 0, 0, 10, 1  @ 8695990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869599C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86959A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86959B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86959C0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 86959CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86959D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86959E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86959F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86959FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B64
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 1  @ 8695B70
+voicegroup103::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 1, 1, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 0, 10, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 1
 
diff --git a/sound/voicegroups/voicegroup104.inc b/sound/voicegroups/voicegroup104.inc
index b13ff6594..9ca1a8848 100644
--- a/sound/voicegroups/voicegroup104.inc
+++ b/sound/voicegroups/voicegroup104.inc
@@ -1,111 +1,111 @@
 	.align 2
-voicegroup104:: @ 8695B7C
-	voice_keysplit_all voicegroup003  @ 8695B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695B94
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_koto_high, 255, 0, 206, 242  @ 8695BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695BB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695BC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695BDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695CE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695D98
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 8695DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695DEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695E94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695EE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695EF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695F0C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_shakuhachi, 255, 0, 255, 204  @ 8695F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695F30
-	voice_square_1_alt 60, 0, 0, 1, 2, 0, 12, 5  @ 8695F3C
-	voice_square_2_alt 60, 0, 0, 0, 0, 10, 4  @ 8695F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695F54
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 0, 15, 0  @ 8695F60
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 8695F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695F84
-	voice_square_2_alt 60, 0, 1, 2, 0, 12, 5  @ 8695F90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695FA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695FC0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0  @ 8695FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695FE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8695FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869602C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869605C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696074
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_koto_low, 255, 0, 206, 242  @ 8696080
+voicegroup104::
+	voice_keysplit_all voicegroup003
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_koto_high, 255, 0, 206, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_shakuhachi, 255, 0, 255, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 2, 0, 12, 5
+	voice_square_2_alt 60, 0, 0, 0, 0, 10, 4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 2, 0, 12, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_koto_low, 255, 0, 206, 242
 
diff --git a/sound/voicegroups/voicegroup105.inc b/sound/voicegroups/voicegroup105.inc
index 5acba78cc..c3bfdec9a 100644
--- a/sound/voicegroups/voicegroup105.inc
+++ b/sound/voicegroups/voicegroup105.inc
@@ -1,86 +1,86 @@
 	.align 2
-voicegroup105:: @ 869608C
-	voice_keysplit_all voicegroup002  @ 869608C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86960A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86960B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86960BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86960C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86960D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86960E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86960EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86960F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869611C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 216  @ 8696128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869614C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869617C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86961A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86961AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86961B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86961C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86961D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86961DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86961E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86961F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869620C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869623C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869626C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869629C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86962A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86962B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86962C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86962CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86962D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86962E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86962F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86962FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869632C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869635C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869638C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86963A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86963B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86963BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86963C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86963D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86963E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86963EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86963F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869641C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696440
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 9, 4  @ 869644C
-	voice_square_2_alt 60, 0, 2, 0, 2, 9, 4  @ 8696458
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 8696464
+voicegroup105::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 9, 4
+	voice_square_2_alt 60, 0, 2, 0, 2, 9, 4
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
 
diff --git a/sound/voicegroups/voicegroup106.inc b/sound/voicegroups/voicegroup106.inc
index 267921b62..834b9a8a2 100644
--- a/sound/voicegroups/voicegroup106.inc
+++ b/sound/voicegroups/voicegroup106.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup106:: @ 8696470
-	voice_keysplit_all voicegroup002  @ 8696470
-	voice_keysplit voicegroup005, KeySplitTable1  @ 869647C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86964A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86964AC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 86964B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86964C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86964D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86964DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86964E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86964F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869650C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8696518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696530
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 38, 128, 226  @ 869653C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869656C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696584
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76  @ 8696590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869659C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86965A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86965B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86965C0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127  @ 86965CC
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127  @ 86965D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86965E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86965F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86965FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869662C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8696638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869665C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869668C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 8696698
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 86966A4
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86966B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86966BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86966C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86966D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86966E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86966EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86966F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696704
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8696710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869671C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696734
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8696740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869674C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127  @ 8696758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869677C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86967A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86967AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86967B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86967C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86967D0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86967DC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 86967E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86967F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869680C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696824
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 8696830
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 869683C
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8696848
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 8696854
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0  @ 8696860
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1  @ 869686C
-	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1  @ 8696878
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 8696884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869689C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86968A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86968B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86968C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86968CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86968D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86968E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86968F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86968FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869692C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869695C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869698C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86969A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86969B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86969BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86969C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86969D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86969E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86969EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86969F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A58
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8696A64
+voicegroup106::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 38, 128, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup107.inc b/sound/voicegroups/voicegroup107.inc
index 527e23971..e2945809e 100644
--- a/sound/voicegroups/voicegroup107.inc
+++ b/sound/voicegroups/voicegroup107.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup107:: @ 8696A70
-	voice_keysplit_all voicegroup002  @ 8696A70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696A94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696AAC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 8696AB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696AE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B0C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8696B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B84
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76  @ 8696B90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696BA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696BE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696C8C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 8696C98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696CA4
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8696CB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696CE0
-	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0  @ 8696CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D34
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8696D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696DD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696DDC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 8696DE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696E18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696E24
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 8696E30
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 8696E3C
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 8696E48
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 8696E54
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0  @ 8696E60
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1  @ 8696E6C
-	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1  @ 8696E78
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 8696E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696EE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696FA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696FB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8696FF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869701C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869704C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697058
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8697064
+voicegroup107::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 3, 0, 1, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup108.inc b/sound/voicegroups/voicegroup108.inc
index d6bd6cf1f..b53907010 100644
--- a/sound/voicegroups/voicegroup108.inc
+++ b/sound/voicegroups/voicegroup108.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup108:: @ 8697070
-	voice_keysplit_all voicegroup004  @ 8697070
-	voice_keysplit voicegroup005, KeySplitTable1  @ 869707C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86970A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86970AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86970B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86970C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86970D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86970DC
-	voice_directsound 60, 0, DirectSoundWaveData_heart_of_asia_gamelan, 255, 188, 139, 239  @ 86970E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86970F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869710C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869713C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869716C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697184
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76  @ 8697190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869719C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86971A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86971B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86971C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86971CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86971D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86971E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86971F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86971FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697208
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8697214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869722C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869725C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869728C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 8697298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86972A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86972B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86972BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86972C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86972D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86972E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86972EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86972F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869731C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869734C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869737C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86973A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86973AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86973B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86973C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86973D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86973DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86973E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86973F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869740C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697424
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 13, 4  @ 8697430
-	voice_square_2_alt 60, 0, 0, 0, 0, 9, 2  @ 869743C
-	voice_square_2_alt 60, 0, 1, 0, 0, 7, 1  @ 8697448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697454
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 7, 15, 1  @ 8697460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869746C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697478
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 0, 15, 0  @ 8697484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869749C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86974A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86974B4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 86974C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86974CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86974D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86974E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86974F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86974FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869752C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869755C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869758C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86975A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86975B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86975BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86975C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86975D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86975E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86975EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86975F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869761C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869764C
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 8697658
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 8697664
+voicegroup108::
+	voice_keysplit_all voicegroup004
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_heart_of_asia_gamelan, 255, 188, 139, 239
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 13, 4
+	voice_square_2_alt 60, 0, 0, 0, 0, 9, 2
+	voice_square_2_alt 60, 0, 1, 0, 0, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup109.inc b/sound/voicegroups/voicegroup109.inc
index 8dd614217..52942e9ec 100644
--- a/sound/voicegroups/voicegroup109.inc
+++ b/sound/voicegroups/voicegroup109.inc
@@ -1,86 +1,86 @@
 	.align 2
-voicegroup109:: @ 8697670
-	voice_keysplit_all voicegroup004  @ 8697670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869767C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86976A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86976AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86976B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86976C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86976D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86976DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86976E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86976F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869770C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869773C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697748
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_church_organ3_low, 255, 76, 154, 188  @ 8697754
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_church_organ3_high, 255, 76, 154, 188  @ 8697760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869776C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869779C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86977A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86977B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86977C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86977CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86977D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86977E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86977F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86977FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697808
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8697814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869782C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869785C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869788C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86978A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86978B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86978BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86978C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86978D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86978E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86978EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86978F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869791C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869794C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869797C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86979A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86979AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86979B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86979C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86979D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86979DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86979E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86979F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697A0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697A18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697A24
-	voice_square_1_alt 60, 0, 0, 0, 0, 0, 13, 1  @ 8697A30
-	voice_square_2_alt 60, 0, 0, 0, 0, 12, 1  @ 8697A3C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0  @ 8697A48
+voicegroup109::
+	voice_keysplit_all voicegroup004
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_church_organ3_low, 255, 76, 154, 188
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_church_organ3_high, 255, 76, 154, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 0, 13, 1
+	voice_square_2_alt 60, 0, 0, 0, 0, 12, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup110.inc b/sound/voicegroups/voicegroup110.inc
index f29928c5f..a13facb2c 100644
--- a/sound/voicegroups/voicegroup110.inc
+++ b/sound/voicegroups/voicegroup110.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup110:: @ 8697A54
-	voice_keysplit_all voicegroup002  @ 8697A54
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8697A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697A6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697A78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697A84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697AA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697AF0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8697AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697BD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697C34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697C40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697C58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697C64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697C70
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 8697C7C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239  @ 8697C88
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8697C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697CC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697CE8
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8697CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D18
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8697D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697E08
-	voice_square_1_alt 60, 0, 0, 1, 1, 1, 6, 0  @ 8697E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697E20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697E2C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1  @ 8697E38
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 1  @ 8697E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697E5C
-	voice_square_2_alt 60, 0, 3, 0, 0, 10, 1  @ 8697E68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697E74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697E98
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 8697EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697EB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8697FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869800C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869803C
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 1  @ 8698048
+voicegroup110::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 239
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 1, 1, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 0, 10, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 1
 
diff --git a/sound/voicegroups/voicegroup111.inc b/sound/voicegroups/voicegroup111.inc
index f4bf65fdc..546ed3a46 100644
--- a/sound/voicegroups/voicegroup111.inc
+++ b/sound/voicegroups/voicegroup111.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup111:: @ 8698054
-	voice_keysplit_all voicegroup002  @ 8698054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869806C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869809C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86980A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86980B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86980C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86980CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86980D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86980E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86980F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86980FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698114
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 8698120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869812C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869815C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869818C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86981A4
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 226  @ 86981B0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 195  @ 86981BC
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 195  @ 86981C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86981D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86981E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86981EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86981F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869821C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869824C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869827C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86982A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86982AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86982B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86982C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86982D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86982DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86982E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86982F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869830C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698330
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 195  @ 869833C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869836C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869839C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86983A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86983B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86983C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86983CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86983D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86983E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86983F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86983FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698408
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1  @ 8698414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869842C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1  @ 8698438
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 1  @ 8698444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869845C
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1  @ 8698468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869848C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698498
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 86984A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86984B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86984BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86984C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86984D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86984E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86984EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86984F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869851C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869854C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869857C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86985A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86985AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86985B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86985C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86985D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86985DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86985E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86985F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869860C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698630
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 869863C
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 1  @ 8698648
+voicegroup111::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 226
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 195
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 195
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 195
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 1
 
diff --git a/sound/voicegroups/voicegroup112.inc b/sound/voicegroups/voicegroup112.inc
index 1bafa809f..ad1c4a1b7 100644
--- a/sound/voicegroups/voicegroup112.inc
+++ b/sound/voicegroups/voicegroup112.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup112:: @ 8698654
-	voice_keysplit_all voicegroup003  @ 8698654
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8698660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869866C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698678
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 1  @ 8698684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869869C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86986A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86986B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86986C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86986CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86986D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86986E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86986F0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86986FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698714
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 8698720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869872C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869875C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698768
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76  @ 8698774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869878C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86987A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86987B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86987BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86987C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86987D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86987E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86987EC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86987F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698810
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 128, 252, 0, 115  @ 869881C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869884C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698870
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 869887C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698888
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8698894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86988A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86988AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86988B8
-	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 128, 165, 128, 188  @ 86988C4
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_female_voice, 128, 165, 128, 204  @ 86988D0
-	voice_directsound 60, 0, DirectSoundWaveData_unused_unknown_male_voice, 128, 165, 128, 188  @ 86988DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86988E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86988F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869890C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698918
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8698924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869893C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869896C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869899C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86989A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86989B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86989C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86989CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86989D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86989E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86989F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86989FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698A08
-	voice_square_1_alt 60, 0, 0, 1, 0, 0, 7, 0  @ 8698A14
-	voice_square_2_alt 60, 0, 1, 0, 0, 6, 0  @ 8698A20
-	voice_square_2_alt 60, 0, 3, 0, 0, 6, 0  @ 8698A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698A68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698BB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698BC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698BDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698C30
-	voice_noise_alt 60, 0, 0, 0, 7, 10, 1  @ 8698C3C
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 1  @ 8698C48
+voicegroup112::
+	voice_keysplit_all voicegroup003
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 76
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 128, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 128, 165, 128, 188
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_female_voice, 128, 165, 128, 204
+	voice_directsound 60, 0, DirectSoundWaveData_unused_unknown_male_voice, 128, 165, 128, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 0, 7, 0
+	voice_square_2_alt 60, 0, 1, 0, 0, 6, 0
+	voice_square_2_alt 60, 0, 3, 0, 0, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 7, 10, 1
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 1
 
diff --git a/sound/voicegroups/voicegroup113.inc b/sound/voicegroups/voicegroup113.inc
index d70870112..cfe06aa97 100644
--- a/sound/voicegroups/voicegroup113.inc
+++ b/sound/voicegroups/voicegroup113.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup113:: @ 8698C54
-	voice_keysplit_all voicegroup002  @ 8698C54
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4990, 0, 7, 15, 1  @ 8698C60
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B49B0, 0, 7, 15, 1  @ 8698C6C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B49A0, 0, 7, 15, 1  @ 8698C78
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 1  @ 8698C84
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4980, 0, 7, 15, 1  @ 8698C90
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48B0, 0, 7, 15, 1  @ 8698C9C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48C0, 0, 7, 15, 1  @ 8698CA8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48D0, 0, 7, 15, 1  @ 8698CB4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48E0, 0, 7, 15, 1  @ 8698CC0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48F0, 0, 7, 15, 1  @ 8698CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698CD8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 8698CE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698CF0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 8698CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698DA4
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 195  @ 8698DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698DEC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 8698DF8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 8698E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698E10
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 8698E1C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 1  @ 8698E28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698E34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698E4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698E64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698E7C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246  @ 8698E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698E94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698EE8
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8698EF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F18
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8698F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698FA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698FB4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127  @ 8698FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698FE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8698FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699008
-	voice_square_1_alt 60, 0, 0, 2, 0, 7, 7, 0  @ 8699014
-	voice_square_2_alt 60, 0, 2, 0, 7, 7, 0  @ 8699020
-	voice_square_2_alt 60, 0, 1, 0, 7, 7, 0  @ 869902C
-	voice_square_2_alt 60, 0, 0, 0, 7, 7, 0  @ 8699038
-	voice_square_2_alt 60, 0, 3, 0, 7, 7, 0  @ 8699044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869905C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 1  @ 8699068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869908C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699098
-	voice_square_1_alt 60, 0, 0, 1, 0, 7, 7, 0  @ 86990A4
-	voice_square_1_alt 60, 0, 0, 0, 0, 7, 7, 0  @ 86990B0
-	voice_square_1_alt 60, 0, 0, 3, 0, 7, 7, 0  @ 86990BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86990C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86990D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86990E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86990EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86990F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869911C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869914C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869917C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86991A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86991AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86991B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86991C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86991D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86991DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86991E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86991F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869920C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699230
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 869923C
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 1  @ 8699248
+voicegroup113::
+	voice_keysplit_all voicegroup002
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4990, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B49B0, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B49A0, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4980, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48B0, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48C0, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48D0, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48E0, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48F0, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 195
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 180, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 7, 7, 0
+	voice_square_2_alt 60, 0, 2, 0, 7, 7, 0
+	voice_square_2_alt 60, 0, 1, 0, 7, 7, 0
+	voice_square_2_alt 60, 0, 0, 0, 7, 7, 0
+	voice_square_2_alt 60, 0, 3, 0, 7, 7, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 7, 7, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 7, 7, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 7, 7, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 1
 
diff --git a/sound/voicegroups/voicegroup114.inc b/sound/voicegroups/voicegroup114.inc
index 1c2eaa98e..cb078d24c 100644
--- a/sound/voicegroups/voicegroup114.inc
+++ b/sound/voicegroups/voicegroup114.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup114:: @ 8699254
-	voice_keysplit_all voicegroup001  @ 8699254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869926C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869929C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86992A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86992B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86992C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86992CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86992D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86992E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86992F0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242  @ 86992FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869932C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869935C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869938C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86993A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86993B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86993BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86993C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86993D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 86993E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86993EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86993F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869941C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869944C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869947C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 8699488
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8699494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86994A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86994AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86994B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86994C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86994D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86994DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86994E8
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86994F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869950C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699518
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8699524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869953C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869956C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869959C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86995A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86995B4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86995C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86995CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86995D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86995E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86995F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86995FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699608
-	voice_square_2 60, 0, 3, 0, 1, 7, 1  @ 8699614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699620
-	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1  @ 869962C
-	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1  @ 8699638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869965C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869968C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86996A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86996B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86996BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86996C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86996D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86996E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86996EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86996F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869971C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869974C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869977C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86997A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86997AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86997B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86997C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86997D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86997DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86997E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86997F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869980C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869983C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216  @ 8699848
+voicegroup114::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216
 
diff --git a/sound/voicegroups/voicegroup115.inc b/sound/voicegroups/voicegroup115.inc
index caa336237..afdfebaf7 100644
--- a/sound/voicegroups/voicegroup115.inc
+++ b/sound/voicegroups/voicegroup115.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup115:: @ 8699854
-	voice_keysplit_all voicegroup002  @ 8699854
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8699860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869986C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699878
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 128, 249, 0, 188  @ 8699884
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 188, 103, 165  @ 8699890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869989C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86998A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86998B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86998C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86998CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86998D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86998E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86998F0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86998FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699914
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 8699920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869992C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869995C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699968
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 204  @ 8699974
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204  @ 8699980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869998C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86999A4
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127  @ 86999B0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 165, 154, 165  @ 86999BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86999C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86999D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 86999E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86999EC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 198  @ 86999F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699A10
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 146  @ 8699A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699A28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699A4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699A58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699A64
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 8699A70
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 8699A7C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 8699A88
-	voice_keysplit voicegroup006, KeySplitTable2  @ 8699A94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699AB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699AE8
-	voice_keysplit voicegroup007, KeySplitTable3  @ 8699AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B18
-	voice_keysplit voicegroup009, KeySplitTable5  @ 8699B24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B30
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 165, 180, 165  @ 8699B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699BA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699BE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699C08
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2  @ 8699C14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699C20
-	voice_square_2_alt 60, 0, 0, 0, 1, 6, 0  @ 8699C2C
-	voice_square_2_alt 60, 0, 3, 0, 3, 6, 2  @ 8699C38
-	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5  @ 8699C44
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 6, 0  @ 8699C50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699C5C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 1  @ 8699C68
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 8699C74
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 1, 9, 2  @ 8699C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699C98
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3  @ 8699CA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699CB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699CE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699DD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699DDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699DE8
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165  @ 8699DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699E18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699E30
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 2  @ 8699E3C
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 8699E48
+voicegroup115::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 128, 249, 0, 188
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 188, 103, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 204
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 165, 154, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 198
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 146
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 165, 180, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 6, 0
+	voice_square_2_alt 60, 0, 3, 0, 3, 6, 2
+	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 1, 9, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 2
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup116.inc b/sound/voicegroups/voicegroup116.inc
index b9cbd5833..c5b16797a 100644
--- a/sound/voicegroups/voicegroup116.inc
+++ b/sound/voicegroups/voicegroup116.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup116:: @ 8699E54
-	voice_keysplit_all voicegroup002  @ 8699E54
-	voice_keysplit voicegroup005, KeySplitTable1  @ 8699E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699E78
-	voice_square_2_alt 60, 0, 3, 0, 2, 6, 5  @ 8699E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699EE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699F14
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 190, 115  @ 8699F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699F44
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 8699F50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699F68
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 216  @ 8699F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699FA4
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127  @ 8699FB0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127  @ 8699FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699FD4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 8699FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 8699FF8
-	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216  @ 869A004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A010
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 869A01C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A04C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A07C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A088
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869A094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A0A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A0AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A0B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A0C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A0D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A0DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A0E8
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869A0F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A10C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A118
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869A124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A130
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127  @ 869A13C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A16C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A19C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A1A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A1B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A1C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A1CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A1D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A1E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A1F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A1FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A208
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2  @ 869A214
-	voice_square_2_alt 60, 0, 3, 0, 3, 3, 0  @ 869A220
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 3, 6, 5  @ 869A22C
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 2  @ 869A238
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 0  @ 869A244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A25C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 869A268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A28C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A298
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3  @ 869A2A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A2B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A2BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A2C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A2D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A2E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A2EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A2F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A31C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A34C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A37C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A3A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A3AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A3B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A3C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A3D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A3DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A3E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A3F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A40C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A430
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 869A43C
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 1  @ 869A448
+voicegroup116::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 190, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2
+	voice_square_2_alt 60, 0, 3, 0, 3, 3, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 3, 6, 5
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4970, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 1
 
diff --git a/sound/voicegroups/voicegroup117.inc b/sound/voicegroups/voicegroup117.inc
index 014153021..da6a16d7a 100644
--- a/sound/voicegroups/voicegroup117.inc
+++ b/sound/voicegroups/voicegroup117.inc
@@ -1,85 +1,85 @@
 	.align 2
-voicegroup117:: @ 869A454
-	voice_keysplit_all voicegroup001  @ 869A454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A46C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A478
-	voice_square_2 60, 0, 2, 0, 1, 1, 1  @ 869A484
-	voice_square_1 60, 0, 0, 2, 0, 1, 1, 1  @ 869A490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A49C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A4A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A4B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A4C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A4CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A4D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A4E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A4F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A4FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A52C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A55C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A58C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A5A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A5B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A5BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A5C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A5D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 869A5E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A5EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A5F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A61C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A64C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A670
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 869A67C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869A688
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869A694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A6A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A6AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A6B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A6C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A6D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A6DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A6E8
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869A6F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A700
-	voice_keysplit voicegroup008, KeySplitTable4  @ 869A70C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A718
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869A724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A73C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A76C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A79C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A7A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A7B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A7C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A7CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A7D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A7E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A7F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A7FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A808
-	voice_square_2 60, 0, 3, 0, 1, 7, 1  @ 869A814
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2  @ 869A820
+voicegroup117::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 1, 1
+	voice_square_1 60, 0, 0, 2, 0, 1, 1, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 3, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
 
diff --git a/sound/voicegroups/voicegroup118.inc b/sound/voicegroups/voicegroup118.inc
index 1675cf1ee..129831d75 100644
--- a/sound/voicegroups/voicegroup118.inc
+++ b/sound/voicegroups/voicegroup118.inc
@@ -1,94 +1,94 @@
 	.align 2
-voicegroup118:: @ 869A82C
-	voice_keysplit_all voicegroup001  @ 869A82C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A850
-	voice_square_2 60, 0, 0, 0, 1, 7, 1  @ 869A85C
-	voice_square_1 60, 0, 0, 0, 0, 1, 7, 1  @ 869A868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A88C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A8A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A8B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A8BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A8C8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 250, 0, 242  @ 869A8D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A8E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A8EC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 869A8F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A91C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 869A928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A94C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A97C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A9A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A9AC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 869A9B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A9C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A9D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A9DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869A9E8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 869A9F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA48
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 869AA54
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869AA60
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869AA6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AA9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AAA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AAB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AAC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AAD8
-	voice_keysplit voicegroup008, KeySplitTable4  @ 869AAE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AAF0
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869AAFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AB98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ABA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ABB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ABBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ABC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ABD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ABE0
-	voice_square_2 60, 0, 2, 0, 1, 7, 1  @ 869ABEC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2  @ 869ABF8
-	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1  @ 869AC04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AC10
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2  @ 869AC1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AC28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AC34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AC40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AC4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AC58
-	voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 0, 255, 127  @ 869AC64
+voicegroup118::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 0, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 0, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 250, 0, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 0, 255, 127
 
diff --git a/sound/voicegroups/voicegroup119.inc b/sound/voicegroups/voicegroup119.inc
index 0bba5d48b..063ed24b9 100644
--- a/sound/voicegroups/voicegroup119.inc
+++ b/sound/voicegroups/voicegroup119.inc
@@ -1,94 +1,94 @@
 	.align 2
-voicegroup119:: @ 869AC70
-	voice_keysplit_all voicegroup001  @ 869AC70
-	voice_keysplit voicegroup005, KeySplitTable1  @ 869AC7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AC88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AC94
-	voice_square_2 60, 0, 0, 0, 2, 4, 1  @ 869ACA0
-	voice_square_1 60, 0, 0, 0, 0, 2, 4, 1  @ 869ACAC
-	voice_square_2 60, 0, 3, 0, 1, 7, 1  @ 869ACB8
-	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1  @ 869ACC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ACD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ACDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ACE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ACF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD30
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 869AD3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AD9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ADA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ADB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ADC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ADCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ADD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ADE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869ADF0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 869ADFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AE8C
-	voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88pro_timpani_with_snare, 255, 246, 0, 226  @ 869AE98
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869AEA4
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869AEB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AEBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AEC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AEE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AEEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AEF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF04
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869AF10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF34
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869AF40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AF94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AFA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AFAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AFB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AFC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AFD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AFDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AFE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869AFF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B00C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B024
-	voice_square_2 60, 0, 2, 0, 1, 7, 1  @ 869B030
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 2  @ 869B03C
-	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1  @ 869B048
-	voice_square_2 60, 0, 1, 0, 1, 9, 1  @ 869B054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B06C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B09C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2  @ 869B0A8
+voicegroup119::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 0, 0, 2, 4, 1
+	voice_square_1 60, 0, 0, 0, 0, 2, 4, 1
+	voice_square_2 60, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88pro_timpani_with_snare, 255, 246, 0, 226
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_2 60, 0, 1, 0, 1, 9, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
 
diff --git a/sound/voicegroups/voicegroup120.inc b/sound/voicegroups/voicegroup120.inc
index eb1bb463b..f80380fc4 100644
--- a/sound/voicegroups/voicegroup120.inc
+++ b/sound/voicegroups/voicegroup120.inc
@@ -1,94 +1,94 @@
 	.align 2
-voicegroup120:: @ 869B0B4
-	voice_keysplit_all voicegroup001  @ 869B0B4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 869B0C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B0CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B0D8
-	voice_square_2 60, 0, 2, 0, 2, 6, 1  @ 869B0E4
-	voice_square_1 60, 0, 0, 2, 0, 2, 6, 1  @ 869B0F0
-	voice_square_2 60, 0, 3, 0, 2, 4, 1  @ 869B0FC
-	voice_square_1 60, 0, 0, 3, 0, 2, 4, 1  @ 869B108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B12C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B15C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B18C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B1A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B1B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B1BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B1C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B1D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B1E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B1EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B1F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B21C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B234
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 869B240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B24C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B27C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B2A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B2AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B2B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B2C4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 869B2D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B2DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869B2E8
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869B2F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B30C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B33C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B348
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869B354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B36C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B378
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869B384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B39C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B3A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B3B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B3C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B3CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B3D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B3E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B3F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B3FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B42C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B45C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B468
-	voice_square_2 60, 0, 2, 0, 1, 7, 1  @ 869B474
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2  @ 869B480
-	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1  @ 869B48C
-	voice_square_1 60, 0, 0, 2, 0, 0, 7, 1  @ 869B498
-	voice_square_2 60, 0, 3, 0, 1, 7, 1  @ 869B4A4
-	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1  @ 869B4B0
-	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1  @ 869B4BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B4C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B4D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B4E0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2  @ 869B4EC
+voicegroup120::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 2, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 2, 6, 1
+	voice_square_2 60, 0, 3, 0, 2, 4, 1
+	voice_square_1 60, 0, 0, 3, 0, 2, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 7, 1
+	voice_square_2 60, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
 
diff --git a/sound/voicegroups/voicegroup121.inc b/sound/voicegroups/voicegroup121.inc
index eca6ff4b6..2c9e9fa3e 100644
--- a/sound/voicegroups/voicegroup121.inc
+++ b/sound/voicegroups/voicegroup121.inc
@@ -1,89 +1,89 @@
 	.align 2
-voicegroup121:: @ 869B4F8
-	voice_keysplit_all voicegroup001  @ 869B4F8
-	voice_keysplit voicegroup005, KeySplitTable1  @ 869B504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B51C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B54C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B57C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B5A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B5AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B5B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B5C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B5D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B5DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B5E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B5F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B60C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B63C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B66C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B678
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 869B684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B69C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B6A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B6B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B6C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B6CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B6D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B6E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B6F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B6FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B708
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 869B714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B720
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869B72C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869B738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B75C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B78C
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869B798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B7A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B7B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B7BC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869B7C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B7D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B7E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B7EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B7F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B81C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B84C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B858
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 869B864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B87C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B8A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B8AC
-	voice_square_2 60, 0, 2, 0, 1, 7, 1  @ 869B8B8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2  @ 869B8C4
-	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1  @ 869B8D0
-	voice_square_2 60, 0, 0, 0, 1, 7, 1  @ 869B8DC
-	voice_square_1 60, 0, 0, 0, 0, 1, 7, 1  @ 869B8E8
-	voice_square_1 60, 0, 0, 0, 0, 0, 7, 1  @ 869B8F4
+voicegroup121::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_2 60, 0, 0, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 0, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 0, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup122.inc b/sound/voicegroups/voicegroup122.inc
index 45c052cf1..ca64a7c00 100644
--- a/sound/voicegroups/voicegroup122.inc
+++ b/sound/voicegroups/voicegroup122.inc
@@ -1,87 +1,87 @@
 	.align 2
-voicegroup122:: @ 869B900
-	voice_keysplit_all voicegroup001  @ 869B900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B90C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B924
-	voice_square_2 60, 0, 1, 0, 1, 6, 1  @ 869B930
-	voice_square_1 60, 0, 0, 1, 0, 1, 6, 1  @ 869B93C
-	voice_square_2 60, 0, 2, 0, 1, 6, 1  @ 869B948
-	voice_square_1 60, 0, 0, 2, 0, 1, 6, 1  @ 869B954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B96C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B99C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B9A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B9B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B9C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B9CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B9D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B9E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B9F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869B9FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BA98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BAA4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 869BAB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BAC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BAD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BAE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BAEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BAF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BB04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BB10
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 869BB1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BB28
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869BB34
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869BB40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BB4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BB58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BB64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BB70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BB7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BB88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BB94
-	voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 165, 154, 127  @ 869BBA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BBAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BBB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BBC4
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869BBD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BBDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BBE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BBF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BC9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BCA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BCB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BCC0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2  @ 869BCCC
-	voice_square_1 60, 0, 0, 3, 0, 1, 9, 1  @ 869BCD8
-	voice_square_1 60, 0, 0, 3, 0, 0, 9, 1  @ 869BCE4
+voicegroup122::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 1, 0, 1, 6, 1
+	voice_square_1 60, 0, 0, 1, 0, 1, 6, 1
+	voice_square_2 60, 0, 2, 0, 1, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 1, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 165, 154, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 3, 0, 1, 9, 1
+	voice_square_1 60, 0, 0, 3, 0, 0, 9, 1
 
diff --git a/sound/voicegroups/voicegroup123.inc b/sound/voicegroups/voicegroup123.inc
index ab048cac0..6178994cc 100644
--- a/sound/voicegroups/voicegroup123.inc
+++ b/sound/voicegroups/voicegroup123.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup123:: @ 869BCF0
-	voice_keysplit_all voicegroup001  @ 869BCF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BCFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BD8C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242  @ 869BD98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BDA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BDB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BDBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BDC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BDD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BDE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BDEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BDF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE70
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 869BE7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BE94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BEA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BEAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BEB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BEC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BEDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BEE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BEF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF18
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869BF24
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869BF30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF84
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869BF90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BF9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BFA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BFB4
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869BFC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BFCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BFD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BFE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BFF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869BFFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C02C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C050
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 869C05C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C08C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C0A4
-	voice_square_2 60, 0, 3, 0, 1, 7, 1  @ 869C0B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C0BC
-	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1  @ 869C0C8
-	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1  @ 869C0D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C0E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C0EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C0F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C11C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C14C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C17C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C1A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C1AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C1B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C1C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C1D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C1DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C1E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C1F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C20C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C23C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C26C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C29C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C2A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C2B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C2C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C2CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C2D8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216  @ 869C2E4
+voicegroup123::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 216, 90, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216
 
diff --git a/sound/voicegroups/voicegroup124.inc b/sound/voicegroups/voicegroup124.inc
index 630ab4a15..6f5d263b3 100644
--- a/sound/voicegroups/voicegroup124.inc
+++ b/sound/voicegroups/voicegroup124.inc
@@ -1,90 +1,90 @@
 	.align 2
-voicegroup124:: @ 869C2F0
-	voice_keysplit_all voicegroup001  @ 869C2F0
-	voice_keysplit voicegroup005, KeySplitTable1  @ 869C2FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C314
-	voice_square_2 60, 0, 2, 0, 2, 3, 1  @ 869C320
-	voice_square_1 60, 0, 0, 2, 0, 2, 3, 1  @ 869C32C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C35C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C38C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C3A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C3B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C3BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C3C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C3D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C3E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C3EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C3F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C41C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C44C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C470
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 869C47C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C4A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C4AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C4B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C4C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C4D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C4DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C4E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C4F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C50C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 869C518
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869C524
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869C530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C53C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C56C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C584
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869C590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C59C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C5A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C5B4
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869C5C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C5CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C5D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C5E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C5F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C5FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C62C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C65C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C68C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C6A4
-	voice_square_2 60, 0, 3, 0, 1, 7, 1  @ 869C6B0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2  @ 869C6BC
-	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1  @ 869C6C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C6D4
-	voice_square_2 60, 0, 2, 0, 1, 7, 1  @ 869C6E0
-	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1  @ 869C6EC
-	voice_square_2 60, 0, 3, 0, 2, 7, 1  @ 869C6F8
+voicegroup124::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 2, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 2, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 3, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_2 60, 0, 3, 0, 2, 7, 1
 
diff --git a/sound/voicegroups/voicegroup125.inc b/sound/voicegroups/voicegroup125.inc
index 17a72153e..afe16b0b0 100644
--- a/sound/voicegroups/voicegroup125.inc
+++ b/sound/voicegroups/voicegroup125.inc
@@ -1,87 +1,87 @@
 	.align 2
-voicegroup125:: @ 869C704
-	voice_keysplit_all voicegroup001  @ 869C704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C71C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C728
-	voice_square_2 60, 0, 2, 0, 2, 3, 1  @ 869C734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C74C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C77C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C7A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C7AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C7B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C7C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C7D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C7DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C7E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C7F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C80C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C83C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C86C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C89C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C8A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C8B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C8C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 869C8CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C8D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C8E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C8F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C8FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C92C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869C938
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869C944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C95C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C98C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C998
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869C9A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C9B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C9BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C9C8
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869C9D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C9E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C9EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869C9F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CA94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CAA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CAAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CAB8
-	voice_square_2 60, 0, 3, 0, 1, 7, 1  @ 869CAC4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2  @ 869CAD0
-	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1  @ 869CADC
-	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1  @ 869CAE8
+voicegroup125::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 2, 0, 2, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 3, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 3, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup126.inc b/sound/voicegroups/voicegroup126.inc
index f169edb80..a2e663cf1 100644
--- a/sound/voicegroups/voicegroup126.inc
+++ b/sound/voicegroups/voicegroup126.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup126:: @ 869CAF4
-	voice_keysplit_all voicegroup001  @ 869CAF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB18
-	voice_square_2 60, 0, 0, 1, 1, 7, 1  @ 869CB24
-	voice_square_1 60, 0, 0, 0, 1, 1, 7, 1  @ 869CB30
-	voice_square_1 60, 0, 0, 0, 0, 0, 7, 1  @ 869CB3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CB9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CBA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CBB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CBC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CBCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CBD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CBE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CBF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CBFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC74
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99  @ 869CC80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CC98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CCA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CCB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CCBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CCC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CCD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CCE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CCEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CCF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CD04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CD10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CD1C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869CD28
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869CD34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CD40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CD4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CD58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CD64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CD70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CD7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CD88
-	voice_keysplit voicegroup007, KeySplitTable3  @ 869CD94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CDA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CDAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CDB8
-	voice_keysplit voicegroup009, KeySplitTable5  @ 869CDC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CDD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CDDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CDE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CDF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CE9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CEA8
-	voice_square_2 60, 0, 3, 1, 1, 6, 1  @ 869CEB4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2  @ 869CEC0
-	voice_square_1 60, 0, 0, 3, 1, 1, 6, 1  @ 869CECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CEE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CEF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CEFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CF98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CFA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CFB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CFBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CFC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CFD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CFE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CFEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869CFF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D01C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D04C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D07C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D0A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D0AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D0B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D0C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D0D0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 216  @ 869D0DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216  @ 869D0E8
+voicegroup126::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 0, 1, 1, 7, 1
+	voice_square_1 60, 0, 0, 0, 1, 1, 7, 1
+	voice_square_1 60, 0, 0, 0, 0, 0, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 235, 128, 99
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2 60, 0, 3, 1, 1, 6, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 3, 1, 1, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 216
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 246, 0, 216
 
diff --git a/sound/voicegroups/voicegroup127.inc b/sound/voicegroups/voicegroup127.inc
index ee83df628..476d3f48f 100644
--- a/sound/voicegroups/voicegroup127.inc
+++ b/sound/voicegroups/voicegroup127.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup127:: @ 869D0F4
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 249, 103, 165  @ 869D0F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D10C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D118
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0  @ 869D124
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 0, 1  @ 869D130
-	voice_square_1_alt 60, 0, 0, 2, 0, 4, 0, 1  @ 869D13C
-	voice_square_1_alt 60, 0, 44, 2, 0, 4, 0, 0  @ 869D148
-	voice_square_1_alt 60, 0, 38, 0, 0, 4, 0, 0  @ 869D154
-	voice_square_1_alt 60, 0, 0, 0, 0, 7, 0, 0  @ 869D160
-	voice_square_1_alt 60, 0, 0, 2, 2, 0, 15, 0  @ 869D16C
-	voice_square_1_alt 60, 0, 0, 1, 2, 0, 15, 0  @ 869D178
-	voice_square_1_alt 60, 0, 23, 1, 0, 1, 9, 0  @ 869D184
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 165  @ 869D190
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 165  @ 869D19C
-	voice_square_1_alt 60, 0, 0, 2, 0, 6, 0, 1  @ 869D1A8
-	voice_square_1_alt 60, 0, 36, 0, 0, 2, 0, 0  @ 869D1B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D1C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D1CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D1D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D1E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D1F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D1FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D22C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D25C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D28C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D2A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D2B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D2BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D2C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D2D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D2E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D2EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D2F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D31C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 869D328
-	voice_keysplit voicegroup006, KeySplitTable2  @ 869D334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D34C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D37C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D3A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D3AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D3B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D3C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D3D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D3DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D3E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D3F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D40C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D43C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D46C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D49C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D4A8
-	voice_square_2_alt 60, 0, 3, 0, 1, 0, 1  @ 869D4B4
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 0, 1  @ 869D4C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D4CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D4D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D4E4
-	voice_square_1_alt 60, 0, 46, 2, 0, 4, 0, 0  @ 869D4F0
-	voice_square_1_alt 60, 0, 38, 2, 0, 4, 0, 0  @ 869D4FC
-	voice_square_1_alt 60, 0, 119, 2, 0, 0, 15, 1  @ 869D508
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 1  @ 869D514
-	voice_square_1_alt 60, 0, 106, 2, 0, 2, 0, 0  @ 869D520
-	voice_square_1_alt 60, 0, 23, 2, 0, 1, 9, 0  @ 869D52C
-	voice_square_1_alt 60, 0, 21, 2, 0, 1, 9, 0  @ 869D538
-	voice_square_1_alt 60, 0, 0, 0, 0, 0, 15, 1  @ 869D544
-	voice_square_1_alt 60, 0, 47, 2, 0, 2, 6, 0  @ 869D550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D55C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D58C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D5A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D5B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D5BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D5C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D5D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D5E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D5EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D5F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D61C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D64C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D67C
-	voice_noise 60, 0, 0, 0, 7, 15, 0  @ 869D688
-	voice_noise 60, 0, 0, 2, 7, 15, 0  @ 869D694
-	voice_noise_alt 60, 0, 0, 2, 0, 15, 0  @ 869D6A0
-	voice_noise_alt 60, 0, 1, 0, 0, 15, 0  @ 869D6AC
-	voice_noise_alt 60, 0, 0, 0, 0, 15, 0  @ 869D6B8
-	voice_noise_alt 60, 0, 0, 0, 3, 0, 0  @ 869D6C4
-	voice_noise_alt 60, 0, 0, 0, 2, 0, 0  @ 869D6D0
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 869D6DC
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 1  @ 869D6E8
+voicegroup127::
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 249, 103, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 0, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 4, 0, 1
+	voice_square_1_alt 60, 0, 44, 2, 0, 4, 0, 0
+	voice_square_1_alt 60, 0, 38, 0, 0, 4, 0, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 7, 0, 0
+	voice_square_1_alt 60, 0, 0, 2, 2, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 2, 0, 15, 0
+	voice_square_1_alt 60, 0, 23, 1, 0, 1, 9, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 165
+	voice_square_1_alt 60, 0, 0, 2, 0, 6, 0, 1
+	voice_square_1_alt 60, 0, 36, 0, 0, 2, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 0, 1
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 0, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 46, 2, 0, 4, 0, 0
+	voice_square_1_alt 60, 0, 38, 2, 0, 4, 0, 0
+	voice_square_1_alt 60, 0, 119, 2, 0, 0, 15, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 1
+	voice_square_1_alt 60, 0, 106, 2, 0, 2, 0, 0
+	voice_square_1_alt 60, 0, 23, 2, 0, 1, 9, 0
+	voice_square_1_alt 60, 0, 21, 2, 0, 1, 9, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 0, 15, 1
+	voice_square_1_alt 60, 0, 47, 2, 0, 2, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise 60, 0, 0, 0, 7, 15, 0
+	voice_noise 60, 0, 0, 2, 7, 15, 0
+	voice_noise_alt 60, 0, 0, 2, 0, 15, 0
+	voice_noise_alt 60, 0, 1, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 3, 0, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 0, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 1
 
diff --git a/sound/voicegroups/voicegroup128.inc b/sound/voicegroups/voicegroup128.inc
index ef4227e16..ce4904626 100644
--- a/sound/voicegroups/voicegroup128.inc
+++ b/sound/voicegroups/voicegroup128.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup128:: @ 869D6F4
-	voice_directsound_no_resample 60, 0, DirectSoundWaveData_bicycle_bell, 255, 249, 0, 165  @ 869D6F4
-	voice_directsound_alt 60, 0, DirectSoundWaveData_bicycle_bell, 255, 0, 255, 165  @ 869D700
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 0, 255, 165  @ 869D70C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 242, 0, 127  @ 869D718
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 1  @ 869D724
-	voice_noise_alt 60, 0, 1, 0, 1, 0, 1  @ 869D730
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 255, 165  @ 869D73C
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1  @ 869D748
-	voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165  @ 869D754
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 0, 255, 127  @ 869D760
-	voice_directsound 60, 0, DirectSoundWaveData_872762C, 255, 0, 255, 127  @ 869D76C
-	voice_noise_alt 60, 0, 1, 0, 2, 0, 0  @ 869D778
-	voice_square_1 60, 0, 103, 3, 2, 7, 0, 0  @ 869D784
-	voice_square_2 60, 0, 3, 2, 7, 0, 0  @ 869D790
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127  @ 869D79C
-	voice_directsound 60, 0, DirectSoundWaveData_872921C, 255, 0, 255, 0  @ 869D7A8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127  @ 869D7B4
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1  @ 869D7C0
-	voice_directsound 60, 0, DirectSoundWaveData_872A5D0, 255, 0, 255, 127  @ 869D7CC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127  @ 869D7D8
-	voice_square_1 60, 0, 103, 0, 0, 7, 0, 0  @ 869D7E4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 127  @ 869D7F0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_wind, 255, 0, 255, 127  @ 869D7FC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_bubbles, 255, 0, 255, 127  @ 869D808
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 127  @ 869D814
-	voice_noise_alt 60, 0, 0, 0, 7, 15, 1  @ 869D820
-	voice_directsound 60, 0, DirectSoundWaveData_872EEA8, 255, 0, 255, 127  @ 869D82C
-	voice_noise_alt 60, 0, 1, 0, 7, 15, 1  @ 869D838
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 246, 0, 127  @ 869D844
-	voice_directsound 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127  @ 869D850
-	voice_square_1_alt 60, 0, 19, 2, 0, 2, 0, 0  @ 869D85C
-	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 0, 255, 127  @ 869D868
-	voice_square_1 60, 0, 103, 0, 0, 0, 15, 0  @ 869D874
-	voice_directsound_alt 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127  @ 869D880
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 255, 255, 127  @ 869D88C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 0, 255, 127  @ 869D898
-	voice_directsound 60, 0, DirectSoundWaveData_8734298, 255, 0, 255, 127  @ 869D8A4
-	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 242, 0, 0  @ 869D8B0
-	voice_directsound 60, 0, DirectSoundWaveData_87364A8, 255, 0, 255, 0  @ 869D8BC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 869D8C8
-	voice_directsound 60, 0, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188  @ 869D8D4
-	voice_directsound 60, 0, DirectSoundWaveData_87385E4, 255, 249, 0, 165  @ 869D8E0
-	voice_square_1 60, 0, 0, 0, 4, 6, 0, 0  @ 869D8EC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 13, 0, 255, 127  @ 869D8F8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 13, 0, 255, 127  @ 869D904
-	voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 0, 255, 127  @ 869D910
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 252, 0, 204  @ 869D91C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869D928
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 869D934
-	voice_square_1 60, 0, 0, 0, 4, 0, 15, 0  @ 869D940
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 188, 0, 0  @ 869D94C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 226, 0, 127  @ 869D958
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 26, 0, 255, 127  @ 869D964
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 0, 0  @ 869D970
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 252, 0, 127  @ 869D97C
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 0, 0  @ 869D988
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 127, 0, 127  @ 869D994
-	voice_noise_alt 60, 0, 0, 1, 6, 0, 0  @ 869D9A0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 255, 255, 127  @ 869D9AC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 869D9B8
-	voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127  @ 869D9C4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 11, 242, 0, 127  @ 869D9D0
-	voice_square_1_alt 60, 0, 0, 2, 4, 6, 0, 0  @ 869D9DC
-	voice_directsound 60, 0, DirectSoundWaveData_8740818, 255, 255, 255, 127  @ 869D9E8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 869D9F4
-	voice_directsound 60, 0, DirectSoundWaveData_unused_sc55_tom, 255, 0, 255, 165  @ 869DA00
-	voice_noise_alt 60, 0, 0, 5, 7, 15, 1  @ 869DA0C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 128, 242, 0, 165  @ 869DA18
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 165  @ 869DA24
-	voice_square_1 60, 0, 0, 0, 1, 5, 0, 0  @ 869DA30
-	voice_noise_alt 60, 0, 0, 6, 6, 0, 1  @ 869DA3C
-	voice_noise_alt 60, 0, 0, 3, 6, 0, 1  @ 869DA48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DA54
-	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 15, 127, 231, 127  @ 869DA60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DA6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DA78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DA84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DA90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DA9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DAA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DAB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DAC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DAD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DAE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DAF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DAFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DB98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DBA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DBB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DBBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DBC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DBD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DBE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DBEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DBF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DC94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 869DCA0
-	voice_directsound 60, 0, DirectSoundWaveData_87424B0, 255, 0, 255, 165  @ 869DCAC
-	voice_directsound 60, 0, DirectSoundWaveData_87430C0, 255, 0, 255, 165  @ 869DCB8
-	voice_directsound 60, 0, DirectSoundWaveData_8743C50, 255, 0, 255, 165  @ 869DCC4
-	voice_directsound 60, 0, DirectSoundWaveData_87446EC, 255, 0, 255, 165  @ 869DCD0
-	voice_directsound 60, 0, DirectSoundWaveData_8745034, 255, 0, 255, 165  @ 869DCDC
-	voice_directsound 60, 0, DirectSoundWaveData_8745A7C, 255, 0, 255, 165  @ 869DCE8
-	
+voicegroup128::
+	voice_directsound_no_resample 60, 0, DirectSoundWaveData_bicycle_bell, 255, 249, 0, 165
+	voice_directsound_alt 60, 0, DirectSoundWaveData_bicycle_bell, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_synth_snare, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 242, 0, 127
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 1
+	voice_noise_alt 60, 0, 1, 0, 1, 0, 1
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 255, 165
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1
+	voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_872762C, 255, 0, 255, 127
+	voice_noise_alt 60, 0, 1, 0, 2, 0, 0
+	voice_square_1 60, 0, 103, 3, 2, 7, 0, 0
+	voice_square_2 60, 0, 3, 2, 7, 0, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127
+	voice_directsound 60, 0, DirectSoundWaveData_872921C, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 1
+	voice_directsound 60, 0, DirectSoundWaveData_872A5D0, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127
+	voice_square_1 60, 0, 103, 0, 0, 7, 0, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_wind, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_bubbles, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 127
+	voice_noise_alt 60, 0, 0, 0, 7, 15, 1
+	voice_directsound 60, 0, DirectSoundWaveData_872EEA8, 255, 0, 255, 127
+	voice_noise_alt 60, 0, 1, 0, 7, 15, 1
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 246, 0, 127
+	voice_directsound 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127
+	voice_square_1_alt 60, 0, 19, 2, 0, 2, 0, 0
+	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 0, 255, 127
+	voice_square_1 60, 0, 103, 0, 0, 0, 15, 0
+	voice_directsound_alt 60, 0, DirectSoundWaveData_87301B0, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_8734298, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 255, 242, 0, 0
+	voice_directsound 60, 0, DirectSoundWaveData_87364A8, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_directsound 60, 0, DirectSoundWaveData_unknown_close_hihat, 255, 127, 0, 188
+	voice_directsound 60, 0, DirectSoundWaveData_87385E4, 255, 249, 0, 165
+	voice_square_1 60, 0, 0, 0, 4, 6, 0, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 13, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 13, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_trinity_big_boned, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 252, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 0, 4, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 188, 0, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 226, 0, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 26, 0, 255, 127
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 0, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 252, 0, 127
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 0, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 127, 0, 127
+	voice_noise_alt 60, 0, 0, 1, 6, 0, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_slap_bass, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_873ECD8, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_french_horn_72, 11, 242, 0, 127
+	voice_square_1_alt 60, 0, 0, 2, 4, 6, 0, 0
+	voice_directsound 60, 0, DirectSoundWaveData_8740818, 255, 255, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sc55_tom, 255, 0, 255, 165
+	voice_noise_alt 60, 0, 0, 5, 7, 15, 1
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 128, 242, 0, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_string_ensemble_72, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 0, 1, 5, 0, 0
+	voice_noise_alt 60, 0, 0, 6, 6, 0, 1
+	voice_noise_alt 60, 0, 0, 3, 6, 0, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_trinity_30303_mega_bass, 15, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_87424B0, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_87430C0, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_8743C50, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_87446EC, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_8745034, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_8745A7C, 255, 0, 255, 165
+
diff --git a/sound/voicegroups/voicegroup129.inc b/sound/voicegroups/voicegroup129.inc
index 3c3ce90c6..ad94d1f70 100644
--- a/sound/voicegroups/voicegroup129.inc
+++ b/sound/voicegroups/voicegroup129.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup129:: @ 86A0154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0154
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 86A0160
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86A016C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 226, 25, 0  @ 86A0178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0184
-	voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165  @ 86A0190
-	voice_directsound 60, 0, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231  @ 86A019C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_open_triangle, 255, 204, 128, 249  @ 86A01A8
-	voice_directsound 60, 0, DirectSoundWaveData_register_noise, 255, 0, 255, 76  @ 86A01B4
-	voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204  @ 86A01C0
-	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 206, 38  @ 86A01CC
-	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 206, 0  @ 86A01D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A01E4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 216  @ 86A01F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A01FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A022C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A025C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0268
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204  @ 86A0274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A028C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A02A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A02B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A02BC
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165  @ 86A02C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A02D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A02E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A02EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A02F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0310
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 86A031C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A034C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0370
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 252, 0, 204  @ 86A037C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 86A0388
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127  @ 86A0394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A03A0
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0  @ 86A03AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A03B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A03C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A03D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A03DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A03E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A03F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0400
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86A040C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A043C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A046C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A049C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A04A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A04B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A04C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A04CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A04D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A04E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A04F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A04FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0508
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 10, 4  @ 86A0514
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 10, 3  @ 86A0520
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 10, 1  @ 86A052C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A055C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A058C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0598
-	voice_square_1_alt 60, 0, 0, 0, 0, 0, 15, 1  @ 86A05A4
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 6  @ 86A05B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A05BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A05C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A05D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A05E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A05EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A05F8
-	voice_square_1_alt 60, 0, 29, 2, 0, 2, 0, 0  @ 86A0604
-	voice_square_1_alt 60, 0, 22, 2, 0, 2, 0, 0  @ 86A0610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A061C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A064C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A067C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A06A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A06AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A06B8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0  @ 86A06C4
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86A06D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A06DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A06E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A06F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A070C
-	voice_noise_alt 60, 0, 0, 0, 1, 9, 2  @ 86A0718
-	voice_noise_alt 60, 0, 0, 0, 4, 3, 1  @ 86A0724
-	voice_noise_alt 60, 0, 0, 0, 1, 12, 0  @ 86A0730
-	voice_noise_alt 60, 0, 1, 0, 1, 9, 0  @ 86A073C
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86A0748
+voicegroup129::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 226, 25, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_8725A2C, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_open_triangle, 255, 204, 128, 249
+	voice_directsound 60, 0, DirectSoundWaveData_register_noise, 255, 0, 255, 76
+	voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_ohtsuzumi, 255, 0, 206, 38
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_hyoushigi, 255, 0, 206, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 252, 0, 204
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 204, 0, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 10, 4
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 10, 3
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 10, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 0, 15, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 6
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 29, 2, 0, 2, 0, 0
+	voice_square_1_alt 60, 0, 22, 2, 0, 2, 0, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 9, 2
+	voice_noise_alt 60, 0, 0, 0, 4, 3, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 12, 0
+	voice_noise_alt 60, 0, 1, 0, 1, 9, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
 
diff --git a/sound/voicegroups/voicegroup130.inc b/sound/voicegroups/voicegroup130.inc
index d322326e9..6f06938aa 100644
--- a/sound/voicegroups/voicegroup130.inc
+++ b/sound/voicegroups/voicegroup130.inc
@@ -1,182 +1,182 @@
 	.align 2
-voicegroup130:: @ 86A0754
-	voice_directsound 60, 0, DirectSoundWaveData_88DBBC0, 255, 0, 255, 0  @ 86A0754
-	voice_directsound 60, 0, DirectSoundWaveData_88DC220, 255, 0, 255, 0  @ 86A0760
-	voice_directsound 60, 0, DirectSoundWaveData_88DC704, 255, 0, 255, 0  @ 86A076C
-	voice_directsound 60, 0, DirectSoundWaveData_88DD054, 255, 0, 255, 0  @ 86A0778
-	voice_directsound 60, 0, DirectSoundWaveData_88DDAC4, 255, 0, 255, 0  @ 86A0784
-	voice_directsound 60, 0, DirectSoundWaveData_88DDDE4, 255, 0, 255, 0  @ 86A0790
-	voice_directsound 60, 0, DirectSoundWaveData_88DEA6C, 255, 0, 255, 0  @ 86A079C
-	voice_directsound 60, 0, DirectSoundWaveData_88DF08C, 255, 0, 255, 0  @ 86A07A8
-	voice_directsound 60, 0, DirectSoundWaveData_88DF414, 255, 0, 255, 0  @ 86A07B4
-	voice_directsound 60, 0, DirectSoundWaveData_88E01F8, 255, 0, 255, 0  @ 86A07C0
-	voice_directsound 60, 0, DirectSoundWaveData_88E0B68, 255, 0, 255, 0  @ 86A07CC
-	voice_directsound 60, 0, DirectSoundWaveData_88E0F04, 255, 0, 255, 0  @ 86A07D8
-	voice_directsound 60, 0, DirectSoundWaveData_88E16B8, 255, 0, 255, 0  @ 86A07E4
-	voice_directsound 60, 0, DirectSoundWaveData_88E2414, 255, 0, 255, 0  @ 86A07F0
-	voice_directsound 60, 0, DirectSoundWaveData_88E2658, 255, 0, 255, 0  @ 86A07FC
-	voice_directsound 60, 0, DirectSoundWaveData_88E3498, 255, 0, 255, 0  @ 86A0808
-	voice_directsound 60, 0, DirectSoundWaveData_88E3DEC, 255, 0, 255, 0  @ 86A0814
-	voice_directsound 60, 0, DirectSoundWaveData_88E4140, 255, 0, 255, 0  @ 86A0820
-	voice_directsound 60, 0, DirectSoundWaveData_88E4774, 255, 0, 255, 0  @ 86A082C
-	voice_directsound 60, 0, DirectSoundWaveData_88E53E0, 255, 0, 255, 0  @ 86A0838
-	voice_directsound 60, 0, DirectSoundWaveData_88E5978, 255, 0, 255, 0  @ 86A0844
-	voice_directsound 60, 0, DirectSoundWaveData_88E647C, 255, 0, 255, 0  @ 86A0850
-	voice_directsound 60, 0, DirectSoundWaveData_88E6A80, 255, 0, 255, 0  @ 86A085C
-	voice_directsound 60, 0, DirectSoundWaveData_88E6C78, 255, 0, 255, 0  @ 86A0868
-	voice_directsound 60, 0, DirectSoundWaveData_88E75DC, 255, 0, 255, 0  @ 86A0874
-	voice_directsound 60, 0, DirectSoundWaveData_88E8568, 255, 0, 255, 0  @ 86A0880
-	voice_directsound 60, 0, DirectSoundWaveData_88E8BA0, 255, 0, 255, 0  @ 86A088C
-	voice_directsound 60, 0, DirectSoundWaveData_88E9674, 255, 0, 255, 0  @ 86A0898
-	voice_directsound 60, 0, DirectSoundWaveData_88EA5B8, 255, 0, 255, 0  @ 86A08A4
-	voice_directsound 60, 0, DirectSoundWaveData_88EAB30, 255, 0, 255, 0  @ 86A08B0
-	voice_directsound 60, 0, DirectSoundWaveData_88EB97C, 255, 0, 255, 0  @ 86A08BC
-	voice_directsound 60, 0, DirectSoundWaveData_88EC884, 255, 0, 255, 0  @ 86A08C8
-	voice_directsound 60, 0, DirectSoundWaveData_88ED358, 255, 0, 255, 0  @ 86A08D4
-	voice_directsound 60, 0, DirectSoundWaveData_88EDEEC, 255, 0, 255, 0  @ 86A08E0
-	voice_directsound 60, 0, DirectSoundWaveData_88EE8C4, 255, 0, 255, 0  @ 86A08EC
-	voice_directsound 60, 0, DirectSoundWaveData_88EEF04, 255, 0, 255, 0  @ 86A08F8
-	voice_directsound 60, 0, DirectSoundWaveData_88EF9E4, 255, 0, 255, 0  @ 86A0904
-	voice_directsound 60, 0, DirectSoundWaveData_88F0020, 255, 0, 255, 0  @ 86A0910
-	voice_directsound 60, 0, DirectSoundWaveData_88F0738, 255, 0, 255, 0  @ 86A091C
-	voice_directsound 60, 0, DirectSoundWaveData_88F1074, 255, 0, 255, 0  @ 86A0928
-	voice_directsound 60, 0, DirectSoundWaveData_88F1830, 255, 0, 255, 0  @ 86A0934
-	voice_directsound 60, 0, DirectSoundWaveData_88F1D94, 255, 0, 255, 0  @ 86A0940
-	voice_directsound 60, 0, DirectSoundWaveData_88F2B08, 255, 0, 255, 0  @ 86A094C
-	voice_directsound 60, 0, DirectSoundWaveData_88F2F84, 255, 0, 255, 0  @ 86A0958
-	voice_directsound 60, 0, DirectSoundWaveData_88F3470, 255, 0, 255, 0  @ 86A0964
-	voice_directsound 60, 0, DirectSoundWaveData_88F3C38, 255, 0, 255, 0  @ 86A0970
-	voice_directsound 60, 0, DirectSoundWaveData_88F4834, 255, 0, 255, 0  @ 86A097C
-	voice_directsound 60, 0, DirectSoundWaveData_88F4BAC, 255, 0, 255, 0  @ 86A0988
-	voice_directsound 60, 0, DirectSoundWaveData_88F5368, 255, 0, 255, 0  @ 86A0994
-	voice_directsound 60, 0, DirectSoundWaveData_88F5FCC, 255, 0, 255, 0  @ 86A09A0
-	voice_directsound 60, 0, DirectSoundWaveData_88F6498, 255, 0, 255, 0  @ 86A09AC
-	voice_keysplit_all voicegroup001  @ 86A09B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A09C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A09D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A09DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A09E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A09F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0AA8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion_duplicate, 255, 249, 25, 248  @ 86A0AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0AF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0BD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0CC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0E98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0EB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0FA0
-	voice_noise_alt 60, 0, 0, 0, 1, 7, 1  @ 86A0FAC
+voicegroup130::
+	voice_directsound 60, 0, DirectSoundWaveData_88DBBC0, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88DC220, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88DC704, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88DD054, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88DDAC4, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88DDDE4, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88DEA6C, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88DF08C, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88DF414, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E01F8, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E0B68, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E0F04, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E16B8, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E2414, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E2658, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E3498, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E3DEC, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E4140, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E4774, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E53E0, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E5978, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E647C, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E6A80, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E6C78, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E75DC, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E8568, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E8BA0, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88E9674, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88EA5B8, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88EAB30, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88EB97C, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88EC884, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88ED358, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88EDEEC, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88EE8C4, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88EEF04, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88EF9E4, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F0020, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F0738, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F1074, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F1830, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F1D94, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F2B08, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F2F84, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F3470, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F3C38, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F4834, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F4BAC, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F5368, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F5FCC, 255, 0, 255, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88F6498, 255, 0, 255, 0
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion_duplicate, 255, 249, 25, 248
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 7, 1
 
diff --git a/sound/voicegroups/voicegroup131.inc b/sound/voicegroups/voicegroup131.inc
index ff98f6f82..e0e8c6cee 100644
--- a/sound/voicegroups/voicegroup131.inc
+++ b/sound/voicegroups/voicegroup131.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup131:: @ 86A0FB8
-	voice_keysplit_all voicegroup002  @ 86A0FB8
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A0FC4
-	voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 128, 204, 51, 242  @ 86A0FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A0FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A100C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A103C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A106C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A109C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A10A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A10B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A10C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A10CC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226  @ 86A10D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A10E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A10F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A10FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A112C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A115C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A118C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A11A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A11B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A11BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A11C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A11D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A11E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A11EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A11F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A121C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A124C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A127C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A12A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A12AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A12B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A12C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A12D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A12DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A12E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A12F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A130C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A133C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A136C
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 5  @ 86A1378
-	voice_square_2_alt 60, 0, 3, 0, 2, 6, 5  @ 86A1384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A139C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A13A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A13B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A13C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A13CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A13D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A13E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A13F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A13FC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 9, 1  @ 86A1408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A142C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A145C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A148C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A14A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A14B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A14BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A14C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A14D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A14E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A14EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A14F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A151C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A154C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A157C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A15A0
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 1  @ 86A15AC
+voicegroup131::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 128, 204, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 5
+	voice_square_2_alt 60, 0, 3, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 9, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 1
 
diff --git a/sound/voicegroups/voicegroup132.inc b/sound/voicegroups/voicegroup132.inc
index 48247b457..2e7dbc825 100644
--- a/sound/voicegroups/voicegroup132.inc
+++ b/sound/voicegroups/voicegroup132.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup132:: @ 86A15B8
-	voice_keysplit_all voicegroup002  @ 86A15B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A15C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A15D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A15DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A15E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A15F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A160C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A163C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1654
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236  @ 86A1660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A166C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1678
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 118, 137  @ 86A1684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A169C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A16A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A16B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A16C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A16CC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226  @ 86A16D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A16E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A16F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A16FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A172C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A175C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A178C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A17A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A17B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A17BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A17C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A17D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A17E0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 165, 154, 235  @ 86A17EC
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A17F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A181C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A184C
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A1858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1864
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86A1870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A187C
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A1888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A18A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A18AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A18B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A18C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A18D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A18DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A18E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A18F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A190C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1918
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86A1924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A193C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A196C
-	voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 2  @ 86A1978
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 5  @ 86A1984
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 4, 6, 0  @ 86A1990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A199C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 4, 6, 0  @ 86A19A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A19B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A19C0
-	voice_square_1_alt 60, 0, 0, 0, 0, 4, 2, 2  @ 86A19CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A19D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A19E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A19F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A19FC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 2, 9, 1  @ 86A1A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1B94
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86A1BA0
-	voice_noise_alt 60, 0, 0, 0, 1, 8, 1  @ 86A1BAC
+voicegroup132::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 118, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 165, 154, 235
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 2
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 5
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 4, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 4, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 4, 2, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 2, 9, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 8, 1
 
diff --git a/sound/voicegroups/voicegroup133.inc b/sound/voicegroups/voicegroup133.inc
index 766d7ef8f..23bfa9249 100644
--- a/sound/voicegroups/voicegroup133.inc
+++ b/sound/voicegroups/voicegroup133.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup133:: @ 86A1BB8
-	voice_keysplit_all voicegroup002  @ 86A1BB8
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A1BC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1BDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C24
-	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 86A1C30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C54
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86A1C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C78
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137  @ 86A1C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1CCC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226  @ 86A1CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1CE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1D08
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127  @ 86A1D14
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127  @ 86A1D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1D74
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 86A1D80
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127  @ 86A1D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1DE0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153  @ 86A1DEC
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A1DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E4C
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A1E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E7C
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A1E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1E94
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127  @ 86A1EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1EE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1EF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1F0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1F3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1F54
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127  @ 86A1F60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1F6C
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 9, 0  @ 86A1F78
-	voice_square_2_alt 60, 0, 3, 0, 2, 9, 1  @ 86A1F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1F90
-	voice_square_2_alt 60, 0, 2, 1, 0, 9, 1  @ 86A1F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1FA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1FC0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86A1FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1FE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A1FFC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0  @ 86A2008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A202C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A205C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A208C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A20A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A20B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A20BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A20C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A20D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A20E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A20EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A20F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A211C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A214C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165  @ 86A2158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A217C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2194
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86A21A0
-	voice_noise_alt 60, 0, 0, 0, 1, 8, 1  @ 86A21AC
+voicegroup133::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 9, 0
+	voice_square_2_alt 60, 0, 3, 0, 2, 9, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 1, 0, 9, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 8, 1
 
diff --git a/sound/voicegroups/voicegroup134.inc b/sound/voicegroups/voicegroup134.inc
index e689983d7..2266c55de 100644
--- a/sound/voicegroups/voicegroup134.inc
+++ b/sound/voicegroups/voicegroup134.inc
@@ -1,93 +1,93 @@
 	.align 2
-voicegroup134:: @ 86A21B8
-	voice_keysplit_all voicegroup001  @ 86A21B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A21C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A21D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A21DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A21E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A21F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A220C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A223C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A226C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A229C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A22A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A22B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A22C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A22CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A22D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A22E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A22F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A22FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A232C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A235C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A238C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A23A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A23B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A23BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A23C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A23D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A23E0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 86A23EC
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A23F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A241C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A244C
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A2458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A247C
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A2488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A24A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A24AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A24B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A24C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A24D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A24DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A24E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A24F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A250C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A253C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A256C
-	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1  @ 86A2578
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1  @ 86A2584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A259C
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1  @ 86A25A8
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1  @ 86A25B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A25C0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1  @ 86A25CC
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1  @ 86A25D8
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 1  @ 86A25E4
+voicegroup134::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 1
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 7, 1
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 1
 
diff --git a/sound/voicegroups/voicegroup135.inc b/sound/voicegroups/voicegroup135.inc
index 09b7843c9..2ea22bf96 100644
--- a/sound/voicegroups/voicegroup135.inc
+++ b/sound/voicegroups/voicegroup135.inc
@@ -1,86 +1,86 @@
 	.align 2
-voicegroup135:: @ 86A25F0
-	voice_keysplit_all voicegroup002  @ 86A25F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A25FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A262C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A265C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A268C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A26A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A26B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A26BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A26C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A26D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A26E0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 85, 137, 180, 204  @ 86A26EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A26F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A271C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A274C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A277C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A27A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A27AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A27B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A27C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A27D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A27DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A27E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A27F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A280C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A283C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A286C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A289C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A28A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A28B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A28C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A28CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A28D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A28E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A28F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A28FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A292C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A295C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A298C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A29A4
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 9, 0  @ 86A29B0
-	voice_square_2_alt 60, 0, 2, 0, 0, 9, 0  @ 86A29BC
-	voice_square_1_alt 60, 0, 0, 0, 1, 2, 6, 0  @ 86A29C8
+voicegroup135::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 85, 137, 180, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 9, 0
+	voice_square_2_alt 60, 0, 2, 0, 0, 9, 0
+	voice_square_1_alt 60, 0, 0, 0, 1, 2, 6, 0
 
diff --git a/sound/voicegroups/voicegroup136.inc b/sound/voicegroups/voicegroup136.inc
index 086956a96..672c9435c 100644
--- a/sound/voicegroups/voicegroup136.inc
+++ b/sound/voicegroups/voicegroup136.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup136:: @ 86A29D4
-	voice_keysplit_all voicegroup002  @ 86A29D4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A29E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A29EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A29F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2A94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2AB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2AE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B24
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127  @ 86A2B30
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127  @ 86A2B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2B90
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 86A2B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2BA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2BE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C08
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A2C14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2C98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2CA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2CB0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127  @ 86A2CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2CE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2D88
-	voice_square_2_alt 60, 0, 0, 0, 5, 0, 0  @ 86A2D94
-	voice_square_1_alt 60, 0, 0, 0, 0, 5, 0, 0  @ 86A2DA0
-	voice_square_1_alt 60, 0, 0, 2, 2, 4, 10, 0  @ 86A2DAC
-	voice_square_2_alt 60, 0, 0, 0, 5, 0, 0  @ 86A2DB8
-	voice_square_1_alt 60, 0, 0, 1, 0, 5, 0, 0  @ 86A2DC4
-	voice_square_2_alt 60, 0, 3, 2, 4, 10, 0  @ 86A2DD0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 1, 5, 0, 3  @ 86A2DDC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 1, 5, 0, 3  @ 86A2DE8
-	voice_square_2_alt 60, 0, 1, 0, 1, 10, 2  @ 86A2DF4
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 10, 0  @ 86A2E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2EE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2FA4
-	voice_noise_alt 60, 0, 0, 0, 0, 15, 0  @ 86A2FB0
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 86A2FBC
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 86A2FC8
+voicegroup136::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 0, 0, 5, 0, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 5, 0, 0
+	voice_square_1_alt 60, 0, 0, 2, 2, 4, 10, 0
+	voice_square_2_alt 60, 0, 0, 0, 5, 0, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 5, 0, 0
+	voice_square_2_alt 60, 0, 3, 2, 4, 10, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 1, 5, 0, 3
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 1, 5, 0, 3
+	voice_square_2_alt 60, 0, 1, 0, 1, 10, 2
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 10, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup137.inc b/sound/voicegroups/voicegroup137.inc
index 17c92d591..494b82d37 100644
--- a/sound/voicegroups/voicegroup137.inc
+++ b/sound/voicegroups/voicegroup137.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup137:: @ 86A2FD4
-	voice_keysplit_all voicegroup002  @ 86A2FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A2FF8
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 165, 180, 165  @ 86A3004
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 137, 154, 165  @ 86A3010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A301C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3034
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 204, 51, 242  @ 86A3040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A304C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3070
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86A307C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A30A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A30AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A30B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A30C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A30D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A30DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A30E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A30F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A310C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A313C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A316C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A319C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A31A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A31B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A31C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A31CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A31D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A31E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A31F0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242  @ 86A31FC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153  @ 86A3208
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A3214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A322C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A325C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3268
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A3274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3280
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86A328C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3298
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A32A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A32B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A32BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A32C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A32D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A32E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A32EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A32F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A331C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A334C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A337C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3388
-	voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1  @ 86A3394
-	voice_square_2_alt 60, 0, 1, 1, 2, 3, 1  @ 86A33A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A33AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A33B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A33C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A33D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A33DC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 2, 4, 1  @ 86A33E8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 2, 4, 1  @ 86A33F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A340C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A343C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A346C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A349C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A34A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A34B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A34C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A34CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A34D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A34E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A34F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A34FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A352C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A355C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A358C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A35A4
-	voice_noise_alt 60, 0, 0, 0, 0, 15, 0  @ 86A35B0
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 86A35BC
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 1  @ 86A35C8
+voicegroup137::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 165, 180, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 137, 154, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 204, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 0, 242
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1
+	voice_square_2_alt 60, 0, 1, 1, 2, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 2, 4, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 2, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 1
 
diff --git a/sound/voicegroups/voicegroup138.inc b/sound/voicegroups/voicegroup138.inc
index 21e849979..599dd92ff 100644
--- a/sound/voicegroups/voicegroup138.inc
+++ b/sound/voicegroups/voicegroup138.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup138:: @ 86A35D4
-	voice_keysplit_all voicegroup002  @ 86A35D4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A35E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A35EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A35F8
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226  @ 86A3604
-	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246  @ 86A3610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A361C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A364C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A367C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3694
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137  @ 86A36A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A36AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A36B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A36C4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165  @ 86A36D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A36DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A36E8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127  @ 86A36F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A370C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A373C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A376C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A379C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A37A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A37B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A37C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A37CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A37D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A37E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A37F0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 86A37FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3808
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A3814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A382C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A385C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3868
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A3874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A388C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A38A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A38B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A38BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A38C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A38D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A38E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A38EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A38F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A391C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3934
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86A3940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A394C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A397C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3988
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2  @ 86A3994
-	voice_square_2_alt 60, 0, 3, 0, 1, 6, 3  @ 86A39A0
-	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5  @ 86A39AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A39B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A39C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A39D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A39DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A39E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A39F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A18
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0  @ 86A3A24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3AA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3AF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3BB0
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86A3BBC
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86A3BC8
+voicegroup138::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2
+	voice_square_2_alt 60, 0, 3, 0, 1, 6, 3
+	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup139.inc b/sound/voicegroups/voicegroup139.inc
index fc44fa188..32250fd92 100644
--- a/sound/voicegroups/voicegroup139.inc
+++ b/sound/voicegroups/voicegroup139.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup139:: @ 86A3BD4
-	voice_keysplit_all voicegroup002  @ 86A3BD4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A3BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3C34
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242  @ 86A3C40
-	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 86A3C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3C58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3C64
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 86A3C70
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86A3C7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3C88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3C94
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 127, 103, 201  @ 86A3CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3CC4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 37, 127, 77, 165  @ 86A3CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3CE8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226  @ 86A3CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3DF0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 226  @ 86A3DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3E08
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A3E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3E20
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1  @ 86A3E2C
-	voice_square_2_alt 60, 0, 3, 0, 2, 7, 2  @ 86A3E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3E5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3E68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3E74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3E80
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86A3E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3E98
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A3EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3EB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F34
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86A3F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F70
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127  @ 86A3F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A3FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A400C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4018
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86A4024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A403C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A406C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A409C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A40A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A40B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A40C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A40CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A40D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A40E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A40F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A40FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A412C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A415C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A418C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A41A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A41B0
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 1  @ 86A41BC
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 1  @ 86A41C8
+voicegroup139::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 127, 103, 201
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 37, 127, 77, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1
+	voice_square_2_alt 60, 0, 3, 0, 2, 7, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 1
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 1
 
diff --git a/sound/voicegroups/voicegroup140.inc b/sound/voicegroups/voicegroup140.inc
index b135831ca..a12a9f30a 100644
--- a/sound/voicegroups/voicegroup140.inc
+++ b/sound/voicegroups/voicegroup140.inc
@@ -1,7 +1,7 @@
 	.align 2
-voicegroup140:: @ 86A41D4
-	voice_keysplit_all voicegroup001  @ 86A41D4
-	voice_square_1 60, 0, 0, 2, 0, 2, 3, 1  @ 86A41E0
-	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1  @ 86A41EC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86A41F8
+voicegroup140::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 2, 3, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup141.inc b/sound/voicegroups/voicegroup141.inc
index 4923049b3..6373309ed 100644
--- a/sound/voicegroups/voicegroup141.inc
+++ b/sound/voicegroups/voicegroup141.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup141:: @ 86A4204
-	voice_keysplit_all voicegroup002  @ 86A4204
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A4210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A421C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A424C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A427C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4294
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 86A42A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A42AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A42B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A42C4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137  @ 86A42D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A42DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A42E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A42F4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165  @ 86A4300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A430C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4318
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 127  @ 86A4324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A433C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A436C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A439C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A43A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A43B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A43C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A43CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A43D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A43E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A43F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A43FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A442C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4438
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A4444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A445C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A448C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4498
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A44A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A44B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A44BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A44C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A44D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A44E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A44EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A44F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A451C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A454C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4564
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86A4570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A457C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A45A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A45AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A45B8
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2  @ 86A45C4
-	voice_square_2_alt 60, 0, 3, 0, 2, 7, 3  @ 86A45D0
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 5  @ 86A45DC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 1, 7, 0, 6  @ 86A45E8
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 2  @ 86A45F4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 2, 9, 0  @ 86A4600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A460C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A463C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A466C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A469C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A46A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A46B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A46C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A46CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A46D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A46E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A46F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A46FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A472C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A475C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A478C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A47A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A47B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A47BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A47C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A47D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A47E0
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86A47EC
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86A47F8
+voicegroup141::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2
+	voice_square_2_alt 60, 0, 3, 0, 2, 7, 3
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 5
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 1, 7, 0, 6
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 2, 9, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup142.inc b/sound/voicegroups/voicegroup142.inc
index f478d6dca..3764a327f 100644
--- a/sound/voicegroups/voicegroup142.inc
+++ b/sound/voicegroups/voicegroup142.inc
@@ -1,87 +1,87 @@
 	.align 2
-voicegroup142:: @ 86A4804
-	voice_keysplit_all voicegroup002  @ 86A4804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A481C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A484C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A487C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A48A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A48AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A48B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A48C4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 188, 128, 201  @ 86A48D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A48DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A48E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A48F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A490C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4918
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 195, 103, 220  @ 86A4924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A493C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4954
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 195, 72, 127  @ 86A4960
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 85, 188, 103, 160  @ 86A496C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A499C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A49A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A49B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A49C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 128, 188, 77, 115  @ 86A49CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A49D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A49E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A49F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A49FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4AE0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 175, 154, 127  @ 86A4AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4BB8
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 4  @ 86A4BC4
-	voice_square_2_alt 60, 0, 2, 0, 2, 5, 5  @ 86A4BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4BDC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 7, 15, 0  @ 86A4BE8
+voicegroup142::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 188, 128, 201
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 195, 103, 220
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 195, 72, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 85, 188, 103, 160
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 128, 188, 77, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 175, 154, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 4
+	voice_square_2_alt 60, 0, 2, 0, 2, 5, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup143.inc b/sound/voicegroups/voicegroup143.inc
index 0f528bd88..346c644d8 100644
--- a/sound/voicegroups/voicegroup143.inc
+++ b/sound/voicegroups/voicegroup143.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup143:: @ 86A4BF4
-	voice_keysplit_all voicegroup002  @ 86A4BF4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A4C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4CB4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 160, 123, 165  @ 86A4CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4CE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D08
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 0  @ 86A4D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4DEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E28
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A4E34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4E94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4EE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4EF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4FA8
-	voice_square_2_alt 60, 0, 3, 0, 2, 3, 2  @ 86A4FB4
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1  @ 86A4FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4FCC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86A4FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4FE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A4FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A502C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A505C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A508C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A50A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A50B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A50BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A50C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A50D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A50E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A50EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A50F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A511C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A514C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A517C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A51A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A51AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A51B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A51C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A51D0
-	voice_noise_alt 60, 0, 0, 0, 1, 9, 0  @ 86A51DC
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 1  @ 86A51E8
+voicegroup143::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 160, 123, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 2, 3, 2
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 9, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 1
 
diff --git a/sound/voicegroups/voicegroup144.inc b/sound/voicegroups/voicegroup144.inc
index 4a3209f06..60bd142ad 100644
--- a/sound/voicegroups/voicegroup144.inc
+++ b/sound/voicegroups/voicegroup144.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup144:: @ 86A51F4
-	voice_keysplit_all voicegroup002  @ 86A51F4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A5200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A520C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A523C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A526C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A529C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A52A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A52B4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 85, 188, 92, 165  @ 86A52C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 85, 127, 180, 165  @ 86A52CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A52D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A52E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A52F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A52FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5308
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226  @ 86A5314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A532C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A535C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A538C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216  @ 86A5398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A53A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A53B0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 86A53BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A53C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A53D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A53E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A53EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A53F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A541C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5428
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A5434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A544C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A547C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A54A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A54AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A54B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A54C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A54D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A54DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A54E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A54F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A550C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A553C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A556C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A559C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A55A8
-	voice_square_2_alt 60, 0, 3, 0, 2, 4, 2  @ 86A55B4
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 3  @ 86A55C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A55CC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86A55D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A55E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A55F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A55FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A562C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A565C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A568C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A56A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A56B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A56BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A56C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A56D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A56E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A56EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A56F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A571C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A574C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A577C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A57A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A57AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A57B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A57C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A57D0
-	voice_noise_alt 60, 0, 0, 0, 1, 9, 0  @ 86A57DC
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86A57E8
+voicegroup144::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 85, 188, 92, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 85, 127, 180, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 51, 204, 92, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 2, 4, 2
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 9, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup145.inc b/sound/voicegroups/voicegroup145.inc
index d4cd030fb..374987162 100644
--- a/sound/voicegroups/voicegroup145.inc
+++ b/sound/voicegroups/voicegroup145.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup145:: @ 86A57F4
-	voice_keysplit_all voicegroup002  @ 86A57F4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A5800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A580C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5818
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226  @ 86A5824
-	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246  @ 86A5830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A583C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A586C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A589C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A58A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A58B4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137  @ 86A58C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A58CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A58D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A58E4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165  @ 86A58F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A58FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5908
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127  @ 86A5914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A592C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A595C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A598C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A59A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A59B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A59BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A59C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A59D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A59E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A59EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A59F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5A10
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 86A5A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5A28
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A5A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5A4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5A58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5A64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5A70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5A7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5A88
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A5A94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5AB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5AE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B54
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86A5B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5BA8
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2  @ 86A5BB4
-	voice_square_2_alt 60, 0, 3, 0, 0, 9, 0  @ 86A5BC0
-	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5  @ 86A5BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5BE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C38
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0  @ 86A5C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5C98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5CA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5CB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5CE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5DD0
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86A5DDC
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86A5DE8
+voicegroup145::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2
+	voice_square_2_alt 60, 0, 3, 0, 0, 9, 0
+	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup146.inc b/sound/voicegroups/voicegroup146.inc
index ad15ef86a..fcbfedcfe 100644
--- a/sound/voicegroups/voicegroup146.inc
+++ b/sound/voicegroups/voicegroup146.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup146:: @ 86A5DF4
-	voice_keysplit_all voicegroup002  @ 86A5DF4
-	voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235  @ 86A5E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E84
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 86A5E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5EE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F08
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 226  @ 86A5F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5FA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5FB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A5FF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A601C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6028
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A6034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A604C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A607C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A60A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A60AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A60B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A60C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A60D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A60DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A60E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A60F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A610C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A613C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A616C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6190
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 43, 76, 103, 216  @ 86A619C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A61A8
-	voice_square_2_alt 60, 0, 2, 0, 2, 4, 4  @ 86A61B4
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0  @ 86A61C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A61CC
-	voice_square_2_alt 60, 0, 2, 0, 0, 15, 0  @ 86A61D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A61E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A61F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A61FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A622C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6238
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 86A6244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A625C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A628C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A62A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A62B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A62BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A62C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A62D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A62E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A62EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A62F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A631C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A634C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A637C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A63A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A63AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A63B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A63C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A63D0
-	voice_noise_alt 60, 0, 0, 0, 1, 9, 0  @ 86A63DC
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 2  @ 86A63E8
+voicegroup146::
+	voice_keysplit_all voicegroup002
+	voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 43, 76, 103, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 4, 4
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 9, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 2
 
diff --git a/sound/voicegroups/voicegroup147.inc b/sound/voicegroups/voicegroup147.inc
index 159b5df80..de4c5a02f 100644
--- a/sound/voicegroups/voicegroup147.inc
+++ b/sound/voicegroups/voicegroup147.inc
@@ -1,87 +1,87 @@
 	.align 2
-voicegroup147:: @ 86A63F4
-	voice_keysplit_all voicegroup001  @ 86A63F4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A6400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A640C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A643C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A646C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A649C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A64A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A64B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A64C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A64CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A64D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A64E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A64F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A64FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6508
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 249, 25, 226  @ 86A6514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A652C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A655C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A658C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A65A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A65B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A65BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A65C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A65D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A65E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A65EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A65F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A661C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6628
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A6634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A664C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A667C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A66A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A66AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A66B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A66C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A66D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A66DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A66E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A66F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A670C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A673C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A676C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A679C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A67A8
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 6, 1  @ 86A67B4
-	voice_square_2_alt 60, 0, 2, 0, 0, 6, 1  @ 86A67C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A67CC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 2, 4, 2  @ 86A67D8
+voicegroup147::
+	voice_keysplit_all voicegroup001
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 249, 25, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 6, 1
+	voice_square_2_alt 60, 0, 2, 0, 0, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 2, 4, 2
 
diff --git a/sound/voicegroups/voicegroup148.inc b/sound/voicegroups/voicegroup148.inc
index da14a098b..ba25340f0 100644
--- a/sound/voicegroups/voicegroup148.inc
+++ b/sound/voicegroups/voicegroup148.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup148:: @ 86A67E4
-	voice_keysplit_all voicegroup002  @ 86A67E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A67F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A67FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A682C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A685C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6874
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127  @ 86A6880
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86A688C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A68A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A68B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A68BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A68C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A68D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A68E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A68EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A68F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A691C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A694C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A697C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A69A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A69AC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127  @ 86A69B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A69C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A69D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A69DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A69E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A69F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A18
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A6A24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6A90
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86A6A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6AA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6AF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6B98
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 12, 0  @ 86A6BA4
-	voice_square_2_alt 60, 0, 2, 0, 0, 12, 0  @ 86A6BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6BD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6BEC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86A6BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6CC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6DC0
-	voice_noise_alt 60, 0, 0, 0, 3, 5, 2  @ 86A6DCC
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 5  @ 86A6DD8
+voicegroup148::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 226, 0, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 12, 0
+	voice_square_2_alt 60, 0, 2, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 3, 5, 2
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 5
 
diff --git a/sound/voicegroups/voicegroup149.inc b/sound/voicegroups/voicegroup149.inc
index 2d009d7fe..50c47bc35 100644
--- a/sound/voicegroups/voicegroup149.inc
+++ b/sound/voicegroups/voicegroup149.inc
@@ -1,96 +1,96 @@
 	.align 2
-voicegroup149:: @ 86A6DE4
-	voice_keysplit_all voicegroup190  @ 86A6DE4
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A6DF0
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 12, 0  @ 86A6DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6E08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6E20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6E2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6E44
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242  @ 86A6E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6E5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6E68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6E74
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 86A6E80
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86A6E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6E98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6EB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A6FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7000
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 86A700C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 165, 154, 153  @ 86A7018
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A7024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A703C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A706C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7078
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A7084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7090
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86A709C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A70A8
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A70B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A70C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A70CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A70D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A70E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A70F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A70FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7108
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 43, 188, 103, 165  @ 86A7114
-	voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 43, 165, 103, 165  @ 86A7120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A712C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7144
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86A7150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A715C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A718C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7198
-	voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1  @ 86A71A4
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 2  @ 86A71B0
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 1  @ 86A71BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A71C8
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1  @ 86A71D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A71E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A71EC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86A71F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A721C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7228
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 86A7234
+voicegroup149::
+	voice_keysplit_all voicegroup190
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 165, 154, 153
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_oboe, 43, 188, 103, 165
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sd90_oboe, 43, 165, 103, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 2
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup150.inc b/sound/voicegroups/voicegroup150.inc
index e07ad0b97..97de70ac6 100644
--- a/sound/voicegroups/voicegroup150.inc
+++ b/sound/voicegroups/voicegroup150.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup150:: @ 86A7240
-	voice_keysplit_all voicegroup002  @ 86A7240
-	voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235  @ 86A724C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A727C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A72A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A72AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A72B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A72C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A72D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A72DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A72E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A72F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A730C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A733C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A736C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A739C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A73A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A73B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A73C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A73CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A73D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A73E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A73F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A73FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A742C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A745C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A748C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A74A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A74B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A74BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A74C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A74D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A74E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A74EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A74F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A751C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A754C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A757C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A75A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A75AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A75B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A75C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A75D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A75DC
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 85, 204, 77, 127  @ 86A75E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A75F4
-	voice_square_2_alt 60, 0, 1, 0, 1, 4, 6  @ 86A7600
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 5  @ 86A760C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7618
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 86A7624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A763C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A766C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A769C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A76A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A76B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A76C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A76CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A76D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A76E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A76F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A76FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A772C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A775C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A778C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A77A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A77B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A77BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A77C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A77D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A77E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A77EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A77F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A781C
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 86A7828
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 86A7834
+voicegroup150::
+	voice_keysplit_all voicegroup002
+	voice_directsound 60, 0, DirectSoundWaveData_steinway_b_piano, 255, 165, 103, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 85, 204, 77, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 1, 4, 6
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup151.inc b/sound/voicegroups/voicegroup151.inc
index ac5d1a802..c7e150baf 100644
--- a/sound/voicegroups/voicegroup151.inc
+++ b/sound/voicegroups/voicegroup151.inc
@@ -1,91 +1,91 @@
 	.align 2
-voicegroup151:: @ 86A7840
-	voice_keysplit_all voicegroup002  @ 86A7840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A784C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A787C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A78A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A78AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A78B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A78C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A78D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A78DC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86A78E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A78F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A790C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A793C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A796C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A799C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A79A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A79B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A79C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A79CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A79D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A79E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A79F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A79FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A68
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 127  @ 86A7A74
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A7A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7AD4
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A7AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7AEC
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86A7AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B04
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A7B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7BB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7BC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7BDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7BF4
-	voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1  @ 86A7C00
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 2  @ 86A7C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7C24
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1  @ 86A7C30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7C3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7C48
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86A7C54
+voicegroup151::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 127
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup152.inc b/sound/voicegroups/voicegroup152.inc
index 16cd4bb97..19340b82c 100644
--- a/sound/voicegroups/voicegroup152.inc
+++ b/sound/voicegroups/voicegroup152.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup152:: @ 86A7C60
-	voice_keysplit_all voicegroup002  @ 86A7C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7C90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7CE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7CFC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236  @ 86A7D08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7D20
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 160, 175, 165  @ 86A7D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7D74
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204  @ 86A7D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7DEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7E88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235  @ 86A7E94
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A7EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7EE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7EF4
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A7F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F0C
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86A7F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F24
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A7F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7FA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7FE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A7FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8014
-	voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 1  @ 86A8020
-	voice_square_2_alt 60, 0, 3, 0, 1, 5, 2  @ 86A802C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 4, 6, 0  @ 86A8038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8044
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 4, 6, 0  @ 86A8050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A805C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8068
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 1  @ 86A8074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A808C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A80A4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 2, 9, 1  @ 86A80B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A80BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A80C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A80D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A80E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A80EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A80F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A811C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A814C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A817C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A81A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A81AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A81B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A81C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A81D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A81DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A81E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A81F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A820C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A823C
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86A8248
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 1  @ 86A8254
+voicegroup152::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 160, 175, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 4, 2, 1
+	voice_square_2_alt 60, 0, 3, 0, 1, 5, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 4, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 4, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 2, 9, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 1
 
diff --git a/sound/voicegroups/voicegroup153.inc b/sound/voicegroups/voicegroup153.inc
index 1dae15586..4284b8991 100644
--- a/sound/voicegroups/voicegroup153.inc
+++ b/sound/voicegroups/voicegroup153.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup153:: @ 86A8260
-	voice_keysplit_all voicegroup002  @ 86A8260
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A826C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A829C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A82A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A82B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A82C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A82CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A82D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A82E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A82F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A82FC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236  @ 86A8308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A832C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A835C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A838C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A83A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A83B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A83BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A83C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A83D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A83E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A83EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A83F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A841C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A844C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A847C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 86A8488
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235  @ 86A8494
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A84A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A84AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A84B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A84C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A84D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A84DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A84E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A84F4
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A8500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A850C
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86A8518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8524
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A8530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A853C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A856C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A859C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A85A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A85B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A85C0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86A85CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A85D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A85E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A85F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A85FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8614
-	voice_square_1_alt 60, 0, 0, 1, 0, 3, 5, 2  @ 86A8620
-	voice_square_2_alt 60, 0, 3, 0, 3, 4, 2  @ 86A862C
-	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5  @ 86A8638
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 6, 2  @ 86A8644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A865C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A868C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A86A4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48A0, 0, 1, 12, 0  @ 86A86B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A86BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A86C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A86D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A86E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A86EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A86F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A871C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A874C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A877C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A87A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A87AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A87B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A87C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A87D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A87DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A87E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A87F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A880C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A883C
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86A8848
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 2  @ 86A8854
+voicegroup153::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 3, 5, 2
+	voice_square_2_alt 60, 0, 3, 0, 3, 4, 2
+	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B48A0, 0, 1, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 2
 
diff --git a/sound/voicegroups/voicegroup154.inc b/sound/voicegroups/voicegroup154.inc
index 77b8d3a1a..e38e7a448 100644
--- a/sound/voicegroups/voicegroup154.inc
+++ b/sound/voicegroups/voicegroup154.inc
@@ -1,96 +1,96 @@
 	.align 2
-voicegroup154:: @ 86A8860
-	voice_keysplit_all voicegroup002  @ 86A8860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A886C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8884
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165  @ 86A8890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A889C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A88A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A88B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A88C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A88CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A88D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A88E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A88F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A88FC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236  @ 86A8908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A892C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A895C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A898C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A89A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A89B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A89BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A89C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A89D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A89E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A89EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A89F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8A88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235  @ 86A8A94
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A8AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8AB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8AD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8AE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8AF4
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A8B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B0C
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86A8B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B24
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A8B30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8BA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8BD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8BE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8C08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8C14
-	voice_square_1_alt 60, 0, 0, 1, 0, 0, 10, 0  @ 86A8C20
-	voice_square_2_alt 60, 0, 1, 0, 0, 10, 0  @ 86A8C2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8C38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8C50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8C5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8C68
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 0, 12, 0  @ 86A8C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8C98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8CA4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 0, 12, 0  @ 86A8CB0
+voicegroup154::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 97, 236
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 127, 154, 235
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 0, 10, 0
+	voice_square_2_alt 60, 0, 1, 0, 0, 10, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4860, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 0, 12, 0
 
diff --git a/sound/voicegroups/voicegroup155.inc b/sound/voicegroups/voicegroup155.inc
index daefabb24..87cd50498 100644
--- a/sound/voicegroups/voicegroup155.inc
+++ b/sound/voicegroups/voicegroup155.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup155:: @ 86A8CBC
-	voice_keysplit_all voicegroup002  @ 86A8CBC
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A8CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8CE0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165  @ 86A8CEC
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 188, 103, 165  @ 86A8CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D58
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86A8D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D7C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 86A8D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8DD0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127  @ 86A8DDC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204  @ 86A8DE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E0C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127  @ 86A8E18
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 165, 154, 165  @ 86A8E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8EE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 86A8EF0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A8EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F50
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A8F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F80
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A8F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8F98
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 165, 180, 165  @ 86A8FA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8FB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A8FF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A901C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A904C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9070
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2  @ 86A907C
-	voice_square_2_alt 60, 0, 3, 0, 3, 6, 2  @ 86A9088
-	voice_square_2_alt 60, 0, 3, 0, 2, 6, 5  @ 86A9094
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 3, 6, 5  @ 86A90A0
-	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5  @ 86A90AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A90B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A90C4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1  @ 86A90D0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 86A90DC
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 1, 9, 2  @ 86A90E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A90F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9100
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3  @ 86A910C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A913C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A916C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A919C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A91A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A91B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A91C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A91CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A91D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A91E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A91F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A91FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A922C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9250
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165  @ 86A925C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A928C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9298
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 2  @ 86A92A4
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86A92B0
+voicegroup155::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 188, 103, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 165, 154, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 165, 180, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2
+	voice_square_2_alt 60, 0, 3, 0, 3, 6, 2
+	voice_square_2_alt 60, 0, 3, 0, 2, 6, 5
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 3, 6, 5
+	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4850, 0, 7, 15, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 1, 9, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 2
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup156.inc b/sound/voicegroups/voicegroup156.inc
index 52bebd5f7..76291c1e6 100644
--- a/sound/voicegroups/voicegroup156.inc
+++ b/sound/voicegroups/voicegroup156.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup156:: @ 86A92BC
-	voice_keysplit_all voicegroup002  @ 86A92BC
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A92C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A92D4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86A92E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A92EC
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165  @ 86A92F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A931C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A934C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A937C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 86A9388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A93A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A93AC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 86A93B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A93C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A93D0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204  @ 86A93DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A93E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A93F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A940C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127  @ 86A9418
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127  @ 86A9424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A943C
-	voice_square_2_alt 60, 0, 3, 0, 4, 4, 4  @ 86A9448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9460
-	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216  @ 86A946C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9484
-	voice_square_2_alt 60, 0, 1, 0, 1, 7, 5  @ 86A9490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A949C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A94A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A94B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A94C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A94CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A94D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A94E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A94F0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A94FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A952C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9550
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A955C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9580
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A958C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9598
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127  @ 86A95A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A95B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A95BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A95C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A95D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A95E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A95EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A95F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A961C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A964C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9670
-	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1  @ 86A967C
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 5  @ 86A9688
-	voice_square_1_alt 60, 0, 0, 3, 0, 2, 6, 5  @ 86A9694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A96A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A96AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A96B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A96C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A96D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A96DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A96E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A96F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A970C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A973C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A976C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A979C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A97A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A97B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A97C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A97CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A97D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A97E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A97F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A97FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A982C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9850
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165  @ 86A985C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A988C
-	voice_noise_alt 60, 0, 0, 0, 0, 15, 0  @ 86A9898
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86A98A4
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86A98B0
+voicegroup156::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 4, 4, 4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 1, 7, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 5
+	voice_square_1_alt 60, 0, 0, 3, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup157.inc b/sound/voicegroups/voicegroup157.inc
index 6469c4c4a..66cd6ff1c 100644
--- a/sound/voicegroups/voicegroup157.inc
+++ b/sound/voicegroups/voicegroup157.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup157:: @ 86A98BC
-	voice_keysplit_all voicegroup002  @ 86A98BC
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A98C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A98D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A98E0
-	voice_square_2_alt 60, 0, 3, 0, 2, 6, 5  @ 86A98EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A98F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A991C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A994C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A997C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 190, 115  @ 86A9988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A99A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A99AC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 86A99B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A99C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A99D0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204  @ 86A99DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A99E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A99F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9A00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9A0C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127  @ 86A9A18
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127  @ 86A9A24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9A30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9A3C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 86A9A48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9A54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9A60
-	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216  @ 86A9A6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9A78
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 86A9A84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9AA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9AF0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86A9AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B50
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86A9B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B80
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86A9B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9B98
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127  @ 86A9BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9BD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9C28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9C34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9C40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9C58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9C64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9C70
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2  @ 86A9C7C
-	voice_square_2_alt 60, 0, 3, 0, 3, 3, 0  @ 86A9C88
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 3, 6, 5  @ 86A9C94
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 2  @ 86A9CA0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 86A9CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9CC4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 86A9CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D00
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3  @ 86A9D0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9E98
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86A9EA4
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 1  @ 86A9EB0
+voicegroup157::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 190, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 128, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_unused_sc88pro_unison_slap, 255, 165, 180, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 7, 2
+	voice_square_2_alt 60, 0, 3, 0, 3, 3, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 3, 6, 5
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 7, 2
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 1
 
diff --git a/sound/voicegroups/voicegroup158.inc b/sound/voicegroups/voicegroup158.inc
index efed45e18..6a8ca184b 100644
--- a/sound/voicegroups/voicegroup158.inc
+++ b/sound/voicegroups/voicegroup158.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup158:: @ 86A9EBC
-	voice_keysplit_all voicegroup002  @ 86A9EBC
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86A9EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9EE0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165  @ 86A9EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9F28
-	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 86A9F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9F58
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86A9F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9F7C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137  @ 86A9F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9FD0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226  @ 86A9FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86A9FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA00C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127  @ 86AA018
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127  @ 86AA024
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165  @ 86AA030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA03C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA054
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86AA060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA06C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA078
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 86AA084
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127  @ 86AA090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA09C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA0A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA0B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA0C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA0CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA0D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA0E4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153  @ 86AA0F0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AA0FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA12C
-	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0  @ 86AA138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA150
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86AA15C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA180
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86AA18C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA198
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188  @ 86AA1A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA1B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA1BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA1C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA1D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA1E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA1EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA1F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA21C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA24C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA258
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127  @ 86AA264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA270
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 9, 0  @ 86AA27C
-	voice_square_2_alt 60, 0, 3, 0, 1, 10, 1  @ 86AA288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA294
-	voice_square_2_alt 60, 0, 2, 1, 0, 9, 1  @ 86AA2A0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 86AA2AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA2B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA2C4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86AA2D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA2DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA2E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA2F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA300
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0  @ 86AA30C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA33C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA36C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA39C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA3A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA3B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA3C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA3CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA3D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA3E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA3F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA3FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA42C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA45C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA48C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA498
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86AA4A4
-	voice_noise_alt 60, 0, 0, 0, 1, 8, 1  @ 86AA4B0
+voicegroup158::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 9, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 10, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 1, 0, 9, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 8, 1
 
diff --git a/sound/voicegroups/voicegroup159.inc b/sound/voicegroups/voicegroup159.inc
index 9b72cb505..7ee1e3a56 100644
--- a/sound/voicegroups/voicegroup159.inc
+++ b/sound/voicegroups/voicegroup159.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup159:: @ 86AA4BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA4BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA4C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA4D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA4E0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188  @ 86AA4EC
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 51, 249, 0, 165  @ 86AA4F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA51C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA54C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA57C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA5A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA5AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA5B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA5C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA5D0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 127  @ 86AA5DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA5E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA5F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA60C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA63C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA66C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA69C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA6A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA6B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA6C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA6CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA6D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA6E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA6F0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AA6FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA72C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA75C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA78C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA7A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA7B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA7BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA7C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA7D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA7E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA7EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA7F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA81C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA84C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA870
-	voice_square_1_alt 60, 0, 0, 2, 0, 7, 0, 6  @ 86AA87C
-	voice_square_2_alt 60, 0, 1, 1, 5, 1, 6  @ 86AA888
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 1, 7, 0, 6  @ 86AA894
-	voice_square_1_alt 60, 0, 0, 0, 1, 4, 3, 6  @ 86AA8A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA8AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA8B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA8C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA8D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA8DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA8E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA8F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA90C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA93C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA96C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA99C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA9A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA9B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA9C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA9CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA9D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA9E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA9F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AA9FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAA98
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 86AAAA4
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 86AAAB0
+voicegroup159::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 51, 249, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 7, 0, 6
+	voice_square_2_alt 60, 0, 1, 1, 5, 1, 6
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 1, 7, 0, 6
+	voice_square_1_alt 60, 0, 0, 0, 1, 4, 3, 6
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup160.inc b/sound/voicegroups/voicegroup160.inc
index 5bd5ec42d..faff81095 100644
--- a/sound/voicegroups/voicegroup160.inc
+++ b/sound/voicegroups/voicegroup160.inc
@@ -1,91 +1,91 @@
 	.align 2
-voicegroup160:: @ 86AAABC
-	voice_keysplit_all voicegroup001  @ 86AAABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAAC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAAD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAAE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAAEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAAF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB58
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86AAB64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAB94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AABA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AABAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AABB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AABC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AABD0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127  @ 86AABDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AABE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AABF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC54
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86AAC60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAC9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AACA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AACB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AACC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AACCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AACD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AACE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AACF0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AACFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAD98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AADA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AADB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AADBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AADC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AADD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AADE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AADEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AADF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE70
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 1  @ 86AAE7C
-	voice_square_2_alt 60, 0, 1, 0, 2, 4, 2  @ 86AAE88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAE94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAEA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAEAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAEB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAEC4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86AAED0
+voicegroup160::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 1
+	voice_square_2_alt 60, 0, 1, 0, 2, 4, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup161.inc b/sound/voicegroups/voicegroup161.inc
index 72008eece..71374e1a0 100644
--- a/sound/voicegroups/voicegroup161.inc
+++ b/sound/voicegroups/voicegroup161.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup161:: @ 86AAEDC
-	voice_keysplit_all voicegroup002  @ 86AAEDC
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86AAEE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAEF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF78
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86AAF84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAF9C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 86AAFA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAFB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAFC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAFCC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 86AAFD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAFE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAFF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AAFFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB02C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB05C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB08C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB0A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB0B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB0BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB0C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB0D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB0E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB0EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB0F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB110
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AB11C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB14C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB170
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86AB17C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB188
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86AB194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB1A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB1AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB1B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB1C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB1D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB1DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB1E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB1F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB20C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB23C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86AB248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB26C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB290
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 4  @ 86AB29C
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 2  @ 86AB2A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB2B4
-	voice_square_2_alt 60, 0, 1, 0, 2, 6, 2  @ 86AB2C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB2CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB2D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB2E4
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86AB2F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB2FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB32C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB35C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB38C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB3A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB3B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB3BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB3C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB3D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB3E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB3EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB3F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB41C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB44C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB47C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB4A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB4AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB4B8
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 86AB4C4
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 86AB4D0
+voicegroup161::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 4
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 2, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup162.inc b/sound/voicegroups/voicegroup162.inc
index 0694dc883..53edb3b0e 100644
--- a/sound/voicegroups/voicegroup162.inc
+++ b/sound/voicegroups/voicegroup162.inc
@@ -1,96 +1,96 @@
 	.align 2
-voicegroup162:: @ 86AB4DC
-	voice_keysplit_all voicegroup002  @ 86AB4DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB4E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB4F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB500
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 64, 188, 108, 244  @ 86AB50C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB53C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB56C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB578
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86AB584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB59C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 195, 92, 235  @ 86AB5A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB5B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB5C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB5CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB5D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB5E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB5F0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127  @ 86AB5FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB62C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB65C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 64, 204, 113, 235  @ 86AB668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB68C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB6A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB6B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB6BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB6C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB6D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB6E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB6EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB6F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB710
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AB71C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB74C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB77C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB7A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB7AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB7B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB7C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB7D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB7DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB7E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB7F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB80C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB83C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB86C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB890
-	voice_square_1_alt 60, 0, 0, 1, 0, 0, 6, 0  @ 86AB89C
-	voice_square_2_alt 60, 0, 1, 0, 0, 6, 0  @ 86AB8A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB8B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB8C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB8CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB8D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB8E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB8F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB8FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB920
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86AB92C
+voicegroup162::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 64, 188, 108, 244
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 64, 195, 92, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 64, 204, 113, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 0, 6, 0
+	voice_square_2_alt 60, 0, 1, 0, 0, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup163.inc b/sound/voicegroups/voicegroup163.inc
index f221b761d..86ff86ef9 100644
--- a/sound/voicegroups/voicegroup163.inc
+++ b/sound/voicegroups/voicegroup163.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup163:: @ 86AB938
-	voice_keysplit_all voicegroup002  @ 86AB938
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86AB944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB95C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226  @ 86AB968
-	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246  @ 86AB974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB98C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB9A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB9B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB9BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB9C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB9D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB9E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB9EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AB9F8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137  @ 86ABA04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABA10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABA1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABA28
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165  @ 86ABA34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABA40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABA4C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127  @ 86ABA58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABA64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABA70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABA7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABA88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABA94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABAA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABAAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABAB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABAC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABAD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABAE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABAF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB54
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 86ABB60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB6C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86ABB78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABB9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABBA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABBB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABBC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABBCC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86ABBD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABBE4
-	voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204  @ 86ABBF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABBFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABC98
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86ABCA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABCB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABCBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABCC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABCD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABCE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABCEC
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 5, 2  @ 86ABCF8
-	voice_square_2_alt 60, 0, 3, 0, 3, 4, 2  @ 86ABD04
-	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5  @ 86ABD10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABD1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABD28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABD34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABD40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABD4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABD58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABD64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABD70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABD7C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 0, 12, 0  @ 86ABD88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABD94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABDA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABDAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABDB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABDC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABDD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABDDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABDE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABDF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABE9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABEA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABEB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABEC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABEE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABEF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABEFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABF08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABF14
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86ABF20
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86ABF2C
+voicegroup163::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_88D6978, 255, 0, 206, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 5, 2
+	voice_square_2_alt 60, 0, 3, 0, 3, 4, 2
+	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup164.inc b/sound/voicegroups/voicegroup164.inc
index 67783f8f8..fe48fbfb9 100644
--- a/sound/voicegroups/voicegroup164.inc
+++ b/sound/voicegroups/voicegroup164.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup164:: @ 86ABF38
-	voice_keysplit_all voicegroup002  @ 86ABF38
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86ABF44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABF50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABF5C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 128, 180, 108, 209  @ 86ABF68
-	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 85, 204, 77, 246  @ 86ABF74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABF80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABF8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABF98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABFA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABFB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABFBC
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 10, 6  @ 86ABFC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABFD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABFE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABFEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ABFF8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137  @ 86AC004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC01C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC028
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165  @ 86AC034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC04C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127  @ 86AC058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC07C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC0A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC0AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC0B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC0C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC0D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC0DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC0E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC0F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC10C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC13C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC154
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 86AC160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC16C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AC178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC19C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC1A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC1B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC1C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC1CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC1D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC1E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC1F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC1FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC22C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC25C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC28C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC298
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86AC2A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC2B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC2BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC2C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC2D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC2E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC2EC
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 2  @ 86AC2F8
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 4  @ 86AC304
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 0, 12, 0  @ 86AC310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC31C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC34C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC37C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0  @ 86AC388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC3A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC3AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC3B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC3C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC3D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC3DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC3E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC3F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC40C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC43C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC46C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC49C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC4A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC4B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC4C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC4CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC4D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC4E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC4F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC4FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC514
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86AC520
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86AC52C
+voicegroup164::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 128, 180, 108, 209
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 85, 204, 77, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 10, 6
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 2
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 4
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup165.inc b/sound/voicegroups/voicegroup165.inc
index 95042d7a7..e633e5671 100644
--- a/sound/voicegroups/voicegroup165.inc
+++ b/sound/voicegroups/voicegroup165.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup165:: @ 86AC538
-	voice_keysplit_all voicegroup002  @ 86AC538
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86AC544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC55C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC58C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC598
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242  @ 86AC5A4
-	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 86AC5B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC5BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC5C8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 86AC5D4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86AC5E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC5EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC5F8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 37, 165, 103, 127  @ 86AC604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC61C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC64C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 204, 92, 226  @ 86AC658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC67C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC6A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC6AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC6B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC6C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC6D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC6DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC6E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC6F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC70C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC73C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC754
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 226  @ 86AC760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC76C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AC778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC784
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 10, 1  @ 86AC790
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 6  @ 86AC79C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC7A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC7B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC7C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC7CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC7D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC7E4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86AC7F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC7FC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86AC808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC82C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC85C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC88C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC898
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165  @ 86AC8A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC8B0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_enhanced_delay_shaku, 255, 191, 97, 165  @ 86AC8BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC8C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC8D4
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127  @ 86AC8E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC8EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC8F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC91C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC928
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC94C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC97C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86AC988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC9A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC9AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC9B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC9C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC9D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC9DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC9E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AC9F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACA9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACAA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACAB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACAC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACAD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACAE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACAF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACAFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACB08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACB14
-	voice_noise_alt 60, 0, 0, 0, 1, 9, 0  @ 86ACB20
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 1  @ 86ACB2C
+voicegroup165::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_glockenspiel, 255, 165, 51, 242
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 37, 165, 103, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 204, 92, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 10, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 6
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_enhanced_delay_shaku, 255, 191, 97, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 9, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 1
 
diff --git a/sound/voicegroups/voicegroup166.inc b/sound/voicegroups/voicegroup166.inc
index a859f7f3a..e4ac4a28e 100644
--- a/sound/voicegroups/voicegroup166.inc
+++ b/sound/voicegroups/voicegroup166.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup166:: @ 86ACB38
-	voice_keysplit_all voicegroup002  @ 86ACB38
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86ACB44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACB50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACB5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACB68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACB74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACB80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACB8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACB98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACBA4
-	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 86ACBB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACBBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACBC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACBD4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86ACBE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACBEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACBF8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137  @ 86ACC04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACC10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACC1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACC28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACC34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACC40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACC4C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226  @ 86ACC58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACC64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACC70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACC7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACC88
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127  @ 86ACC94
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127  @ 86ACCA0
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165  @ 86ACCAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACCB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACCC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACCD0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86ACCDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACCE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACCF4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 86ACD00
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127  @ 86ACD0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACD18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACD24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACD30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACD3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACD48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACD54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACD60
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153  @ 86ACD6C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86ACD78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACD84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACD90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACD9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACDA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACDB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACDC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACDCC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86ACDD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACDE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACDF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACDFC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86ACE08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE14
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188  @ 86ACE20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACE98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACEA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACEB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACEBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACEC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACED4
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127  @ 86ACEE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACEEC
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 9, 0  @ 86ACEF8
-	voice_square_2_alt 60, 0, 3, 0, 2, 9, 1  @ 86ACF04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACF10
-	voice_square_2_alt 60, 0, 2, 1, 0, 9, 1  @ 86ACF1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACF28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACF34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACF40
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86ACF4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACF58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACF64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACF70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACF7C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0  @ 86ACF88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACF94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACFA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACFAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACFB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACFC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACFD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACFDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACFE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ACFF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD00C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD03C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD06C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD09C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD0A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD0B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD0C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD0CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD0D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD0E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD0F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD0FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD114
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86AD120
-	voice_noise_alt 60, 0, 0, 0, 1, 8, 1  @ 86AD12C
+voicegroup166::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 128, 146, 108, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 204, 103, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 255, 0, 255, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_square_wave, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 153
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 236, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 9, 0
+	voice_square_2_alt 60, 0, 3, 0, 2, 9, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 1, 0, 9, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 8, 1
 
diff --git a/sound/voicegroups/voicegroup167.inc b/sound/voicegroups/voicegroup167.inc
index 2583623c3..307379eb9 100644
--- a/sound/voicegroups/voicegroup167.inc
+++ b/sound/voicegroups/voicegroup167.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup167:: @ 86AD138
-	voice_keysplit_all voicegroup002  @ 86AD138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD15C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD18C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD1A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD1B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD1BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD1C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD1D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD1E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD1EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD1F8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137  @ 86AD204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD21C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD228
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165  @ 86AD234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD24C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127  @ 86AD258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD27C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD2A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD2AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD2B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD2C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD2D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD2DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD2E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD2F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD30C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD33C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD36C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD39C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD3A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD3B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD3C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD3CC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86AD3D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD3E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD3F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD3FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD42C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD45C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD48C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD4A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD4B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD4BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD4C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD4D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD4E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD4EC
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 10, 4  @ 86AD4F8
-	voice_square_2_alt 60, 0, 3, 0, 2, 8, 3  @ 86AD504
-	voice_square_2_alt 60, 0, 2, 0, 2, 6, 5  @ 86AD510
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD51C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 0, 6, 0  @ 86AD528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD54C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD57C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD5A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD5AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD5B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD5C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD5D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD5DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD5E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD5F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD600
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD60C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD618
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD63C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD66C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD69C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD6A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD6B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD6C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD6CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD6D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD6E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD6F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD6FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD714
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86AD720
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86AD72C
+voicegroup167::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 10, 4
+	voice_square_2_alt 60, 0, 3, 0, 2, 8, 3
+	voice_square_2_alt 60, 0, 2, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 0, 6, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup168.inc b/sound/voicegroups/voicegroup168.inc
index 8d4d77c20..05dbf3954 100644
--- a/sound/voicegroups/voicegroup168.inc
+++ b/sound/voicegroups/voicegroup168.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup168:: @ 86AD738
-	voice_keysplit_all voicegroup002  @ 86AD738
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86AD744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD75C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226  @ 86AD768
-	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246  @ 86AD774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD78C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD7A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD7B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD7BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD7C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD7D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD7E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD7EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD7F8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137  @ 86AD804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD81C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD828
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165  @ 86AD834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD840
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD84C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127  @ 86AD858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD87C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD8A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD8AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD8B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD8C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD8D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD8DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD8E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD8F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD90C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD93C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD948
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 86AD954
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 86AD960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD96C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AD978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD99C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD9A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD9B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD9C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD9CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD9D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD9E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD9F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AD9FC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86ADA08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADA98
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86ADAA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADAB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADAC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADAD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADAE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADAEC
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 2  @ 86ADAF8
-	voice_square_2_alt 60, 0, 3, 0, 2, 6, 4  @ 86ADB04
-	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5  @ 86ADB10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADB1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADB28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADB34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADB40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADB4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADB58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADB64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADB70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADB7C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 0, 12, 0  @ 86ADB88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADB94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADBA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADBAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADBB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADBC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADBD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADBDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADBE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADBF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADC9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADCA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADCB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADCC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADCCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADCD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADCE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADCF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADCFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADD08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADD14
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86ADD20
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86ADD2C
+voicegroup168::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 4, 2
+	voice_square_2_alt 60, 0, 3, 0, 2, 6, 4
+	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup169.inc b/sound/voicegroups/voicegroup169.inc
index 37c24742e..220425ff0 100644
--- a/sound/voicegroups/voicegroup169.inc
+++ b/sound/voicegroups/voicegroup169.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup169:: @ 86ADD38
-	voice_keysplit_all voicegroup001  @ 86ADD38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADD44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADD50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADD5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADD68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADD74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADD80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADD8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADD98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADDA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADDB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADDBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADDC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADDD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADDE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADDEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADDF8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210  @ 86ADE04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADE94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADEA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADEAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADEB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADEC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADED0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86ADEDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADEE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADEF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADF9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADFA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADFB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADFC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADFCC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86ADFD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADFE4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86ADFF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86ADFFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE02C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE05C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE08C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE0A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE0B0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 86AE0BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE0C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE0D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE0E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE0EC
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1  @ 86AE0F8
-	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1  @ 86AE104
-	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1  @ 86AE110
-	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1  @ 86AE11C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE14C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE17C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE1A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE1AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE1B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE1C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE1D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE1DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE1E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE1F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE20C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE23C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE26C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE29C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE2A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE2B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE2C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE2CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE2D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE2E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE2F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE2FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE314
-	voice_noise_alt 60, 0, 0, 0, 2, 4, 0  @ 86AE320
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 86AE32C
+voicegroup169::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 210
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 4, 1
+	voice_square_2_alt 60, 0, 0, 0, 1, 4, 1
+	voice_square_1_alt 60, 0, 0, 0, 0, 1, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 4, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup170.inc b/sound/voicegroups/voicegroup170.inc
index b230f32d7..68c29a6c9 100644
--- a/sound/voicegroups/voicegroup170.inc
+++ b/sound/voicegroups/voicegroup170.inc
@@ -1,87 +1,87 @@
 	.align 2
-voicegroup170:: @ 86AE338
-	voice_keysplit_all voicegroup001  @ 86AE338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE35C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE38C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE3A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE3B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE3BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE3C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE3D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE3E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE3EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE3F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE41C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE434
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE44C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE47C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE4A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE4AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE4B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE4C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE4D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE4DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE4E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE4F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE50C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE53C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE560
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 86AE56C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE59C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE5A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE5B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE5C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE5CC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86AE5D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE5E4
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86AE5F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE5FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE62C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE65C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE68C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE698
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86AE6A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE6B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE6BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE6C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE6D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE6E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE6EC
-	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1  @ 86AE6F8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1  @ 86AE704
-	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1  @ 86AE710
-	voice_square_2_alt 60, 0, 2, 0, 1, 0, 0  @ 86AE71C
+voicegroup170::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 1, 0, 1, 7, 1
+	voice_square_2_alt 60, 0, 2, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup171.inc b/sound/voicegroups/voicegroup171.inc
index fe9cccdc7..76eee5f8a 100644
--- a/sound/voicegroups/voicegroup171.inc
+++ b/sound/voicegroups/voicegroup171.inc
@@ -1,94 +1,94 @@
 	.align 2
-voicegroup171:: @ 86AE728
-	voice_keysplit_all voicegroup001  @ 86AE728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE74C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE77C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE7A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE7AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE7B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE7C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE7D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE7DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE7E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE7F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE80C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE818
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE83C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE86C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE89C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE8A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE8B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE8C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE8CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE8D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE8E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE8F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE8FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE92C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE938
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 86AE944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE950
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 86AE95C
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AE968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE98C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE9A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE9B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE9BC
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86AE9C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE9D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE9E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AE9EC
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86AE9F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEA88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86AEA94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEAA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEAAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEAB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEAC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEAD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEADC
-	voice_square_2_alt 60, 0, 2, 0, 1, 7, 0  @ 86AEAE8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1  @ 86AEAF4
-	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0  @ 86AEB00
-	voice_square_2_alt 60, 0, 2, 0, 2, 0, 0  @ 86AEB0C
-	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0  @ 86AEB18
-	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0  @ 86AEB24
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0  @ 86AEB30
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0  @ 86AEB3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEB48
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0  @ 86AEB54
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1  @ 86AEB60
+voicegroup171::
+	voice_keysplit_all voicegroup001
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 1, 7, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 1
+	voice_square_1_alt 60, 0, 0, 2, 0, 1, 7, 0
+	voice_square_2_alt 60, 0, 2, 0, 2, 0, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 7, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 1, 7, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 0, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 7, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4880, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4890, 0, 7, 15, 1
 
diff --git a/sound/voicegroups/voicegroup172.inc b/sound/voicegroups/voicegroup172.inc
index ee1db7715..3e04a358c 100644
--- a/sound/voicegroups/voicegroup172.inc
+++ b/sound/voicegroups/voicegroup172.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup172:: @ 86AEB6C
-	voice_keysplit_all voicegroup002  @ 86AEB6C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86AEB78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEB84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEB90
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226  @ 86AEB9C
-	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246  @ 86AEBA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEBB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEBC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEBCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEBD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEBE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEBF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEBFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEC08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEC14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEC20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEC2C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137  @ 86AEC38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEC44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEC50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEC5C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165  @ 86AEC68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEC74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEC80
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127  @ 86AEC8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEC98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AECA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AECB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AECBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AECC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AECD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AECE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AECEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AECF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AED88
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 86AED94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEDA0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AEDAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEDB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEDC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEDD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEDDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEDE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEDF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE00
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86AEE0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEE9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEEA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEEB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEEC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEECC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86AEED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEEE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEEF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEEFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEF08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEF14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEF20
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 5, 2  @ 86AEF2C
-	voice_square_2_alt 60, 0, 3, 0, 2, 6, 3  @ 86AEF38
-	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5  @ 86AEF44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEF50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEF5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEF68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEF74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEF80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEF8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEF98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEFA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEFB0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 0, 12, 0  @ 86AEFBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEFC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEFD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEFE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEFEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AEFF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF004
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF01C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF04C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF07C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF0A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF0AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF0B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF0C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF0D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF0DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF0E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF0F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF10C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF13C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF148
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86AF154
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 0  @ 86AF160
+voicegroup172::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 255, 204, 77, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 5, 2
+	voice_square_2_alt 60, 0, 3, 0, 2, 6, 3
+	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4900, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 0
 
diff --git a/sound/voicegroups/voicegroup173.inc b/sound/voicegroups/voicegroup173.inc
index e75926269..ee4a2c866 100644
--- a/sound/voicegroups/voicegroup173.inc
+++ b/sound/voicegroups/voicegroup173.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup173:: @ 86AF16C
-	voice_keysplit_all voicegroup002  @ 86AF16C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86AF178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF190
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226  @ 86AF19C
-	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246  @ 86AF1A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF1B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF1C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF1CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF1D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF1E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF1F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF1FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF208
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86AF214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF220
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF22C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127  @ 86AF238
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF25C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF280
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127  @ 86AF28C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224  @ 86AF298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF2A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF2B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF2BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF2C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF2D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF2E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF2EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF2F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF304
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86AF310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF31C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF34C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF37C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF3A0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AF3AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF3B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF3C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF3D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF3DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF3E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF3F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF400
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF40C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF43C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF46C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF49C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF4A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF4B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF4C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF4CC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86AF4D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF4E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF4F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF4FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF520
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 4  @ 86AF52C
-	voice_square_2_alt 60, 0, 3, 0, 3, 3, 2  @ 86AF538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF55C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF58C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF5A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF5B0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86AF5BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF5C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF5D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF5E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF5EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF5F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF604
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF61C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF634
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF640
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF64C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF67C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF6A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF6AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF6B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF6C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF6D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF6DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF6E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF6F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF70C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF73C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF748
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86AF754
-	voice_noise_alt 60, 0, 0, 0, 1, 3, 2  @ 86AF760
+voicegroup173::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 3, 4
+	voice_square_2_alt 60, 0, 3, 0, 3, 3, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 3, 2
 
diff --git a/sound/voicegroups/voicegroup174.inc b/sound/voicegroups/voicegroup174.inc
index face4c675..82be8ccf9 100644
--- a/sound/voicegroups/voicegroup174.inc
+++ b/sound/voicegroups/voicegroup174.inc
@@ -1,160 +1,160 @@
 	.align 2
-voicegroup174:: @ 86AF76C
-	voice_keysplit_all voicegroup002  @ 86AF76C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86AF778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF79C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165  @ 86AF7A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF7B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF7C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF7CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF7D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF7E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF7F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF7FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF808
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF82C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127  @ 86AF838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF85C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165  @ 86AF868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF874
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF880
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF88C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF8A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF8B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF8BC
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214  @ 86AF8C8
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206  @ 86AF8D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF8E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF8EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF8F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF910
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF91C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF928
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 165  @ 86AF934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF94C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF97C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF9A0
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86AF9AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF9B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF9C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF9D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF9DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF9E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AF9F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA00
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86AFA0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA30
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86AFA3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA48
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209  @ 86AFA54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFA9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFAA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFAB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFAC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFAD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFAE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFAF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFAFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFB08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFB14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFB20
-	voice_square_1_alt 60, 0, 0, 3, 0, 2, 3, 4  @ 86AFB2C
-	voice_square_2_alt 60, 0, 3, 0, 2, 3, 4  @ 86AFB38
-	voice_square_1_alt 60, 0, 0, 3, 0, 2, 3, 4  @ 86AFB44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFB50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFB5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFB68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFB74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFB80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFB8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFB98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFBA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFBB0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0  @ 86AFBBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFBC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFBD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFBE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFBEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFBF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFC94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFCA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFCAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFCB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFCC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFCD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFCDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFCE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFCF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFD00
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165  @ 86AFD0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFD18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFD24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFD30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFD3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFD48
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86AFD54
-	voice_noise_alt 60, 0, 0, 0, 1, 3, 1  @ 86AFD60
-	voice_keysplit_all voicegroup177  @ 86AFD6C
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 9, 1  @ 86AFD78
-	voice_square_2_alt 60, 0, 2, 0, 2, 9, 1  @ 86AFD84
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86AFD90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFD9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFDA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFDB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFDC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFDCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFDD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFDE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFDF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFDFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFE80
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 154, 127  @ 86AFE8C
-	voice_keysplit_all voicegroup002  @ 86AFE98
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1  @ 86AFEA4
-	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1  @ 86AFEB0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86AFEBC
+voicegroup174::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 2, 3, 4
+	voice_square_2_alt 60, 0, 3, 0, 2, 3, 4
+	voice_square_1_alt 60, 0, 0, 3, 0, 2, 3, 4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4840, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 3, 1
+	voice_keysplit_all voicegroup177
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 9, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 9, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 154, 127
+	voice_keysplit_all voicegroup002
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup175.inc b/sound/voicegroups/voicegroup175.inc
index dac5ee5be..a074f216d 100644
--- a/sound/voicegroups/voicegroup175.inc
+++ b/sound/voicegroups/voicegroup175.inc
@@ -1,55 +1,55 @@
 	.align 2
-voicegroup175:: @ 86AFEC8
-	voice_keysplit_all voicegroup177  @ 86AFEC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFEE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFEEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFEF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF58
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 86AFF64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFF94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFFA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFFAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFFB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFFC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFFD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFFDC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 165, 154, 127  @ 86AFFE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86AFFF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B000C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B003C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B006C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B009C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B00A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B00B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B00C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B00CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B00D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B00E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B00F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B00FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B012C
+voicegroup175::
+	voice_keysplit_all voicegroup177
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 165, 154, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 
diff --git a/sound/voicegroups/voicegroup176.inc b/sound/voicegroups/voicegroup176.inc
index 04a8b3fef..9743d50e2 100644
--- a/sound/voicegroups/voicegroup176.inc
+++ b/sound/voicegroups/voicegroup176.inc
@@ -1,51 +1,51 @@
 	.align 2
-voicegroup176:: @ 86B0138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B015C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B018C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B01A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B01B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B01BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B01C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B01D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B01E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B01EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B01F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B021C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0234
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0240
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B024C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B027C
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 7, 1  @ 86B0288
-	voice_square_2_alt 60, 0, 2, 0, 2, 9, 1  @ 86B0294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B02A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B02AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B02B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B02C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B02D0
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 86B02DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B02E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B02F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B030C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B033C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0360
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B036C
+voicegroup176::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 7, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 9, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 
diff --git a/sound/voicegroups/voicegroup177.inc b/sound/voicegroups/voicegroup177.inc
index 6d43470b8..bd0e738fd 100644
--- a/sound/voicegroups/voicegroup177.inc
+++ b/sound/voicegroups/voicegroup177.inc
@@ -1,93 +1,93 @@
 	.align 2
-voicegroup177:: @ 86B0378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B039C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B03A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B03B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B03C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B03CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B03D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B03E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B03F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B03FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B042C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B045C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0468
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0480
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B048C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B04A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B04B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B04BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B04C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B04D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B04E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B04EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B04F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0510
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0  @ 86B051C
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0  @ 86B0528
-	voice_directsound_no_resample 67, 71, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228  @ 86B0534
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242  @ 86B0540
-	voice_directsound_no_resample 65, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 86B054C
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 86B0558
-	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86B0564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0570
-	voice_directsound 68, 29, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86B057C
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 86B0588
-	voice_directsound 72, 64, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86B0594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B05A0
-	voice_directsound 76, 39, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86B05AC
-	voice_directsound 80, 89, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226  @ 86B05B8
-	voice_directsound_no_resample 33, 10, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86B05C4
-	voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235  @ 86B05D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B05DC
-	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86B05E8
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231  @ 86B05F4
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 86B0600
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188  @ 86B060C
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242  @ 86B0618
-	voice_directsound_no_resample 64, 118, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86B0624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0630
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86B063C
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 86B0648
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0  @ 86B0654
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 86B0660
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86B066C
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86B0678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0690
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B069C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B06A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B06B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B06C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B06CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B06D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B06E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B06F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B06FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B072C
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 86B0738
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 86B0744
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188  @ 86B0750
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0  @ 86B075C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0774
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 86B0780
-	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0  @ 86B078C
-	voice_directsound 50, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 86B0798
-	voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0  @ 86B07A4
+voicegroup177::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0
+	voice_directsound_no_resample 67, 71, DirectSoundWaveData_sd90_solo_snare, 255, 180, 175, 228
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_solo_snare, 255, 0, 255, 242
+	voice_directsound_no_resample 65, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_directsound 64, 24, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 68, 29, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242
+	voice_directsound 72, 64, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 76, 39, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound 80, 89, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 226
+	voice_directsound_no_resample 33, 10, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound 84, 104, DirectSoundWaveData_sd90_ambient_tom, 255, 0, 255, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_dance_drums_ride_bell, 255, 165, 103, 231
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242
+	voice_directsound_no_resample 64, 118, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0
+	voice_directsound 50, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0
+	voice_directsound 64, 64, DirectSoundWaveData_ethnic_flavours_kotsuzumi, 255, 0, 255, 0
 
diff --git a/sound/voicegroups/voicegroup178.inc b/sound/voicegroups/voicegroup178.inc
index ea0ee13e9..1dc6971d7 100644
--- a/sound/voicegroups/voicegroup178.inc
+++ b/sound/voicegroups/voicegroup178.inc
@@ -1,91 +1,91 @@
 	.align 2
-voicegroup178:: @ 86B07B0
-	voice_keysplit_all voicegroup177  @ 86B07B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B07BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B07C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B07D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B07E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B07EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B07F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B081C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0828
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0834
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0840
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 204, 103, 165  @ 86B084C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0870
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B087C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B08A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B08AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B08B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B08C4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 154, 165  @ 86B08D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B08DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B08E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B08F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B090C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B093C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0960
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B096C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B099C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B09A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B09B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B09C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B09CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B09D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B09E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B09F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B09FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B64
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 7, 1  @ 86B0B70
-	voice_square_2_alt 60, 0, 2, 0, 2, 7, 1  @ 86B0B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0BAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0BB8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 0, 15, 1  @ 86B0BC4
+voicegroup178::
+	voice_keysplit_all voicegroup177
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 204, 103, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 165, 154, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 7, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 7, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 0, 15, 1
 
diff --git a/sound/voicegroups/voicegroup179.inc b/sound/voicegroups/voicegroup179.inc
index c98f76b03..b7df91e68 100644
--- a/sound/voicegroups/voicegroup179.inc
+++ b/sound/voicegroups/voicegroup179.inc
@@ -1,91 +1,91 @@
 	.align 2
-voicegroup179:: @ 86B0BD0
-	voice_keysplit_all voicegroup177  @ 86B0BD0
-	voice_keysplit_all voicegroup176  @ 86B0BDC
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86B0BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C60
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204  @ 86B0C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0CE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 165, 154, 127  @ 86B0CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D50
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 86B0D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0DEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0E04
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86B0E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0E28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0E34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0E40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0E4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0E64
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86B0E70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0E7C
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86B0E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0E94
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86B0EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0EE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0EF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0F84
-	voice_square_1_alt 60, 0, 0, 3, 0, 0, 10, 0  @ 86B0F90
-	voice_square_2_alt 60, 0, 0, 0, 1, 9, 0  @ 86B0F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0FA8
-	voice_square_2_alt 60, 0, 3, 0, 1, 9, 0  @ 86B0FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0FD8
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0  @ 86B0FE4
+voicegroup179::
+	voice_keysplit_all voicegroup177
+	voice_keysplit_all voicegroup176
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_xylophone, 255, 235, 0, 204
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 85, 165, 154, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 3, 0, 0, 10, 0
+	voice_square_2_alt 60, 0, 0, 0, 1, 9, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 1, 9, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup180.inc b/sound/voicegroups/voicegroup180.inc
index 6915bd8dd..82e98196d 100644
--- a/sound/voicegroups/voicegroup180.inc
+++ b/sound/voicegroups/voicegroup180.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup180:: @ 86B0FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B0FF0
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86B0FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1014
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188  @ 86B1020
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165  @ 86B102C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B105C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1080
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B108C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B10A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B10B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B10BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B10C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B10D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B10E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B10EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B10F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B111C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B114C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B117C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B11A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B11AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B11B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B11C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B11D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B11DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B11E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B11F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1200
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B120C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1218
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B123C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B126C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1290
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B129C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B12A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B12B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B12C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B12CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B12D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B12E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B12F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B12FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B132C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B135C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B138C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B13A4
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1  @ 86B13B0
-	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1  @ 86B13BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B13C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B13D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B13E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B13EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B13F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B141C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1428
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1434
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86B1440
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B144C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1458
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B147C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B14A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B14AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B14B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B14C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B14D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B14DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B14E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B14F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1500
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B150C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1518
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1524
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1530
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B153C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1554
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1560
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B156C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1578
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1584
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1590
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B159C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B15A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B15B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B15C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B15CC
-	voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127  @ 86B15D8
-	voice_noise_alt 60, 0, 0, 0, 1, 0, 0  @ 86B15E4
+voicegroup180::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 64, 249, 0, 188
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 249, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 3, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 60, 0, DirectSoundWaveData_sc88pro_tr909_hand_clap, 255, 255, 255, 127
+	voice_noise_alt 60, 0, 0, 0, 1, 0, 0
 
diff --git a/sound/voicegroups/voicegroup181.inc b/sound/voicegroups/voicegroup181.inc
index 2b41b646c..92df8710a 100644
--- a/sound/voicegroups/voicegroup181.inc
+++ b/sound/voicegroups/voicegroup181.inc
@@ -1,50 +1,50 @@
 	.align 2
-voicegroup181:: @ 86B15F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B15F0
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86B15FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B162C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1650
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B165C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1668
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1674
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B168C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1698
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B16A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B16B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B16BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B16C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B16D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B16E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B16EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B16F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1704
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1710
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B171C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1728
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1734
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1740
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B174C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1758
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1764
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1770
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B177C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1788
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1794
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B17A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B17AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B17B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B17C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B17D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B17DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B17E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B17F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1800
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B180C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242  @ 86B1818
+voicegroup181::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 242, 51, 242
 
diff --git a/sound/voicegroups/voicegroup182.inc b/sound/voicegroups/voicegroup182.inc
index 0eb9a5f7b..1fb444fec 100644
--- a/sound/voicegroups/voicegroup182.inc
+++ b/sound/voicegroups/voicegroup182.inc
@@ -1,91 +1,91 @@
 	.align 2
-voicegroup182:: @ 86B1824
-	voice_keysplit_all voicegroup002  @ 86B1824
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1830
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B183C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1848
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1854
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1860
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B186C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1878
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1884
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1890
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B189C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B18A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B18B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B18C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B18CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B18D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B18E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B18F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B18FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1908
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1914
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1920
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B192C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1938
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1944
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1950
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B195C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1968
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1974
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1980
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B198C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1998
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B19A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B19B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B19BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B19C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B19D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B19E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B19EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B19F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A4C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 76  @ 86B1A58
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86B1A64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1A94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1AA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1AAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1AB8
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86B1AC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1AD0
-	voice_keysplit voicegroup008, KeySplitTable4  @ 86B1ADC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1AE8
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86B1AF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1B9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1BA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1BB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1BC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1BCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1BD8
-	voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1  @ 86B1BE4
-	voice_square_2_alt 60, 0, 1, 0, 2, 6, 2  @ 86B1BF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1BFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1C08
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1  @ 86B1C14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1C20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1C2C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86B1C38
+voicegroup182::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 0, 193, 76
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup008, KeySplitTable4
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 1, 2, 3, 1
+	voice_square_2_alt 60, 0, 1, 0, 2, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 3, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
 
diff --git a/sound/voicegroups/voicegroup183.inc b/sound/voicegroups/voicegroup183.inc
index 29b8b05d9..92b953fc4 100644
--- a/sound/voicegroups/voicegroup183.inc
+++ b/sound/voicegroups/voicegroup183.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup183:: @ 86B1C44
-	voice_keysplit_all voicegroup002  @ 86B1C44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1C50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1C5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1C68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1C74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1C80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1C8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1C98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1CA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1CB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1CBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1CC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1CD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1CE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1CEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1CF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D58
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127  @ 86B1D64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1D94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1DA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1DAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1DB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1DC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1DD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1DDC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86B1DE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1DF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1E9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1EA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1EB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1EC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1ECC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1ED8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1EE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1EF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1EFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1F98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1FA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1FB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1FBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1FC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1FD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1FE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1FEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B1FF8
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1  @ 86B2004
-	voice_square_2_alt 60, 0, 2, 0, 2, 4, 1  @ 86B2010
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B201C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86B2028
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2034
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2040
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B204C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2058
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2064
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2070
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B207C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2088
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2094
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B20A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B20AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B20B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B20C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B20D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B20DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B20E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B20F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2100
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B210C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2118
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2124
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2130
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B213C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2148
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2154
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2160
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B216C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2178
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2184
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2190
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B219C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B21A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B21B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B21C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B21CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B21D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B21E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B21F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B21FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2208
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2214
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2220
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86B222C
-	voice_noise_alt 60, 0, 0, 0, 1, 3, 1  @ 86B2238
+voicegroup183::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 4, 1
+	voice_square_2_alt 60, 0, 2, 0, 2, 4, 1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 3, 1
 
diff --git a/sound/voicegroups/voicegroup184.inc b/sound/voicegroups/voicegroup184.inc
index 771c1e33a..e0d1c958d 100644
--- a/sound/voicegroups/voicegroup184.inc
+++ b/sound/voicegroups/voicegroup184.inc
@@ -1,89 +1,89 @@
 	.align 2
-voicegroup184:: @ 86B2244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2244
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2250
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B225C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86B2268
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2274
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2280
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B228C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2298
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B22A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B22B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B22BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B22C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B22D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B22E0
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86B22EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B22F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2304
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2310
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B231C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2328
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2334
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2340
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B234C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2358
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2364
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2370
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B237C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2388
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2394
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B23A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B23AC
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165  @ 86B23B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B23C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B23D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B23DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B23E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B23F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2400
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 86B240C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2418
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2424
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2430
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B243C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2448
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2454
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2460
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B246C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2478
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2484
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2490
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B249C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B24A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B24B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B24C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B24CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B24D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B24E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B24F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B24FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2508
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2514
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2520
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B252C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2538
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2544
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2550
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B255C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2568
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2574
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2580
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B258C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2598
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B25A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B25B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B25BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B25C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B25D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B25E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B25EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B25F8
-	voice_square_2_alt 60, 0, 3, 0, 0, 15, 0  @ 86B2604
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2610
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B261C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2628
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2634
-	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0  @ 86B2640
+voicegroup184::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 255, 0, 255, 0
 
diff --git a/sound/voicegroups/voicegroup185.inc b/sound/voicegroups/voicegroup185.inc
index 3d4c08f7a..8417a2407 100644
--- a/sound/voicegroups/voicegroup185.inc
+++ b/sound/voicegroups/voicegroup185.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup185:: @ 86B264C
-	voice_keysplit_all voicegroup002  @ 86B264C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2658
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2664
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2670
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B267C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2688
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2694
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B26A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B26AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B26B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B26C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B26D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B26DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B26E8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86B26F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2700
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B270C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2718
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2724
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2730
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B273C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2748
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2754
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2760
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B276C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2778
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2784
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2790
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B279C
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214  @ 86B27A8
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206  @ 86B27B4
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165  @ 86B27C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B27CC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149  @ 86B27D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B27E4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86B27F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B27FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2808
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115  @ 86B2814
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2820
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B282C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2838
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2844
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2850
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B285C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165  @ 86B2868
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2874
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226  @ 86B2880
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86B288C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2898
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B28A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B28B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B28BC
-	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 85, 0, 154, 165  @ 86B28C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B28D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B28E0
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86B28EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B28F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2904
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2910
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86B291C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2928
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209  @ 86B2934
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2940
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B294C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2958
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2964
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2970
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B297C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2988
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2994
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B29A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B29AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B29B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B29C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B29D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B29DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B29E8
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127  @ 86B29F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2A00
-	voice_square_2_alt 60, 0, 2, 0, 0, 15, 0  @ 86B2A0C
-	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2A18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2A24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2A30
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0  @ 86B2A3C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0  @ 86B2A48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2A54
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0  @ 86B2A60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2A6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2A78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2A84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2A90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2A9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2AA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2AB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2AC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2ACC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2AD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2AE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2AF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2AFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2B98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2BA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2BB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2BBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2BC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2BD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2BE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2BEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2BF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2C04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2C10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2C1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2C28
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86B2C34
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 1  @ 86B2C40
+voicegroup185::
+	voice_keysplit_all voicegroup002
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_overdrive_guitar, 128, 0, 255, 214
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_high, 128, 0, 255, 206
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_special_scream_drive, 255, 0, 255, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fingered_bass, 255, 253, 0, 149
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_synth_bass, 255, 252, 0, 115
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_pizzicato_strings, 255, 216, 0, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_timpani, 255, 246, 0, 226
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_classical_choir_voice_ahhs, 85, 0, 154, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_distortion_guitar_low, 255, 0, 255, 209
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_whistle, 255, 0, 255, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4920, 0, 7, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4910, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4870, 0, 7, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 1
 
diff --git a/sound/voicegroups/voicegroup186.inc b/sound/voicegroups/voicegroup186.inc
index 82f4a680f..18dc71d70 100644
--- a/sound/voicegroups/voicegroup186.inc
+++ b/sound/voicegroups/voicegroup186.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup186:: @ 86B2C4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2C4C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86B2C58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2C64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2C70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2C7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2C88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2C94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2CA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2CAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2CB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2CC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2CD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2CDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2CE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2CF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D0C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2D9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2DA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2DB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2DC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2DCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2DD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2DE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2DF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2DFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2E98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2EA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2EB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2EBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2EC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2ED4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2EE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2EEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2EF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2F94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2FA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2FAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2FB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2FC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2FD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2FDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2FE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B2FF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3000
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B300C
-	voice_square_2_alt 60, 0, 3, 0, 0, 15, 0  @ 86B3018
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3024
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3030
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B303C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3048
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3054
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3060
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B306C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3078
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3084
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3090
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B309C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B30A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B30B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B30C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B30CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B30D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B30E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B30F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B30FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3108
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3114
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3120
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B312C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3138
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3144
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3150
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B315C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3168
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3174
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3180
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B318C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3198
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B31A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B31B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B31BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B31C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B31D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B31E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B31EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B31F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3204
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3210
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B321C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3228
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3234
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86B3240
+voicegroup186::
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_2_alt 60, 0, 3, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
 
diff --git a/sound/voicegroups/voicegroup187.inc b/sound/voicegroups/voicegroup187.inc
index 9afa51349..46c5c1f9d 100644
--- a/sound/voicegroups/voicegroup187.inc
+++ b/sound/voicegroups/voicegroup187.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup187:: @ 86B324C
-	voice_keysplit_all voicegroup002  @ 86B324C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86B3258
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3264
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3270
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B327C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3288
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3294
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B32A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B32AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B32B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B32C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B32D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B32DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B32E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B32F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3300
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B330C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137  @ 86B3318
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3324
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3330
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B333C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165  @ 86B3348
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3354
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3360
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127  @ 86B336C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3378
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3384
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3390
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B339C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B33A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B33B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B33C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B33CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B33D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B33E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B33F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B33FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3408
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3414
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3420
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B342C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3438
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3444
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3450
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B345C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3468
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235  @ 86B3474
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3480
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86B348C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3498
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B34A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B34B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B34BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B34C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B34D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B34E0
-	voice_keysplit voicegroup007, KeySplitTable3  @ 86B34EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B34F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3504
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3510
-	voice_keysplit voicegroup009, KeySplitTable5  @ 86B351C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3528
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3534
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3540
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B354C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3558
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3564
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3570
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B357C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3588
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3594
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B35A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B35AC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86B35B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B35C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B35D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B35DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B35E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B35F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3600
-	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2  @ 86B360C
-	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1  @ 86B3618
-	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5  @ 86B3624
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3630
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B363C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3648
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3654
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3660
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B366C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3678
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3684
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3690
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0  @ 86B369C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B36A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B36B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B36C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B36CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B36D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B36E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B36F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B36FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3708
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3714
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3720
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B372C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3738
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3744
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3750
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B375C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3768
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3774
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3780
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B378C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3798
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B37A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B37B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B37BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B37C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B37D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B37E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B37EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B37F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3804
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3810
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B381C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3828
-	voice_noise_alt 60, 0, 0, 0, 2, 6, 0  @ 86B3834
-	voice_noise_alt 60, 0, 0, 0, 1, 6, 1  @ 86B3840
+voicegroup187::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 255, 76, 133, 137
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_accordion, 64, 188, 108, 165
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 255, 249, 25, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_harp, 255, 246, 0, 235
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup007, KeySplitTable3
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup009, KeySplitTable5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 0, 0, 2, 5, 2
+	voice_square_2_alt 60, 0, 1, 0, 1, 7, 1
+	voice_square_2_alt 60, 0, 0, 0, 2, 6, 5
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 0, 12, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 6, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 6, 1
 
diff --git a/sound/voicegroups/voicegroup188.inc b/sound/voicegroups/voicegroup188.inc
index a67df5a3a..c6afe243b 100644
--- a/sound/voicegroups/voicegroup188.inc
+++ b/sound/voicegroups/voicegroup188.inc
@@ -1,131 +1,131 @@
 	.align 2
-voicegroup188:: @ 86B384C
-	voice_keysplit_all voicegroup002  @ 86B384C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86B3858
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3864
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3870
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226  @ 86B387C
-	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246  @ 86B3888
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3894
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B38A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B38AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B38B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B38C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B38D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B38DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B38E8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86B38F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3900
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B390C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127  @ 86B3918
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3924
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3930
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B393C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3948
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3954
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3960
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127  @ 86B396C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224  @ 86B3978
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3984
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3990
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B399C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B39A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B39B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B39C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B39CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B39D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B39E4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86B39F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B39FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A80
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86B3A8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3A98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3AA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3AB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3ABC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3AC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3AD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3AE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3AEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3AF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B28
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B34
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B40
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B4C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B70
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B7C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3B94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3BA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3BAC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86B3BB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3BC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3BD0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3BDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3BE8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3BF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C00
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 1  @ 86B3C0C
-	voice_square_2_alt 60, 0, 3, 0, 3, 3, 2  @ 86B3C18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C60
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C6C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3C90
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 2  @ 86B3C9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3CA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3CB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3CC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3CCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3CD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3CE4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3CF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3CFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D08
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D14
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D20
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D2C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D38
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D44
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D50
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D5C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D68
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D74
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D80
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D8C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3D98
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3DA4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3DB0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3DBC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3DC8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3DD4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3DE0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3DEC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3DF8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3E04
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3E10
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3E1C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3E28
-	voice_noise_alt 60, 0, 0, 0, 2, 7, 0  @ 86B3E34
-	voice_noise_alt 60, 0, 0, 0, 1, 9, 1  @ 86B3E40
+voicegroup188::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 1
+	voice_square_2_alt 60, 0, 3, 0, 3, 3, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 7, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 9, 1
 
diff --git a/sound/voicegroups/voicegroup189.inc b/sound/voicegroups/voicegroup189.inc
index 4593c06f0..6c04cd832 100644
--- a/sound/voicegroups/voicegroup189.inc
+++ b/sound/voicegroups/voicegroup189.inc
@@ -1,95 +1,95 @@
 	.align 2
-voicegroup189:: @ 86B3E4C
-	voice_keysplit_all voicegroup002  @ 86B3E4C
-	voice_keysplit voicegroup005, KeySplitTable1  @ 86B3E58
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3E64
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3E70
-	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226  @ 86B3E7C
-	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246  @ 86B3E88
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3E94
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3EA0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3EAC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3EB8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3EC4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3ED0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3EDC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3EE8
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216  @ 86B3EF4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F00
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F0C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127  @ 86B3F18
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F24
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F30
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F3C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F48
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F54
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F60
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127  @ 86B3F6C
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224  @ 86B3F78
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F84
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F90
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3F9C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3FA8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3FB4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3FC0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3FCC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3FD8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3FE4
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188  @ 86B3FF0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B3FFC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4008
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4014
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4020
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B402C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4038
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4044
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4050
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B405C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4068
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4074
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4080
-	voice_keysplit voicegroup006, KeySplitTable2  @ 86B408C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4098
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B40A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B40B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B40BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B40C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B40D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B40E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B40EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B40F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4104
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4110
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B411C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4128
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4134
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4140
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B414C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4158
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4164
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4170
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B417C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4188
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4194
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B41A0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B41AC
-	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127  @ 86B41B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B41C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B41D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B41DC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B41E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B41F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4200
-	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 3  @ 86B420C
-	voice_square_2_alt 60, 0, 3, 0, 2, 7, 2  @ 86B4218
-	voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 2  @ 86B4224
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4230
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B423C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4248
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4254
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4260
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B426C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4278
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4284
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4290
+voicegroup189::
+	voice_keysplit_all voicegroup002
+	voice_keysplit voicegroup005, KeySplitTable1
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sd90_classical_detuned_ep1_low, 255, 188, 128, 226
+	voice_directsound 60, 65, DirectSoundWaveData_sd90_classical_detuned_ep1_high, 128, 204, 77, 246
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_tubular_bell, 255, 165, 90, 216
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_organ2, 51, 0, 203, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 128, 249, 25, 127
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_nylon_str_guitar, 64, 216, 51, 224
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_fretless_bass, 255, 253, 0, 188
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_keysplit voicegroup006, KeySplitTable2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 60, 0, DirectSoundWaveData_sc88pro_flute, 255, 127, 231, 127
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1_alt 60, 0, 0, 2, 0, 2, 6, 3
+	voice_square_2_alt 60, 0, 3, 0, 2, 7, 2
+	voice_square_1_alt 60, 0, 0, 1, 0, 2, 6, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
 
diff --git a/sound/voicegroups/voicegroup190.inc b/sound/voicegroups/voicegroup190.inc
index 9dc83deed..6faa27c62 100644
--- a/sound/voicegroups/voicegroup190.inc
+++ b/sound/voicegroups/voicegroup190.inc
@@ -1,90 +1,90 @@
 	.align 2
-voicegroup190:: @ 86B429C
-	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 2  @ 86B429C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B42A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B42B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B42C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B42CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B42D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B42E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B42F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B42FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4308
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4314
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4320
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B432C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4338
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4344
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4350
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B435C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4368
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4374
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4380
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B438C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4398
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B43A4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B43B0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B43BC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B43C8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B43D4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B43E0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B43EC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B43F8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4404
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4410
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B441C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4428
-	voice_noise_alt 60, 0, 0, 0, 2, 7, 0  @ 86B4434
-	voice_noise_alt 60, 0, 0, 0, 1, 9, 1  @ 86B4440
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0  @ 86B444C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4458
-	voice_directsound_no_resample 64, 52, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242  @ 86B4464
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4470
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B447C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4488
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4494
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B44A0
-	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242  @ 86B44AC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B44B8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B44C4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B44D0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B44DC
-	voice_directsound_no_resample 33, 104, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86B44E8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B44F4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4500
-	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86B450C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4518
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204  @ 86B4524
-	voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188  @ 86B4530
-	voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242  @ 86B453C
-	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86B4548
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4554
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231  @ 86B4560
-	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216  @ 86B456C
-	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0  @ 86B4578
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0  @ 86B4584
-	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86B4590
-	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0  @ 86B459C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B45A8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B45B4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B45C0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B45CC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B45D8
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B45E4
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B45F0
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B45FC
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4608
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4614
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4620
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B462C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4638
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4644
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4650
-	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 86B465C
-	voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188  @ 86B4668
-	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188  @ 86B4674
-	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0  @ 86B4680
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B468C
-	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0  @ 86B4698
-	voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0  @ 86B46A4
-	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0  @ 86B46B0
+voicegroup190::
+	voice_programmable_wave_alt 60, 0, ProgrammableWaveData_86B4830, 0, 7, 15, 2
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_noise_alt 60, 0, 0, 0, 2, 7, 0
+	voice_noise_alt 60, 0, 0, 0, 1, 9, 1
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_drum_and_percussion_kick, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 52, DirectSoundWaveData_sc88pro_orchestra_snare, 255, 0, 255, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 60, 64, DirectSoundWaveData_sc88pro_rnd_snare, 255, 0, 255, 242
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 33, 104, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_tambourine, 255, 127, 77, 204
+	voice_directsound_no_resample 64, 14, DirectSoundWaveData_trinity_cymbal_crash, 255, 231, 0, 188
+	voice_directsound_no_resample 64, 89, DirectSoundWaveData_sd90_cowbell, 255, 0, 255, 242
+	voice_directsound_no_resample 64, 24, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 255, 235, 0, 231
+	voice_directsound_no_resample 64, 54, DirectSoundWaveData_sc88pro_orchestra_cymbal_crash, 8, 0, 255, 216
+	voice_directsound_no_resample 64, 94, DirectSoundWaveData_unused_heart_of_asia_indian_drum, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_mute_high_conga, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 34, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_directsound_no_resample 64, 90, DirectSoundWaveData_sc88pro_open_low_conga, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188
+	voice_directsound_no_resample 64, 79, DirectSoundWaveData_sd90_open_triangle, 255, 242, 103, 188
+	voice_directsound_no_resample 64, 39, DirectSoundWaveData_sd90_open_triangle, 255, 165, 103, 188
+	voice_directsound_no_resample 64, 64, DirectSoundWaveData_sc88pro_jingle_bell, 255, 0, 255, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_square_1 60, 0, 0, 2, 0, 0, 15, 0
+	voice_directsound_no_resample 64, 104, DirectSoundWaveData_ethnic_flavours_atarigane, 255, 0, 255, 0
+	voice_directsound 63, 64, DirectSoundWaveData_sc88pro_taiko, 255, 0, 255, 0
diff --git a/src/apprentice.c b/src/apprentice.c
index 00157dc1a..f881c3bef 100644
--- a/src/apprentice.c
+++ b/src/apprentice.c
@@ -48,7 +48,7 @@
  * - Asking which move a mon should use, which they will ask at most 5 times
  * - Asking what held item to give to a mon, which they will ask at most 3 times (once for each mon)
  * - Asking what they should say when they win a battle, which will always be their final question before departing
- * 
+ *
  * ## After departing
  * After telling them what they should say when they win a battle they will leave the lobby for a final time
  * They will then be replaced by a new random Apprentice (they can repeat)
@@ -274,7 +274,7 @@ static void SetRandomQuestionData(void)
 
     for (i = 0; i < ARRAY_COUNT(questionOrder); i++)
         questionOrder[i] = sQuestionPossibilities[i];
-    
+
     // Shuffle the questions an arbitrary 50 times
     for (i = 0; i < 50; i++)
     {
@@ -788,7 +788,7 @@ static void GetNumApprenticePartyMonsAssigned(void)
 static void IsFinalQuestion(void)
 {
     s32 questionNum = CURRENT_QUESTION_NUM;
-    
+
     if (questionNum < 0)
     {
         // Not finished asking initial questions
@@ -941,7 +941,7 @@ static void ApprenticeGetQuestion(void)
             gSpecialVar_Result = APPRENTICE_QUESTION_WHICH_FIRST;
             break;
         default:
-      //case QUESTION_ID_WIN_SPEECH:  
+      //case QUESTION_ID_WIN_SPEECH:
             gSpecialVar_Result = APPRENTICE_QUESTION_WIN_SPEECH;
             break;
         }
@@ -1107,7 +1107,7 @@ static void TrySetApprenticeHeldItem(void)
 
     if (PLAYER_APPRENTICE.questionsAnswered < NUM_WHICH_MON_QUESTIONS)
         return;
-    
+
     count = 0;
     for (j = 0; j < APPRENTICE_MAX_QUESTIONS; j++)
     {
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index bb615e497..b1b62fd5b 100644
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -1632,13 +1632,13 @@ static void Cmd_if_status_not_in_party(void)
 
 static void Cmd_get_weather(void)
 {
-    if (gBattleWeather & WEATHER_RAIN_ANY)
+    if (gBattleWeather & B_WEATHER_RAIN)
         AI_THINKING_STRUCT->funcResult = AI_WEATHER_RAIN;
-    if (gBattleWeather & WEATHER_SANDSTORM_ANY)
+    if (gBattleWeather & B_WEATHER_SANDSTORM)
         AI_THINKING_STRUCT->funcResult = AI_WEATHER_SANDSTORM;
-    if (gBattleWeather & WEATHER_SUN_ANY)
+    if (gBattleWeather & B_WEATHER_SUN)
         AI_THINKING_STRUCT->funcResult = AI_WEATHER_SUN;
-    if (gBattleWeather & WEATHER_HAIL_ANY)
+    if (gBattleWeather & B_WEATHER_HAIL)
         AI_THINKING_STRUCT->funcResult = AI_WEATHER_HAIL;
 
     gAIScriptPtr += 1;
diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c
index 04122b17d..426dc5d15 100644
--- a/src/battle_ai_switch_items.c
+++ b/src/battle_ai_switch_items.c
@@ -866,7 +866,7 @@ static bool8 ShouldUseItem(void)
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_HEAL_SLEEP);
                 shouldUse = TRUE;
             }
-            if (itemEffects[3] & ITEM3_POISON && (gBattleMons[gActiveBattler].status1 & STATUS1_POISON 
+            if (itemEffects[3] & ITEM3_POISON && (gBattleMons[gActiveBattler].status1 & STATUS1_POISON
                                                || gBattleMons[gActiveBattler].status1 & STATUS1_TOXIC_POISON))
             {
                 *(gBattleStruct->AI_itemFlags + gActiveBattler / 2) |= (1 << AI_HEAL_POISON);
diff --git a/src/battle_anim.c b/src/battle_anim.c
index a10b20b55..80d511f4c 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -2185,8 +2185,8 @@ static void sub_80A40F4(u8 taskId)
 
     newTaskId = CreateTask(task_pA_ma0A_obj_to_bg_pal, 10);
     gTasks[newTaskId].data[t2_BATTLER_SPRITE_ID] = battlerSpriteId;
-    gTasks[newTaskId].data[1] = gSprites[battlerSpriteId].pos1.x + gSprites[battlerSpriteId].pos2.x;
-    gTasks[newTaskId].data[2] = gSprites[battlerSpriteId].pos1.y + gSprites[battlerSpriteId].pos2.y;
+    gTasks[newTaskId].data[1] = gSprites[battlerSpriteId].x + gSprites[battlerSpriteId].x2;
+    gTasks[newTaskId].data[2] = gSprites[battlerSpriteId].y + gSprites[battlerSpriteId].y2;
 
     if (!selfData[t1_MON_IN_BG2])
     {
@@ -2310,11 +2310,11 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
 
         battlerSpriteId = gBattlerSpriteIds[battlerId];
 
-        gBattle_BG1_X =  -(gSprites[battlerSpriteId].pos1.x + gSprites[battlerSpriteId].pos2.x) + 0x20;
+        gBattle_BG1_X =  -(gSprites[battlerSpriteId].x + gSprites[battlerSpriteId].x2) + 0x20;
         if (IsContest() && IsSpeciesNotUnown(gContestResources->moveAnim->species))
             gBattle_BG1_X--;
 
-        gBattle_BG1_Y =  -(gSprites[battlerSpriteId].pos1.y + gSprites[battlerSpriteId].pos2.y) + 0x20;
+        gBattle_BG1_Y =  -(gSprites[battlerSpriteId].y + gSprites[battlerSpriteId].y2) + 0x20;
         if (setSpriteInvisible)
             gSprites[gBattlerSpriteIds[battlerId]].invisible = TRUE;
 
@@ -2347,8 +2347,8 @@ void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible)
 
         battlerSpriteId = gBattlerSpriteIds[battlerId];
 
-        gBattle_BG2_X =  -(gSprites[battlerSpriteId].pos1.x + gSprites[battlerSpriteId].pos2.x) + 0x20;
-        gBattle_BG2_Y =  -(gSprites[battlerSpriteId].pos1.y + gSprites[battlerSpriteId].pos2.y) + 0x20;
+        gBattle_BG2_X =  -(gSprites[battlerSpriteId].x + gSprites[battlerSpriteId].x2) + 0x20;
+        gBattle_BG2_Y =  -(gSprites[battlerSpriteId].y + gSprites[battlerSpriteId].y2) + 0x20;
 
         if (setSpriteInvisible)
             gSprites[gBattlerSpriteIds[battlerId]].invisible = TRUE;
@@ -2436,8 +2436,8 @@ static void task_pA_ma0A_obj_to_bg_pal(u8 taskId)
     spriteId = gTasks[taskId].data[0];
     palIndex = gTasks[taskId].data[6];
     GetBattleAnimBg1Data(&animBg);
-    x = gTasks[taskId].data[1] - (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x);
-    y = gTasks[taskId].data[2] - (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y);
+    x = gTasks[taskId].data[1] - (gSprites[spriteId].x + gSprites[spriteId].x2);
+    y = gTasks[taskId].data[2] - (gSprites[spriteId].y + gSprites[spriteId].y2);
 
     if (gTasks[taskId].data[5] == 0)
     {
diff --git a/src/battle_anim_bug.c b/src/battle_anim_bug.c
index 9d9952979..105cc611e 100644
--- a/src/battle_anim_bug.c
+++ b/src/battle_anim_bug.c
@@ -212,8 +212,8 @@ static void AnimMegahornHorn(struct Sprite *sprite)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord2(gBattleAnimTarget, 2) + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBattlerSpriteCoord2(gBattleAnimTarget, 3) + gBattleAnimArgs[1];
+    sprite->x = GetBattlerSpriteCoord2(gBattleAnimTarget, 2) + gBattleAnimArgs[0];
+    sprite->y = GetBattlerSpriteCoord2(gBattleAnimTarget, 3) + gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[4];
 
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
@@ -236,8 +236,8 @@ static void AnimLeechLifeNeedle(struct Sprite *sprite)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord2(gBattleAnimTarget, 2) + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBattlerSpriteCoord2(gBattleAnimTarget, 3) + gBattleAnimArgs[1];
+    sprite->x = GetBattlerSpriteCoord2(gBattleAnimTarget, 2) + gBattleAnimArgs[0];
+    sprite->y = GetBattlerSpriteCoord2(gBattleAnimTarget, 3) + gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
 
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
@@ -261,8 +261,8 @@ static void AnimTranslateWebThread(struct Sprite *sprite)
 
     InitSpritePosToAnimAttacker(sprite, TRUE);
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[3] = sprite->y;
 
     if (!gBattleAnimArgs[4])
     {
@@ -287,22 +287,22 @@ static void AnimTranslateWebThread_Step(struct Sprite *sprite)
         return;
     }
 
-    sprite->pos2.x += Sin(sprite->data[6], sprite->data[5]);
+    sprite->x2 += Sin(sprite->data[6], sprite->data[5]);
     sprite->data[6] = (sprite->data[6] + 13) & 0xFF;
 }
 
 // Second stage of String Shot
 static void AnimStringWrap(struct Sprite *sprite)
 {
-    SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+    SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y);
     if (GetBattlerSide(gBattleAnimAttacker))
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
     else
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
 
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     if (!GetBattlerSide(gBattleAnimTarget))
-        sprite->pos1.y += 8;
+        sprite->y += 8;
 
     sprite->callback = AnimStringWrap_Step;
 }
@@ -396,7 +396,7 @@ static void AnimTranslateStinger(struct Sprite *sprite)
 
     lVarX = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
     lVarY = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
-    rot = ArcTan2Neg(lVarX - sprite->pos1.x, lVarY - sprite->pos1.y);
+    rot = ArcTan2Neg(lVarX - sprite->x, lVarY - sprite->y);
     rot += 0xC000;
     TrySetSpriteRotScale(sprite, FALSE, 0x100, 0x100, rot);
 
@@ -444,10 +444,10 @@ static void AnimMissileArc_Step(struct Sprite *sprite)
     {
         s16 tempData[8];
         u16 *data = sprite->data;
-        u16 x1 = sprite->pos1.x;
-        s16 x2 = sprite->pos2.x;
-        u16 y1 = sprite->pos1.y;
-        s16 y2 = sprite->pos2.y;
+        u16 x1 = sprite->x;
+        s16 x2 = sprite->x2;
+        u16 y1 = sprite->y;
+        s16 y2 = sprite->y2;
         int i;
 
         for (i = 0; i < 8; i++)
@@ -458,8 +458,8 @@ static void AnimMissileArc_Step(struct Sprite *sprite)
 
         if (!TranslateAnimHorizontalArc(sprite))
         {
-            u16 rotation = ArcTan2Neg(sprite->pos1.x + sprite->pos2.x - x2,
-                                  sprite->pos1.y + sprite->pos2.y - y2);
+            u16 rotation = ArcTan2Neg(sprite->x + sprite->x2 - x2,
+                                  sprite->y + sprite->y2 - y2);
             rotation += 0xC000;
             TrySetSpriteRotScale(sprite, FALSE, 0x100, 0x100, rotation);
 
@@ -473,13 +473,13 @@ static void AnimTailGlowOrb(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == ANIM_ATTACKER)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 18;
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 18;
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 18;
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 18;
     }
 
     StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
diff --git a/src/battle_anim_dark.c b/src/battle_anim_dark.c
index 8000a648c..fe8b18105 100644
--- a/src/battle_anim_dark.c
+++ b/src/battle_anim_dark.c
@@ -287,18 +287,18 @@ static void AnimUnusedBagSteal_Step(struct Sprite *sprite)
 {
     sprite->data[3] += sprite->data[1];
     sprite->data[4] += sprite->data[2];
-    sprite->pos2.x = sprite->data[3] >> 8;
-    sprite->pos2.y = sprite->data[4] >> 8;
+    sprite->x2 = sprite->data[3] >> 8;
+    sprite->y2 = sprite->data[4] >> 8;
     if (sprite->data[7] == 0)
     {
         sprite->data[3] += sprite->data[1];
         sprite->data[4] += sprite->data[2];
-        sprite->pos2.x = sprite->data[3] >> 8;
-        sprite->pos2.y = sprite->data[4] >> 8;
+        sprite->x2 = sprite->data[3] >> 8;
+        sprite->y2 = sprite->data[4] >> 8;
         sprite->data[0]--;
     }
 
-    sprite->pos2.y += Sin(sprite->data[5], sprite->data[6]);
+    sprite->y2 += Sin(sprite->data[5], sprite->data[6]);
     sprite->data[5] = (sprite->data[5] + 3) & 0xFF;
     if (sprite->data[5] > 0x7F)
     {
@@ -314,8 +314,8 @@ static void AnimUnusedBagSteal_Step(struct Sprite *sprite)
 // Move sprite inward for Bite/Crunch and Clamp
 static void AnimBite(struct Sprite *sprite)
 {
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
     StartSpriteAffineAnim(sprite, gBattleAnimArgs[2]);
     sprite->data[0] = gBattleAnimArgs[3];
     sprite->data[1] = gBattleAnimArgs[4];
@@ -327,8 +327,8 @@ static void AnimBite_Step1(struct Sprite *sprite)
 {
     sprite->data[4] += sprite->data[0];
     sprite->data[5] += sprite->data[1];
-    sprite->pos2.x = sprite->data[4] >> 8;
-    sprite->pos2.y = sprite->data[5] >> 8;
+    sprite->x2 = sprite->data[4] >> 8;
+    sprite->y2 = sprite->data[5] >> 8;
     if (++sprite->data[3] == sprite->data[2])
         sprite->callback = AnimBite_Step2;
 }
@@ -337,8 +337,8 @@ static void AnimBite_Step2(struct Sprite *sprite)
 {
     sprite->data[4] -= sprite->data[0];
     sprite->data[5] -= sprite->data[1];
-    sprite->pos2.x = sprite->data[4] >> 8;
-    sprite->pos2.y = sprite->data[5] >> 8;
+    sprite->x2 = sprite->data[4] >> 8;
+    sprite->y2 = sprite->data[5] >> 8;
     if (--sprite->data[3] == 0)
         DestroySpriteAndMatrix(sprite);
 }
@@ -360,30 +360,30 @@ static void AnimTearDrop(struct Sprite *sprite)
     switch (gBattleAnimArgs[1])
     {
     case 0:
-        sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) - 8;
-        sprite->pos1.y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_TOP) + 8;
+        sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) - 8;
+        sprite->y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_TOP) + 8;
         break;
     case 1:
-        sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) - 14;
-        sprite->pos1.y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_TOP) + 16;
+        sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) - 14;
+        sprite->y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_TOP) + 16;
         break;
     case 2:
-        sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_LEFT) + 8;
-        sprite->pos1.y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_TOP) + 8;
+        sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_LEFT) + 8;
+        sprite->y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_TOP) + 8;
         StartSpriteAffineAnim(sprite, 1);
         xOffset = -20;
         break;
     case 3:
-        sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_LEFT) + 14;
-        sprite->pos1.y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_TOP) + 16;
+        sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_LEFT) + 14;
+        sprite->y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_TOP) + 16;
         StartSpriteAffineAnim(sprite, 1);
         xOffset = -20;
         break;
     }
 
     sprite->data[0] = 32;
-    sprite->data[2] = sprite->pos1.x + xOffset;
-    sprite->data[4] = sprite->pos1.y + 12;
+    sprite->data[2] = sprite->x + xOffset;
+    sprite->data[4] = sprite->y + 12;
     sprite->data[5] = -12;
 
     InitAnimArcTranslation(sprite);
@@ -784,7 +784,7 @@ void AnimTask_InitMementoShadow(u8 taskId)
     DestroyAnimVisualTask(taskId);
 }
 
-void sub_8114470(u8 taskId)
+void AnimTask_MementoHandleBg(u8 taskId)
 {
     u8 toBG2 = GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) ^ 1 ? 1 : 0;
     ResetBattleAnimBg(toBG2);
@@ -798,8 +798,8 @@ void sub_8114470(u8 taskId)
 // Animates a deep slash from a claw. Used by Metal Claw, Dragon Claw, and Crush Claw
 static void AnimClawSlash(struct Sprite *sprite)
 {
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
     StartSpriteAnim(sprite, gBattleAnimArgs[2]);
     sprite->callback = RunStoredCallbackWhenAnimEnds;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
@@ -865,8 +865,8 @@ void AnimTask_MetallicShine(u8 taskId)
     AnimLoadCompressedBgGfx(animBg.bgId, gMetalShineGfx, animBg.tilesOffset);
     LoadCompressedPalette(gMetalShinePalette, animBg.paletteId * 16, 32);
 
-    gBattle_BG1_X = -gSprites[spriteId].pos1.x + 96;
-    gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32;
+    gBattle_BG1_X = -gSprites[spriteId].x + 96;
+    gBattle_BG1_Y = -gSprites[spriteId].y + 32;
     paletteNum = 16 + gSprites[spriteId].oam.paletteNum;
 
     if (gBattleAnimArgs[1] == 0)
diff --git a/src/battle_anim_dragon.c b/src/battle_anim_dragon.c
index caafdf3b8..1bc0f569b 100644
--- a/src/battle_anim_dragon.c
+++ b/src/battle_anim_dragon.c
@@ -189,20 +189,20 @@ const struct SpriteTemplate gOverheatFlameSpriteTemplate =
 
 static void AnimOutrageFlame(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
         gBattleAnimArgs[4] = -gBattleAnimArgs[4];
     }
     else
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
     }
 
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[3] = gBattleAnimArgs[4];
@@ -219,15 +219,15 @@ static void StartDragonFireTranslation(struct Sprite *sprite)
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
-        sprite->pos1.x -= gBattleAnimArgs[1];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x -= gBattleAnimArgs[1];
+        sprite->y += gBattleAnimArgs[1];
         sprite->data[2] -= gBattleAnimArgs[2];
         sprite->data[4] += gBattleAnimArgs[3];
     }
     else
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         sprite->data[2] += gBattleAnimArgs[2];
         sprite->data[4] += gBattleAnimArgs[3];
         StartSpriteAnim(sprite, 1);
@@ -242,17 +242,17 @@ static void AnimDragonRageFirePlume(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
     }
 
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[1]);
-    sprite->pos1.y += gBattleAnimArgs[2];
+    sprite->y += gBattleAnimArgs[2];
     sprite->callback = RunStoredCallbackWhenAnimEnds;
     StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
 }
@@ -270,8 +270,8 @@ static void AnimDragonDanceOrb(struct Sprite *sprite)
 {
     u16 r5;
     u16 r0;
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[4] = 0;
     sprite->data[5] = 1;
     sprite->data[6] = gBattleAnimArgs[0];
@@ -281,8 +281,8 @@ static void AnimDragonDanceOrb(struct Sprite *sprite)
         sprite->data[7] = r5 / 2;
     else
         sprite->data[7] = r0 / 2;
-    sprite->pos2.x = Cos(sprite->data[6], sprite->data[7]);
-    sprite->pos2.y = Sin(sprite->data[6], sprite->data[7]);
+    sprite->x2 = Cos(sprite->data[6], sprite->data[7]);
+    sprite->y2 = Sin(sprite->data[6], sprite->data[7]);
     sprite->callback = AnimDragonDanceOrb_Step;
 }
 
@@ -292,8 +292,8 @@ static void AnimDragonDanceOrb_Step(struct Sprite *sprite)
     {
     case 0:
         sprite->data[6] = (sprite->data[6] - sprite->data[5]) & 0xFF;
-        sprite->pos2.x = Cos(sprite->data[6], sprite->data[7]);
-        sprite->pos2.y = Sin(sprite->data[6], sprite->data[7]);
+        sprite->x2 = Cos(sprite->data[6], sprite->data[7]);
+        sprite->y2 = Sin(sprite->data[6], sprite->data[7]);
         if (++sprite->data[4] > 5)
         {
             sprite->data[4] = 0;
@@ -310,8 +310,8 @@ static void AnimDragonDanceOrb_Step(struct Sprite *sprite)
         sprite->data[6] = (sprite->data[6] - sprite->data[5]) & 0xFF;
         if (sprite->data[7] <= 0x95 && (sprite->data[7] += 8) > 0x95)
             sprite->data[7] = 0x96;
-        sprite->pos2.x = Cos(sprite->data[6], sprite->data[7]);
-        sprite->pos2.y = Sin(sprite->data[6], sprite->data[7]);
+        sprite->x2 = Cos(sprite->data[6], sprite->data[7]);
+        sprite->y2 = Sin(sprite->data[6], sprite->data[7]);
         if (++sprite->data[4] > 5)
         {
             sprite->data[4] = 0;
@@ -417,12 +417,12 @@ static void AnimOverheatFlame(struct Sprite *sprite)
 {
     int i;
     int yAmplitude = (gBattleAnimArgs[2] * 3) / 5;
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[4];
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[4];
     sprite->data[1] = Cos(gBattleAnimArgs[1], gBattleAnimArgs[2]);
     sprite->data[2] = Sin(gBattleAnimArgs[1], yAmplitude);
-    sprite->pos1.x += sprite->data[1] * gBattleAnimArgs[0];
-    sprite->pos1.y += sprite->data[2] * gBattleAnimArgs[0];
+    sprite->x += sprite->data[1] * gBattleAnimArgs[0];
+    sprite->y += sprite->data[2] * gBattleAnimArgs[0];
     sprite->data[3] = gBattleAnimArgs[3];
     sprite->callback = AnimOverheatFlame_Step;
     for (i = 0; i < 7; i++)
@@ -433,8 +433,8 @@ static void AnimOverheatFlame_Step(struct Sprite *sprite)
 {
     sprite->data[4] += sprite->data[1];
     sprite->data[5] += sprite->data[2];
-    sprite->pos2.x = sprite->data[4] / 10;
-    sprite->pos2.y = sprite->data[5] / 10;
+    sprite->x2 = sprite->data[4] / 10;
+    sprite->y2 = sprite->data[5] / 10;
     if (++sprite->data[0] > sprite->data[3])
         DestroyAnimSprite(sprite);
 }
diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c
index 9901aa5dd..ebdb471bf 100644
--- a/src/battle_anim_effects_1.c
+++ b/src/battle_anim_effects_1.c
@@ -2199,8 +2199,8 @@ const struct SpriteTemplate gTauntFingerSpriteTemplate =
 // arg 5: wave speed
 static void AnimMovePowderParticle(struct Sprite* sprite)
 {
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
 
@@ -2222,9 +2222,9 @@ static void AnimMovePowderParticle_Step(struct Sprite* sprite)
     if (sprite->data[0] > 0)
     {
         sprite->data[0]--;
-        sprite->pos2.y = sprite->data[2] >> 8;
+        sprite->y2 = sprite->data[2] >> 8;
         sprite->data[2] += sprite->data[1];
-        sprite->pos2.x = Sin(sprite->data[5], sprite->data[3]);
+        sprite->x2 = Sin(sprite->data[5], sprite->data[3]);
         sprite->data[5] = (sprite->data[5] + sprite->data[4]) & 0xFF;
     }
     else
@@ -2273,9 +2273,9 @@ static void AnimSolarbeamSmallOrb(struct Sprite* sprite)
 {
     InitSpritePosToAnimAttacker(sprite, TRUE);
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = gBattleAnimArgs[3];
@@ -2296,8 +2296,8 @@ static void AnimSolarbeamSmallOrb_Step(struct Sprite* sprite)
         else
             sprite->subpriority = GetBattlerSpriteSubpriority(gBattleAnimTarget) + 6;
 
-        sprite->pos2.x += Sin(sprite->data[5], 5);
-        sprite->pos2.y += Cos(sprite->data[5], 14);
+        sprite->x2 += Sin(sprite->data[5], 5);
+        sprite->y2 += Cos(sprite->data[5], 14);
         sprite->data[5] = (sprite->data[5] + 15) & 0xFF;
     }
 }
@@ -2352,18 +2352,18 @@ static void AnimHyperBeamOrb(struct Sprite* sprite)
     u16 animNum = Random2();
 
     StartSpriteAnim(sprite, animNum % 8);
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-        sprite->pos1.x -= 20;
+        sprite->x -= 20;
     else
-        sprite->pos1.x += 20;
+        sprite->x += 20;
 
     speed = Random2();
     sprite->data[0] = (speed & 31) + 64;
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
     InitAnimFastLinearTranslationWithSpeed(sprite);
     sprite->data[5] = Random2() & 0xFF;
@@ -2380,7 +2380,7 @@ static void AnimHyperBeamOrb_Step(struct Sprite* sprite)
     }
     else
     {
-        sprite->pos2.y += Cos(sprite->data[5], 12);
+        sprite->y2 += Cos(sprite->data[5], 12);
         if (sprite->data[5] < 0x7F)
             sprite->subpriority = sprite->data[6];
         else
@@ -2456,8 +2456,8 @@ static void AnimSporeParticle(struct Sprite* sprite)
 
 static void AnimSporeParticle_Step(struct Sprite* sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[1], 32);
-    sprite->pos2.y = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8);
+    sprite->x2 = Sin(sprite->data[1], 32);
+    sprite->y2 = Cos(sprite->data[1], -3) + ((sprite->data[2] += 24) >> 8);
     if ((u16)(sprite->data[1] - 0x40) < 0x80)
     {
         sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget);
@@ -2507,9 +2507,9 @@ static void AnimPetalDanceBigFlower(struct Sprite* sprite)
 {
     InitSpritePosToAnimAttacker(sprite, FALSE);
     sprite->data[0] = gBattleAnimArgs[3];
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[2] = sprite->x;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = 0x40;
@@ -2521,8 +2521,8 @@ static void AnimPetalDanceBigFlower_Step(struct Sprite* sprite)
 {
     if (!AnimTranslateLinear(sprite))
     {
-        sprite->pos2.x += Sin(sprite->data[5], 32);
-        sprite->pos2.y += Cos(sprite->data[5], -5);
+        sprite->x2 += Sin(sprite->data[5], 32);
+        sprite->y2 += Cos(sprite->data[5], -5);
         if ((u16)(sprite->data[5] - 0x40) < 0x80)
             sprite->subpriority = GetBattlerSpriteSubpriority(gBattleAnimAttacker) - 1;
         else
@@ -2545,9 +2545,9 @@ static void AnimPetalDanceSmallFlower(struct Sprite* sprite)
 {
     InitSpritePosToAnimAttacker(sprite, TRUE);
     sprite->data[0] = gBattleAnimArgs[3];
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[2] = sprite->x;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = 0x40;
@@ -2559,7 +2559,7 @@ static void AnimPetalDanceSmallFlower_Step(struct Sprite* sprite)
 {
     if (!AnimTranslateLinear(sprite))
     {
-        sprite->pos2.x += Sin(sprite->data[5], 8);
+        sprite->x2 += Sin(sprite->data[5], 8);
         if ((u16)(sprite->data[5] - 59) < 5 || (u16)(sprite->data[5] - 187) < 5)
             sprite->oam.matrixNum ^= ST_OAM_HFLIP;
 
@@ -2578,8 +2578,8 @@ static void AnimPetalDanceSmallFlower_Step(struct Sprite* sprite)
 // arg 2: upward duration
 static void AnimRazorLeafParticle(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
     sprite->data[2] = gBattleAnimArgs[2];
@@ -2607,23 +2607,23 @@ static void AnimRazorLeafParticle_Step1(struct Sprite* sprite)
     else
     {
         sprite->data[2]--;
-        sprite->pos1.x += sprite->data[0];
-        sprite->pos1.y += sprite->data[1];
+        sprite->x += sprite->data[0];
+        sprite->y += sprite->data[1];
     }
 }
 
 static void AnimRazorLeafParticle_Step2(struct Sprite* sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker))
-        sprite->pos2.x = -Sin(sprite->data[0], 25);
+        sprite->x2 = -Sin(sprite->data[0], 25);
     else
-        sprite->pos2.x = Sin(sprite->data[0], 25);
+        sprite->x2 = Sin(sprite->data[0], 25);
 
     sprite->data[0] += 2;
     sprite->data[0] &= 0xFF;
     sprite->data[1]++;
     if (!(sprite->data[1] & 1))
-        sprite->pos2.y++;
+        sprite->y2++;
 
     if (sprite->data[1] > 80)
         DestroyAnimSprite(sprite);
@@ -2690,10 +2690,10 @@ static void AnimTranslateLinearSingleSineWave_Step(struct Sprite* sprite)
             destroy = TRUE;
     }
 
-    if (sprite->pos1.x + sprite->pos2.x > DISPLAY_WIDTH + 16
-     || sprite->pos1.x + sprite->pos2.x < -16
-     || sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT
-     || sprite->pos1.y + sprite->pos2.y < -16)
+    if (sprite->x + sprite->x2 > DISPLAY_WIDTH + 16
+     || sprite->x + sprite->x2 < -16
+     || sprite->y + sprite->y2 > DISPLAY_HEIGHT
+     || sprite->y + sprite->y2 < -16)
         destroy = TRUE;
 
     if (destroy)
@@ -2709,9 +2709,9 @@ static void AnimTranslateLinearSingleSineWave_Step(struct Sprite* sprite)
 void AnimMoveTwisterParticle(struct Sprite* sprite)
 {
     if (IsDoubleBattle() == TRUE)
-        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->x, &sprite->y);
 
-    sprite->pos1.y += 32;
+    sprite->y += 32;
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
     sprite->data[2] = gBattleAnimArgs[2];
@@ -2724,11 +2724,11 @@ static void AnimMoveTwisterParticle_Step(struct Sprite* sprite)
 {
     if (sprite->data[1] == 0xFF)
     {
-        sprite->pos1.y -= 2;
+        sprite->y -= 2;
     }
     else if (sprite->data[1] > 0)
     {
-        sprite->pos1.y -= 2;
+        sprite->y -= 2;
         sprite->data[1] -= 2;
     }
 
@@ -2737,8 +2737,8 @@ static void AnimMoveTwisterParticle_Step(struct Sprite* sprite)
         sprite->data[5] += sprite->data[2];
 
     sprite->data[5] &= 0xFF;
-    sprite->pos2.x = Cos(sprite->data[5], sprite->data[3]);
-    sprite->pos2.y = Sin(sprite->data[5], 5);
+    sprite->x2 = Cos(sprite->data[5], sprite->data[3]);
+    sprite->y2 = Sin(sprite->data[5], 5);
     if (sprite->data[5] < 0x80)
         sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget) - 1;
     else
@@ -2825,9 +2825,9 @@ static void AnimTask_DuplicateAndShrinkToPos_Step1(u8 taskId)
 {
     u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
     gTasks[taskId].data[10] += gTasks[taskId].data[0];
-    gSprites[spriteId].pos2.x = gTasks[taskId].data[10] >> 8;
+    gSprites[spriteId].x2 = gTasks[taskId].data[10] >> 8;
     if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER)
-        gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x;
+        gSprites[spriteId].x2 = -gSprites[spriteId].x2;
 
     gTasks[taskId].data[11] += 16;
     SetSpriteRotScale(spriteId, gTasks[taskId].data[11], gTasks[taskId].data[11], 0);
@@ -2847,8 +2847,8 @@ static void AnimTask_DuplicateAndShrinkToPos_Step2(u8 taskId)
         {
             u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET);
             ResetSpriteRotScale(spriteId);
-            gSprites[spriteId].pos2.x = 0;
-            gSprites[spriteId].pos2.y = 0;
+            gSprites[spriteId].x2 = 0;
+            gSprites[spriteId].y2 = 0;
             gSprites[spriteId].oam.priority = gTasks[taskId].data[14];
             spriteId = GetAnimBattlerSpriteId(ANIM_DEF_PARTNER);
             gSprites[spriteId].oam.priority = gTasks[taskId].data[15];
@@ -2878,8 +2878,8 @@ static void AnimMimicOrb(struct Sprite* sprite)
         if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
             gBattleAnimArgs[0] *= -1;
 
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + gBattleAnimArgs[1];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X) + gBattleAnimArgs[0];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + gBattleAnimArgs[1];
         sprite->invisible = TRUE;
         sprite->data[0]++;
         break;
@@ -2908,16 +2908,16 @@ static void AnimIngrainRoot(struct Sprite* sprite)
 {
     if (!sprite->data[0])
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y);
-        sprite->pos2.x = gBattleAnimArgs[0];
-        sprite->pos2.y = gBattleAnimArgs[1];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y);
+        sprite->x2 = gBattleAnimArgs[0];
+        sprite->y2 = gBattleAnimArgs[1];
         sprite->subpriority = gBattleAnimArgs[2] + 30;
         StartSpriteAnim(sprite, gBattleAnimArgs[3]);
         sprite->data[2] = gBattleAnimArgs[4];
         sprite->data[0]++;
-        if (sprite->pos1.y + sprite->pos2.y > 120)
-            sprite->pos1.y += sprite->pos2.y + sprite->pos1.y - 120;
+        if (sprite->y + sprite->y2 > 120)
+            sprite->y += sprite->y2 + sprite->y - 120;
     }
     sprite->callback = AnimRootFlickerOut;
 }
@@ -2938,16 +2938,16 @@ static void AnimFrenzyPlantRoot(struct Sprite *sprite)
 
     targetX -= attackerX;
     targetY -= attackerY;
-    sprite->pos1.x = attackerX + targetX * gBattleAnimArgs[0] / 100;
-    sprite->pos1.y = attackerY + targetY * gBattleAnimArgs[0] / 100;
-    sprite->pos2.x = gBattleAnimArgs[1];
-    sprite->pos2.y = gBattleAnimArgs[2];
+    sprite->x = attackerX + targetX * gBattleAnimArgs[0] / 100;
+    sprite->y = attackerY + targetY * gBattleAnimArgs[0] / 100;
+    sprite->x2 = gBattleAnimArgs[1];
+    sprite->y2 = gBattleAnimArgs[2];
     sprite->subpriority = gBattleAnimArgs[3] + 30;
     StartSpriteAnim(sprite, gBattleAnimArgs[4]);
     sprite->data[2] = gBattleAnimArgs[5];
     sprite->callback = AnimRootFlickerOut;
-    sFrenzyPlantRootData.startX = sprite->pos1.x;
-    sFrenzyPlantRootData.startY = sprite->pos1.y;
+    sFrenzyPlantRootData.startX = sprite->x;
+    sFrenzyPlantRootData.startY = sprite->y;
     sFrenzyPlantRootData.targetX = targetX;
     sFrenzyPlantRootData.targetY = targetY;
 }
@@ -2971,23 +2971,23 @@ static void AnimIngrainOrb(struct Sprite* sprite)
 {
     if (!sprite->data[0])
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
         sprite->data[1] = gBattleAnimArgs[2];
         sprite->data[2] = gBattleAnimArgs[3];
         sprite->data[3] = gBattleAnimArgs[4];
     }
 
     sprite->data[0]++;
-    sprite->pos2.x = sprite->data[1] * sprite->data[0];
-    sprite->pos2.y = Sin((sprite->data[0] * 20) & 0xFF, sprite->data[2]);
+    sprite->x2 = sprite->data[1] * sprite->data[0];
+    sprite->y2 = Sin((sprite->data[0] * 20) & 0xFF, sprite->data[2]);
     if (sprite->data[0] > sprite->data[3])
         DestroyAnimSprite(sprite);
 }
 
 static void InitItemBagData(struct Sprite* sprite, s16 c)
 {
-    int a = (sprite->pos1.x << 8) | sprite->pos1.y;
+    int a = (sprite->x << 8) | sprite->y;
     int b = (sprite->data[6] << 8) | sprite->data[7];
     c <<= 8;
     sprite->data[5] = a;
@@ -3017,8 +3017,8 @@ bool8 moveAlongLinearPath(struct Sprite* sprite)
     r0 = xEndPos - xStartPos;
     var1 = r0 * currentTime / totalTime;
     vaxEndPos = yEndPos_2 * currentTime / totalTime;
-    sprite->pos1.x = var1 + xStartPos;
-    sprite->pos1.y = vaxEndPos + yStartPos;
+    sprite->x = var1 + xStartPos;
+    sprite->y = vaxEndPos + yStartPos;
     if (++currentTime == totalTime)
         return TRUE;
 
@@ -3045,10 +3045,10 @@ static void AnimItemSteal_Step1(struct Sprite* sprite)
         sprite->data[0] = 0;
     }
 
-    sprite->pos2.y = Sin(sprite->data[0] + 128, 30 - sprite->data[1] * 8);
+    sprite->y2 = Sin(sprite->data[0] + 128, 30 - sprite->data[1] * 8);
     if (moveAlongLinearPath(sprite))
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         sprite->data[0] = 0;
         sprite->callback = AnimItemSteal_Step2;
     }
@@ -3091,10 +3091,10 @@ static void AnimKnockOffOpponentsItem(struct Sprite* sprite)
         sprite->data[0] = zero;
     }
 
-    sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
+    sprite->y2 = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
     if (moveAlongLinearPath(sprite))
     {
-        sprite->pos2.y = zero;
+        sprite->y2 = zero;
         sprite->data[0] = zero;
         DestroyAnimSprite(sprite);
     }
@@ -3140,7 +3140,7 @@ static void AnimPresentHealParticle(struct Sprite* sprite)
     }
 
     sprite->data[0]++;
-    sprite->pos2.y = sprite->data[1] * sprite->data[0];
+    sprite->y2 = sprite->data[1] * sprite->data[0];
     if (sprite->animEnded)
         DestroyAnimSprite(sprite);
 }
@@ -3182,13 +3182,13 @@ static void AnimItemSteal_Step3(struct Sprite* sprite)
         sprite->data[0] = zero;
     }
 
-    sprite->pos2.y = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
-    if (sprite->pos2.y == 0)
+    sprite->y2 = Sin(sprite->data[0] + 0x80, 30 - sprite->data[1] * 8);
+    if (sprite->y2 == 0)
         PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(63));
 
     if (moveAlongLinearPath(sprite))
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         sprite->data[0] = 0;
         sprite->callback = AnimItemSteal_Step2;
         PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(-64));
@@ -3208,7 +3208,7 @@ static void AnimTrickBag(struct Sprite* sprite)
         if (!IsContest())
         {
             sprite->data[1] = gBattleAnimArgs[1];
-            sprite->pos1.x = 120;
+            sprite->x = 120;
         }
         else
         {
@@ -3219,14 +3219,14 @@ static void AnimTrickBag(struct Sprite* sprite)
                 b = a;
 
             sprite->data[1] = a - ((b >> 8) << 8);
-            sprite->pos1.x = 70;
+            sprite->x = 70;
         }
 
-        sprite->pos1.y = gBattleAnimArgs[0];
+        sprite->y = gBattleAnimArgs[0];
         sprite->data[2] = gBattleAnimArgs[0];
         sprite->data[4] = 20;
-        sprite->pos2.x = Cos(sprite->data[1], 60);
-        sprite->pos2.y = Sin(sprite->data[1], 20);
+        sprite->x2 = Cos(sprite->data[1], 60);
+        sprite->y2 = Sin(sprite->data[1], 20);
         sprite->callback = AnimTrickBag_Step1;
         if (sprite->data[1] > 0 && sprite->data[1] < 192)
             sprite->subpriority = 31;
@@ -3250,7 +3250,7 @@ static void AnimTrickBag_Step1(struct Sprite* sprite)
         {
             sprite->data[2] += sprite->data[4] / 10;
             sprite->data[4] += 3;
-            sprite->pos1.y = sprite->data[2];
+            sprite->y = sprite->data[2];
             break;
         }
         break;
@@ -3290,8 +3290,8 @@ static void AnimTrickBag_Step2(struct Sprite* sprite)
                 sprite->subpriority = 29;
         }
 
-        sprite->pos2.x = Cos(sprite->data[1], 60);
-        sprite->pos2.y = Sin(sprite->data[1], 20);
+        sprite->x2 = Cos(sprite->data[1], 60);
+        sprite->y2 = Sin(sprite->data[1], 20);
     }
 }
 
@@ -3362,14 +3362,14 @@ static void AnimTask_LeafBlade_Step(u8 taskId)
         }
         break;
     case 1:
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[0] = 10;
-        sprite->data[1] = sprite->pos1.x;
+        sprite->data[1] = sprite->x;
         sprite->data[2] = task->data[6];
-        sprite->data[3] = sprite->pos1.y;
+        sprite->data[3] = sprite->y;
         sprite->data[4] = task->data[7];
         sprite->data[5] = LeafBladeGetPosFactor(sprite);
         task->data[4] += 2;
@@ -3388,14 +3388,14 @@ static void AnimTask_LeafBlade_Step(u8 taskId)
         }
         break;
     case 3:
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[0] = 10;
-        sprite->data[1] = sprite->pos1.x;
+        sprite->data[1] = sprite->x;
         sprite->data[2] = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5];
-        sprite->data[3] = sprite->pos1.y;
+        sprite->data[3] = sprite->y;
         sprite->data[4] = task->data[7] - ((task->data[11] / 2) + 10) * task->data[5];
         sprite->data[5] = LeafBladeGetPosFactor(sprite);
         task->data[3] = 2;
@@ -3405,14 +3405,14 @@ static void AnimTask_LeafBlade_Step(u8 taskId)
         task->data[0]++;
         break;
     case 5:
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[0] = 10;
-        sprite->data[1] = sprite->pos1.x;
+        sprite->data[1] = sprite->x;
         sprite->data[2] = task->data[6] + ((task->data[10] / 2) + 10) * task->data[5];
-        sprite->data[3] = sprite->pos1.y;
+        sprite->data[3] = sprite->y;
         sprite->data[4] = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5];
         sprite->data[5] = LeafBladeGetPosFactor(sprite);
         task->data[4] -= 2;
@@ -3431,14 +3431,14 @@ static void AnimTask_LeafBlade_Step(u8 taskId)
         }
         break;
     case 7:
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[0] = 10;
-        sprite->data[1] = sprite->pos1.x;
+        sprite->data[1] = sprite->x;
         sprite->data[2] = task->data[6];
-        sprite->data[3] = sprite->pos1.y;
+        sprite->data[3] = sprite->y;
         sprite->data[4] = task->data[7];
         sprite->data[5] = LeafBladeGetPosFactor(sprite);
         task->data[4] += 2;
@@ -3449,14 +3449,14 @@ static void AnimTask_LeafBlade_Step(u8 taskId)
         task->data[0]++;
         break;
     case 9:
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[0] = 10;
-        sprite->data[1] = sprite->pos1.x;
+        sprite->data[1] = sprite->x;
         sprite->data[2] = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5];
-        sprite->data[3] = sprite->pos1.y;
+        sprite->data[3] = sprite->y;
         sprite->data[4] = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5];
         sprite->data[5] = LeafBladeGetPosFactor(sprite);
         task->data[3] = 5;
@@ -3475,14 +3475,14 @@ static void AnimTask_LeafBlade_Step(u8 taskId)
         break;
     case 11:
     {
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[0] = 10;
-        sprite->data[1] = sprite->pos1.x;
+        sprite->data[1] = sprite->x;
         sprite->data[2] = task->data[8];
-        sprite->data[3] = sprite->pos1.y;
+        sprite->data[3] = sprite->y;
         sprite->data[4] = task->data[9];
         sprite->data[5] = LeafBladeGetPosFactor(sprite);
         task->data[4] -= 2;
@@ -3518,7 +3518,7 @@ static void AnimTask_LeafBlade_Step(u8 taskId)
 static s16 LeafBladeGetPosFactor(struct Sprite* sprite)
 {
     s16 var = 8;
-    if (sprite->data[4] < sprite->pos1.y)
+    if (sprite->data[4] < sprite->y)
         var = -var;
 
     return var;
@@ -3533,8 +3533,8 @@ static void AnimTask_LeafBlade_Step2(struct Task* task, u8 taskId)
         s16 spriteX;
         s16 spriteY;
         task->data[14] = 0;
-        spriteX = gSprites[task->data[2]].pos1.x + gSprites[task->data[2]].pos2.x;
-        spriteY = gSprites[task->data[2]].pos1.y + gSprites[task->data[2]].pos2.y;
+        spriteX = gSprites[task->data[2]].x + gSprites[task->data[2]].x2;
+        spriteY = gSprites[task->data[2]].y + gSprites[task->data[2]].y2;
         spriteId = CreateSprite(&gLeafBladeSpriteTemplate, spriteX, spriteY, task->data[4]);
         if (spriteId != MAX_SPRITES)
         {
@@ -3578,13 +3578,13 @@ static void AnimFlyingParticle(struct Sprite* sprite)
     {
         sprite->data[4] = 0;
         sprite->data[2] = gBattleAnimArgs[3];
-        sprite->pos1.x = 0xFFF0;
+        sprite->x = 0xFFF0;
     }
     else
     {
         sprite->data[4] = 1;
         sprite->data[2] = -gBattleAnimArgs[3];
-        sprite->pos1.x = 0x100;
+        sprite->x = 0x100;
     }
 
     sprite->data[1] = gBattleAnimArgs[1];
@@ -3593,19 +3593,19 @@ static void AnimFlyingParticle(struct Sprite* sprite)
     switch (gBattleAnimArgs[5])
     {
     case 0:
-        sprite->pos1.y = gBattleAnimArgs[0];
+        sprite->y = gBattleAnimArgs[0];
         sprite->oam.priority = GetBattlerSpriteBGPriority(battler);
         break;
     case 1:
-        sprite->pos1.y = gBattleAnimArgs[0];
+        sprite->y = gBattleAnimArgs[0];
         sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1;
         break;
     case 2:
-        sprite->pos1.y = GetBattlerSpriteCoord(battler, 3) + gBattleAnimArgs[0];
+        sprite->y = GetBattlerSpriteCoord(battler, 3) + gBattleAnimArgs[0];
         sprite->oam.priority = GetBattlerSpriteBGPriority(battler);
         break;
     case 3:
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[0];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[0];
         GetAnimBattlerSpriteId(ANIM_TARGET);
         sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1;
         break;
@@ -3618,17 +3618,17 @@ static void AnimFlyingParticle_Step(struct Sprite* sprite)
 {
     int a = sprite->data[7];
     sprite->data[7]++;
-    sprite->pos2.y = (sprite->data[1] * gSineTable[sprite->data[0]]) >> 8;
-    sprite->pos2.x = sprite->data[2] * a;
+    sprite->y2 = (sprite->data[1] * gSineTable[sprite->data[0]]) >> 8;
+    sprite->x2 = sprite->data[2] * a;
     sprite->data[0] = (sprite->data[3] * a) & 0xFF;
     if (!sprite->data[4])
     {
-        if (sprite->pos2.x + sprite->pos1.x <= 0xF7)
+        if (sprite->x2 + sprite->x <= 0xF7)
             return;
     }
     else
     {
-        if (sprite->pos2.x + sprite->pos1.x > -16)
+        if (sprite->x2 + sprite->x > -16)
             return;
     }
 
@@ -3693,25 +3693,25 @@ static void AnimNeedleArmSpike(struct Sprite* sprite)
         sprite->data[0] = gBattleAnimArgs[4];
         if (gBattleAnimArgs[1] == 0)
         {
-            sprite->pos1.x = gBattleAnimArgs[2] + a;
-            sprite->pos1.y = gBattleAnimArgs[3] + b;
+            sprite->x = gBattleAnimArgs[2] + a;
+            sprite->y = gBattleAnimArgs[3] + b;
             sprite->data[5] = a;
             sprite->data[6] = b;
         }
         else
         {
-            sprite->pos1.x = a;
-            sprite->pos1.y = b;
+            sprite->x = a;
+            sprite->y = b;
             sprite->data[5] = gBattleAnimArgs[2] + a;
             sprite->data[6] = gBattleAnimArgs[3] + b;
         }
 
-        x = sprite->pos1.x;
+        x = sprite->x;
         sprite->data[1] = x * 16;
-        y = sprite->pos1.y;
+        y = sprite->y;
         sprite->data[2] = y * 16;
-        sprite->data[3] = (sprite->data[5] - sprite->pos1.x) * 16 / gBattleAnimArgs[4];
-        sprite->data[4] = (sprite->data[6] - sprite->pos1.y) * 16 / gBattleAnimArgs[4];
+        sprite->data[3] = (sprite->data[5] - sprite->x) * 16 / gBattleAnimArgs[4];
+        sprite->data[4] = (sprite->data[6] - sprite->y) * 16 / gBattleAnimArgs[4];
         c = ArcTan2Neg(sprite->data[5] - x, sprite->data[6] - y);
         if (IsContest())
             c -= 0x8000;
@@ -3727,8 +3727,8 @@ static void AnimNeedleArmSpike_Step(struct Sprite* sprite)
     {
         sprite->data[1] += sprite->data[3];
         sprite->data[2] += sprite->data[4];
-        sprite->pos1.x = sprite->data[1] >> 4 ;
-        sprite->pos1.y = sprite->data[2] >> 4 ;
+        sprite->x = sprite->data[1] >> 4 ;
+        sprite->y = sprite->data[2] >> 4 ;
         sprite->data[0]--;
     }
     else
@@ -3747,13 +3747,13 @@ static void AnimSlidingHit(struct Sprite* sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x -= gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
     }
     else
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
     }
 
     sprite->callback = RunStoredCallbackWhenAnimEnds;
@@ -3767,13 +3767,13 @@ static void AnimWhipHit(struct Sprite* sprite)
 
     sprite->callback = AnimWhipHit_WaitEnd;
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
 }
 
 static void AnimFlickeringPunch(struct Sprite* sprite)
 {
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[3] = gBattleAnimArgs[4];
@@ -3790,23 +3790,23 @@ static void AnimFlickeringPunch(struct Sprite* sprite)
 // arg 2: slice direction; 0 = right-to-left, 1 = left-to-right
 static void AnimCuttingSlice(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
     if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
-        sprite->pos1.y += 8;
+        sprite->y += 8;
 
     sprite->callback = AnimSlice_Step;
     if (gBattleAnimArgs[2] == 0)
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
     }
     else
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
         sprite->hFlip = 1;
     }
 
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[1] -= 0x400;
     sprite->data[2] += 0x400;
     sprite->data[5] = gBattleAnimArgs[2];
@@ -3840,23 +3840,23 @@ static void AnimAirCutterSlice(struct Sprite* sprite)
         break;
     }
 
-    sprite->pos1.x = a;
-    sprite->pos1.y = b;
+    sprite->x = a;
+    sprite->y = b;
     if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
-        sprite->pos1.y += 8;
+        sprite->y += 8;
 
     sprite->callback = AnimSlice_Step;
     if (gBattleAnimArgs[2] == 0)
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
     }
     else
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
         sprite->hFlip = 1;
     }
 
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[1] -= 0x400;
     sprite->data[2] += 0x400;
     sprite->data[5] = gBattleAnimArgs[2];
@@ -3874,8 +3874,8 @@ static void AnimSlice_Step(struct Sprite* sprite)
         sprite->data[1] -= 0x18;
 
     sprite->data[2] -= 0x18;
-    sprite->pos2.x = sprite->data[3] >> 8;
-    sprite->pos2.y = sprite->data[4] >> 8;
+    sprite->x2 = sprite->data[3] >> 8;
+    sprite->y2 = sprite->data[4] >> 8;
     sprite->data[0]++;
     if (sprite->data[0] == 20)
     {
@@ -3922,13 +3922,13 @@ static void AnimCirclingMusicNote(struct Sprite* sprite)
 {
     sprite->data[0] = gBattleAnimArgs[2];
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
     else
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
 
     StartSpriteAnim(sprite, gBattleAnimArgs[5]);
     sprite->data[1] = -gBattleAnimArgs[3];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[3] = gBattleAnimArgs[4];
     sprite->callback = AnimCirclingMusicNote_Step;
     sprite->callback(sprite);
@@ -3936,8 +3936,8 @@ static void AnimCirclingMusicNote(struct Sprite* sprite)
 
 static void AnimCirclingMusicNote_Step(struct Sprite* sprite)
 {
-    sprite->pos2.x = Cos(sprite->data[0], 100);
-    sprite->pos2.y = Sin(sprite->data[0], 20);
+    sprite->x2 = Cos(sprite->data[0], 100);
+    sprite->y2 = Sin(sprite->data[0], 20);
     if (sprite->data[0] < 128)
         sprite->subpriority = 0;
     else
@@ -3945,7 +3945,7 @@ static void AnimCirclingMusicNote_Step(struct Sprite* sprite)
 
     sprite->data[0] = (sprite->data[0] + sprite->data[1]) & 0xFF;
     sprite->data[5] += 130;
-    sprite->pos2.y += sprite->data[5] >> 8;
+    sprite->y2 += sprite->data[5] >> 8;
     sprite->data[2]++;
     if (sprite->data[2] == sprite->data[3])
         DestroyAnimSprite(sprite);
@@ -3956,8 +3956,8 @@ static void AnimProtect(struct Sprite* sprite)
     if (IsContest())
         gBattleAnimArgs[1] += 8;
 
-    sprite->pos1.x = GetBattlerSpriteCoord2(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBattlerSpriteCoord2(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
+    sprite->x = GetBattlerSpriteCoord2(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
+    sprite->y = GetBattlerSpriteCoord2(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER || IsContest())
         sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker) + 1;
     else
@@ -3975,7 +3975,7 @@ static void AnimProtect_Step(struct Sprite *sprite)
 {
     int i, id, savedPal;
     sprite->data[5] += 96;
-    sprite->pos2.x = -(sprite->data[5] >> 8);
+    sprite->x2 = -(sprite->data[5] >> 8);
     if (++sprite->data[1] > 1)
     {
         sprite->data[1] = 0;
@@ -4016,8 +4016,8 @@ static void AnimProtect_Step(struct Sprite *sprite)
 
 static void AnimMilkBottle(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 0xFFE8;
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + 0xFFE8;
     sprite->data[0] = 0;
     sprite->data[1] = 0;
     sprite->data[2] = 0;
@@ -4067,7 +4067,7 @@ static void AnimMilkBottle_Step1(struct Sprite* sprite)
         if (++sprite->data[1] > 2)
         {
             sprite->data[1] = 0;
-            sprite->pos1.y++;
+            sprite->y++;
         }
 
         if (++sprite->data[2] <= 29)
@@ -4114,10 +4114,10 @@ static void AnimMilkBottle_Step2(struct Sprite* sprite, int unk1, int unk2)
     if ((sprite->data[3]) > 0x2F)
         sprite->data[4] += 2;
 
-    sprite->pos2.x = sprite->data[4] / 9;
-    sprite->pos2.y = sprite->data[4] / 14;
-    if (sprite->pos2.y < 0)
-        sprite->pos2.y *= -1;
+    sprite->x2 = sprite->data[4] / 9;
+    sprite->y2 = sprite->data[4] / 14;
+    if (sprite->y2 < 0)
+        sprite->y2 *= -1;
 
     sprite->data[3]++;
     if (sprite->data[3] > 0x3B)
@@ -4130,7 +4130,7 @@ static void AnimGrantingStars(struct Sprite* sprite)
         SetSpriteCoordsToAnimAttackerCoords(sprite);
 
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[5];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = gBattleAnimArgs[4];
@@ -4148,21 +4148,21 @@ static void AnimSparkingStars(struct Sprite* sprite)
 
     if (IsDoubleBattle() && IsBattlerSpriteVisible(BATTLE_PARTNER(battler)))
     {
-        SetAverageBattlerPositions(battler, gBattleAnimArgs[6], &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(battler, gBattleAnimArgs[6], &sprite->x, &sprite->y);
         SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->y += gBattleAnimArgs[1];
     }
     else
     {
         if (!gBattleAnimArgs[6])
         {
-            sprite->pos1.x = GetBattlerSpriteCoord(battler, 0);
-            sprite->pos1.y = GetBattlerSpriteCoord(battler, 1) + gBattleAnimArgs[1];
+            sprite->x = GetBattlerSpriteCoord(battler, 0);
+            sprite->y = GetBattlerSpriteCoord(battler, 1) + gBattleAnimArgs[1];
         }
         else
         {
-            sprite->pos1.x = GetBattlerSpriteCoord(battler, 2);
-            sprite->pos1.y = GetBattlerSpriteCoord(battler, 3) + gBattleAnimArgs[1];
+            sprite->x = GetBattlerSpriteCoord(battler, 2);
+            sprite->y = GetBattlerSpriteCoord(battler, 3) + gBattleAnimArgs[1];
         }
 
         SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
@@ -4180,13 +4180,13 @@ static void AnimBubbleBurst(struct Sprite* sprite)
     SetSpriteCoordsToAnimAttackerCoords(sprite);
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
     }
     else
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x -= gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         StartSpriteAnim(sprite, 1);
     }
 
@@ -4197,8 +4197,8 @@ static void AnimBubbleBurst_Step(struct Sprite* sprite)
 {
     if (++sprite->data[0] > 30)
     {
-        sprite->pos2.y = (30 - sprite->data[0]) / 3;
-        sprite->pos2.x = Sin(sprite->data[1] * 4, 3);
+        sprite->y2 = (30 - sprite->data[0]) / 3;
+        sprite->x2 = Sin(sprite->data[1] * 4, 3);
         sprite->data[1]++;
     }
 
@@ -4211,14 +4211,14 @@ static void AnimSleepLetterZ(struct Sprite* sprite)
     SetSpriteCoordsToAnimAttackerCoords(sprite);
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         sprite->data[3] = 1;
     }
     else
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x -= gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         sprite->data[3] = 0xFFFF;
         StartSpriteAffineAnim(sprite, 1);
     }
@@ -4228,8 +4228,8 @@ static void AnimSleepLetterZ(struct Sprite* sprite)
 
 static void AnimSleepLetterZ_Step(struct Sprite* sprite)
 {
-    sprite->pos2.y = -(sprite->data[0] / 0x28);
-    sprite->pos2.x = sprite->data[4] / 10;
+    sprite->y2 = -(sprite->data[0] / 0x28);
+    sprite->x2 = sprite->data[4] / 10;
     sprite->data[4] += sprite->data[3] * 2;
     sprite->data[0] += sprite->data[1];
     if (++sprite->data[1] > 60)
@@ -4238,8 +4238,8 @@ static void AnimSleepLetterZ_Step(struct Sprite* sprite)
 
 static void AnimLockOnTarget(struct Sprite* sprite)
 {
-    sprite->pos1.x -= 32;
-    sprite->pos1.y -= 32;
+    sprite->x -= 32;
+    sprite->y -= 32;
     sprite->data[0] = 20;
     sprite->callback = WaitAnimForDuration;
     StoreSpriteCallbackInData6(sprite, AnimLockOnTarget_Step1);
@@ -4255,13 +4255,13 @@ static void AnimLockOnTarget_Step1(struct Sprite* sprite)
         StoreSpriteCallbackInData6(sprite, AnimLockOnTarget_Step1);
         break;
     case 1:
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->y2 = 0;
+        sprite->x2 = 0;
         sprite->data[0] = 8;
-        sprite->data[2] = sprite->pos1.x + gInclineMonCoordTable[sprite->data[5] >> 8][0];
-        sprite->data[4] = sprite->pos1.y + gInclineMonCoordTable[sprite->data[5] >> 8][1];
+        sprite->data[2] = sprite->x + gInclineMonCoordTable[sprite->data[5] >> 8][0];
+        sprite->data[4] = sprite->y + gInclineMonCoordTable[sprite->data[5] >> 8][1];
         sprite->callback = StartAnimLinearTranslation;
         StoreSpriteCallbackInData6(sprite, AnimLockOnTarget_Step2);
         sprite->data[5] += 0x100;
@@ -4320,10 +4320,10 @@ static void AnimLockOnTarget_Step3(struct Sprite* sprite)
             break;
         }
 
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->y2 = 0;
+        sprite->x2 = 0;
         sprite->data[0] = 6;
         sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + a;
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + b;
@@ -4387,25 +4387,25 @@ static void AnimLockOnMoveTarget(struct Sprite* sprite)
     sprite->oam.affineParam = gBattleAnimArgs[0];
     if ((s16)sprite->oam.affineParam == 1)
     {
-        sprite->pos1.x -= 0x18;
-        sprite->pos1.y -= 0x18;
+        sprite->x -= 0x18;
+        sprite->y -= 0x18;
     }
     else if ((s16)sprite->oam.affineParam == 2)
     {
-        sprite->pos1.x -= 0x18;
-        sprite->pos1.y += 0x18;
+        sprite->x -= 0x18;
+        sprite->y += 0x18;
         sprite->oam.matrixNum = ST_OAM_VFLIP;
     }
     else if ((s16)sprite->oam.affineParam == 3)
     {
-        sprite->pos1.x += 0x18;
-        sprite->pos1.y -= 0x18;
+        sprite->x += 0x18;
+        sprite->y -= 0x18;
         sprite->oam.matrixNum = ST_OAM_HFLIP;
     }
     else
     {
-        sprite->pos1.x += 0x18;
-        sprite->pos1.y += 0x18;
+        sprite->x += 0x18;
+        sprite->y += 0x18;
         sprite->oam.matrixNum = ST_OAM_HFLIP | ST_OAM_VFLIP;
     }
 
@@ -4607,7 +4607,7 @@ static void AnimTask_SkullBashPositionSet(u8 taskId)
         if (task->data[3])
         {
             task->data[4] += task->data[5];
-            gSprites[task->data[0]].pos2.x = task->data[4];
+            gSprites[task->data[0]].x2 = task->data[4];
             task->data[3]--;
         }
         else
@@ -4630,7 +4630,7 @@ static void AnimTask_SkullBashPositionSet(u8 taskId)
         else
         {
             task->data[3] = 8;
-            task->data[4] = gSprites[task->data[0]].pos2.x;
+            task->data[4] = gSprites[task->data[0]].x2;
             task->data[5] = (task->data[1] == 0) ? 0x2 : -0x2;
             task->data[6] = 1;
             task->data[2]++;
@@ -4646,9 +4646,9 @@ static void AnimTask_SkullBashPositionSet(u8 taskId)
             else
             {
                 if (task->data[3] & 1)
-                    gSprites[task->data[0]].pos2.x = task->data[4] + task->data[5];
+                    gSprites[task->data[0]].x2 = task->data[4] + task->data[5];
                 else
-                    gSprites[task->data[0]].pos2.x = task->data[4] - task->data[5];
+                    gSprites[task->data[0]].x2 = task->data[4] - task->data[5];
 
                 task->data[6] = 1;
                 task->data[3]--;
@@ -4656,7 +4656,7 @@ static void AnimTask_SkullBashPositionSet(u8 taskId)
         }
         else
         {
-            gSprites[task->data[0]].pos2.x = task->data[4];
+            gSprites[task->data[0]].x2 = task->data[4];
             task->data[3] = 12;
             task->data[2]++;
         }
@@ -4669,7 +4669,7 @@ static void AnimTask_SkullBashPositionSet(u8 taskId)
         else
         {
             task->data[3] = 3;
-            task->data[4] = gSprites[task->data[0]].pos2.x;
+            task->data[4] = gSprites[task->data[0]].x2;
             task->data[5] = (task->data[1] == 0) ? 8 : -8;
             task->data[2]++;
         }
@@ -4678,7 +4678,7 @@ static void AnimTask_SkullBashPositionSet(u8 taskId)
         if (task->data[3])
         {
             task->data[4] += task->data[5];
-            gSprites[task->data[0]].pos2.x = task->data[4];
+            gSprites[task->data[0]].x2 = task->data[4];
             task->data[3]--;
         }
         else
@@ -4710,13 +4710,13 @@ static void AnimSlashSlice(struct Sprite* sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[1];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[2];
     }
 
     sprite->data[0] = 0;
@@ -4727,16 +4727,16 @@ static void AnimSlashSlice(struct Sprite* sprite)
 
 static void AnimFalseSwipeSlice(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0;
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0;
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     StoreSpriteCallbackInData6(sprite, AnimFalseSwipeSlice_Step1);
     sprite->callback = RunStoredCallbackWhenAnimEnds;
 }
 
 static void AnimFalseSwipePositionedSlice(struct Sprite* sprite)
 {
-    sprite->pos1.x = sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+    sprite->x = sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + 0xFFD0 + gBattleAnimArgs[0];
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     StartSpriteAnim(sprite, 1);
     sprite->data[0] = 0;
     sprite->data[1] = 0;
@@ -4777,13 +4777,13 @@ static void AnimEndureEnergy(struct Sprite* sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[2];
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[2];
     }
 
     sprite->data[0] = 0;
@@ -4796,18 +4796,18 @@ static void AnimEndureEnergy_Step(struct Sprite* sprite)
     if (++sprite->data[0] > sprite->data[1])
     {
         sprite->data[0] = 0;
-        sprite->pos1.y--;
+        sprite->y--;
     }
 
-    sprite->pos1.y -= sprite->data[0];
+    sprite->y -= sprite->data[0];
     if (sprite->animEnded)
         DestroyAnimSprite(sprite);
 }
 
 static void AnimSharpenSphere(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) - 12;
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) - 12;
     sprite->data[0] = 0;
     sprite->data[1] = 2;
     sprite->data[2] = 0;
@@ -4845,10 +4845,10 @@ static void AnimConversion(struct Sprite* sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[0];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[1];
         if (IsContest())
-            sprite->pos1.y += 10;
+            sprite->y += 10;
 
         sprite->data[0]++;
     }
@@ -4948,13 +4948,13 @@ static void AnimMoon(struct Sprite* sprite)
 {
     if (IsContest())
     {
-        sprite->pos1.x = 48;
-        sprite->pos1.y = 40;
+        sprite->x = 48;
+        sprite->y = 40;
     }
     else
     {
-        sprite->pos1.x = gBattleAnimArgs[0];
-        sprite->pos1.y = gBattleAnimArgs[1];
+        sprite->x = gBattleAnimArgs[0];
+        sprite->y = gBattleAnimArgs[1];
     }
 
     sprite->oam.shape = SPRITE_SHAPE(64x64);
@@ -4971,8 +4971,8 @@ static void AnimMoon_Step(struct Sprite* sprite)
 
 static void AnimMoonlightSparkle(struct Sprite* sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
-    sprite->pos1.y = gBattleAnimArgs[1];
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
+    sprite->y = gBattleAnimArgs[1];
     sprite->data[0] = 0;
     sprite->data[1] = 0;
     sprite->data[2] = 0;
@@ -4988,7 +4988,7 @@ static void AnimMoonlightSparkle_Step(struct Sprite* sprite)
         sprite->data[1] = 0;
         if (sprite->data[2] < 120)
         {
-            sprite->pos1.y++;
+            sprite->y++;
             sprite->data[2]++;
         }
     }
@@ -5112,36 +5112,36 @@ static void AnimHornHit(struct Sprite* sprite)
 
     sprite->data[0] = 0;
     sprite->data[1] = gBattleAnimArgs[2];
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[1];
-    sprite->data[6] = sprite->pos1.x;
-    sprite->data[7] = sprite->pos1.y;
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[0];
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[1];
+    sprite->data[6] = sprite->x;
+    sprite->data[7] = sprite->y;
     if (IsContest())
     {
         sprite->oam.matrixNum = ST_OAM_HFLIP;
-        sprite->pos1.x += 40;
-        sprite->pos1.y += 20;
-        sprite->data[2] = sprite->pos1.x << 7;
+        sprite->x += 40;
+        sprite->y += 20;
+        sprite->data[2] = sprite->x << 7;
         sprite->data[3] = -0x1400 / sprite->data[1];
-        sprite->data[4] = sprite->pos1.y << 7;
+        sprite->data[4] = sprite->y << 7;
         sprite->data[5] = -0xA00 / sprite->data[1];
     }
     else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
-        sprite->pos1.x -= 40;
-        sprite->pos1.y += 20;
-        sprite->data[2] = sprite->pos1.x << 7;
+        sprite->x -= 40;
+        sprite->y += 20;
+        sprite->data[2] = sprite->x << 7;
         sprite->data[3] = 0x1400 / sprite->data[1];
-        sprite->data[4] = sprite->pos1.y << 7;
+        sprite->data[4] = sprite->y << 7;
         sprite->data[5] = -0xA00 / sprite->data[1];
     }
     else
     {
-        sprite->pos1.x += 40;
-        sprite->pos1.y -= 20;
-        sprite->data[2] = sprite->pos1.x << 7;
+        sprite->x += 40;
+        sprite->y -= 20;
+        sprite->data[2] = sprite->x << 7;
         sprite->data[3] = -0x1400 / sprite->data[1];
-        sprite->data[4] = sprite->pos1.y << 7;
+        sprite->data[4] = sprite->y << 7;
         sprite->data[5] = 0xA00 / sprite->data[1];
         sprite->oam.matrixNum = (ST_OAM_HFLIP | ST_OAM_VFLIP);
     }
@@ -5153,12 +5153,12 @@ static void AnimHornHit_Step(struct Sprite* sprite)
 {
     sprite->data[2] += sprite->data[3];
     sprite->data[4] += sprite->data[5];
-    sprite->pos1.x = sprite->data[2] >> 7;
-    sprite->pos1.y = sprite->data[4] >> 7;
+    sprite->x = sprite->data[2] >> 7;
+    sprite->y = sprite->data[4] >> 7;
     if (--sprite->data[1] == 1)
     {
-        sprite->pos1.x = sprite->data[6];
-        sprite->pos1.y = sprite->data[7];
+        sprite->x = sprite->data[6];
+        sprite->y = sprite->data[7];
     }
 
     if (sprite->data[1] == 0)
@@ -5233,7 +5233,7 @@ static void AnimDoubleTeam(struct Sprite* sprite)
         sprite->data[4] = gSineTable[sprite->data[0]] / 6;
         sprite->data[5] = gSineTable[sprite->data[0]] / 13;
         sprite->data[1] = (sprite->data[1] + sprite->data[5]) & 0xFF;
-        sprite->pos2.x = Sin(sprite->data[1], sprite->data[4]);
+        sprite->x2 = Sin(sprite->data[1], sprite->data[4]);
     }
 }
 
@@ -5304,9 +5304,9 @@ static void AnimWavyMusicNotes(struct Sprite* sprite)
         b = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     }
 
-    sprite->data[4] = sprite->pos1.x << 4;
-    sprite->data[5] = sprite->pos1.y << 4;
-    AnimWavyMusicNotesGetNextPos(a - sprite->pos1.x, b - sprite->pos1.y, &sprite->data[6], &sprite->data[7], 40);
+    sprite->data[4] = sprite->x << 4;
+    sprite->data[5] = sprite->y << 4;
+    AnimWavyMusicNotesGetNextPos(a - sprite->x, b - sprite->y, &sprite->data[6], &sprite->data[7], 40);
     sprite->callback = AnimWavyMusicNotes_Step;
 }
 
@@ -5335,12 +5335,12 @@ static void AnimWavyMusicNotes_Step(struct Sprite* sprite)
     yDelta = sprite->data[0] * 5 - ((sprite->data[0] * 5 / 256) << 8);
     sprite->data[4] += sprite->data[6];
     sprite->data[5] += sprite->data[7];
-    sprite->pos1.x = sprite->data[4] >> 4;
-    sprite->pos1.y = sprite->data[5] >> 4;
-    sprite->pos2.y = Sin(yDelta, 15);
+    sprite->x = sprite->data[4] >> 4;
+    sprite->y = sprite->data[5] >> 4;
+    sprite->y2 = Sin(yDelta, 15);
 
-    y = sprite->pos1.y;
-    if (sprite->pos1.x < -16 || sprite->pos1.x > 256 || y < -16 || y > 128)
+    y = sprite->y;
+    if (sprite->x < -16 || sprite->x > 256 || y < -16 || y > 128)
     {
         DestroySpriteAndMatrix(sprite);
     }
@@ -5364,13 +5364,13 @@ static void AnimFlyingMusicNotes(struct Sprite* sprite)
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
         gBattleAnimArgs[1] *= -1;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
     StartSpriteAnim(sprite, gBattleAnimArgs[0]);
     sprite->data[2] = 0;
     sprite->data[3] = 0;
-    sprite->data[4] = sprite->pos1.x << 4;
-    sprite->data[5] = sprite->pos1.y << 4;
+    sprite->data[4] = sprite->x << 4;
+    sprite->data[5] = sprite->y << 4;
     sprite->data[6] = (gBattleAnimArgs[1] << 4) / 5;
     sprite->data[7] = (gBattleAnimArgs[2] << 7) / 5;
     sprite->callback = AnimFlyingMusicNotes_Step;
@@ -5380,13 +5380,13 @@ static void AnimFlyingMusicNotes_Step(struct Sprite* sprite)
 {
     sprite->data[4] += sprite->data[6];
     sprite->data[5] += sprite->data[7];
-    sprite->pos1.x = sprite->data[4] >> 4;
-    sprite->pos1.y = sprite->data[5] >> 4;
+    sprite->x = sprite->data[4] >> 4;
+    sprite->y = sprite->data[5] >> 4;
     if (sprite->data[0] > 5 && sprite->data[3] == 0)
     {
         sprite->data[2] = (sprite->data[2] + 16) & 0xFF;
-        sprite->pos2.x = Cos(sprite->data[2], 18);
-        sprite->pos2.y = Sin(sprite->data[2], 18);
+        sprite->x2 = Cos(sprite->data[2], 18);
+        sprite->y2 = Sin(sprite->data[2], 18);
         if (sprite->data[2] == 0)
             sprite->data[3] = 1;
     }
@@ -5408,8 +5408,8 @@ static void AnimBellyDrumHand(struct Sprite* sprite)
         a = -16;
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + a;
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 8;
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + a;
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + 8;
     sprite->data[0] = 8;
     sprite->callback = WaitAnimForDuration;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
@@ -5420,7 +5420,7 @@ void AnimSlowFlyingMusicNotes(struct Sprite* sprite)
     s16 xDiff;
     u8 index;
     SetSpriteCoordsToAnimAttackerCoords(sprite);
-    sprite->pos1.y += 8;
+    sprite->y += 8;
     StartSpriteAnim(sprite, gBattleAnimArgs[1]);
     index = IndexOfSpritePaletteTag(gParticlesColorBlendTable[gBattleAnimArgs[2]][0]);
     if (index != 0xFF)
@@ -5428,9 +5428,9 @@ void AnimSlowFlyingMusicNotes(struct Sprite* sprite)
 
     xDiff = (gBattleAnimArgs[0] == 0) ? -32 : 32;
     sprite->data[0] = 40;
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = xDiff + sprite->data[1];
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = sprite->data[3] - 40;
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = gBattleAnimArgs[3];
@@ -5443,11 +5443,11 @@ static void AnimSlowFlyingMusicNotes_Step(struct Sprite* sprite)
     {
         s16 xDiff;
         xDiff = Sin(sprite->data[5], 8);
-        if (sprite->pos2.x < 0)
+        if (sprite->x2 < 0)
             xDiff = -xDiff;
 
-        sprite->pos2.x += xDiff;
-        sprite->pos2.y += Sin(sprite->data[5], 4);
+        sprite->x2 += xDiff;
+        sprite->y2 += Sin(sprite->data[5], 4);
         sprite->data[5] = (sprite->data[5] + 8) & 0xFF;
     }
     else
@@ -5459,11 +5459,11 @@ static void AnimSlowFlyingMusicNotes_Step(struct Sprite* sprite)
 void SetSpriteNextToMonHead(u8 battler, struct Sprite* sprite)
 {
     if (GetBattlerSide(battler) == B_SIDE_PLAYER)
-        sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) + 8;
+        sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) + 8;
     else
-        sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_LEFT) - 8;
+        sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_LEFT) - 8;
 
-    sprite->pos1.y = GetBattlerSpriteCoord(battler, 3) - (s16)GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_HEIGHT) / 4;
+    sprite->y = GetBattlerSpriteCoord(battler, 3) - (s16)GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_HEIGHT) / 4;
 }
 
 static void AnimThoughtBubble(struct Sprite* sprite)
@@ -5526,10 +5526,10 @@ static void AnimFollowMeFinger(struct Sprite* sprite)
     else
         battler = gBattleAnimTarget;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(battler, 0);
-    sprite->pos1.y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_TOP);
-    if (sprite->pos1.y <= 9)
-        sprite->pos1.y = 10;
+    sprite->x = GetBattlerSpriteCoord(battler, 0);
+    sprite->y = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_TOP);
+    if (sprite->y <= 9)
+        sprite->y = 10;
 
     sprite->data[0] = 1;
     sprite->data[1] = 0;
@@ -5555,7 +5555,7 @@ static void AnimFollowMeFinger_Step2(struct Sprite* sprite)
     {
         if (--sprite->data[0] == 0)
         {
-            sprite->pos2.x = 0;
+            sprite->x2 = 0;
             sprite->callback = AnimMetronomeFinger_Step;
             return;
         }
@@ -5573,7 +5573,7 @@ static void AnimFollowMeFinger_Step2(struct Sprite* sprite)
 
     x1 = gSineTable[sprite->data[1]];
     x2 = x1 >> 3;
-    sprite->pos2.x = (x1 >> 3) + (x2 >> 1);
+    sprite->x2 = (x1 >> 3) + (x2 >> 1);
 }
 
 static void AnimTauntFinger(struct Sprite* sprite)
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c
index 0ac5d384b..2f4343e73 100755
--- a/src/battle_anim_effects_2.c
+++ b/src/battle_anim_effects_2.c
@@ -1266,7 +1266,7 @@ static void AnimCirclingFinger(struct Sprite *sprite)
 {
     SetSpriteCoordsToAnimAttackerCoords(sprite);
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[1] = gBattleAnimArgs[2];
     sprite->data[2] = gBattleAnimArgs[4];
     sprite->data[3] = gBattleAnimArgs[5];
@@ -1295,12 +1295,12 @@ static void AnimBouncingMusicNote_Step(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos2.y -= 3;
+        sprite->y2 -= 3;
         if (++sprite->data[1] == 6)
             sprite->data[0]++;
         break;
     case 1:
-        sprite->pos2.y += 3;
+        sprite->y2 += 3;
         if (--sprite->data[1] == 0)
             sprite->data[0]++;
         break;
@@ -1314,12 +1314,12 @@ static void AnimBouncingMusicNote_Step(struct Sprite *sprite)
 static void AnimVibrateBattlerBack_Step(struct Sprite *sprite)
 {
     s16 temp;
-    gSprites[sprite->data[2]].pos2.x += sprite->data[1];
+    gSprites[sprite->data[2]].x2 += sprite->data[1];
     temp = sprite->data[1];
     sprite->data[1] = -temp;
     if (sprite->data[0] == 0)
     {
-        gSprites[sprite->data[2]].pos2.x = 0;
+        gSprites[sprite->data[2]].x2 = 0;
         DestroySpriteAndMatrix(sprite);
     }
 
@@ -1329,15 +1329,15 @@ static void AnimVibrateBattlerBack_Step(struct Sprite *sprite)
 static void AnimVibrateBattlerBack(struct Sprite *sprite)
 {
     u8 spriteId;
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     spriteId = gBattlerSpriteIds[gBattleAnimTarget];
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
     else
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
 
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = spriteId;
@@ -1358,8 +1358,8 @@ static void AnimMovingClamp(struct Sprite *sprite)
 static void AnimMovingClamp_Step(struct Sprite *sprite)
 {
     sprite->data[0] = sprite->data[1];
-    sprite->data[2] = sprite->pos1.x;
-    sprite->data[4] = sprite->pos1.y + 15;
+    sprite->data[2] = sprite->x;
+    sprite->data[4] = sprite->y + 15;
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(sprite, AnimMovingClamp_End);
 }
@@ -1394,7 +1394,7 @@ static void AnimTask_Withdraw_Step(u8 taskId)
     {
         gTasks[taskId].data[0] += 0xB0;
         // this y position update gets overwritten by SetBattlerSpriteYOffsetFromRotation()
-        gSprites[spriteId].pos2.y++;
+        gSprites[spriteId].y2++;
     }
     else if (gTasks[taskId].data[1] == 1)
     {
@@ -1407,7 +1407,7 @@ static void AnimTask_Withdraw_Step(u8 taskId)
     {
         gTasks[taskId].data[0] -= 0xB0;
         // this y position update gets overwritten by SetBattlerSpriteYOffsetFromRotation()
-        gSprites[spriteId].pos2.y--;
+        gSprites[spriteId].y2--;
     }
 
     SetBattlerSpriteYOffsetFromRotation(spriteId);
@@ -1433,11 +1433,11 @@ static void AnimKinesisZapEnergy(struct Sprite *sprite)
 {
     SetSpriteCoordsToAnimAttackerCoords(sprite);
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
     else
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
 
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         sprite->hFlip = 1;
@@ -1467,8 +1467,8 @@ static void AnimSwordsDanceBlade(struct Sprite *sprite)
 static void AnimSwordsDanceBlade_Step(struct Sprite *sprite)
 {
     sprite->data[0] = 6;
-    sprite->data[2] = sprite->pos1.x;
-    sprite->data[4] = sprite->pos1.y - 32;
+    sprite->data[2] = sprite->x;
+    sprite->data[4] = sprite->y - 32;
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
 }
@@ -1500,7 +1500,7 @@ static void AnimSonicBoomProjectile(struct Sprite *sprite)
     InitSpritePosToAnimAttacker(sprite, TRUE);
     targetXPos = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
     targetYPos = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
-    rotation = ArcTan2Neg(targetXPos - sprite->pos1.x, targetYPos - sprite->pos1.y);
+    rotation = ArcTan2Neg(targetXPos - sprite->x, targetYPos - sprite->y);
     rotation += 0xF000;
     if (IsContest())
         rotation -= 0x6000;
@@ -1539,14 +1539,14 @@ static void AnimAirWaveProjectile_Step1(struct Sprite *sprite)
     sprite->data[1] += sprite->data[5];
     sprite->data[2] += sprite->data[6];
     if (1 & task->data[7])
-        sprite->pos2.x = ((u16)sprite->data[1] >> 8) * -1;
+        sprite->x2 = ((u16)sprite->data[1] >> 8) * -1;
     else
-        sprite->pos2.x = (u16)sprite->data[1] >> 8;
+        sprite->x2 = (u16)sprite->data[1] >> 8;
 
     if (1 & task->data[8])
-        sprite->pos2.y = ((u16)sprite->data[2] / 256u) * -1;
+        sprite->y2 = ((u16)sprite->data[2] / 256u) * -1;
     else
-        sprite->pos2.y = (u16)sprite->data[2] / 256u;
+        sprite->y2 = (u16)sprite->data[2] / 256u;
 
     if (sprite->data[0]-- <= 0)
     {
@@ -1565,33 +1565,33 @@ static void AnimAirWaveProjectile(struct Sprite *sprite)
     sprite->data[1] += (-2 & task->data[7]);
     sprite->data[2] += (-2 & task->data[8]);
     if (1 & task->data[7])
-        sprite->pos2.x = ((u16)sprite->data[1] >> 8) * -1;
+        sprite->x2 = ((u16)sprite->data[1] >> 8) * -1;
     else
-        sprite->pos2.x = (u16)sprite->data[1] >> 8;
+        sprite->x2 = (u16)sprite->data[1] >> 8;
 
     if (1 & task->data[8])
-        sprite->pos2.y = ((u16)sprite->data[2] / 256u) * -1;
+        sprite->y2 = ((u16)sprite->data[2] / 256u) * -1;
     else
-        sprite->pos2.y = (u16)sprite->data[2] / 256u;
+        sprite->y2 = (u16)sprite->data[2] / 256u;
 
     if (sprite->data[0]-- <= 0)
     {
         sprite->data[0] = 8;
         task->data[5] = 4;
         a = MathUtil_Inv16(Q_8_8(16));
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
-        if (task->data[11] >= sprite->pos1.x)
-            b = (task->data[11] - sprite->pos1.x) << 8;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->y2 = 0;
+        sprite->x2 = 0;
+        if (task->data[11] >= sprite->x)
+            b = (task->data[11] - sprite->x) << 8;
         else
-            b = (sprite->pos1.x - task->data[11]) << 8;
+            b = (sprite->x - task->data[11]) << 8;
 
-        if (task->data[12] >= sprite->pos1.y)
-            c = (task->data[12] - sprite->pos1.y) << 8;
+        if (task->data[12] >= sprite->y)
+            c = (task->data[12] - sprite->y) << 8;
         else
-            c = (sprite->pos1.y - task->data[12]) << 8;
+            c = (sprite->y - task->data[12]) << 8;
 
         sprite->data[2] = 0;
         sprite->data[1] = 0;
@@ -1778,7 +1778,7 @@ static void AnimCoinThrow(struct Sprite *sprite)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     r6 += gBattleAnimArgs[2];
-    var = ArcTan2Neg(r6 - sprite->pos1.x, r7 - sprite->pos1.y);
+    var = ArcTan2Neg(r6 - sprite->x, r7 - sprite->y);
     var += 0xC000;
     TrySetSpriteRotScale(sprite, FALSE, 0x100, 0x100, var);
     sprite->data[0] = gBattleAnimArgs[4];
@@ -1791,18 +1791,18 @@ static void AnimCoinThrow(struct Sprite *sprite)
 static void AnimFallingCoin(struct Sprite *sprite)
 {
     sprite->data[2] = -16;
-    sprite->pos1.y += 8;
+    sprite->y += 8;
     sprite->callback = AnimFallingCoin_Step;
 }
 
 static void AnimFallingCoin_Step(struct Sprite *sprite)
 {
     sprite->data[0] += 0x80;
-    sprite->pos2.x = sprite->data[0] >> 8;
+    sprite->x2 = sprite->data[0] >> 8;
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
-        sprite->pos2.x = -sprite->pos2.x;
+        sprite->x2 = -sprite->x2;
 
-    sprite->pos2.y = Sin(sprite->data[1], sprite->data[2]);
+    sprite->y2 = Sin(sprite->data[1], sprite->data[2]);
     sprite->data[1] += 5;
     if (sprite->data[1] > 126)
     {
@@ -1830,10 +1830,10 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite)
     u16 rand;
     s16* ptr;
     PlaySE12WithPanning(SE_M_HORN_ATTACK, BattleAnimAdjustPanning(63));
-    sprite->pos1.x += sprite->pos2.x;
-    sprite->pos1.y += sprite->pos2.y;
-    sprite->pos2.y = 0;
-    sprite->pos2.x = 0;
+    sprite->x += sprite->x2;
+    sprite->y += sprite->y2;
+    sprite->y2 = 0;
+    sprite->x2 = 0;
     ptr = &sprite->data[7];
     for (i = 0; i < 8; i++)
         ptr[i - 7] = 0;
@@ -1849,11 +1849,11 @@ static void AnimBulletSeed_Step1(struct Sprite *sprite)
 static void AnimBulletSeed_Step2(struct Sprite *sprite)
 {
     sprite->data[0] += sprite->data[7];
-    sprite->pos2.x = sprite->data[0] >> 8;
+    sprite->x2 = sprite->data[0] >> 8;
     if (sprite->data[7] & 1)
-        sprite->pos2.x = -sprite->pos2.x;
+        sprite->x2 = -sprite->x2;
 
-    sprite->pos2.y = Sin(sprite->data[1], sprite->data[6]);
+    sprite->y2 = Sin(sprite->data[1], sprite->data[6]);
     sprite->data[1] += 8;
     if (sprite->data[1] > 126)
     {
@@ -1876,7 +1876,7 @@ static void AnimRazorWindTornado(struct Sprite *sprite)
 {
     InitSpritePosToAnimAttacker(sprite, FALSE);
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
-        sprite->pos1.y += 16;
+        sprite->y += 16;
 
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[1] = gBattleAnimArgs[2];
@@ -1905,8 +1905,8 @@ static void AnimViceGripPincer(struct Sprite *sprite)
         StartSpriteAnim(sprite, 1);
     }
 
-    sprite->pos1.x += startXOffset;
-    sprite->pos1.y += startYOffset;
+    sprite->x += startXOffset;
+    sprite->y += startYOffset;
     sprite->data[0] = 6;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + endXOffset;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + endYOffset;
@@ -1937,12 +1937,12 @@ static void AnimGuillotinePincer(struct Sprite *sprite)
         StartSpriteAnim(sprite, gBattleAnimArgs[0]);
     }
 
-    sprite->pos1.x += startXOffset;
-    sprite->pos1.y += startYOffset;
+    sprite->x += startXOffset;
+    sprite->y += startYOffset;
     sprite->data[0] = 6;
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + endXOffset;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + endYOffset;
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = gBattleAnimArgs[0];
@@ -1956,10 +1956,10 @@ static void AnimGuillotinePincer_Step1(struct Sprite *sprite)
     {
         SeekSpriteAnim(sprite, 0);
         sprite->animPaused = 1;
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.x = 2;
-        sprite->pos2.y = -2;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->x2 = 2;
+        sprite->y2 = -2;
         sprite->data[0] = sprite->data[6];
         sprite->data[1] ^= 1;
         sprite->data[2] ^= 1;
@@ -1973,15 +1973,15 @@ static void AnimGuillotinePincer_Step2(struct Sprite *sprite)
 {
     if (sprite->data[3])
     {
-        sprite->pos2.x = -sprite->pos2.x;
-        sprite->pos2.y = -sprite->pos2.y;
+        sprite->x2 = -sprite->x2;
+        sprite->y2 = -sprite->y2;
     }
 
     sprite->data[3] ^= 1;
     if (++sprite->data[4] == 51)
     {
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
+        sprite->y2 = 0;
+        sprite->x2 = 0;
         sprite->data[4] = 0;
         sprite->data[3] = 0;
         sprite->animPaused = 0;
@@ -2099,7 +2099,7 @@ static void AnimTask_Minimize_Step(u8 taskId)
         break;
     case 5:
         ResetSpriteRotScale(task->data[0]);
-        gSprites[task->data[15]].pos2.y = 0;
+        gSprites[task->data[15]].y2 = 0;
         DestroyAnimVisualTask(taskId);
         break;
     }
@@ -2176,7 +2176,7 @@ static void AnimTask_Splash_Step(u8 taskId)
     case 0:
         RunAffineAnimFromTaskData(task);
         task->data[4] += 3;
-        gSprites[task->data[0]].pos2.y += task->data[4];
+        gSprites[task->data[0]].y2 += task->data[4];
         if (++task->data[3] > 7)
         {
             task->data[3] = 0;
@@ -2185,7 +2185,7 @@ static void AnimTask_Splash_Step(u8 taskId)
         break;
     case 1:
         RunAffineAnimFromTaskData(task);
-        gSprites[task->data[0]].pos2.y += task->data[4];
+        gSprites[task->data[0]].y2 += task->data[4];
         if (++task->data[3] > 7)
         {
             task->data[3] = 0;
@@ -2195,7 +2195,7 @@ static void AnimTask_Splash_Step(u8 taskId)
     case 2:
         if (task->data[4] != 0)
         {
-            gSprites[task->data[0]].pos2.y -= 2;
+            gSprites[task->data[0]].y2 -= 2;
             task->data[4] -= 2;
         }
         else
@@ -2206,7 +2206,7 @@ static void AnimTask_Splash_Step(u8 taskId)
         {
             if (--task->data[2] == 0)
             {
-                gSprites[task->data[0]].pos2.y = 0;
+                gSprites[task->data[0]].y2 = 0;
                 DestroyAnimVisualTask(taskId);
             }
             else
@@ -2245,17 +2245,17 @@ static void AnimBreathPuff(struct Sprite *sprite)
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
         StartSpriteAnim(sprite, 0);
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + 32;
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + 32;
         sprite->data[1] = 64;
     }
     else
     {
         StartSpriteAnim(sprite, 1);
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) - 32;
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) - 32;
         sprite->data[1] = -64;
     }
 
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     sprite->data[0] = 52;
     sprite->data[2] = 0;
     sprite->data[3] = 0;
@@ -2279,10 +2279,10 @@ static void AnimAngerMark(struct Sprite *sprite)
     if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
         gBattleAnimArgs[1] *= -1;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
-    if (sprite->pos1.y < 8)
-        sprite->pos1.y = 8;
+    sprite->x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
+    sprite->y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
+    if (sprite->y < 8)
+        sprite->y = 8;
 
     StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
     sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
@@ -2315,8 +2315,8 @@ void AnimTask_ThrashMoveMonVertical(u8 taskId)
     task->data[2] = 4;
     task->data[3] = 7;
     task->data[4] = 3;
-    task->data[5] = gSprites[task->data[0]].pos1.x;
-    task->data[6] = gSprites[task->data[0]].pos1.y;
+    task->data[5] = gSprites[task->data[0]].x;
+    task->data[6] = gSprites[task->data[0]].y;
     task->data[7] = 0;
     task->data[8] = 0;
     task->data[9] = 2;
@@ -2334,14 +2334,14 @@ static void AnimTask_ThrashMoveMonVertical_Step(u8 taskId)
         task->data[7] = 0;
         task->data[8]++;
         if (task->data[8] & 1)
-            gSprites[task->data[0]].pos1.y += task->data[9];
+            gSprites[task->data[0]].y += task->data[9];
         else
-            gSprites[task->data[0]].pos1.y -= task->data[9];
+            gSprites[task->data[0]].y -= task->data[9];
     }
     switch (task->data[1])
     {
     case 0:
-        gSprites[task->data[0]].pos1.x += task->data[2];
+        gSprites[task->data[0]].x += task->data[2];
         if (--task->data[3] == 0)
         {
             task->data[3] = 14;
@@ -2349,7 +2349,7 @@ static void AnimTask_ThrashMoveMonVertical_Step(u8 taskId)
         }
         break;
     case 1:
-        gSprites[task->data[0]].pos1.x -= task->data[2];
+        gSprites[task->data[0]].x -= task->data[2];
         if (--task->data[3] == 0)
         {
             task->data[3] = 7;
@@ -2357,7 +2357,7 @@ static void AnimTask_ThrashMoveMonVertical_Step(u8 taskId)
         }
         break;
     case 2:
-        gSprites[task->data[0]].pos1.x += task->data[2];
+        gSprites[task->data[0]].x += task->data[2];
         if (--task->data[3] == 0)
         {
             if (--task->data[4] != 0)
@@ -2368,7 +2368,7 @@ static void AnimTask_ThrashMoveMonVertical_Step(u8 taskId)
             else
             {
                 if ((task->data[8] & 1) != 0)
-                    gSprites[task->data[0]].pos1.y -= task->data[9];
+                    gSprites[task->data[0]].y -= task->data[9];
 
                 DestroyAnimVisualTask(taskId);
             }
@@ -2467,8 +2467,8 @@ static void AnimTask_SketchDrawMon_Step(u8 taskId)
 
 static void AnimPencil(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) - 16;
-    sprite->pos1.y = GetBattlerYCoordWithElevation(gBattleAnimTarget) + 16;
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) - 16;
+    sprite->y = GetBattlerYCoordWithElevation(gBattleAnimTarget) + 16;
     sprite->data[0] = 0;
     sprite->data[1] = 0;
     sprite->data[2] = 0;
@@ -2499,7 +2499,7 @@ static void AnimPencil_Step(struct Sprite *sprite)
         if (++sprite->data[1] > 3 && sprite->data[2] < sprite->data[5])
         {
             sprite->data[1] = 0;
-            sprite->pos1.y -= 1;
+            sprite->y -= 1;
             sprite->data[2]++;
             if (sprite->data[2] % 10 == 0)
                 PlaySE12WithPanning(SE_M_SKETCH, sprite->data[6]);
@@ -2515,7 +2515,7 @@ static void AnimPencil_Step(struct Sprite *sprite)
             sprite->data[4] = -0x40 - sprite->data[4];
             sprite->data[3] *= -1;
         }
-        sprite->pos2.x = sprite->data[4];
+        sprite->x2 = sprite->data[4];
         if (sprite->data[5] == sprite->data[2])
         {
             sprite->data[1] = 0;
@@ -2624,7 +2624,7 @@ static void AnimHyperVoiceRing(struct Sprite *sprite)
         r9 = GetBattlerSpriteCoord(battler1, r10) - gBattleAnimArgs[0];
         if (!IsContest() && IsBattlerSpriteVisible(BATTLE_PARTNER(battler1)))
         {
-            if (gSprites[gBattlerSpriteIds[battler1]].pos1.x < gSprites[gBattlerSpriteIds[BATTLE_PARTNER(battler1)]].pos1.x)
+            if (gSprites[gBattlerSpriteIds[battler1]].x < gSprites[gBattlerSpriteIds[BATTLE_PARTNER(battler1)]].x)
                 sprite->subpriority = gSprites[gBattlerSpriteIds[BATTLE_PARTNER(battler1)]].subpriority + 1;
             else
                 sprite->subpriority = gSprites[gBattlerSpriteIds[battler1]].subpriority - 1;
@@ -2653,8 +2653,8 @@ static void AnimHyperVoiceRing(struct Sprite *sprite)
         sp0 -= gBattleAnimArgs[3];
 
     sp1 += gBattleAnimArgs[4];
-    sprite->pos1.x = sprite->data[1] = r9;
-    sprite->pos1.y = sprite->data[3] = r6;
+    sprite->x = sprite->data[1] = r9;
+    sprite->y = sprite->data[3] = r6;
     sprite->data[2] = sp0;
     sprite->data[4] = sp1;
     sprite->data[0] = gBattleAnimArgs[0];
@@ -2690,17 +2690,17 @@ static void AnimSoftBoiledEgg(struct Sprite *sprite)
 static void AnimSoftBoiledEgg_Step1(struct Sprite *sprite)
 {
     s16 add;
-    sprite->pos2.y -= (sprite->data[0] >> 8);
-    sprite->pos2.x = sprite->data[1] >> 8;
+    sprite->y2 -= (sprite->data[0] >> 8);
+    sprite->x2 = sprite->data[1] >> 8;
     sprite->data[0] -= 32;
     add = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? -160 : 160;
     sprite->data[1] += add;
-    if (sprite->pos2.y > 0)
+    if (sprite->y2 > 0)
     {
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
+        sprite->y += sprite->y2;
+        sprite->x += sprite->x2;
+        sprite->y2 = 0;
+        sprite->x2 = 0;
         sprite->data[0] = 0;
         StartSpriteAffineAnim(sprite, 1);
         sprite->callback = AnimSoftBoiledEgg_Step2;
@@ -2737,7 +2737,7 @@ static void AnimSoftBoiledEgg_Step3(struct Sprite *sprite)
 
 static void AnimSoftBoiledEgg_Step3_Callback1(struct Sprite *sprite)
 {
-    sprite->pos2.y -= 2;
+    sprite->y2 -= 2;
     if (++sprite->data[0] == 9)
     {
         sprite->data[0] = 16;
@@ -2793,7 +2793,7 @@ static void AnimTask_AttackerStretchAndDisappear_Step(u8 taskId)
     struct Task* task = &gTasks[taskId];
     if (!RunAffineAnimFromTaskData(task))
     {
-        gSprites[task->data[0]].pos2.y = 0;
+        gSprites[task->data[0]].y2 = 0;
         gSprites[task->data[0]].invisible = TRUE;
         DestroyAnimVisualTask(taskId);
     }
@@ -2829,7 +2829,7 @@ static void AnimTask_ExtremeSpeedImpact_Step(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        gSprites[task->data[15]].pos2.x += task->data[14];
+        gSprites[task->data[15]].x2 += task->data[14];
         task->data[1] = 0;
         task->data[2] = 0;
         task->data[3] = 0;
@@ -2841,14 +2841,14 @@ static void AnimTask_ExtremeSpeedImpact_Step(u8 taskId)
             task->data[1] = 0;
             task->data[2]++;
             if (task->data[2] & 1)
-                gSprites[task->data[15]].pos2.x += 6;
+                gSprites[task->data[15]].x2 += 6;
             else
-                gSprites[task->data[15]].pos2.x -= 6;
+                gSprites[task->data[15]].x2 -= 6;
 
             if (++task->data[3] > 4)
             {
                 if (task->data[2] & 1)
-                    gSprites[task->data[15]].pos2.x -= 6;
+                    gSprites[task->data[15]].x2 -= 6;
 
                 task->data[0]++;
             }
@@ -2861,8 +2861,8 @@ static void AnimTask_ExtremeSpeedImpact_Step(u8 taskId)
             task->data[0]++;
         break;
     case 3:
-        gSprites[task->data[15]].pos2.x += task->data[13];
-        if (gSprites[task->data[15]].pos2.x == 0)
+        gSprites[task->data[15]].x2 += task->data[13];
+        if (gSprites[task->data[15]].x2 == 0)
             DestroyAnimVisualTask(taskId);
         break;
     }
@@ -2975,8 +2975,8 @@ static void AnimTask_SpeedDust_Step(u8 taskId)
             {
                 gSprites[spriteId].data[0] = taskId;
                 gSprites[spriteId].data[1] = 13;
-                gSprites[spriteId].pos2.x = gSpeedDustPosTable[task->data[2]][0];
-                gSprites[spriteId].pos2.y = gSpeedDustPosTable[task->data[2]][1];
+                gSprites[spriteId].x2 = gSpeedDustPosTable[task->data[2]][0];
+                gSprites[spriteId].y2 = gSpeedDustPosTable[task->data[2]][1];
                 task->data[13]++;
                 if (++task->data[2] > 3)
                 {
@@ -3059,8 +3059,8 @@ static void AnimMagentaHeart(struct Sprite *sprite)
     if (++sprite->data[0] == 1)
         InitSpritePosToAnimAttacker(sprite, FALSE);
 
-    sprite->pos2.x = Sin(sprite->data[1], 8);
-    sprite->pos2.y = sprite->data[2] >> 8;
+    sprite->x2 = Sin(sprite->data[1], 8);
+    sprite->y2 = sprite->data[2] >> 8;
     sprite->data[1] = (sprite->data[1] + 7) & 0xFF;
     sprite->data[2] -= 0x80;
     if (sprite->data[0] == 60)
@@ -3126,15 +3126,15 @@ void AnimTask_StretchTargetUp(u8 taskId)
     if (++gTasks[taskId].data[0] == 1)
     {
         PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_TARGET), sAffineAnims_StretchBattlerUp);
-        gSprites[spriteId].pos2.x = 4;
+        gSprites[spriteId].x2 = 4;
     }
     else
     {
-        gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x;
+        gSprites[spriteId].x2 = -gSprites[spriteId].x2;
         if (!RunAffineAnimFromTaskData(&gTasks[taskId]))
         {
-            gSprites[spriteId].pos2.x = 0;
-            gSprites[spriteId].pos2.y = 0;
+            gSprites[spriteId].x2 = 0;
+            gSprites[spriteId].y2 = 0;
             DestroyAnimVisualTask(taskId);
         }
     }
@@ -3146,15 +3146,15 @@ void AnimTask_StretchAttackerUp(u8 taskId)
     if (++gTasks[taskId].data[0] == 1)
     {
         PrepareAffineAnimInTaskData(&gTasks[taskId], GetAnimBattlerSpriteId(ANIM_ATTACKER), sAffineAnims_StretchBattlerUp);
-        gSprites[spriteId].pos2.x = 4;
+        gSprites[spriteId].x2 = 4;
     }
     else
     {
-        gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x;
+        gSprites[spriteId].x2 = -gSprites[spriteId].x2;
         if (!RunAffineAnimFromTaskData(&gTasks[taskId]))
         {
-            gSprites[spriteId].pos2.x = 0;
-            gSprites[spriteId].pos2.y = 0;
+            gSprites[spriteId].x2 = 0;
+            gSprites[spriteId].y2 = 0;
             DestroyAnimVisualTask(taskId);
         }
     }
@@ -3164,9 +3164,9 @@ static void AnimRedHeartProjectile(struct Sprite *sprite)
 {
     InitSpritePosToAnimAttacker(sprite, TRUE);
     sprite->data[0] = 95;
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     InitAnimLinearTranslation(sprite);
     sprite->callback = AnimRedHeartProjectile_Step;
@@ -3176,7 +3176,7 @@ static void AnimRedHeartProjectile_Step(struct Sprite *sprite)
 {
     if (!AnimTranslateLinear(sprite))
     {
-        sprite->pos2.y += Sin(sprite->data[5], 14);
+        sprite->y2 += Sin(sprite->data[5], 14);
         sprite->data[5] = (sprite->data[5] + 4) & 0xFF;
     }
     else
@@ -3196,8 +3196,8 @@ void AnimParticleBurst(struct Sprite *sprite)
     else
     {
         sprite->data[4] += sprite->data[1];
-        sprite->pos2.x = sprite->data[4] >> 8;
-        sprite->pos2.y = Sin(sprite->data[3], sprite->data[2]);
+        sprite->x2 = sprite->data[4] >> 8;
+        sprite->y2 = Sin(sprite->data[3], sprite->data[2]);
         sprite->data[3] = (sprite->data[3] + 3) & 0xFF;
         if (sprite->data[3] > 100)
             sprite->invisible = sprite->data[3] % 2;
@@ -3209,8 +3209,8 @@ void AnimParticleBurst(struct Sprite *sprite)
 
 static void AnimRedHeartRising(struct Sprite *sprite)
 {
-    sprite->pos1.x = gBattleAnimArgs[0];
-    sprite->pos1.y = DISPLAY_HEIGHT;
+    sprite->x = gBattleAnimArgs[0];
+    sprite->y = DISPLAY_HEIGHT;
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[1];
     sprite->callback = WaitAnimForDuration;
@@ -3221,10 +3221,10 @@ static void AnimRedHeartRising_Step(struct Sprite *sprite)
 {
     s16 y;
     sprite->data[2] += sprite->data[1];
-    sprite->pos2.y = -((u16)sprite->data[2] >> 8);
-    sprite->pos2.x = Sin(sprite->data[3], 4);
+    sprite->y2 = -((u16)sprite->data[2] >> 8);
+    sprite->x2 = Sin(sprite->data[3], 4);
     sprite->data[3] = (sprite->data[3] + 3) & 0xFF;
-    y = sprite->pos1.y + sprite->pos2.y;
+    y = sprite->y + sprite->y2;
     if (y <= 72)
     {
         sprite->invisible = sprite->data[3] % 2;
@@ -3402,8 +3402,8 @@ static void AnimTask_ScaryFace_Step(u8 taskId)
 // arg 1: initial wave offset
 static void AnimOrbitFast(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->affineAnimPaused = 1;
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
@@ -3419,8 +3419,8 @@ static void AnimOrbitFast_Step(struct Sprite *sprite)
     else
         sprite->subpriority = sprite->data[7] - 1;
 
-    sprite->pos2.x = Sin(sprite->data[1], sprite->data[2] >> 8);
-    sprite->pos2.y = Cos(sprite->data[1], sprite->data[3] >> 8);
+    sprite->x2 = Sin(sprite->data[1], sprite->data[2] >> 8);
+    sprite->y2 = Cos(sprite->data[1], sprite->data[3] >> 8);
     sprite->data[1] = (sprite->data[1] + 9) & 0xFF;
     switch (sprite->data[5])
     {
@@ -3453,8 +3453,8 @@ static void AnimOrbitFast_Step(struct Sprite *sprite)
 // arg 0: initial wave offset
 static void AnimOrbitScatter(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
     sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
     sprite->callback = AnimOrbitScatter_Step;
@@ -3462,25 +3462,25 @@ static void AnimOrbitScatter(struct Sprite *sprite)
 
 static void AnimOrbitScatter_Step(struct Sprite *sprite)
 {
-    sprite->pos2.x += sprite->data[0];
-    sprite->pos2.y += sprite->data[1];
-    if (sprite->pos1.x + sprite->pos2.x + 16 > ((u32)DISPLAY_WIDTH + 32) 
-     || sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT || sprite->pos1.y + sprite->pos2.y < -16)
+    sprite->x2 += sprite->data[0];
+    sprite->y2 += sprite->data[1];
+    if (sprite->x + sprite->x2 + 16 > ((u32)DISPLAY_WIDTH + 32)
+     || sprite->y + sprite->y2 > DISPLAY_HEIGHT || sprite->y + sprite->y2 < -16)
         DestroyAnimSprite(sprite);
 }
 
 static void AnimSpitUpOrb_Step(struct Sprite *sprite)
 {
-    sprite->pos2.x += sprite->data[0];
-    sprite->pos2.y += sprite->data[1];
+    sprite->x2 += sprite->data[0];
+    sprite->y2 += sprite->data[1];
     if (sprite->data[3]++ >= sprite->data[2])
         DestroyAnimSprite(sprite);
 }
 
 static void AnimSpitUpOrb(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = Sin(gBattleAnimArgs[0], 10);
     sprite->data[1] = Cos(gBattleAnimArgs[0], 7);
     sprite->data[2] = gBattleAnimArgs[1];
@@ -3504,20 +3504,20 @@ static void AnimAngel(struct Sprite *sprite)
     s16 var0;
     if (!sprite->data[0])
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
     }
 
     sprite->data[0]++;
     var0 = (sprite->data[0] * 10) & 0xFF;
-    sprite->pos2.x = Sin(var0, 80) >> 8;
+    sprite->x2 = Sin(var0, 80) >> 8;
     if (sprite->data[0] < 80)
-        sprite->pos2.y = (sprite->data[0] / 2) + (Cos(var0, 80) >> 8);
+        sprite->y2 = (sprite->data[0] / 2) + (Cos(var0, 80) >> 8);
 
     if (sprite->data[0] > 90)
     {
         sprite->data[2]++;
-        sprite->pos2.x -= sprite->data[2] / 2;
+        sprite->x2 -= sprite->data[2] / 2;
     }
 
     if (sprite->data[0] > 100)
@@ -3527,8 +3527,8 @@ static void AnimAngel(struct Sprite *sprite)
 static void AnimPinkHeart_Step(struct Sprite *sprite)
 {
     sprite->data[5]++;
-    sprite->pos2.x = Sin(sprite->data[3], 5);
-    sprite->pos2.y = sprite->data[5] / 2;
+    sprite->x2 = Sin(sprite->data[3], 5);
+    sprite->y2 = sprite->data[5] / 2;
     sprite->data[3] = (sprite->data[3] + 3) & 0xFF;
     if (sprite->data[5] > 20)
         sprite->invisible = sprite->data[5] % 2;
@@ -3548,16 +3548,16 @@ static void AnimPinkHeart(struct Sprite *sprite)
     else
     {
         sprite->data[4] += sprite->data[1];
-        sprite->pos2.x = sprite->data[4] >> 8;
-        sprite->pos2.y = Sin(sprite->data[3], sprite->data[2]);
+        sprite->x2 = sprite->data[4] >> 8;
+        sprite->y2 = Sin(sprite->data[3], sprite->data[2]);
         sprite->data[3] = (sprite->data[3] + 3) & 0xFF;
         if (sprite->data[3] > 70)
         {
             sprite->callback = AnimPinkHeart_Step;
-            sprite->pos1.x += sprite->pos2.x;
-            sprite->pos1.y += sprite->pos2.y;
-            sprite->pos2.x = 0;
-            sprite->pos2.y = 0;
+            sprite->x += sprite->x2;
+            sprite->y += sprite->y2;
+            sprite->x2 = 0;
+            sprite->y2 = 0;
             sprite->data[3] = Random2() % 180;
         }
     }
@@ -3567,8 +3567,8 @@ static void AnimDevil(struct Sprite *sprite)
 {
     if (sprite->data[3] == 0)
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         StartSpriteAnim(sprite, 0);
         sprite->subpriority = GetBattlerSpriteSubpriority(gBattleAnimTarget) - 1;
         sprite->data[2] = 1;
@@ -3577,8 +3577,8 @@ static void AnimDevil(struct Sprite *sprite)
     sprite->data[1] = (sprite->data[0] * 4) % 256;
     if (sprite->data[1] < 0)
         sprite->data[1] = 0;
-    sprite->pos2.x = Cos(sprite->data[1], 30 - sprite->data[0] / 4);
-    sprite->pos2.y = Sin(sprite->data[1], 10 - sprite->data[0] / 8);
+    sprite->x2 = Cos(sprite->data[1], 30 - sprite->data[0] / 4);
+    sprite->y2 = Sin(sprite->data[1], 10 - sprite->data[0] / 8);
     if (sprite->data[1] > 128 && sprite->data[2] > 0)
         sprite->data[2] = -1;
     if (sprite->data[1] == 0 && sprite->data[2] < 0)
@@ -3596,8 +3596,8 @@ static void AnimFurySwipes(struct Sprite *sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         StartSpriteAnim(sprite, gBattleAnimArgs[2]);
         sprite->data[0]++;
     }
@@ -3617,19 +3617,19 @@ static void AnimMovementWaves(struct Sprite *sprite)
     {
         if (!gBattleAnimArgs[0])
         {
-            sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-            sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+            sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+            sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         }
         else
         {
-            sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-            sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+            sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+            sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
         }
 
         if (!gBattleAnimArgs[1])
-            sprite->pos1.x += 32;
+            sprite->x += 32;
         else
-            sprite->pos1.x -= 32;
+            sprite->x -= 32;
 
         sprite->data[0] = gBattleAnimArgs[2];
         sprite->data[1] = gBattleAnimArgs[1];
@@ -3671,11 +3671,11 @@ static void AnimJaggedMusicNote(struct Sprite *sprite)
     if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
         gBattleAnimArgs[1] *= -1;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(battler, 2)  + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBattlerSpriteCoord(battler, 3) + gBattleAnimArgs[2];
+    sprite->x = GetBattlerSpriteCoord(battler, 2)  + gBattleAnimArgs[1];
+    sprite->y = GetBattlerSpriteCoord(battler, 3) + gBattleAnimArgs[2];
     sprite->data[0] = 0;
-    sprite->data[1] = (u16)sprite->pos1.x << 3;
-    sprite->data[2] = (u16)sprite->pos1.y << 3;
+    sprite->data[1] = (u16)sprite->x << 3;
+    sprite->data[2] = (u16)sprite->y << 3;
 
     var1 = gBattleAnimArgs[1] << 3;
     if (var1 < 0)
@@ -3695,8 +3695,8 @@ static void AnimJaggedMusicNote_Step(struct Sprite *sprite)
 {
     sprite->data[1] += sprite->data[3];
     sprite->data[2] += sprite->data[4];
-    sprite->pos1.x = sprite->data[1] >> 3;
-    sprite->pos1.y = sprite->data[2] >> 3;
+    sprite->x = sprite->data[1] >> 3;
+    sprite->y = sprite->data[2] >> 3;
     if (++sprite->data[0] > 16)
         DestroyAnimSprite(sprite);
 }
@@ -3723,8 +3723,8 @@ static void AnimPerishSongMusicNote(struct Sprite *sprite)
 
     if (!sprite->data[0])
     {
-        sprite->pos1.x = 120;
-        sprite->pos1.y = (gBattleAnimArgs[0] + (((u16)gBattleAnimArgs[0]) >> 31)) / 2 - 15;
+        sprite->x = 120;
+        sprite->y = (gBattleAnimArgs[0] + (((u16)gBattleAnimArgs[0]) >> 31)) / 2 - 15;
 
         StartSpriteAnim(sprite, gBattleAnimArgs[1]);
 
@@ -3740,9 +3740,9 @@ static void AnimPerishSongMusicNote(struct Sprite *sprite)
     sprite->data[6] = (sprite->data[6] + 10) & 0xFF;
 
     index &= var2;
-    sprite->pos2.x = Cos(index, 100);
+    sprite->x2 = Cos(index, 100);
 
-    sprite->pos2.y = sprite->data[1] + Sin(index, 10) + Cos(sprite->data[6], 4);
+    sprite->y2 = sprite->data[1] + Sin(index, 10) + Cos(sprite->data[6], 4);
 
     if (sprite->data[0] > sprite->data[5])
     {
@@ -3770,7 +3770,7 @@ static void AnimPerishSongMusicNote_Step1(struct Sprite *sprite)
 static void AnimPerishSongMusicNote_Step2(struct Sprite *sprite)
 {
     sprite->data[3] += sprite->data[2];
-    sprite->pos2.y = sprite->data[3];
+    sprite->y2 = sprite->data[3];
 
     sprite->data[2]++;
 
@@ -3797,20 +3797,20 @@ static void AnimGuardRing(struct Sprite *sprite)
 {
     if ((gBattleTypeFlags & BATTLE_TYPE_DOUBLE) && IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimAttacker)))
     {
-        SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
-        sprite->pos1.y += 40;
+        SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->x, &sprite->y);
+        sprite->y += 40;
 
         StartSpriteAffineAnim(sprite, 1);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 40;
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 40;
     }
 
     sprite->data[0] = 13;
-    sprite->data[2] = sprite->pos1.x;
-    sprite->data[4] = sprite->pos1.y - 72;
+    sprite->data[2] = sprite->x;
+    sprite->data[4] = sprite->y - 72;
 
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index 5aaf45f19..c827aaaa6 100755
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -1181,8 +1181,8 @@ const union AffineAnimCmd gSlackOffSquishAffineAnimCmds[] =
 
 static void AnimBlackSmoke(struct Sprite *sprite)
 {
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
 
     if (!gBattleAnimArgs[3])
         sprite->data[0] = gBattleAnimArgs[2];
@@ -1197,7 +1197,7 @@ static void AnimBlackSmoke_Step(struct Sprite *sprite)
 {
     if (sprite->data[1] > 0)
     {
-        sprite->pos2.x = sprite->data[2] >> 8;
+        sprite->x2 = sprite->data[2] >> 8;
         sprite->data[2] += sprite->data[0];
         sprite->invisible ^= 1;
         sprite->data[1]--;
@@ -1252,7 +1252,7 @@ static void AnimTealAlert(struct Sprite *sprite)
 
     InitSpritePosToAnimTarget(sprite, TRUE);
 
-    rotation = ArcTan2Neg(sprite->pos1.x - x, sprite->pos1.y - y);
+    rotation = ArcTan2Neg(sprite->x - x, sprite->y - y);
     rotation += 0x6000;
     if (IsContest())
         rotation += 0x4000;
@@ -1315,23 +1315,23 @@ static void AnimMeanLookEye_Step3(struct Sprite *sprite)
     {
     case 0:
     case 1:
-        sprite->pos2.x = 1;
-        sprite->pos2.y = 0;
+        sprite->x2 = 1;
+        sprite->y2 = 0;
         break;
     case 2:
     case 3:
-        sprite->pos2.x = -1;
-        sprite->pos2.y = 0;
+        sprite->x2 = -1;
+        sprite->y2 = 0;
         break;
     case 4:
     case 5:
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 1;
+        sprite->x2 = 0;
+        sprite->y2 = 1;
         break;
     case 6:
     default:
-        sprite->pos2.x = 0;
-        sprite->pos2.y = -1;
+        sprite->x2 = 0;
+        sprite->y2 = -1;
         break;
     }
 
@@ -1470,7 +1470,7 @@ static void AnimLeer(struct Sprite *sprite)
 {
     SetSpriteCoordsToAnimAttackerCoords(sprite);
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->callback = RunStoredCallbackWhenAnimEnds;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
 }
@@ -1506,10 +1506,10 @@ static void AnimLetterZ(struct Sprite *sprite)
     var0 = (sprite->data[0] * 20) & 0xFF;
     sprite->data[3] += sprite->data[1];
     sprite->data[4] += sprite->data[2];
-    sprite->pos2.x = sprite->data[3] / 2;
-    sprite->pos2.y = Sin(var0 & 0xFF, 5) + (sprite->data[4] / 2);
+    sprite->x2 = sprite->data[3] / 2;
+    sprite->y2 = Sin(var0 & 0xFF, 5) + (sprite->data[4] / 2);
 
-    if ((u16)(sprite->pos1.x + sprite->pos2.x) > DISPLAY_WIDTH)
+    if ((u16)(sprite->x + sprite->x2) > DISPLAY_WIDTH)
         DestroyAnimSprite(sprite);
 }
 
@@ -1567,7 +1567,7 @@ static void AnimSpotlight_Step1(struct Sprite *sprite)
     case 1:
     case 3:
         sprite->data[1] += 117;
-        sprite->pos2.x = sprite->data[1] >> 8;
+        sprite->x2 = sprite->data[1] >> 8;
         if (++sprite->data[2] == 21)
         {
             sprite->data[2] = 0;
@@ -1576,7 +1576,7 @@ static void AnimSpotlight_Step1(struct Sprite *sprite)
         break;
     case 2:
         sprite->data[1] -= 117;
-        sprite->pos2.x = sprite->data[1] >> 8;
+        sprite->x2 = sprite->data[1] >> 8;
         if (++sprite->data[2] == 41)
         {
             sprite->data[2] = 0;
@@ -1608,23 +1608,23 @@ static void AnimClappingHand(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[3] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     }
 
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
     sprite->oam.tileNum += 16;
 
     if (gBattleAnimArgs[2] == 0)
     {
         sprite->oam.matrixNum = ST_OAM_HFLIP;
-        sprite->pos2.x = -12;
+        sprite->x2 = -12;
         sprite->data[1] = 2;
     }
     else
     {
-        sprite->pos2.x = 12;
+        sprite->x2 = 12;
         sprite->data[1] = -2;
     }
 
@@ -1640,8 +1640,8 @@ static void AnimClappingHand_Step(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
-        sprite->pos2.x += sprite->data[1];
-        if (sprite->pos2.x == 0)
+        sprite->x2 += sprite->data[1];
+        if (sprite->x2 == 0)
         {
             sprite->data[2]++;
             if (sprite->data[3] == 0)
@@ -1652,8 +1652,8 @@ static void AnimClappingHand_Step(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos2.x -= sprite->data[1];
-        if (abs(sprite->pos2.x) == 12)
+        sprite->x2 -= sprite->data[1];
+        if (abs(sprite->x2) == 12)
         {
             sprite->data[0]--;
             sprite->data[2]--;
@@ -1710,18 +1710,18 @@ static void AnimRapidSpin(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[1];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[1];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
     }
 
-    sprite->pos2.y = gBattleAnimArgs[2];
+    sprite->y2 = gBattleAnimArgs[2];
 
-    sprite->data[0] = (sprite->pos2.y > gBattleAnimArgs[3]);
+    sprite->data[0] = (sprite->y2 > gBattleAnimArgs[3]);
     sprite->data[1] = 0;
     sprite->data[2] = gBattleAnimArgs[4];
     sprite->data[3] = gBattleAnimArgs[5];
@@ -1732,17 +1732,17 @@ static void AnimRapidSpin(struct Sprite *sprite)
 static void AnimRapidSpin_Step(struct Sprite *sprite)
 {
     sprite->data[1] = (sprite->data[1] + sprite->data[2]) & 0xFF;
-    sprite->pos2.x = gSineTable[sprite->data[1]] >> 4;
-    sprite->pos2.y += sprite->data[3];
+    sprite->x2 = gSineTable[sprite->data[1]] >> 4;
+    sprite->y2 += sprite->data[3];
 
     if (sprite->data[0])
     {
-        if (sprite->pos2.y < sprite->data[4])
+        if (sprite->y2 < sprite->data[4])
             DestroyAnimSprite(sprite);
     }
     else
     {
-        if (sprite->pos2.y > sprite->data[4])
+        if (sprite->y2 > sprite->data[4])
             DestroyAnimSprite(sprite);
     }
 }
@@ -2033,10 +2033,10 @@ static void AnimTriAttackTriangle(struct Sprite *sprite)
     if (sprite->data[0] == 61)
     {
         StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[0] = 20;
         sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
@@ -2066,8 +2066,8 @@ static void AnimBatonPassPokeball(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
         PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_NORMAL);
         sprite->data[1] = 256;
         sprite->data[2] = 256;
@@ -2095,8 +2095,8 @@ static void AnimBatonPassPokeball(struct Sprite *sprite)
         }
         break;
     case 3:
-        sprite->pos2.y -= 6;
-        if (sprite->pos1.y + sprite->pos2.y < -32)
+        sprite->y2 -= 6;
+        if (sprite->y + sprite->y2 < -32)
             DestroyAnimSprite(sprite);
         break;
     }
@@ -2105,11 +2105,11 @@ static void AnimBatonPassPokeball(struct Sprite *sprite)
 static void AnimWishStar(struct Sprite *sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-        sprite->pos1.x = -16;
+        sprite->x = -16;
     else
-        sprite->pos1.x = 256;
+        sprite->x = 256;
 
-    sprite->pos1.y = 0;
+    sprite->y = 0;
     sprite->callback = AnimWishStar_Step;
 }
 
@@ -2119,23 +2119,23 @@ static void AnimWishStar_Step(struct Sprite *sprite)
 
     sprite->data[0] += 72;
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-        sprite->pos2.x = sprite->data[0] >> 4;
+        sprite->x2 = sprite->data[0] >> 4;
     else
-        sprite->pos2.x = -(sprite->data[0] >> 4);
+        sprite->x2 = -(sprite->data[0] >> 4);
 
     sprite->data[1] += 16;
-    sprite->pos2.y += sprite->data[1] >> 8;
+    sprite->y2 += sprite->data[1] >> 8;
 
     if (++sprite->data[2] % 3 == 0)
     {
         CreateSpriteAndAnimate(
             &gMiniTwinklingStarSpriteTemplate,
-            sprite->pos1.x + sprite->pos2.x,
-            sprite->pos1.y + sprite->pos2.y,
+            sprite->x + sprite->x2,
+            sprite->y + sprite->y2,
             sprite->subpriority + 1);
     }
 
-    newX = sprite->pos1.x + sprite->pos2.x + 32;
+    newX = sprite->x + sprite->x2 + 32;
     if (newX > 304)
         DestroyAnimSprite(sprite);
 }
@@ -2155,7 +2155,7 @@ static void AnimMiniTwinklingStar(struct Sprite *sprite)
     if (y > 3)
         y = -y;
 
-    sprite->pos2.y = y;
+    sprite->y2 = y;
     sprite->callback = AnimMiniTwinklingStar_Step;
 }
 
@@ -2226,9 +2226,9 @@ static void AnimSwallowBlueOrb(struct Sprite *sprite)
         sprite->data[0]++;
         break;
     case 1:
-        sprite->pos2.y -= sprite->data[1] >> 8;
+        sprite->y2 -= sprite->data[1] >> 8;
         sprite->data[1] -= 96;
-        if (sprite->pos1.y + sprite->pos2.y > sprite->data[2])
+        if (sprite->y + sprite->y2 > sprite->data[2])
             DestroyAnimSprite(sprite);
         break;
     }
@@ -2476,13 +2476,13 @@ static void AnimGreenStar(struct Sprite *sprite)
     if (xOffset > 31)
         xOffset = 32 - xOffset;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + xOffset;
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32;
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + xOffset;
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32;
     sprite->data[1] = gBattleAnimArgs[0];
     sprite->data[2] = gBattleAnimArgs[1];
 
-    spriteId1 = CreateSprite(&gGreenStarSpriteTemplate, sprite->pos1.x, sprite->pos1.y, sprite->subpriority + 1);
-    spriteId2 = CreateSprite(&gGreenStarSpriteTemplate, sprite->pos1.x, sprite->pos1.y, sprite->subpriority + 1);
+    spriteId1 = CreateSprite(&gGreenStarSpriteTemplate, sprite->x, sprite->y, sprite->subpriority + 1);
+    spriteId2 = CreateSprite(&gGreenStarSpriteTemplate, sprite->x, sprite->y, sprite->subpriority + 1);
     StartSpriteAnim(&gSprites[spriteId1], 1);
     StartSpriteAnim(&gSprites[spriteId2], 2);
 
@@ -2505,16 +2505,16 @@ static void AnimGreenStar(struct Sprite *sprite)
 static void AnimGreenStar_Step1(struct Sprite *sprite)
 {
     s16 delta = sprite->data[3] + sprite->data[2];
-    sprite->pos2.y -= delta >> 8;
+    sprite->y2 -= delta >> 8;
     sprite->data[3] += sprite->data[2];
     sprite->data[3] &= 0xFF;
-    if (sprite->data[4] == 0 && sprite->pos2.y < -8)
+    if (sprite->data[4] == 0 && sprite->y2 < -8)
     {
         gSprites[sprite->data[6]].invisible = FALSE;
         sprite->data[4]++;
     }
 
-    if (sprite->data[4] == 1 && sprite->pos2.y < -16)
+    if (sprite->data[4] == 1 && sprite->y2 < -16)
     {
         gSprites[sprite->data[7]].invisible = FALSE;
         sprite->data[4]++;
@@ -2543,7 +2543,7 @@ static void AnimGreenStar_Callback(struct Sprite *sprite)
     if (!sprite->invisible)
     {
         s16 delta = sprite->data[3] + sprite->data[2];
-        sprite->pos2.y -= delta >> 8;
+        sprite->y2 -= delta >> 8;
         sprite->data[3] += sprite->data[2];
         sprite->data[3] &= 0xFF;
         if (--sprite->data[1] == -1)
@@ -2686,12 +2686,12 @@ static void AnimWeakFrustrationAngerMark(struct Sprite *sprite)
         sprite->data[2] += 128;
 
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-            sprite->pos2.x = -(sprite->data[1] >> 8);
+            sprite->x2 = -(sprite->data[1] >> 8);
         else
-            sprite->pos2.x = sprite->data[1] >> 8;
+            sprite->x2 = sprite->data[1] >> 8;
 
-        sprite->pos2.y += sprite->data[2] >> 8;
-        if (sprite->pos2.y > 64)
+        sprite->y2 += sprite->data[2] >> 8;
+        if (sprite->y2 > 64)
             DestroyAnimSprite(sprite);
     }
 }
@@ -2747,7 +2747,7 @@ static void AnimTask_RockMonBackAndForth_Step(u8 taskId)
     switch (task->data[0])
     {
     case 0:
-        gSprites[task->data[15]].pos2.x += task->data[5];
+        gSprites[task->data[15]].x2 += task->data[5];
         task->data[2] -= task->data[4];
         SetSpriteRotScale(task->data[15], 0x100, 0x100, task->data[2]);
         SetBattlerSpriteYOffsetFromRotation(task->data[15]);
@@ -2758,7 +2758,7 @@ static void AnimTask_RockMonBackAndForth_Step(u8 taskId)
         }
         break;
     case 1:
-        gSprites[task->data[15]].pos2.x -= task->data[5];
+        gSprites[task->data[15]].x2 -= task->data[5];
         task->data[2] += task->data[4];
         SetSpriteRotScale(task->data[15], 0x100, 0x100, task->data[2]);
         SetBattlerSpriteYOffsetFromRotation(task->data[15]);
@@ -2769,7 +2769,7 @@ static void AnimTask_RockMonBackAndForth_Step(u8 taskId)
         }
         break;
     case 2:
-        gSprites[task->data[15]].pos2.x += task->data[5];
+        gSprites[task->data[15]].x2 += task->data[5];
         task->data[2] -= task->data[4];
         SetSpriteRotScale(task->data[15], 0x100, 0x100, task->data[2]);
         SetBattlerSpriteYOffsetFromRotation(task->data[15]);
@@ -2802,13 +2802,13 @@ static void AnimSweetScentPetal(struct Sprite *sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
-        sprite->pos1.x = 0;
-        sprite->pos1.y = gBattleAnimArgs[0];
+        sprite->x = 0;
+        sprite->y = gBattleAnimArgs[0];
     }
     else
     {
-        sprite->pos1.x = DISPLAY_WIDTH;
-        sprite->pos1.y = gBattleAnimArgs[0] - 30;
+        sprite->x = DISPLAY_WIDTH;
+        sprite->y = gBattleAnimArgs[0] - 30;
     }
 
     sprite->data[2] = gBattleAnimArgs[2];
@@ -2821,23 +2821,23 @@ static void AnimSweetScentPetal_Step(struct Sprite *sprite)
     sprite->data[0] += 3;
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
     {
-        sprite->pos1.x += 5;
-        sprite->pos1.y -= 1;
+        sprite->x += 5;
+        sprite->y -= 1;
 
-        if (sprite->pos1.x > DISPLAY_WIDTH)
+        if (sprite->x > DISPLAY_WIDTH)
             DestroyAnimSprite(sprite);
 
-        sprite->pos2.y = Sin(sprite->data[0] & 0xFF, 16);
+        sprite->y2 = Sin(sprite->data[0] & 0xFF, 16);
     }
     else
     {
-        sprite->pos1.x -= 5;
-        sprite->pos1.y += 1;
+        sprite->x -= 5;
+        sprite->y += 1;
 
-        if (sprite->pos1.x < 0)
+        if (sprite->x < 0)
             DestroyAnimSprite(sprite);
 
-        sprite->pos2.y = Cos(sprite->data[0] & 0xFF, 16);
+        sprite->y2 = Cos(sprite->data[0] & 0xFF, 16);
     }
 }
 
@@ -2913,7 +2913,7 @@ static void AnimTask_FlailMovement_Step(u8 taskId)
 
     SetSpriteRotScale(task->data[15], 0x100, 0x100, task->data[2]);
     SetBattlerSpriteYOffsetFromRotation(task->data[15]);
-    gSprites[task->data[15]].pos2.x = -(((temp = task->data[2]) >= 0 ? task->data[2] : temp + 63) >> 6);
+    gSprites[task->data[15]].x2 = -(((temp = task->data[2]) >= 0 ? task->data[2] : temp + 63) >> 6);
 
     if (++task->data[1] > 8)
     {
@@ -2941,12 +2941,12 @@ static void AnimPainSplitProjectile(struct Sprite *sprite)
     {
         if (gBattleAnimArgs[2] == ANIM_ATTACKER)
         {
-            sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-            sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+            sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+            sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
         }
 
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         sprite->data[1] = 0x80;
         sprite->data[2] = 0x300;
         sprite->data[3] = gBattleAnimArgs[1];
@@ -2954,9 +2954,9 @@ static void AnimPainSplitProjectile(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos2.x = sprite->data[1] >> 8;
-        sprite->pos2.y += sprite->data[2] >> 8;
-        if (sprite->data[4] == 0 && sprite->pos2.y > -sprite->data[3])
+        sprite->x2 = sprite->data[1] >> 8;
+        sprite->y2 += sprite->data[2] >> 8;
+        if (sprite->data[4] == 0 && sprite->y2 > -sprite->data[3])
         {
             sprite->data[4] = 1;
             sprite->data[2] = (-sprite->data[2] / 3) * 2;
@@ -2997,17 +2997,17 @@ void AnimTask_PainSplitMovement(u8 taskId)
             SetSpriteRotScale(spriteId, 0xD0, 0x130, 0xF00);
             SetBattlerSpriteYOffsetFromYScale(spriteId);
             if (IsContest() || GetBattlerSide(gTasks[taskId].data[11]) == B_SIDE_PLAYER)
-                gSprites[spriteId].pos2.y += 16;
+                gSprites[spriteId].y2 += 16;
             break;
         case 2:
             SetSpriteRotScale(spriteId, 0xD0, 0x130, 0xF100);
             SetBattlerSpriteYOffsetFromYScale(spriteId);
             if (IsContest() || GetBattlerSide(gTasks[taskId].data[11]) == B_SIDE_PLAYER)
-                gSprites[spriteId].pos2.y += 16;
+                gSprites[spriteId].y2 += 16;
             break;
         }
 
-        gSprites[spriteId].pos2.x = 2;
+        gSprites[spriteId].x2 = 2;
         gTasks[taskId].data[0]++;
     }
     else
@@ -3016,14 +3016,14 @@ void AnimTask_PainSplitMovement(u8 taskId)
         if (++gTasks[taskId].data[2] == 3)
         {
             gTasks[taskId].data[2] = 0;
-            gSprites[spriteId].pos2.x = -gSprites[spriteId].pos2.x;
+            gSprites[spriteId].x2 = -gSprites[spriteId].x2;
         }
 
         if (++gTasks[taskId].data[1] == 13)
         {
             ResetSpriteRotScale(spriteId);
-            gSprites[spriteId].pos2.x = 0;
-            gSprites[spriteId].pos2.y = 0;
+            gSprites[spriteId].x2 = 0;
+            gSprites[spriteId].y2 = 0;
             DestroyAnimVisualTask(taskId);
         }
     }
@@ -3054,11 +3054,11 @@ static void AnimFlatterConfetti(struct Sprite *sprite)
 
     sprite->data[2] = gBattleAnimArgs[0];
     if (sprite->data[2] == ANIM_ATTACKER)
-        sprite->pos1.x = -8;
+        sprite->x = -8;
     else
-        sprite->pos1.x = 248;
+        sprite->x = 248;
 
-    sprite->pos1.y = 104;
+    sprite->y = 104;
     sprite->callback = AnimFlatterConfetti_Step;
 }
 
@@ -3066,13 +3066,13 @@ static void AnimFlatterConfetti_Step(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
-        sprite->pos2.x += sprite->data[0] >> 8;
-        sprite->pos2.y -= sprite->data[1] >> 8;
+        sprite->x2 += sprite->data[0] >> 8;
+        sprite->y2 -= sprite->data[1] >> 8;
     }
     else
     {
-        sprite->pos2.x -= sprite->data[0] >> 8;
-        sprite->pos2.y -= sprite->data[1] >> 8;
+        sprite->x2 -= sprite->data[0] >> 8;
+        sprite->y2 -= sprite->data[1] >> 8;
     }
 
     sprite->data[0] -= 22;
@@ -3140,8 +3140,8 @@ static void AnimFlatterSpotlight_Step(struct Sprite *sprite)
 // arg 1: initial wave offset
 static void AnimReversalOrb(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     sprite->data[0] = gBattleAnimArgs[0];
     sprite->data[1] = gBattleAnimArgs[1];
     sprite->callback = AnimReversalOrb_Step;
@@ -3150,8 +3150,8 @@ static void AnimReversalOrb(struct Sprite *sprite)
 
 static void AnimReversalOrb_Step(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[1], sprite->data[2] >> 8);
-    sprite->pos2.y = Cos(sprite->data[1], sprite->data[3] >> 8);
+    sprite->x2 = Sin(sprite->data[1], sprite->data[2] >> 8);
+    sprite->y2 = Cos(sprite->data[1], sprite->data[3] >> 8);
     sprite->data[1] = (sprite->data[1] + 9) & 0xFF;
 
     if ((u16)sprite->data[1] < 64 || sprite->data[1] > 195)
@@ -3496,14 +3496,14 @@ static void AnimTask_DeepInhale_Step(u8 taskId)
             task->data[1] = 0;
             task->data[2]++;
             if (task->data[2] & 1)
-                gSprites[task->data[15]].pos2.x = 1;
+                gSprites[task->data[15]].x2 = 1;
             else
-                gSprites[task->data[15]].pos2.x = -1;
+                gSprites[task->data[15]].x2 = -1;
         }
     }
     else
     {
-        gSprites[task->data[15]].pos2.x = 0;
+        gSprites[task->data[15]].x2 = 0;
     }
 
     if (!RunAffineAnimFromTaskData(&gTasks[taskId]))
@@ -3512,8 +3512,8 @@ static void AnimTask_DeepInhale_Step(u8 taskId)
 
 static void InitYawnCloudPosition(struct Sprite *sprite, s16 startX, s16 startY, s16 destX, s16 destY, u16 duration)
 {
-    sprite->pos1.x = startX;
-    sprite->pos1.y = startY;
+    sprite->x = startX;
+    sprite->y = startY;
     sprite->data[4] = startX << 4;
     sprite->data[5] = startY << 4;
     sprite->data[6] = ((destX - startX) << 4) / duration;
@@ -3524,20 +3524,20 @@ static void UpdateYawnCloudPosition(struct Sprite *sprite)
 {
     sprite->data[4] += sprite->data[6];
     sprite->data[5] += sprite->data[7];
-    sprite->pos1.x = sprite->data[4] >> 4;
-    sprite->pos1.y = sprite->data[5] >> 4;
+    sprite->x = sprite->data[4] >> 4;
+    sprite->y = sprite->data[5] >> 4;
 }
 
 // Drifts a cloud in a wavy path towards the target mon.
 // arg 0: which affine anim
 static void AnimYawnCloud(struct Sprite *sprite)
 {
-    s16 destX = sprite->pos1.x;
-    s16 destY = sprite->pos1.y;
+    s16 destX = sprite->x;
+    s16 destY = sprite->y;
 
     SetSpriteCoordsToAnimAttackerCoords(sprite);
     StartSpriteAffineAnim(sprite, gBattleAnimArgs[0]);
-    InitYawnCloudPosition(sprite, sprite->pos1.x, sprite->pos1.y, destX, destY, 64);
+    InitYawnCloudPosition(sprite, sprite->x, sprite->y, destX, destY, 64);
     sprite->data[0] = 0;
     sprite->callback = AnimYawnCloud_Step;
 }
@@ -3549,7 +3549,7 @@ static void AnimYawnCloud_Step(struct Sprite *sprite)
     sprite->data[0]++;
     index = (sprite->data[0] * 8) & 0xFF;
     UpdateYawnCloudPosition(sprite);
-    sprite->pos2.y = Sin(index, 8);
+    sprite->y2 = Sin(index, 8);
     if (sprite->data[0] > 58)
     {
         if (++sprite->data[1] > 1)
@@ -3575,8 +3575,8 @@ static void AnimSmokeBallEscapeCloud(struct Sprite *sprite)
     if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER)
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
     sprite->callback = DestroyAnimSpriteAfterTimer;
 }
 
@@ -3614,14 +3614,14 @@ static void AnimTask_SlideMonForFocusBand_Step2(u8 taskId)
     var0 = gTasks[taskId].data[7];
     var1 = gTasks[taskId].data[8];
     if (gTasks[taskId].data[2] & 0x8000)
-        gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] - (var0 >> 8);
+        gSprites[gTasks[taskId].data[15]].x2 = gTasks[taskId].data[9] - (var0 >> 8);
     else
-        gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] + (var0 >> 8);
+        gSprites[gTasks[taskId].data[15]].x2 = gTasks[taskId].data[9] + (var0 >> 8);
 
     if (gTasks[taskId].data[3] & 0x8000)
-        gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] - (var1 >> 8);
+        gSprites[gTasks[taskId].data[15]].y2 = gTasks[taskId].data[10] - (var1 >> 8);
     else
-        gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] + (var1 >> 8);
+        gSprites[gTasks[taskId].data[15]].y2 = gTasks[taskId].data[10] + (var1 >> 8);
 
     if (gTasks[taskId].data[0] < 1)
     {
@@ -3664,14 +3664,14 @@ static void AnimTask_SlideMonForFocusBand_Step1(u8 taskId)
     var0 = (gTasks[taskId].data[2] & 0x7FFF) + gTasks[taskId].data[7];
     var1 = (gTasks[taskId].data[3] & 0x7FFF) + gTasks[taskId].data[8];
     if (gTasks[taskId].data[2] & 0x8000)
-        gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] - (var0 >> 8);
+        gSprites[gTasks[taskId].data[15]].x2 = gTasks[taskId].data[9] - (var0 >> 8);
     else
-        gSprites[gTasks[taskId].data[15]].pos2.x = gTasks[taskId].data[9] + (var0 >> 8);
+        gSprites[gTasks[taskId].data[15]].x2 = gTasks[taskId].data[9] + (var0 >> 8);
 
     if (gTasks[taskId].data[3] & 0x8000)
-        gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] - (var1 >> 8);
+        gSprites[gTasks[taskId].data[15]].y2 = gTasks[taskId].data[10] - (var1 >> 8);
     else
-        gSprites[gTasks[taskId].data[15]].pos2.y = gTasks[taskId].data[10] + (var1 >> 8);
+        gSprites[gTasks[taskId].data[15]].y2 = gTasks[taskId].data[10] + (var1 >> 8);
 
     gTasks[taskId].data[7] = var0;
     gTasks[taskId].data[8] = var1;
@@ -3823,8 +3823,8 @@ static void CreateSweatDroplets(u8 taskId, bool8 arg1)
 
 static void AnimFacadeSweatDrop(struct Sprite *sprite)
 {
-    sprite->pos1.x += sprite->data[1];
-    sprite->pos1.y += sprite->data[2];
+    sprite->x += sprite->data[1];
+    sprite->y += sprite->data[2];
     if (++sprite->data[0] > 6)
     {
         gTasks[sprite->data[3]].data[sprite->data[4]]--;
@@ -3889,8 +3889,8 @@ static void AnimRoarNoiseLine(struct Sprite *sprite)
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X) + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y) + gBattleAnimArgs[1];
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X) + gBattleAnimArgs[0];
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y) + gBattleAnimArgs[1];
     if (gBattleAnimArgs[2] == 0)
     {
         sprite->data[0] = 0x280;
@@ -3921,8 +3921,8 @@ static void AnimRoarNoiseLine_Step(struct Sprite *sprite)
 {
     sprite->data[6] += sprite->data[0];
     sprite->data[7] += sprite->data[1];
-    sprite->pos2.x = sprite->data[6] >> 8;
-    sprite->pos2.y = sprite->data[7] >> 8;
+    sprite->x2 = sprite->data[6] >> 8;
+    sprite->y2 = sprite->data[7] >> 8;
     if (++sprite->data[5] == 14)
         DestroyAnimSprite(sprite);
 }
@@ -3987,21 +3987,21 @@ static void AnimTask_GlareEyeDots_Step(u8 taskId)
                     if (task->data[7] == 0)
                     {
                         if (i == 0)
-                            gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = -task->data[6];
+                            gSprites[spriteId].x2 = gSprites[spriteId].y2 = -task->data[6];
                         else
-                            gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = task->data[6];
+                            gSprites[spriteId].x2 = gSprites[spriteId].y2 = task->data[6];
                     }
                     else
                     {
                         if (i == 0)
                         {
-                            gSprites[spriteId].pos2.x = -task->data[6];
-                            gSprites[spriteId].pos2.y = task->data[6];
+                            gSprites[spriteId].x2 = -task->data[6];
+                            gSprites[spriteId].y2 = task->data[6];
                         }
                         else
                         {
-                            gSprites[spriteId].pos2.x = task->data[6];
-                            gSprites[spriteId].pos2.y = -task->data[6];
+                            gSprites[spriteId].x2 = task->data[6];
+                            gSprites[spriteId].y2 = -task->data[6];
                         }
                     }
 
@@ -4068,8 +4068,8 @@ static void AnimGlareEyeDot(struct Sprite *sprite)
 // arg 4: duration
 static void AnimAssistPawprint(struct Sprite *sprite)
 {
-    sprite->pos1.x = gBattleAnimArgs[0];
-    sprite->pos1.y = gBattleAnimArgs[1];
+    sprite->x = gBattleAnimArgs[0];
+    sprite->y = gBattleAnimArgs[1];
     sprite->data[2] = gBattleAnimArgs[2];
     sprite->data[4] = gBattleAnimArgs[3];
     sprite->data[0] = gBattleAnimArgs[4];
@@ -4165,15 +4165,15 @@ static void AnimSmellingSaltsHand(struct Sprite *sprite)
     sprite->oam.tileNum += 16;
     sprite->data[6] = gBattleAnimArgs[2];
     sprite->data[7] = gBattleAnimArgs[1] == 0 ? -1 : 1;
-    sprite->pos1.y = GetBattlerSpriteCoord(battler, 3);
+    sprite->y = GetBattlerSpriteCoord(battler, 3);
     if (gBattleAnimArgs[1] == 0)
     {
         sprite->oam.matrixNum |= ST_OAM_HFLIP;
-        sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_LEFT) - 8;
+        sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_LEFT) - 8;
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) + 8;
+        sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) + 8;
     }
 
     sprite->callback = AnimSmellingSaltsHand_Step;
@@ -4187,7 +4187,7 @@ static void AnimSmellingSaltsHand_Step(struct Sprite *sprite)
         if (++sprite->data[1] > 1)
         {
             sprite->data[1] = 0;
-            sprite->pos2.x += sprite->data[7];
+            sprite->x2 += sprite->data[7];
             if (++sprite->data[2] == 12)
                 sprite->data[0]++;
         }
@@ -4200,7 +4200,7 @@ static void AnimSmellingSaltsHand_Step(struct Sprite *sprite)
         }
         break;
     case 2:
-        sprite->pos2.x -= sprite->data[7] * 4;
+        sprite->x2 -= sprite->data[7] * 4;
         if (++sprite->data[1] == 6)
         {
             sprite->data[1] = 0;
@@ -4208,7 +4208,7 @@ static void AnimSmellingSaltsHand_Step(struct Sprite *sprite)
         }
         break;
     case 3:
-        sprite->pos2.x += sprite->data[7] * 3;
+        sprite->x2 += sprite->data[7] * 3;
         if (++sprite->data[1] == 8)
         {
             if (--sprite->data[6])
@@ -4251,14 +4251,14 @@ static void AnimTask_SmellingSaltsSquish_Step(u8 taskId)
     {
         task->data[1] = 0;
         if (!(task->data[2] & 1))
-            gSprites[task->data[15]].pos2.x = 2;
+            gSprites[task->data[15]].x2 = 2;
         else
-            gSprites[task->data[15]].pos2.x = -2;
+            gSprites[task->data[15]].x2 = -2;
     }
 
     if (!RunAffineAnimFromTaskData(task))
     {
-        gSprites[task->data[15]].pos2.x = 0;
+        gSprites[task->data[15]].x2 = 0;
         if (--task->data[0])
         {
             PrepareAffineAnimInTaskData(&gTasks[taskId], gTasks[taskId].data[15], gSmellingSaltsSquishAffineAnimCmds);
@@ -4280,17 +4280,17 @@ static void AnimSmellingSaltExclamation(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == ANIM_ATTACKER)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_TOP);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+        sprite->y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_TOP);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-        sprite->pos1.y = GetBattlerSpriteCoordAttr(gBattleAnimTarget, BATTLER_COORD_ATTR_TOP);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->y = GetBattlerSpriteCoordAttr(gBattleAnimTarget, BATTLER_COORD_ATTR_TOP);
     }
 
-    if (sprite->pos1.y < 8)
-        sprite->pos1.y = 8;
+    if (sprite->y < 8)
+        sprite->y = 8;
 
     sprite->data[0] = 0;
     sprite->data[1] = gBattleAnimArgs[1];
@@ -4319,16 +4319,16 @@ static void AnimHelpingHandClap(struct Sprite *sprite)
     if (gBattleAnimArgs[0] == 0)
     {
         sprite->oam.matrixNum |= ST_OAM_HFLIP;
-        sprite->pos1.x = 100;
+        sprite->x = 100;
         sprite->data[7] = 1;
     }
     else
     {
-        sprite->pos1.x = 140;
+        sprite->x = 140;
         sprite->data[7] = -1;
     }
 
-    sprite->pos1.y = 56;
+    sprite->y = 56;
     sprite->callback = AnimHelpingHandClap_Step;
 }
 
@@ -4337,9 +4337,9 @@ static void AnimHelpingHandClap_Step(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos1.y -= sprite->data[7] * 2;
+        sprite->y -= sprite->data[7] * 2;
         if (sprite->data[1] & 1)
-            sprite->pos1.x -= sprite->data[7] * 2;
+            sprite->x -= sprite->data[7] * 2;
 
         if (++sprite->data[1] == 9)
         {
@@ -4356,8 +4356,8 @@ static void AnimHelpingHandClap_Step(struct Sprite *sprite)
         break;
     case 2:
         sprite->data[1]++;
-        sprite->pos1.y += sprite->data[7] * 3;
-        sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3);
+        sprite->y += sprite->data[7] * 3;
+        sprite->x2 = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3);
         if (sprite->data[1] == 12)
         {
             sprite->data[1] = 0;
@@ -4373,15 +4373,15 @@ static void AnimHelpingHandClap_Step(struct Sprite *sprite)
         break;
     case 4:
         sprite->data[1]++;
-        sprite->pos1.y -= sprite->data[7] * 3;
-        sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3);
+        sprite->y -= sprite->data[7] * 3;
+        sprite->x2 = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3);
         if (sprite->data[1] == 12)
             sprite->data[0]++;
         break;
     case 5:
         sprite->data[1]++;
-        sprite->pos1.y += sprite->data[7] * 3;
-        sprite->pos2.x = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3);
+        sprite->y += sprite->data[7] * 3;
+        sprite->x2 = sprite->data[7] * (gSineTable[sprite->data[1] * 10] >> 3);
         if (sprite->data[1] == 15)
             sprite->oam.tileNum += 16;
 
@@ -4392,7 +4392,7 @@ static void AnimHelpingHandClap_Step(struct Sprite *sprite)
         }
         break;
     case 6:
-        sprite->pos1.x += sprite->data[7] * 6;
+        sprite->x += sprite->data[7] * 6;
         if (++sprite->data[1] == 9)
         {
             sprite->data[1] = 0;
@@ -4400,7 +4400,7 @@ static void AnimHelpingHandClap_Step(struct Sprite *sprite)
         }
         break;
     case 7:
-        sprite->pos1.x += sprite->data[7] * 2;
+        sprite->x += sprite->data[7] * 2;
         if (++sprite->data[1] == 1)
         {
             sprite->data[1] = 0;
@@ -4408,7 +4408,7 @@ static void AnimHelpingHandClap_Step(struct Sprite *sprite)
         }
         break;
     case 8:
-        sprite->pos1.x -= sprite->data[7] * 3;
+        sprite->x -= sprite->data[7] * 3;
         if (++sprite->data[1] == 5)
             DestroyAnimSprite(sprite);
         break;
@@ -4463,7 +4463,7 @@ static void AnimTask_HelpingHandAttackerMovement_Step(u8 taskId)
         }
         break;
     case 1:
-        gSprites[task->data[15]].pos2.x -= task->data[14] * 3;
+        gSprites[task->data[15]].x2 -= task->data[14] * 3;
         if (++task->data[1] == 6)
         {
             task->data[1] = 0;
@@ -4471,7 +4471,7 @@ static void AnimTask_HelpingHandAttackerMovement_Step(u8 taskId)
         }
         break;
     case 2:
-        gSprites[task->data[15]].pos2.x += task->data[14] * 3;
+        gSprites[task->data[15]].x2 += task->data[14] * 3;
         if (++task->data[1] == 6)
         {
             task->data[1] = 0;
@@ -4494,7 +4494,7 @@ static void AnimTask_HelpingHandAttackerMovement_Step(u8 taskId)
         }
         break;
     case 4:
-        gSprites[task->data[15]].pos2.x += task->data[14];
+        gSprites[task->data[15]].x2 += task->data[14];
         if (++task->data[1] == 3)
         {
             task->data[1] = 0;
@@ -4509,7 +4509,7 @@ static void AnimTask_HelpingHandAttackerMovement_Step(u8 taskId)
         }
         break;
     case 6:
-        gSprites[task->data[15]].pos2.x -= task->data[14] * 4;
+        gSprites[task->data[15]].x2 -= task->data[14] * 4;
         if (++task->data[1] == 5)
         {
             task->data[1] = 0;
@@ -4517,7 +4517,7 @@ static void AnimTask_HelpingHandAttackerMovement_Step(u8 taskId)
         }
         break;
     case 7:
-        gSprites[task->data[15]].pos2.x += task->data[14] * 4;
+        gSprites[task->data[15]].x2 += task->data[14] * 4;
         if (++task->data[1] == 5)
         {
             task->data[1] = 0;
@@ -4525,7 +4525,7 @@ static void AnimTask_HelpingHandAttackerMovement_Step(u8 taskId)
         }
         break;
     case 8:
-        gSprites[task->data[15]].pos2.x = 0;
+        gSprites[task->data[15]].x2 = 0;
         DestroyAnimVisualTask(taskId);
         break;
     }
@@ -4594,9 +4594,9 @@ static void AnimForesightMagnifyingGlass_Step(struct Sprite *sprite)
         else
             sprite->data[0] = 12;
 
-        sprite->data[1] = sprite->pos1.x;
+        sprite->data[1] = sprite->x;
         sprite->data[2] = x;
-        sprite->data[3] = sprite->pos1.y;
+        sprite->data[3] = sprite->y;
         sprite->data[4] = y;
         InitAnimLinearTranslation(sprite);
         sprite->data[5]++;
@@ -4607,19 +4607,19 @@ static void AnimForesightMagnifyingGlass_Step(struct Sprite *sprite)
             switch (sprite->data[6])
             {
             default:
-                sprite->pos1.x += sprite->pos2.x;
-                sprite->pos1.y += sprite->pos2.y;
-                sprite->pos2.y = 0;
-                sprite->pos2.x = 0;
+                sprite->x += sprite->x2;
+                sprite->y += sprite->y2;
+                sprite->y2 = 0;
+                sprite->x2 = 0;
                 sprite->data[0] = 0;
                 sprite->data[5]++;
                 sprite->data[6]++;
                 break;
             case 4:
-                sprite->pos1.x += sprite->pos2.x;
-                sprite->pos1.y += sprite->pos2.y;
-                sprite->pos2.y = 0;
-                sprite->pos2.x = 0;
+                sprite->x += sprite->x2;
+                sprite->y += sprite->y2;
+                sprite->y2 = 0;
+                sprite->x2 = 0;
                 sprite->data[5] = 0;
                 sprite->data[6]++;
                 break;
@@ -4657,14 +4657,14 @@ static void AnimForesightMagnifyingGlass_Step(struct Sprite *sprite)
 
 static void AnimMeteorMashStar_Step(struct Sprite *sprite)
 {
-    sprite->pos2.x = ((sprite->data[2] - sprite->data[0]) * sprite->data[5]) / sprite->data[4];
-    sprite->pos2.y = ((sprite->data[3] - sprite->data[1]) * sprite->data[5]) / sprite->data[4];
+    sprite->x2 = ((sprite->data[2] - sprite->data[0]) * sprite->data[5]) / sprite->data[4];
+    sprite->y2 = ((sprite->data[3] - sprite->data[1]) * sprite->data[5]) / sprite->data[4];
     if (!(sprite->data[5] & 1))
     {
         CreateSprite(
             &gMiniTwinklingStarSpriteTemplate,
-            sprite->pos1.x + sprite->pos2.x,
-            sprite->pos1.y + sprite->pos2.y, 5);
+            sprite->x + sprite->x2,
+            sprite->y + sprite->y2, 5);
     }
 
     if (sprite->data[5] == sprite->data[4])
@@ -4686,20 +4686,20 @@ static void AnimMeteorMashStar(struct Sprite *sprite)
 
     if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER || IsContest())
     {
-        sprite->data[0] = sprite->pos1.x - gBattleAnimArgs[0];
-        sprite->data[2] = sprite->pos1.x - gBattleAnimArgs[2];
+        sprite->data[0] = sprite->x - gBattleAnimArgs[0];
+        sprite->data[2] = sprite->x - gBattleAnimArgs[2];
     }
     else
     {
-        sprite->data[0] = sprite->pos1.x + gBattleAnimArgs[0];
-        sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
+        sprite->data[0] = sprite->x + gBattleAnimArgs[0];
+        sprite->data[2] = sprite->x + gBattleAnimArgs[2];
     }
 
-    sprite->data[1] = sprite->pos1.y + gBattleAnimArgs[1];
-    sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[3];
+    sprite->data[1] = sprite->y + gBattleAnimArgs[1];
+    sprite->data[3] = sprite->y + gBattleAnimArgs[3];
     sprite->data[4] = gBattleAnimArgs[4];
-    sprite->pos1.x = sprite->data[0];
-    sprite->pos1.y = sprite->data[1];
+    sprite->x = sprite->data[0];
+    sprite->y = sprite->data[1];
     sprite->callback = AnimMeteorMashStar_Step;
 }
 
@@ -4751,22 +4751,22 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId)
     switch (gTasks[taskId].data[0])
     {
     case 0:
-        gSprites[spriteId].pos2.y = -200;
-        gSprites[spriteId].pos2.x = 200;
+        gSprites[spriteId].y2 = -200;
+        gSprites[spriteId].x2 = 200;
         gSprites[spriteId].invisible = FALSE;
         gTasks[taskId].data[10] = 0;
         gTasks[taskId].data[0]++;
         break;
     case 1:
         gTasks[taskId].data[10] += 112;
-        gSprites[spriteId].pos2.y += gTasks[taskId].data[10] >> 8;
-        if (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y >= -32)
-            gSprites[spriteId].pos2.x = 0;
+        gSprites[spriteId].y2 += gTasks[taskId].data[10] >> 8;
+        if (gSprites[spriteId].y + gSprites[spriteId].y2 >= -32)
+            gSprites[spriteId].x2 = 0;
 
-        if (gSprites[spriteId].pos2.y > 0)
-            gSprites[spriteId].pos2.y = 0;
+        if (gSprites[spriteId].y2 > 0)
+            gSprites[spriteId].y2 = 0;
 
-        if (gSprites[spriteId].pos2.y == 0)
+        if (gSprites[spriteId].y2 == 0)
         {
             PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(-64));
             gTasks[taskId].data[10] -= 0x800;
@@ -4778,17 +4778,17 @@ static void AnimTask_MonToSubstituteDoll(u8 taskId)
         if (gTasks[taskId].data[10] < 0)
             gTasks[taskId].data[10] = 0;
 
-        gSprites[spriteId].pos2.y -= gTasks[taskId].data[10] >> 8;
+        gSprites[spriteId].y2 -= gTasks[taskId].data[10] >> 8;
         if (gTasks[taskId].data[10] == 0)
             gTasks[taskId].data[0]++;
         break;
     case 3:
         gTasks[taskId].data[10] += 112;
-        gSprites[spriteId].pos2.y += gTasks[taskId].data[10] >> 8;
-        if (gSprites[spriteId].pos2.y > 0)
-            gSprites[spriteId].pos2.y = 0;
+        gSprites[spriteId].y2 += gTasks[taskId].data[10] >> 8;
+        if (gSprites[spriteId].y2 > 0)
+            gSprites[spriteId].y2 = 0;
 
-        if (gSprites[spriteId].pos2.y == 0)
+        if (gSprites[spriteId].y2 == 0)
         {
             PlaySE12WithPanning(SE_M_BUBBLE2, BattleAnimAdjustPanning(-64));
             DestroyAnimVisualTask(taskId);
@@ -4814,8 +4814,8 @@ static void AnimBlockX(struct Sprite *sprite)
         y = -96;
     }
 
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
-    sprite->pos2.y = y;
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+    sprite->y2 = y;
     sprite->callback = AnimBlockX_Step;
 }
 
@@ -4824,32 +4824,32 @@ static void AnimBlockX_Step(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos2.y += 10;
-        if (sprite->pos2.y >= 0)
+        sprite->y2 += 10;
+        if (sprite->y2 >= 0)
         {
             PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(63));
-            sprite->pos2.y = 0;
+            sprite->y2 = 0;
             sprite->data[0]++;
         }
         break;
     case 1:
         sprite->data[1] += 4;
-        sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 3);
+        sprite->y2 = -(gSineTable[sprite->data[1]] >> 3);
         if (sprite->data[1] > 0x7F)
         {
             PlaySE12WithPanning(SE_M_SKETCH, BattleAnimAdjustPanning(63));
             sprite->data[1] = 0;
-            sprite->pos2.y = 0;
+            sprite->y2 = 0;
             sprite->data[0]++;
         }
         break;
     case 2:
         sprite->data[1] += 6;
-        sprite->pos2.y = -(gSineTable[sprite->data[1]] >> 4);
+        sprite->y2 = -(gSineTable[sprite->data[1]] >> 4);
         if (sprite->data[1] > 0x7F)
         {
             sprite->data[1] = 0;
-            sprite->pos2.y = 0;
+            sprite->y2 = 0;
             sprite->data[0]++;
         }
         break;
@@ -4901,8 +4901,8 @@ void AnimTask_OdorSleuthMovement(u8 taskId)
         return;
     }
 
-    gSprites[spriteId2].pos2.x += 24;
-    gSprites[spriteId1].pos2.x -= 24;
+    gSprites[spriteId2].x2 += 24;
+    gSprites[spriteId1].x2 -= 24;
     gSprites[spriteId2].data[0] = 0;
     gSprites[spriteId1].data[0] = 0;
     gSprites[spriteId2].data[1] = 0;
@@ -4956,7 +4956,7 @@ static void MoveOdorSleuthClone(struct Sprite *sprite)
 
     sprite->data[4] = sprite->data[4] + sprite->data[3];
     sprite->data[4] &= 0xFF;
-    sprite->pos2.x = Cos(sprite->data[4], sprite->data[5]);
+    sprite->x2 = Cos(sprite->data[4], sprite->data[5]);
     switch (sprite->data[0])
     {
     case 0:
@@ -5014,12 +5014,12 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
         spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
         gTasks[taskId].data[1] += 0x800;
         if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
-            gSprites[spriteId].pos2.x += (gTasks[taskId].data[1] >> 8);
+            gSprites[spriteId].x2 += (gTasks[taskId].data[1] >> 8);
         else
-            gSprites[spriteId].pos2.x -= (gTasks[taskId].data[1] >> 8);
+            gSprites[spriteId].x2 -= (gTasks[taskId].data[1] >> 8);
 
         gTasks[taskId].data[1] &= 0xFF;
-        x = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
+        x = gSprites[spriteId].x + gSprites[spriteId].x2;
         if ((u16)(x + 32) > 304)
         {
             gTasks[taskId].data[1] = 0;
@@ -5077,12 +5077,12 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
         spriteId2 = gTasks[taskId].data[15];
         gTasks[taskId].data[1] += 0x800;
         if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
-            gSprites[spriteId2].pos2.x -= (gTasks[taskId].data[1] >> 8);
+            gSprites[spriteId2].x2 -= (gTasks[taskId].data[1] >> 8);
         else
-            gSprites[spriteId2].pos2.x += (gTasks[taskId].data[1] >> 8);
+            gSprites[spriteId2].x2 += (gTasks[taskId].data[1] >> 8);
 
         gTasks[taskId].data[1] &= 0xFF;
-        x = gSprites[spriteId2].pos1.x + gSprites[spriteId2].pos2.x;
+        x = gSprites[spriteId2].x + gSprites[spriteId2].x2;
         if (gTasks[taskId].data[14] == 0)
         {
             if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
@@ -5114,9 +5114,9 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
         spriteId2 = gTasks[taskId].data[15];
         DestroySpriteAndFreeResources_(&gSprites[spriteId2]);
         if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
-            gSprites[spriteId].pos2.x = -gSprites[spriteId].pos1.x - 32;
+            gSprites[spriteId].x2 = -gSprites[spriteId].x - 32;
         else
-            gSprites[spriteId].pos2.x = DISPLAY_WIDTH + 32 - gSprites[spriteId].pos1.x;
+            gSprites[spriteId].x2 = DISPLAY_WIDTH + 32 - gSprites[spriteId].x;
 
         gTasks[taskId].data[0]++;
         break;
@@ -5125,19 +5125,19 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
         gTasks[taskId].data[1] += 0x800;
         if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
         {
-            gSprites[spriteId].pos2.x += (gTasks[taskId].data[1] >> 8);
-            if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x >= GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X))
-                gSprites[spriteId].pos2.x = 0;
+            gSprites[spriteId].x2 += (gTasks[taskId].data[1] >> 8);
+            if (gSprites[spriteId].x2 + gSprites[spriteId].x >= GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X))
+                gSprites[spriteId].x2 = 0;
         }
         else
         {
-            gSprites[spriteId].pos2.x -= (gTasks[taskId].data[1] >> 8);
-            if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x <= GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X))
-                gSprites[spriteId].pos2.x = 0;
+            gSprites[spriteId].x2 -= (gTasks[taskId].data[1] >> 8);
+            if (gSprites[spriteId].x2 + gSprites[spriteId].x <= GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X))
+                gSprites[spriteId].x2 = 0;
         }
 
         gTasks[taskId].data[1] &= 0xFF;
-        if (gSprites[spriteId].pos2.x == 0)
+        if (gSprites[spriteId].x2 == 0)
             DestroyAnimVisualTask(taskId);
         break;
     }
@@ -5151,7 +5151,7 @@ static void AnimUnusedItemBagSteal(struct Sprite *sprite)
         if (gBattleAnimArgs[7] == -1)
         {
             PlaySE12WithPanning(SE_M_VITAL_THROW, BattleAnimAdjustPanning(63));
-            sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16;
+            sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + 16;
             sprite->data[0] = -32;
             sprite->data[7]++;
             sprite->invisible = FALSE;
@@ -5164,7 +5164,7 @@ static void AnimUnusedItemBagSteal(struct Sprite *sprite)
         }
         break;
     case 1:
-        sprite->pos2.y = Sin(sprite->data[1], sprite->data[0]);
+        sprite->y2 = Sin(sprite->data[1], sprite->data[0]);
         sprite->data[1] += 5;
         if (sprite->data[1] > 0x7F)
         {
@@ -5175,9 +5175,9 @@ static void AnimUnusedItemBagSteal(struct Sprite *sprite)
 
         sprite->data[2] += 0x100;
         if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
-            sprite->pos2.x -= (sprite->data[2] >> 8);
+            sprite->x2 -= (sprite->data[2] >> 8);
         else
-            sprite->pos2.x += (sprite->data[2] >> 8);
+            sprite->x2 += (sprite->data[2] >> 8);
 
         sprite->data[2] &= 0xFF;
         if (sprite->data[3] == 2)
@@ -5208,15 +5208,15 @@ void AnimTask_SnatchPartnerMove(u8 taskId)
         break;
     case 1:
         spriteId = gBattlerSpriteIds[gBattleAnimAttacker];
-        gSprites[spriteId].pos2.x += gTasks[taskId].data[0];
+        gSprites[spriteId].x2 += gTasks[taskId].data[0];
         if (gTasks[taskId].data[0] > 0)
         {
-            if (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x >= gTasks[taskId].data[2])
+            if (gSprites[spriteId].x + gSprites[spriteId].x2 >= gTasks[taskId].data[2])
                 gTasks[taskId].data[15]++;
         }
         else
         {
-            if (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x <= gTasks[taskId].data[2])
+            if (gSprites[spriteId].x + gSprites[spriteId].x2 <= gTasks[taskId].data[2])
                 gTasks[taskId].data[15]++;
         }
         break;
@@ -5226,22 +5226,22 @@ void AnimTask_SnatchPartnerMove(u8 taskId)
         break;
     case 3:
         spriteId = gBattlerSpriteIds[gBattleAnimAttacker];
-        gSprites[spriteId].pos2.x += gTasks[taskId].data[0];
+        gSprites[spriteId].x2 += gTasks[taskId].data[0];
         if (gTasks[taskId].data[0] < 0)
         {
-            if (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x <= gTasks[taskId].data[1])
+            if (gSprites[spriteId].x + gSprites[spriteId].x2 <= gTasks[taskId].data[1])
                 gTasks[taskId].data[15]++;
         }
         else
         {
-            if (gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x >= gTasks[taskId].data[1])
+            if (gSprites[spriteId].x + gSprites[spriteId].x2 >= gTasks[taskId].data[1])
                 gTasks[taskId].data[15]++;
         }
         break;
     case 4:
     default:
         spriteId = gBattlerSpriteIds[gBattleAnimAttacker];
-        gSprites[spriteId].pos2.x = 0;
+        gSprites[spriteId].x2 = 0;
         DestroyAnimVisualTask(taskId);
         break;
     }
@@ -5254,8 +5254,8 @@ void AnimTask_TeeterDanceMovement(u8 taskId)
     struct Task *task = &gTasks[taskId];
     task->data[3] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
     task->data[4] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER ? 1 : -1;
-    task->data[6] = gSprites[task->data[3]].pos1.y;
-    task->data[5] = gSprites[task->data[3]].pos1.x;
+    task->data[6] = gSprites[task->data[3]].y;
+    task->data[5] = gSprites[task->data[3]].x;
     task->data[9] = 0;
     task->data[11] = 0;
     task->data[10] = 1;
@@ -5271,23 +5271,23 @@ static void AnimTask_TeeterDanceMovement_Step(u8 taskId)
     case 0:
         task->data[11] += 8;
         task->data[11] &= 0xFF;
-        gSprites[task->data[3]].pos2.x = gSineTable[task->data[11]] >> 5;
+        gSprites[task->data[3]].x2 = gSineTable[task->data[11]] >> 5;
         task->data[9] += 2;
         task->data[9] &= 0xFF;
-        gSprites[task->data[3]].pos1.x = (gSineTable[task->data[9]] >> 3) * task->data[4] + task->data[5];
+        gSprites[task->data[3]].x = (gSineTable[task->data[9]] >> 3) * task->data[4] + task->data[5];
         if (task->data[9] == 0)
         {
-            gSprites[task->data[3]].pos1.x = task->data[5];
+            gSprites[task->data[3]].x = task->data[5];
             task->data[0]++;
         }
         break;
     case 1:
         task->data[11] += 8;
         task->data[11] &= 0xFF;
-        gSprites[task->data[3]].pos2.x = gSineTable[task->data[11]] >> 5;
+        gSprites[task->data[3]].x2 = gSineTable[task->data[11]] >> 5;
         if (task->data[11] == 0)
         {
-            gSprites[task->data[3]].pos2.x = 0;
+            gSprites[task->data[3]].x2 = 0;
             task->data[0]++;
         }
         break;
@@ -5311,8 +5311,8 @@ static void AnimKnockOffStrike_Step(struct Sprite *sprite)
         sprite->data[1] &= 0xFF;
     }
 
-    sprite->pos2.x = Cos(sprite->data[1], 20);
-    sprite->pos2.y = Sin(sprite->data[1], 20);
+    sprite->x2 = Cos(sprite->data[1], 20);
+    sprite->y2 = Sin(sprite->data[1], 20);
     if (sprite->animEnded)
         DestroyAnimSprite(sprite);
 
@@ -5326,8 +5326,8 @@ static void AnimKnockOffStrike(struct Sprite *sprite)
 {
     if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x -= gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         sprite->data[0] = -11;
         sprite->data[1] = 192;
         StartSpriteAffineAnim(sprite, 1);
@@ -5336,8 +5336,8 @@ static void AnimKnockOffStrike(struct Sprite *sprite)
     {
         sprite->data[0] = 11;
         sprite->data[1] = 192;
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
     }
 
     sprite->callback = AnimKnockOffStrike_Step;
@@ -5347,10 +5347,10 @@ static void AnimKnockOffStrike(struct Sprite *sprite)
 // No args.
 static void AnimRecycle(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_TOP);
-    if (sprite->pos1.y < 16)
-        sprite->pos1.y = 16;
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_TOP);
+    if (sprite->y < 16)
+        sprite->y = 16;
 
     sprite->data[6] = 0;
     sprite->data[7] = 16;
@@ -5421,13 +5421,13 @@ static void AnimRecycle_Step(struct Sprite *sprite)
 void AnimTask_GetWeather(u8 taskId)
 {
     gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_NONE;
-    if (gWeatherMoveAnim & WEATHER_SUN_ANY)
+    if (gWeatherMoveAnim & B_WEATHER_SUN)
         gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_SUN;
-    else if (gWeatherMoveAnim & WEATHER_RAIN_ANY)
+    else if (gWeatherMoveAnim & B_WEATHER_RAIN)
         gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_RAIN;
-    else if (gWeatherMoveAnim & WEATHER_SANDSTORM_ANY)
+    else if (gWeatherMoveAnim & B_WEATHER_SANDSTORM)
         gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_SANDSTORM;
-    else if (gWeatherMoveAnim & WEATHER_HAIL_ANY)
+    else if (gWeatherMoveAnim & B_WEATHER_HAIL)
         gBattleAnimArgs[ARG_RET_ID] = ANIM_WEATHER_HAIL;
 
     DestroyAnimVisualTask(taskId);
@@ -5456,14 +5456,14 @@ static void AnimTask_SlackOffSquish_Step(u8 taskId)
             task->data[1] = 0;
             task->data[2]++;
             if (!(task->data[2] & 1))
-                gSprites[task->data[15]].pos2.x = -1;
+                gSprites[task->data[15]].x2 = -1;
             else
-                gSprites[task->data[15]].pos2.x = 1;
+                gSprites[task->data[15]].x2 = 1;
         }
     }
     else
     {
-        gSprites[task->data[15]].pos2.x = 0;
+        gSprites[task->data[15]].x2 = 0;
     }
 
     if (!RunAffineAnimFromTaskData(&gTasks[taskId]))
diff --git a/src/battle_anim_electric.c b/src/battle_anim_electric.c
index 2c5c7e0f1..a9a876920 100644
--- a/src/battle_anim_electric.c
+++ b/src/battle_anim_electric.c
@@ -459,11 +459,11 @@ const struct SpriteTemplate gShockWaveProgressingBoltSpriteTemplate =
 static void AnimLightning(struct Sprite *sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
     else
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
 
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->callback = AnimLightning_Step;
 }
 
@@ -476,9 +476,9 @@ static void AnimLightning_Step(struct Sprite *sprite)
 static void AnimUnusedSpinningFist(struct Sprite *sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
     else
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
 
     sprite->callback = AnimUnusedSpinningFist_Step;
 }
@@ -491,18 +491,18 @@ static void AnimUnusedSpinningFist_Step(struct Sprite *sprite)
 
 static void AnimUnusedCirclingShock(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
 
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
-        sprite->pos1.y -= gBattleAnimArgs[1];
+        sprite->x -= gBattleAnimArgs[0];
+        sprite->y -= gBattleAnimArgs[1];
     }
     else
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
     }
     sprite->data[0] = 0;
     sprite->data[1] = gBattleAnimArgs[2];
@@ -543,17 +543,17 @@ static void AnimSparkElectricity(struct Sprite *sprite)
 
     if (gBattleAnimArgs[5] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X);
-        sprite->pos1.y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y);
+        sprite->x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X);
+        sprite->y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2);
-        sprite->pos1.y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET);
+        sprite->x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2);
+        sprite->y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET);
     }
 
-    sprite->pos2.x = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8;
-    sprite->pos2.y = (gSineTable[gBattleAnimArgs[0] + 64] * gBattleAnimArgs[1]) >> 8;
+    sprite->x2 = (gSineTable[gBattleAnimArgs[0]] * gBattleAnimArgs[1]) >> 8;
+    sprite->y2 = (gSineTable[gBattleAnimArgs[0] + 64] * gBattleAnimArgs[1]) >> 8;
 
     if (gBattleAnimArgs[6] & 1)
         sprite->oam.priority = GetBattlerSpriteBGPriority(battler) + 1;
@@ -573,9 +573,9 @@ static void AnimZapCannonSpark(struct Sprite *sprite)
 {
     InitSpritePosToAnimAttacker(sprite, 1);
     sprite->data[0] = gBattleAnimArgs[3];
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = gBattleAnimArgs[2];
@@ -590,8 +590,8 @@ static void AnimZapCannonSpark_Step(struct Sprite *sprite)
 {
     if (!AnimTranslateLinear(sprite))
     {
-        sprite->pos2.x += Sin(sprite->data[7], sprite->data[5]);
-        sprite->pos2.y += Cos(sprite->data[7], sprite->data[5]);
+        sprite->x2 += Sin(sprite->data[7], sprite->data[5]);
+        sprite->y2 += Cos(sprite->data[7], sprite->data[5]);
         sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF;
         if(!(sprite->data[7] % 3))
             sprite->invisible ^= 1;
@@ -616,8 +616,8 @@ static void AnimThunderboltOrb(struct Sprite *sprite)
     if (IsContest() || GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[1];
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[2];
     sprite->data[3] = gBattleAnimArgs[0];
     sprite->data[4] = gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[3];
@@ -637,8 +637,8 @@ static void AnimSparkElectricityFlashing(struct Sprite *sprite)
     if (IsContest() || GetBattlerSide(battler) == B_SIDE_PLAYER)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
-    sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2) + gBattleAnimArgs[0];
-    sprite->pos1.y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[1];
+    sprite->x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2) + gBattleAnimArgs[0];
+    sprite->y = GetBattlerSpriteCoord(battler, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[1];
 
     sprite->data[4] = gBattleAnimArgs[7] & 0x7FFF;
     sprite->data[5] = gBattleAnimArgs[2];
@@ -652,8 +652,8 @@ static void AnimSparkElectricityFlashing(struct Sprite *sprite)
 
 static void AnimSparkElectricityFlashing_Step(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[7], sprite->data[5]);
-    sprite->pos2.y = Cos(sprite->data[7], sprite->data[5]);
+    sprite->x2 = Sin(sprite->data[7], sprite->data[5]);
+    sprite->y2 = Cos(sprite->data[7], sprite->data[5]);
 
     sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF;
     if (sprite->data[7] % sprite->data[4] == 0)
@@ -778,9 +778,9 @@ static void AnimThunderWave(struct Sprite *sprite)
 {
     u8 spriteId;
 
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
-    spriteId = CreateSprite(&gThunderWaveSpriteTemplate, sprite->pos1.x + 32, sprite->pos1.y, sprite->subpriority);
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
+    spriteId = CreateSprite(&gThunderWaveSpriteTemplate, sprite->x + 32, sprite->y, sprite->subpriority);
     gSprites[spriteId].oam.tileNum += 8;
     gAnimVisualTaskCount++;
     gSprites[spriteId].callback = AnimThunderWave_Step;
@@ -840,13 +840,13 @@ static void AnimTask_ElectricChargingParticles_Step(u8 taskId)
             if (spriteId != MAX_SPRITES)
             {
                 struct Sprite *sprite = &gSprites[spriteId];
-                sprite->pos1.x += sElectricChargingParticleCoordOffsets[task->data[9]][0];
-                sprite->pos1.y += sElectricChargingParticleCoordOffsets[task->data[9]][1];
+                sprite->x += sElectricChargingParticleCoordOffsets[task->data[9]][0];
+                sprite->y += sElectricChargingParticleCoordOffsets[task->data[9]][1];
 
                 sprite->data[0] = 40 - task->data[8] * 5;
-                sprite->data[1] = sprite->pos1.x;
+                sprite->data[1] = sprite->x;
                 sprite->data[2] = task->data[14];
-                sprite->data[3] = sprite->pos1.y;
+                sprite->data[3] = sprite->y;
                 sprite->data[4] = task->data[15];
                 sprite->data[5] = taskId;
 
@@ -892,13 +892,13 @@ static void AnimGrowingChargeOrb(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == ANIM_ATTACKER)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
     }
 
     StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
@@ -910,17 +910,17 @@ static void AnimElectricPuff(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == ANIM_ATTACKER)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
     }
 
-    sprite->pos2.x = gBattleAnimArgs[1];
-    sprite->pos2.y = gBattleAnimArgs[2];
+    sprite->x2 = gBattleAnimArgs[1];
+    sprite->y2 = gBattleAnimArgs[2];
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
     sprite->callback = RunStoredCallbackWhenAnimEnds;
 }
@@ -929,8 +929,8 @@ static void AnimElectricPuff(struct Sprite *sprite)
 static void AnimVoltTackleOrbSlide(struct Sprite *sprite)
 {
     StartSpriteAffineAnim(sprite, 1);
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     sprite->data[6] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
     sprite->data[7] = 16;
 
@@ -949,9 +949,9 @@ static void AnimVoltTackleOrbSlide_Step(struct Sprite *sprite)
             sprite->data[0]++;
         break;
     case 1:
-        sprite->pos1.x += sprite->data[7];
-        gSprites[sprite->data[6]].pos2.x += sprite->data[7];
-        if ((u16)(sprite->pos1.x + 80) > 400)
+        sprite->x += sprite->data[7];
+        gSprites[sprite->data[6]].x2 += sprite->data[7];
+        if ((u16)(sprite->x + 80) > 400)
             DestroySpriteAndMatrix(sprite);
     }
 }
@@ -976,7 +976,7 @@ void AnimTask_VoltTackleAttackerReappear(u8 taskId)
             task->data[13] = -2;
         }
 
-        gSprites[task->data[15]].pos2.x = task->data[14];
+        gSprites[task->data[15]].x2 = task->data[14];
         task->data[0]++;
         break;
     case 1:
@@ -988,7 +988,7 @@ void AnimTask_VoltTackleAttackerReappear(u8 taskId)
             if (task->data[14])
             {
                 task->data[14] += task->data[13];
-                gSprites[task->data[15]].pos2.x = task->data[14];
+                gSprites[task->data[15]].x2 = task->data[14];
             }
             else
                 task->data[0]++;
@@ -1131,8 +1131,8 @@ static void AnimGrowingShockWaveOrb(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
         StartSpriteAffineAnim(sprite, 2);
         sprite->data[0]++;
         break;
@@ -1305,7 +1305,7 @@ void AnimTask_ShockWaveLightning(u8 taskId)
 static bool8 CreateShockWaveLightningSprite(struct Task *task, u8 taskId)
 {
     u8 spriteId = CreateSprite(&gLightningSpriteTemplate, task->data[13], task->data[14], task->data[12]);
-    
+
     if (spriteId != MAX_SPRITES)
     {
         gSprites[spriteId].callback = AnimShockWaveLightning;
diff --git a/src/battle_anim_fight.c b/src/battle_anim_fight.c
index b3399901e..47bb9312f 100644
--- a/src/battle_anim_fight.c
+++ b/src/battle_anim_fight.c
@@ -412,7 +412,7 @@ const struct SpriteTemplate gFocusPunchFistSpriteTemplate =
 static void AnimUnusedHumanoidFoot(struct Sprite *sprite)
 {
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = 15;
     sprite->callback = WaitAnimForDuration;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
@@ -478,8 +478,8 @@ static void AnimFistOrFootRandomPos(struct Sprite *sprite)
         gBattleAnimArgs[2] = Random2() % 5;
 
     StartSpriteAnim(sprite, gBattleAnimArgs[2]);
-    sprite->pos1.x = GetBattlerSpriteCoord(battler, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(battler, 3);
+    sprite->x = GetBattlerSpriteCoord(battler, 2);
+    sprite->y = GetBattlerSpriteCoord(battler, 3);
 
     xMod = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_WIDTH) / 2;
     yMod = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_HEIGHT) / 4;
@@ -495,11 +495,11 @@ static void AnimFistOrFootRandomPos(struct Sprite *sprite)
     if ((gBattlerPositions[battler] & BIT_SIDE) == B_SIDE_PLAYER)
         y += 0xFFF0;
 
-    sprite->pos1.x += x;
-    sprite->pos1.y += y;
+    sprite->x += x;
+    sprite->y += y;
 
     sprite->data[0] = gBattleAnimArgs[1];
-    sprite->data[7] = CreateSprite(&gBasicHitSplatSpriteTemplate, sprite->pos1.x, sprite->pos1.y, sprite->subpriority + 1);
+    sprite->data[7] = CreateSprite(&gBasicHitSplatSpriteTemplate, sprite->x, sprite->y, sprite->subpriority + 1);
     if (sprite->data[7] != 64)
     {
         StartSpriteAffineAnim(&gSprites[sprite->data[7]], 0);
@@ -534,15 +534,15 @@ static void AnimCrossChopHand(struct Sprite *sprite)
 
     if (gBattleAnimArgs[2] == 0)
     {
-        sprite->data[2] = sprite->pos1.x - 20;
+        sprite->data[2] = sprite->x - 20;
     }
     else
     {
-        sprite->data[2] = sprite->pos1.x + 20;
+        sprite->data[2] = sprite->x + 20;
         sprite->hFlip = 1;
     }
 
-    sprite->data[4] = sprite->pos1.y - 20;
+    sprite->data[4] = sprite->y - 20;
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(sprite, AnimCrossChopHand_Step);
 }
@@ -551,13 +551,13 @@ static void AnimCrossChopHand_Step(struct Sprite *sprite)
 {
     if (++sprite->data[5] == 11)
     {
-        sprite->data[2] = sprite->pos1.x - sprite->pos2.x;
-        sprite->data[4] = sprite->pos1.y - sprite->pos2.y;
+        sprite->data[2] = sprite->x - sprite->x2;
+        sprite->data[4] = sprite->y - sprite->y2;
         sprite->data[0] = 8;
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->y2 = 0;
+        sprite->x2 = 0;
 
         sprite->callback = StartAnimLinearTranslation;
         StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
@@ -576,10 +576,10 @@ static void AnimSlidingKick(struct Sprite *sprite)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[3];
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
-    sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[2] = sprite->x + gBattleAnimArgs[2];
+    sprite->data[3] = sprite->y;
+    sprite->data[4] = sprite->y;
 
     InitAnimLinearTranslation(sprite);
 
@@ -594,7 +594,7 @@ static void AnimSlidingKick_Step(struct Sprite *sprite)
 {
     if (!AnimTranslateLinear(sprite))
     {
-        sprite->pos2.y += Sin(sprite->data[7] >> 8, sprite->data[5]);
+        sprite->y2 += Sin(sprite->data[7] >> 8, sprite->data[5]);
         sprite->data[7] += sprite->data[6];
     }
     else
@@ -674,8 +674,8 @@ static void AnimDizzyPunchDuck(struct Sprite *sprite)
     else
     {
         sprite->data[4] += sprite->data[1];
-        sprite->pos2.x = sprite->data[4] >> 8;
-        sprite->pos2.y = Sin(sprite->data[3], sprite->data[2]);
+        sprite->x2 = sprite->data[4] >> 8;
+        sprite->y2 = Sin(sprite->data[3], sprite->data[2]);
         sprite->data[3] = (sprite->data[3] + 3) & 0xFF;
 
         if (sprite->data[3] > 100)
@@ -691,17 +691,17 @@ static void AnimBrickBreakWall(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == ANIM_ATTACKER)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
     }
 
-    sprite->pos1.x += gBattleAnimArgs[1];
-    sprite->pos1.y += gBattleAnimArgs[2];
+    sprite->x += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[2];
 
     sprite->data[0] = 0;
     sprite->data[1] = gBattleAnimArgs[3];
@@ -729,9 +729,9 @@ static void AnimBrickBreakWall_Step(struct Sprite *sprite)
             sprite->data[1] = 0;
             sprite->data[3]++;
             if (sprite->data[3] & 1)
-                sprite->pos2.x = 2;
+                sprite->x2 = 2;
             else
-                sprite->pos2.x = -2;
+                sprite->x2 = -2;
         }
 
         if (--sprite->data[2] == 0)
@@ -745,13 +745,13 @@ static void AnimBrickBreakWallShard(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == ANIM_ATTACKER)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[2];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0) + gBattleAnimArgs[2];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + gBattleAnimArgs[3];
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0) + gBattleAnimArgs[2];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + gBattleAnimArgs[3];
     }
 
     sprite->oam.tileNum += gBattleAnimArgs[1] * 16;
@@ -785,8 +785,8 @@ static void AnimBrickBreakWallShard(struct Sprite *sprite)
 
 static void AnimBrickBreakWallShard_Step(struct Sprite *sprite)
 {
-    sprite->pos1.x += sprite->data[6];
-    sprite->pos1.y += sprite->data[7];
+    sprite->x += sprite->data[6];
+    sprite->y += sprite->data[7];
 
     if (++sprite->data[0] > 40)
         DestroyAnimSprite(sprite);
@@ -796,8 +796,8 @@ static void AnimSuperpowerOrb(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == ANIM_ATTACKER)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
+        sprite->x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
+        sprite->y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
         sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
         sprite->data[7] = gBattleAnimTarget;
     }
@@ -820,9 +820,9 @@ static void AnimSuperpowerOrb_Step(struct Sprite *sprite)
         SetGpuReg(REG_OFFSET_BLDCNT, 0);
 
         sprite->data[0] = 16;
-        sprite->data[1] = sprite->pos1.x;
+        sprite->data[1] = sprite->x;
         sprite->data[2] = GetBattlerSpriteCoord(sprite->data[7], 2);
-        sprite->data[3] = sprite->pos1.y;
+        sprite->data[3] = sprite->y;
         sprite->data[4] = GetBattlerSpriteCoord(sprite->data[7], 3);
 
         InitAnimLinearTranslation(sprite);
@@ -834,11 +834,11 @@ static void AnimSuperpowerOrb_Step(struct Sprite *sprite)
 // Floating rock that flies off to hit the target. Used by Superpower
 static void AnimSuperpowerRock(struct Sprite *sprite)
 {
-    sprite->pos1.x = gBattleAnimArgs[0];
-    sprite->pos1.y = 120;
+    sprite->x = gBattleAnimArgs[0];
+    sprite->y = 120;
 
     sprite->data[0] = gBattleAnimArgs[3];
-    StorePointerInVars(&sprite->data[4], &sprite->data[5], (void *)(sprite->pos1.y << 8));
+    StorePointerInVars(&sprite->data[4], &sprite->data[5], (void *)(sprite->y << 8));
 
     sprite->data[6] = gBattleAnimArgs[1];
     sprite->oam.tileNum += gBattleAnimArgs[2] * 4;
@@ -857,8 +857,8 @@ static void AnimSuperpowerRock_Step1(struct Sprite *sprite)
         StorePointerInVars(&sprite->data[4], &sprite->data[5], var0);
 
         var0 = (void *)(((intptr_t)var0) >> 8);
-        sprite->pos1.y = (intptr_t)var0;
-        if (sprite->pos1.y < -8)
+        sprite->y = (intptr_t)var0;
+        if (sprite->y < -8)
             DestroyAnimSprite(sprite);
         else
             sprite->data[0]--;
@@ -872,8 +872,8 @@ static void AnimSuperpowerRock_Step1(struct Sprite *sprite)
 
         sprite->data[0] = pos2 - pos0;
         sprite->data[1] = pos3 - pos1;
-        sprite->data[2] = sprite->pos1.x << 4;
-        sprite->data[3] = sprite->pos1.y << 4;
+        sprite->data[2] = sprite->x << 4;
+        sprite->data[3] = sprite->y << 4;
 
         sprite->callback = AnimSuperpowerRock_Step2;
     }
@@ -885,11 +885,11 @@ static void AnimSuperpowerRock_Step2(struct Sprite *sprite)
 
     sprite->data[2] += sprite->data[0];
     sprite->data[3] += sprite->data[1];
-    sprite->pos1.x = sprite->data[2] >> 4;
-    sprite->pos1.y = sprite->data[3] >> 4;
+    sprite->x = sprite->data[2] >> 4;
+    sprite->y = sprite->data[3] >> 4;
 
-    edgeX = sprite->pos1.x + 8;
-    if (edgeX > 256 || sprite->pos1.y < -8 || sprite->pos1.y > 120)
+    edgeX = sprite->x + 8;
+    if (edgeX > 256 || sprite->y < -8 || sprite->y > 120)
         DestroyAnimSprite(sprite);
 }
 
@@ -899,8 +899,8 @@ static void AnimSuperpowerFireball(struct Sprite *sprite)
 
     if (gBattleAnimArgs[0] == ANIM_ATTACKER)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
+        sprite->x = GetBattlerSpriteCoord(gBattlerAttacker, 2);
+        sprite->y = GetBattlerSpriteCoord(gBattlerAttacker, 3);
         battler = gBattleAnimTarget;
         sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker);
     }
@@ -916,9 +916,9 @@ static void AnimSuperpowerFireball(struct Sprite *sprite)
         sprite->oam.matrixNum |= (ST_OAM_HFLIP | ST_OAM_VFLIP);
 
     sprite->data[0] = 16;
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(battler, 2);
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(battler, 3);
 
     InitAnimLinearTranslation(sprite);
@@ -938,8 +938,8 @@ static void AnimArmThrustHit(struct Sprite *sprite)
 {
     u8 turn;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = gBattleAnimArgs[0];
     sprite->data[3] = gBattleAnimArgs[1];
@@ -956,8 +956,8 @@ static void AnimArmThrustHit(struct Sprite *sprite)
     }
 
     StartSpriteAnim(sprite, sprite->data[1]);
-    sprite->pos2.x = sprite->data[2];
-    sprite->pos2.y = sprite->data[3];
+    sprite->x2 = sprite->data[2];
+    sprite->y2 = sprite->data[3];
     sprite->callback = AnimArmThrustHit_Step;
 }
 
@@ -987,7 +987,7 @@ static void AnimFocusPunchFist(struct Sprite *sprite)
     if (sprite->affineAnimEnded)
     {
         sprite->data[1] = (sprite->data[1] + 40) & 0xFF;
-        sprite->pos2.x = Sin(sprite->data[1], 2);
+        sprite->x2 = Sin(sprite->data[1], 2);
         if (++sprite->data[0] > 40)
             DestroyAnimSprite(sprite);
     }
diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c
index e18d72c31..912391280 100644
--- a/src/battle_anim_fire.c
+++ b/src/battle_anim_fire.c
@@ -481,7 +481,7 @@ static void AnimFireSpread(struct Sprite *sprite)
 {
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
 
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[1] = gBattleAnimArgs[2];
     sprite->data[2] = gBattleAnimArgs[3];
@@ -496,14 +496,14 @@ static void AnimFirePlume(struct Sprite *sprite)
 
     if (GetBattlerSide(gBattleAnimAttacker))
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x -= gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         sprite->data[2] = -gBattleAnimArgs[4];
     }
     else
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         sprite->data[2] = gBattleAnimArgs[4];
     }
 
@@ -518,14 +518,14 @@ static void AnimLargeFlame(struct Sprite *sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker))
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x -= gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         sprite->data[2] = gBattleAnimArgs[4];
     }
     else
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
         sprite->data[2] = -gBattleAnimArgs[4];
     }
 
@@ -540,8 +540,8 @@ static void AnimLargeFlame_Step(struct Sprite *sprite)
 {
     if (++sprite->data[0] < sprite->data[4])
     {
-        sprite->pos2.x += sprite->data[2];
-        sprite->pos2.y += sprite->data[3];
+        sprite->x2 += sprite->data[2];
+        sprite->y2 += sprite->data[3];
     }
 
     if (sprite->data[0] == sprite->data[1])
@@ -554,15 +554,15 @@ static void AnimUnusedSmallEmber(struct Sprite *sprite)
 
     if (GetBattlerSide(gBattleAnimAttacker))
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
     }
     else
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
         sprite->subpriority = 8;
     }
 
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = gBattleAnimArgs[4];
@@ -580,8 +580,8 @@ static void AnimUnusedSmallEmber_Step(struct Sprite *sprite)
         if(sprite->data[5] > 10000)
             sprite->subpriority = 1;
 
-        sprite->pos2.x = Sin(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8));
-        sprite->pos2.y = Cos(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8));
+        sprite->x2 = Sin(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8));
+        sprite->y2 = Cos(sprite->data[0], sprite->data[1] + (sprite->data[5] >> 8));
 
         sprite->data[0] += sprite->data[2];
         sprite->data[5] += sprite->data[4];
@@ -602,8 +602,8 @@ static void AnimUnusedSmallEmber_Step(struct Sprite *sprite)
 // Sunlight from Sunny Day / sunny weather
 static void AnimSunlight(struct Sprite *sprite)
 {
-    sprite->pos1.x = 0;
-    sprite->pos1.y = 0;
+    sprite->x = 0;
+    sprite->y = 0;
     sprite->data[0] = 60;
     sprite->data[2] = 140;
     sprite->data[4] = 80;
@@ -658,15 +658,15 @@ void AnimFireRing(struct Sprite *sprite)
 }
 
 static void AnimFireRing_Step1(struct Sprite *sprite)
-{   
+{
     UpdateFireRingCircleOffset(sprite);
 
     if (++sprite->data[0] == 0x12)
     {
         sprite->data[0] = 0x19;
-        sprite->data[1] = sprite->pos1.x;
+        sprite->data[1] = sprite->x;
         sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-        sprite->data[3] = sprite->pos1.y;
+        sprite->data[3] = sprite->y;
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
         InitAnimLinearTranslation(sprite);
@@ -681,18 +681,18 @@ static void AnimFireRing_Step2(struct Sprite *sprite)
     {
         sprite->data[0] = 0;
 
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+        sprite->y2 = 0;
+        sprite->x2 = 0;
 
         sprite->callback = AnimFireRing_Step3;
         sprite->callback(sprite);
     }
     else
     {
-        sprite->pos2.x += Sin(sprite->data[7], 28);
-        sprite->pos2.y += Cos(sprite->data[7], 28);
+        sprite->x2 += Sin(sprite->data[7], 28);
+        sprite->y2 += Cos(sprite->data[7], 28);
 
         sprite->data[7] = (sprite->data[7] + 20) & 0xFF;
     }
@@ -708,8 +708,8 @@ static void AnimFireRing_Step3(struct Sprite *sprite)
 
 static void UpdateFireRingCircleOffset(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[7], 28);
-    sprite->pos2.y = Cos(sprite->data[7], 28);
+    sprite->x2 = Sin(sprite->data[7], 28);
+    sprite->y2 = Cos(sprite->data[7], 28);
 
     sprite->data[7] = (sprite->data[7] + 20) & 0xFF;
 }
@@ -718,12 +718,12 @@ static void UpdateFireRingCircleOffset(struct Sprite *sprite)
 // arg 1: initial y pixel offset
 // arg 2: duration
 // arg 3: x delta
-// arg 4: y delta 
+// arg 4: y delta
 // AnimFireCross(struct Sprite *sprite)
 static void AnimFireCross(struct Sprite *sprite)
 {
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
 
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
@@ -760,8 +760,8 @@ static void AnimFireSpiralOutward_Step1(struct Sprite *sprite)
 
 static void AnimFireSpiralOutward_Step2(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[1], sprite->data[2] >> 8);
-    sprite->pos2.y = Cos(sprite->data[1], sprite->data[2] >> 8);
+    sprite->x2 = Sin(sprite->data[1], sprite->data[2] >> 8);
+    sprite->y2 = Cos(sprite->data[1], sprite->data[2] >> 8);
 
     sprite->data[1] = (sprite->data[1] + 10) & 0xFF;
     sprite->data[2] += 0xD0;
@@ -781,7 +781,7 @@ void AnimTask_EruptionLaunchRocks(u8 taskId)
     task->data[1] = 0;
     task->data[2] = 0;
     task->data[3] = 0;
-    task->data[4] = gSprites[task->data[15]].pos1.y;
+    task->data[4] = gSprites[task->data[15]].y;
     task->data[5] = GetBattlerSide(gBattleAnimAttacker);
     task->data[6] = 0;
 
@@ -805,9 +805,9 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId)
             task->data[1] = 0;
 
             if (++task->data[2] & 0x1)
-                gSprites[task->data[15]].pos2.x = 3;
+                gSprites[task->data[15]].x2 = 3;
             else
-                gSprites[task->data[15]].pos2.x = -3;
+                gSprites[task->data[15]].x2 = -3;
         }
 
         if (task->data[5] != B_SIDE_PLAYER)
@@ -815,14 +815,14 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId)
             if (++task->data[3] > 4)
             {
                 task->data[3] = 0;
-                gSprites[task->data[15]].pos1.y++;
+                gSprites[task->data[15]].y++;
             }
         }
 
         if(!UpdateEruptAnimTask(task))
         {
             SetBattlerSpriteYOffsetFromYScale(task->data[15]);
-            gSprites[task->data[15]].pos2.x = 0;
+            gSprites[task->data[15]].x2 = 0;
 
             task->data[1] = 0;
             task->data[2] = 0;
@@ -855,9 +855,9 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId)
             task->data[1] = 0;
 
             if (++task->data[2] & 1)
-                gSprites[task->data[15]].pos2.y += 3;
+                gSprites[task->data[15]].y2 += 3;
             else
-                gSprites[task->data[15]].pos2.y -= 3;
+                gSprites[task->data[15]].y2 -= 3;
         }
 
         if (++task->data[3] > 0x18)
@@ -868,7 +868,7 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId)
                 PrepareEruptAnimTaskData(task, task->data[15], 0x180, 0xC0, 0x100, 0x100, 8);
 
             if (task->data[2] & 1)
-                gSprites[task->data[15]].pos2.y -= 3;
+                gSprites[task->data[15]].y2 -= 3;
 
             task->data[1] = 0;
             task->data[2] = 0;
@@ -878,11 +878,11 @@ static void AnimTask_EruptionLaunchRocks_Step(u8 taskId)
         break;
     case 5:
         if (task->data[5] != B_SIDE_PLAYER)
-            gSprites[task->data[15]].pos1.y--;
+            gSprites[task->data[15]].y--;
 
         if (!UpdateEruptAnimTask(task))
         {
-            gSprites[task->data[15]].pos1.y = task->data[4];
+            gSprites[task->data[15]].y = task->data[4];
             ResetSpriteRotScale(task->data[15]);
             task->data[2] = 0;
             task->data[0]++;
@@ -903,7 +903,7 @@ static void CreateEruptionLaunchRocks(u8 spriteId, u8 taskId, u8 a3)
     s8 sign;
 
     u16 y = GetEruptionLaunchRockInitialYPos(spriteId);
-    u16 x = gSprites[spriteId].pos1.x;
+    u16 x = gSprites[spriteId].x;
 
     if(!GetBattlerSide(gBattleAnimAttacker))
     {
@@ -949,7 +949,7 @@ static void AnimEruptionLaunchRock(struct Sprite *sprite)
 
 static u16 GetEruptionLaunchRockInitialYPos(u8 spriteId)
 {
-    s16 y = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y + gSprites[spriteId].centerToCornerVecY;
+    s16 y = gSprites[spriteId].y + gSprites[spriteId].y2 + gSprites[spriteId].centerToCornerVecY;
 
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
         y += 74;
@@ -963,8 +963,8 @@ static void InitEruptionLaunchRockCoordData(struct Sprite *sprite, s16 x, s16 y)
 {
     sprite->data[0] = 0;
     sprite->data[1] = 0;
-    sprite->data[2] = (u16)sprite->pos1.x * 8;
-    sprite->data[3] = (u16)sprite->pos1.y * 8;
+    sprite->data[2] = (u16)sprite->x * 8;
+    sprite->data[3] = (u16)sprite->y * 8;
     sprite->data[4] = x * 8;
     sprite->data[5] = y * 8;
 }
@@ -981,18 +981,18 @@ static void UpdateEruptionLaunchRockPos(struct Sprite *sprite)
     }
 
     sprite->data[2] += sprite->data[4];
-    sprite->pos1.x = sprite->data[2] >> 3;
+    sprite->x = sprite->data[2] >> 3;
     sprite->data[3] += sprite->data[5];
-    sprite->pos1.y = sprite->data[3] >> 3;
+    sprite->y = sprite->data[3] >> 3;
 
-    if (sprite->pos1.x < -8 || sprite->pos1.x > 0xf8 || sprite->pos1.y < -8 || sprite->pos1.y > 120)
+    if (sprite->x < -8 || sprite->x > 0xf8 || sprite->y < -8 || sprite->y > 120)
         sprite->invisible = TRUE;
 }
 
 static void AnimEruptionFallingRock(struct Sprite *sprite)
 {
-    sprite->pos1.x = gBattleAnimArgs[0];
-    sprite->pos1.y = gBattleAnimArgs[1];
+    sprite->x = gBattleAnimArgs[0];
+    sprite->y = gBattleAnimArgs[1];
 
     sprite->data[0] = 0;
     sprite->data[1] = 0;
@@ -1018,10 +1018,10 @@ static void AnimEruptionFallingRock_Step(struct Sprite *sprite)
         sprite->data[0]++;
         // fall through
     case 1:
-        sprite->pos1.y += 8;
-        if (sprite->pos1.y >= sprite->data[7])
+        sprite->y += 8;
+        if (sprite->y >= sprite->data[7])
         {
-            sprite->pos1.y = sprite->data[7];
+            sprite->y = sprite->data[7];
             sprite->data[0]++;
         }
         break;
@@ -1031,11 +1031,11 @@ static void AnimEruptionFallingRock_Step(struct Sprite *sprite)
             sprite->data[1] = 0;
             if ((++sprite->data[2] & 1) != 0)
             {
-                sprite->pos2.y = -3;
+                sprite->y2 = -3;
             }
             else
             {
-                sprite->pos2.y = 3;
+                sprite->y2 = 3;
             }
         }
 
@@ -1072,14 +1072,14 @@ static void AnimWillOWispOrb(struct Sprite *sprite)
         sprite->data[1] += 192;
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         {
-            sprite->pos2.y = -(sprite->data[1] >> 8);
+            sprite->y2 = -(sprite->data[1] >> 8);
         }
         else
         {
-            sprite->pos2.y = sprite->data[1] >> 8;
+            sprite->y2 = sprite->data[1] >> 8;
         }
 
-        sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]);
+        sprite->x2 = Sin(sprite->data[2], sprite->data[4]);
         sprite->data[2] = (sprite->data[2] + 4) & 0xFF;
 
         if (++sprite->data[3] == 1)
@@ -1089,20 +1089,20 @@ static void AnimWillOWispOrb(struct Sprite *sprite)
         }
         break;
     case 2:
-        sprite->pos2.x = Sin(sprite->data[2], sprite->data[4]);
+        sprite->x2 = Sin(sprite->data[2], sprite->data[4]);
         sprite->data[2] = (sprite->data[2] + 4) & 0xFF;
-        
+
         if (++sprite->data[3] == 31)
         {
-            sprite->pos1.x += sprite->pos2.x;
-            sprite->pos1.y += sprite->pos2.y;
-            sprite->pos2.y = 0;
-            sprite->pos2.x = 0;
+            sprite->x += sprite->x2;
+            sprite->y += sprite->y2;
+            sprite->y2 = 0;
+            sprite->x2 = 0;
 
             sprite->data[0] = 256;
-            sprite->data[1] = sprite->pos1.x;
+            sprite->data[1] = sprite->x;
             sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-            sprite->data[3] = sprite->pos1.y;
+            sprite->data[3] = sprite->y;
             sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
 
             InitAnimLinearTranslationWithSpeed(sprite);
@@ -1119,7 +1119,7 @@ static void AnimWillOWispOrb_Step(struct Sprite *sprite)
 
     if (!AnimTranslateLinear(sprite))
     {
-        sprite->pos2.x += Sin(sprite->data[5], 16);
+        sprite->x2 += Sin(sprite->data[5], 16);
         initialData5 = sprite->data[5];
         sprite->data[5] = (sprite->data[5] + 4) & 0xFF;
         newData5 = sprite->data[5];
@@ -1146,8 +1146,8 @@ static void AnimWillOWispFire(struct Sprite *sprite)
     sprite->data[3] += 0xC0 * 2;
     sprite->data[4] += 0xA0;
 
-    sprite->pos2.x = Sin(sprite->data[1], sprite->data[3] >> 8);
-    sprite->pos2.y = Cos(sprite->data[1], sprite->data[4] >> 8);
+    sprite->x2 = Sin(sprite->data[1], sprite->data[3] >> 8);
+    sprite->y2 = Cos(sprite->data[1], sprite->data[4] >> 8);
 
     sprite->data[1] = (sprite->data[1] + 7) & 0xFF;
 
@@ -1205,7 +1205,7 @@ static void AnimTask_MoveHeatWaveTargets_Step(u8 taskId)
 
             for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
             {
-                gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11];
+                gSprites[task->data[task->data[3] + 14]].x2 = task->data[10] + task->data[11];
             }
 
             if (++task->data[9] == 16)
@@ -1228,7 +1228,7 @@ static void AnimTask_MoveHeatWaveTargets_Step(u8 taskId)
 
             for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
             {
-                gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11];
+                gSprites[task->data[task->data[3] + 14]].x2 = task->data[10] + task->data[11];
             }
 
             if (++task->data[9] == 96)
@@ -1253,7 +1253,7 @@ static void AnimTask_MoveHeatWaveTargets_Step(u8 taskId)
 
             for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
             {
-                gSprites[task->data[task->data[3] + 14]].pos2.x = task->data[10] + task->data[11];
+                gSprites[task->data[task->data[3] + 14]].x2 = task->data[10] + task->data[11];
             }
 
             if (++task->data[9] == 16)
@@ -1264,7 +1264,7 @@ static void AnimTask_MoveHeatWaveTargets_Step(u8 taskId)
         case 3:
             for (task->data[3] = 0; task->data[3] < task->data[13]; task->data[3]++)
             {
-                gSprites[task->data[task->data[3] + 14]].pos2.x = 0;
+                gSprites[task->data[task->data[3] + 14]].x2 = 0;
             }
 
             DestroyAnimVisualTask(taskId);
@@ -1312,14 +1312,14 @@ void AnimTask_ShakeTargetInPattern(u8 taskId)
         dir = sShakeDirsPattern1[gTasks[taskId].tShakeNum % 10];
 
     if (gTasks[taskId].tVertical == TRUE)
-        gSprites[spriteId].pos2.y = gBattleAnimArgs[1] * dir < 0 ? -(gBattleAnimArgs[1] * dir) : gBattleAnimArgs[1] * dir;
+        gSprites[spriteId].y2 = gBattleAnimArgs[1] * dir < 0 ? -(gBattleAnimArgs[1] * dir) : gBattleAnimArgs[1] * dir;
     else
-        gSprites[spriteId].pos2.x = gBattleAnimArgs[1] * dir;
+        gSprites[spriteId].x2 = gBattleAnimArgs[1] * dir;
 
     if (gTasks[taskId].tShakeNum == gTasks[taskId].tMaxShakes)
     {
-        gSprites[spriteId].pos2.x = 0;
-        gSprites[spriteId].pos2.y = 0;
+        gSprites[spriteId].x2 = 0;
+        gSprites[spriteId].y2 = 0;
         DestroyAnimVisualTask(taskId);
     }
 }
diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c
index 9e3e6c33e..b1098ad80 100644
--- a/src/battle_anim_flying.c
+++ b/src/battle_anim_flying.c
@@ -353,7 +353,7 @@ const struct SpriteTemplate gSkyAttackBirdSpriteTemplate =
 static void AnimEllipticalGust(struct Sprite *sprite)
 {
     InitSpritePosToAnimTarget(sprite, FALSE);
-    sprite->pos1.y += 20;
+    sprite->y += 20;
     sprite->data[1] = 191;
     sprite->callback = AnimEllipticalGust_Step;
     sprite->callback(sprite);
@@ -361,8 +361,8 @@ static void AnimEllipticalGust(struct Sprite *sprite)
 
 static void AnimEllipticalGust_Step(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[1], 32);
-    sprite->pos2.y = Cos(sprite->data[1], 8);
+    sprite->x2 = Sin(sprite->data[1], 32);
+    sprite->y2 = Cos(sprite->data[1], 8);
     sprite->data[1] += 5;
     sprite->data[1] &= 0xFF;
     if (++sprite->data[0] == 71)
@@ -412,9 +412,9 @@ static void AnimGustToTarget(struct Sprite *sprite)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2];
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3];
     InitAnimLinearTranslation(sprite);
     sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
@@ -443,10 +443,10 @@ static void AnimAirWaveCrescent(struct Sprite *sprite)
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[4];
 
     if (gBattleAnimArgs[6] == 0)
@@ -485,10 +485,10 @@ static void AnimFlyBallUp_Step(struct Sprite *sprite)
     else
     {
         sprite->data[2] += sprite->data[1];
-        sprite->pos2.y -= (sprite->data[2] >> 8);
+        sprite->y2 -= (sprite->data[2] >> 8);
     }
 
-    if (sprite->pos1.y + sprite->pos2.y < -32)
+    if (sprite->y + sprite->y2 < -32)
         DestroyAnimSprite(sprite);
 }
 
@@ -496,20 +496,20 @@ static void AnimFlyBallAttack(struct Sprite *sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
-        sprite->pos1.x = DISPLAY_WIDTH + 32;
-        sprite->pos1.y = -32;
+        sprite->x = DISPLAY_WIDTH + 32;
+        sprite->y = -32;
         StartSpriteAffineAnim(sprite, 1);
     }
     else
     {
-        sprite->pos1.x = -32;
-        sprite->pos1.y = -32;
+        sprite->x = -32;
+        sprite->y = -32;
     }
 
     sprite->data[0] = gBattleAnimArgs[0];
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
 
     InitAnimLinearTranslation(sprite);
@@ -522,14 +522,14 @@ static void AnimFlyBallAttack_Step(struct Sprite *sprite)
     AnimTranslateLinear(sprite);
     if (((u16)sprite->data[3] >> 8) > 200)
     {
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos2.x = 0;
+        sprite->x += sprite->x2;
+        sprite->x2 = 0;
         sprite->data[3] &= 0xFF;
     }
 
-    if (sprite->pos1.x + sprite->pos2.x < -32
-        || sprite->pos1.x + sprite->pos2.x > DISPLAY_WIDTH + 32
-        || sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT)
+    if (sprite->x + sprite->x2 < -32
+        || sprite->x + sprite->x2 > DISPLAY_WIDTH + 32
+        || sprite->y + sprite->y2 > DISPLAY_HEIGHT)
     {
         gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].invisible = FALSE;
         DestroyAnimSprite(sprite);
@@ -584,11 +584,11 @@ static void AnimFallingFeather(struct Sprite *sprite)
     if (GetBattlerSide(battler) == B_SIDE_PLAYER)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
-    sprite->pos1.x = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_HEIGHT) + gBattleAnimArgs[0];
+    sprite->x = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_HEIGHT) + gBattleAnimArgs[0];
     spriteCoord = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_WIDTH);
-    sprite->pos1.y = spriteCoord + gBattleAnimArgs[1];
+    sprite->y = spriteCoord + gBattleAnimArgs[1];
 
-    data->unk8 = sprite->pos1.y << 8;
+    data->unk8 = sprite->y << 8;
     data->unkE_1 = spriteCoord + gBattleAnimArgs[6];
     data->unk0_0c = 1;
     data->unk2 = gBattleAnimArgs[2] & 0xFF;
@@ -631,10 +631,10 @@ static void AnimFallingFeather(struct Sprite *sprite)
     }
 
     data->unk0_1 = data->unk2 >> 6;
-    sprite->pos2.x = (gSineTable[data->unk2] * data->unkC[0]) >> 8;
+    sprite->x2 = (gSineTable[data->unk2] * data->unkC[0]) >> 8;
     matrixNum = sprite->oam.matrixNum;
 
-    sinIndex = (-sprite->pos2.x >> 1) + data->unkA;
+    sinIndex = (-sprite->x2 >> 1) + data->unkA;
     spriteCoord = gSineTable[sinIndex];
 
     gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64];
@@ -661,7 +661,7 @@ static void AnimFallingFeather_Step(struct Sprite *sprite)
     {
         switch (data->unk2 / 64)
         {
-        case 0: 
+        case 0:
             if ((u8)data->unk0_1 == 1) //casts to u8 here are necessary for matching
             {
                 data->unk0_0d = 1;
@@ -867,10 +867,10 @@ static void AnimFallingFeather_Step(struct Sprite *sprite)
             break;
         }
 
-        sprite->pos2.x = ((s32)data->unkC[data->unk0_0b] * gSineTable[data->unk2]) >> 8;
+        sprite->x2 = ((s32)data->unkC[data->unk0_0b] * gSineTable[data->unk2]) >> 8;
         matrixNum = sprite->oam.matrixNum;
 
-        sinIndex = (-sprite->pos2.x >> 1) + data->unkA;
+        sinIndex = (-sprite->x2 >> 1) + data->unkA;
         sinVal = gSineTable[sinIndex];
 
         gOamMatrices[matrixNum].a = gOamMatrices[matrixNum].d = gSineTable[sinIndex + 64];
@@ -878,13 +878,13 @@ static void AnimFallingFeather_Step(struct Sprite *sprite)
         gOamMatrices[matrixNum].c = -sinVal;
 
         data->unk8 += data->unk6;
-        sprite->pos1.y = data->unk8 >> 8;
+        sprite->y = data->unk8 >> 8;
         if (data->unk4 & 0x8000)
             data->unk2 = (data->unk2 - (data->unk4 & 0x7FFF)) & 0xFF;
         else
             data->unk2 = (data->unk2 + (data->unk4 & 0x7FFF)) & 0xFF;
 
-        if (sprite->pos1.y + sprite->pos2.y >= data->unkE_1)
+        if (sprite->y + sprite->y2 >= data->unkE_1)
         {
             sprite->data[0] = 0;
             sprite->callback = DestroyAnimSpriteAfterTimer;
@@ -895,8 +895,8 @@ static void AnimFallingFeather_Step(struct Sprite *sprite)
 static void AnimUnusedBubbleThrow(struct Sprite *sprite)
 {
     sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget);
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->callback = TranslateAnimSpriteToTargetMonLocation;
 }
 
@@ -913,16 +913,16 @@ static void AnimWhirlwindLine(struct Sprite * sprite)
     if ((gBattleAnimArgs[2] == ANIM_ATTACKER && !GetBattlerSide(gBattleAnimAttacker))
         || (gBattleAnimArgs[2] == ANIM_TARGET && !GetBattlerSide(gBattleAnimTarget)))
     {
-        sprite->pos1.x += 8;
+        sprite->x += 8;
     }
 
     SeekSpriteAnim(sprite, gBattleAnimArgs[4]);
-    sprite->pos1.x -= 32;
+    sprite->x -= 32;
     sprite->data[1] = 0x0ccc;
 
     offset = gBattleAnimArgs[4];
     mult = 12;
-    sprite->pos2.x += mult * offset;
+    sprite->x2 += mult * offset;
     sprite->data[0] = offset;
     sprite->data[7] = gBattleAnimArgs[3];
     sprite->callback = AnimWhirlwindLine_Step;
@@ -930,12 +930,12 @@ static void AnimWhirlwindLine(struct Sprite * sprite)
 
 static void AnimWhirlwindLine_Step(struct Sprite *sprite)
 {
-    sprite->pos2.x += sprite->data[1] >> 8;
+    sprite->x2 += sprite->data[1] >> 8;
 
     if (++sprite->data[0] == 6)
     {
         sprite->data[0] = 0;
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         StartSpriteAnim(sprite, 0);
     }
 
@@ -987,18 +987,18 @@ static void AnimBounceBallLand(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
-        sprite->pos2.y = -sprite->pos1.y - 32;
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+        sprite->y2 = -sprite->y - 32;
         sprite->data[0]++;
         break;
     case 1:
-        sprite->pos2.y += 10;
-        if (sprite->pos2.y >= 0)
+        sprite->y2 += 10;
+        if (sprite->y2 >= 0)
             ++sprite->data[0];
         break;
     case 2:
-        sprite->pos2.y -= 10;
-        if (sprite->pos1.y + sprite->pos2.y < -32)
+        sprite->y2 -= 10;
+        if (sprite->y + sprite->y2 < -32)
         {
             gSprites[GetAnimBattlerSpriteId(ANIM_ATTACKER)].invisible = FALSE;
             DestroyAnimSprite(sprite);
@@ -1022,10 +1022,10 @@ void AnimDiveBall_Step1(struct Sprite *sprite)
     {
         sprite->data[0]--;
     }
-    else if (sprite->pos1.y + sprite->pos2.y > -32)
+    else if (sprite->y + sprite->y2 > -32)
     {
         sprite->data[2] += sprite->data[1];
-        sprite->pos2.y -= (sprite->data[2] >> 8);
+        sprite->y2 -= (sprite->data[2] >> 8);
     }
     else
     {
@@ -1037,12 +1037,12 @@ void AnimDiveBall_Step1(struct Sprite *sprite)
 
 static void AnimDiveBall_Step2(struct Sprite *sprite)
 {
-    sprite->pos2.y += sprite->data[2] >> 8;
+    sprite->y2 += sprite->data[2] >> 8;
 
-    if (sprite->pos1.y + sprite->pos2.y > -32)
+    if (sprite->y + sprite->y2 > -32)
         sprite->invisible = FALSE;
 
-    if (sprite->pos2.y > 0)
+    if (sprite->y2 > 0)
         DestroyAnimSprite(sprite);
 }
 
@@ -1056,13 +1056,13 @@ static void AnimDiveWaterSplash(struct Sprite *sprite)
     case 0:
         if (!gBattleAnimArgs[0])
         {
-            sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
-            sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
+            sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+            sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
         }
         else
         {
-            sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
-            sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+            sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+            sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
         }
 
         sprite->data[1] = 0x200;
@@ -1089,7 +1089,7 @@ static void AnimDiveWaterSplash(struct Sprite *sprite)
             t2 = 128;
 
         t2 = (64 - t2) / 2;
-        sprite->pos2.y = t2;
+        sprite->y2 = t2;
 
         if (sprite->data[2] == 24)
         {
@@ -1123,13 +1123,13 @@ static void AnimSprayWaterDroplet(struct Sprite *sprite)
 
     if (gBattleAnimArgs[1] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32;
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1) + 32;
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 32;
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1) + 32;
     }
 
     sprite->callback = AnimSprayWaterDroplet_Step;
@@ -1139,13 +1139,13 @@ static void AnimSprayWaterDroplet_Step(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
-        sprite->pos2.x += sprite->data[0] >> 8;
-        sprite->pos2.y -= sprite->data[1] >> 8;
+        sprite->x2 += sprite->data[0] >> 8;
+        sprite->y2 -= sprite->data[1] >> 8;
     }
     else
     {
-        sprite->pos2.x -= sprite->data[0] >> 8;
-        sprite->pos2.y -= sprite->data[1] >> 8;
+        sprite->x2 -= sprite->data[0] >> 8;
+        sprite->y2 -= sprite->data[1] >> 8;
     }
 
     sprite->data[0] = sprite->data[0];
@@ -1187,19 +1187,19 @@ static void AnimUnusedFlashingLight_Step(struct Sprite *sprite)
 static void AnimSkyAttackBird(struct Sprite *sprite)
 {
     u16 rotation;
-    s16 posx = sprite->pos1.x;
-    s16 posy = sprite->pos1.y;
+    s16 posx = sprite->x;
+    s16 posy = sprite->y;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
 
-    sprite->data[4] = sprite->pos1.x << 4;
-    sprite->data[5] = sprite->pos1.y << 4;
+    sprite->data[4] = sprite->x << 4;
+    sprite->data[5] = sprite->y << 4;
 
-    sprite->data[6] = ((posx - sprite->pos1.x) << 4) / 12;
-    sprite->data[7] = ((posy - sprite->pos1.y) << 4) / 12;
+    sprite->data[6] = ((posx - sprite->x) << 4) / 12;
+    sprite->data[7] = ((posy - sprite->y) << 4) / 12;
 
-    rotation = ArcTan2Neg(posx - sprite->pos1.x, posy - sprite->pos1.y);
+    rotation = ArcTan2Neg(posx - sprite->x, posy - sprite->y);
     rotation -= 16384;
 
     TrySetSpriteRotScale(sprite, 1, 0x100, 0x100, rotation);
@@ -1212,11 +1212,11 @@ void AnimSkyAttackBird_Step(struct Sprite *sprite)
     sprite->data[4] += sprite->data[6];
     sprite->data[5] += sprite->data[7];
 
-    sprite->pos1.x = sprite->data[4] >> 4;
-    sprite->pos1.y = sprite->data[5] >> 4;
+    sprite->x = sprite->data[4] >> 4;
+    sprite->y = sprite->data[5] >> 4;
 
-    if (sprite->pos1.x > 285 || sprite->pos1.x < -45
-        || sprite->pos1.y > 157 || sprite->pos1.y < -45)
+    if (sprite->x > 285 || sprite->x < -45
+        || sprite->y > 157 || sprite->y < -45)
         DestroySpriteAndMatrix(sprite);
 }
 
diff --git a/src/battle_anim_ghost.c b/src/battle_anim_ghost.c
index e7cd4b253..03a003c60 100644
--- a/src/battle_anim_ghost.c
+++ b/src/battle_anim_ghost.c
@@ -221,9 +221,9 @@ static void AnimConfuseRayBallBounce(struct Sprite *sprite)
 {
     InitSpritePosToAnimAttacker(sprite, TRUE);
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     InitAnimLinearTranslationWithSpeed(sprite);
     sprite->callback = AnimConfuseRayBallBounce_Step1;
@@ -243,8 +243,8 @@ static void AnimConfuseRayBallBounce_Step1(struct Sprite *sprite)
         return;
     }
 
-    sprite->pos2.x += Sin(sprite->data[5], 10);
-    sprite->pos2.y += Cos(sprite->data[5], 15);
+    sprite->x2 += Sin(sprite->data[5], 10);
+    sprite->y2 += Cos(sprite->data[5], 15);
     r2 = sprite->data[5];
     sprite->data[5] = (sprite->data[5] + 5) & 0xFF;
     r0 = sprite->data[5];
@@ -261,8 +261,8 @@ static void AnimConfuseRayBallBounce_Step2(struct Sprite *sprite)
     s16 r0;
     sprite->data[0] = 1;
     AnimTranslateLinear(sprite);
-    sprite->pos2.x += Sin(sprite->data[5], 10);
-    sprite->pos2.y += Cos(sprite->data[5], 15);
+    sprite->x2 += Sin(sprite->data[5], 10);
+    sprite->y2 += Cos(sprite->data[5], 15);
 
     r2 = sprite->data[5];
     sprite->data[5] = (sprite->data[5] + 5) & 0xFF;
@@ -318,8 +318,8 @@ static void AnimConfuseRayBallSpiral(struct Sprite *sprite)
 static void AnimConfuseRayBallSpiral_Step(struct Sprite *sprite)
 {
     u16 temp1;
-    sprite->pos2.x = Sin(sprite->data[0], 32);
-    sprite->pos2.y = Cos(sprite->data[0], 8);
+    sprite->x2 = Sin(sprite->data[0], 32);
+    sprite->y2 = Cos(sprite->data[0], 8);
     temp1 = sprite->data[0] - 65;
     if (temp1 <= 130)
         sprite->oam.priority = 2;
@@ -327,7 +327,7 @@ static void AnimConfuseRayBallSpiral_Step(struct Sprite *sprite)
         sprite->oam.priority = 1;
     sprite->data[0] = (sprite->data[0] + 19) & 0xFF;
     sprite->data[2] += 80;
-    sprite->pos2.y += sprite->data[2] >> 8;
+    sprite->y2 += sprite->data[2] >> 8;
     sprite->data[7] += 1;
     if (sprite->data[7] == 61)
         DestroyAnimSprite(sprite);
@@ -397,19 +397,19 @@ static void AnimTask_NightShadeClone_Step2(u8 taskId)
 // arg 2: duration step 3 (center -> target)
 static void AnimShadowBall(struct Sprite *sprite)
 {
-    s16 oldPosX = sprite->pos1.x;
-    s16 oldPosY = sprite->pos1.y;
+    s16 oldPosX = sprite->x;
+    s16 oldPosY = sprite->y;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = 0;
     sprite->data[1] = gBattleAnimArgs[0];
     sprite->data[2] = gBattleAnimArgs[1];
     sprite->data[3] = gBattleAnimArgs[2];
-    sprite->data[4] = sprite->pos1.x << 4;
-    sprite->data[5] = sprite->pos1.y << 4;
-    sprite->data[6] = ((oldPosX - sprite->pos1.x) << 4) / (gBattleAnimArgs[0] << 1);
-    sprite->data[7] = ((oldPosY - sprite->pos1.y) << 4) / (gBattleAnimArgs[0] << 1);
+    sprite->data[4] = sprite->x << 4;
+    sprite->data[5] = sprite->y << 4;
+    sprite->data[6] = ((oldPosX - sprite->x) << 4) / (gBattleAnimArgs[0] << 1);
+    sprite->data[7] = ((oldPosY - sprite->y) << 4) / (gBattleAnimArgs[0] << 1);
     sprite->callback = AnimShadowBall_Step;
 }
 
@@ -420,8 +420,8 @@ static void AnimShadowBall_Step(struct Sprite *sprite)
     case 0:
         sprite->data[4] += sprite->data[6];
         sprite->data[5] += sprite->data[7];
-        sprite->pos1.x = sprite->data[4] >> 4;
-        sprite->pos1.y = sprite->data[5] >> 4;
+        sprite->x = sprite->data[4] >> 4;
+        sprite->y = sprite->data[5] >> 4;
         sprite->data[1] -= 1;
         if (sprite->data[1] > 0)
             break;
@@ -433,22 +433,22 @@ static void AnimShadowBall_Step(struct Sprite *sprite)
             break;
         sprite->data[1] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
         sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
-        sprite->data[4] = sprite->pos1.x << 4;
-        sprite->data[5] = sprite->pos1.y << 4;
-        sprite->data[6] = ((sprite->data[1] - sprite->pos1.x) << 4) / sprite->data[3];
-        sprite->data[7] = ((sprite->data[2] - sprite->pos1.y) << 4) / sprite->data[3];
+        sprite->data[4] = sprite->x << 4;
+        sprite->data[5] = sprite->y << 4;
+        sprite->data[6] = ((sprite->data[1] - sprite->x) << 4) / sprite->data[3];
+        sprite->data[7] = ((sprite->data[2] - sprite->y) << 4) / sprite->data[3];
         sprite->data[0] += 1;
         break;
     case 2:
         sprite->data[4] += sprite->data[6];
         sprite->data[5] += sprite->data[7];
-        sprite->pos1.x = sprite->data[4] >> 4;
-        sprite->pos1.y = sprite->data[5] >> 4;
+        sprite->x = sprite->data[4] >> 4;
+        sprite->y = sprite->data[5] >> 4;
         sprite->data[3] -= 1;
         if (sprite->data[3] > 0)
             break;
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
         sprite->data[0] += 1;
         break;
     case 3:
@@ -648,7 +648,7 @@ static void AnimTask_SpiteTargetShadow_Step1(u8 taskId)
         task->data[15]++;
         break;
     case 2:
-        startLine = gSprites[task->data[13]].pos1.y + gSprites[task->data[13]].pos2.y - 32;
+        startLine = gSprites[task->data[13]].y + gSprites[task->data[13]].y2 - 32;
         if (startLine < 0)
             startLine = 0;
 
@@ -770,8 +770,8 @@ static void AnimDestinyBondWhiteShadow(struct Sprite *sprite)
     sprite->data[6] = battler2Y;
     sprite->data[7] = sprite->data[4] / 2;
     sprite->oam.priority = 2;
-    sprite->pos1.x = battler1X;
-    sprite->pos1.y = battler1Y;
+    sprite->x = battler1X;
+    sprite->y = battler1Y;
     sprite->callback = AnimDestinyBondWhiteShadow_Step;
     sprite->invisible = TRUE;
 }
@@ -782,8 +782,8 @@ static void AnimDestinyBondWhiteShadow_Step(struct Sprite *sprite)
     {
         sprite->data[0] += sprite->data[2];
         sprite->data[1] += sprite->data[3];
-        sprite->pos1.x = sprite->data[0] >> 4;
-        sprite->pos1.y = sprite->data[1] >> 4;
+        sprite->x = sprite->data[0] >> 4;
+        sprite->y = sprite->data[1] >> 4;
         if (--sprite->data[4] == 0)
             sprite->data[0] = 0;
     }
@@ -1047,7 +1047,7 @@ static void AnimCurseNail(struct Sprite *sprite)
         xDelta2 = 2;
     }
 
-    sprite->pos1.x += xDelta;
+    sprite->x += xDelta;
     sprite->data[1] = xDelta2;
     sprite->data[0] = 60;
     sprite->callback = AnimCurseNail_Step1;
@@ -1063,12 +1063,12 @@ static void AnimCurseNail_Step1(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos2.x += sprite->data[1];
-        var0 = sprite->pos2.x + 7;
+        sprite->x2 += sprite->data[1];
+        var0 = sprite->x2 + 7;
         if (var0 > 14)
         {
-            sprite->pos1.x += sprite->pos2.x;
-            sprite->pos2.x = 0;
+            sprite->x += sprite->x2;
+            sprite->x2 = 0;
             sprite->oam.tileNum += 8;
             if (++sprite->data[2] == 3)
             {
@@ -1125,13 +1125,13 @@ static void AnimGhostStatusSprite(struct Sprite *sprite)
     u16 coeffB;
     u16 coeffA;
 
-    sprite->pos2.x = Sin(sprite->data[0], 12);
+    sprite->x2 = Sin(sprite->data[0], 12);
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-        sprite->pos2.x = -sprite->pos2.x;
+        sprite->x2 = -sprite->x2;
 
     sprite->data[0] = (sprite->data[0] + 6) & 0xFF;
     sprite->data[1] += 0x100;
-    sprite->pos2.y = -(sprite->data[1] >> 8);
+    sprite->y2 = -(sprite->data[1] >> 8);
 
     sprite->data[7]++;
     if (sprite->data[7] == 1)
@@ -1284,7 +1284,7 @@ static void AnimGrudgeFlame(struct Sprite *sprite)
         sprite->data[2] -= 2;
 
     sprite->data[2] &= 0xFF;
-    sprite->pos2.x = Sin(sprite->data[2], sprite->data[3]);
+    sprite->x2 = Sin(sprite->data[2], sprite->data[3]);
 
     index = sprite->data[2] - 65;
     if (index < 127)
@@ -1294,7 +1294,7 @@ static void AnimGrudgeFlame(struct Sprite *sprite)
 
     sprite->data[5]++;
     sprite->data[6] = (sprite->data[5] * 8) & 0xFF;
-    sprite->pos2.y = Sin(sprite->data[6], 7);
+    sprite->y2 = Sin(sprite->data[6], 7);
     if (gTasks[sprite->data[0]].data[8])
     {
         gTasks[sprite->data[0]].data[7]--;
@@ -1312,7 +1312,7 @@ static void AnimMonMoveCircular(struct Sprite *sprite)
     sprite->data[3] = gBattleAnimArgs[1];
     sprite->callback = AnimMonMoveCircular_Step;
 
-    gSprites[sprite->data[5]].pos1.y += 8;
+    gSprites[sprite->data[5]].y += 8;
 }
 
 static void AnimMonMoveCircular_Step(struct Sprite *sprite)
@@ -1320,17 +1320,17 @@ static void AnimMonMoveCircular_Step(struct Sprite *sprite)
     if (sprite->data[3])
     {
         sprite->data[3]--;
-        gSprites[sprite->data[5]].pos2.x = Sin(sprite->data[0], sprite->data[1]);
-        gSprites[sprite->data[5]].pos2.y = Cos(sprite->data[0], sprite->data[1]);
+        gSprites[sprite->data[5]].x2 = Sin(sprite->data[0], sprite->data[1]);
+        gSprites[sprite->data[5]].y2 = Cos(sprite->data[0], sprite->data[1]);
         sprite->data[0] += sprite->data[2];
         if (sprite->data[0] > 255)
             sprite->data[0] -= 256;
     }
     else
     {
-        gSprites[sprite->data[5]].pos2.x = 0;
-        gSprites[sprite->data[5]].pos2.y = 0;
-        gSprites[sprite->data[5]].pos1.y -= 8;
+        gSprites[sprite->data[5]].x2 = 0;
+        gSprites[sprite->data[5]].y2 = 0;
+        gSprites[sprite->data[5]].y -= 8;
         sprite->callback = DestroySpriteAndMatrix;
     }
 }
diff --git a/src/battle_anim_ground.c b/src/battle_anim_ground.c
index aa089394e..81b3d160f 100644
--- a/src/battle_anim_ground.c
+++ b/src/battle_anim_ground.c
@@ -141,8 +141,8 @@ const struct SpriteTemplate gDirtMoundSpriteTemplate =
 // a boomerang. After hitting the target mon, it comes back to the user.
 static void AnimBonemerangProjectile(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
     sprite->data[0] = 20;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
@@ -155,10 +155,10 @@ static void AnimBonemerangProjectile_Step(struct Sprite *sprite)
 {
     if (TranslateAnimHorizontalArc(sprite))
     {
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->y2 = 0;
+        sprite->x2 = 0;
         sprite->data[0] = 20;
         sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, 2);
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, 3);
@@ -186,7 +186,7 @@ static void AnimBoneHitProjectile(struct Sprite *sprite)
     InitSpritePosToAnimTarget(sprite, TRUE);
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
-    
+
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + gBattleAnimArgs[2];
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
@@ -234,16 +234,16 @@ static void AnimMudSportDirt(struct Sprite *sprite)
     sprite->oam.tileNum++;
     if (gBattleAnimArgs[0] == 0)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[1];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[2];
         sprite->data[0] = gBattleAnimArgs[1] > 0 ? 1 : -1;
         sprite->callback = AnimMudSportDirtRising;
     }
     else
     {
-        sprite->pos1.x = gBattleAnimArgs[1];
-        sprite->pos1.y = gBattleAnimArgs[2];
-        sprite->pos2.y = -gBattleAnimArgs[2];
+        sprite->x = gBattleAnimArgs[1];
+        sprite->y = gBattleAnimArgs[2];
+        sprite->y2 = -gBattleAnimArgs[2];
         sprite->callback = AnimMudSportDirtFalling;
     }
 }
@@ -253,11 +253,11 @@ static void AnimMudSportDirtRising(struct Sprite *sprite)
     if (++sprite->data[1] > 1)
     {
         sprite->data[1] = 0;
-        sprite->pos1.x += sprite->data[0];
+        sprite->x += sprite->data[0];
     }
 
-    sprite->pos1.y -= 4;
-    if (sprite->pos1.y < -4)
+    sprite->y -= 4;
+    if (sprite->y < -4)
         DestroyAnimSprite(sprite);
 }
 
@@ -266,10 +266,10 @@ static void AnimMudSportDirtFalling(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos2.y += 4;
-        if (sprite->pos2.y >= 0)
+        sprite->y2 += 4;
+        if (sprite->y2 >= 0)
         {
-            sprite->pos2.y = 0;
+            sprite->y2 = 0;
             sprite->data[0]++;
         }
         break;
@@ -353,7 +353,7 @@ static void AnimTask_DigBounceMovement(u8 taskId)
             else
                 gBattle_BG2_Y = task->data[13] - task->data[5];
 
-            gSprites[task->data[10]].pos2.x = DISPLAY_WIDTH + 32 - gSprites[task->data[10]].pos1.x;
+            gSprites[task->data[10]].x2 = DISPLAY_WIDTH + 32 - gSprites[task->data[10]].x;
             task->data[0]++;
         }
         break;
@@ -372,8 +372,8 @@ static void AnimTask_DigEndBounceMovementSetInvisible(u8 taskId)
 {
     u8 spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
     gSprites[spriteId].invisible = TRUE;
-    gSprites[spriteId].pos2.x = 0;
-    gSprites[spriteId].pos2.y = 0;
+    gSprites[spriteId].x2 = 0;
+    gSprites[spriteId].y2 = 0;
 
     if (GetBattlerSpriteBGPriorityRank(gBattleAnimAttacker) == 1)
         gBattle_BG1_Y = 0;
@@ -404,8 +404,8 @@ static void AnimTask_DigSetVisibleUnderground(u8 taskId)
     case 0:
         task->data[10] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
         gSprites[task->data[10]].invisible = FALSE;
-        gSprites[task->data[10]].pos2.x = 0;
-        gSprites[task->data[10]].pos2.y = DISPLAY_HEIGHT - gSprites[task->data[10]].pos1.y;
+        gSprites[task->data[10]].x2 = 0;
+        gSprites[task->data[10]].y2 = DISPLAY_HEIGHT - gSprites[task->data[10]].y;
         task->data[0]++;
         break;
     case 1:
@@ -438,12 +438,12 @@ static void AnimTask_DigRiseUpFromHole(u8 taskId)
         task->data[0]++;
         break;
     case 2:
-        gSprites[task->data[10]].pos2.y = 96;
+        gSprites[task->data[10]].y2 = 96;
         task->data[0]++;
         break;
     case 3:
-        gSprites[task->data[10]].pos2.y -= 8;
-        if (gSprites[task->data[10]].pos2.y == 0)
+        gSprites[task->data[10]].y2 -= 8;
+        if (gSprites[task->data[10]].y2 == 0)
         {
             gScanlineEffect.state = 3;
             task->data[0]++;
@@ -518,11 +518,11 @@ void AnimDirtPlumeParticle(struct Sprite *sprite)
         gBattleAnimArgs[2] *= -1;
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord(battler, 2) + xOffset;
-    sprite->pos1.y = GetBattlerYCoordWithElevation(battler) + 30;
+    sprite->x = GetBattlerSpriteCoord(battler, 2) + xOffset;
+    sprite->y = GetBattlerYCoordWithElevation(battler) + 30;
     sprite->data[0] = gBattleAnimArgs[5];
-    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
-    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[3];
+    sprite->data[2] = sprite->x + gBattleAnimArgs[2];
+    sprite->data[4] = sprite->y + gBattleAnimArgs[3];
     sprite->data[5] = gBattleAnimArgs[4];
     InitAnimArcTranslation(sprite);
     sprite->callback = AnimDirtPlumeParticle_Step;
@@ -549,8 +549,8 @@ static void AnimDigDirtMound(struct Sprite *sprite)
     else
         battler = gBattleAnimTarget;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(battler, 0) - 16 + (gBattleAnimArgs[1] * 32);
-    sprite->pos1.y = GetBattlerYCoordWithElevation(battler) + 32;
+    sprite->x = GetBattlerSpriteCoord(battler, 0) - 16 + (gBattleAnimArgs[1] * 32);
+    sprite->y = GetBattlerYCoordWithElevation(battler) + 32;
     sprite->oam.tileNum += gBattleAnimArgs[1] * 8;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
     sprite->data[0] = gBattleAnimArgs[2];
@@ -698,7 +698,7 @@ static void AnimTask_ShakeBattlers(u8 taskId)
         break;
     case 2:
         for (i = 0; i < task->tNumBattlers; i++)
-            gSprites[task->tbattlerSpriteIds(i)].pos2.x = 0;
+            gSprites[task->tbattlerSpriteIds(i)].x2 = 0;
 
         DestroyAnimVisualTask(taskId);
         break;
@@ -717,7 +717,7 @@ static void SetBattlersXOffsetForShake(struct Task *task)
 
     for (i = 0; i < task->tNumBattlers; i++)
     {
-        gSprites[task->tbattlerSpriteIds(i)].pos2.x = xOffset;
+        gSprites[task->tbattlerSpriteIds(i)].x2 = xOffset;
     }
 }
 
diff --git a/src/battle_anim_ice.c b/src/battle_anim_ice.c
index 23b0f6c3b..a0608cfd1 100644
--- a/src/battle_anim_ice.c
+++ b/src/battle_anim_ice.c
@@ -550,8 +550,8 @@ static void AnimUnusedIceCrystalThrow(struct Sprite *sprite)
            attackerX += sprite->data[1], attackerY += sprite->data[2])
         ;
 
-    sprite->pos1.x = attackerX;
-    sprite->pos1.y = attackerY;
+    sprite->x = attackerX;
+    sprite->y = attackerY;
     sprite->data[0] = gBattleAnimArgs[4];
     sprite->data[1] = attackerX;
     sprite->data[2] = targetX;
@@ -569,10 +569,10 @@ static void AnimUnusedIceCrystalThrow_Step(struct Sprite *sprite)
     {
         sprite->data[5] += sprite->data[1];
         sprite->data[6] += sprite->data[2];
-        sprite->pos2.x = sprite->data[5];
-        sprite->pos2.y = sprite->data[6];
-        sprite->pos2.x += Sin(sprite->data[7], sprite->data[3]);
-        sprite->pos2.y += Sin(sprite->data[7], sprite->data[3]);
+        sprite->x2 = sprite->data[5];
+        sprite->y2 = sprite->data[6];
+        sprite->x2 += Sin(sprite->data[7], sprite->data[3]);
+        sprite->y2 += Sin(sprite->data[7], sprite->data[3]);
         sprite->data[7] = (sprite->data[7] + sprite->data[4]) & 0xFF;
         sprite->data[0]--;
     }
@@ -631,12 +631,12 @@ static void AnimIceEffectParticle(struct Sprite *sprite)
     }
     else
     {
-        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gBattleAnimTarget, 1, &sprite->x, &sprite->y);
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
     }
 
     StoreSpriteCallbackInData6(sprite, AnimFlickerIceEffectParticle);
@@ -666,8 +666,8 @@ static void AnimSwirlingSnowball(struct Sprite *sprite)
     InitSpritePosToAnimAttacker(sprite, TRUE);
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[3] = sprite->y;
 
     if (!gBattleAnimArgs[5])
     {
@@ -696,16 +696,16 @@ static void AnimSwirlingSnowball(struct Sprite *sprite)
         sprite->data[0] = 1;
         AnimFastTranslateLinear(sprite);
 
-        if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > DISPLAY_WIDTH + 32
-         || sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT
-         || sprite->pos1.y + sprite->pos2.y < -16)
+        if ((u32)(sprite->x + sprite->x2 + 16) > DISPLAY_WIDTH + 32
+         || sprite->y + sprite->y2 > DISPLAY_HEIGHT
+         || sprite->y + sprite->y2 < -16)
             break;
     }
 
-    sprite->pos1.x += sprite->pos2.x;
-    sprite->pos1.y += sprite->pos2.y;
-    sprite->pos2.y = 0;
-    sprite->pos2.x = 0;
+    sprite->x += sprite->x2;
+    sprite->y += sprite->y2;
+    sprite->y2 = 0;
+    sprite->x2 = 0;
 
     for (i = 0; i < 8; i++)
         sprite->data[i] = tempDataHolder[i];
@@ -718,10 +718,10 @@ static void AnimSwirlingSnowball_Step1(struct Sprite *sprite)
 {
     s16 tempVar;
 
-    sprite->pos1.x += sprite->pos2.x;
-    sprite->pos1.y += sprite->pos2.y;
-    sprite->pos2.y = 0;
-    sprite->pos2.x = 0;
+    sprite->x += sprite->x2;
+    sprite->y += sprite->y2;
+    sprite->y2 = 0;
+    sprite->x2 = 0;
     sprite->data[0] = 128;
 
     tempVar = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 20 : -20;
@@ -740,17 +740,17 @@ static void AnimSwirlingSnowball_Step2(struct Sprite *sprite)
 
     if (sprite->data[5] <= 31)
     {
-        sprite->pos2.x = Sin(sprite->data[0], tempVar) - sprite->data[3];
-        sprite->pos2.y = Cos(sprite->data[0], 15)      - sprite->data[4];
+        sprite->x2 = Sin(sprite->data[0], tempVar) - sprite->data[3];
+        sprite->y2 = Cos(sprite->data[0], 15)      - sprite->data[4];
         sprite->data[0] = (sprite->data[0] + 16) & 0xFF;
         sprite->data[5] += 1;
     }
     else
     {
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->y2 = 0;
+        sprite->x2 = 0;
         sprite->data[4] = 0;
         sprite->data[3] = 0;
         sprite->callback = AnimSwirlingSnowball_End;
@@ -762,9 +762,9 @@ static void AnimSwirlingSnowball_End(struct Sprite *sprite)
     sprite->data[0] = 1;
     AnimFastTranslateLinear(sprite);
 
-    if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > DISPLAY_WIDTH + 32
-     || sprite->pos1.y + sprite->pos2.y > 256
-     || sprite->pos1.y + sprite->pos2.y < -16)
+    if ((u32)(sprite->x + sprite->x2 + 16) > DISPLAY_WIDTH + 32
+     || sprite->y + sprite->y2 > 256
+     || sprite->y + sprite->y2 < -16)
         DestroyAnimSprite(sprite);
 }
 
@@ -786,8 +786,8 @@ static void AnimMoveParticleBeyondTarget(struct Sprite *sprite)
     InitSpritePosToAnimAttacker(sprite, TRUE);
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[3] = sprite->y;
 
     if (!gBattleAnimArgs[7])
     {
@@ -816,16 +816,16 @@ static void AnimMoveParticleBeyondTarget(struct Sprite *sprite)
     {
         sprite->data[0] = 1;
         AnimFastTranslateLinear(sprite);
-        if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > DISPLAY_WIDTH + 32
-         || sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT
-         || sprite->pos1.y + sprite->pos2.y < -16)
+        if ((u32)(sprite->x + sprite->x2 + 16) > DISPLAY_WIDTH + 32
+         || sprite->y + sprite->y2 > DISPLAY_HEIGHT
+         || sprite->y + sprite->y2 < -16)
             break;
     }
 
-    sprite->pos1.x += sprite->pos2.x;
-    sprite->pos1.y += sprite->pos2.y;
-    sprite->pos2.y = 0;
-    sprite->pos2.x = 0;
+    sprite->x += sprite->x2;
+    sprite->y += sprite->y2;
+    sprite->y2 = 0;
+    sprite->x2 = 0;
 
     for (i = 0; i < 8; i++)
         sprite->data[i] = tempDataHolder[i];
@@ -842,13 +842,13 @@ static void AnimWiggleParticleTowardsTarget(struct Sprite *sprite)
     if (sprite->data[0] == 0)
         sprite->data[0] = 1;
 
-    sprite->pos2.y += Sin(sprite->data[7], sprite->data[5]);
+    sprite->y2 += Sin(sprite->data[7], sprite->data[5]);
     sprite->data[7] = (sprite->data[7] + sprite->data[6]) & 0xFF;
     if (sprite->data[0] == 1)
     {
-        if ((u32)(sprite->pos1.x + sprite->pos2.x + 16) > DISPLAY_WIDTH + 32
-         || sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT
-         || sprite->pos1.y + sprite->pos2.y < -16)
+        if ((u32)(sprite->x + sprite->x2 + 16) > DISPLAY_WIDTH + 32
+         || sprite->y + sprite->y2 > DISPLAY_HEIGHT
+         || sprite->y + sprite->y2 < -16)
             DestroyAnimSprite(sprite);
     }
 }
@@ -867,13 +867,13 @@ static void AnimWaveFromCenterOfTarget(struct Sprite *sprite)
         }
         else
         {
-            SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+            SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y);
 
             if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
                 gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
-            sprite->pos1.x += gBattleAnimArgs[0];
-            sprite->pos1.y += gBattleAnimArgs[1];
+            sprite->x += gBattleAnimArgs[0];
+            sprite->y += gBattleAnimArgs[1];
         }
 
         sprite->data[0]++;
@@ -905,13 +905,13 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
         }
         else
         {
-            SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->pos1.x, &sprite->pos1.y);
+            SetAverageBattlerPositions(gBattleAnimAttacker, 0, &sprite->x, &sprite->y);
             if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-                sprite->pos1.x -= gBattleAnimArgs[0];
+                sprite->x -= gBattleAnimArgs[0];
             else
-                sprite->pos1.x += gBattleAnimArgs[0];
+                sprite->x += gBattleAnimArgs[0];
 
-            sprite->pos1.y += gBattleAnimArgs[1];
+            sprite->y += gBattleAnimArgs[1];
         }
 
         battler = gBattleAnimAttacker;
@@ -924,13 +924,13 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
         }
         else
         {
-            SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+            SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y);
             if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER)
-                sprite->pos1.x -= gBattleAnimArgs[0];
+                sprite->x -= gBattleAnimArgs[0];
             else
-                sprite->pos1.x += gBattleAnimArgs[0];
+                sprite->x += gBattleAnimArgs[0];
 
-            sprite->pos1.y += gBattleAnimArgs[1];
+            sprite->y += gBattleAnimArgs[1];
         }
 
         battler = gBattleAnimTarget;
@@ -944,13 +944,13 @@ static void InitSwirlingFogAnim(struct Sprite *sprite)
 
     sprite->data[6] = tempVar;
     if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
-        sprite->pos1.y += 8;
+        sprite->y += 8;
 
     sprite->data[0] = gBattleAnimArgs[3];
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[2];
+    sprite->data[1] = sprite->x;
+    sprite->data[2] = sprite->x;
+    sprite->data[3] = sprite->y;
+    sprite->data[4] = sprite->y + gBattleAnimArgs[2];
 
     InitAnimLinearTranslation(sprite);
 
@@ -964,8 +964,8 @@ static void AnimSwirlingFogAnim(struct Sprite *sprite)
 {
     if (!AnimTranslateLinear(sprite))
     {
-        sprite->pos2.x += Sin(sprite->data[5], sprite->data[6]);
-        sprite->pos2.y += Cos(sprite->data[5], -6);
+        sprite->x2 += Sin(sprite->data[5], sprite->data[6]);
+        sprite->y2 += Cos(sprite->data[5], -6);
 
         if ((u16)(sprite->data[5] - 64) <= 0x7F)
             sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]);
@@ -1080,8 +1080,8 @@ static void AnimTask_HazeScrollingFog_Step(u8 taskId)
 // arg 5: ??? unknown (seems to vibrate target mon somehow)
 static void AnimThrowMistBall(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     sprite->callback = TranslateAnimSpriteToTargetMonLocation;
 }
 
@@ -1200,21 +1200,21 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite)
         sprite->data[6] = 1;
     }
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     if (gBattleAnimArgs[7])
     {
-        sprite->data[1] = sprite->pos1.x + gBattleAnimArgs[1];
+        sprite->data[1] = sprite->x + gBattleAnimArgs[1];
         sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[3];
-        sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2];
+        sprite->data[3] = sprite->y + gBattleAnimArgs[2];
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[4];
         sprite->data[7] |= GetBattlerSpriteBGPriority(gBattleAnimTarget) << 8;
     }
     else
     {
-        sprite->data[1] = sprite->pos1.x + gBattleAnimArgs[1];
+        sprite->data[1] = sprite->x + gBattleAnimArgs[1];
         sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X) + gBattleAnimArgs[3];
-        sprite->data[3] = sprite->pos1.y + gBattleAnimArgs[2];
+        sprite->data[3] = sprite->y + gBattleAnimArgs[2];
         sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y) + gBattleAnimArgs[4];
         sprite->data[7] |= GetBattlerSpriteBGPriority(gBattleAnimTarget) << 8;
     }
@@ -1238,7 +1238,7 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
     case 0:
         AnimTranslateLinear(sprite);
         value = gSineTable[sprite->data[5]];
-        sprite->pos2.x += value >> 4;
+        sprite->x2 += value >> 4;
         if (sprite->data[6])
             sprite->data[5] = (sprite->data[5] - 8) & 0xFF;
         else
@@ -1247,12 +1247,12 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
         if (sprite->data[0] <= 0)
         {
             sprite->data[0] = 80;
-            sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X);
-            sprite->data[1] = sprite->pos1.x;
-            sprite->data[2] = sprite->pos1.x;
-            sprite->pos1.y += sprite->pos2.y;
-            sprite->data[3] = sprite->pos1.y;
-            sprite->data[4] = sprite->pos1.y + 29;
+            sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X);
+            sprite->data[1] = sprite->x;
+            sprite->data[2] = sprite->x;
+            sprite->y += sprite->y2;
+            sprite->data[3] = sprite->y;
+            sprite->data[4] = sprite->y + 29;
             sprite->data[7]++;
             if (IsContest())
                 sprite->data[5] = 80;
@@ -1261,9 +1261,9 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
             else
                 sprite->data[5] = 80;
 
-            sprite->pos2.y = 0;
+            sprite->y2 = 0;
             value = gSineTable[sprite->data[5]];
-            sprite->pos2.x = value >> 3;
+            sprite->x2 = value >> 3;
             sprite->data[5] = (sprite->data[5] + 2) & 0xFF;
             InitAnimLinearTranslation(sprite);
         }
@@ -1271,8 +1271,8 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
     case 1:
         AnimTranslateLinear(sprite);
         value = gSineTable[sprite->data[5]];
-        sprite->pos2.x += value >> 3;
-        sprite->pos2.y += (gSineTable[sprite->data[5] + 0x40] * -3) >> 8;
+        sprite->x2 += value >> 3;
+        sprite->y2 += (gSineTable[sprite->data[5] + 0x40] * -3) >> 8;
         if (!IsContest())
         {
             u16 var0 = sprite->data[5] - 0x40;
@@ -1297,9 +1297,9 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
         if (sprite->data[0] <= 0)
         {
             sprite->data[0] = 0x300;
-            sprite->data[1] = sprite->pos1.x += sprite->pos2.x;
-            sprite->data[3] = sprite->pos1.y += sprite->pos2.y;
-            sprite->data[4] = sprite->pos1.y + 4;
+            sprite->data[1] = sprite->x += sprite->x2;
+            sprite->data[3] = sprite->y += sprite->y2;
+            sprite->data[4] = sprite->y + 4;
             if (IsContest())
                 sprite->data[2] = -0x10;
             else if (GET_BATTLER_SIDE2(gBattleAnimTarget) != B_SIDE_PLAYER)
@@ -1308,7 +1308,7 @@ static void MovePoisonGasCloud(struct Sprite *sprite)
                 sprite->data[2] = -0x10;
 
             sprite->data[7]++;
-            sprite->pos2.x = sprite->pos2.y = 0;
+            sprite->x2 = sprite->y2 = 0;
             InitAnimLinearTranslationWithSpeed(sprite);
         }
         break;
@@ -1442,10 +1442,10 @@ static void AnimHailBegin(struct Sprite *sprite)
 {
     u8 spriteId;
 
-    sprite->pos1.x += 4;
-    sprite->pos1.y += 8;
+    sprite->x += 4;
+    sprite->y += 8;
 
-    if (sprite->pos1.x < sprite->data[3] && sprite->pos1.y < sprite->data[4])
+    if (sprite->x < sprite->data[3] && sprite->y < sprite->data[4])
         return;
 
     if (sprite->data[0] == 1 && sprite->data[5] == 0)
@@ -1550,11 +1550,11 @@ static void AnimIceBallParticle(struct Sprite *sprite)
     sprite->data[4] += sprite->data[2];
 
     if (sprite->data[1] & 1)
-        sprite->pos2.x = -(sprite->data[3] >> 8);
+        sprite->x2 = -(sprite->data[3] >> 8);
     else
-        sprite->pos2.x = sprite->data[3] >> 8;
+        sprite->x2 = sprite->data[3] >> 8;
 
-    sprite->pos2.y = sprite->data[4] >> 8;
+    sprite->y2 = sprite->data[4] >> 8;
 
     if (++sprite->data[0] == 21)
         DestroyAnimSprite(sprite);
diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c
index b9c4c7b30..31857c4dc 100644
--- a/src/battle_anim_mon_movement.c
+++ b/src/battle_anim_mon_movement.c
@@ -99,8 +99,8 @@ void AnimTask_ShakeMon(u8 taskId)
         DestroyAnimVisualTask(taskId);
         return;
     }
-    gSprites[spriteId].pos2.x = gBattleAnimArgs[1];
-    gSprites[spriteId].pos2.y = gBattleAnimArgs[2];
+    gSprites[spriteId].x2 = gBattleAnimArgs[1];
+    gSprites[spriteId].y2 = gBattleAnimArgs[2];
     gTasks[taskId].data[0] = spriteId;
     gTasks[taskId].data[1] = gBattleAnimArgs[3];
     gTasks[taskId].data[2] = gBattleAnimArgs[4];
@@ -115,27 +115,27 @@ static void AnimTask_ShakeMon_Step(u8 taskId)
 {
     if (gTasks[taskId].data[3] == 0)
     {
-        if (gSprites[gTasks[taskId].data[0]].pos2.x == 0)
+        if (gSprites[gTasks[taskId].data[0]].x2 == 0)
         {
-            gSprites[gTasks[taskId].data[0]].pos2.x = gTasks[taskId].data[4];
+            gSprites[gTasks[taskId].data[0]].x2 = gTasks[taskId].data[4];
         }
         else
         {
-            gSprites[gTasks[taskId].data[0]].pos2.x = 0;
+            gSprites[gTasks[taskId].data[0]].x2 = 0;
         }
-        if (gSprites[gTasks[taskId].data[0]].pos2.y == 0)
+        if (gSprites[gTasks[taskId].data[0]].y2 == 0)
         {
-            gSprites[gTasks[taskId].data[0]].pos2.y = gTasks[taskId].data[5];
+            gSprites[gTasks[taskId].data[0]].y2 = gTasks[taskId].data[5];
         }
         else
         {
-            gSprites[gTasks[taskId].data[0]].pos2.y = 0;
+            gSprites[gTasks[taskId].data[0]].y2 = 0;
         }
         gTasks[taskId].data[3] = gTasks[taskId].data[2];
         if (--gTasks[taskId].data[1] == 0)
         {
-            gSprites[gTasks[taskId].data[0]].pos2.x = 0;
-            gSprites[gTasks[taskId].data[0]].pos2.y = 0;
+            gSprites[gTasks[taskId].data[0]].x2 = 0;
+            gSprites[gTasks[taskId].data[0]].y2 = 0;
             DestroyAnimVisualTask(taskId);
             return;
         }
@@ -203,8 +203,8 @@ void AnimTask_ShakeMon2(u8 taskId)
         return;
     }
 
-    gSprites[spriteId].pos2.x = gBattleAnimArgs[1];
-    gSprites[spriteId].pos2.y = gBattleAnimArgs[2];
+    gSprites[spriteId].x2 = gBattleAnimArgs[1];
+    gSprites[spriteId].y2 = gBattleAnimArgs[2];
     gTasks[taskId].data[0] = spriteId;
     gTasks[taskId].data[1] = gBattleAnimArgs[3];
     gTasks[taskId].data[2] = gBattleAnimArgs[4];
@@ -219,21 +219,21 @@ static void AnimTask_ShakeMon2_Step(u8 taskId)
 {
     if (gTasks[taskId].data[3] == 0)
     {
-        if (gSprites[gTasks[taskId].data[0]].pos2.x == gTasks[taskId].data[4])
-            gSprites[gTasks[taskId].data[0]].pos2.x = -gTasks[taskId].data[4];
+        if (gSprites[gTasks[taskId].data[0]].x2 == gTasks[taskId].data[4])
+            gSprites[gTasks[taskId].data[0]].x2 = -gTasks[taskId].data[4];
         else
-            gSprites[gTasks[taskId].data[0]].pos2.x = gTasks[taskId].data[4];
+            gSprites[gTasks[taskId].data[0]].x2 = gTasks[taskId].data[4];
 
-        if (gSprites[gTasks[taskId].data[0]].pos2.y == gTasks[taskId].data[5])
-            gSprites[gTasks[taskId].data[0]].pos2.y = -gTasks[taskId].data[5];
+        if (gSprites[gTasks[taskId].data[0]].y2 == gTasks[taskId].data[5])
+            gSprites[gTasks[taskId].data[0]].y2 = -gTasks[taskId].data[5];
         else
-            gSprites[gTasks[taskId].data[0]].pos2.y = gTasks[taskId].data[5];
+            gSprites[gTasks[taskId].data[0]].y2 = gTasks[taskId].data[5];
 
         gTasks[taskId].data[3] = gTasks[taskId].data[2];
         if (--gTasks[taskId].data[1] == 0)
         {
-            gSprites[gTasks[taskId].data[0]].pos2.x = 0;
-            gSprites[gTasks[taskId].data[0]].pos2.y = 0;
+            gSprites[gTasks[taskId].data[0]].x2 = 0;
+            gSprites[gTasks[taskId].data[0]].y2 = 0;
             DestroyAnimVisualTask(taskId);
             return;
         }
@@ -261,8 +261,8 @@ void AnimTask_ShakeMonInPlace(u8 taskId)
         return;
     }
 
-    gSprites[spriteId].pos2.x += gBattleAnimArgs[1];
-    gSprites[spriteId].pos2.y += gBattleAnimArgs[2];
+    gSprites[spriteId].x2 += gBattleAnimArgs[1];
+    gSprites[spriteId].y2 += gBattleAnimArgs[2];
     gTasks[taskId].data[0] = spriteId;
     gTasks[taskId].data[1] = 0;
     gTasks[taskId].data[2] = gBattleAnimArgs[3];
@@ -280,26 +280,26 @@ static void AnimTask_ShakeMonInPlace_Step(u8 taskId)
     {
         if (gTasks[taskId].data[1] & 1)
         {
-            gSprites[gTasks[taskId].data[0]].pos2.x += gTasks[taskId].data[5];
-            gSprites[gTasks[taskId].data[0]].pos2.y += gTasks[taskId].data[6];
+            gSprites[gTasks[taskId].data[0]].x2 += gTasks[taskId].data[5];
+            gSprites[gTasks[taskId].data[0]].y2 += gTasks[taskId].data[6];
         }
         else
         {
-            gSprites[gTasks[taskId].data[0]].pos2.x -= gTasks[taskId].data[5];
-            gSprites[gTasks[taskId].data[0]].pos2.y -= gTasks[taskId].data[6];
+            gSprites[gTasks[taskId].data[0]].x2 -= gTasks[taskId].data[5];
+            gSprites[gTasks[taskId].data[0]].y2 -= gTasks[taskId].data[6];
         }
         gTasks[taskId].data[3] = gTasks[taskId].data[4];
         if (++gTasks[taskId].data[1] >= gTasks[taskId].data[2])
         {
             if (gTasks[taskId].data[1] & 1)
             {
-                gSprites[gTasks[taskId].data[0]].pos2.x += gTasks[taskId].data[5] / 2;
-                gSprites[gTasks[taskId].data[0]].pos2.y += gTasks[taskId].data[6] / 2;
+                gSprites[gTasks[taskId].data[0]].x2 += gTasks[taskId].data[5] / 2;
+                gSprites[gTasks[taskId].data[0]].y2 += gTasks[taskId].data[6] / 2;
             }
             else
             {
-                gSprites[gTasks[taskId].data[0]].pos2.x -= gTasks[taskId].data[5] / 2;
-                gSprites[gTasks[taskId].data[0]].pos2.y -= gTasks[taskId].data[6] / 2;
+                gSprites[gTasks[taskId].data[0]].x2 -= gTasks[taskId].data[5] / 2;
+                gSprites[gTasks[taskId].data[0]].y2 -= gTasks[taskId].data[6] / 2;
             }
             DestroyAnimVisualTask(taskId);
             return;
@@ -320,7 +320,7 @@ static void AnimTask_ShakeMonInPlace_Step(u8 taskId)
 void AnimTask_ShakeAndSinkMon(u8 taskId)
 {
     u8 spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
-    gSprites[spriteId].pos2.x = gBattleAnimArgs[1];
+    gSprites[spriteId].x2 = gBattleAnimArgs[1];
     gTasks[taskId].data[0] = spriteId;
     gTasks[taskId].data[1] = gBattleAnimArgs[1];
     gTasks[taskId].data[2] = gBattleAnimArgs[2];
@@ -339,15 +339,15 @@ static void AnimTask_ShakeAndSinkMon_Step(u8 taskId)
     if (gTasks[taskId].data[2] == gTasks[taskId].data[8]++)
     {
         gTasks[taskId].data[8] = 0;
-        if (gSprites[spriteId].pos2.x == x)
+        if (gSprites[spriteId].x2 == x)
             x = -x;
 
-        gSprites[spriteId].pos2.x += x;
+        gSprites[spriteId].x2 += x;
     }
 
     gTasks[taskId].data[1] = x;
     gTasks[taskId].data[9] += gTasks[taskId].data[3];
-    gSprites[spriteId].pos2.y = gTasks[taskId].data[9] >> 8;
+    gSprites[spriteId].y2 = gTasks[taskId].data[9] >> 8;
     if (--gTasks[taskId].data[4] == 0)
     {
         DestroyAnimVisualTask(taskId);
@@ -390,9 +390,9 @@ void AnimTask_TranslateMonElliptical(u8 taskId)
 static void AnimTask_TranslateMonElliptical_Step(u8 taskId)
 {
     u8 spriteId = gTasks[taskId].data[0];
-    gSprites[spriteId].pos2.x = Sin(gTasks[taskId].data[5], gTasks[taskId].data[1]);
-    gSprites[spriteId].pos2.y = -Cos(gTasks[taskId].data[5], gTasks[taskId].data[2]);
-    gSprites[spriteId].pos2.y += gTasks[taskId].data[2];
+    gSprites[spriteId].x2 = Sin(gTasks[taskId].data[5], gTasks[taskId].data[1]);
+    gSprites[spriteId].y2 = -Cos(gTasks[taskId].data[5], gTasks[taskId].data[2]);
+    gSprites[spriteId].y2 += gTasks[taskId].data[2];
     gTasks[taskId].data[5] += gTasks[taskId].data[4];
     gTasks[taskId].data[5] &= 0xff;
 
@@ -401,8 +401,8 @@ static void AnimTask_TranslateMonElliptical_Step(u8 taskId)
 
     if (gTasks[taskId].data[3] == 0)
     {
-        gSprites[spriteId].pos2.x = 0;
-        gSprites[spriteId].pos2.y = 0;
+        gSprites[spriteId].x2 = 0;
+        gSprites[spriteId].y2 = 0;
         DestroyAnimVisualTask(taskId);
         return;
     }
@@ -493,15 +493,15 @@ static void SlideMonToOriginalPos(struct Sprite *sprite)
         monSpriteId = gBattlerSpriteIds[gBattleAnimTarget];
 
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[1] = gSprites[monSpriteId].pos1.x + gSprites[monSpriteId].pos2.x;
-    sprite->data[2] = gSprites[monSpriteId].pos1.x;
-    sprite->data[3] = gSprites[monSpriteId].pos1.y + gSprites[monSpriteId].pos2.y;
-    sprite->data[4] = gSprites[monSpriteId].pos1.y;
+    sprite->data[1] = gSprites[monSpriteId].x + gSprites[monSpriteId].x2;
+    sprite->data[2] = gSprites[monSpriteId].x;
+    sprite->data[3] = gSprites[monSpriteId].y + gSprites[monSpriteId].y2;
+    sprite->data[4] = gSprites[monSpriteId].y;
     InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = 0;
     sprite->data[4] = 0;
-    sprite->data[5] = gSprites[monSpriteId].pos2.x;
-    sprite->data[6] = gSprites[monSpriteId].pos2.y;
+    sprite->data[5] = gSprites[monSpriteId].x2;
+    sprite->data[6] = gSprites[monSpriteId].y2;
     sprite->invisible = TRUE;
 
     if (gBattleAnimArgs[1] == 1)
@@ -526,10 +526,10 @@ static void SlideMonToOriginalPos_Step(struct Sprite *sprite)
     if (sprite->data[0] == 0)
     {
         if (lo < 2)
-            monSprite->pos2.x = 0;
+            monSprite->x2 = 0;
 
         if (lo == 2 || lo == 0)
-            monSprite->pos2.y = 0;
+            monSprite->y2 = 0;
 
         DestroyAnimSprite(sprite);
     }
@@ -538,8 +538,8 @@ static void SlideMonToOriginalPos_Step(struct Sprite *sprite)
         sprite->data[0]--;
         sprite->data[3] += sprite->data[1];
         sprite->data[4] += sprite->data[2];
-        monSprite->pos2.x = (s8)(sprite->data[3] >> 8) + sprite->data[5];
-        monSprite->pos2.y = (s8)(sprite->data[4] >> 8) + sprite->data[6];
+        monSprite->x2 = (s8)(sprite->data[3] >> 8) + sprite->data[5];
+        monSprite->y2 = (s8)(sprite->data[4] >> 8) + sprite->data[6];
     }
 }
 
@@ -571,10 +571,10 @@ static void SlideMonToOffset(struct Sprite *sprite)
     }
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[1] = gSprites[monSpriteId].pos1.x;
-    sprite->data[2] = gSprites[monSpriteId].pos1.x + gBattleAnimArgs[1];
-    sprite->data[3] = gSprites[monSpriteId].pos1.y;
-    sprite->data[4] = gSprites[monSpriteId].pos1.y + gBattleAnimArgs[2];
+    sprite->data[1] = gSprites[monSpriteId].x;
+    sprite->data[2] = gSprites[monSpriteId].x + gBattleAnimArgs[1];
+    sprite->data[3] = gSprites[monSpriteId].y;
+    sprite->data[4] = gSprites[monSpriteId].y + gBattleAnimArgs[2];
     InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = 0;
     sprite->data[4] = 0;
@@ -605,13 +605,13 @@ static void SlideMonToOffsetAndBack(struct Sprite *sprite)
         }
     }
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[1] = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x;
+    sprite->data[1] = gSprites[spriteId].x + gSprites[spriteId].x2;
     sprite->data[2] = sprite->data[1] + gBattleAnimArgs[1];
-    sprite->data[3] = gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y;
+    sprite->data[3] = gSprites[spriteId].y + gSprites[spriteId].y2;
     sprite->data[4] = sprite->data[3] + gBattleAnimArgs[2];
     InitSpriteDataForLinearTranslation(sprite);
-    sprite->data[3] = gSprites[spriteId].pos2.x << 8;
-    sprite->data[4] = gSprites[spriteId].pos2.y << 8;
+    sprite->data[3] = gSprites[spriteId].x2 << 8;
+    sprite->data[4] = gSprites[spriteId].y2 << 8;
     sprite->data[5] = spriteId;
     sprite->data[6] = gBattleAnimArgs[5];
     if (!gBattleAnimArgs[5])
@@ -628,8 +628,8 @@ static void SlideMonToOffsetAndBack(struct Sprite *sprite)
 
 static void SlideMonToOffsetAndBack_End(struct Sprite *sprite)
 {
-    gSprites[sprite->data[5]].pos2.x = 0;
-    gSprites[sprite->data[5]].pos2.y = 0;
+    gSprites[sprite->data[5]].x2 = 0;
+    gSprites[sprite->data[5]].y2 = 0;
     DestroyAnimSprite(sprite);
 }
 
@@ -667,8 +667,8 @@ static void AnimTask_WindUpLunge_Step1(u8 taskId)
     u8 spriteId;
     spriteId = gTasks[taskId].data[0];
     gTasks[taskId].data[11] += gTasks[taskId].data[1];
-    gSprites[spriteId].pos2.x = gTasks[taskId].data[11] >> 8;
-    gSprites[spriteId].pos2.y = Sin((u8)(gTasks[taskId].data[10] >> 8), gTasks[taskId].data[2]);
+    gSprites[spriteId].x2 = gTasks[taskId].data[11] >> 8;
+    gSprites[spriteId].y2 = Sin((u8)(gTasks[taskId].data[10] >> 8), gTasks[taskId].data[2]);
     gTasks[taskId].data[10] += gTasks[taskId].data[7];
     if (--gTasks[taskId].data[3] == 0)
     {
@@ -687,7 +687,7 @@ static void AnimTask_WindUpLunge_Step2(u8 taskId)
     {
         spriteId = gTasks[taskId].data[0];
         gTasks[taskId].data[12] += gTasks[taskId].data[5];
-        gSprites[spriteId].pos2.x = (gTasks[taskId].data[12] >> 8) + (gTasks[taskId].data[11] >> 8);
+        gSprites[spriteId].x2 = (gTasks[taskId].data[12] >> 8) + (gTasks[taskId].data[11] >> 8);
         if (--gTasks[taskId].data[6] == 0)
         {
             DestroyAnimVisualTask(taskId);
@@ -741,8 +741,8 @@ void AnimTask_SlideOffScreen(u8 taskId)
 static void AnimTask_SlideOffScreen_Step(u8 taskId)
 {
     u8 spriteId = gTasks[taskId].data[0];
-    gSprites[spriteId].pos2.x += gTasks[taskId].data[1];
-    if (gSprites[spriteId].pos2.x + gSprites[spriteId].pos1.x + 0x20 > 0x130u)
+    gSprites[spriteId].x2 += gTasks[taskId].data[1];
+    if (gSprites[spriteId].x2 + gSprites[spriteId].x + 0x20 > 0x130u)
     {
         DestroyAnimVisualTask(taskId);
         return;
@@ -794,17 +794,17 @@ static void AnimTask_SwayMonStep(u8 taskId)
 
     if (gTasks[taskId].data[0] == 0)
     {
-        gSprites[spriteId].pos2.x = sineValue;
+        gSprites[spriteId].x2 = sineValue;
     }
     else
     {
         if (GetBattlerSide(gTasks[taskId].data[5]) == B_SIDE_PLAYER)
         {
-            gSprites[spriteId].pos2.y = (sineValue >= 0) ? sineValue : -sineValue;
+            gSprites[spriteId].y2 = (sineValue >= 0) ? sineValue : -sineValue;
         }
         else
         {
-            gSprites[spriteId].pos2.y = (sineValue >= 0) ? -sineValue : sineValue;
+            gSprites[spriteId].y2 = (sineValue >= 0) ? -sineValue : sineValue;
         }
     }
 
@@ -815,8 +815,8 @@ static void AnimTask_SwayMonStep(u8 taskId)
         gTasks[taskId].data[12] ^= 1;
         if (--gTasks[taskId].data[3] == 0)
         {
-            gSprites[spriteId].pos2.x = 0;
-            gSprites[spriteId].pos2.y = 0;
+            gSprites[spriteId].x2 = 0;
+            gSprites[spriteId].y2 = 0;
             DestroyAnimVisualTask(taskId);
             return;
         }
@@ -1011,8 +1011,8 @@ void AnimTask_ShakeTargetBasedOnMovePowerOrDmg(u8 taskId)
     gTasks[taskId].data[10] = gBattleAnimArgs[3];
     gTasks[taskId].data[11] = gBattleAnimArgs[4];
     gTasks[taskId].data[7] = GetAnimBattlerSpriteId(ANIM_TARGET);
-    gTasks[taskId].data[8] = gSprites[gTasks[taskId].data[7]].pos2.x;
-    gTasks[taskId].data[9] = gSprites[gTasks[taskId].data[7]].pos2.y;
+    gTasks[taskId].data[8] = gSprites[gTasks[taskId].data[7]].x2;
+    gTasks[taskId].data[9] = gSprites[gTasks[taskId].data[7]].y2;
     gTasks[taskId].data[0] = 0;
     gTasks[taskId].data[1] = gBattleAnimArgs[1];
     gTasks[taskId].data[2] = gBattleAnimArgs[2];
@@ -1030,28 +1030,28 @@ static void AnimTask_ShakeTargetBasedOnMovePowerOrDmg_Step(u8 taskId)
         {
             if (task->data[12])
             {
-                gSprites[task->data[7]].pos2.x = task->data[8] + task->data[13];
+                gSprites[task->data[7]].x2 = task->data[8] + task->data[13];
             }
             else
             {
-                gSprites[task->data[7]].pos2.x = task->data[8] - task->data[14];
+                gSprites[task->data[7]].x2 = task->data[8] - task->data[14];
             }
         }
         if (task->data[11])
         {
             if (task->data[12])
             {
-                gSprites[task->data[7]].pos2.y = task->data[15];
+                gSprites[task->data[7]].y2 = task->data[15];
             }
             else
             {
-                gSprites[task->data[7]].pos2.y = 0;
+                gSprites[task->data[7]].y2 = 0;
             }
         }
         if (!--task->data[2])
         {
-            gSprites[task->data[7]].pos2.x = 0;
-            gSprites[task->data[7]].pos2.y = 0;
+            gSprites[task->data[7]].x2 = 0;
+            gSprites[task->data[7]].y2 = 0;
             DestroyAnimVisualTask(taskId);
             return;
         }
diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c
index cf5ae6eb2..be409f366 100644
--- a/src/battle_anim_mons.c
+++ b/src/battle_anim_mons.c
@@ -432,8 +432,8 @@ void TranslateSpriteInCircleOverDuration(struct Sprite *sprite)
 {
     if (sprite->data[3])
     {
-        sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
-        sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]);
+        sprite->x2 = Sin(sprite->data[0], sprite->data[1]);
+        sprite->y2 = Cos(sprite->data[0], sprite->data[1]);
         sprite->data[0] += sprite->data[2];
         if (sprite->data[0] >= 0x100)
             sprite->data[0] -= 0x100;
@@ -451,8 +451,8 @@ void TranslateSpriteInGrowingCircleOverDuration(struct Sprite *sprite)
 {
     if (sprite->data[3])
     {
-        sprite->pos2.x = Sin(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]);
-        sprite->pos2.y = Cos(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]);
+        sprite->x2 = Sin(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]);
+        sprite->y2 = Cos(sprite->data[0], (sprite->data[5] >> 8) + sprite->data[1]);
         sprite->data[0] += sprite->data[2];
         sprite->data[5] += sprite->data[4];
         if (sprite->data[0] >= 0x100)
@@ -471,8 +471,8 @@ void sub_80A63C8(struct Sprite *sprite)
 {
     if (sprite->data[3])
     {
-        sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
-        sprite->pos2.y = Cos(sprite->data[4], sprite->data[1]);
+        sprite->x2 = Sin(sprite->data[0], sprite->data[1]);
+        sprite->y2 = Cos(sprite->data[4], sprite->data[1]);
         sprite->data[0] += sprite->data[2];
         sprite->data[4] += sprite->data[5];
         if (sprite->data[0] >= 0x100)
@@ -495,8 +495,8 @@ void TranslateSpriteInEllipseOverDuration(struct Sprite *sprite)
 {
     if (sprite->data[3])
     {
-        sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
-        sprite->pos2.y = Cos(sprite->data[0], sprite->data[4]);
+        sprite->x2 = Sin(sprite->data[0], sprite->data[1]);
+        sprite->y2 = Cos(sprite->data[0], sprite->data[4]);
         sprite->data[0] += sprite->data[2];
         if (sprite->data[0] >= 0x100)
             sprite->data[0] -= 0x100;
@@ -547,8 +547,8 @@ void TranslateSpriteLinear(struct Sprite *sprite)
     if (sprite->data[0] > 0)
     {
         sprite->data[0]--;
-        sprite->pos2.x += sprite->data[1];
-        sprite->pos2.y += sprite->data[2];
+        sprite->x2 += sprite->data[1];
+        sprite->y2 += sprite->data[2];
     }
     else
     {
@@ -563,8 +563,8 @@ void TranslateSpriteLinearFixedPoint(struct Sprite *sprite)
         sprite->data[0]--;
         sprite->data[3] += sprite->data[1];
         sprite->data[4] += sprite->data[2];
-        sprite->pos2.x = sprite->data[3] >> 8;
-        sprite->pos2.y = sprite->data[4] >> 8;
+        sprite->x2 = sprite->data[3] >> 8;
+        sprite->y2 = sprite->data[4] >> 8;
     }
     else
     {
@@ -579,8 +579,8 @@ static void TranslateSpriteLinearFixedPointIconFrame(struct Sprite *sprite)
         sprite->data[0]--;
         sprite->data[3] += sprite->data[1];
         sprite->data[4] += sprite->data[2];
-        sprite->pos2.x = sprite->data[3] >> 8;
-        sprite->pos2.y = sprite->data[4] >> 8;
+        sprite->x2 = sprite->data[3] >> 8;
+        sprite->y2 = sprite->data[4] >> 8;
     }
     else
     {
@@ -592,8 +592,8 @@ static void TranslateSpriteLinearFixedPointIconFrame(struct Sprite *sprite)
 
 void sub_80A65EC(struct Sprite *sprite)
 {
-    sprite->data[1] = sprite->pos1.x + sprite->pos2.x;
-    sprite->data[3] = sprite->pos1.y + sprite->pos2.y;
+    sprite->data[1] = sprite->x + sprite->x2;
+    sprite->data[3] = sprite->y + sprite->y2;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2);
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET);
     sprite->callback = sub_80A64D0;
@@ -604,8 +604,8 @@ void TranslateMonSpriteLinear(struct Sprite *sprite)
     if (sprite->data[0] > 0)
     {
         sprite->data[0]--;
-        gSprites[sprite->data[3]].pos2.x += sprite->data[1];
-        gSprites[sprite->data[3]].pos2.y += sprite->data[2];
+        gSprites[sprite->data[3]].x2 += sprite->data[1];
+        gSprites[sprite->data[3]].y2 += sprite->data[2];
     }
     else
     {
@@ -620,8 +620,8 @@ void TranslateMonSpriteLinearFixedPoint(struct Sprite *sprite)
         sprite->data[0]--;
         sprite->data[3] += sprite->data[1];
         sprite->data[4] += sprite->data[2];
-        gSprites[sprite->data[5]].pos2.x = sprite->data[3] >> 8;
-        gSprites[sprite->data[5]].pos2.y = sprite->data[4] >> 8;
+        gSprites[sprite->data[5]].x2 = sprite->data[3] >> 8;
+        gSprites[sprite->data[5]].y2 = sprite->data[4] >> 8;
     }
     else
     {
@@ -634,9 +634,9 @@ void TranslateSpriteLinearAndFlicker(struct Sprite *sprite)
     if (sprite->data[0] > 0)
     {
         sprite->data[0]--;
-        sprite->pos2.x = sprite->data[2] >> 8;
+        sprite->x2 = sprite->data[2] >> 8;
         sprite->data[2] += sprite->data[1];
-        sprite->pos2.y = sprite->data[4] >> 8;
+        sprite->y2 = sprite->data[4] >> 8;
         sprite->data[4] += sprite->data[3];
         if (sprite->data[0] % sprite->data[5] == 0)
         {
@@ -658,8 +658,8 @@ void DestroySpriteAndMatrix(struct Sprite *sprite)
 
 void sub_80A6760(struct Sprite *sprite)
 {
-    sprite->data[1] = sprite->pos1.x + sprite->pos2.x;
-    sprite->data[3] = sprite->pos1.y + sprite->pos2.y;
+    sprite->data[1] = sprite->x + sprite->x2;
+    sprite->data[3] = sprite->y + sprite->y2;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     sprite->callback = sub_80A64D0;
@@ -699,8 +699,8 @@ void DestroyAnimVisualTaskAndDisableBlend(u8 taskId)
 
 void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
 }
 
 // Sets the initial x offset of the anim sprite depending on the horizontal orientation
@@ -712,25 +712,25 @@ void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 xOffset)
 
     if (attackerX > targetX)
     {
-        sprite->pos1.x -= xOffset;
+        sprite->x -= xOffset;
     }
     else if (attackerX < targetX)
     {
-        sprite->pos1.x += xOffset;
+        sprite->x += xOffset;
     }
     else
     {
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-            sprite->pos1.x -= xOffset;
+            sprite->x -= xOffset;
         else
-            sprite->pos1.x += xOffset;
+            sprite->x += xOffset;
     }
 }
 
 void InitAnimArcTranslation(struct Sprite *sprite)
 {
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[3] = sprite->y;
     InitAnimLinearTranslation(sprite);
     sprite->data[6] = 0x8000 / sprite->data[0];
     sprite->data[7] = 0;
@@ -741,7 +741,7 @@ bool8 TranslateAnimHorizontalArc(struct Sprite *sprite)
     if (AnimTranslateLinear(sprite))
         return TRUE;
     sprite->data[7] += sprite->data[6];
-    sprite->pos2.y += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]);
+    sprite->y2 += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]);
     return FALSE;
 }
 
@@ -750,16 +750,16 @@ bool8 TranslateAnimVerticalArc(struct Sprite *sprite)
     if (AnimTranslateLinear(sprite))
         return TRUE;
     sprite->data[7] += sprite->data[6];
-    sprite->pos2.x += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]);
+    sprite->x2 += Sin((u8)(sprite->data[7] >> 8), sprite->data[5]);
     return FALSE;
 }
 
 void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite)
 {
-    sprite->pos1.x += sprite->pos2.x;
-    sprite->pos1.y += sprite->pos2.y;
-    sprite->pos2.x = 0;
-    sprite->pos2.y = 0;
+    sprite->x += sprite->x2;
+    sprite->y += sprite->y2;
+    sprite->x2 = 0;
+    sprite->y2 = 0;
 }
 
 void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 respectMonPicOffsets)
@@ -768,27 +768,27 @@ void InitSpritePosToAnimTarget(struct Sprite *sprite, bool8 respectMonPicOffsets
     // is why there is no else clause for the "respectMonPicOffsets" check.
     if (!respectMonPicOffsets)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_X);
-        sprite->pos1.y = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_Y);
+        sprite->x = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_X);
+        sprite->y = GetBattlerSpriteCoord2(gBattleAnimTarget, BATTLER_COORD_Y);
     }
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
 }
 
 void InitSpritePosToAnimAttacker(struct Sprite *sprite, bool8 respectMonPicOffsets)
 {
     if (!respectMonPicOffsets)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_X);
-        sprite->pos1.y = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_Y);
+        sprite->x = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_X);
+        sprite->y = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_Y);
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_X_2);
-        sprite->pos1.y = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+        sprite->x = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        sprite->y = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     }
     SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]);
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
 }
 
 u8 GetBattlerSide(u8 battlerId)
@@ -986,8 +986,8 @@ void UpdateAnimBg3ScreenSize(bool8 largeScreenSize)
 
 void TradeMenuBouncePartySprites(struct Sprite *sprite)
 {
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[3] = sprite->y;
     InitSpriteDataForLinearTranslation(sprite);
     sprite->callback = TranslateSpriteLinearFixedPointIconFrame;
     sprite->callback(sprite);
@@ -1033,8 +1033,8 @@ void InitAnimLinearTranslation(struct Sprite *sprite)
 
 void StartAnimLinearTranslation(struct Sprite *sprite)
 {
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[3] = sprite->y;
     InitAnimLinearTranslation(sprite);
     sprite->callback = AnimTranslateLinear_WaitEnd;
     sprite->callback(sprite);
@@ -1042,8 +1042,8 @@ void StartAnimLinearTranslation(struct Sprite *sprite)
 
 void sub_80A6F14(struct Sprite *sprite)
 {
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[3] = sprite->y;
     InitAnimLinearTranslation(sprite);
     sprite->callback = sub_80A6FB4;
     sprite->callback(sprite);
@@ -1064,14 +1064,14 @@ bool8 AnimTranslateLinear(struct Sprite *sprite)
     y += v2;
 
     if (v1 & 1)
-        sprite->pos2.x = -(x >> 8);
+        sprite->x2 = -(x >> 8);
     else
-        sprite->pos2.x = x >> 8;
+        sprite->x2 = x >> 8;
 
     if (v2 & 1)
-        sprite->pos2.y = -(y >> 8);
+        sprite->y2 = -(y >> 8);
     else
-        sprite->pos2.y = y >> 8;
+        sprite->y2 = y >> 8;
 
     sprite->data[3] = x;
     sprite->data[4] = y;
@@ -1101,8 +1101,8 @@ void InitAnimLinearTranslationWithSpeed(struct Sprite *sprite)
 
 void InitAnimLinearTranslationWithSpeedAndPos(struct Sprite *sprite)
 {
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[3] = sprite->y;
     InitAnimLinearTranslationWithSpeed(sprite);
     sprite->callback = AnimTranslateLinear_WaitEnd;
     sprite->callback(sprite);
@@ -1138,8 +1138,8 @@ static void InitAnimFastLinearTranslation(struct Sprite *sprite)
 
 void InitAndRunAnimFastLinearTranslation(struct Sprite *sprite)
 {
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[3] = sprite->y;
     InitAnimFastLinearTranslation(sprite);
     sprite->callback = AnimFastTranslateLinearWaitEnd;
     sprite->callback(sprite);
@@ -1160,14 +1160,14 @@ bool8 AnimFastTranslateLinear(struct Sprite *sprite)
     y += v2;
 
     if (v1 & 1)
-        sprite->pos2.x = -(x >> 4);
+        sprite->x2 = -(x >> 4);
     else
-        sprite->pos2.x = x >> 4;
+        sprite->x2 = x >> 4;
 
     if (v2 & 1)
-        sprite->pos2.y = -(y >> 4);
+        sprite->y2 = -(y >> 4);
     else
-        sprite->pos2.y = y >> 4;
+        sprite->y2 = y >> 4;
 
     sprite->data[3] = x;
     sprite->data[4] = y;
@@ -1190,8 +1190,8 @@ void InitAnimFastLinearTranslationWithSpeed(struct Sprite *sprite)
 
 void InitAnimFastLinearTranslationWithSpeedAndPos(struct Sprite *sprite)
 {
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[1] = sprite->x;
+    sprite->data[3] = sprite->y;
     InitAnimFastLinearTranslationWithSpeed(sprite);
     sprite->callback = AnimFastTranslateLinearWaitEnd;
     sprite->callback(sprite);
@@ -1264,7 +1264,7 @@ void SetBattlerSpriteYOffsetFromRotation(u8 spriteId)
     if (c < 0)
         c = -c;
 
-    gSprites[spriteId].pos2.y = c >> 3;
+    gSprites[spriteId].y2 = c >> 3;
 }
 
 void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation)
@@ -1801,7 +1801,7 @@ bool8 RunAffineAnimFromTaskData(struct Task *task)
         task->data[7]++;
         break;
     case AFFINEANIMCMDTYPE_END:
-        gSprites[task->data[15]].pos2.y = 0;
+        gSprites[task->data[15]].y2 = 0;
         ResetSpriteRotScale(task->data[15]);
         return FALSE;
     }
@@ -1819,7 +1819,7 @@ void SetBattlerSpriteYOffsetFromYScale(u8 spriteId)
 
     if (var2 > 128)
         var2 = 128;
-    gSprites[spriteId].pos2.y = (var - var2) / 2;
+    gSprites[spriteId].y2 = (var - var2) / 2;
 }
 
 // Sets the sprite's y offset equal to the y displacement caused by another sprite
@@ -1832,7 +1832,7 @@ void SetBattlerSpriteYOffsetFromOtherYScale(u8 spriteId, u8 otherSpriteId)
 
     if (var2 > 128)
         var2 = 128;
-    gSprites[spriteId].pos2.y = (var - var2) / 2;
+    gSprites[spriteId].y2 = (var - var2) / 2;
 }
 
 static u16 GetBattlerYDeltaFromSpriteId(u8 spriteId)
@@ -1927,7 +1927,7 @@ u8 UpdateEruptAnimTask(struct Task *task)
     if (task->data[8])
         SetBattlerSpriteYOffsetFromYScale(task->data[15]);
     else
-        gSprites[task->data[15]].pos2.y = 0;
+        gSprites[task->data[15]].y2 = 0;
     return task->data[8];
 }
 
@@ -2278,15 +2278,15 @@ void AnimTranslateLinearAndFlicker_Flipped(struct Sprite *sprite)
     SetSpriteCoordsToAnimAttackerCoords(sprite);
     if (GetBattlerSide(gBattleAnimAttacker))
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
         gBattleAnimArgs[3] = -gBattleAnimArgs[3];
         sprite->hFlip = TRUE;
     }
     else
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
     }
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[3] = gBattleAnimArgs[4];
@@ -2300,14 +2300,14 @@ void AnimTranslateLinearAndFlicker(struct Sprite *sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
         gBattleAnimArgs[3] *= -1;
     }
     else
     {
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
     }
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[3] = gBattleAnimArgs[4];
@@ -2322,10 +2322,10 @@ void AnimSpinningSparkle(struct Sprite *sprite)
 {
     SetSpriteCoordsToAnimAttackerCoords(sprite);
     if (GetBattlerSide(gBattleAnimAttacker))
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
     else
-        sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
     sprite->callback = RunStoredCallbackWhenAnimEnds;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
 }
@@ -2343,7 +2343,7 @@ void AnimTask_AttackerPunchWithTrace(u8 taskId)
     task->data[1] = ((GetBattlerSide(gBattleAnimAttacker)) != B_SIDE_PLAYER) ? -8 : 8;
     task->data[2] = 0;
     task->data[3] = 0;
-    gSprites[task->data[0]].pos2.x -= task->data[0];
+    gSprites[task->data[0]].x2 -= task->data[0];
     task->data[4] = AllocSpritePalette(ANIM_TAG_BENT_SPOON);
     task->data[5] = 0;
 
@@ -2366,7 +2366,7 @@ static void AnimTask_AttackerPunchWithTrace_Step(u8 taskId)
     {
     case 0:
         sub_80A8D78(task, taskId);
-        gSprites[task->data[0]].pos2.x += task->data[1];
+        gSprites[task->data[0]].x2 += task->data[1];
         if (++task->data[3] == 5)
         {
             task->data[3]--;
@@ -2375,10 +2375,10 @@ static void AnimTask_AttackerPunchWithTrace_Step(u8 taskId)
         break;
     case 1:
         sub_80A8D78(task, taskId);
-        gSprites[task->data[0]].pos2.x -= task->data[1];
+        gSprites[task->data[0]].x2 -= task->data[1];
         if (--task->data[3] == 0)
         {
-            gSprites[task->data[0]].pos2.x = 0;
+            gSprites[task->data[0]].x2 = 0;
             task->data[2]++;
         }
         break;
@@ -2402,7 +2402,7 @@ static void sub_80A8D78(struct Task *task, u8 taskId)
         gSprites[spriteId].data[0] = 8;
         gSprites[spriteId].data[1] = taskId;
         gSprites[spriteId].data[2] = spriteId;
-        gSprites[spriteId].pos2.x = gSprites[task->data[0]].pos2.x;
+        gSprites[spriteId].x2 = gSprites[task->data[0]].x2;
         gSprites[spriteId].callback = sub_80A8DFC;
         task->data[5]++;
     }
@@ -2419,8 +2419,8 @@ static void sub_80A8DFC(struct Sprite *sprite)
 
 void AnimWeatherBallUp(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     if (!GetBattlerSide(gBattleAnimAttacker))
         sprite->data[0] = 5;
     else
@@ -2433,11 +2433,11 @@ static void AnimWeatherBallUp_Step(struct Sprite *sprite)
 {
     sprite->data[2] += sprite->data[0];
     sprite->data[3] += sprite->data[1];
-    sprite->pos2.x = sprite->data[2] / 10;
-    sprite->pos2.y = sprite->data[3] / 10;
+    sprite->x2 = sprite->data[2] / 10;
+    sprite->y2 = sprite->data[3] / 10;
     if (sprite->data[1] < -20)
         sprite->data[1]++;
-    if (sprite->pos1.y + sprite->pos2.y < -32)
+    if (sprite->y + sprite->y2 < -32)
         DestroyAnimSprite(sprite);
 }
 
@@ -2445,19 +2445,19 @@ void AnimWeatherBallDown(struct Sprite *sprite)
 {
     int x;
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[4];
-    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[5];
+    sprite->data[2] = sprite->x + gBattleAnimArgs[4];
+    sprite->data[4] = sprite->y + gBattleAnimArgs[5];
     if (!GetBattlerSide(gBattleAnimTarget))
     {
         x = (u16)gBattleAnimArgs[4] + 30;
-        sprite->pos1.x += x;
-        sprite->pos1.y = gBattleAnimArgs[5] - 20;
+        sprite->x += x;
+        sprite->y = gBattleAnimArgs[5] - 20;
     }
     else
     {
         x = (u16)gBattleAnimArgs[4] - 30;
-        sprite->pos1.x += x;
-        sprite->pos1.y = gBattleAnimArgs[5] - 80;
+        sprite->x += x;
+        sprite->y = gBattleAnimArgs[5] - 80;
     }
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
diff --git a/src/battle_anim_normal.c b/src/battle_anim_normal.c
index 9be56880a..d79f344ed 100644
--- a/src/battle_anim_normal.c
+++ b/src/battle_anim_normal.c
@@ -261,8 +261,8 @@ const struct SpriteTemplate gPersistHitSplatSpriteTemplate =
 // arg 4: duration
 static void AnimConfusionDuck(struct Sprite *sprite)
 {
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
@@ -283,8 +283,8 @@ static void AnimConfusionDuck(struct Sprite *sprite)
 
 static void AnimConfusionDuck_Step(struct Sprite *sprite)
 {
-    sprite->pos2.x = Cos(sprite->data[0], 30);
-    sprite->pos2.y = Sin(sprite->data[0], 10);
+    sprite->x2 = Cos(sprite->data[0], 30);
+    sprite->y2 = Sin(sprite->data[0], 10);
 
     if ((u16)sprite->data[0] < 128)
         sprite->oam.priority = 1;
@@ -400,8 +400,8 @@ static void AnimComplexPaletteBlend_Step2(struct Sprite *sprite)
 
 static void AnimCirclingSparkle(struct Sprite *sprite)
 {
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
     sprite->data[0] = 0;
     sprite->data[1] = 10;
     sprite->data[2] = 8;
@@ -425,7 +425,7 @@ static void AnimCirclingSparkle(struct Sprite *sprite)
 #define tPalSelectorHi data[9]
 #define tPalSelectorLo data[10]
 
-// Blends mon/screen to designated color or back alternately tNumBlends times 
+// Blends mon/screen to designated color or back alternately tNumBlends times
 // Many uses of this task only set a tNumBlends of 2, which has the effect of blending to a color and back once
 void AnimTask_BlendColorCycle(u8 taskId)
 {
@@ -733,50 +733,67 @@ void AnimTask_InvertScreenColor(u8 taskId)
     DestroyAnimVisualTask(taskId);
 }
 
-void UnusedAnimTask_8115F94(u8 taskId)
+// Unused
+#define tTimer         data[0]
+#define tLength        data[1]
+#define tFlagsScenery  data[2]
+#define tFlagsAttacker data[3]
+#define tFlagsTarget   data[4]
+#define tColorR        data[5]
+#define tColorG        data[6]
+#define tColorB        data[7]
+void AnimTask_TintPalettes(u8 taskId)
 {
     u8 attackerBattler;
     u8 targetBattler;
     u8 paletteIndex;
     u32 selectedPalettes = 0;
 
-    if (gTasks[taskId].data[0] == 0)
+    if (gTasks[taskId].tTimer == 0)
     {
-        gTasks[taskId].data[2] = gBattleAnimArgs[0];
-        gTasks[taskId].data[3] = gBattleAnimArgs[1];
-        gTasks[taskId].data[4] = gBattleAnimArgs[2];
-        gTasks[taskId].data[1] = gBattleAnimArgs[3];
-        gTasks[taskId].data[5] = gBattleAnimArgs[4];
-        gTasks[taskId].data[6] = gBattleAnimArgs[5];
-        gTasks[taskId].data[7] = gBattleAnimArgs[6];
+        gTasks[taskId].tFlagsScenery = gBattleAnimArgs[0];
+        gTasks[taskId].tFlagsAttacker = gBattleAnimArgs[1];
+        gTasks[taskId].tFlagsTarget = gBattleAnimArgs[2];
+        gTasks[taskId].tLength = gBattleAnimArgs[3];
+        gTasks[taskId].tColorR = gBattleAnimArgs[4];
+        gTasks[taskId].tColorG = gBattleAnimArgs[5];
+        gTasks[taskId].tColorB = gBattleAnimArgs[6];
     }
 
-    gTasks[taskId].data[0]++;
+    gTasks[taskId].tTimer++;
     attackerBattler = gBattleAnimAttacker;
     targetBattler = gBattleAnimTarget;
 
-    if (gTasks[taskId].data[2] & 0x100)
-        selectedPalettes = 0x0000FFFF;
+    if (gTasks[taskId].tFlagsScenery & (1 << 8))
+        selectedPalettes = PALETTES_BG;
 
-    if (gTasks[taskId].data[2] & 0x1)
+    if (gTasks[taskId].tFlagsScenery & 1)
     {
         paletteIndex = IndexOfSpritePaletteTag(gSprites[gHealthboxSpriteIds[attackerBattler]].template->paletteTag);
         selectedPalettes |= (1 << paletteIndex) << 16;
     }
-    
-    if (gTasks[taskId].data[3] & 0x100)
+
+    if (gTasks[taskId].tFlagsAttacker & (1 << 8))
         selectedPalettes |= (1 << attackerBattler) << 16;
 
-    if (gTasks[taskId].data[4] & 0x100)
+    if (gTasks[taskId].tFlagsTarget & (1 << 8))
         selectedPalettes |= (1 << targetBattler) << 16;
 
-    TintPlttBuffer(selectedPalettes, gTasks[taskId].data[5], gTasks[taskId].data[6], gTasks[taskId].data[7]);
-    if (gTasks[taskId].data[0] == gTasks[taskId].data[1])
+    TintPlttBuffer(selectedPalettes, gTasks[taskId].tColorR, gTasks[taskId].tColorG, gTasks[taskId].tColorB);
+    if (gTasks[taskId].tTimer == gTasks[taskId].tLength)
     {
         UnfadePlttBuffer(selectedPalettes);
         DestroyAnimVisualTask(taskId);
     }
 }
+#undef tTimer
+#undef tLength
+#undef tFlagsScenery
+#undef tFlagsAttacker
+#undef tFlagsTarget
+#undef tColorR
+#undef tColorG
+#undef tColorB
 
 static void AnimShakeMonOrBattleTerrain(struct Sprite *sprite)
 {
@@ -956,7 +973,7 @@ static void AnimHitSplatHandleInvert(struct Sprite *sprite)
 {
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER && !IsContest())
         gBattleAnimArgs[1] = -gBattleAnimArgs[1];
-    
+
     AnimHitSplatBasic(sprite);
 }
 
@@ -971,8 +988,8 @@ static void AnimHitSplatRandom(struct Sprite *sprite)
     else
         InitSpritePosToAnimTarget(sprite, FALSE);
 
-    sprite->pos2.x += (Random2() % 48) - 24;
-    sprite->pos2.y += (Random2() % 24) - 12;
+    sprite->x2 += (Random2() % 48) - 24;
+    sprite->y2 += (Random2() % 24) - 12;
 
     StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
     sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
@@ -981,10 +998,10 @@ static void AnimHitSplatRandom(struct Sprite *sprite)
 static void AnimHitSplatOnMonEdge(struct Sprite *sprite)
 {
     sprite->data[0] = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
-    sprite->pos1.x = gSprites[sprite->data[0]].pos1.x + gSprites[sprite->data[0]].pos2.x;
-    sprite->pos1.y = gSprites[sprite->data[0]].pos1.y + gSprites[sprite->data[0]].pos2.y;
-    sprite->pos2.x = gBattleAnimArgs[1];
-    sprite->pos2.y = gBattleAnimArgs[2];
+    sprite->x = gSprites[sprite->data[0]].x + gSprites[sprite->data[0]].x2;
+    sprite->y = gSprites[sprite->data[0]].y + gSprites[sprite->data[0]].y2;
+    sprite->x2 = gBattleAnimArgs[1];
+    sprite->y2 = gBattleAnimArgs[2];
     StartSpriteAffineAnim(sprite, gBattleAnimArgs[3]);
     StoreSpriteCallbackInData6(sprite, DestroySpriteAndMatrix);
     sprite->callback = RunStoredCallbackWhenAffineAnimEnds;
diff --git a/src/battle_anim_poison.c b/src/battle_anim_poison.c
index bc5624249..6dedbd955 100644
--- a/src/battle_anim_poison.c
+++ b/src/battle_anim_poison.c
@@ -239,10 +239,10 @@ static void AnimAcidPoisonBubble_Step(struct Sprite *sprite)
 static void AnimSludgeBombHitParticle(struct Sprite *sprite)
 {
     sprite->data[0] = gBattleAnimArgs[2];
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[0];
-    sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[1];
+    sprite->data[1] = sprite->x;
+    sprite->data[2] = sprite->x + gBattleAnimArgs[0];
+    sprite->data[3] = sprite->y;
+    sprite->data[4] = sprite->y + gBattleAnimArgs[1];
 
     InitSpriteDataForLinearTranslation(sprite);
 
@@ -265,17 +265,17 @@ static void AnimSludgeBombHitParticle_Step(struct Sprite *sprite)
 
 static void AnimAcidPoisonDroplet(struct Sprite *sprite)
 {
-    SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+    SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->x, &sprite->y);
 
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
-    sprite->data[4] = sprite->pos1.y + sprite->data[0];
+    sprite->data[2] = sprite->x + gBattleAnimArgs[2];
+    sprite->data[4] = sprite->y + sprite->data[0];
 
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
@@ -295,13 +295,13 @@ static void AnimBubbleEffect(struct Sprite *sprite)
     }
     else
     {
-        SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->x, &sprite->y);
 
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
-        sprite->pos1.x += gBattleAnimArgs[0];
-        sprite->pos1.y += gBattleAnimArgs[1];
+        sprite->x += gBattleAnimArgs[0];
+        sprite->y += gBattleAnimArgs[1];
     }
 
     sprite->callback = AnimBubbleEffect_Step;
@@ -310,9 +310,9 @@ static void AnimBubbleEffect(struct Sprite *sprite)
 static void AnimBubbleEffect_Step(struct Sprite *sprite)
 {
     sprite->data[0] = (sprite->data[0] + 0xB) & 0xFF;
-    sprite->pos2.x = Sin(sprite->data[0], 4);
+    sprite->x2 = Sin(sprite->data[0], 4);
     sprite->data[1] += 0x30;
-    sprite->pos2.y = -(sprite->data[1] >> 8);
+    sprite->y2 = -(sprite->data[1] >> 8);
 
     if (sprite->affineAnimEnded)
         DestroyAnimSprite(sprite);
diff --git a/src/battle_anim_psychic.c b/src/battle_anim_psychic.c
index 718fce396..b3c7b4ce8 100644
--- a/src/battle_anim_psychic.c
+++ b/src/battle_anim_psychic.c
@@ -450,13 +450,13 @@ static void AnimDefensiveWall(struct Sprite *sprite)
     {
         if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
         {
-            sprite->pos1.x = 72;
-            sprite->pos1.y = 80;
+            sprite->x = 72;
+            sprite->y = 80;
         }
         else
         {
-            sprite->pos1.x = 176;
-            sprite->pos1.y = 40;
+            sprite->x = 176;
+            sprite->y = 40;
         }
     }
     else
@@ -464,15 +464,15 @@ static void AnimDefensiveWall(struct Sprite *sprite)
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
             gBattleAnimArgs[0] = -gBattleAnimArgs[0];
 
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y) + gBattleAnimArgs[1];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X) + gBattleAnimArgs[0];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y) + gBattleAnimArgs[1];
     }
 
     sprite->data[0] = 256 + IndexOfSpritePaletteTag(gBattleAnimArgs[2]) * 16;
 
     if (isContest)
     {
-        sprite->pos1.y += 9;
+        sprite->y += 9;
         sprite->callback = AnimDefensiveWall_Step2;
         sprite->callback(sprite);
     }
@@ -493,7 +493,7 @@ static void AnimDefensiveWall_Step1(struct Sprite *sprite)
 
     if (IsBattlerSpriteVisible(battler))
         gSprites[gBattlerSpriteIds[battler]].invisible = TRUE;
-    
+
     battler = BATTLE_PARTNER(battler);
     if (IsBattlerSpriteVisible(battler))
         gSprites[gBattlerSpriteIds[battler]].invisible = TRUE;
@@ -592,13 +592,13 @@ static void AnimWallSparkle(struct Sprite *sprite)
         {
             if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
             {
-                sprite->pos1.x = 72 - gBattleAnimArgs[0];
-                sprite->pos1.y = gBattleAnimArgs[1] + 80;
+                sprite->x = 72 - gBattleAnimArgs[0];
+                sprite->y = gBattleAnimArgs[1] + 80;
             }
             else
             {
-                sprite->pos1.x = gBattleAnimArgs[0] + 176;
-                sprite->pos1.y = gBattleAnimArgs[1] + 40;
+                sprite->x = gBattleAnimArgs[0] + 176;
+                sprite->y = gBattleAnimArgs[1] + 40;
             }
         }
         else
@@ -620,20 +620,20 @@ static void AnimWallSparkle(struct Sprite *sprite)
 
 static void AnimBentSpoon(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
 
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
         StartSpriteAnim(sprite, 1);
-        sprite->pos1.x -= 40;
-        sprite->pos1.y += 10;
+        sprite->x -= 40;
+        sprite->y += 10;
         sprite->data[1] = -1;
     }
     else
     {
-        sprite->pos1.x += 40;
-        sprite->pos1.y -= 10;
+        sprite->x += 40;
+        sprite->y -= 10;
         sprite->data[1] = 1;
     }
 
@@ -650,11 +650,11 @@ static void AnimQuestionMark(struct Sprite *sprite)
     if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
         x = -x;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + x;
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + y;
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + x;
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + y;
 
-    if (sprite->pos1.y < 16)
-        sprite->pos1.y = 16;
+    if (sprite->y < 16)
+        sprite->y = 16;
 
     StoreSpriteCallbackInData6(sprite, AnimQuestionMark_Step1);
     sprite->callback = RunStoredCallbackWhenAnimEnds;
@@ -731,13 +731,13 @@ static void AnimTask_Teleport_Step(u8 taskId)
     case 1:
         if (task->data[3] != 0)
         {
-            gSprites[task->data[0]].pos2.y -= 8;
+            gSprites[task->data[0]].y2 -= 8;
             task->data[3]--;
         }
         else
         {
             gSprites[task->data[0]].invisible = TRUE;
-            gSprites[task->data[0]].pos1.x = DISPLAY_WIDTH + 32;
+            gSprites[task->data[0]].x = DISPLAY_WIDTH + 32;
             ResetSpriteRotScale(task->data[0]);
             DestroyAnimVisualTask(taskId);
         }
@@ -785,20 +785,20 @@ static void AnimTask_ImprisonOrbs_Step(u8 taskId)
                 switch (task->data[2])
                 {
                 case 0:
-                    gSprites[spriteId].pos2.x = task->data[12];
-                    gSprites[spriteId].pos2.y = -task->data[12];
+                    gSprites[spriteId].x2 = task->data[12];
+                    gSprites[spriteId].y2 = -task->data[12];
                     break;
                 case 1:
-                    gSprites[spriteId].pos2.x = -task->data[12];
-                    gSprites[spriteId].pos2.y = task->data[12];
+                    gSprites[spriteId].x2 = -task->data[12];
+                    gSprites[spriteId].y2 = task->data[12];
                     break;
                 case 2:
-                    gSprites[spriteId].pos2.x = task->data[12];
-                    gSprites[spriteId].pos2.y = task->data[12];
+                    gSprites[spriteId].x2 = task->data[12];
+                    gSprites[spriteId].y2 = task->data[12];
                     break;
                 case 3:
-                    gSprites[spriteId].pos2.x = -task->data[12];
-                    gSprites[spriteId].pos2.y = -task->data[12];
+                    gSprites[spriteId].x2 = -task->data[12];
+                    gSprites[spriteId].y2 = -task->data[12];
                     break;
                 }
             }
@@ -851,8 +851,8 @@ static void AnimRedX(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[0] == ANIM_ATTACKER)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
     }
 
     sprite->data[0] = gBattleAnimArgs[1];
@@ -957,7 +957,7 @@ void AnimTask_ExtrasensoryDistortion(u8 taskId)
     u8 yOffset;
     struct ScanlineEffectParams scanlineParams;
     struct Task *task = &gTasks[taskId];
-    
+
     yOffset = GetBattlerYCoordWithElevation(gBattleAnimTarget);
     task->data[14] = yOffset - 32;
 
@@ -1056,7 +1056,7 @@ void AnimTask_TransparentCloneGrowAndShrink(u8 taskId)
     s16 spriteId;
     s16 matrixNum;
     struct Task *task = &gTasks[taskId];
-    
+
     matrixNum = AllocOamMatrix();
     if (matrixNum == 0xFF)
     {
@@ -1123,11 +1123,11 @@ static void AnimPsychoBoost(struct Sprite *sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X);
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y);
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X);
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y);
 
         if (IsContest())
-            sprite->pos1.y += 12;
+            sprite->y += 12;
 
         sprite->data[1] = 8;
         SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_EFFECT_BLEND);
@@ -1156,7 +1156,7 @@ static void AnimPsychoBoost(struct Sprite *sprite)
         }
 
         sprite->data[3] += 0x380;
-        sprite->pos2.y -= sprite->data[3] >> 8;
+        sprite->y2 -= sprite->data[3] >> 8;
         sprite->data[3] &= 0xFF;
         break;
     case 3:
diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c
index 3e9eafb90..7f292d596 100644
--- a/src/battle_anim_rock.c
+++ b/src/battle_anim_rock.c
@@ -297,10 +297,10 @@ const struct SpriteTemplate gWeatherBallRockDownSpriteTemplate =
 static void AnimFallingRock(struct Sprite *sprite)
 {
     if (gBattleAnimArgs[3] != 0)
-        SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->pos1.x, &sprite->pos1.y);
+        SetAverageBattlerPositions(gBattleAnimTarget, 0, &sprite->x, &sprite->y);
 
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += 14;
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += 14;
 
     StartSpriteAnim(sprite, gBattleAnimArgs[1]);
     AnimateSprite(sprite);
@@ -319,7 +319,7 @@ static void AnimFallingRock(struct Sprite *sprite)
 
 static void AnimFallingRock_Step(struct Sprite *sprite)
 {
-    sprite->pos1.x += sprite->data[5];
+    sprite->x += sprite->data[5];
 
     sprite->data[0] = 192;
     sprite->data[1] = sprite->data[5];
@@ -339,17 +339,17 @@ static void AnimRockFragment(struct Sprite *sprite)
     AnimateSprite(sprite);
 
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-        sprite->pos1.x -= gBattleAnimArgs[0];
+        sprite->x -= gBattleAnimArgs[0];
     else
-        sprite->pos1.x += gBattleAnimArgs[0];
+        sprite->x += gBattleAnimArgs[0];
 
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->y += gBattleAnimArgs[1];
 
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[1] = sprite->pos1.x;
-    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
-    sprite->data[3] = sprite->pos1.y;
-    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[3];
+    sprite->data[1] = sprite->x;
+    sprite->data[2] = sprite->x + gBattleAnimArgs[2];
+    sprite->data[3] = sprite->y;
+    sprite->data[4] = sprite->y + gBattleAnimArgs[3];
 
     InitSpriteDataForLinearTranslation(sprite);
     sprite->data[3] = 0;
@@ -378,8 +378,8 @@ static void AnimParticleInVortex(struct Sprite *sprite)
 static void AnimParticleInVortex_Step(struct Sprite *sprite)
 {
     sprite->data[4] += sprite->data[1];
-    sprite->pos2.y = -(sprite->data[4] >> 8);
-    sprite->pos2.x = Sin(sprite->data[5], sprite->data[3]);
+    sprite->y2 = -(sprite->data[4] >> 8);
+    sprite->x2 = Sin(sprite->data[5], sprite->data[3]);
     sprite->data[5] = (sprite->data[5] + sprite->data[2]) & 0xFF;
 
     if (--sprite->data[0] == -1)
@@ -496,17 +496,17 @@ static void AnimFlyingSandCrescent(struct Sprite *sprite)
     {
         if (gBattleAnimArgs[3] != 0 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         {
-            sprite->pos1.x = DISPLAY_WIDTH + 64;
+            sprite->x = DISPLAY_WIDTH + 64;
             gBattleAnimArgs[1] = -gBattleAnimArgs[1];
             sprite->data[5] = 1;
             sprite->oam.matrixNum = ST_OAM_HFLIP;
         }
         else
         {
-            sprite->pos1.x = -64;
+            sprite->x = -64;
         }
 
-        sprite->pos1.y = gBattleAnimArgs[0];
+        sprite->y = gBattleAnimArgs[0];
         SetSubspriteTables(sprite, sFlyingSandSubspriteTable);
         sprite->data[1] = gBattleAnimArgs[1];
         sprite->data[2] = gBattleAnimArgs[2];
@@ -516,19 +516,19 @@ static void AnimFlyingSandCrescent(struct Sprite *sprite)
     {
         sprite->data[3] += sprite->data[1];
         sprite->data[4] += sprite->data[2];
-        sprite->pos2.x += (sprite->data[3] >> 8);
-        sprite->pos2.y += (sprite->data[4] >> 8);
+        sprite->x2 += (sprite->data[3] >> 8);
+        sprite->y2 += (sprite->data[4] >> 8);
         sprite->data[3] &= 0xFF;
         sprite->data[4] &= 0xFF;
 
         if (sprite->data[5] == 0)
         {
-            if (sprite->pos1.x + sprite->pos2.x > DISPLAY_WIDTH + 32)
+            if (sprite->x + sprite->x2 > DISPLAY_WIDTH + 32)
             {
                 sprite->callback = DestroyAnimSprite;
             }
         }
-        else if (sprite->pos1.x + sprite->pos2.x < -32)
+        else if (sprite->x + sprite->x2 < -32)
         {
             sprite->callback = DestroyAnimSprite;
         }
@@ -547,8 +547,8 @@ static void AnimRaiseSprite(struct Sprite *sprite)
     InitSpritePosToAnimAttacker(sprite, 0);
 
     sprite->data[0] = gBattleAnimArgs[3];
-    sprite->data[2] = sprite->pos1.x;
-    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[2];
+    sprite->data[2] = sprite->x;
+    sprite->data[4] = sprite->y + gBattleAnimArgs[2];
 
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
@@ -618,8 +618,8 @@ static void AnimTask_Rollout_Step(u8 taskId)
     case 0:
         task->data[6] -= task->data[4];
         task->data[7] -= task->data[5];
-        gSprites[task->data[15]].pos2.x = task->data[6] >> 3;
-        gSprites[task->data[15]].pos2.y = task->data[7] >> 3;
+        gSprites[task->data[15]].x2 = task->data[6] >> 3;
+        gSprites[task->data[15]].y2 = task->data[7] >> 3;
 
         if (++task->data[9] == 10)
         {
@@ -646,8 +646,8 @@ static void AnimTask_Rollout_Step(u8 taskId)
             task->data[0]++;
         }
 
-        gSprites[task->data[15]].pos2.x = task->data[6] >> 3;
-        gSprites[task->data[15]].pos2.y = task->data[7] >> 3;
+        gSprites[task->data[15]].x2 = task->data[6] >> 3;
+        gSprites[task->data[15]].y2 = task->data[7] >> 3;
         break;
     case 3:
         task->data[2] += task->data[4];
@@ -748,7 +748,7 @@ static void AnimRockTomb(struct Sprite *sprite)
 {
     StartSpriteAnim(sprite, gBattleAnimArgs[4]);
 
-    sprite->pos2.x = gBattleAnimArgs[0];
+    sprite->x2 = gBattleAnimArgs[0];
     sprite->data[2] = gBattleAnimArgs[1];
     sprite->data[3] -= gBattleAnimArgs[2];
     sprite->data[0] = 3;
@@ -762,7 +762,7 @@ static void AnimRockTomb_Step(struct Sprite *sprite)
     sprite->invisible = FALSE;
     if (sprite->data[3] != 0)
     {
-        sprite->pos2.y = sprite->data[2] + sprite->data[3];
+        sprite->y2 = sprite->data[2] + sprite->data[3];
         sprite->data[3] += sprite->data[0];
         sprite->data[0]++;
         if (sprite->data[3] > 0)
@@ -787,10 +787,10 @@ static void AnimRockBlastRock(struct Sprite *sprite)
 
 static void AnimRockScatter(struct Sprite *sprite)
 {
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
-    sprite->pos1.x += gBattleAnimArgs[0];
-    sprite->pos1.y += gBattleAnimArgs[1];
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, 0);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, 1);
+    sprite->x += gBattleAnimArgs[0];
+    sprite->y += gBattleAnimArgs[1];
 
     sprite->data[1] = gBattleAnimArgs[0];
     sprite->data[2] = gBattleAnimArgs[1];
@@ -806,8 +806,8 @@ static void AnimRockScatter_Step(struct Sprite *sprite)
     sprite->data[3] += sprite->data[1];
     sprite->data[4] += sprite->data[2];
 
-    sprite->pos2.x += sprite->data[3] / 40;
-    sprite->pos2.y -= Sin(sprite->data[0], sprite->data[5]);
+    sprite->x2 += sprite->data[3] / 40;
+    sprite->y2 -= Sin(sprite->data[0], sprite->data[5]);
 
     if (sprite->data[0] > 140)
         DestroyAnimSprite(sprite);
diff --git a/src/battle_anim_smokescreen.c b/src/battle_anim_smokescreen.c
index ea7f94843..9844f5007 100644
--- a/src/battle_anim_smokescreen.c
+++ b/src/battle_anim_smokescreen.c
@@ -13,7 +13,7 @@ static void SpriteCB_DestroySprite(struct Sprite *sprite);
 
 // The below data for smokescreen starts and ends with some data that belongs to battle_gfx_sfx_util.c
 
-const u8 gBattlePalaceNatureToMoveTarget[NUM_NATURES] = 
+const u8 gBattlePalaceNatureToMoveTarget[NUM_NATURES] =
 {
     [NATURE_HARDY]   = PALACE_TARGET_STRONGER,
     [NATURE_LONELY]  = PALACE_TARGET_STRONGER,
@@ -21,7 +21,7 @@ const u8 gBattlePalaceNatureToMoveTarget[NUM_NATURES] =
     [NATURE_ADAMANT] = PALACE_TARGET_STRONGER,
     [NATURE_NAUGHTY] = PALACE_TARGET_WEAKER,
     [NATURE_BOLD]    = PALACE_TARGET_WEAKER,
-    [NATURE_DOCILE]  = PALACE_TARGET_RANDOM, 
+    [NATURE_DOCILE]  = PALACE_TARGET_RANDOM,
     [NATURE_RELAXED] = PALACE_TARGET_STRONGER,
     [NATURE_IMPISH]  = PALACE_TARGET_STRONGER,
     [NATURE_LAX]     = PALACE_TARGET_STRONGER,
@@ -29,7 +29,7 @@ const u8 gBattlePalaceNatureToMoveTarget[NUM_NATURES] =
     [NATURE_HASTY]   = PALACE_TARGET_WEAKER,
     [NATURE_SERIOUS] = PALACE_TARGET_WEAKER,
     [NATURE_JOLLY]   = PALACE_TARGET_STRONGER,
-    [NATURE_NAIVE]   = PALACE_TARGET_RANDOM, 
+    [NATURE_NAIVE]   = PALACE_TARGET_RANDOM,
     [NATURE_MODEST]  = PALACE_TARGET_WEAKER,
     [NATURE_MILD]    = PALACE_TARGET_STRONGER,
     [NATURE_QUIET]   = PALACE_TARGET_WEAKER,
@@ -54,7 +54,7 @@ static const struct CompressedSpritePalette sSmokescreenImpactSpritePalette =
 
 static const struct OamData sOamData_SmokescreenImpact =
 {
-    .y = 0, 
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
@@ -71,33 +71,33 @@ static const struct OamData sOamData_SmokescreenImpact =
 
 static const union AnimCmd sAnim_SmokescreenImpact_0[] =
 {
-    ANIMCMD_FRAME(0, 4), 
-    ANIMCMD_FRAME(4, 4), 
-    ANIMCMD_FRAME(8, 4), 
+    ANIMCMD_FRAME(0, 4),
+    ANIMCMD_FRAME(4, 4),
+    ANIMCMD_FRAME(8, 4),
     ANIMCMD_END
 };
 
 static const union AnimCmd sAnim_SmokescreenImpact_1[] =
 {
-    ANIMCMD_FRAME(0, 4, .hFlip = TRUE), 
-    ANIMCMD_FRAME(4, 4, .hFlip = TRUE), 
-    ANIMCMD_FRAME(8, 4, .hFlip = TRUE), 
+    ANIMCMD_FRAME(0, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(4, 4, .hFlip = TRUE),
+    ANIMCMD_FRAME(8, 4, .hFlip = TRUE),
     ANIMCMD_END
 };
 
 static const union AnimCmd sAnim_SmokescreenImpact_2[] =
 {
-    ANIMCMD_FRAME(0, 4, .vFlip = TRUE), 
-    ANIMCMD_FRAME(4, 4, .vFlip = TRUE), 
-    ANIMCMD_FRAME(8, 4, .vFlip = TRUE), 
+    ANIMCMD_FRAME(0, 4, .vFlip = TRUE),
+    ANIMCMD_FRAME(4, 4, .vFlip = TRUE),
+    ANIMCMD_FRAME(8, 4, .vFlip = TRUE),
     ANIMCMD_END
 };
 
 static const union AnimCmd sAnim_SmokescreenImpact_3[] =
 {
-    ANIMCMD_FRAME(0, 4, .hFlip = TRUE, .vFlip = TRUE), 
-    ANIMCMD_FRAME(4, 4, .hFlip = TRUE, .vFlip = TRUE), 
-    ANIMCMD_FRAME(8, 4, .hFlip = TRUE, .vFlip = TRUE), 
+    ANIMCMD_FRAME(0, 4, .hFlip = TRUE, .vFlip = TRUE),
+    ANIMCMD_FRAME(4, 4, .hFlip = TRUE, .vFlip = TRUE),
+    ANIMCMD_FRAME(8, 4, .hFlip = TRUE, .vFlip = TRUE),
     ANIMCMD_END
 };
 
@@ -111,12 +111,12 @@ static const union AnimCmd *const sAnims_SmokescreenImpact[] =
 
 static const struct SpriteTemplate sSmokescreenImpactSpriteTemplate =
 {
-    .tileTag = 55019, 
-    .paletteTag = 55019, 
-    .oam = &sOamData_SmokescreenImpact, 
-    .anims = sAnims_SmokescreenImpact, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = 55019,
+    .paletteTag = 55019,
+    .oam = &sOamData_SmokescreenImpact,
+    .anims = sAnims_SmokescreenImpact,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_DestroySprite
 };
 
@@ -127,7 +127,7 @@ const struct CompressedSpriteSheet gSpriteSheet_EnemyShadow =
 
 static const struct OamData sOamData_EnemyShadow =
 {
-    .y = 0, 
+    .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
     .objMode = ST_OAM_OBJ_NORMAL,
     .mosaic = 0,
@@ -144,12 +144,12 @@ static const struct OamData sOamData_EnemyShadow =
 
 const struct SpriteTemplate gSpriteTemplate_EnemyShadow =
 {
-    .tileTag = 55129, 
-    .paletteTag = 55039, 
-    .oam = &sOamData_EnemyShadow, 
-    .anims = gDummySpriteAnimTable, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = 55129,
+    .paletteTag = 55039,
+    .oam = &sOamData_EnemyShadow,
+    .anims = gDummySpriteAnimTable,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_SetInvisible
 };
 
diff --git a/src/battle_anim_sound_tasks.c b/src/battle_anim_sound_tasks.c
index 39d6729e8..6068b0f33 100644
--- a/src/battle_anim_sound_tasks.c
+++ b/src/battle_anim_sound_tasks.c
@@ -349,7 +349,7 @@ void SoundTask_PlaySE2WithPanning(u8 taskId)
     DestroyAnimVisualTask(taskId);
 }
 
-// Adjusts panning and assigns it to gAnimCustomPanning. Doesnt play sound. 
+// Adjusts panning and assigns it to gAnimCustomPanning. Doesnt play sound.
 // Used by Confuse Ray and Will-O-Wisp (see uses of gAnimCustomPanning)
 void SoundTask_AdjustPanningVar(u8 taskId)
 {
@@ -381,7 +381,7 @@ static void SoundTask_AdjustPanningVar_Step(u8 taskId)
         u16 oldPan;
         gTasks[taskId].data[10] = 0;
         oldPan = gTasks[taskId].data[11];
-        gTasks[taskId].data[11] = panIncrement + oldPan; 
+        gTasks[taskId].data[11] = panIncrement + oldPan;
         gTasks[taskId].data[11] = KeepPanInRange(gTasks[taskId].data[11], oldPan);
     }
 
diff --git a/src/battle_anim_status_effects.c b/src/battle_anim_status_effects.c
index e859bed62..9be3d65dc 100644
--- a/src/battle_anim_status_effects.c
+++ b/src/battle_anim_status_effects.c
@@ -210,35 +210,35 @@ static const struct SpriteTemplate sFlickeringShrinkOrbSpriteTemplate =
 static const struct Subsprite sFrozenIceCubeSubsprites[] =
 {
     {
-        .x = -16, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(64x64),      
-        .size = SPRITE_SIZE(64x64), 
-        .tileOffset = 0, 
+        .x = -16,
+        .y = -16,
+        .shape = SPRITE_SHAPE(64x64),
+        .size = SPRITE_SIZE(64x64),
+        .tileOffset = 0,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =  48, 
-        .shape = SPRITE_SHAPE(64x32), 
-        .size = SPRITE_SIZE(64x32), 
-        .tileOffset = 64, 
+        .x = -16,
+        .y =  48,
+        .shape = SPRITE_SHAPE(64x32),
+        .size = SPRITE_SIZE(64x32),
+        .tileOffset = 64,
         .priority = 2
     },
     {
-        .x =  48, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(32x64), 
+        .x =  48,
+        .y = -16,
+        .shape = SPRITE_SHAPE(32x64),
         .size = SPRITE_SIZE(32x64),
-        .tileOffset = 96, 
+        .tileOffset = 96,
         .priority = 2
     },
     {
-        .x =  48, 
-        .y =  48, 
-        .shape = SPRITE_SHAPE(32x32),   
-        .size = SPRITE_SIZE(32x32), 
-        .tileOffset = 128, 
+        .x =  48,
+        .y =  48,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .tileOffset = 128,
         .priority = 2
     },
 };
@@ -286,7 +286,7 @@ static u8 Task_FlashingCircleImpacts(u8 battlerId, bool8 red)
         gTasks[taskId].data[1] = RGB_RED;
         for (i = 0; i < 10; i++)
         {
-            spriteId = CreateSprite(&sFlashingCircleImpactSpriteTemplate, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y + 32, 0);
+            spriteId = CreateSprite(&sFlashingCircleImpactSpriteTemplate, gSprites[battlerSpriteId].x, gSprites[battlerSpriteId].y + 32, 0);
             gSprites[spriteId].data[0] = i * 51;
             gSprites[spriteId].data[1] = -256;
             gSprites[spriteId].invisible = TRUE;
@@ -299,7 +299,7 @@ static u8 Task_FlashingCircleImpacts(u8 battlerId, bool8 red)
         gTasks[taskId].data[1] = RGB_BLUE;
         for (i = 0; i < 10; i++)
         {
-            spriteId = CreateSprite(&sFlashingCircleImpactSpriteTemplate, gSprites[battlerSpriteId].pos1.x, gSprites[battlerSpriteId].pos1.y - 32, 0);
+            spriteId = CreateSprite(&sFlashingCircleImpactSpriteTemplate, gSprites[battlerSpriteId].x, gSprites[battlerSpriteId].y - 32, 0);
             gSprites[spriteId].data[0] = i * 51;
             gSprites[spriteId].data[1] = 256;
             gSprites[spriteId].invisible = TRUE;
@@ -360,15 +360,15 @@ static void AnimFlashingCircleImpact(struct Sprite *sprite)
 
 static void AnimFlashingCircleImpact_Step(struct Sprite *sprite)
 {
-    sprite->pos2.x = Cos(sprite->data[0], 32);
-    sprite->pos2.y = Sin(sprite->data[0], 8);
+    sprite->x2 = Cos(sprite->data[0], 32);
+    sprite->y2 = Sin(sprite->data[0], 8);
     if (sprite->data[0] < 128)
         sprite->subpriority = 29;
     else
         sprite->subpriority = 31;
     sprite->data[0] = (sprite->data[0] + 8) & 0xFF;
     sprite->data[5] += sprite->data[1];
-    sprite->pos2.y += sprite->data[5] >> 8;
+    sprite->y2 += sprite->data[5] >> 8;
     sprite->data[2]++;
     if (sprite->data[2] == 52)
     {
diff --git a/src/battle_anim_throw.c b/src/battle_anim_throw.c
index 4064e250c..0a81a6eca 100755
--- a/src/battle_anim_throw.c
+++ b/src/battle_anim_throw.c
@@ -473,8 +473,8 @@ void AnimTask_UnusedLevelUpHealthBox(u8 taskId)
     AnimLoadCompressedBgGfx(animBgData.bgId, UnusedLevelupAnimationGfx, animBgData.tilesOffset);
     LoadCompressedPalette(gCureBubblesPal, animBgData.paletteId << 4, 32);
 
-    gBattle_BG1_X = -gSprites[spriteId3].pos1.x + 32;
-    gBattle_BG1_Y = -gSprites[spriteId3].pos1.y - 32;
+    gBattle_BG1_X = -gSprites[spriteId3].x + 32;
+    gBattle_BG1_Y = -gSprites[spriteId3].y - 32;
     gTasks[taskId].data[1] = 640;
     gTasks[taskId].data[0] = spriteId3;
     gTasks[taskId].data[2] = spriteId4;
@@ -857,9 +857,9 @@ static void SpriteCB_Ball_Throw(struct Sprite *sprite)
     u16 targetX = sprite->sTargetXArg;
     u16 targetY = sprite->sTargetYArg;
 
-    sprite->sOffsetX = sprite->pos1.x;
+    sprite->sOffsetX = sprite->x;
     sprite->sTargetX = targetX;
-    sprite->sOffsetY = sprite->pos1.y;
+    sprite->sOffsetY = sprite->y;
     sprite->sTargetY = targetY;
     sprite->sAmplitude = -40;
     InitAnimArcTranslation(sprite);
@@ -891,10 +891,10 @@ static void SpriteCB_Ball_Arc(struct Sprite *sprite)
         else
         {
             StartSpriteAnim(sprite, 1);
-            sprite->pos1.x += sprite->pos2.x;
-            sprite->pos1.y += sprite->pos2.y;
-            sprite->pos2.x = 0;
-            sprite->pos2.y = 0;
+            sprite->x += sprite->x2;
+            sprite->y += sprite->y2;
+            sprite->x2 = 0;
+            sprite->y2 = 0;
 
             for (i = 0; i < 8; i++)
                 sprite->data[i] = 0;
@@ -906,7 +906,7 @@ static void SpriteCB_Ball_Arc(struct Sprite *sprite)
             switch (ballId)
             {
             case 0 ... POKEBALL_COUNT - 1:
-                AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId);
+                AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballId);
                 LaunchBallFadeMonTask(FALSE, gBattleAnimTarget, 14, ballId);
                 break;
             }
@@ -948,7 +948,7 @@ static void SpriteCB_Ball_MonShrink_Step(struct Sprite *sprite)
         PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_NORMAL);
         gTasks[taskId].data[10] = 256;
         gMonShrinkDuration = 28;
-        gMonShrinkDistance = (gSprites[spriteId].pos1.y + gSprites[spriteId].pos2.y) - (sprite->pos1.y + sprite->pos2.y);
+        gMonShrinkDistance = (gSprites[spriteId].y + gSprites[spriteId].y2) - (sprite->y + sprite->y2);
         gMonShrinkDelta = (u32)(gMonShrinkDistance * 256) / gMonShrinkDuration;
         gTasks[taskId].data[2] = gMonShrinkDelta;
         gTasks[taskId].tState++; // MON_SHRINK_STEP
@@ -957,7 +957,7 @@ static void SpriteCB_Ball_MonShrink_Step(struct Sprite *sprite)
         gTasks[taskId].data[10] += 32;
         SetSpriteRotScale(spriteId, gTasks[taskId].data[10], gTasks[taskId].data[10], 0);
         gTasks[taskId].data[3] += gTasks[taskId].data[2];
-        gSprites[spriteId].pos2.y = -gTasks[taskId].data[3] >> 8;
+        gSprites[spriteId].y2 = -gTasks[taskId].data[3] >> 8;
         if (gTasks[taskId].data[10] >= 1152)
             gTasks[taskId].tState++; // MON_SHRINK_INVISIBLE
         break;
@@ -997,8 +997,8 @@ static void SpriteCB_Ball_Bounce(struct Sprite *sprite)
         sprite->sAmplitude = 40;
         sprite->sPhase = 0;
         phase = 0;
-        sprite->pos1.y += Cos(phase, 40);
-        sprite->pos2.y = -Cos(phase, sprite->sAmplitude);
+        sprite->y += Cos(phase, 40);
+        sprite->y2 = -Cos(phase, sprite->sAmplitude);
         sprite->callback = SpriteCB_Ball_Bounce_Step;
     }
 }
@@ -1032,7 +1032,7 @@ static void SpriteCB_Ball_Bounce_Step(struct Sprite *sprite)
     switch (DIRECTION(sprite->sState))
     {
     case BALL_FALLING:
-        sprite->pos2.y = -Cos(sprite->sPhase, sprite->sAmplitude);
+        sprite->y2 = -Cos(sprite->sPhase, sprite->sAmplitude);
         sprite->sPhase += PHASE_DELTA(sprite->sState) + 4;
         // Once the ball touches the ground
         if (sprite->sPhase >= 64)
@@ -1062,7 +1062,7 @@ static void SpriteCB_Ball_Bounce_Step(struct Sprite *sprite)
         }
         break;
     case BALL_RISING:
-        sprite->pos2.y = -Cos(sprite->sPhase, sprite->sAmplitude);
+        sprite->y2 = -Cos(sprite->sPhase, sprite->sAmplitude);
         sprite->sPhase -= PHASE_DELTA(sprite->sState) + 4;
         // Once ball reaches max height
         if (sprite->sPhase <= 0)
@@ -1077,8 +1077,8 @@ static void SpriteCB_Ball_Bounce_Step(struct Sprite *sprite)
     if (lastBounce)
     {
         sprite->sState = 0;
-        sprite->pos1.y += Cos(64, 40);
-        sprite->pos2.y = 0;
+        sprite->y += Cos(64, 40);
+        sprite->y2 = 0;
         if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_NO_SHAKES)
         {
             sprite->sTimer = 0;
@@ -1139,11 +1139,11 @@ static void SpriteCB_Ball_Wobble_Step(struct Sprite *sprite)
 
     switch (STATE(sprite->sState))
     {
-    case BALL_ROLL_1: 
-        // Rolling effect: every frame in the rotation, the sprite shifts 176/256 of a pixel. 
+    case BALL_ROLL_1:
+        // Rolling effect: every frame in the rotation, the sprite shifts 176/256 of a pixel.
         if (gBattleSpritesDataPtr->animationData->ballSubpx > 255)
         {
-            sprite->pos2.x += sprite->sDirection;
+            sprite->x2 += sprite->sDirection;
             gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF;
         }
         else
@@ -1177,7 +1177,7 @@ static void SpriteCB_Ball_Wobble_Step(struct Sprite *sprite)
     case BALL_ROLL_2:
         if (gBattleSpritesDataPtr->animationData->ballSubpx > 255)
         {
-            sprite->pos2.x += sprite->sDirection;
+            sprite->x2 += sprite->sDirection;
             gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF;
         }
         else
@@ -1212,7 +1212,7 @@ static void SpriteCB_Ball_Wobble_Step(struct Sprite *sprite)
     case BALL_ROLL_3:
         if (gBattleSpritesDataPtr->animationData->ballSubpx > 0xFF)
         {
-            sprite->pos2.x += sprite->sDirection;
+            sprite->x2 += sprite->sDirection;
             gBattleSpritesDataPtr->animationData->ballSubpx &= 0xFF;
         }
         else
@@ -1420,12 +1420,12 @@ static void MakeCaptureStars(struct Sprite *sprite)
     LoadBallParticleGfx(BALL_MASTER);
     for (i = 0; i < ARRAY_COUNT(sCaptureStars); i++)
     {
-        u8 spriteId = CreateSprite(&sBallParticleSpriteTemplates[BALL_MASTER], sprite->pos1.x, sprite->pos1.y, subpriority);
+        u8 spriteId = CreateSprite(&sBallParticleSpriteTemplates[BALL_MASTER], sprite->x, sprite->y, subpriority);
         if (spriteId != MAX_SPRITES)
         {
             gSprites[spriteId].sDuration = 24;
-            gSprites[spriteId].sTargetX = sprite->pos1.x + sCaptureStars[i].xOffset;
-            gSprites[spriteId].sTargetY = sprite->pos1.y + sCaptureStars[i].yOffset;
+            gSprites[spriteId].sTargetX = sprite->x + sCaptureStars[i].xOffset;
+            gSprites[spriteId].sTargetY = sprite->y + sCaptureStars[i].yOffset;
             gSprites[spriteId].sAmplitude = sCaptureStars[i].amplitude;
             InitAnimArcTranslation(&gSprites[spriteId]);
             gSprites[spriteId].callback = SpriteCB_CaptureStar_Flicker;
@@ -1465,7 +1465,7 @@ static void SpriteCB_Ball_Release_Step(struct Sprite *sprite)
     switch (ballId)
     {
     case 0 ... POKEBALL_COUNT - 1:
-        AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId);
+        AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 28, ballId);
         LaunchBallFadeMonTask(TRUE, gBattleAnimTarget, 14, ballId);
         break;
     }
@@ -1492,12 +1492,12 @@ static void SpriteCB_Ball_Release_Wait(struct Sprite *sprite)
     else
     {
         gSprites[gBattlerSpriteIds[gBattleAnimTarget]].sOffsetY -= 288;
-        gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].sOffsetY >> 8;
+        gSprites[gBattlerSpriteIds[gBattleAnimTarget]].y2 = gSprites[gBattlerSpriteIds[gBattleAnimTarget]].sOffsetY >> 8;
     }
 
     if (sprite->animEnded && released)
     {
-        gSprites[gBattlerSpriteIds[gBattleAnimTarget]].pos2.y = 0;
+        gSprites[gBattlerSpriteIds[gBattleAnimTarget]].y2 = 0;
         gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = gBattleSpritesDataPtr->animationData->wildMonInvisible;
         sprite->sFrame = 0;
         sprite->callback = DestroySpriteAfterOneFrame;
@@ -1513,10 +1513,10 @@ static void SpriteCB_Ball_Block(struct Sprite *sprite)
 {
     s32 i;
 
-    sprite->pos1.x += sprite->pos2.x;
-    sprite->pos1.y += sprite->pos2.y;
-    sprite->pos2.y = 0;
-    sprite->pos2.x = 0;
+    sprite->x += sprite->x2;
+    sprite->y += sprite->y2;
+    sprite->y2 = 0;
+    sprite->x2 = 0;
     for (i = 0; i < 6; i++)
         sprite->data[i] = 0;
 
@@ -1533,13 +1533,13 @@ static void SpriteCB_Ball_Block_Step(struct Sprite *sprite)
 {
     s16 dy = sprite->sDy + 0x800;
     s16 dx = sprite->sDx + 0x680;
-    sprite->pos2.x -= dx >> 8;
-    sprite->pos2.y += dy >> 8;
+    sprite->x2 -= dx >> 8;
+    sprite->y2 += dy >> 8;
     sprite->sDy = (sprite->sDy + 0x800) & 0xFF;
     sprite->sDx = (sprite->sDx + 0x680) & 0xFF;
 
-    if (sprite->pos1.y + sprite->pos2.y > DISPLAY_HEIGHT
-     || sprite->pos1.x + sprite->pos2.x < -8)
+    if (sprite->y + sprite->y2 > DISPLAY_HEIGHT
+     || sprite->x + sprite->x2 < -8)
     {
         sprite->sFrame = 0;
         sprite->callback = DestroySpriteAfterOneFrame;
@@ -1638,8 +1638,8 @@ static void PokeBallOpenParticleAnimation_Step1(struct Sprite *sprite)
 
 static void PokeBallOpenParticleAnimation_Step2(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
-    sprite->pos2.y = Cos(sprite->data[0], sprite->data[1]);
+    sprite->x2 = Sin(sprite->data[0], sprite->data[1]);
+    sprite->y2 = Cos(sprite->data[0], sprite->data[1]);
     sprite->data[1] += 2;
     if (sprite->data[1] == 50)
         DestroyBallOpenAnimationParticle(sprite);
@@ -1831,8 +1831,8 @@ static void GreatBallOpenParticleAnimation(u8 taskId)
 
 static void FanOutBallOpenParticles_Step1(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
-    sprite->pos2.y = Cos(sprite->data[0], sprite->data[2]);
+    sprite->x2 = Sin(sprite->data[0], sprite->data[1]);
+    sprite->y2 = Cos(sprite->data[0], sprite->data[2]);
     sprite->data[0] = (sprite->data[0] + sprite->data[4]) & 0xFF;
     sprite->data[1] += sprite->data[5];
     sprite->data[2] += sprite->data[6];
@@ -1873,8 +1873,8 @@ static void RepeatBallOpenParticleAnimation(u8 taskId)
 
 static void RepeatBallOpenParticleAnimation_Step1(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
-    sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0], sprite->data[2]));
+    sprite->x2 = Sin(sprite->data[0], sprite->data[1]);
+    sprite->y2 = Cos(sprite->data[0], Sin(sprite->data[0], sprite->data[2]));
     sprite->data[0] = (sprite->data[0] + 6) & 0xFF;
     sprite->data[1]++;
     sprite->data[2]++;
@@ -1961,8 +1961,8 @@ static void PremierBallOpenParticleAnimation(u8 taskId)
 
 static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[0], sprite->data[1]);
-    sprite->pos2.y = Cos(sprite->data[0], Sin(sprite->data[0] & 0x3F, sprite->data[2]));
+    sprite->x2 = Sin(sprite->data[0], sprite->data[1]);
+    sprite->y2 = Cos(sprite->data[0], Sin(sprite->data[0] & 0x3F, sprite->data[2]));
     sprite->data[0] = (sprite->data[0] + 10) & 0xFF;
     sprite->data[1]++;
     sprite->data[2]++;
@@ -2111,12 +2111,12 @@ void AnimTask_SwapMonSpriteToFromSubstitute(u8 taskId)
         gTasks[taskId].data[11] = gBattleAnimArgs[0];
         gTasks[taskId].data[0] += 0x500;
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-            gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8;
+            gSprites[spriteId].x2 += gTasks[taskId].data[0] >> 8;
         else
-            gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8;
+            gSprites[spriteId].x2 -= gTasks[taskId].data[0] >> 8;
 
         gTasks[taskId].data[0] &= 0xFF;
-        x = gSprites[spriteId].pos1.x + gSprites[spriteId].pos2.x + 32;
+        x = gSprites[spriteId].x + gSprites[spriteId].x2 + 32;
         if (x > 304)
             gTasks[taskId].data[10]++;
         break;
@@ -2127,24 +2127,24 @@ void AnimTask_SwapMonSpriteToFromSubstitute(u8 taskId)
     case 2:
         gTasks[taskId].data[0] += 0x500;
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
-            gSprites[spriteId].pos2.x -= gTasks[taskId].data[0] >> 8;
+            gSprites[spriteId].x2 -= gTasks[taskId].data[0] >> 8;
         else
-            gSprites[spriteId].pos2.x += gTasks[taskId].data[0] >> 8;
+            gSprites[spriteId].x2 += gTasks[taskId].data[0] >> 8;
 
         gTasks[taskId].data[0] &= 0xFF;
         if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         {
-            if (gSprites[spriteId].pos2.x <= 0)
+            if (gSprites[spriteId].x2 <= 0)
             {
-                gSprites[spriteId].pos2.x = 0;
+                gSprites[spriteId].x2 = 0;
                 done = TRUE;
             }
         }
         else
         {
-            if (gSprites[spriteId].pos2.x >= 0)
+            if (gSprites[spriteId].x2 >= 0)
             {
-                gSprites[spriteId].pos2.x = 0;
+                gSprites[spriteId].x2 = 0;
                 done = TRUE;
             }
         }
@@ -2268,7 +2268,7 @@ static void Task_ShinyStars(u8 taskId)
     }
 
     // Wait until the ball particles have despawned
-    if (gBattleSpritesDataPtr->animationData->numBallParticles) 
+    if (gBattleSpritesDataPtr->animationData->numBallParticles)
         return;
 
     timer = gTasks[taskId].tStarTimer++;
@@ -2302,8 +2302,8 @@ static void Task_ShinyStars(u8 taskId)
     else
     {
         gSprites[spriteId].callback = SpriteCB_ShinyStars_Diagonal;
-        gSprites[spriteId].pos2.x = -32;
-        gSprites[spriteId].pos2.y = 32;
+        gSprites[spriteId].x2 = -32;
+        gSprites[spriteId].y2 = 32;
         gSprites[spriteId].invisible = TRUE;
         if (gTasks[taskId].tStarIdx == 0)
         {
@@ -2343,8 +2343,8 @@ static void Task_ShinyStars_Wait(u8 taskId)
 
 static void SpriteCB_ShinyStars_Encircle(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->sPhase, 24);
-    sprite->pos2.y = Cos(sprite->sPhase, 24);
+    sprite->x2 = Sin(sprite->sPhase, 24);
+    sprite->y2 = Cos(sprite->sPhase, 24);
     sprite->sPhase += 12;
     if (sprite->sPhase > 255)
     {
@@ -2362,9 +2362,9 @@ static void SpriteCB_ShinyStars_Diagonal(struct Sprite *sprite)
     else
     {
         sprite->invisible = FALSE;
-        sprite->pos2.x += 5;
-        sprite->pos2.y -= 5;
-        if (sprite->pos2.x > 32)
+        sprite->x2 += 5;
+        sprite->y2 -= 5;
+        if (sprite->x2 > 32)
         {
             gTasks[sprite->sTaskId].tNumStars--;
             FreeSpriteOamMatrix(sprite);
@@ -2440,7 +2440,7 @@ static void SpriteCB_PokeBlock_Arc(struct Sprite *sprite)
 }
 
 // Destroy after end of player animation
-static void SpriteCB_ThrowPokeBlock_Free(struct Sprite *sprite) 
+static void SpriteCB_ThrowPokeBlock_Free(struct Sprite *sprite)
 {
     if (gSprites[gBattlerSpriteIds[gBattleAnimAttacker]].animEnded)
     {
diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c
index 9b2b2e03c..c20fbc9e2 100644
--- a/src/battle_anim_utility_funcs.c
+++ b/src/battle_anim_utility_funcs.c
@@ -335,8 +335,8 @@ void AnimTask_DrawFallingWhiteLinesOnAttacker(u8 taskId)
     AnimLoadCompressedBgGfx(animBgData.bgId, gBattleAnimMaskImage_Curse, animBgData.tilesOffset);
     LoadPalette(sCurseLinesPalette, animBgData.paletteId * 16 + 1, 2);
 
-    gBattle_BG1_X = -gSprites[spriteId].pos1.x + 32;
-    gBattle_BG1_Y = -gSprites[spriteId].pos1.y + 32;
+    gBattle_BG1_X = -gSprites[spriteId].x + 32;
+    gBattle_BG1_Y = -gSprites[spriteId].y + 32;
     gTasks[taskId].data[0] = newSpriteId;
     gTasks[taskId].data[6] = var0;
     gTasks[taskId].func = AnimTask_DrawFallingWhiteLinesOnAttacker_Step;
diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c
index d9cfeab9a..4ee09f386 100644
--- a/src/battle_anim_water.c
+++ b/src/battle_anim_water.c
@@ -504,8 +504,8 @@ static void AnimRainDrop_Step(struct Sprite *sprite)
 {
     if (++sprite->data[0] <= 13)
     {
-        sprite->pos2.x++;
-        sprite->pos2.y += 4;
+        sprite->x2++;
+        sprite->y2 += 4;
     }
     if (sprite->animEnded)
         DestroySprite(sprite);
@@ -518,28 +518,28 @@ static void AnimWaterBubbleProjectile(struct Sprite *sprite)
 
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) - gBattleAnimArgs[0];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1];
         sprite->animPaused = TRUE;
     }
     else
     {
-        sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
-        sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1];
+        sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 2) + gBattleAnimArgs[0];
+        sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 3) + gBattleAnimArgs[1];
         sprite->animPaused = TRUE;
     }
     if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
         gBattleAnimArgs[2] = -gBattleAnimArgs[2];
     sprite->data[0] = gBattleAnimArgs[6];
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     InitAnimLinearTranslation(sprite);
     spriteId = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy);
     sprite->data[5] = spriteId;
-    sprite->pos1.x -= Sin((u8)gBattleAnimArgs[4], gBattleAnimArgs[2]);
-    sprite->pos1.y -= Cos((u8)gBattleAnimArgs[4], gBattleAnimArgs[3]);
+    sprite->x -= Sin((u8)gBattleAnimArgs[4], gBattleAnimArgs[2]);
+    sprite->y -= Cos((u8)gBattleAnimArgs[4], gBattleAnimArgs[3]);
     gSprites[spriteId].data[0] = gBattleAnimArgs[2];
     gSprites[spriteId].data[1] = gBattleAnimArgs[3];
     gSprites[spriteId].data[2] = gBattleAnimArgs[5];
@@ -557,8 +557,8 @@ static void AnimWaterBubbleProjectile_Step1(struct Sprite *sprite)
 
     sprite->data[0] = 1;
     AnimTranslateLinear(sprite);
-    sprite->pos2.x += Sin(trigIndex >> 8, gSprites[otherSpriteId].data[0]);
-    sprite->pos2.y += Cos(trigIndex >> 8, gSprites[otherSpriteId].data[1]);
+    sprite->x2 += Sin(trigIndex >> 8, gSprites[otherSpriteId].data[0]);
+    sprite->y2 += Cos(trigIndex >> 8, gSprites[otherSpriteId].data[1]);
     gSprites[otherSpriteId].data[3] = trigIndex + gSprites[otherSpriteId].data[2];
     if (--timer != 0)
     {
@@ -595,9 +595,9 @@ static void AnimAuroraBeamRings(struct Sprite *sprite)
     else
         unkArg = gBattleAnimArgs[2];
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2) + unkArg;
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3) + gBattleAnimArgs[3];
     InitAnimLinearTranslation(sprite);
     sprite->callback = AnimAuroraBeamRings_Step;
@@ -650,9 +650,9 @@ static void AnimToTargetInSinWave(struct Sprite *sprite)
 
     InitSpritePosToAnimAttacker(sprite, TRUE);
     sprite->data[0] = 30;
-    sprite->data[1] = sprite->pos1.x;
+    sprite->data[1] = sprite->x;
     sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, 2);
-    sprite->data[3] = sprite->pos1.y;
+    sprite->data[3] = sprite->y;
     sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, 3);
     InitAnimLinearTranslation(sprite);
     sprite->data[5] = 0xD200 / sprite->data[0];
@@ -675,7 +675,7 @@ static void AnimToTargetInSinWave_Step(struct Sprite *sprite)
 {
     if (AnimTranslateLinear(sprite))
         DestroyAnimSprite(sprite);
-    sprite->pos2.y += Sin(sprite->data[6] >> 8, sprite->data[7]);
+    sprite->y2 += Sin(sprite->data[6] >> 8, sprite->data[7]);
     if ((sprite->data[6] + sprite->data[5]) >> 8 > 127)
     {
         sprite->data[6] = 0;
@@ -706,26 +706,26 @@ static void AnimHydroCannonCharge(struct Sprite *sprite)
 {
     u8 priority;
 
-    sprite->pos1.x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
-    sprite->pos1.y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
-    sprite->pos2.y = -10;
+    sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, 0);
+    sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, 1);
+    sprite->y2 = -10;
     priority = GetBattlerSpriteSubpriority(gBattleAnimAttacker);
     if (!IsContest())
     {
         if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER)
         {
-            sprite->pos2.x = 10;
+            sprite->x2 = 10;
             sprite->subpriority = priority + 2;
         }
         else
         {
-            sprite->pos2.x = -10;
+            sprite->x2 = -10;
             sprite->subpriority = priority - 2;
         }
     }
     else
     {
-        sprite->pos2.x = -10;
+        sprite->x2 = -10;
         sprite->subpriority = priority + 2;
     }
     sprite->callback = AnimHydroCannonCharge_Step;
@@ -771,8 +771,8 @@ static void AnimWaterGunDroplet(struct Sprite *sprite)
 {
     InitSpritePosToAnimTarget(sprite, TRUE);
     sprite->data[0] = gBattleAnimArgs[4];
-    sprite->data[2] = sprite->pos1.x + gBattleAnimArgs[2];
-    sprite->data[4] = sprite->pos1.y + gBattleAnimArgs[4];
+    sprite->data[2] = sprite->x + gBattleAnimArgs[2];
+    sprite->data[4] = sprite->y + gBattleAnimArgs[4];
     sprite->callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(sprite, DestroyAnimSprite);
 }
@@ -790,9 +790,9 @@ static void AnimSmallBubblePair(struct Sprite *sprite)
 static void AnimSmallBubblePair_Step(struct Sprite *sprite)
 {
     sprite->data[0] = (sprite->data[0] + 11) & 0xFF;
-    sprite->pos2.x = Sin(sprite->data[0], 4);
+    sprite->x2 = Sin(sprite->data[0], 4);
     sprite->data[1] += 48;
-    sprite->pos2.y = -(sprite->data[1] >> 8);
+    sprite->y2 = -(sprite->data[1] >> 8);
     if (--sprite->data[7] == -1)
         DestroyAnimSprite(sprite);
 }
@@ -1027,10 +1027,10 @@ static void AnimSmallDriftingBubbles_Step(struct Sprite *sprite)
     sprite->data[3] += sprite->data[1];
     sprite->data[4] += sprite->data[2];
     if (sprite->data[1] & 1)
-        sprite->pos2.x = -(sprite->data[3] >> 8);
+        sprite->x2 = -(sprite->data[3] >> 8);
     else
-        sprite->pos2.x = sprite->data[3] >> 8;
-    sprite->pos2.y = sprite->data[4] >> 8;
+        sprite->x2 = sprite->data[3] >> 8;
+    sprite->y2 = sprite->data[4] >> 8;
     if (++sprite->data[0] == 21)
         DestroyAnimSprite(sprite);
 }
@@ -1040,7 +1040,7 @@ void AnimTask_WaterSpoutLaunch(u8 taskId)
     struct Task *task = &gTasks[taskId];
 
     task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER);
-    task->data[5] = gSprites[task->data[15]].pos1.y;
+    task->data[5] = gSprites[task->data[15]].y;
     task->data[1] = GetWaterSpoutPowerForAnim();
     PrepareBattlerSpriteForRotScale(task->data[15], ST_OAM_OBJ_NORMAL);
     task->func = AnimTask_WaterSpoutLaunch_Step;
@@ -1061,18 +1061,18 @@ static void AnimTask_WaterSpoutLaunch_Step(u8 taskId)
             task->data[3] = 0;
             if (++task->data[4] & 1)
             {
-                gSprites[task->data[15]].pos2.x = 3;
-                gSprites[task->data[15]].pos1.y++;
+                gSprites[task->data[15]].x2 = 3;
+                gSprites[task->data[15]].y++;
             }
             else
             {
-                gSprites[task->data[15]].pos2.x = -3;
+                gSprites[task->data[15]].x2 = -3;
             }
         }
         if (UpdateEruptAnimTask(task) == 0)
         {
             SetBattlerSpriteYOffsetFromYScale(task->data[15]);
-            gSprites[task->data[15]].pos2.x = 0;
+            gSprites[task->data[15]].x2 = 0;
             task->data[3] = 0;
             task->data[4] = 0;
             task->data[0]++;
@@ -1102,9 +1102,9 @@ static void AnimTask_WaterSpoutLaunch_Step(u8 taskId)
         {
             task->data[3] = 0;
             if (++task->data[4] & 1)
-                gSprites[task->data[15]].pos2.y += 2;
+                gSprites[task->data[15]].y2 += 2;
             else
-                gSprites[task->data[15]].pos2.y -= 2;
+                gSprites[task->data[15]].y2 -= 2;
             if (task->data[4] == 10)
             {
                 PrepareEruptAnimTaskData(task, task->data[15], 0x180, 0xE0, 0x100, 0x100, 8);
@@ -1115,11 +1115,11 @@ static void AnimTask_WaterSpoutLaunch_Step(u8 taskId)
         }
         break;
     case 6:
-        gSprites[task->data[15]].pos1.y--;
+        gSprites[task->data[15]].y--;
         if (UpdateEruptAnimTask(task) == 0)
         {
             ResetSpriteRotScale(task->data[15]);
-            gSprites[task->data[15]].pos1.y = task->data[5];
+            gSprites[task->data[15]].y = task->data[5];
             task->data[4] = 0;
             task->data[0]++;
         }
@@ -1209,9 +1209,9 @@ static void AnimSmallWaterOrb(struct Sprite *sprite)
     case 1:
         sprite->data[2] += sprite->data[4];
         sprite->data[3] += sprite->data[5];
-        sprite->pos1.x = sprite->data[2] >> 4;
-        sprite->pos1.y = sprite->data[3] >> 4;
-        if (sprite->pos1.x < -8 || sprite->pos1.x > 248 || sprite->pos1.y < -8 || sprite->pos1.y > 120)
+        sprite->x = sprite->data[2] >> 4;
+        sprite->y = sprite->data[3] >> 4;
+        if (sprite->x < -8 || sprite->x > 248 || sprite->y < -8 || sprite->y > 120)
         {
             gTasks[sprite->data[6]].data[sprite->data[7]]--;
             DestroySprite(sprite);
@@ -1306,11 +1306,11 @@ static void AnimWaterSpoutRain(struct Sprite *sprite)
 {
     if (sprite->data[0] == 0)
     {
-        sprite->pos1.y += 8;
-        if (sprite->pos1.y >= sprite->data[5])
+        sprite->y += 8;
+        if (sprite->y >= sprite->data[5])
         {
             gTasks[sprite->data[6]].data[10] = 1;
-            sprite->data[1] = CreateSprite(&gWaterHitSplatSpriteTemplate, sprite->pos1.x, sprite->pos1.y, 1);
+            sprite->data[1] = CreateSprite(&gWaterHitSplatSpriteTemplate, sprite->x, sprite->y, 1);
             if (sprite->data[1] != MAX_SPRITES)
             {
                 StartSpriteAffineAnim(&gSprites[sprite->data[1]], 3);
@@ -1449,11 +1449,11 @@ static void AnimWaterSportDroplet(struct Sprite *sprite)
 {
     if (TranslateAnimHorizontalArc(sprite))
     {
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
         sprite->data[0] = 6;
-        sprite->data[2] = (Random2() & 0x1F) - 16 + sprite->pos1.x;
-        sprite->data[4] = (Random2() & 0x1F) - 16 + sprite->pos1.y;
+        sprite->data[2] = (Random2() & 0x1F) - 16 + sprite->x;
+        sprite->data[4] = (Random2() & 0x1F) - 16 + sprite->y;
         sprite->data[5] = ~(Random2() & 7);
         InitAnimArcTranslation(sprite);
         sprite->callback = AnimWaterSportDroplet_Step;
@@ -1480,8 +1480,8 @@ static void AnimWaterSportDroplet_Step(struct Sprite *sprite)
 
 static void AnimWaterPulseBubble(struct Sprite *sprite)
 {
-    sprite->pos1.x = gBattleAnimArgs[0];
-    sprite->pos1.y = gBattleAnimArgs[1];
+    sprite->x = gBattleAnimArgs[0];
+    sprite->y = gBattleAnimArgs[1];
     sprite->data[0] = gBattleAnimArgs[2];
     sprite->data[1] = gBattleAnimArgs[3];
     sprite->data[2] = gBattleAnimArgs[4];
@@ -1492,9 +1492,9 @@ static void AnimWaterPulseBubble(struct Sprite *sprite)
 static void AnimWaterPulseBubble_Step(struct Sprite *sprite)
 {
     sprite->data[4] -= sprite->data[0];
-    sprite->pos2.y = sprite->data[4] / 10;
+    sprite->y2 = sprite->data[4] / 10;
     sprite->data[5] = (sprite->data[5] + sprite->data[1]) & 0xFF;
-    sprite->pos2.x = Sin(sprite->data[5], sprite->data[2]);
+    sprite->x2 = Sin(sprite->data[5], sprite->data[2]);
     if (--sprite->data[3] == 0)
         DestroyAnimSprite(sprite);
 }
@@ -1503,8 +1503,8 @@ static void AnimWaterPulseRingBubble(struct Sprite *sprite)
 {
     sprite->data[3] += sprite->data[1];
     sprite->data[4] += sprite->data[2];
-    sprite->pos2.x = sprite->data[3] >> 7;
-    sprite->pos2.y = sprite->data[4] >> 7;
+    sprite->x2 = sprite->data[3] >> 7;
+    sprite->y2 = sprite->data[4] >> 7;
     if (--sprite->data[0] == 0)
     {
         FreeSpriteOamMatrix(sprite);
@@ -1524,11 +1524,11 @@ void AnimWaterPulseRing(struct Sprite *sprite)
 
 static void AnimWaterPulseRing_Step(struct Sprite *sprite)
 {
-    int xDiff = sprite->data[1] - sprite->pos1.x;
-    int yDiff = sprite->data[2] - sprite->pos1.y;
+    int xDiff = sprite->data[1] - sprite->x;
+    int yDiff = sprite->data[2] - sprite->y;
 
-    sprite->pos2.x = (sprite->data[0] * xDiff) / sprite->data[3];
-    sprite->pos2.y = (sprite->data[0] * yDiff) / sprite->data[3];
+    sprite->x2 = (sprite->data[0] * xDiff) / sprite->data[3];
+    sprite->y2 = (sprite->data[0] * yDiff) / sprite->data[3];
     if (++sprite->data[5] == sprite->data[4])
     {
         sprite->data[5] = 0;
@@ -1549,10 +1549,10 @@ static void CreateWaterPulseRingBubbles(struct Sprite *sprite, int xDiff, int yD
     s16 randomSomethingY;
     s16 randomSomethingX;
     u8 spriteId;
-    
+
     something = sprite->data[0] / 2;
-    combinedX = sprite->pos1.x + sprite->pos2.x;
-    combinedY = sprite->pos1.y + sprite->pos2.y;
+    combinedX = sprite->x + sprite->x2;
+    combinedY = sprite->y + sprite->y2;
     if (yDiff < 0)
         unusedVar *= -1; //Needed to match
     randomSomethingY = yDiff + (Random2() % 10) - 5;
diff --git a/src/battle_arena.c b/src/battle_arena.c
index 11c918225..f61526edc 100644
--- a/src/battle_arena.c
+++ b/src/battle_arena.c
@@ -453,7 +453,7 @@ static const union AnimCmd *const sJudgementIconAnimCmds[] =
 static const struct SpriteTemplate sSpriteTemplate_JudgmentIcon =
 {
     .tileTag = TAG_JUDGEMENT_ICON,
-    .paletteTag = 0xFFFF,
+    .paletteTag = TAG_NONE,
     .oam = &sJudgementIconOamData,
     .anims = sJudgementIconAnimCmds,
     .images = NULL,
@@ -917,7 +917,7 @@ void DrawArenaRefereeTextBox(void)
     FillBgTilemapBufferRect(0, 0x836, 29, 19, 1,  1, palNum);
 }
 
-void RemoveArenaRefereeTextBox(void)
+void EraseArenaRefereeTextBox(void)
 {
     u8 width;
     u8 height;
diff --git a/src/battle_bg.c b/src/battle_bg.c
index ae5d27779..0ad126509 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -1112,8 +1112,8 @@ void InitLinkBattleVsScreen(u8 taskId)
             gSprites[gBattleStruct->linkBattleVsSpriteId_S].oam.tileNum += 0x40;
             gSprites[gBattleStruct->linkBattleVsSpriteId_V].data[0] = 0;
             gSprites[gBattleStruct->linkBattleVsSpriteId_S].data[0] = 1;
-            gSprites[gBattleStruct->linkBattleVsSpriteId_V].data[1] = gSprites[gBattleStruct->linkBattleVsSpriteId_V].pos1.x;
-            gSprites[gBattleStruct->linkBattleVsSpriteId_S].data[1] = gSprites[gBattleStruct->linkBattleVsSpriteId_S].pos1.x;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_V].data[1] = gSprites[gBattleStruct->linkBattleVsSpriteId_V].x;
+            gSprites[gBattleStruct->linkBattleVsSpriteId_S].data[1] = gSprites[gBattleStruct->linkBattleVsSpriteId_S].x;
             gSprites[gBattleStruct->linkBattleVsSpriteId_V].data[2] = 0;
             gSprites[gBattleStruct->linkBattleVsSpriteId_S].data[2] = 0;
         }
diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c
index 0f612f964..dc8b2bfd1 100644
--- a/src/battle_controller_link_opponent.c
+++ b/src/battle_controller_link_opponent.c
@@ -365,7 +365,7 @@ static void Intro_TryShinyAnimShowHealthbox(void)
 static void TryShinyAnimAfterMonAnim(void)
 {
     if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
-     && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
+     && gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim)
         {
@@ -1134,7 +1134,7 @@ static void LinkOpponentHandleLoadMonSprite(void)
                                                GetBattlerSpriteDefault_Y(gActiveBattler),
                                                GetBattlerSpriteSubpriority(gActiveBattler));
 
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
     StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
@@ -1302,7 +1302,7 @@ static void LinkOpponentHandleDrawTrainerPic(void)
                                                (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 40,
                                                GetBattlerSpriteSubpriority(gActiveBattler));
 
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = 2;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
@@ -1324,8 +1324,8 @@ static void LinkOpponentHandleTrainerSlide(void)
     SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler));
     gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 176, (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 40, 0x1E);
 
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 96;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.x += 32;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = 96;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x += 32;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
@@ -1342,7 +1342,7 @@ static void LinkOpponentHandleTrainerSlideBack(void)
     SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
     gBattlerControllerFuncs[gActiveBattler] = FreeTrainerSpriteAfterSlide;
@@ -1703,7 +1703,7 @@ static void LinkOpponentHandleIntroTrainerBallThrow(void)
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
 
     StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCB_FreeOpponentSprite);
diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c
index 9184f5ac9..07101c682 100644
--- a/src/battle_controller_link_partner.c
+++ b/src/battle_controller_link_partner.c
@@ -265,7 +265,7 @@ static void Intro_ShowHealthbox(void)
 
 static void WaitForMonAnimAfterLoad(void)
 {
-    if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded && gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0)
         LinkPartnerBufferExecCompleted();
 }
 
@@ -288,7 +288,7 @@ static void CompleteOnHealthbarDone(void)
 
 static void FreeMonSpriteAfterFaintAnim(void)
 {
-    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y + gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].y + gSprites[gBattlerSpriteIds[gActiveBattler]].y2 > DISPLAY_HEIGHT)
     {
         u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
@@ -1021,7 +1021,7 @@ static void LinkPartnerHandleLoadMonSprite(void)
                                                GetBattlerSpriteCoord(gActiveBattler, 2),
                                                GetBattlerSpriteDefault_Y(gActiveBattler),
                                                GetBattlerSpriteSubpriority(gActiveBattler));
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
     StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
@@ -1144,7 +1144,7 @@ static void LinkPartnerHandleDrawTrainerPic(void)
     gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, (8 - gTrainerBackPicCoords[trainerPicId].size) * 4 + 80, GetBattlerSpriteSubpriority(gActiveBattler));
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
 
@@ -1163,7 +1163,7 @@ static void LinkPartnerHandleTrainerSlideBack(void)
     SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
     gBattlerControllerFuncs[gActiveBattler] = FreeTrainerSpriteAfterSlide;
@@ -1535,7 +1535,7 @@ static void LinkPartnerHandleIntroTrainerBallThrow(void)
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c
index 9fce5050e..87bef4302 100644
--- a/src/battle_controller_opponent.c
+++ b/src/battle_controller_opponent.c
@@ -249,7 +249,7 @@ static void Intro_WaitForShinyAnimAndHealthbox(void)
     {
         if (twoMons == TRUE)
         {
-            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim 
+            if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim
              && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim)
             {
                 gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE;
@@ -266,7 +266,7 @@ static void Intro_WaitForShinyAnimAndHealthbox(void)
         {
             if (GetBattlerPosition(gActiveBattler) == 3)
             {
-                if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim 
+                if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim
                  && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim)
                 {
                     FreeSpriteTilesByTag(ANIM_TAG_GOLD_STARS);
@@ -291,16 +291,16 @@ static void Intro_TryShinyAnimShowHealthbox(void)
     bool32 bgmRestored = FALSE;
     bool32 battlerAnimsDone = FALSE;
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim 
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive 
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim)
         TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
 
-    if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) 
-     && !(gBattleTypeFlags & BATTLE_TYPE_MULTI) 
-     && IsDoubleBattle() 
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim 
-     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive 
+    if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
+     && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)
+     && IsDoubleBattle()
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim
+     && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].finishedShinyMonAnim)
         TryShinyAnimation(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
 
@@ -379,12 +379,12 @@ static void Intro_TryShinyAnimShowHealthbox(void)
 
 static void TryShinyAnimAfterMonAnim(void)
 {
-    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0 
-        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim 
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0
+        && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim
         && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim)
         TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
 
-    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy 
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
      && gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE;
@@ -467,7 +467,7 @@ static void SwitchIn_HandleSoundAndEnd(void)
 {
     if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].specialAnimActive && !IsCryPlayingOrClearCrySongs())
     {
-        if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy 
+        if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
          || gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy_2)
         {
             m4aMPlayVolumeControl(&gMPlayInfo_BGM, 0xFFFF, 0x100);
@@ -478,7 +478,7 @@ static void SwitchIn_HandleSoundAndEnd(void)
 
 static void SwitchIn_ShowHealthbox(void)
 {
-    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim 
+    if (gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim
      && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE;
@@ -496,7 +496,7 @@ static void SwitchIn_ShowHealthbox(void)
 
 static void SwitchIn_TryShinyAnim(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim 
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
         TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
 
@@ -1143,7 +1143,7 @@ static void OpponentHandleLoadMonSprite(void)
                                                GetBattlerSpriteDefault_Y(gActiveBattler),
                                                GetBattlerSpriteSubpriority(gActiveBattler));
 
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = species;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
@@ -1310,7 +1310,7 @@ static void OpponentHandleDrawTrainerPic(void)
                                                (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 40,
                                                GetBattlerSpriteSubpriority(gActiveBattler));
 
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = 2;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
@@ -1379,8 +1379,8 @@ static void OpponentHandleTrainerSlide(void)
     SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(gActiveBattler));
     gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 176, (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 40, 0x1E);
 
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = 96;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.x += 32;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = 96;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x += 32;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
@@ -1396,7 +1396,7 @@ static void OpponentHandleTrainerSlideBack(void)
     SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
     gBattlerControllerFuncs[gActiveBattler] = FreeTrainerSpriteAfterSlide;
@@ -1869,7 +1869,7 @@ static void OpponentHandleIntroTrainerBallThrow(void)
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
 
     StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCB_FreeOpponentSprite);
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 34fcb82f6..8e7bc9a9f 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -229,7 +229,7 @@ static void PlayerBufferRunCommand(void)
 
 static void CompleteOnBankSpritePosX_0(void)
 {
-    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0)
         PlayerBufferExecCompleted();
 }
 
@@ -985,17 +985,17 @@ static void Intro_TryShinyAnimShowHealthbox(void)
     bool32 battlerAnimsDone = FALSE;
 
     // Start shiny animation if applicable for 1st pokemon
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim 
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
         TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]);
 
     // Start shiny animation if applicable for 2nd pokemon
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim 
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
         TryShinyAnimation(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
 
     // Show healthbox after ball anim
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive 
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].healthboxSlideInStarted)
@@ -1072,7 +1072,7 @@ static void SwitchIn_CleanShinyAnimShowSubstitute(void)
      && gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy)
     {
         CopyBattleSpriteInvisibility(gActiveBattler);
-        
+
         // Reset shiny anim (even if it didn't occur)
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim = FALSE;
         gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].finishedShinyMonAnim = FALSE;
@@ -1316,7 +1316,7 @@ static void DestroyExpTaskAndCompleteOnInactiveTextPrinter(u8 taskId)
 
 static void FreeMonSpriteAfterFaintAnim(void)
 {
-    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y + gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].y + gSprites[gBattlerSpriteIds[gActiveBattler]].y2 > DISPLAY_HEIGHT)
     {
         u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
@@ -2328,8 +2328,8 @@ static void PlayerHandleDrawTrainerPic(void)
         gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, GetBattlerSpriteSubpriority(gActiveBattler));
 
         gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = DISPLAY_WIDTH;
-        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y = 48;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = DISPLAY_WIDTH;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].y2 = 48;
         gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
         gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
         gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = ST_OAM_AFFINE_OFF;
@@ -2343,7 +2343,7 @@ static void PlayerHandleDrawTrainerPic(void)
         gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, GetBattlerSpriteSubpriority(gActiveBattler));
 
         gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = DISPLAY_WIDTH;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = DISPLAY_WIDTH;
         gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
         gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
     }
@@ -2382,7 +2382,7 @@ static void PlayerHandleTrainerSlide(void)
     gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, 80, (8 - gTrainerBackPicCoords[trainerPicId].size) * 4 + 80, 30);
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -96;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = 2;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
 
@@ -2396,7 +2396,7 @@ static void PlayerHandleTrainerSlideBack(void)
     SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
     StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], 1);
@@ -2953,7 +2953,7 @@ static void PlayerHandleIntroTrainerBallThrow(void)
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sBattlerId = gActiveBattler;
 
diff --git a/src/battle_controller_player_partner.c b/src/battle_controller_player_partner.c
index 401ad311b..d1d23099a 100644
--- a/src/battle_controller_player_partner.c
+++ b/src/battle_controller_player_partner.c
@@ -277,7 +277,7 @@ static void Intro_ShowHealthbox(void)
 
 static void WaitForMonAnimAfterLoad(void)
 {
-    if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded && gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0)
         PlayerPartnerBufferExecCompleted();
 }
 
@@ -472,7 +472,7 @@ static void DestroyExpTaskAndCompleteOnInactiveTextPrinter(u8 taskId)
 
 static void FreeMonSpriteAfterFaintAnim(void)
 {
-    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y + gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].y + gSprites[gBattlerSpriteIds[gActiveBattler]].y2 > DISPLAY_HEIGHT)
     {
         u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
@@ -1205,7 +1205,7 @@ static void PlayerPartnerHandleLoadMonSprite(void)
                                                GetBattlerSpriteCoord(gActiveBattler, 2),
                                                GetBattlerSpriteDefault_Y(gActiveBattler),
                                                GetBattlerSpriteSubpriority(gActiveBattler));
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
     StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
@@ -1320,7 +1320,7 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
         gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, GetBattlerSpriteSubpriority(gActiveBattler));
 
         gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = DISPLAY_WIDTH;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = DISPLAY_WIDTH;
         gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
         gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
     }
@@ -1331,8 +1331,8 @@ static void PlayerPartnerHandleDrawTrainerPic(void)
         gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, GetBattlerSpriteSubpriority(gActiveBattler));
 
         gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = DISPLAY_WIDTH;
-        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y = 48;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = DISPLAY_WIDTH;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].y2 = 48;
         gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
         gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
         gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = ST_OAM_AFFINE_OFF;
@@ -1354,7 +1354,7 @@ static void PlayerPartnerHandleTrainerSlideBack(void)
     SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
     gBattlerControllerFuncs[gActiveBattler] = FreeTrainerSpriteAfterSlide;
@@ -1784,7 +1784,7 @@ static void PlayerPartnerHandleIntroTrainerBallThrow(void)
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
diff --git a/src/battle_controller_recorded_opponent.c b/src/battle_controller_recorded_opponent.c
index 245e4bd30..adac43961 100644
--- a/src/battle_controller_recorded_opponent.c
+++ b/src/battle_controller_recorded_opponent.c
@@ -262,11 +262,11 @@ static void Intro_TryShinyAnimShowHealthbox(void)
     bool32 bgmRestored = FALSE;
     bool32 battlerAnimsDone = FALSE;
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim 
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
         TryShinyAnimation(gActiveBattler, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler]]);
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim 
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
         TryShinyAnimation(gActiveBattler ^ BIT_FLANK, &gEnemyParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
 
@@ -349,7 +349,7 @@ static void Intro_TryShinyAnimShowHealthbox(void)
 static void TryShinyAnimAfterMonAnim(void)
 {
     if (gSprites[gBattlerSpriteIds[gActiveBattler]].callback == SpriteCallbackDummy
-     && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
+     && gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0)
     {
         if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim)
         {
@@ -1117,7 +1117,7 @@ static void RecordedOpponentHandleLoadMonSprite(void)
                                                GetBattlerSpriteDefault_Y(gActiveBattler),
                                                GetBattlerSpriteSubpriority(gActiveBattler));
 
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
     StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
@@ -1249,7 +1249,7 @@ static void RecordedOpponentHandleDrawTrainerPic(void)
                                                (8 - gTrainerFrontPicCoords[trainerPicId].size) * 4 + 40,
                                                GetBattlerSpriteSubpriority(gActiveBattler));
 
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = 2;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineParam = trainerPicId;
@@ -1270,7 +1270,7 @@ static void RecordedOpponentHandleTrainerSlideBack(void)
     SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
     gBattlerControllerFuncs[gActiveBattler] = FreeTrainerSpriteAfterSlide;
@@ -1643,7 +1643,7 @@ static void RecordedOpponentHandleIntroTrainerBallThrow(void)
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = 280;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
 
     StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCB_FreeOpponentSprite);
diff --git a/src/battle_controller_recorded_player.c b/src/battle_controller_recorded_player.c
index 73c23afc5..bff81948b 100644
--- a/src/battle_controller_recorded_player.c
+++ b/src/battle_controller_recorded_player.c
@@ -342,7 +342,7 @@ static void Intro_TryShinyAnimShowHealthbox(void)
 
 static void WaitForMonAnimAfterLoad(void)
 {
-    if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded && gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x == 0)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].animEnded && gSprites[gBattlerSpriteIds[gActiveBattler]].x2 == 0)
         RecordedPlayerBufferExecCompleted();
 }
 
@@ -365,7 +365,7 @@ static void CompleteOnHealthbarDone(void)
 
 static void FreeMonSpriteAfterFaintAnim(void)
 {
-    if (gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y + gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y > DISPLAY_HEIGHT)
+    if (gSprites[gBattlerSpriteIds[gActiveBattler]].y + gSprites[gBattlerSpriteIds[gActiveBattler]].y2 > DISPLAY_HEIGHT)
     {
         u16 species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_SPECIES);
 
@@ -1098,7 +1098,7 @@ static void RecordedPlayerHandleLoadMonSprite(void)
                                                GetBattlerSpriteCoord(gActiveBattler, 2),
                                                GetBattlerSpriteDefault_Y(gActiveBattler),
                                                GetBattlerSpriteSubpriority(gActiveBattler));
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = gActiveBattler;
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
     StartSpriteAnim(&gSprites[gBattlerSpriteIds[gActiveBattler]], gBattleMonForms[gActiveBattler]);
@@ -1233,8 +1233,8 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
         gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, GetBattlerSpriteSubpriority(gActiveBattler));
 
         gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = IndexOfSpritePaletteTag(gTrainerFrontPicPaletteTable[trainerPicId].tag);
-        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = DISPLAY_WIDTH;
-        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.y = 48;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = DISPLAY_WIDTH;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].y2 = 48;
         gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
         gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
         gSprites[gBattlerSpriteIds[gActiveBattler]].oam.affineMode = ST_OAM_AFFINE_OFF;
@@ -1247,7 +1247,7 @@ static void RecordedPlayerHandleDrawTrainerPic(void)
         gBattlerSpriteIds[gActiveBattler] = CreateSprite(&gMultiuseSpriteTemplate, xPos, yPos, GetBattlerSpriteSubpriority(gActiveBattler));
 
         gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-        gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = DISPLAY_WIDTH;
+        gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = DISPLAY_WIDTH;
         gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
         gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
     }
@@ -1267,7 +1267,7 @@ static void RecordedPlayerHandleTrainerSlideBack(void)
     SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattlerSpriteIds[gActiveBattler]]);
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 35;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     StoreSpriteCallbackInData6(&gSprites[gBattlerSpriteIds[gActiveBattler]], SpriteCallbackDummy);
     gBattlerControllerFuncs[gActiveBattler] = FreeTrainerSpriteAfterSlide;
@@ -1668,7 +1668,7 @@ static void RecordedPlayerHandleIntroTrainerBallThrow(void)
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 5d8b46ebd..a82538741 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -361,7 +361,7 @@ static void SafariHandleDrawTrainerPic(void)
       (8 - gTrainerBackPicCoords[gSaveBlock2Ptr->playerGender].size) * 4 + 80,
       30);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
     gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy;
diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c
index b35ffa692..048600d9a 100644
--- a/src/battle_controller_wally.c
+++ b/src/battle_controller_wally.c
@@ -285,11 +285,11 @@ static void CompleteOnChosenItem(void)
 
 static void Intro_TryShinyAnimShowHealthbox(void)
 {
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim 
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].triedShinyMonAnim
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive)
         TryShinyAnimation(gActiveBattler, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler]]);
 
-    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim 
+    if (!gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].triedShinyMonAnim
      && !gBattleSpritesDataPtr->healthBoxesData[gActiveBattler ^ BIT_FLANK].ballAnimActive)
         TryShinyAnimation(gActiveBattler ^ BIT_FLANK, &gPlayerParty[gBattlerPartyIndexes[gActiveBattler ^ BIT_FLANK]]);
 
@@ -1041,7 +1041,7 @@ static void WallyHandleDrawTrainerPic(void)
                                                80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].size),
                                                30);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = DISPLAY_WIDTH;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = DISPLAY_WIDTH;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = -2;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
     gBattlerControllerFuncs[gActiveBattler] = CompleteOnBattlerSpriteCallbackDummy;
@@ -1056,7 +1056,7 @@ static void WallyHandleTrainerSlide(void)
                                                80 + 4 * (8 - gTrainerBackPicCoords[TRAINER_BACK_PIC_WALLY].size),
                                                30);
     gSprites[gBattlerSpriteIds[gActiveBattler]].oam.paletteNum = gActiveBattler;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].pos2.x = -96;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].x2 = -96;
     gSprites[gBattlerSpriteIds[gActiveBattler]].sSpeedX = 2;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = SpriteCB_TrainerSlideIn;
     gBattlerControllerFuncs[gActiveBattler] = CompleteOnBankSpriteCallbackDummy2;
@@ -1435,7 +1435,7 @@ static void WallyHandleIntroTrainerBallThrow(void)
 
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[0] = 50;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[2] = -40;
-    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].pos1.y;
+    gSprites[gBattlerSpriteIds[gActiveBattler]].data[4] = gSprites[gBattlerSpriteIds[gActiveBattler]].y;
     gSprites[gBattlerSpriteIds[gActiveBattler]].callback = StartAnimLinearTranslation;
     gSprites[gBattlerSpriteIds[gActiveBattler]].data[5] = gActiveBattler;
 
diff --git a/src/battle_dome.c b/src/battle_dome.c
index ea1e5abba..944918631 100644
--- a/src/battle_dome.c
+++ b/src/battle_dome.c
@@ -978,7 +978,7 @@ static const union AnimCmd * const sSpriteAnimTable_TourneyTreePokeball[] =
 static const struct SpriteTemplate sTourneyTreePokeballSpriteTemplate =
 {
     .tileTag = 0x0000,
-    .paletteTag = 0xffff,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_TourneyTreePokeball,
     .anims = sSpriteAnimTable_TourneyTreePokeball,
     .images = NULL,
@@ -1007,7 +1007,7 @@ static const union AnimCmd * const sSpriteAnimTable_TourneyTreeCancelButton[] =
 static const struct SpriteTemplate sCancelButtonSpriteTemplate =
 {
     .tileTag = 0x0000,
-    .paletteTag = 0xffff,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_TourneyTreeCloseButton,
     .anims = sSpriteAnimTable_TourneyTreeCancelButton,
     .images = NULL,
@@ -1036,7 +1036,7 @@ static const union AnimCmd * const sSpriteAnimTable_TourneyTreeExitButton[] =
 static const struct SpriteTemplate sExitButtonSpriteTemplate =
 {
     .tileTag = 0x0000,
-    .paletteTag = 0xffff,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_TourneyTreeCloseButton,
     .anims = sSpriteAnimTable_TourneyTreeExitButton,
     .images = NULL,
@@ -1083,7 +1083,7 @@ static const union AnimCmd * const sSpriteAnimTable_HorizontalScrollArrow[] =
 static const struct SpriteTemplate sHorizontalScrollArrowSpriteTemplate =
 {
     .tileTag = 0x0000,
-    .paletteTag = 0xffff,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_HorizontalScrollArrow,
     .anims = sSpriteAnimTable_HorizontalScrollArrow,
     .images = NULL,
@@ -1094,7 +1094,7 @@ static const struct SpriteTemplate sHorizontalScrollArrowSpriteTemplate =
 static const struct SpriteTemplate sVerticalScrollArrowSpriteTemplate =
 {
     .tileTag = 0x0000,
-    .paletteTag = 0xffff,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_VerticalScrollArrow,
     .anims = sSpriteAnimTable_VerticalScrollArrow,
     .images = NULL,
@@ -3102,17 +3102,17 @@ static void Task_ShowTourneyInfoCard(u8 taskId)
 // That means that the sprite needs to move with the moving card in the opposite scrolling direction.
 static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite)
 {
-    sprite->pos1.y += 4;
+    sprite->y += 4;
     if (sprite->data[0] != 0)
     {
-        if (sprite->pos1.y >= -32)
+        if (sprite->y >= -32)
             sprite->invisible = FALSE;
         if (++sprite->data[1] == 40)
             sprite->callback = SpriteCallbackDummy;
     }
     else
     {
-        if (sprite->pos1.y >= 192)
+        if (sprite->y >= 192)
         {
             sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
@@ -3122,17 +3122,17 @@ static void SpriteCb_TrainerIconCardScrollUp(struct Sprite *sprite)
 
 static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite)
 {
-    sprite->pos1.y -= 4;
+    sprite->y -= 4;
     if (sprite->data[0] != 0)
     {
-        if (sprite->pos1.y <= 192)
+        if (sprite->y <= 192)
             sprite->invisible = FALSE;
         if (++sprite->data[1] == 40)
             sprite->callback = SpriteCallbackDummy;
     }
     else
     {
-        if (sprite->pos1.y <= -32)
+        if (sprite->y <= -32)
         {
             sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
@@ -3142,17 +3142,17 @@ static void SpriteCb_TrainerIconCardScrollDown(struct Sprite *sprite)
 
 static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite)
 {
-    sprite->pos1.x += 4;
+    sprite->x += 4;
     if (sprite->data[0] != 0)
     {
-        if (sprite->pos1.x >= -32)
+        if (sprite->x >= -32)
             sprite->invisible = FALSE;
         if (++sprite->data[1] == 64)
             sprite->callback = SpriteCallbackDummy;
     }
     else
     {
-        if (sprite->pos1.x >= DISPLAY_WIDTH + 32)
+        if (sprite->x >= DISPLAY_WIDTH + 32)
         {
             sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
@@ -3162,17 +3162,17 @@ static void SpriteCb_TrainerIconCardScrollLeft(struct Sprite *sprite)
 
 static void SpriteCb_TrainerIconCardScrollRight(struct Sprite *sprite)
 {
-    sprite->pos1.x -= 4;
+    sprite->x -= 4;
     if (sprite->data[0] != 0)
     {
-        if (sprite->pos1.x <= DISPLAY_WIDTH + 32)
+        if (sprite->x <= DISPLAY_WIDTH + 32)
             sprite->invisible = FALSE;
         if (++sprite->data[1] == 64)
             sprite->callback = SpriteCallbackDummy;
     }
     else
     {
-        if (sprite->pos1.x <= -32)
+        if (sprite->x <= -32)
         {
             sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE;
             FreeAndDestroyTrainerPicSprite(sprite->data[3]);
@@ -3192,17 +3192,17 @@ static void SpriteCb_MonIconCardScrollUp(struct Sprite *sprite)
 {
     if (!sprite->sMonIconStill)
         UpdateMonIconFrame(sprite);
-    sprite->pos1.y += 4;
+    sprite->y += 4;
     if (sprite->data[0] != 0)
     {
-        if (sprite->pos1.y >= -16)
+        if (sprite->y >= -16)
             sprite->invisible = FALSE;
         if (++sprite->data[1] == 40)
             sprite->callback = SpriteCb_MonIcon;
     }
     else
     {
-        if (sprite->pos1.y >= 176)
+        if (sprite->y >= 176)
         {
             sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE;
             FreeAndDestroyMonIconSprite(sprite);
@@ -3214,17 +3214,17 @@ static void SpriteCb_MonIconCardScrollDown(struct Sprite *sprite)
 {
     if (!sprite->sMonIconStill)
         UpdateMonIconFrame(sprite);
-    sprite->pos1.y -= 4;
+    sprite->y -= 4;
     if (sprite->data[0] != 0)
     {
-        if (sprite->pos1.y <= 176)
+        if (sprite->y <= 176)
             sprite->invisible = FALSE;
         if (++sprite->data[1] == 40)
             sprite->callback = SpriteCb_MonIcon;
     }
     else
     {
-        if (sprite->pos1.y <= -16)
+        if (sprite->y <= -16)
         {
             sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE;
             FreeAndDestroyMonIconSprite(sprite);
@@ -3236,17 +3236,17 @@ static void SpriteCb_MonIconCardScrollLeft(struct Sprite *sprite)
 {
     if (!sprite->sMonIconStill)
         UpdateMonIconFrame(sprite);
-    sprite->pos1.x += 4;
+    sprite->x += 4;
     if (sprite->data[0] != 0)
     {
-        if (sprite->pos1.x >= -16)
+        if (sprite->x >= -16)
             sprite->invisible = FALSE;
         if (++sprite->data[1] == 64)
             sprite->callback = SpriteCb_MonIcon;
     }
     else
     {
-        if (sprite->pos1.x >= DISPLAY_WIDTH + 16)
+        if (sprite->x >= DISPLAY_WIDTH + 16)
         {
             sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE;
             FreeAndDestroyMonIconSprite(sprite);
@@ -3258,17 +3258,17 @@ static void SpriteCb_MonIconCardScrollRight(struct Sprite *sprite)
 {
     if (!sprite->sMonIconStill)
         UpdateMonIconFrame(sprite);
-    sprite->pos1.x -= 4;
+    sprite->x -= 4;
     if (sprite->data[0] != 0)
     {
-        if (sprite->pos1.x <= DISPLAY_WIDTH + 16)
+        if (sprite->x <= DISPLAY_WIDTH + 16)
             sprite->invisible = FALSE;
         if (++sprite->data[1] == 64)
             sprite->callback = SpriteCb_MonIcon;
     }
     else
     {
-        if (sprite->pos1.x <= -16)
+        if (sprite->x <= -16)
         {
             sInfoCard->spriteIds[sprite->data[2]] = SPRITE_NONE;
             FreeAndDestroyMonIconSprite(sprite);
@@ -4267,11 +4267,11 @@ static void DisplayTrainerInfoOnCard(u8 flags, u8 trainerTourneyId)
 
     // Create trainer pic sprite
     if (trainerId == TRAINER_PLAYER)
-        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF);
+        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 48, y + 64, palSlot + 12, TAG_NONE);
     else if (trainerId == TRAINER_FRONTIER_BRAIN)
-        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF);
+        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 48, y + 64, palSlot + 12, TAG_NONE);
     else
-        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerId), TRUE, x + 48, y + 64, palSlot + 12, 0xFFFF);
+        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerId), TRUE, x + 48, y + 64, palSlot + 12, TAG_NONE);
 
     if (flags & MOVE_CARD)
         gSprites[sInfoCard->spriteIds[arrId]].invisible = TRUE;
@@ -4741,11 +4741,11 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
 
     // Draw left trainer sprite.
     if (trainerIds[0] == TRAINER_PLAYER)
-        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF);
+        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 48, y + 88, palSlot + 12, TAG_NONE);
     else if (trainerIds[0] == TRAINER_FRONTIER_BRAIN)
-        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF);
+        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 48, y + 88, palSlot + 12, TAG_NONE);
     else
-        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[0]), TRUE, x + 48, y + 88, palSlot + 12, 0xFFFF);
+        sInfoCard->spriteIds[arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[0]), TRUE, x + 48, y + 88, palSlot + 12, TAG_NONE);
 
     if (flags & MOVE_CARD)
         gSprites[sInfoCard->spriteIds[arrId]].invisible = TRUE;
@@ -4754,11 +4754,11 @@ static void DisplayMatchInfoOnCard(u8 flags, u8 matchNo)
 
     // Draw right trainer sprite.
     if (trainerIds[1] == TRAINER_PLAYER)
-        sInfoCard->spriteIds[1 + arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF);
+        sInfoCard->spriteIds[1 + arrId] = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId(gSaveBlock2Ptr->playerGender), TRUE, x + 192, y + 88, palSlot + 13, TAG_NONE);
     else if (trainerIds[1] == TRAINER_FRONTIER_BRAIN)
-        sInfoCard->spriteIds[1 + arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF);
+        sInfoCard->spriteIds[1 + arrId] = CreateTrainerPicSprite(GetDomeBrainTrainerPicId(), TRUE, x + 192, y + 88, palSlot + 13, TAG_NONE);
     else
-        sInfoCard->spriteIds[1 + arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[1]), TRUE, x + 192, y + 88, palSlot + 13, 0xFFFF);
+        sInfoCard->spriteIds[1 + arrId] = CreateTrainerPicSprite(GetFrontierTrainerFrontSpriteId(trainerIds[1]), TRUE, x + 192, y + 88, palSlot + 13, TAG_NONE);
 
     if (flags & MOVE_CARD)
         gSprites[sInfoCard->spriteIds[1 + arrId]].invisible = TRUE;
@@ -5800,7 +5800,7 @@ static void InitRandomTourneyTreeResults(void)
     gSaveBlock2Ptr->frontier.lvlMode = FRONTIER_LVL_50;
     zero1 = 0;
     zero2 = 0;
-    
+
     gSaveBlock2Ptr->frontier.domeLvlMode = zero1 + 1;
     gSaveBlock2Ptr->frontier.domeBattleMode = zero2 + 1;
 
diff --git a/src/battle_factory.c b/src/battle_factory.c
index e0bfdfdd0..8f1001e9c 100644
--- a/src/battle_factory.c
+++ b/src/battle_factory.c
@@ -43,12 +43,12 @@ static u8 GetMoveBattleStyle(u16 move);
 
 // Number of moves needed on the team to be considered using a certain battle style
 static const u8 sRequiredMoveCounts[FACTORY_NUM_STYLES - 1] = {
-    [FACTORY_STYLE_PREPARATION - 1]   = 3, 
-    [FACTORY_STYLE_SLOW_STEADY - 1]   = 3, 
-    [FACTORY_STYLE_ENDURANCE - 1]     = 3, 
-    [FACTORY_STYLE_HIGH_RISK - 1]     = 2, 
-    [FACTORY_STYLE_WEAKENING - 1]     = 2, 
-    [FACTORY_STYLE_UNPREDICTABLE - 1] = 2, 
+    [FACTORY_STYLE_PREPARATION - 1]   = 3,
+    [FACTORY_STYLE_SLOW_STEADY - 1]   = 3,
+    [FACTORY_STYLE_ENDURANCE - 1]     = 3,
+    [FACTORY_STYLE_HIGH_RISK - 1]     = 2,
+    [FACTORY_STYLE_WEAKENING - 1]     = 2,
+    [FACTORY_STYLE_UNPREDICTABLE - 1] = 2,
     [FACTORY_STYLE_WEATHER - 1]       = 2
 };
 
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c
index db810e965..64d564062 100644
--- a/src/battle_factory_screen.c
+++ b/src/battle_factory_screen.c
@@ -1307,7 +1307,7 @@ static void Select_InitAllSprites(void)
         Select_SetBallSpritePaletteNum(i);
     }
     cursorPos = sFactorySelectScreen->cursorPos;
-    x = gSprites[sFactorySelectScreen->mons[cursorPos].ballSpriteId].pos1.x;
+    x = gSprites[sFactorySelectScreen->mons[cursorPos].ballSpriteId].x;
     sFactorySelectScreen->cursorSpriteId = CreateSprite(&sSpriteTemplate_Select_Arrow, x, 88, 0);
     sFactorySelectScreen->menuCursor1SpriteId = CreateSprite(&sSpriteTemplate_Select_MenuHighlightLeft, 176, 112, 0);
     sFactorySelectScreen->menuCursor2SpriteId = CreateSprite(&sSpriteTemplate_Select_MenuHighlightRight, 176, 144, 0);
@@ -1352,7 +1352,7 @@ static void Select_UpdateBallCursorPosition(s8 direction)
     }
 
     cursorPos = sFactorySelectScreen->cursorPos;
-    gSprites[sFactorySelectScreen->cursorSpriteId].pos1.x = gSprites[sFactorySelectScreen->mons[cursorPos].ballSpriteId].pos1.x;
+    gSprites[sFactorySelectScreen->cursorSpriteId].x = gSprites[sFactorySelectScreen->mons[cursorPos].ballSpriteId].x;
 }
 
 static void Select_UpdateMenuCursorPosition(s8 direction)
@@ -1372,8 +1372,8 @@ static void Select_UpdateMenuCursorPosition(s8 direction)
             sFactorySelectScreen->menuCursorPos = ARRAY_COUNT(sSelect_MenuOptionFuncs) - 1;
     }
 
-    gSprites[sFactorySelectScreen->menuCursor1SpriteId].pos1.y = (sFactorySelectScreen->menuCursorPos * 16) + 112;
-    gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.y = (sFactorySelectScreen->menuCursorPos * 16) + 112;
+    gSprites[sFactorySelectScreen->menuCursor1SpriteId].y = (sFactorySelectScreen->menuCursorPos * 16) + 112;
+    gSprites[sFactorySelectScreen->menuCursor2SpriteId].y = (sFactorySelectScreen->menuCursorPos * 16) + 112;
 }
 
 static void Select_UpdateYesNoCursorPosition(s8 direction)
@@ -1393,8 +1393,8 @@ static void Select_UpdateYesNoCursorPosition(s8 direction)
             sFactorySelectScreen->yesNoCursorPos = 1;
     }
 
-    gSprites[sFactorySelectScreen->menuCursor1SpriteId].pos1.y = (sFactorySelectScreen->yesNoCursorPos * 16) + 112;
-    gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.y = (sFactorySelectScreen->yesNoCursorPos * 16) + 112;
+    gSprites[sFactorySelectScreen->menuCursor1SpriteId].y = (sFactorySelectScreen->yesNoCursorPos * 16) + 112;
+    gSprites[sFactorySelectScreen->menuCursor2SpriteId].y = (sFactorySelectScreen->yesNoCursorPos * 16) + 112;
 }
 
 static void Select_HandleMonSelectionChange(void)
@@ -1404,7 +1404,7 @@ static void Select_HandleMonSelectionChange(void)
     if (sFactorySelectScreen->mons[cursorPos].selectedId) // Deselect a mon.
     {
         paletteNum = IndexOfSpritePaletteTag(PALTAG_BALL_GRAY);
-        if (sFactorySelectScreen->selectingMonsState == FRONTIER_PARTY_SIZE 
+        if (sFactorySelectScreen->selectingMonsState == FRONTIER_PARTY_SIZE
          && sFactorySelectScreen->mons[cursorPos].selectedId == 1)
         {
             for (i = 0; i < SELECTABLE_MONS_COUNT; i++)
@@ -1823,10 +1823,10 @@ static void Select_ShowMenuOptions(void)
     if (!sFactorySelectScreen->fromSummaryScreen)
         sFactorySelectScreen->menuCursorPos = 0;
 
-    gSprites[sFactorySelectScreen->menuCursor1SpriteId].pos1.x = 176;
-    gSprites[sFactorySelectScreen->menuCursor1SpriteId].pos1.y = (sFactorySelectScreen->menuCursorPos * 16) + 112;
-    gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.x = 208;
-    gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.y = (sFactorySelectScreen->menuCursorPos * 16) + 112;
+    gSprites[sFactorySelectScreen->menuCursor1SpriteId].x = 176;
+    gSprites[sFactorySelectScreen->menuCursor1SpriteId].y = (sFactorySelectScreen->menuCursorPos * 16) + 112;
+    gSprites[sFactorySelectScreen->menuCursor2SpriteId].x = 208;
+    gSprites[sFactorySelectScreen->menuCursor2SpriteId].y = (sFactorySelectScreen->menuCursorPos * 16) + 112;
 
     gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = FALSE;
     gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = FALSE;
@@ -1838,10 +1838,10 @@ static void Select_ShowYesNoOptions(void)
 {
     sFactorySelectScreen->yesNoCursorPos = 0;
 
-    gSprites[sFactorySelectScreen->menuCursor1SpriteId].pos1.x = 176;
-    gSprites[sFactorySelectScreen->menuCursor1SpriteId].pos1.y = 112;
-    gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.x = 208;
-    gSprites[sFactorySelectScreen->menuCursor2SpriteId].pos1.y = 112;
+    gSprites[sFactorySelectScreen->menuCursor1SpriteId].x = 176;
+    gSprites[sFactorySelectScreen->menuCursor1SpriteId].y = 112;
+    gSprites[sFactorySelectScreen->menuCursor2SpriteId].x = 208;
+    gSprites[sFactorySelectScreen->menuCursor2SpriteId].y = 112;
 
     gSprites[sFactorySelectScreen->menuCursor1SpriteId].invisible = FALSE;
     gSprites[sFactorySelectScreen->menuCursor2SpriteId].invisible = FALSE;
@@ -2008,7 +2008,7 @@ static void Select_CreateMonSprite(void)
     u32 personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL);
     u32 otId = GetMonData(mon, MON_DATA_OT_ID, NULL);
 
-    sFactorySelectScreen->monPics[1].monSpriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF);
+    sFactorySelectScreen->monPics[1].monSpriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, 88, 32, 15, TAG_NONE);
     gSprites[sFactorySelectScreen->monPics[1].monSpriteId].centerToCornerVecX = 0;
     gSprites[sFactorySelectScreen->monPics[1].monSpriteId].centerToCornerVecY = 0;
 
@@ -2034,7 +2034,7 @@ static void Select_ReshowMonSprite(void)
     personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL);
     otId = GetMonData(mon, MON_DATA_OT_ID, NULL);
 
-    sFactorySelectScreen->monPics[1].monSpriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF);
+    sFactorySelectScreen->monPics[1].monSpriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, 88, 32, 15, TAG_NONE);
     gSprites[sFactorySelectScreen->monPics[1].monSpriteId].centerToCornerVecX = 0;
     gSprites[sFactorySelectScreen->monPics[1].monSpriteId].centerToCornerVecY = 0;
 
@@ -2056,7 +2056,7 @@ static void Select_CreateChosenMonsSprites(void)
                 u32 personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL);
                 u32 otId = GetMonData(mon, MON_DATA_OT_ID, NULL);
 
-                sFactorySelectScreen->monPics[i].monSpriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, (i * 72) + 16, 32, i + 13, 0xFFFF);
+                sFactorySelectScreen->monPics[i].monSpriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, (i * 72) + 16, 32, i + 13, TAG_NONE);
                 gSprites[sFactorySelectScreen->monPics[i].monSpriteId].centerToCornerVecX = 0;
                 gSprites[sFactorySelectScreen->monPics[i].monSpriteId].centerToCornerVecY = 0;
                 break;
@@ -2793,33 +2793,33 @@ static void Swap_Task_SlideCycleBalls(u8 taskId)
         {
             if (i != FRONTIER_PARTY_SIZE - 1)
             {
-                u8 posX = lastX - gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x;
+                u8 posX = lastX - gSprites[sFactorySwapScreen->ballSpriteIds[i]].x;
                 if (posX == 16 || gTasks[taskId].tBallCycled(i + 1) == TRUE)
                 {
-                    lastX = gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x;
-                    gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x += 10;
+                    lastX = gSprites[sFactorySwapScreen->ballSpriteIds[i]].x;
+                    gSprites[sFactorySwapScreen->ballSpriteIds[i]].x += 10;
                 }
                 else if (posX > 16)
                 {
-                    gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x = gSprites[sFactorySwapScreen->ballSpriteIds[i + 1]].pos1.x - 48;
+                    gSprites[sFactorySwapScreen->ballSpriteIds[i]].x = gSprites[sFactorySwapScreen->ballSpriteIds[i + 1]].x - 48;
                 }
             }
             else
             {
-                lastX = gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x;
-                gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x += 10;
+                lastX = gSprites[sFactorySwapScreen->ballSpriteIds[i]].x;
+                gSprites[sFactorySwapScreen->ballSpriteIds[i]].x += 10;
             }
 
             if (gTasks[taskId].tBallCycled(i) == TRUE)
             {
                 // New ball coming in from left, check if it has reached dest
-                if (gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x > (i * 48) + 72)
+                if (gSprites[sFactorySwapScreen->ballSpriteIds[i]].x > (i * 48) + 72)
                 {
                     // Overshot dest, set x and finish
-                    gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x = (i * 48) + 72;
+                    gSprites[sFactorySwapScreen->ballSpriteIds[i]].x = (i * 48) + 72;
                     finished = TRUE;
                 }
-                else if (gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x == (i * 48) + 72)
+                else if (gSprites[sFactorySwapScreen->ballSpriteIds[i]].x == (i * 48) + 72)
                 {
                     finished = TRUE;
                 }
@@ -2833,11 +2833,11 @@ static void Swap_Task_SlideCycleBalls(u8 taskId)
                 finished = FALSE;
             }
 
-            if (gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x - 16 > DISPLAY_WIDTH)
+            if (gSprites[sFactorySwapScreen->ballSpriteIds[i]].x - 16 > DISPLAY_WIDTH)
             {
                 // Ball is offscreen right, cycle its palette and move to left side of screen
-                lastX = gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x;
-                gSprites[sFactorySwapScreen->ballSpriteIds[i]].pos1.x = -16;
+                lastX = gSprites[sFactorySwapScreen->ballSpriteIds[i]].x;
+                gSprites[sFactorySwapScreen->ballSpriteIds[i]].x = -16;
                 if (sFactorySwapScreen->inEnemyScreen == TRUE)
                     gSprites[sFactorySwapScreen->ballSpriteIds[i]].oam.paletteNum = IndexOfSpritePaletteTag(PALTAG_BALL_SELECTED);
                 else
@@ -2881,7 +2881,7 @@ static void Swap_Task_SlideButtonOnOffScreen(u8 taskId)
     switch (gTasks[taskId].tState)
     {
     case SLIDE_BUTTON_PKMN:
-        currPosX = gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0][0]].pos1.x;
+        currPosX = gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0][0]].x;
         if (!gTasks[taskId].tSlidingOn)
         {
             // Sliding "Pkmn for Swap" offscreen
@@ -2915,7 +2915,7 @@ static void Swap_Task_SlideButtonOnOffScreen(u8 taskId)
             for (i = 0; i < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0]); i++)
             {
                 for (j = 0; j < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds); j++)
-                    gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][i]].pos1.x += deltaX;
+                    gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][i]].x += deltaX;
             }
         }
         else
@@ -2923,9 +2923,9 @@ static void Swap_Task_SlideButtonOnOffScreen(u8 taskId)
             // Set final position
             for (j = 0; j < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds); j++)
             {
-                gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][0]].pos1.x = posX;
-                gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][1]].pos1.x = posX + 16;
-                gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][2]].pos1.x = posX + 48;
+                gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][0]].x = posX;
+                gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][1]].x = posX + 16;
+                gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[j][2]].x = posX + 48;
             }
             prevTaskId = gTasks[taskId].tTaskId;
             gTasks[prevTaskId].tSlideFinishedPkmn = TRUE;
@@ -2933,7 +2933,7 @@ static void Swap_Task_SlideButtonOnOffScreen(u8 taskId)
         }
         break;
     case SLIDE_BUTTON_CANCEL:
-        currPosX = gSprites[sFactorySwapScreen->cancelButtonSpriteIds[0][0]].pos1.x;
+        currPosX = gSprites[sFactorySwapScreen->cancelButtonSpriteIds[0][0]].x;
         if (!gTasks[taskId].tSlidingOn)
         {
             // Sliding "Cancel" offscreen
@@ -2967,7 +2967,7 @@ static void Swap_Task_SlideButtonOnOffScreen(u8 taskId)
             for (i = 0; i < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds); i++)
             {
                 for (j = 0; j < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds[0]); j++)
-                    gSprites[sFactorySwapScreen->cancelButtonSpriteIds[j][i]].pos1.x += deltaX;
+                    gSprites[sFactorySwapScreen->cancelButtonSpriteIds[j][i]].x += deltaX;
             }
         }
         else
@@ -2975,8 +2975,8 @@ static void Swap_Task_SlideButtonOnOffScreen(u8 taskId)
             // Set final position
             for (j = 0; j < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds); j++)
             {
-                gSprites[sFactorySwapScreen->cancelButtonSpriteIds[j][0]].pos1.x = posX;
-                gSprites[sFactorySwapScreen->cancelButtonSpriteIds[j][1]].pos1.x = posX + 16;
+                gSprites[sFactorySwapScreen->cancelButtonSpriteIds[j][0]].x = posX;
+                gSprites[sFactorySwapScreen->cancelButtonSpriteIds[j][1]].x = posX + 16;
             }
             prevTaskId = gTasks[taskId].tTaskId;
             gTasks[prevTaskId].tSlideFinishedCancel = TRUE;
@@ -3057,7 +3057,7 @@ static void Swap_Task_ScreenInfoTransitionOut(u8 taskId)
         }
         break;
     case 5:
-        if (gTasks[taskId].tSlideFinishedPkmn == TRUE 
+        if (gTasks[taskId].tSlideFinishedPkmn == TRUE
          && gTasks[taskId].tSlideFinishedCancel == TRUE)
         {
             gTasks[taskId].tState = gTasks[taskId].tFollowUpTaskState;
@@ -3123,7 +3123,7 @@ static void Swap_Task_ScreenInfoTransitionIn(u8 taskId)
         }
         break;
     case 2:
-        if (gTasks[taskId].tSlideFinishedPkmn == TRUE 
+        if (gTasks[taskId].tSlideFinishedPkmn == TRUE
          && gTasks[taskId].tSlideFinishedCancel == TRUE)
         {
             gPlttBufferFaded[226] = sPokeballGray_Pal[37];
@@ -3205,7 +3205,7 @@ static void Swap_Task_SwitchPartyScreen(u8 taskId)
         gTasks[taskId].tState++;
         break;
     case 3:
-        if (!FuncIsActiveTask(Swap_Task_SlideCycleBalls) 
+        if (!FuncIsActiveTask(Swap_Task_SlideCycleBalls)
          && gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].tFadeOutFinished == TRUE)
         {
             Swap_EraseSpeciesWindow();
@@ -3221,7 +3221,7 @@ static void Swap_Task_SwitchPartyScreen(u8 taskId)
                 for (i = 0; i < ARRAY_COUNT(sFactorySwapScreen->pkmnForSwapButtonSpriteIds[0]); i++)
                     gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[1][i]].invisible = TRUE;
             }
-            gSprites[sFactorySwapScreen->cursorSpriteId].pos1.x = gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].pos1.x;
+            gSprites[sFactorySwapScreen->cursorSpriteId].x = gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].x;
             gTasks[sFactorySwapScreen->fadeSpeciesNameTaskId].func = Swap_Task_FadeSpeciesName;
             sFactorySwapScreen->fadeSpeciesNameCoeffDelay = 0;
             sFactorySwapScreen->fadeSpeciesNameCoeff = 6;
@@ -3433,7 +3433,7 @@ static void Swap_InitAllSprites(void)
         sFactorySwapScreen->ballSpriteIds[i] = CreateSprite(&spriteTemplate, (48 * i) + 72, 64, 1);
         gSprites[sFactorySwapScreen->ballSpriteIds[i]].data[0] = 0;
     }
-    sFactorySwapScreen->cursorSpriteId = CreateSprite(&sSpriteTemplate_Swap_Arrow, gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].pos1.x, 88, 0);
+    sFactorySwapScreen->cursorSpriteId = CreateSprite(&sSpriteTemplate_Swap_Arrow, gSprites[sFactorySwapScreen->ballSpriteIds[sFactorySwapScreen->cursorPos]].x, 88, 0);
     sFactorySwapScreen->menuCursor1SpriteId = CreateSprite(&sSpriteTemplate_Swap_MenuHighlightLeft, 176, 112, 0);
     sFactorySwapScreen->menuCursor2SpriteId = CreateSprite(&sSpriteTemplate_Swap_MenuHighlightRight, 176, 144, 0);
     gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = TRUE;
@@ -3541,7 +3541,7 @@ static void Swap_HandleActionCursorChange(u8 cursorId)
         // Cursor is on one of the pokemon
         gSprites[sFactorySwapScreen->cursorSpriteId].invisible = FALSE;
         Swap_HideActionButtonHighlights();
-        gSprites[sFactorySwapScreen->cursorSpriteId].pos1.x = gSprites[sFactorySwapScreen->ballSpriteIds[cursorId]].pos1.x;
+        gSprites[sFactorySwapScreen->cursorSpriteId].x = gSprites[sFactorySwapScreen->ballSpriteIds[cursorId]].x;
     }
     else
     {
@@ -3618,8 +3618,8 @@ static void Swap_UpdateYesNoCursorPosition(s8 direction)
             sFactorySwapScreen->yesNoCursorPos = 1;
     }
 
-    gSprites[sFactorySwapScreen->menuCursor1SpriteId].pos1.y = (sFactorySwapScreen->yesNoCursorPos * 16) + 112;
-    gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.y = (sFactorySwapScreen->yesNoCursorPos * 16) + 112;
+    gSprites[sFactorySwapScreen->menuCursor1SpriteId].y = (sFactorySwapScreen->yesNoCursorPos * 16) + 112;
+    gSprites[sFactorySwapScreen->menuCursor2SpriteId].y = (sFactorySwapScreen->yesNoCursorPos * 16) + 112;
 }
 
 static void Swap_UpdateMenuCursorPosition(s8 direction)
@@ -3640,8 +3640,8 @@ static void Swap_UpdateMenuCursorPosition(s8 direction)
             sFactorySwapScreen->menuCursorPos = ARRAY_COUNT(sSwap_MenuOptionFuncs) - 1;
     }
 
-    gSprites[sFactorySwapScreen->menuCursor1SpriteId].pos1.y = (sFactorySwapScreen->menuCursorPos * 16) + 112;
-    gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.y = (sFactorySwapScreen->menuCursorPos * 16) + 112;
+    gSprites[sFactorySwapScreen->menuCursor1SpriteId].y = (sFactorySwapScreen->menuCursorPos * 16) + 112;
+    gSprites[sFactorySwapScreen->menuCursor2SpriteId].y = (sFactorySwapScreen->menuCursorPos * 16) + 112;
 }
 
 static void Swap_HighlightActionButton(u8 actionId)
@@ -3679,7 +3679,7 @@ static void Swap_HideActionButtonHighlights(void)
     {
         // Hide button highlight on "Pkmn for Swap"
         gSprites[sFactorySwapScreen->pkmnForSwapButtonSpriteIds[1][i]].invisible = TRUE;
-        
+
         // Hide button highlight on Cancel
         if (i < ARRAY_COUNT(sFactorySwapScreen->cancelButtonSpriteIds[0]))
             gSprites[sFactorySwapScreen->cancelButtonSpriteIds[1][i]].invisible = TRUE;
@@ -3693,10 +3693,10 @@ static void Swap_ShowMenuOptions(void)
     else
         sFactorySwapScreen->menuCursorPos = 0;
 
-    gSprites[sFactorySwapScreen->menuCursor1SpriteId].pos1.x = 176;
-    gSprites[sFactorySwapScreen->menuCursor1SpriteId].pos1.y = (sFactorySwapScreen->menuCursorPos * 16) + 112;
-    gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.x = 208;
-    gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.y = (sFactorySwapScreen->menuCursorPos * 16) + 112;
+    gSprites[sFactorySwapScreen->menuCursor1SpriteId].x = 176;
+    gSprites[sFactorySwapScreen->menuCursor1SpriteId].y = (sFactorySwapScreen->menuCursorPos * 16) + 112;
+    gSprites[sFactorySwapScreen->menuCursor2SpriteId].x = 208;
+    gSprites[sFactorySwapScreen->menuCursor2SpriteId].y = (sFactorySwapScreen->menuCursorPos * 16) + 112;
 
     gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = FALSE;
     gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = FALSE;
@@ -3708,10 +3708,10 @@ static void Swap_ShowYesNoOptions(void)
 {
     sFactorySwapScreen->yesNoCursorPos = 0;
 
-    gSprites[sFactorySwapScreen->menuCursor1SpriteId].pos1.x = 176;
-    gSprites[sFactorySwapScreen->menuCursor1SpriteId].pos1.y = 112;
-    gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.x = 208;
-    gSprites[sFactorySwapScreen->menuCursor2SpriteId].pos1.y = 112;
+    gSprites[sFactorySwapScreen->menuCursor1SpriteId].x = 176;
+    gSprites[sFactorySwapScreen->menuCursor1SpriteId].y = 112;
+    gSprites[sFactorySwapScreen->menuCursor2SpriteId].x = 208;
+    gSprites[sFactorySwapScreen->menuCursor2SpriteId].y = 112;
 
     gSprites[sFactorySwapScreen->menuCursor1SpriteId].invisible = FALSE;
     gSprites[sFactorySwapScreen->menuCursor2SpriteId].invisible = FALSE;
@@ -4072,9 +4072,9 @@ static void Swap_ShowSummaryMonSprite(void)
     otId = GetMonData(mon, MON_DATA_OT_ID, NULL);
 
 #ifdef BUGFIX
-    sFactorySwapScreen->monPic.monSpriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF);
+    sFactorySwapScreen->monPic.monSpriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, 88, 32, 15, TAG_NONE);
 #else
-    sFactorySwapScreen->monPic.monSpriteId = CreateMonPicSprite_HandleDeoxys(species, personality, otId, TRUE, 88, 32, 15, 0xFFFF);
+    sFactorySwapScreen->monPic.monSpriteId = CreateMonPicSprite_HandleDeoxys(species, personality, otId, TRUE, 88, 32, 15, TAG_NONE);
 #endif
     gSprites[sFactorySwapScreen->monPic.monSpriteId].centerToCornerVecX = 0;
     gSprites[sFactorySwapScreen->monPic.monSpriteId].centerToCornerVecY = 0;
@@ -4296,7 +4296,7 @@ static void Swap_CreateMonSprite(void)
     personality = GetMonData(mon, MON_DATA_PERSONALITY, NULL);
     otId = GetMonData(mon, MON_DATA_OT_ID, NULL);
 
-    sFactorySwapScreen->monPic.monSpriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, 88, 32, 15, 0xFFFF);
+    sFactorySwapScreen->monPic.monSpriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, 88, 32, 15, TAG_NONE);
     gSprites[sFactorySwapScreen->monPic.monSpriteId].centerToCornerVecX = 0;
     gSprites[sFactorySwapScreen->monPic.monSpriteId].centerToCornerVecY = 0;
 
diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c
index 88e69665e..77755775e 100644
--- a/src/battle_gfx_sfx_util.c
+++ b/src/battle_gfx_sfx_util.c
@@ -139,7 +139,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
     // Each nature has a different percent chance to select a move from one of 3 move groups
     // If percent is less than 1st check, use move from "Attack" group
     // If percent is less than 2nd check, use move from "Defense" group
-    // Otherwise use move from "Support" group 
+    // Otherwise use move from "Support" group
     for (; i < maxGroupNum; i++)
     {
         if (gBattlePalaceNatureToMoveGroupLikelihood[GetNatureFromPersonality(gBattleMons[gActiveBattler].personality)][i] > percent)
@@ -196,7 +196,7 @@ u16 ChooseMoveAndTargetInBattlePalace(void)
             if ((validMoveFlags & 0xF0) > 0x1FF)
                 numValidMoveGroups++;
 
-            
+
             // If more than 1 possible move group, or no possible move groups
             // then choose move randomly
             if (numValidMoveGroups > 1 || numValidMoveGroups == 0)
@@ -376,10 +376,10 @@ void SpriteCB_TrainerSlideIn(struct Sprite *sprite)
 {
     if (!(gIntroSlideFlags & 1))
     {
-        sprite->pos2.x += sprite->sSpeedX;
-        if (sprite->pos2.x == 0)
+        sprite->x2 += sprite->sSpeedX;
+        if (sprite->x2 == 0)
         {
-            if (sprite->pos2.y != 0)
+            if (sprite->y2 != 0)
                 sprite->callback = SpriteCB_TrainerSlideVertical;
             else
                 sprite->callback = SpriteCallbackDummy;
@@ -390,8 +390,8 @@ void SpriteCB_TrainerSlideIn(struct Sprite *sprite)
 // Slide up to 0 if necessary (used by multi battle intro)
 static void SpriteCB_TrainerSlideVertical(struct Sprite *sprite)
 {
-    sprite->pos2.y -= 2;
-    if (sprite->pos2.y == 0)
+    sprite->y2 -= 2;
+    if (sprite->y2 == 0)
         sprite->callback = SpriteCallbackDummy;
 }
 
@@ -914,7 +914,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform
             BlendPalette(paletteOffset, 16, 6, RGB_WHITE);
             CpuCopy32(gPlttBufferFaded + paletteOffset, gPlttBufferUnfaded + paletteOffset, 32);
         }
-        gSprites[gBattlerSpriteIds[battlerAtk]].pos1.y = GetBattlerSpriteDefault_Y(battlerAtk);
+        gSprites[gBattlerSpriteIds[battlerAtk]].y = GetBattlerSpriteDefault_Y(battlerAtk);
     }
     else
     {
@@ -989,7 +989,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool8 notTransform
             gBattleMonForms[battlerAtk] = gBattleMonForms[battlerDef];
         }
 
-        gSprites[gBattlerSpriteIds[battlerAtk]].pos1.y = GetBattlerSpriteDefault_Y(battlerAtk);
+        gSprites[gBattlerSpriteIds[battlerAtk]].y = GetBattlerSpriteDefault_Y(battlerAtk);
         StartSpriteAnim(&gSprites[gBattlerSpriteIds[battlerAtk]], gBattleMonForms[battlerAtk]);
     }
 }
@@ -1038,9 +1038,9 @@ void LoadBattleMonGfxAndAnimate(u8 battlerId, bool8 loadMonSprite, u8 spriteId)
     StartSpriteAnim(&gSprites[spriteId], gBattleMonForms[battlerId]);
 
     if (!loadMonSprite)
-        gSprites[spriteId].pos1.y = GetSubstituteSpriteDefault_Y(battlerId);
+        gSprites[spriteId].y = GetSubstituteSpriteDefault_Y(battlerId);
     else
-        gSprites[spriteId].pos1.y = GetBattlerSpriteDefault_Y(battlerId);
+        gSprites[spriteId].y = GetBattlerSpriteDefault_Y(battlerId);
 }
 
 void TrySetBehindSubstituteSpriteBit(u8 battlerId, u16 move)
@@ -1181,8 +1181,8 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite)
     if (gBattleSpritesDataPtr->battlerData[battlerId].behindSubstitute)
         invisible = TRUE;
 
-    shadowSprite->pos1.x = battlerSprite->pos1.x;
-    shadowSprite->pos2.x = battlerSprite->pos2.x;
+    shadowSprite->x = battlerSprite->x;
+    shadowSprite->x2 = battlerSprite->x2;
     shadowSprite->invisible = invisible;
 }
 
@@ -1213,7 +1213,8 @@ void HideBattlerShadowSprite(u8 battlerId)
     gSprites[gBattleSpritesDataPtr->healthBoxesData[battlerId].shadowSpriteId].callback = SpriteCB_SetInvisible;
 }
 
-void sub_805EF14(void)
+// Color the background tiles surrounding the action selection and move windows
+void FillAroundBattleWindows(void)
 {
     u16 *vramPtr = (u16*)(VRAM + 0x240);
     s32 i;
diff --git a/src/battle_interface.c b/src/battle_interface.c
index 50eb5373a..77308cb3c 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -103,11 +103,11 @@ enum
     HEALTHBOX_GFX_63, //hp bar red [7 pixels]
     HEALTHBOX_GFX_64, //hp bar red [8 pixels]
     HEALTHBOX_GFX_65, //hp bar frame end
-    HEALTHBOX_GFX_66, //status ball [full]
-    HEALTHBOX_GFX_67, //status ball [empty]
-    HEALTHBOX_GFX_68, //status ball [fainted]
-    HEALTHBOX_GFX_69, //status ball [statused]
-    HEALTHBOX_GFX_70, //status ball [unused extra]
+    HEALTHBOX_GFX_STATUS_BALL, // Full
+    HEALTHBOX_GFX_STATUS_BALL_EMPTY,
+    HEALTHBOX_GFX_STATUS_BALL_FAINTED,
+    HEALTHBOX_GFX_STATUS_BALL_STATUSED,
+    HEALTHBOX_GFX_STATUS_BALL_CAUGHT,
     HEALTHBOX_GFX_STATUS_PSN_BATTLER1, //status2 "PSN"
     HEALTHBOX_GFX_72,
     HEALTHBOX_GFX_73,
@@ -153,8 +153,8 @@ enum
     HEALTHBOX_GFX_STATUS_BRN_BATTLER3, //status4 "BRN"
     HEALTHBOX_GFX_114,
     HEALTHBOX_GFX_115,
-    HEALTHBOX_GFX_116, //unknown_D12FEC
-    HEALTHBOX_GFX_117, //unknown_D1300C
+    HEALTHBOX_GFX_FRAME_END,
+    HEALTHBOX_GFX_FRAME_END_BAR,
 };
 
 // strings
@@ -330,43 +330,43 @@ static const struct SpriteTemplate sHealthbarSpriteTemplates[MAX_BATTLERS_COUNT]
 static const struct Subsprite sUnknown_0832C220[] =
 {
     {
-        .x = DISPLAY_WIDTH,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(64x32),  
-        .size = SPRITE_SIZE(64x32),  
-        .tileOffset = 0,      
+        .x = DISPLAY_WIDTH,
+        .y = 0,
+        .shape = SPRITE_SHAPE(64x32),
+        .size = SPRITE_SIZE(64x32),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = 48,    
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x32),  
-        .size = SPRITE_SIZE(32x32),  
-        .tileOffset = 32,     
+        .x = 48,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .tileOffset = 32,
         .priority = 1
     },
     {
-        .x = DISPLAY_WIDTH,   
-        .y = 32, 
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 48,     
+        .x = DISPLAY_WIDTH,
+        .y = 32,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 48,
         .priority = 1
     },
     {
-        .x = 16,    
-        .y = 32, 
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 52,     
+        .x = 16,
+        .y = 32,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 52,
         .priority = 1
     },
     {
-        .x = 48,    
-        .y = 32, 
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 56,     
+        .x = 48,
+        .y = 32,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 56,
         .priority = 1
     }
 };
@@ -374,43 +374,43 @@ static const struct Subsprite sUnknown_0832C220[] =
 static const struct Subsprite sUnknown_0832C234[] =
 {
     {
-        .x = DISPLAY_WIDTH,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(64x32),  
-        .size = SPRITE_SIZE(64x32),  
-        .tileOffset = 64,     
+        .x = DISPLAY_WIDTH,
+        .y = 0,
+        .shape = SPRITE_SHAPE(64x32),
+        .size = SPRITE_SIZE(64x32),
+        .tileOffset = 64,
         .priority = 1
     },
     {
-        .x = 48,    
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x32),  
-        .size = SPRITE_SIZE(32x32),  
-        .tileOffset = 96,     
+        .x = 48,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .tileOffset = 96,
         .priority = 1
     },
     {
-        .x = DISPLAY_WIDTH,   
-        .y = 32, 
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 112,    
+        .x = DISPLAY_WIDTH,
+        .y = 32,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 112,
         .priority = 1
     },
     {
-        .x = 16,    
-        .y = 32, 
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 116,    
+        .x = 16,
+        .y = 32,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 116,
         .priority = 1
     },
     {
-        .x = 48,    
-        .y = 32, 
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 120,    
+        .x = 48,
+        .y = 32,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 120,
         .priority = 1
     }
 };
@@ -418,19 +418,19 @@ static const struct Subsprite sUnknown_0832C234[] =
 static const struct Subsprite sUnknown_0832C248[] =
 {
     {
-        .x = DISPLAY_WIDTH,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(64x32),  
+        .x = DISPLAY_WIDTH,
+        .y = 0,
+        .shape = SPRITE_SHAPE(64x32),
         .size = SPRITE_SIZE(64x32),
-        .tileOffset = 0,      
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = 48,    
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x32),  
-        .size = SPRITE_SIZE(32x32),  
-        .tileOffset = 32,     
+        .x = 48,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .tileOffset = 32,
         .priority = 1
     }
 };
@@ -438,19 +438,19 @@ static const struct Subsprite sUnknown_0832C248[] =
 static const struct Subsprite sUnknown_0832C250[] =
 {
     {
-        .x = DISPLAY_WIDTH,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(64x32),  
+        .x = DISPLAY_WIDTH,
+        .y = 0,
+        .shape = SPRITE_SHAPE(64x32),
         .size = SPRITE_SIZE(64x32),
-        .tileOffset = 0,      
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = 48,    
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x32),  
-        .size = SPRITE_SIZE(32x32),  
-        .tileOffset = 32,     
+        .x = 48,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .tileOffset = 32,
         .priority = 1
     }
 };
@@ -458,19 +458,19 @@ static const struct Subsprite sUnknown_0832C250[] =
 static const struct Subsprite sUnknown_0832C258[] =
 {
     {
-        .x = DISPLAY_WIDTH,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 0,      
+        .x = DISPLAY_WIDTH,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = 16,    
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 4,      
+        .x = 16,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 1
     }
 };
@@ -478,27 +478,27 @@ static const struct Subsprite sUnknown_0832C258[] =
 static const struct Subsprite sUnknown_0832C260[] =
 {
     {
-        .x = DISPLAY_WIDTH,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 0,      
+        .x = DISPLAY_WIDTH,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = 16,    
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 4,      
+        .x = 16,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 1
     },
     {
-        .x = DISPLAY_WIDTH - 16,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(8x8),  
-        .size = SPRITE_SIZE(8x8),  
-        .tileOffset = 8,      
+        .x = DISPLAY_WIDTH - 16,
+        .y = 0,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 8,
         .priority = 1
     }
 };
@@ -521,35 +521,35 @@ static const struct SubspriteTable sUnknown_0832C28C[] =
 static const struct Subsprite sStatusSummaryBar_Subsprites_0[] =
 {
     {
-        .x = 160,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 0,      
+        .x = 160,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = 192,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 4,     
+        .x = 192,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 1
     },
     {
-        .x = 224,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 8,      
+        .x = 224,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 8,
         .priority = 1
     },
     {
-        .x = 0,     
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 12,     
+        .x = 0,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 12,
         .priority = 1
     }
 };
@@ -557,51 +557,51 @@ static const struct Subsprite sStatusSummaryBar_Subsprites_0[] =
 static const struct Subsprite sUnknown_0832C2AC[] =
 {
     {
-        .x = 160,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 0,      
+        .x = 160,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = 192,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 4,      
+        .x = 192,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 1
     },
     {
-        .x = 224,   
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 8,      
+        .x = 224,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 8,
         .priority = 1
     },
     {
-        .x = 0,     
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 8,      
+        .x = 0,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 8,
         .priority = 1
     },
     {
-        .x = 32,    
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 8,      
+        .x = 32,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 8,
         .priority = 1
     },
     {
-        .x = 64,    
-        .y = 0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 12,     
+        .x = 64,
+        .y = 0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 12,
         .priority = 1
     }
 };
@@ -636,7 +636,7 @@ static const struct SpritePalette sStatusSummaryBallsSpritePal =
 
 static const struct SpriteSheet sStatusSummaryBallsSpriteSheet =
 {
-    gBattleInterface_BallDisplayGfx, 0x80, TAG_STATUS_SUMMARY_BALLS_TILE
+    &gHealthboxElementsGfxTable[HEALTHBOX_GFX_STATUS_BALL], 0x80, TAG_STATUS_SUMMARY_BALLS_TILE
 };
 
 // unused oam data
@@ -975,33 +975,33 @@ static void SpriteCB_HealthBar(struct Sprite *sprite)
     switch (sprite->hBar_Data6)
     {
     case 0:
-        sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 16;
-        sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y;
+        sprite->x = gSprites[healthboxSpriteId].x + 16;
+        sprite->y = gSprites[healthboxSpriteId].y;
         break;
     case 1:
-        sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 16;
-        sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y;
+        sprite->x = gSprites[healthboxSpriteId].x + 16;
+        sprite->y = gSprites[healthboxSpriteId].y;
         break;
     case 2:
     default:
-        sprite->pos1.x = gSprites[healthboxSpriteId].pos1.x + 8;
-        sprite->pos1.y = gSprites[healthboxSpriteId].pos1.y;
+        sprite->x = gSprites[healthboxSpriteId].x + 8;
+        sprite->y = gSprites[healthboxSpriteId].y;
         break;
     }
 
-    sprite->pos2.x = gSprites[healthboxSpriteId].pos2.x;
-    sprite->pos2.y = gSprites[healthboxSpriteId].pos2.y;
+    sprite->x2 = gSprites[healthboxSpriteId].x2;
+    sprite->y2 = gSprites[healthboxSpriteId].y2;
 }
 
 static void SpriteCB_HealthBoxOther(struct Sprite *sprite)
 {
     u8 healthboxMainSpriteId = sprite->hOther_HealthBoxSpriteId;
 
-    sprite->pos1.x = gSprites[healthboxMainSpriteId].pos1.x + 64;
-    sprite->pos1.y = gSprites[healthboxMainSpriteId].pos1.y;
+    sprite->x = gSprites[healthboxMainSpriteId].x + 64;
+    sprite->y = gSprites[healthboxMainSpriteId].y;
 
-    sprite->pos2.x = gSprites[healthboxMainSpriteId].pos2.x;
-    sprite->pos2.y = gSprites[healthboxMainSpriteId].pos2.y;
+    sprite->x2 = gSprites[healthboxMainSpriteId].x2;
+    sprite->y2 = gSprites[healthboxMainSpriteId].y2;
 }
 
 void SetBattleBarStruct(u8 battlerId, u8 healthboxSpriteId, s32 maxVal, s32 oldVal, s32 receivedValue)
@@ -1029,8 +1029,8 @@ void SetHealthboxSpriteVisible(u8 healthboxSpriteId)
 
 static void UpdateSpritePos(u8 spriteId, s16 x, s16 y)
 {
-    gSprites[spriteId].pos1.x = x;
-    gSprites[spriteId].pos1.y = y;
+    gSprites[spriteId].x = x;
+    gSprites[spriteId].y = y;
 }
 
 void DestoryHealthboxSprite(u8 healthboxSpriteId)
@@ -1101,7 +1101,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl)
     u8 text[16];
     u32 xPos;
     u8 *objVram;
-    
+
     text[0] = CHAR_EXTRA_SYMBOL;
     text[1] = CHAR_LV_2;
 
@@ -1225,7 +1225,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
                 windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, 0, 5, 0, &windowId);
                 HpTextIntoHealthboxObject((void*)(OBJ_VRAM0) + spriteTileNum + 0xC0, windowTileData, 2);
                 RemoveWindowOnHealthbox(windowId);
-                CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_116),
+                CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END),
                           (void*)(OBJ_VRAM0 + 0x680) + (gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP),
                            0x20);
             }
@@ -1291,7 +1291,7 @@ static void UpdateHpTextInHealthboxInDoubles(u8 healthboxSpriteId, s16 value, u8
             {
                 if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) // Impossible to reach part, because the battlerId is from the opponent's side.
                 {
-                    CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_116),
+                    CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END),
                           (void*)(OBJ_VRAM0) + ((gSprites[healthboxSpriteId].oam.tileNum + 52) * TILE_SIZE_4BPP),
                            0x20);
                 }
@@ -1399,7 +1399,7 @@ void SwapHpBarsWithHpText(void)
                 {
                     UpdateStatusIconInHealthbox(gHealthboxSpriteIds[i]);
                     UpdateHealthboxAttribute(gHealthboxSpriteIds[i], &gPlayerParty[gBattlerPartyIndexes[i]], HEALTHBOX_HEALTH_BAR);
-                    CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_117), (void*)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * TILE_SIZE_4BPP), 32);
+                    CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END_BAR), (void*)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * TILE_SIZE_4BPP), 32);
                 }
             }
             else
@@ -1485,17 +1485,17 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
 
     summaryBarSpriteId = CreateSprite(&sStatusSummaryBarSpriteTemplates[isOpponent], bar_X, bar_Y, 10);
     SetSubspriteTables(&gSprites[summaryBarSpriteId], sStatusSummaryBar_SubspriteTable);
-    gSprites[summaryBarSpriteId].pos2.x = bar_pos2_X;
+    gSprites[summaryBarSpriteId].x2 = bar_pos2_X;
     gSprites[summaryBarSpriteId].data[0] = bar_data0;
 
     if (isOpponent)
     {
-        gSprites[summaryBarSpriteId].pos1.x -= 96;
+        gSprites[summaryBarSpriteId].x -= 96;
         gSprites[summaryBarSpriteId].oam.matrixNum = ST_OAM_HFLIP;
     }
     else
     {
-        gSprites[summaryBarSpriteId].pos1.x += 96;
+        gSprites[summaryBarSpriteId].x += 96;
     }
 
     for (i = 0; i < PARTY_SIZE; i++)
@@ -1507,23 +1507,23 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo,
 
         if (!isOpponent)
         {
-            gSprites[ballIconSpritesIds[i]].pos2.x = 0;
-            gSprites[ballIconSpritesIds[i]].pos2.y = 0;
+            gSprites[ballIconSpritesIds[i]].x2 = 0;
+            gSprites[ballIconSpritesIds[i]].y2 = 0;
         }
 
         gSprites[ballIconSpritesIds[i]].data[0] = summaryBarSpriteId;
 
         if (!isOpponent)
         {
-            gSprites[ballIconSpritesIds[i]].pos1.x += 10 * i + 24;
+            gSprites[ballIconSpritesIds[i]].x += 10 * i + 24;
             gSprites[ballIconSpritesIds[i]].data[1] = i * 7 + 10;
-            gSprites[ballIconSpritesIds[i]].pos2.x = 120;
+            gSprites[ballIconSpritesIds[i]].x2 = 120;
         }
         else
         {
-            gSprites[ballIconSpritesIds[i]].pos1.x -= 10 * (5 - i) + 24;
+            gSprites[ballIconSpritesIds[i]].x -= 10 * (5 - i) + 24;
             gSprites[ballIconSpritesIds[i]].data[1] = (6 - i) * 7 + 10;
-            gSprites[ballIconSpritesIds[i]].pos2.x = -120;
+            gSprites[ballIconSpritesIds[i]].x2 = -120;
         }
 
         gSprites[ballIconSpritesIds[i]].data[2] = isOpponent;
@@ -1793,17 +1793,17 @@ static void sub_8073F98(u8 taskId)
 
 static void SpriteCB_StatusSummaryBar(struct Sprite *sprite)
 {
-    if (sprite->pos2.x != 0)
-        sprite->pos2.x += sprite->data[0];
+    if (sprite->x2 != 0)
+        sprite->x2 += sprite->data[0];
 }
 
 static void sub_8074090(struct Sprite *sprite)
 {
     sprite->data[1] += 32;
     if (sprite->data[0] > 0)
-        sprite->pos2.x += sprite->data[1] >> 4;
+        sprite->x2 += sprite->data[1] >> 4;
     else
-        sprite->pos2.x -= sprite->data[1] >> 4;
+        sprite->x2 -= sprite->data[1] >> 4;
     sprite->data[1] &= 0xF;
 }
 
@@ -1826,18 +1826,18 @@ static void SpriteCB_StatusSummaryBallsOnBattleStart(struct Sprite *sprite)
 
     if (var1 != 0)
     {
-        sprite->pos2.x += var2 >> 4;
-        if (sprite->pos2.x > 0)
-            sprite->pos2.x = 0;
+        sprite->x2 += var2 >> 4;
+        if (sprite->x2 > 0)
+            sprite->x2 = 0;
     }
     else
     {
-        sprite->pos2.x -= var2 >> 4;
-        if (sprite->pos2.x < 0)
-            sprite->pos2.x = 0;
+        sprite->x2 -= var2 >> 4;
+        if (sprite->x2 < 0)
+            sprite->x2 = 0;
     }
 
-    if (sprite->pos2.x == 0)
+    if (sprite->x2 == 0)
     {
         pan = SOUND_PAN_TARGET;
         if (var1 != 0)
@@ -1867,11 +1867,11 @@ static void sub_8074158(struct Sprite *sprite)
     var2 += 56;
     sprite->data[3] = var2 & 0xFFF0;
     if (var1 != 0)
-        sprite->pos2.x += var2 >> 4;
+        sprite->x2 += var2 >> 4;
     else
-        sprite->pos2.x -= var2 >> 4;
-    if (sprite->pos2.x + sprite->pos1.x > 248
-     || sprite->pos2.x + sprite->pos1.x < -8)
+        sprite->x2 -= var2 >> 4;
+    if (sprite->x2 + sprite->x > 248
+     || sprite->x2 + sprite->x < -8)
     {
         sprite->invisible = TRUE;
         sprite->callback = SpriteCallbackDummy;
@@ -1882,8 +1882,8 @@ static void SpriteCB_StatusSummaryBallsOnSwitchout(struct Sprite *sprite)
 {
     u8 barSpriteId = sprite->data[0];
 
-    sprite->pos2.x = gSprites[barSpriteId].pos2.x;
-    sprite->pos2.y = gSprites[barSpriteId].pos2.y;
+    sprite->x2 = gSprites[barSpriteId].x2;
+    sprite->y2 = gSprites[barSpriteId].y2;
 }
 
 static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon)
@@ -1962,7 +1962,7 @@ static void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus)
     healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId;
 
     if (noStatus)
-        CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_70), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32);
+        CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_STATUS_BALL_CAUGHT), (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32);
     else
         CpuFill32(0, (void*)(OBJ_VRAM0 + (gSprites[healthBarSpriteId].oam.tileNum + 8) * TILE_SIZE_4BPP), 32);
 }
diff --git a/src/battle_main.c b/src/battle_main.c
index 7a7283714..1400e712a 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -961,7 +961,7 @@ static void CB2_HandleStartBattle(void)
             ShowBg(1);
             ShowBg(2);
             ShowBg(3);
-            sub_805EF14();
+            FillAroundBattleWindows();
             gBattleCommunication[MULTIUSE_STATE] = 1;
         }
         if (gWirelessCommType)
@@ -1157,7 +1157,7 @@ static void CB2_HandleStartMultiPartnerBattle(void)
             ShowBg(1);
             ShowBg(2);
             ShowBg(3);
-            sub_805EF14();
+            FillAroundBattleWindows();
             gBattleCommunication[MULTIUSE_STATE] = 1;
         }
         if (gWirelessCommType)
@@ -1558,7 +1558,7 @@ static void CB2_HandleStartMultiBattle(void)
             ShowBg(1);
             ShowBg(2);
             ShowBg(3);
-            sub_805EF14();
+            FillAroundBattleWindows();
             gBattleCommunication[MULTIUSE_STATE] = 1;
         }
         if (gWirelessCommType)
@@ -2082,9 +2082,9 @@ void SpriteCB_VsLetterDummy(struct Sprite *sprite)
 static void SpriteCB_VsLetter(struct Sprite *sprite)
 {
     if (sprite->data[0] != 0)
-        sprite->pos1.x = sprite->data[1] + ((sprite->data[2] & 0xFF00) >> 8);
+        sprite->x = sprite->data[1] + ((sprite->data[2] & 0xFF00) >> 8);
     else
-        sprite->pos1.x = sprite->data[1] - ((sprite->data[2] & 0xFF00) >> 8);
+        sprite->x = sprite->data[1] - ((sprite->data[2] & 0xFF00) >> 8);
 
     sprite->data[2] += 0x180;
 
@@ -2150,7 +2150,7 @@ void CB2_InitEndLinkBattle(void)
 
     SetHBlankCallback(NULL);
     SetVBlankCallback(NULL);
-    gBattleTypeFlags &= ~(BATTLE_TYPE_LINK_IN_BATTLE);
+    gBattleTypeFlags &= ~BATTLE_TYPE_LINK_IN_BATTLE;
 
     if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER)
     {
@@ -2618,8 +2618,8 @@ static void SpriteCb_MoveWildMonToRight(struct Sprite *sprite)
 {
     if ((gIntroSlideFlags & 1) == 0)
     {
-        sprite->pos2.x += 2;
-        if (sprite->pos2.x == 0)
+        sprite->x2 += 2;
+        if (sprite->x2 == 0)
         {
             sprite->callback = SpriteCb_WildMonShowHealthbox;
         }
@@ -2730,7 +2730,7 @@ static void SpriteCB_AnimFaintOpponent(struct Sprite *sprite)
     if (--sprite->data[4] == 0)
     {
         sprite->data[4] = 2;
-        sprite->pos2.y += 8; // Move the sprite down.
+        sprite->y2 += 8; // Move the sprite down.
         if (--sprite->data[3] < 0)
         {
             FreeSpriteOamMatrix(sprite);
@@ -2795,8 +2795,8 @@ static void SpriteCB_BattleSpriteSlideLeft(struct Sprite *sprite)
 {
     if (!(gIntroSlideFlags & 1))
     {
-        sprite->pos2.x -= 2;
-        if (sprite->pos2.x == 0)
+        sprite->x2 -= 2;
+        if (sprite->x2 == 0)
         {
             sprite->callback = SpriteCallbackDummy_3;
             sprite->data[1] = 0;
@@ -2821,8 +2821,8 @@ void SpriteCB_FaintSlideAnim(struct Sprite *sprite)
 {
     if (!(gIntroSlideFlags & 1))
     {
-        sprite->pos2.x += sprite->sSpeedX;
-        sprite->pos2.y += sprite->sSpeedY;
+        sprite->x2 += sprite->sSpeedX;
+        sprite->y2 += sprite->sSpeedY;
     }
 }
 
@@ -2872,8 +2872,8 @@ void DoBounceEffect(u8 battler, u8 which, s8 delta, s8 amplitude)
     gSprites[invisibleSpriteId].sAmplitude = amplitude;
     gSprites[invisibleSpriteId].sBouncerSpriteId = bouncerSpriteId;
     gSprites[invisibleSpriteId].sWhich = which;
-    gSprites[bouncerSpriteId].pos2.x = 0;
-    gSprites[bouncerSpriteId].pos2.y = 0;
+    gSprites[bouncerSpriteId].x2 = 0;
+    gSprites[bouncerSpriteId].y2 = 0;
 }
 
 void EndBounceEffect(u8 battler, u8 which)
@@ -2899,8 +2899,8 @@ void EndBounceEffect(u8 battler, u8 which)
         gBattleSpritesDataPtr->healthBoxesData[battler].battlerIsBouncing = 0;
     }
 
-    gSprites[bouncerSpriteId].pos2.x = 0;
-    gSprites[bouncerSpriteId].pos2.y = 0;
+    gSprites[bouncerSpriteId].x2 = 0;
+    gSprites[bouncerSpriteId].y2 = 0;
 }
 
 static void SpriteCB_BounceEffect(struct Sprite *sprite)
@@ -2913,7 +2913,7 @@ static void SpriteCB_BounceEffect(struct Sprite *sprite)
     else
         index = sprite->sSinIndex;
 
-    gSprites[bouncerSpriteId].pos2.y = Sin(index, sprite->sAmplitude) + sprite->sAmplitude;
+    gSprites[bouncerSpriteId].y2 = Sin(index, sprite->sAmplitude) + sprite->sAmplitude;
     sprite->sSinIndex = (sprite->sSinIndex + sprite->sDelta) & 0xFF;
 }
 
@@ -3116,7 +3116,7 @@ void SwitchInClearSetData(void)
              && (gStatuses3[i] & STATUS3_ALWAYS_HITS) != 0
              && (gDisableStructs[i].battlerWithSureHit == gActiveBattler))
             {
-                gStatuses3[i] &= ~(STATUS3_ALWAYS_HITS);
+                gStatuses3[i] &= ~STATUS3_ALWAYS_HITS;
                 gStatuses3[i] |= STATUS3_ALWAYS_HITS_TURN(2);
             }
         }
@@ -3130,9 +3130,9 @@ void SwitchInClearSetData(void)
     for (i = 0; i < gBattlersCount; i++)
     {
         if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBattler))
-            gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBattler));
+            gBattleMons[i].status2 &= ~STATUS2_INFATUATED_WITH(gActiveBattler);
         if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && *(gBattleStruct->wrappedBy + i) == gActiveBattler)
-            gBattleMons[i].status2 &= ~(STATUS2_WRAPPED);
+            gBattleMons[i].status2 &= ~STATUS2_WRAPPED;
     }
 
     gActionSelectionCursor[gActiveBattler] = 0;
@@ -3212,9 +3212,9 @@ void FaintClearSetData(void)
         if ((gBattleMons[i].status2 & STATUS2_ESCAPE_PREVENTION) && gDisableStructs[i].battlerPreventingEscape == gActiveBattler)
             gBattleMons[i].status2 &= ~STATUS2_ESCAPE_PREVENTION;
         if (gBattleMons[i].status2 & STATUS2_INFATUATED_WITH(gActiveBattler))
-            gBattleMons[i].status2 &= ~(STATUS2_INFATUATED_WITH(gActiveBattler));
+            gBattleMons[i].status2 &= ~STATUS2_INFATUATED_WITH(gActiveBattler);
         if ((gBattleMons[i].status2 & STATUS2_WRAPPED) && *(gBattleStruct->wrappedBy + i) == gActiveBattler)
-            gBattleMons[i].status2 &= ~(STATUS2_WRAPPED);
+            gBattleMons[i].status2 &= ~STATUS2_WRAPPED;
     }
 
     gActionSelectionCursor[gActiveBattler] = 0;
@@ -3821,7 +3821,7 @@ static void TryDoEventsBeforeFirstTurn(void)
         gBattleCommunication[i] = 0;
 
     for (i = 0; i < gBattlersCount; i++)
-        gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
+        gBattleMons[i].status2 &= ~STATUS2_FLINCHED;
 
     *(&gBattleStruct->turnEffectsTracker) = 0;
     *(&gBattleStruct->turnEffectsBattlerId) = 0;
@@ -3852,7 +3852,7 @@ static void HandleEndTurn_ContinueBattle(void)
             gBattleCommunication[i] = 0;
         for (i = 0; i < gBattlersCount; i++)
         {
-            gBattleMons[i].status2 &= ~(STATUS2_FLINCHED);
+            gBattleMons[i].status2 &= ~STATUS2_FLINCHED;
             if ((gBattleMons[i].status1 & STATUS1_SLEEP) && (gBattleMons[i].status2 & STATUS2_MULTIPLETURNS))
                 CancelMultiTurnMoves(i);
         }
@@ -3884,10 +3884,10 @@ void BattleTurnPassed(void)
         return;
 
     TurnValuesCleanUp(FALSE);
-    gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
-    gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
-    gHitMarker &= ~(HITMARKER_x400000);
-    gHitMarker &= ~(HITMARKER_x100000);
+    gHitMarker &= ~HITMARKER_NO_ATTACKSTRING;
+    gHitMarker &= ~HITMARKER_UNABLE_TO_USE_MOVE;
+    gHitMarker &= ~HITMARKER_PLAYER_FAINTED;
+    gHitMarker &= ~HITMARKER_PASSIVE_DAMAGE;
     gBattleScripting.animTurn = 0;
     gBattleScripting.animTargetsHit = 0;
     gBattleScripting.moveendState = 0;
@@ -4374,10 +4374,10 @@ static void HandleTurnActionSelectionState(void)
             }
             break;
         case STATE_WAIT_ACTION_CONFIRMED_STANDBY:
-            if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler]) 
+            if (!(gBattleControllerExecFlags & ((gBitTable[gActiveBattler])
                                                 | (0xF << 28)
-                                                | (gBitTable[gActiveBattler] << 4) 
-                                                | (gBitTable[gActiveBattler] << 8) 
+                                                | (gBitTable[gActiveBattler] << 4)
+                                                | (gBitTable[gActiveBattler] << 8)
                                                 | (gBitTable[gActiveBattler] << 12))))
             {
                 if (AllAtActionConfirmed())
@@ -4525,14 +4525,14 @@ u8 GetWhoStrikesFirst(u8 battler1, u8 battler2, bool8 ignoreChosenMoves)
 
     if (WEATHER_HAS_EFFECT)
     {
-        if ((gBattleMons[battler1].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY)
-            || (gBattleMons[battler1].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY))
+        if ((gBattleMons[battler1].ability == ABILITY_SWIFT_SWIM && gBattleWeather & B_WEATHER_RAIN)
+            || (gBattleMons[battler1].ability == ABILITY_CHLOROPHYLL && gBattleWeather & B_WEATHER_SUN))
             speedMultiplierBattler1 = 2;
         else
             speedMultiplierBattler1 = 1;
 
-        if ((gBattleMons[battler2].ability == ABILITY_SWIFT_SWIM && gBattleWeather & WEATHER_RAIN_ANY)
-            || (gBattleMons[battler2].ability == ABILITY_CHLOROPHYLL && gBattleWeather & WEATHER_SUN_ANY))
+        if ((gBattleMons[battler2].ability == ABILITY_SWIFT_SWIM && gBattleWeather & B_WEATHER_RAIN)
+            || (gBattleMons[battler2].ability == ABILITY_CHLOROPHYLL && gBattleWeather & B_WEATHER_SUN))
             speedMultiplierBattler2 = 2;
         else
             speedMultiplierBattler2 = 1;
@@ -4795,12 +4795,12 @@ static void TurnValuesCleanUp(bool8 var0)
             {
                 gDisableStructs[gActiveBattler].rechargeTimer--;
                 if (gDisableStructs[gActiveBattler].rechargeTimer == 0)
-                    gBattleMons[gActiveBattler].status2 &= ~(STATUS2_RECHARGE);
+                    gBattleMons[gActiveBattler].status2 &= ~STATUS2_RECHARGE;
             }
         }
 
         if (gDisableStructs[gActiveBattler].substituteHP == 0)
-            gBattleMons[gActiveBattler].status2 &= ~(STATUS2_SUBSTITUTE);
+            gBattleMons[gActiveBattler].status2 &= ~STATUS2_SUBSTITUTE;
     }
 
     gSideTimers[0].followmeTimer = 0;
@@ -4860,15 +4860,15 @@ static void RunTurnActionsFunctions(void)
 
     if (gCurrentTurnActionNumber >= gBattlersCount) // everyone did their actions, turn finished
     {
-        gHitMarker &= ~(HITMARKER_x100000);
+        gHitMarker &= ~HITMARKER_PASSIVE_DAMAGE;
         gBattleMainFunc = sEndTurnFuncsTable[gBattleOutcome & 0x7F];
     }
     else
     {
         if (gBattleStruct->savedTurnActionNumber != gCurrentTurnActionNumber) // action turn has been done, clear hitmarker bits for another battlerId
         {
-            gHitMarker &= ~(HITMARKER_NO_ATTACKSTRING);
-            gHitMarker &= ~(HITMARKER_UNABLE_TO_USE_MOVE);
+            gHitMarker &= ~HITMARKER_NO_ATTACKSTRING;
+            gHitMarker &= ~HITMARKER_UNABLE_TO_USE_MOVE;
         }
     }
 }
@@ -4883,7 +4883,7 @@ static void HandleEndTurn_BattleWon(void)
         gBattleTextBuff1[0] = gBattleOutcome;
         gBattlerAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
         gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
-        gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
+        gBattleOutcome &= ~B_OUTCOME_LINK_BATTLE_RAN;
     }
     else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER
             && gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_TRAINER_HILL | BATTLE_TYPE_EREADER_TRAINER))
@@ -4942,13 +4942,13 @@ static void HandleEndTurn_BattleLost(void)
             if (gBattleOutcome & B_OUTCOME_LINK_BATTLE_RAN)
             {
                 gBattlescriptCurrInstr = BattleScript_PrintPlayerForfeitedLinkBattle;
-                gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
+                gBattleOutcome &= ~B_OUTCOME_LINK_BATTLE_RAN;
                 gSaveBlock2Ptr->frontier.disableRecordBattle = TRUE;
             }
             else
             {
                 gBattlescriptCurrInstr = BattleScript_FrontierLinkBattleLost;
-                gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
+                gBattleOutcome &= ~B_OUTCOME_LINK_BATTLE_RAN;
             }
         }
         else
@@ -4956,7 +4956,7 @@ static void HandleEndTurn_BattleLost(void)
             gBattleTextBuff1[0] = gBattleOutcome;
             gBattlerAttacker = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
             gBattlescriptCurrInstr = BattleScript_LinkBattleWonOrLost;
-            gBattleOutcome &= ~(B_OUTCOME_LINK_BATTLE_RAN);
+            gBattleOutcome &= ~B_OUTCOME_LINK_BATTLE_RAN;
         }
     }
     else
diff --git a/src/battle_message.c b/src/battle_message.c
index ae30a2a62..1f4bd893f 100644
--- a/src/battle_message.c
+++ b/src/battle_message.c
@@ -1390,9 +1390,9 @@ static const u8 sText_PkmnEagerForMore[] = _("{B_SCR_ACTIVE_NAME_WITH_PREFIX} is
 
 const u16 gBattlePalaceFlavorTextTable[] =
 {
-    [B_MSG_GLINT_IN_EYE]   = STRINGID_GLINTAPPEARSINEYE, 
+    [B_MSG_GLINT_IN_EYE]   = STRINGID_GLINTAPPEARSINEYE,
     [B_MSG_GETTING_IN_POS] = STRINGID_PKMNGETTINGINTOPOSITION,
-    [B_MSG_GROWL_DEEPLY]   = STRINGID_PKMNBEGANGROWLINGDEEPLY, 
+    [B_MSG_GROWL_DEEPLY]   = STRINGID_PKMNBEGANGROWLINGDEEPLY,
     [B_MSG_EAGER_FOR_MORE] = STRINGID_PKMNEAGERFORMORE,
 };
 
diff --git a/src/battle_palace.c b/src/battle_palace.c
index 633666254..c4e48a4b2 100644
--- a/src/battle_palace.c
+++ b/src/battle_palace.c
@@ -40,26 +40,26 @@ static void (* const sBattlePalaceFunctions[])(void) =
     [BATTLE_PALACE_FUNC_GIVE_PRIZE]         = GivePalacePrize,
 };
 
-static const u16 sBattlePalaceEarlyPrizes[] = 
+static const u16 sBattlePalaceEarlyPrizes[] =
 {
-    ITEM_HP_UP, 
-    ITEM_PROTEIN, 
-    ITEM_IRON, 
-    ITEM_CALCIUM, 
-    ITEM_CARBOS, 
+    ITEM_HP_UP,
+    ITEM_PROTEIN,
+    ITEM_IRON,
+    ITEM_CALCIUM,
+    ITEM_CARBOS,
     ITEM_ZINC
 };
 
-static const u16 sBattlePalaceLatePrizes[] = 
+static const u16 sBattlePalaceLatePrizes[] =
 {
-    ITEM_BRIGHT_POWDER, 
-    ITEM_WHITE_HERB, 
-    ITEM_QUICK_CLAW, 
-    ITEM_LEFTOVERS, 
-    ITEM_MENTAL_HERB, 
-    ITEM_KINGS_ROCK, 
-    ITEM_FOCUS_BAND, 
-    ITEM_SCOPE_LENS, 
+    ITEM_BRIGHT_POWDER,
+    ITEM_WHITE_HERB,
+    ITEM_QUICK_CLAW,
+    ITEM_LEFTOVERS,
+    ITEM_MENTAL_HERB,
+    ITEM_KINGS_ROCK,
+    ITEM_FOCUS_BAND,
+    ITEM_SCOPE_LENS,
     ITEM_CHOICE_BAND
 };
 
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index 095cd2bdf..179f4dc65 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -411,20 +411,20 @@ static void Task_ChooseItemsToTossFromPyramidBag(u8 taskId)
 
 void CB2_ReturnToPyramidBagMenu(void)
 {
-    GoToBattlePyramidBagMenu(PYRAMIDBAG_LOC_PREV, gPyramidBagMenuState.callback);
+    GoToBattlePyramidBagMenu(PYRAMIDBAG_LOC_PREV, gPyramidBagMenuState.exitCallback);
 }
 
-void GoToBattlePyramidBagMenu(u8 location, void (*callback)(void))
+void GoToBattlePyramidBagMenu(u8 location, void (*exitCallback)(void))
 {
     gPyramidBagMenu = AllocZeroed(sizeof(*gPyramidBagMenu));
 
     if (location != PYRAMIDBAG_LOC_PREV)
         gPyramidBagMenuState.location = location;
 
-    if (callback != NULL)
-        gPyramidBagMenuState.callback = callback;
+    if (exitCallback != NULL)
+        gPyramidBagMenuState.exitCallback = exitCallback;
 
-    gPyramidBagMenu->exitCallback = NULL;
+    gPyramidBagMenu->newScreenCallback = NULL;
     gPyramidBagMenu->toSwapPos = POS_NONE;
     gPyramidBagMenu->scrollIndicatorsTaskId = TASK_NONE;
 
@@ -452,8 +452,8 @@ static void VBlankCB_PyramidBag(void)
 
 static void CB2_LoadPyramidBagMenu(void)
 {
-    while (MenuHelpers_CallLinkSomething() != TRUE 
-        && LoadPyramidBagMenu() != TRUE 
+    while (MenuHelpers_CallLinkSomething() != TRUE
+        && LoadPyramidBagMenu() != TRUE
         && MenuHelpers_LinkSomething() != TRUE);
 }
 
@@ -624,7 +624,7 @@ static void CopyBagItemName(u8 *dst, u16 itemId)
     {
         ConvertIntToDecimalStringN(gStringVar1, ITEM_TO_BERRY(itemId), STR_CONV_MODE_LEADING_ZEROS, 2);
         CopyItemName(itemId, gStringVar2);
-        StringExpandPlaceholders(dst, gText_NumberVar1Clear7Var2);
+        StringExpandPlaceholders(dst, gText_NumberItem_TMBerry);
     }
     else
     {
@@ -696,9 +696,9 @@ static void PrintItemDescription(s32 listMenuId)
 static void AddScrollArrows(void)
 {
     if (gPyramidBagMenu->scrollIndicatorsTaskId == TASK_NONE)
-        gPyramidBagMenu->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 172, 12, 148, 
-                                                                                            gPyramidBagMenu->listMenuCount - gPyramidBagMenu->listMenuMaxShown, 
-                                                                                            TAG_SCROLL_ARROW, TAG_SCROLL_ARROW, 
+        gPyramidBagMenu->scrollIndicatorsTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 172, 12, 148,
+                                                                                            gPyramidBagMenu->listMenuCount - gPyramidBagMenu->listMenuMaxShown,
+                                                                                            TAG_SCROLL_ARROW, TAG_SCROLL_ARROW,
                                                                                             &gPyramidBagMenuState.scrollPosition);
 }
 
@@ -866,10 +866,13 @@ static void Task_ClosePyramidBag(u8 taskId)
     if (!gPaletteFade.active)
     {
         DestroyListMenuTask(tListTaskId, &gPyramidBagMenuState.scrollPosition, &gPyramidBagMenuState.cursorPosition);
-        if (gPyramidBagMenu->exitCallback != NULL)
-            SetMainCallback2(gPyramidBagMenu->exitCallback);
+
+        // If ready for a new screen (e.g. party menu for giving an item) go to that screen
+        // Otherwise exit the bag and use callback set up when the bag was first opened
+        if (gPyramidBagMenu->newScreenCallback != NULL)
+            SetMainCallback2(gPyramidBagMenu->newScreenCallback);
         else
-            SetMainCallback2(gPyramidBagMenuState.callback);
+            SetMainCallback2(gPyramidBagMenuState.exitCallback);
         RemoveScrollArrow();
         ResetSpriteData();
         FreeAllSpritePalettes();
@@ -934,7 +937,7 @@ static void OpenContextMenu(u8 taskId)
     {
     default:
 //  case PYRAMIDBAG_LOC_FIELD:
-//  case PYRAMIDBAG_LOC_PARTY:    
+//  case PYRAMIDBAG_LOC_PARTY:
         gPyramidBagMenu->menuActionIds = sMenuActionIds_Field;
         gPyramidBagMenu->menuActionsCount = ARRAY_COUNT(sMenuActionIds_Field);
         break;
@@ -1249,7 +1252,7 @@ static void BagAction_Give(u8 taskId)
     }
     else if (!ItemId_GetImportance(gSpecialVar_ItemId))
     {
-        gPyramidBagMenu->exitCallback = CB2_ChooseMonToGiveItem;
+        gPyramidBagMenu->newScreenCallback = CB2_ChooseMonToGiveItem;
         CloseBattlePyramidBag(taskId);
     }
     else
@@ -1582,8 +1585,8 @@ static void ShowItemIcon(u16 itemId, bool8 isAlt)
         if (itemSpriteId != MAX_SPRITES)
         {
             *spriteId = itemSpriteId;
-            gSprites[itemSpriteId].pos2.x = 24;
-            gSprites[itemSpriteId].pos2.y = 88;
+            gSprites[itemSpriteId].x2 = 24;
+            gSprites[itemSpriteId].y2 = 88;
         }
     }
 }
@@ -1605,5 +1608,5 @@ static void SetSwapLineInvisibility(bool8 invisible)
 
 static void UpdateSwapLinePos(u8 y)
 {
-    UpdateSwapLineSpritesPos(&gPyramidBagMenu->spriteIds[PBAG_SPRITE_SWAP_LINE_START], NUM_SWAP_LINE_SPRITES | 0x80, 120, (y + 1) * 16);
+    UpdateSwapLineSpritesPos(&gPyramidBagMenu->spriteIds[PBAG_SPRITE_SWAP_LINE_START], NUM_SWAP_LINE_SPRITES | SWAP_LINE_HAS_MARGIN, 120, (y + 1) * 16);
 }
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index d927ffb76..e7520b1ee 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -833,9 +833,9 @@ static const u8 sTerrainToType[] =
 // - ITEM_ULTRA_BALL skips Master Ball and ITEM_NONE
 static const u8 sBallCatchBonuses[] =
 {
-    [ITEM_ULTRA_BALL - ITEM_ULTRA_BALL]  = 20, 
-    [ITEM_GREAT_BALL - ITEM_ULTRA_BALL]  = 15, 
-    [ITEM_POKE_BALL - ITEM_ULTRA_BALL]   = 10, 
+    [ITEM_ULTRA_BALL - ITEM_ULTRA_BALL]  = 20,
+    [ITEM_GREAT_BALL - ITEM_ULTRA_BALL]  = 15,
+    [ITEM_POKE_BALL - ITEM_ULTRA_BALL]   = 10,
     [ITEM_SAFARI_BALL - ITEM_ULTRA_BALL] = 15
 };
 
@@ -924,7 +924,7 @@ static void Cmd_attackcanceler(void)
         return;
     if (AbilityBattleEffects(ABILITYEFFECT_MOVES_BLOCK, gBattlerTarget, 0, 0, 0))
         return;
-    if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & (HITMARKER_x800000 | HITMARKER_NO_ATTACKSTRING))
+    if (!gBattleMons[gBattlerAttacker].pp[gCurrMovePos] && gCurrentMove != MOVE_STRUGGLE && !(gHitMarker & (HITMARKER_ALLOW_NO_PP | HITMARKER_NO_ATTACKSTRING))
      && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
         gBattlescriptCurrInstr = BattleScript_NoPPForMove;
@@ -932,7 +932,7 @@ static void Cmd_attackcanceler(void)
         return;
     }
 
-    gHitMarker &= ~(HITMARKER_x800000);
+    gHitMarker &= ~HITMARKER_ALLOW_NO_PP;
 
     if (!(gHitMarker & HITMARKER_OBEYS) && !(gBattleMons[gBattlerAttacker].status2 & STATUS2_MULTIPLETURNS))
     {
@@ -1079,7 +1079,7 @@ static bool8 AccuracyCalcHelper(u16 move)
 
     gHitMarker &= ~HITMARKER_IGNORE_UNDERWATER;
 
-    if ((WEATHER_HAS_EFFECT && (gBattleWeather & WEATHER_RAIN_ANY) && gBattleMoves[move].effect == EFFECT_THUNDER)
+    if ((WEATHER_HAS_EFFECT && (gBattleWeather & B_WEATHER_RAIN) && gBattleMoves[move].effect == EFFECT_THUNDER)
      || (gBattleMoves[move].effect == EFFECT_ALWAYS_HIT || gBattleMoves[move].effect == EFFECT_VITAL_THROW))
     {
         JumpIfMoveFailed(7, move);
@@ -1136,7 +1136,7 @@ static void Cmd_accuracycheck(void)
 
         moveAcc = gBattleMoves[move].accuracy;
         // check Thunder on sunny weather
-        if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY && gBattleMoves[move].effect == EFFECT_THUNDER)
+        if (WEATHER_HAS_EFFECT && gBattleWeather & B_WEATHER_SUN && gBattleMoves[move].effect == EFFECT_THUNDER)
             moveAcc = 50;
 
         calc = sAccuracyStageRatios[buff].dividend * moveAcc;
@@ -1144,7 +1144,7 @@ static void Cmd_accuracycheck(void)
 
         if (gBattleMons[gBattlerAttacker].ability == ABILITY_COMPOUND_EYES)
             calc = (calc * 130) / 100; // 1.3 compound eyes boost
-        if (WEATHER_HAS_EFFECT && gBattleMons[gBattlerTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & WEATHER_SANDSTORM_ANY)
+        if (WEATHER_HAS_EFFECT && gBattleMons[gBattlerTarget].ability == ABILITY_SAND_VEIL && gBattleWeather & B_WEATHER_SANDSTORM)
             calc = (calc * 80) / 100; // 1.2 sand veil loss
         if (gBattleMons[gBattlerAttacker].ability == ABILITY_HUSTLE && IS_TYPE_PHYSICAL(type))
             calc = (calc * 80) / 100; // 1.2 hustle loss
@@ -1237,7 +1237,7 @@ static void Cmd_ppreduce(void)
         }
     }
 
-    gHitMarker &= ~(HITMARKER_NO_PPDEDUCT);
+    gHitMarker &= ~HITMARKER_NO_PPDEDUCT;
     gBattlescriptCurrInstr++;
 }
 
@@ -1869,7 +1869,7 @@ static void Cmd_datahpupdate(void)
         }
         else
         {
-            gHitMarker &= ~(HITMARKER_IGNORE_SUBSTITUTE);
+            gHitMarker &= ~HITMARKER_IGNORE_SUBSTITUTE;
             if (gBattleMoveDamage < 0) // hp goes up
             {
                 gBattleMons[gActiveBattler].hp -= gBattleMoveDamage;
@@ -1879,9 +1879,9 @@ static void Cmd_datahpupdate(void)
             }
             else // hp goes down
             {
-                if (gHitMarker & HITMARKER_x20)
+                if (gHitMarker & HITMARKER_SKIP_DMG_TRACK)
                 {
-                    gHitMarker &= ~(HITMARKER_x20);
+                    gHitMarker &= ~HITMARKER_SKIP_DMG_TRACK;
                 }
                 else
                 {
@@ -1903,10 +1903,10 @@ static void Cmd_datahpupdate(void)
                     gBattleMons[gActiveBattler].hp = 0;
                 }
 
-                if (!gSpecialStatuses[gActiveBattler].dmg && !(gHitMarker & HITMARKER_x100000))
+                if (!gSpecialStatuses[gActiveBattler].dmg && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE))
                     gSpecialStatuses[gActiveBattler].dmg = gHpDealt;
 
-                if (IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000) && gCurrentMove != MOVE_PAIN_SPLIT)
+                if (IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE) && gCurrentMove != MOVE_PAIN_SPLIT)
                 {
                     gProtectStructs[gActiveBattler].physicalDmg = gHpDealt;
                     gSpecialStatuses[gActiveBattler].physicalDmg = gHpDealt;
@@ -1921,7 +1921,7 @@ static void Cmd_datahpupdate(void)
                         gSpecialStatuses[gActiveBattler].physicalBattlerId = gBattlerTarget;
                     }
                 }
-                else if (!IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_x100000))
+                else if (!IS_TYPE_PHYSICAL(moveType) && !(gHitMarker & HITMARKER_PASSIVE_DAMAGE))
                 {
                     gProtectStructs[gActiveBattler].specialDmg = gHpDealt;
                     gSpecialStatuses[gActiveBattler].specialDmg = gHpDealt;
@@ -1937,7 +1937,7 @@ static void Cmd_datahpupdate(void)
                     }
                 }
             }
-            gHitMarker &= ~(HITMARKER_x100000);
+            gHitMarker &= ~HITMARKER_PASSIVE_DAMAGE;
             BtlController_EmitSetMonData(0, REQUEST_HP_BATTLE, 0, 2, &gBattleMons[gActiveBattler].hp);
             MarkBattlerForControllerExec(gActiveBattler);
         }
@@ -1972,7 +1972,7 @@ static void Cmd_effectivenesssound(void)
     gActiveBattler = gBattlerTarget;
     if (!(gMoveResultFlags & MOVE_RESULT_MISSED))
     {
-        switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED)))
+        switch (gMoveResultFlags & (u8)(~MOVE_RESULT_MISSED))
         {
         case MOVE_RESULT_SUPER_EFFECTIVE:
             BtlController_EmitPlaySE(0, SE_SUPER_EFFECTIVE);
@@ -2026,7 +2026,7 @@ static void Cmd_resultmessage(void)
     else
     {
         gBattleCommunication[MSG_DISPLAY] = 1;
-        switch (gMoveResultFlags & (u8)(~(MOVE_RESULT_MISSED)))
+        switch (gMoveResultFlags & (u8)(~MOVE_RESULT_MISSED))
         {
         case MOVE_RESULT_SUPER_EFFECTIVE:
             stringId = STRINGID_SUPEREFFECTIVE;
@@ -2060,9 +2060,9 @@ static void Cmd_resultmessage(void)
             }
             else if (gMoveResultFlags & MOVE_RESULT_ONE_HIT_KO)
             {
-                gMoveResultFlags &= ~(MOVE_RESULT_ONE_HIT_KO);
-                gMoveResultFlags &= ~(MOVE_RESULT_SUPER_EFFECTIVE);
-                gMoveResultFlags &= ~(MOVE_RESULT_NOT_VERY_EFFECTIVE);
+                gMoveResultFlags &= ~MOVE_RESULT_ONE_HIT_KO;
+                gMoveResultFlags &= ~MOVE_RESULT_SUPER_EFFECTIVE;
+                gMoveResultFlags &= ~MOVE_RESULT_NOT_VERY_EFFECTIVE;
                 BattleScriptPushCursor();
                 gBattlescriptCurrInstr = BattleScript_OneHitKOMsg;
                 return;
@@ -2206,7 +2206,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
     if (gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_AFFECTS_USER)
     {
         gEffectBattler = gBattlerAttacker; // battlerId that effects get applied on
-        gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_AFFECTS_USER);
+        gBattleCommunication[MOVE_EFFECT_BYTE] &= ~MOVE_EFFECT_AFFECTS_USER;
         affectsUser = MOVE_EFFECT_AFFECTS_USER;
         gBattleScripting.battler = gBattlerTarget; // theoretically the attacker
     }
@@ -2273,7 +2273,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
                 {
                     gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_ABILITY_STATUS;
-                    gHitMarker &= ~(HITMARKER_IGNORE_SAFEGUARD);
+                    gHitMarker &= ~HITMARKER_IGNORE_SAFEGUARD;
                 }
                 else
                 {
@@ -2314,7 +2314,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
                 {
                     gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_ABILITY_STATUS;
-                    gHitMarker &= ~(HITMARKER_IGNORE_SAFEGUARD);
+                    gHitMarker &= ~HITMARKER_IGNORE_SAFEGUARD;
                 }
                 else
                 {
@@ -2342,7 +2342,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
             statusChanged = TRUE;
             break;
         case STATUS1_FREEZE:
-            if (WEATHER_HAS_EFFECT && gBattleWeather & WEATHER_SUN_ANY)
+            if (WEATHER_HAS_EFFECT && gBattleWeather & B_WEATHER_SUN)
                 noSunCanFreeze = FALSE;
             if (IS_BATTLER_OF_TYPE(gEffectBattler, TYPE_ICE))
                 break;
@@ -2370,7 +2370,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                     if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
                     {
                         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_ABILITY_STATUS;
-                        gHitMarker &= ~(HITMARKER_IGNORE_SAFEGUARD);
+                        gHitMarker &= ~HITMARKER_IGNORE_SAFEGUARD;
                     }
                     else
                     {
@@ -2398,7 +2398,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
                 {
                     gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_ABILITY_PREVENTS_ABILITY_STATUS;
-                    gHitMarker &= ~(HITMARKER_IGNORE_SAFEGUARD);
+                    gHitMarker &= ~HITMARKER_IGNORE_SAFEGUARD;
                 }
                 else
                 {
@@ -2424,8 +2424,8 @@ void SetMoveEffect(bool8 primary, u8 certain)
                     break;
 
                 // It's redundant, because at this point we know the status1 value is 0.
-                gBattleMons[gEffectBattler].status1 &= ~(STATUS1_TOXIC_POISON);
-                gBattleMons[gEffectBattler].status1 &= ~(STATUS1_POISON);
+                gBattleMons[gEffectBattler].status1 &= ~STATUS1_TOXIC_POISON;
+                gBattleMons[gEffectBattler].status1 &= ~STATUS1_POISON;
                 statusChanged = TRUE;
                 break;
             }
@@ -2453,7 +2453,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
             if (gHitMarker & HITMARKER_IGNORE_SAFEGUARD)
             {
                 gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STATUSED_BY_ABILITY;
-                gHitMarker &= ~(HITMARKER_IGNORE_SAFEGUARD);
+                gHitMarker &= ~HITMARKER_IGNORE_SAFEGUARD;
             }
             else
             {
@@ -2790,7 +2790,7 @@ void SetMoveEffect(bool8 primary, u8 certain)
                 }
                 else
                 {
-                    gBattleMons[gBattlerTarget].status1 &= ~(STATUS1_PARALYSIS);
+                    gBattleMons[gBattlerTarget].status1 &= ~STATUS1_PARALYSIS;
 
                     gActiveBattler = gBattlerTarget;
                     BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gActiveBattler].status1);
@@ -2881,7 +2881,7 @@ static void Cmd_seteffectwithchance(void)
     if (gBattleCommunication[MOVE_EFFECT_BYTE] & MOVE_EFFECT_CERTAIN
         && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT))
     {
-        gBattleCommunication[MOVE_EFFECT_BYTE] &= ~(MOVE_EFFECT_CERTAIN);
+        gBattleCommunication[MOVE_EFFECT_BYTE] &= ~MOVE_EFFECT_CERTAIN;
         SetMoveEffect(FALSE, MOVE_EFFECT_CERTAIN);
     }
     else if (Random() % 100 < percentChance
@@ -2939,7 +2939,7 @@ static void Cmd_tryfaintmon(void)
 
             BattleScriptPop();
             gBattlescriptCurrInstr = BS_ptr;
-            gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
+            gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~SIDE_STATUS_SPIKES_DAMAGED;
         }
         else
         {
@@ -2970,7 +2970,7 @@ static void Cmd_tryfaintmon(void)
             gBattlescriptCurrInstr = BS_ptr;
             if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER)
             {
-                gHitMarker |= HITMARKER_x400000;
+                gHitMarker |= HITMARKER_PLAYER_FAINTED;
                 if (gBattleResults.playerFaintCounter < 0xFF)
                     gBattleResults.playerFaintCounter++;
                 AdjustFriendshipOnBattleFaint(gActiveBattler);
@@ -2983,7 +2983,7 @@ static void Cmd_tryfaintmon(void)
             }
             if ((gHitMarker & HITMARKER_DESTINYBOND) && gBattleMons[gBattlerAttacker].hp != 0)
             {
-                gHitMarker &= ~(HITMARKER_DESTINYBOND);
+                gHitMarker &= ~HITMARKER_DESTINYBOND;
                 BattleScriptPush(gBattlescriptCurrInstr);
                 gBattleMoveDamage = gBattleMons[battlerId].hp;
                 gBattlescriptCurrInstr = BattleScript_DestinyBondTakesLife;
@@ -3519,7 +3519,7 @@ static void Cmd_unknown_24(void)
 
     if (HP_count == 0)
         gBattleOutcome |= B_OUTCOME_LOST;
-    
+
     HP_count = 0;
 
     for (i = 0; i < PARTY_SIZE; i++)
@@ -3544,7 +3544,7 @@ static void Cmd_unknown_24(void)
             if ((gHitMarker & HITMARKER_FAINTED2(i)) && (!gSpecialStatuses[i].flag40))
                 foundPlayer++;
         }
-        
+
         foundOpponent = 0;
 
         for (i = 1; i < gBattlersCount; i += 2)
@@ -3581,8 +3581,8 @@ static void MoveValuesCleanUp(void)
     gCritMultiplier = 1;
     gBattleCommunication[MOVE_EFFECT_BYTE] = 0;
     gBattleCommunication[MISS_TYPE] = 0;
-    gHitMarker &= ~(HITMARKER_DESTINYBOND);
-    gHitMarker &= ~(HITMARKER_SYNCHRONISE_EFFECT);
+    gHitMarker &= ~HITMARKER_DESTINYBOND;
+    gHitMarker &= ~HITMARKER_SYNCHRONISE_EFFECT;
 }
 
 static void Cmd_movevaluescleanup(void)
@@ -4217,7 +4217,7 @@ static void Cmd_moveend(void)
                 && gSpecialStatuses[gBattlerTarget].specialDmg
                 && !(gMoveResultFlags & MOVE_RESULT_NO_EFFECT) && moveType == TYPE_FIRE)
             {
-                gBattleMons[gBattlerTarget].status1 &= ~(STATUS1_FREEZE);
+                gBattleMons[gBattlerTarget].status1 &= ~STATUS1_FREEZE;
                 gActiveBattler = gBattlerTarget;
                 BtlController_EmitSetMonData(0, REQUEST_STATUS_BATTLE, 0, 4, &gBattleMons[gBattlerTarget].status1);
                 MarkBattlerForControllerExec(gActiveBattler);
@@ -4313,7 +4313,7 @@ static void Cmd_moveend(void)
                 gActiveBattler = gBattlerAttacker;
                 BtlController_EmitSpriteInvisibility(0, FALSE);
                 MarkBattlerForControllerExec(gActiveBattler);
-                gStatuses3[gBattlerAttacker] &= ~(STATUS3_SEMI_INVULNERABLE);
+                gStatuses3[gBattlerAttacker] &= ~STATUS3_SEMI_INVULNERABLE;
                 gSpecialStatuses[gBattlerAttacker].restoredBattlerSprite = 1;
                 gBattleScripting.moveendState++;
                 return;
@@ -4327,7 +4327,7 @@ static void Cmd_moveend(void)
                 gActiveBattler = gBattlerTarget;
                 BtlController_EmitSpriteInvisibility(0, FALSE);
                 MarkBattlerForControllerExec(gActiveBattler);
-                gStatuses3[gBattlerTarget] &= ~(STATUS3_SEMI_INVULNERABLE);
+                gStatuses3[gBattlerTarget] &= ~STATUS3_SEMI_INVULNERABLE;
                 gBattleScripting.moveendState++;
                 return;
             }
@@ -4337,7 +4337,7 @@ static void Cmd_moveend(void)
             for (i = 0; i < gBattlersCount; i++)
             {
                 if (gDisableStructs[i].substituteHP == 0)
-                    gBattleMons[i].status2 &= ~(STATUS2_SUBSTITUTE);
+                    gBattleMons[i].status2 &= ~STATUS2_SUBSTITUTE;
             }
             gBattleScripting.moveendState++;
             break;
@@ -4347,7 +4347,7 @@ static void Cmd_moveend(void)
                 gActiveBattler = gBattlerAttacker;
                 gBattlerAttacker = gBattlerTarget;
                 gBattlerTarget = gActiveBattler;
-                gHitMarker &= ~(HITMARKER_SWAP_ATTACKER_TARGET);
+                gHitMarker &= ~HITMARKER_SWAP_ATTACKER_TARGET;
             }
             if (gHitMarker & HITMARKER_ATTACKSTRING_PRINTED)
             {
@@ -4610,9 +4610,9 @@ static void Cmd_switchindataupdate(void)
 
     SwitchInClearSetData();
 
-    if (gBattleTypeFlags & BATTLE_TYPE_PALACE 
+    if (gBattleTypeFlags & BATTLE_TYPE_PALACE
         && gBattleMons[gActiveBattler].maxHP / 2 >= gBattleMons[gActiveBattler].hp
-        && gBattleMons[gActiveBattler].hp != 0 
+        && gBattleMons[gActiveBattler].hp != 0
         && !(gBattleMons[gActiveBattler].status1 & STATUS1_SLEEP))
     {
         gBattleStruct->palaceFlags |= gBitTable[gActiveBattler];
@@ -4657,7 +4657,7 @@ static void Cmd_jumpifcantswitch(void)
     s32 lastMonId;
     struct Pokemon *party;
 
-    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(SWITCH_IGNORE_ESCAPE_PREVENTION));
+    gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~SWITCH_IGNORE_ESCAPE_PREVENTION);
 
     if (!(gBattlescriptCurrInstr[1] & SWITCH_IGNORE_ESCAPE_PREVENTION)
         && ((gBattleMons[gActiveBattler].status2 & (STATUS2_WRAPPED | STATUS2_ESCAPE_PREVENTION))
@@ -4837,7 +4837,7 @@ static void Cmd_openpartyscreen(void)
                     if (HasNoMonsToSwitch(gActiveBattler, PARTY_SIZE, PARTY_SIZE))
                     {
                         gAbsentBattlerFlags |= gBitTable[gActiveBattler];
-                        gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+                        gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler);
                         BtlController_EmitLinkStandbyMsg(0, 2, FALSE);
                         MarkBattlerForControllerExec(gActiveBattler);
                     }
@@ -4866,7 +4866,7 @@ static void Cmd_openpartyscreen(void)
                 if (HasNoMonsToSwitch(0, PARTY_SIZE, PARTY_SIZE))
                 {
                     gAbsentBattlerFlags |= gBitTable[gActiveBattler];
-                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+                    gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler);
                     BtlController_EmitCantSwitch(0);
                     MarkBattlerForControllerExec(gActiveBattler);
                 }
@@ -4888,7 +4888,7 @@ static void Cmd_openpartyscreen(void)
                 if (HasNoMonsToSwitch(2, PARTY_SIZE, PARTY_SIZE))
                 {
                     gAbsentBattlerFlags |= gBitTable[gActiveBattler];
-                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+                    gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler);
                     BtlController_EmitCantSwitch(0);
                     MarkBattlerForControllerExec(gActiveBattler);
                 }
@@ -4909,7 +4909,7 @@ static void Cmd_openpartyscreen(void)
                 if (HasNoMonsToSwitch(1, PARTY_SIZE, PARTY_SIZE))
                 {
                     gAbsentBattlerFlags |= gBitTable[gActiveBattler];
-                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+                    gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler);
                     BtlController_EmitCantSwitch(0);
                     MarkBattlerForControllerExec(gActiveBattler);
                 }
@@ -4931,7 +4931,7 @@ static void Cmd_openpartyscreen(void)
                 if (HasNoMonsToSwitch(3, PARTY_SIZE, PARTY_SIZE))
                 {
                     gAbsentBattlerFlags |= gBitTable[gActiveBattler];
-                    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+                    gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler);
                     BtlController_EmitCantSwitch(0);
                     MarkBattlerForControllerExec(gActiveBattler);
                 }
@@ -4994,7 +4994,7 @@ static void Cmd_openpartyscreen(void)
                     if (HasNoMonsToSwitch(2, gBattleBufferB[0][1], PARTY_SIZE))
                     {
                         gAbsentBattlerFlags |= gBitTable[gActiveBattler];
-                        gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+                        gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler);
                         BtlController_EmitCantSwitch(0);
                         MarkBattlerForControllerExec(gActiveBattler);
                     }
@@ -5010,7 +5010,7 @@ static void Cmd_openpartyscreen(void)
                     if (HasNoMonsToSwitch(3, gBattleBufferB[1][1], PARTY_SIZE))
                     {
                         gAbsentBattlerFlags |= gBitTable[gActiveBattler];
-                        gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+                        gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler);
                         BtlController_EmitCantSwitch(0);
                         MarkBattlerForControllerExec(gActiveBattler);
                     }
@@ -5049,7 +5049,7 @@ static void Cmd_openpartyscreen(void)
         else
             hitmarkerFaintBits = PARTY_ACTION_SEND_OUT;
 
-        battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~(PARTY_SCREEN_OPTIONAL));
+        battlerId = GetBattlerForBattleScript(gBattlescriptCurrInstr[1] & ~PARTY_SCREEN_OPTIONAL);
         if (gSpecialStatuses[battlerId].flag40)
         {
             gBattlescriptCurrInstr += 6;
@@ -5058,7 +5058,7 @@ static void Cmd_openpartyscreen(void)
         {
             gActiveBattler = battlerId;
             gAbsentBattlerFlags |= gBitTable[gActiveBattler];
-            gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+            gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler);
             gBattlescriptCurrInstr = jumpPtr;
         }
         else
@@ -5174,7 +5174,7 @@ static void Cmd_switchineffects(void)
     gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
     UpdateSentPokesToOpponentValue(gActiveBattler);
 
-    gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
+    gHitMarker &= ~HITMARKER_FAINTED(gActiveBattler);
     gSpecialStatuses[gActiveBattler].flag40 = 0;
 
     if (!(gSideStatuses[GetBattlerSide(gActiveBattler)] & SIDE_STATUS_SPIKES_DAMAGED)
@@ -5186,8 +5186,8 @@ static void Cmd_switchineffects(void)
 
         gSideStatuses[GetBattlerSide(gActiveBattler)] |= SIDE_STATUS_SPIKES_DAMAGED;
 
-        gBattleMons[gActiveBattler].status2 &= ~(STATUS2_DESTINY_BOND);
-        gHitMarker &= ~(HITMARKER_DESTINYBOND);
+        gBattleMons[gActiveBattler].status2 &= ~STATUS2_DESTINY_BOND;
+        gHitMarker &= ~HITMARKER_DESTINYBOND;
 
         spikesDmg = (5 - gSideTimers[GetBattlerSide(gActiveBattler)].spikesAmount) * 2;
         gBattleMoveDamage = gBattleMons[gActiveBattler].maxHP / (spikesDmg);
@@ -5216,7 +5216,7 @@ static void Cmd_switchineffects(void)
         if (!AbilityBattleEffects(ABILITYEFFECT_ON_SWITCHIN, gActiveBattler, 0, 0, 0)
             && !ItemBattleEffects(ITEMEFFECT_ON_SWITCH_IN, gActiveBattler, FALSE))
         {
-            gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~(SIDE_STATUS_SPIKES_DAMAGED);
+            gSideStatuses[GetBattlerSide(gActiveBattler)] &= ~SIDE_STATUS_SPIKES_DAMAGED;
 
             for (i = 0; i < gBattlersCount; i++)
             {
@@ -5632,7 +5632,7 @@ static void Cmd_swapattackerwithtarget(void)
     gBattlerTarget = gActiveBattler;
 
     if (gHitMarker & HITMARKER_SWAP_ATTACKER_TARGET)
-        gHitMarker &= ~(HITMARKER_SWAP_ATTACKER_TARGET);
+        gHitMarker &= ~HITMARKER_SWAP_ATTACKER_TARGET;
     else
         gHitMarker |= HITMARKER_SWAP_ATTACKER_TARGET;
 
@@ -6118,9 +6118,9 @@ static void PutMonIconOnLvlUpBox(void)
 
 static void SpriteCB_MonIconOnLvlUpBox(struct Sprite* sprite)
 {
-    sprite->pos2.x = sprite->sSavedLvlUpBoxXPosition - gBattle_BG2_X;
+    sprite->x2 = sprite->sSavedLvlUpBoxXPosition - gBattle_BG2_X;
 
-    if (sprite->pos2.x != 0)
+    if (sprite->x2 != 0)
     {
         sprite->sDestroy = TRUE;
     }
@@ -6315,13 +6315,13 @@ static void Cmd_various(void)
                 *choicedMove = 0;
         }
         break;
-    case 7:
+    case VARIOUS_RESET_PLAYER_FAINTED:
         if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_DOUBLE))
             && gBattleTypeFlags & BATTLE_TYPE_TRAINER
             && gBattleMons[0].hp != 0
             && gBattleMons[1].hp != 0)
         {
-            gHitMarker &= ~(HITMARKER_x400000);
+            gHitMarker &= ~HITMARKER_PLAYER_FAINTED;
         }
         break;
     case VARIOUS_PALACE_FLAVOR_TEXT:
@@ -6355,7 +6355,7 @@ static void Cmd_various(void)
     case VARIOUS_ARENA_PLAYER_MON_LOST:
         gBattleMons[0].hp = 0;
         gHitMarker |= HITMARKER_FAINTED(0);
-        gHitMarker |= HITMARKER_x400000;
+        gHitMarker |= HITMARKER_PLAYER_FAINTED;
         gBattleStruct->arenaLostPlayerMons |= gBitTable[gBattlerPartyIndexes[0]];
         gDisableStructs[0].truantSwitchInHack = 1;
         break;
@@ -6364,7 +6364,7 @@ static void Cmd_various(void)
         gBattleMons[1].hp = 0;
         gHitMarker |= HITMARKER_FAINTED(0);
         gHitMarker |= HITMARKER_FAINTED(1);
-        gHitMarker |= HITMARKER_x400000;
+        gHitMarker |= HITMARKER_PLAYER_FAINTED;
         gBattleStruct->arenaLostPlayerMons |= gBitTable[gBattlerPartyIndexes[0]];
         gBattleStruct->arenaLostOpponentMons |= gBitTable[gBattlerPartyIndexes[1]];
         gDisableStructs[0].truantSwitchInHack = 1;
@@ -6374,11 +6374,11 @@ static void Cmd_various(void)
         BtlController_EmitYesNoBox(0);
         MarkBattlerForControllerExec(gActiveBattler);
         break;
-    case 14:
+    case VARIOUS_DRAW_ARENA_REF_TEXT_BOX:
         DrawArenaRefereeTextBox();
         break;
-    case 15:
-        RemoveArenaRefereeTextBox();
+    case VARIOUS_ERASE_ARENA_REF_TEXT_BOX:
+        EraseArenaRefereeTextBox();
         break;
     case VARIOUS_ARENA_JUDGMENT_STRING:
         BattleStringExpandPlaceholdersToDisplayedString(gRefereeStringsTable[gBattlescriptCurrInstr[1]]);
@@ -6420,8 +6420,8 @@ static void Cmd_various(void)
     case VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT:
         gBattleStruct->alreadyStatusedMoveAttempt |= gBitTable[gActiveBattler];
         break;
-    case 24:
-        if (sub_805725C(gActiveBattler))
+    case VARIOUS_PALACE_TRY_ESCAPE_STATUS:
+        if (BattlePalace_TryEscapeStatus(gActiveBattler))
             return;
         break;
     case VARIOUS_SET_TELEPORT_OUTCOME:
@@ -6595,14 +6595,14 @@ static void Cmd_trymirrormove(void)
 
     if (move != 0 && move != 0xFFFF)
     {
-        gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
+        gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED;
         gCurrentMove = move;
         gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
         gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
     }
     else if (validMovesCount)
     {
-        gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
+        gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED;
         i = Random() % validMovesCount;
         gCurrentMove = movesArray[i];
         gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
@@ -6617,14 +6617,14 @@ static void Cmd_trymirrormove(void)
 
 static void Cmd_setrain(void)
 {
-    if (gBattleWeather & WEATHER_RAIN_ANY)
+    if (gBattleWeather & B_WEATHER_RAIN)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEATHER_FAILED;
     }
     else
     {
-        gBattleWeather = WEATHER_RAIN_TEMPORARY;
+        gBattleWeather = B_WEATHER_RAIN_TEMPORARY;
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STARTED_RAIN;
         gWishFutureKnock.weatherDuration = 5;
     }
@@ -6882,15 +6882,15 @@ static u8 ChangeStatBuffs(s8 statValue, u8 statId, u8 flags, const u8 *BS_ptr)
     else
         gActiveBattler = gBattlerTarget;
 
-    flags &= ~(MOVE_EFFECT_AFFECTS_USER);
+    flags &= ~MOVE_EFFECT_AFFECTS_USER;
 
     if (flags & MOVE_EFFECT_CERTAIN)
         certain++;
-    flags &= ~(MOVE_EFFECT_CERTAIN);
+    flags &= ~MOVE_EFFECT_CERTAIN;
 
     if (flags & STAT_BUFF_NOT_PROTECT_AFFECTED)
         notProtectAffected++;
-    flags &= ~(STAT_BUFF_NOT_PROTECT_AFFECTED);
+    flags &= ~STAT_BUFF_NOT_PROTECT_AFFECTED;
 
     PREPARE_STAT_BUFFER(gBattleTextBuff1, statId)
 
@@ -7481,14 +7481,14 @@ static void Cmd_damagetohalftargethp(void) // super fang
 
 static void Cmd_setsandstorm(void)
 {
-    if (gBattleWeather & WEATHER_SANDSTORM_ANY)
+    if (gBattleWeather & B_WEATHER_SANDSTORM)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEATHER_FAILED;
     }
     else
     {
-        gBattleWeather = WEATHER_SANDSTORM_TEMPORARY;
+        gBattleWeather = B_WEATHER_SANDSTORM_TEMPORARY;
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STARTED_SANDSTORM;
         gWishFutureKnock.weatherDuration = 5;
     }
@@ -7499,7 +7499,7 @@ static void Cmd_weatherdamage(void)
 {
     if (WEATHER_HAS_EFFECT)
     {
-        if (gBattleWeather & WEATHER_SANDSTORM_ANY)
+        if (gBattleWeather & B_WEATHER_SANDSTORM)
         {
             if (gBattleMons[gBattlerAttacker].type1 != TYPE_ROCK
                 && gBattleMons[gBattlerAttacker].type1 != TYPE_STEEL
@@ -7520,7 +7520,7 @@ static void Cmd_weatherdamage(void)
                 gBattleMoveDamage = 0;
             }
         }
-        if (gBattleWeather & WEATHER_HAIL_ANY)
+        if (gBattleWeather & B_WEATHER_HAIL)
         {
             if (!IS_BATTLER_OF_TYPE(gBattlerAttacker, TYPE_ICE)
                 && !(gStatuses3[gBattlerAttacker] & STATUS3_UNDERGROUND)
@@ -7719,7 +7719,7 @@ static void Cmd_setsubstitute(void)
             gBattleMoveDamage = 1;
 
         gBattleMons[gBattlerAttacker].status2 |= STATUS2_SUBSTITUTE;
-        gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_WRAPPED);
+        gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_WRAPPED;
         gDisableStructs[gBattlerAttacker].substituteHP = gBattleMoveDamage;
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SET_SUBSTITUTE;
         gHitMarker |= HITMARKER_IGNORE_SUBSTITUTE;
@@ -7803,7 +7803,7 @@ static void Cmd_metronome(void)
 
         if (sMovesForbiddenToCopy[i] == METRONOME_FORBIDDEN_END)
         {
-            gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
+            gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED;
             gBattlescriptCurrInstr = gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect];
             gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
             return;
@@ -8019,7 +8019,7 @@ static void Cmd_settypetorandomresistance(void) // conversion 2
 
 static void Cmd_setalwayshitflag(void)
 {
-    gStatuses3[gBattlerTarget] &= ~(STATUS3_ALWAYS_HITS);
+    gStatuses3[gBattlerTarget] &= ~STATUS3_ALWAYS_HITS;
     gStatuses3[gBattlerTarget] |= STATUS3_ALWAYS_HITS_TURN(2);
     gDisableStructs[gBattlerTarget].battlerWithSureHit = gBattlerAttacker;
     gBattlescriptCurrInstr++;
@@ -8104,7 +8104,7 @@ static u8 AttacksThisTurn(u8 battlerId, u16 move) // Note: returns 1 if it's a c
 {
     // first argument is unused
     if (gBattleMoves[move].effect == EFFECT_SOLARBEAM
-        && (gBattleWeather & WEATHER_SUN_ANY))
+        && (gBattleWeather & B_WEATHER_SUN))
         return 2;
 
     if (gBattleMoves[move].effect == EFFECT_SKULL_BASH
@@ -8137,7 +8137,7 @@ static void Cmd_trychoosesleeptalkmove(void)
 
     }
 
-    unusableMovesBits = CheckMoveLimitations(gBattlerAttacker, unusableMovesBits, ~(MOVE_LIMITATION_PP));
+    unusableMovesBits = CheckMoveLimitations(gBattlerAttacker, unusableMovesBits, ~MOVE_LIMITATION_PP);
     if (unusableMovesBits == 0xF) // all 4 moves cannot be chosen
     {
         gBattlescriptCurrInstr += 5;
@@ -8153,7 +8153,7 @@ static void Cmd_trychoosesleeptalkmove(void)
 
         gCalledMove = gBattleMons[gBattlerAttacker].moves[movePosition];
         gCurrMovePos = movePosition;
-        gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
+        gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED;
         gBattlerTarget = GetMoveTarget(gCalledMove, 0);
         gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 1);
     }
@@ -8269,7 +8269,7 @@ static void Cmd_healpartystatus(void)
         if (gBattleMons[gBattlerAttacker].ability != ABILITY_SOUNDPROOF)
         {
             gBattleMons[gBattlerAttacker].status1 = 0;
-            gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+            gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_NIGHTMARE;
         }
         else
         {
@@ -8285,7 +8285,7 @@ static void Cmd_healpartystatus(void)
             if (gBattleMons[gActiveBattler].ability != ABILITY_SOUNDPROOF)
             {
                 gBattleMons[gActiveBattler].status1 = 0;
-                gBattleMons[gActiveBattler].status2 &= ~(STATUS2_NIGHTMARE);
+                gBattleMons[gActiveBattler].status2 &= ~STATUS2_NIGHTMARE;
             }
             else
             {
@@ -8325,14 +8325,14 @@ static void Cmd_healpartystatus(void)
         toHeal = 0x3F;
 
         gBattleMons[gBattlerAttacker].status1 = 0;
-        gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_NIGHTMARE);
+        gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_NIGHTMARE;
 
         gActiveBattler = GetBattlerAtPosition(GetBattlerPosition(gBattlerAttacker) ^ BIT_FLANK);
         if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE
             && !(gAbsentBattlerFlags & gBitTable[gActiveBattler]))
         {
             gBattleMons[gActiveBattler].status1 = 0;
-            gBattleMons[gActiveBattler].status2 &= ~(STATUS2_NIGHTMARE);
+            gBattleMons[gActiveBattler].status2 &= ~STATUS2_NIGHTMARE;
         }
 
     }
@@ -8435,7 +8435,7 @@ static void Cmd_rolloutdamagecalculation(void)
         }
         if (--gDisableStructs[gBattlerAttacker].rolloutTimer == 0) // last hit
         {
-            gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_MULTIPLETURNS);
+            gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_MULTIPLETURNS;
         }
 
         gDynamicBasePower = gBattleMoves[gCurrentMove].power;
@@ -8515,7 +8515,7 @@ static void Cmd_presentdamagecalculation(void)
         gBattlescriptCurrInstr = BattleScript_AlreadyAtFullHp;
     else
     {
-        gMoveResultFlags &= ~(MOVE_RESULT_DOESNT_AFFECT_FOE);
+        gMoveResultFlags &= ~MOVE_RESULT_DOESNT_AFFECT_FOE;
         gBattlescriptCurrInstr = BattleScript_PresentHealTarget;
     }
 }
@@ -8628,7 +8628,7 @@ static void Cmd_jumpifnopursuitswitchdmg(void)
         gCurrMovePos = gChosenMovePos = *(gBattleStruct->chosenMovePositions + gBattlerTarget);
         gBattlescriptCurrInstr += 5;
         gBattleScripting.animTurn = 1;
-        gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
+        gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED;
     }
     else
     {
@@ -8638,14 +8638,14 @@ static void Cmd_jumpifnopursuitswitchdmg(void)
 
 static void Cmd_setsunny(void)
 {
-    if (gBattleWeather & WEATHER_SUN_ANY)
+    if (gBattleWeather & B_WEATHER_SUN)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEATHER_FAILED;
     }
     else
     {
-        gBattleWeather = WEATHER_SUN_TEMPORARY;
+        gBattleWeather = B_WEATHER_SUN_TEMPORARY;
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STARTED_SUNLIGHT;
         gWishFutureKnock.weatherDuration = 5;
     }
@@ -8693,7 +8693,7 @@ static void Cmd_rapidspinfree(void)
     if (gBattleMons[gBattlerAttacker].status2 & STATUS2_WRAPPED)
     {
         gBattleScripting.battler = gBattlerTarget;
-        gBattleMons[gBattlerAttacker].status2 &= ~(STATUS2_WRAPPED);
+        gBattleMons[gBattlerAttacker].status2 &= ~STATUS2_WRAPPED;
         gBattlerTarget = *(gBattleStruct->wrappedBy + gBattlerAttacker);
 
         gBattleTextBuff1[0] = B_BUFF_PLACEHOLDER_BEGIN;
@@ -8707,14 +8707,14 @@ static void Cmd_rapidspinfree(void)
     }
     else if (gStatuses3[gBattlerAttacker] & STATUS3_LEECHSEED)
     {
-        gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED);
-        gStatuses3[gBattlerAttacker] &= ~(STATUS3_LEECHSEED_BATTLER);
+        gStatuses3[gBattlerAttacker] &= ~STATUS3_LEECHSEED;
+        gStatuses3[gBattlerAttacker] &= ~STATUS3_LEECHSEED_BATTLER;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_LeechSeedFree;
     }
     else if (gSideStatuses[GetBattlerSide(gBattlerAttacker)] & SIDE_STATUS_SPIKES)
     {
-        gSideStatuses[GetBattlerSide(gBattlerAttacker)] &= ~(SIDE_STATUS_SPIKES);
+        gSideStatuses[GetBattlerSide(gBattlerAttacker)] &= ~SIDE_STATUS_SPIKES;
         gSideTimers[GetBattlerSide(gBattlerAttacker)].spikesAmount = 0;
         BattleScriptPushCursor();
         gBattlescriptCurrInstr = BattleScript_SpikesFree;
@@ -8739,7 +8739,7 @@ static void Cmd_recoverbasedonsunlight(void)
     {
         if (gBattleWeather == 0 || !WEATHER_HAS_EFFECT)
             gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 2;
-        else if (gBattleWeather & WEATHER_SUN_ANY)
+        else if (gBattleWeather & B_WEATHER_SUN)
             gBattleMoveDamage = 20 * gBattleMons[gBattlerAttacker].maxHP / 30;
         else // not sunny weather
             gBattleMoveDamage = gBattleMons[gBattlerAttacker].maxHP / 4;
@@ -8920,14 +8920,14 @@ static void Cmd_setminimize(void)
 
 static void Cmd_sethail(void)
 {
-    if (gBattleWeather & WEATHER_HAIL_ANY)
+    if (gBattleWeather & B_WEATHER_HAIL)
     {
         gMoveResultFlags |= MOVE_RESULT_MISSED;
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WEATHER_FAILED;
     }
     else
     {
-        gBattleWeather = WEATHER_HAIL;
+        gBattleWeather = B_WEATHER_HAIL_TEMPORARY;
         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_STARTED_HAIL;
         gWishFutureKnock.weatherDuration = 5;
     }
@@ -8970,7 +8970,7 @@ static void Cmd_setcharge(void)
 
 static void Cmd_callterrainattack(void) // nature power
 {
-    gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
+    gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED;
     gCurrentMove = sNaturePowerMoves[gBattleTerrain];
     gBattlerTarget = GetMoveTarget(gCurrentMove, 0);
     BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
@@ -9380,7 +9380,7 @@ static void Cmd_assistattackselect(void)
     }
     if (chooseableMovesNo)
     {
-        gHitMarker &= ~(HITMARKER_ATTACKSTRING_PRINTED);
+        gHitMarker &= ~HITMARKER_ATTACKSTRING_PRINTED;
         gCalledMove = movesArray[((Random() & 0xFF) * chooseableMovesNo) >> 8];
         gBattlerTarget = GetMoveTarget(gCalledMove, 0);
         gBattlescriptCurrInstr += 5;
@@ -9640,15 +9640,15 @@ static void Cmd_setweatherballtype(void)
 {
     if (WEATHER_HAS_EFFECT)
     {
-        if (gBattleWeather & WEATHER_ANY)
+        if (gBattleWeather & B_WEATHER_ANY)
             gBattleScripting.dmgMultiplier = 2;
-        if (gBattleWeather & WEATHER_RAIN_ANY)
+        if (gBattleWeather & B_WEATHER_RAIN)
             *(&gBattleStruct->dynamicMoveType) = TYPE_WATER | 0x80;
-        else if (gBattleWeather & WEATHER_SANDSTORM_ANY)
+        else if (gBattleWeather & B_WEATHER_SANDSTORM)
             *(&gBattleStruct->dynamicMoveType) = TYPE_ROCK | 0x80;
-        else if (gBattleWeather & WEATHER_SUN_ANY)
+        else if (gBattleWeather & B_WEATHER_SUN)
             *(&gBattleStruct->dynamicMoveType) = TYPE_FIRE | 0x80;
-        else if (gBattleWeather & WEATHER_HAIL_ANY)
+        else if (gBattleWeather & B_WEATHER_HAIL)
             *(&gBattleStruct->dynamicMoveType) = TYPE_ICE | 0x80;
         else
             *(&gBattleStruct->dynamicMoveType) = TYPE_NORMAL | 0x80;
@@ -9736,8 +9736,8 @@ static void Cmd_removelightscreenreflect(void) // brick break
 
     if (gSideTimers[opposingSide].reflectTimer || gSideTimers[opposingSide].lightscreenTimer)
     {
-        gSideStatuses[opposingSide] &= ~(SIDE_STATUS_REFLECT);
-        gSideStatuses[opposingSide] &= ~(SIDE_STATUS_LIGHTSCREEN);
+        gSideStatuses[opposingSide] &= ~SIDE_STATUS_REFLECT;
+        gSideStatuses[opposingSide] &= ~SIDE_STATUS_LIGHTSCREEN;
         gSideTimers[opposingSide].reflectTimer = 0;
         gSideTimers[opposingSide].lightscreenTimer = 0;
         gBattleScripting.animTurn = 1;
diff --git a/src/battle_setup.c b/src/battle_setup.c
index cb65d25d6..4337ec29c 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -126,32 +126,32 @@ static const u8 sBattleTransitionTable_Trainer[][2] =
 // Battle Frontier (excluding Pyramid and Dome, which have their own tables below)
 static const u8 sBattleTransitionTable_BattleFrontier[] =
 {
-    B_TRANSITION_FRONTIER_LOGO_WIGGLE, 
-    B_TRANSITION_FRONTIER_LOGO_WAVE, 
-    B_TRANSITION_FRONTIER_SQUARES, 
+    B_TRANSITION_FRONTIER_LOGO_WIGGLE,
+    B_TRANSITION_FRONTIER_LOGO_WAVE,
+    B_TRANSITION_FRONTIER_SQUARES,
     B_TRANSITION_FRONTIER_SQUARES_SCROLL,
-    B_TRANSITION_FRONTIER_CIRCLES_MEET, 
-    B_TRANSITION_FRONTIER_CIRCLES_CROSS, 
-    B_TRANSITION_FRONTIER_CIRCLES_ASYMMETRIC_SPIRAL, 
+    B_TRANSITION_FRONTIER_CIRCLES_MEET,
+    B_TRANSITION_FRONTIER_CIRCLES_CROSS,
+    B_TRANSITION_FRONTIER_CIRCLES_ASYMMETRIC_SPIRAL,
     B_TRANSITION_FRONTIER_CIRCLES_SYMMETRIC_SPIRAL,
-    B_TRANSITION_FRONTIER_CIRCLES_MEET_IN_SEQ, 
-    B_TRANSITION_FRONTIER_CIRCLES_CROSS_IN_SEQ, 
-    B_TRANSITION_FRONTIER_CIRCLES_ASYMMETRIC_SPIRAL_IN_SEQ, 
+    B_TRANSITION_FRONTIER_CIRCLES_MEET_IN_SEQ,
+    B_TRANSITION_FRONTIER_CIRCLES_CROSS_IN_SEQ,
+    B_TRANSITION_FRONTIER_CIRCLES_ASYMMETRIC_SPIRAL_IN_SEQ,
     B_TRANSITION_FRONTIER_CIRCLES_SYMMETRIC_SPIRAL_IN_SEQ
 };
 
 static const u8 sBattleTransitionTable_BattlePyramid[] =
 {
-    B_TRANSITION_FRONTIER_SQUARES, 
-    B_TRANSITION_FRONTIER_SQUARES_SCROLL, 
+    B_TRANSITION_FRONTIER_SQUARES,
+    B_TRANSITION_FRONTIER_SQUARES_SCROLL,
     B_TRANSITION_FRONTIER_SQUARES_SPIRAL
 };
 
 static const u8 sBattleTransitionTable_BattleDome[] =
 {
-    B_TRANSITION_FRONTIER_LOGO_WIGGLE, 
-    B_TRANSITION_FRONTIER_SQUARES, 
-    B_TRANSITION_FRONTIER_SQUARES_SCROLL, 
+    B_TRANSITION_FRONTIER_LOGO_WIGGLE,
+    B_TRANSITION_FRONTIER_SQUARES,
+    B_TRANSITION_FRONTIER_SQUARES_SCROLL,
     B_TRANSITION_FRONTIER_SQUARES_SPIRAL
 };
 
diff --git a/src/battle_tower.c b/src/battle_tower.c
index f2ffd97a6..8d914d706 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -1339,7 +1339,7 @@ void PutNewBattleTowerRecord(struct EmeraldBattleTowerRecord *newRecordEm)
                 if (gSaveBlock2Ptr->frontier.towerRecords[i].name[j] != newRecord->name[j])
                     break;
                 if (newRecord->name[j] == EOS)
-                #endif  
+                #endif
                 {
                     k = PLAYER_NAME_LENGTH;
                     break;
@@ -2655,7 +2655,7 @@ static void TowerTryCloseLink(void)
 static void SetMultiPartnerGfx(void)
 {
     // 0xF below means use VAR_OBJ_GFX_ID_E
-    SetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[17], 0xF); 
+    SetBattleFacilityTrainerGfxId(gSaveBlock2Ptr->frontier.trainerIds[17], 0xF);
 }
 
 static void SetTowerInterviewData(void)
@@ -2968,7 +2968,7 @@ static void FillPartnerParty(u16 trainerId)
                       sStevenMons[i].species,
                       sStevenMons[i].level,
                       sStevenMons[i].fixedIV,
-                      TRUE, 
+                      TRUE,
                       #ifdef BUGFIX
                       j,
                       #else
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 461c45e7d..2fc4c6854 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -748,7 +748,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_Pokeball[] =
 
 static const struct SpriteTemplate sSpriteTemplate_Pokeball =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_POKEBALL,
     .oam = &gObjectEventBaseOam_32x32,
     .anims = sSpriteAnimTable_Pokeball,
@@ -797,7 +797,7 @@ static const union AnimCmd *const sSpriteAnimTable_UnusedBrendanLass[] =
 
 static const struct SpriteTemplate sSpriteTemplate_UnusedBrendan =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = 0x100A,
     .oam = &sOam_UnusedBrendanLass,
     .anims = sSpriteAnimTable_UnusedBrendanLass,
@@ -808,7 +808,7 @@ static const struct SpriteTemplate sSpriteTemplate_UnusedBrendan =
 
 static const struct SpriteTemplate sSpriteTemplate_UnusedLass =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = 0x100A,
     .oam = &sOam_UnusedBrendanLass,
     .anims = sSpriteAnimTable_UnusedBrendanLass,
@@ -1692,10 +1692,10 @@ static void sub_814713C(struct Sprite *sprite)
     }
     else
     {
-        if (sprite->pos1.x >= 0 && sprite->pos1.x <= DISPLAY_WIDTH)
+        if (sprite->x >= 0 && sprite->x <= DISPLAY_WIDTH)
         {
-            s16 posX = sprite->pos1.x >> 3;
-            s16 posY = sprite->pos1.y >> 3;
+            s16 posX = sprite->x >> 3;
+            s16 posY = sprite->y >> 3;
 
             if (posX != sprite->data[2])
             {
@@ -1712,8 +1712,8 @@ static void sub_814713C(struct Sprite *sprite)
                 SOME_VRAM_STORE(ptr, posY + 1, posX, 0xF001);
             }
         }
-        sprite->pos1.x += arr0[sprite->data[0]];
-        if (sprite->pos1.x < -15 || sprite->pos1.x > 255)
+        sprite->x += arr0[sprite->data[0]];
+        if (sprite->x < -15 || sprite->x > 255)
             FieldEffectStop(sprite, FLDEFF_POKEBALL);
     }
 }
@@ -2438,10 +2438,10 @@ static bool8 TrainerPicCb_SetSlideOffsets(struct Sprite *sprite)
 // fast slide to around middle screen
 static bool8 TrainerPicCb_Slide1(struct Sprite *sprite)
 {
-    sprite->pos1.x += sprite->sOffsetX;
-    if (sprite->sSlideTableId && sprite->pos1.x < 133)
+    sprite->x += sprite->sOffsetX;
+    if (sprite->sSlideTableId && sprite->x < 133)
         sprite->sState++;
-    else if (!sprite->sSlideTableId && sprite->pos1.x > 103)
+    else if (!sprite->sSlideTableId && sprite->x > 103)
         sprite->sState++;
     return FALSE;
 }
@@ -2450,7 +2450,7 @@ static bool8 TrainerPicCb_Slide1(struct Sprite *sprite)
 static bool8 TrainerPicCb_Slide2(struct Sprite *sprite)
 {
     sprite->sOffsetX += sprite->sOffsetX2;
-    sprite->pos1.x += sprite->sOffsetX;
+    sprite->x += sprite->sOffsetX;
     if (sprite->sOffsetX == 0)
     {
         sprite->sState++;
@@ -2464,8 +2464,8 @@ static bool8 TrainerPicCb_Slide2(struct Sprite *sprite)
 static bool8 TrainerPicCb_Slide3(struct Sprite *sprite)
 {
     sprite->sOffsetX += sprite->sOffsetX2;
-    sprite->pos1.x += sprite->sOffsetX;
-    if (sprite->pos1.x < -31 || sprite->pos1.x > 271)
+    sprite->x += sprite->sOffsetX;
+    if (sprite->x < -31 || sprite->x > 271)
         sprite->sState++;
     return FALSE;
 }
@@ -3283,8 +3283,8 @@ static bool8 Phase2_WhiteFade_Func2(struct Task *task)
     for (i = 0, posY = 0; i < 8; i++, posY += 0x14)
     {
         sprite = &gSprites[CreateInvisibleSprite(sub_8149864)];
-        sprite->pos1.x = 0xF0;
-        sprite->pos1.y = posY;
+        sprite->x = 0xF0;
+        sprite->y = posY;
         sprite->data[5] = arr1[i];
     }
     sprite->data[6]++;
@@ -3373,21 +3373,21 @@ static void sub_8149864(struct Sprite *sprite)
     else
     {
         u16 i;
-        u16* ptr1 = &gScanlineEffectRegBuffers[0][sprite->pos1.y];
-        u16* ptr2 = &gScanlineEffectRegBuffers[0][sprite->pos1.y + 160];
+        u16* ptr1 = &gScanlineEffectRegBuffers[0][sprite->y];
+        u16* ptr2 = &gScanlineEffectRegBuffers[0][sprite->y + 160];
         for (i = 0; i < 20; i++)
         {
             ptr1[i] = sprite->data[0] >> 8;
-            ptr2[i] = (u8)(sprite->pos1.x);
+            ptr2[i] = (u8)(sprite->x);
         }
-        if (sprite->pos1.x == 0 && sprite->data[0] == 0x1000)
+        if (sprite->x == 0 && sprite->data[0] == 0x1000)
             sprite->data[1] = 1;
 
-        sprite->pos1.x -= 16;
+        sprite->x -= 16;
         sprite->data[0] += 0x80;
 
-        if (sprite->pos1.x < 0)
-            sprite->pos1.x = 0;
+        if (sprite->x < 0)
+            sprite->x = 0;
         if (sprite->data[0] > 0x1000)
             sprite->data[0] = 0x1000;
 
diff --git a/src/battle_transition_frontier.c b/src/battle_transition_frontier.c
index cb3519c4e..2d34c9f86 100644
--- a/src/battle_transition_frontier.c
+++ b/src/battle_transition_frontier.c
@@ -243,7 +243,7 @@ static void SpriteCB_LogoCircleSlide(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
 
-    if (sprite->pos1.x == data[0] && sprite->pos1.y == data[1])
+    if (sprite->x == data[0] && sprite->y == data[1])
     {
         sprite->callback = SpriteCallbackDummy;
     }
@@ -251,7 +251,7 @@ static void SpriteCB_LogoCircleSlide(struct Sprite *sprite)
     {
         if (data[4] == data[6])
         {
-            sprite->pos1.x += data[2];
+            sprite->x += data[2];
             data[4] = 0;
         }
         else
@@ -261,7 +261,7 @@ static void SpriteCB_LogoCircleSlide(struct Sprite *sprite)
 
         if (data[5] == data[7])
         {
-            sprite->pos1.y += data[3];
+            sprite->y += data[3];
             data[5] = 0;
         }
         else
@@ -305,8 +305,8 @@ static u8 CreateSpiralingLogoCircleSprite(s16 x, s16 y, s16 arg2, s16 arg3, s16
 
 static void SpriteCB_LogoCircleSpiral(struct Sprite *sprite)
 {
-    sprite->pos2.x = (Sin2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096
-    sprite->pos2.y = (Cos2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096
+    sprite->x2 = (Sin2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096
+    sprite->y2 = (Cos2(sprite->data[2]) * sprite->data[4]) >> 12; // div by 4096
 
     sprite->data[2] = (sprite->data[2] + sprite->data[3]) % 360;
 
diff --git a/src/battle_tv.c b/src/battle_tv.c
index a61f5ff29..ffdadb697 100644
--- a/src/battle_tv.c
+++ b/src/battle_tv.c
@@ -86,219 +86,219 @@ static const u16 sVariableDmgMoves[] =
 
 static const u16 sPoints_MoveEffect[NUM_BATTLE_MOVE_EFFECTS] =
 {
-    [EFFECT_HIT] = 1, 
-    [EFFECT_SLEEP] = 1, 
-    [EFFECT_POISON_HIT] = 1, 
-    [EFFECT_ABSORB] = 4, 
-    [EFFECT_BURN_HIT] = 1, 
-    [EFFECT_FREEZE_HIT] = 1, 
-    [EFFECT_PARALYZE_HIT] = 1, 
-    [EFFECT_EXPLOSION] = 0, 
-    [EFFECT_DREAM_EATER] = 5, 
-    [EFFECT_MIRROR_MOVE] = 1, 
-    [EFFECT_ATTACK_UP] = 1, 
-    [EFFECT_DEFENSE_UP] = 1, 
-    [EFFECT_SPEED_UP] = 1, 
-    [EFFECT_SPECIAL_ATTACK_UP] = 1, 
-    [EFFECT_SPECIAL_DEFENSE_UP] = 1, 
+    [EFFECT_HIT] = 1,
+    [EFFECT_SLEEP] = 1,
+    [EFFECT_POISON_HIT] = 1,
+    [EFFECT_ABSORB] = 4,
+    [EFFECT_BURN_HIT] = 1,
+    [EFFECT_FREEZE_HIT] = 1,
+    [EFFECT_PARALYZE_HIT] = 1,
+    [EFFECT_EXPLOSION] = 0,
+    [EFFECT_DREAM_EATER] = 5,
+    [EFFECT_MIRROR_MOVE] = 1,
+    [EFFECT_ATTACK_UP] = 1,
+    [EFFECT_DEFENSE_UP] = 1,
+    [EFFECT_SPEED_UP] = 1,
+    [EFFECT_SPECIAL_ATTACK_UP] = 1,
+    [EFFECT_SPECIAL_DEFENSE_UP] = 1,
     [EFFECT_ACCURACY_UP] = 1,
-    [EFFECT_EVASION_UP] = 1, 
-    [EFFECT_ALWAYS_HIT] = 2, 
-    [EFFECT_ATTACK_DOWN] = 1, 
-    [EFFECT_DEFENSE_DOWN] = 1, 
-    [EFFECT_SPEED_DOWN] = 1, 
-    [EFFECT_SPECIAL_ATTACK_DOWN] = 1, 
-    [EFFECT_SPECIAL_DEFENSE_DOWN] = 1, 
-    [EFFECT_ACCURACY_DOWN] = 1, 
-    [EFFECT_EVASION_DOWN] = 1, 
-    [EFFECT_HAZE] = 5, 
-    [EFFECT_BIDE] = 5, 
-    [EFFECT_RAMPAGE] = 4, 
-    [EFFECT_ROAR] = 5, 
-    [EFFECT_MULTI_HIT] = 1, 
-    [EFFECT_CONVERSION] = 3, 
+    [EFFECT_EVASION_UP] = 1,
+    [EFFECT_ALWAYS_HIT] = 2,
+    [EFFECT_ATTACK_DOWN] = 1,
+    [EFFECT_DEFENSE_DOWN] = 1,
+    [EFFECT_SPEED_DOWN] = 1,
+    [EFFECT_SPECIAL_ATTACK_DOWN] = 1,
+    [EFFECT_SPECIAL_DEFENSE_DOWN] = 1,
+    [EFFECT_ACCURACY_DOWN] = 1,
+    [EFFECT_EVASION_DOWN] = 1,
+    [EFFECT_HAZE] = 5,
+    [EFFECT_BIDE] = 5,
+    [EFFECT_RAMPAGE] = 4,
+    [EFFECT_ROAR] = 5,
+    [EFFECT_MULTI_HIT] = 1,
+    [EFFECT_CONVERSION] = 3,
     [EFFECT_FLINCH_HIT] = 1,
-    [EFFECT_RESTORE_HP] = 3, 
-    [EFFECT_TOXIC] = 5, 
-    [EFFECT_PAY_DAY] = 1, 
-    [EFFECT_LIGHT_SCREEN] = 7, 
-    [EFFECT_TRI_ATTACK] = 1, 
-    [EFFECT_REST] = 7, 
-    [EFFECT_OHKO] = 7, 
-    [EFFECT_RAZOR_WIND] = 1, 
-    [EFFECT_SUPER_FANG] = 5, 
-    [EFFECT_DRAGON_RAGE] = 2, 
-    [EFFECT_TRAP] = 4, 
-    [EFFECT_HIGH_CRITICAL] = 1, 
-    [EFFECT_DOUBLE_HIT] = 1, 
-    [EFFECT_RECOIL_IF_MISS] = 1, 
-    [EFFECT_MIST] = 5, 
+    [EFFECT_RESTORE_HP] = 3,
+    [EFFECT_TOXIC] = 5,
+    [EFFECT_PAY_DAY] = 1,
+    [EFFECT_LIGHT_SCREEN] = 7,
+    [EFFECT_TRI_ATTACK] = 1,
+    [EFFECT_REST] = 7,
+    [EFFECT_OHKO] = 7,
+    [EFFECT_RAZOR_WIND] = 1,
+    [EFFECT_SUPER_FANG] = 5,
+    [EFFECT_DRAGON_RAGE] = 2,
+    [EFFECT_TRAP] = 4,
+    [EFFECT_HIGH_CRITICAL] = 1,
+    [EFFECT_DOUBLE_HIT] = 1,
+    [EFFECT_RECOIL_IF_MISS] = 1,
+    [EFFECT_MIST] = 5,
     [EFFECT_FOCUS_ENERGY] = 1,
-    [EFFECT_RECOIL] = 2, 
-    [EFFECT_CONFUSE] = 4, 
-    [EFFECT_ATTACK_UP_2] = 1, 
-    [EFFECT_DEFENSE_UP_2] = 1, 
-    [EFFECT_SPEED_UP_2] = 1, 
-    [EFFECT_SPECIAL_ATTACK_UP_2] = 1, 
-    [EFFECT_SPECIAL_DEFENSE_UP_2] = 1, 
-    [EFFECT_ACCURACY_UP_2] = 1, 
-    [EFFECT_EVASION_UP_2] = 1, 
-    [EFFECT_TRANSFORM] = 0, 
-    [EFFECT_ATTACK_DOWN_2] = 1, 
-    [EFFECT_DEFENSE_DOWN_2] = 1, 
-    [EFFECT_SPEED_DOWN_2] = 1, 
-    [EFFECT_SPECIAL_ATTACK_DOWN_2] = 1, 
-    [EFFECT_SPECIAL_DEFENSE_DOWN_2] = 1, 
+    [EFFECT_RECOIL] = 2,
+    [EFFECT_CONFUSE] = 4,
+    [EFFECT_ATTACK_UP_2] = 1,
+    [EFFECT_DEFENSE_UP_2] = 1,
+    [EFFECT_SPEED_UP_2] = 1,
+    [EFFECT_SPECIAL_ATTACK_UP_2] = 1,
+    [EFFECT_SPECIAL_DEFENSE_UP_2] = 1,
+    [EFFECT_ACCURACY_UP_2] = 1,
+    [EFFECT_EVASION_UP_2] = 1,
+    [EFFECT_TRANSFORM] = 0,
+    [EFFECT_ATTACK_DOWN_2] = 1,
+    [EFFECT_DEFENSE_DOWN_2] = 1,
+    [EFFECT_SPEED_DOWN_2] = 1,
+    [EFFECT_SPECIAL_ATTACK_DOWN_2] = 1,
+    [EFFECT_SPECIAL_DEFENSE_DOWN_2] = 1,
     [EFFECT_ACCURACY_DOWN_2] = 1,
-    [EFFECT_EVASION_DOWN_2] = 1, 
-    [EFFECT_REFLECT] = 7, 
-    [EFFECT_POISON] = 4, 
-    [EFFECT_PARALYZE] = 4, 
-    [EFFECT_ATTACK_DOWN_HIT] = 1, 
-    [EFFECT_DEFENSE_DOWN_HIT] = 1, 
-    [EFFECT_SPEED_DOWN_HIT] = 1, 
-    [EFFECT_SPECIAL_ATTACK_DOWN_HIT] = 1, 
-    [EFFECT_SPECIAL_DEFENSE_DOWN_HIT] = 1, 
-    [EFFECT_ACCURACY_DOWN_HIT] = 1, 
-    [EFFECT_EVASION_DOWN_HIT] = 1, 
-    [EFFECT_SKY_ATTACK] = 4, 
-    [EFFECT_CONFUSE_HIT] = 1, 
-    [EFFECT_TWINEEDLE] = 1, 
-    [EFFECT_VITAL_THROW] = 1, 
+    [EFFECT_EVASION_DOWN_2] = 1,
+    [EFFECT_REFLECT] = 7,
+    [EFFECT_POISON] = 4,
+    [EFFECT_PARALYZE] = 4,
+    [EFFECT_ATTACK_DOWN_HIT] = 1,
+    [EFFECT_DEFENSE_DOWN_HIT] = 1,
+    [EFFECT_SPEED_DOWN_HIT] = 1,
+    [EFFECT_SPECIAL_ATTACK_DOWN_HIT] = 1,
+    [EFFECT_SPECIAL_DEFENSE_DOWN_HIT] = 1,
+    [EFFECT_ACCURACY_DOWN_HIT] = 1,
+    [EFFECT_EVASION_DOWN_HIT] = 1,
+    [EFFECT_SKY_ATTACK] = 4,
+    [EFFECT_CONFUSE_HIT] = 1,
+    [EFFECT_TWINEEDLE] = 1,
+    [EFFECT_VITAL_THROW] = 1,
     [EFFECT_SUBSTITUTE] = 4,
-    [EFFECT_RECHARGE] = 5, 
-    [EFFECT_RAGE] = 2, 
-    [EFFECT_MIMIC] = 4, 
-    [EFFECT_METRONOME] = 1, 
-    [EFFECT_LEECH_SEED] = 4, 
-    [EFFECT_SPLASH] = 1, 
-    [EFFECT_DISABLE] = 7, 
-    [EFFECT_LEVEL_DAMAGE] = 2, 
-    [EFFECT_PSYWAVE] = 1, 
-    [EFFECT_COUNTER] = 5, 
-    [EFFECT_ENCORE] = 7, 
-    [EFFECT_PAIN_SPLIT] = 3, 
-    [EFFECT_SNORE] = 3, 
-    [EFFECT_CONVERSION_2] = 4, 
-    [EFFECT_LOCK_ON] = 3, 
+    [EFFECT_RECHARGE] = 5,
+    [EFFECT_RAGE] = 2,
+    [EFFECT_MIMIC] = 4,
+    [EFFECT_METRONOME] = 1,
+    [EFFECT_LEECH_SEED] = 4,
+    [EFFECT_SPLASH] = 1,
+    [EFFECT_DISABLE] = 7,
+    [EFFECT_LEVEL_DAMAGE] = 2,
+    [EFFECT_PSYWAVE] = 1,
+    [EFFECT_COUNTER] = 5,
+    [EFFECT_ENCORE] = 7,
+    [EFFECT_PAIN_SPLIT] = 3,
+    [EFFECT_SNORE] = 3,
+    [EFFECT_CONVERSION_2] = 4,
+    [EFFECT_LOCK_ON] = 3,
     [EFFECT_SKETCH] = 3,
-    [EFFECT_UNUSED_60] = 3, 
-    [EFFECT_SLEEP_TALK] = 3, 
-    [EFFECT_DESTINY_BOND] = 3, 
-    [EFFECT_FLAIL] = 2, 
-    [EFFECT_SPITE] = 4, 
-    [EFFECT_FALSE_SWIPE] = 1, 
-    [EFFECT_HEAL_BELL] = 5, 
-    [EFFECT_QUICK_ATTACK] = 1, 
-    [EFFECT_TRIPLE_KICK] = 1, 
-    [EFFECT_THIEF] = 4, 
-    [EFFECT_MEAN_LOOK] = 5, 
-    [EFFECT_NIGHTMARE] = 3, 
-    [EFFECT_MINIMIZE] = 1, 
-    [EFFECT_CURSE] = 2, 
-    [EFFECT_UNUSED_6E] = 1, 
+    [EFFECT_UNUSED_60] = 3,
+    [EFFECT_SLEEP_TALK] = 3,
+    [EFFECT_DESTINY_BOND] = 3,
+    [EFFECT_FLAIL] = 2,
+    [EFFECT_SPITE] = 4,
+    [EFFECT_FALSE_SWIPE] = 1,
+    [EFFECT_HEAL_BELL] = 5,
+    [EFFECT_QUICK_ATTACK] = 1,
+    [EFFECT_TRIPLE_KICK] = 1,
+    [EFFECT_THIEF] = 4,
+    [EFFECT_MEAN_LOOK] = 5,
+    [EFFECT_NIGHTMARE] = 3,
+    [EFFECT_MINIMIZE] = 1,
+    [EFFECT_CURSE] = 2,
+    [EFFECT_UNUSED_6E] = 1,
     [EFFECT_PROTECT] = 5,
-    [EFFECT_SPIKES] = 4, 
-    [EFFECT_FORESIGHT] = 3, 
-    [EFFECT_PERISH_SONG] = 6, 
-    [EFFECT_SANDSTORM] = 4, 
-    [EFFECT_ENDURE] = 3, 
-    [EFFECT_ROLLOUT] = 3, 
-    [EFFECT_SWAGGER] = 3, 
-    [EFFECT_FURY_CUTTER] = 2, 
-    [EFFECT_ATTRACT] = 4, 
-    [EFFECT_RETURN] = 1, 
-    [EFFECT_PRESENT] = 1, 
-    [EFFECT_FRUSTRATION] = 1, 
-    [EFFECT_SAFEGUARD] = 5, 
-    [EFFECT_THAW_HIT] = 1, 
-    [EFFECT_MAGNITUDE] = 1, 
+    [EFFECT_SPIKES] = 4,
+    [EFFECT_FORESIGHT] = 3,
+    [EFFECT_PERISH_SONG] = 6,
+    [EFFECT_SANDSTORM] = 4,
+    [EFFECT_ENDURE] = 3,
+    [EFFECT_ROLLOUT] = 3,
+    [EFFECT_SWAGGER] = 3,
+    [EFFECT_FURY_CUTTER] = 2,
+    [EFFECT_ATTRACT] = 4,
+    [EFFECT_RETURN] = 1,
+    [EFFECT_PRESENT] = 1,
+    [EFFECT_FRUSTRATION] = 1,
+    [EFFECT_SAFEGUARD] = 5,
+    [EFFECT_THAW_HIT] = 1,
+    [EFFECT_MAGNITUDE] = 1,
     [EFFECT_BATON_PASS] = 7,
-    [EFFECT_PURSUIT] = 2, 
-    [EFFECT_RAPID_SPIN] = 2, 
-    [EFFECT_SONICBOOM] = 1, 
-    [EFFECT_UNUSED_83] = 1, 
-    [EFFECT_MORNING_SUN] = 4, 
-    [EFFECT_SYNTHESIS] = 4, 
-    [EFFECT_MOONLIGHT] = 4, 
-    [EFFECT_HIDDEN_POWER] = 1, 
-    [EFFECT_RAIN_DANCE] = 4, 
-    [EFFECT_SUNNY_DAY] = 4, 
-    [EFFECT_DEFENSE_UP_HIT] = 1, 
-    [EFFECT_ATTACK_UP_HIT] = 1, 
-    [EFFECT_ALL_STATS_UP_HIT] = 1, 
-    [EFFECT_UNUSED_8D] = 1, 
-    [EFFECT_BELLY_DRUM] = 7, 
+    [EFFECT_PURSUIT] = 2,
+    [EFFECT_RAPID_SPIN] = 2,
+    [EFFECT_SONICBOOM] = 1,
+    [EFFECT_UNUSED_83] = 1,
+    [EFFECT_MORNING_SUN] = 4,
+    [EFFECT_SYNTHESIS] = 4,
+    [EFFECT_MOONLIGHT] = 4,
+    [EFFECT_HIDDEN_POWER] = 1,
+    [EFFECT_RAIN_DANCE] = 4,
+    [EFFECT_SUNNY_DAY] = 4,
+    [EFFECT_DEFENSE_UP_HIT] = 1,
+    [EFFECT_ATTACK_UP_HIT] = 1,
+    [EFFECT_ALL_STATS_UP_HIT] = 1,
+    [EFFECT_UNUSED_8D] = 1,
+    [EFFECT_BELLY_DRUM] = 7,
     [EFFECT_PSYCH_UP] = 7,
-    [EFFECT_MIRROR_COAT] = 6, 
-    [EFFECT_SKULL_BASH] = 3, 
-    [EFFECT_TWISTER] = 1, 
+    [EFFECT_MIRROR_COAT] = 6,
+    [EFFECT_SKULL_BASH] = 3,
+    [EFFECT_TWISTER] = 1,
     [EFFECT_EARTHQUAKE] = 1,
-    [EFFECT_FUTURE_SIGHT] = 1, 
-    [EFFECT_GUST] = 1, 
-    [EFFECT_FLINCH_MINIMIZE_HIT] = 1, 
-    [EFFECT_SOLARBEAM] = 1, 
-    [EFFECT_THUNDER] = 1, 
-    [EFFECT_TELEPORT] = 1, 
-    [EFFECT_BEAT_UP] = 2, 
-    [EFFECT_SEMI_INVULNERABLE] = 3, 
-    [EFFECT_DEFENSE_CURL] = 1, 
-    [EFFECT_SOFTBOILED] = 1, 
-    [EFFECT_FAKE_OUT] = 4, 
+    [EFFECT_FUTURE_SIGHT] = 1,
+    [EFFECT_GUST] = 1,
+    [EFFECT_FLINCH_MINIMIZE_HIT] = 1,
+    [EFFECT_SOLARBEAM] = 1,
+    [EFFECT_THUNDER] = 1,
+    [EFFECT_TELEPORT] = 1,
+    [EFFECT_BEAT_UP] = 2,
+    [EFFECT_SEMI_INVULNERABLE] = 3,
+    [EFFECT_DEFENSE_CURL] = 1,
+    [EFFECT_SOFTBOILED] = 1,
+    [EFFECT_FAKE_OUT] = 4,
     [EFFECT_UPROAR] = 4,
-    [EFFECT_STOCKPILE] = 3, 
-    [EFFECT_SPIT_UP] = 3, 
-    [EFFECT_SWALLOW] = 3, 
-    [EFFECT_UNUSED_A3] = 1, 
-    [EFFECT_HAIL] = 4, 
-    [EFFECT_TORMENT] = 7, 
-    [EFFECT_FLATTER] = 7, 
-    [EFFECT_WILL_O_WISP] = 5, 
-    [EFFECT_MEMENTO] = 7, 
-    [EFFECT_FACADE] = 1, 
-    [EFFECT_FOCUS_PUNCH] = 7, 
-    [EFFECT_SMELLINGSALT] = 1, 
-    [EFFECT_FOLLOW_ME] = 5, 
-    [EFFECT_NATURE_POWER] = 0, 
-    [EFFECT_CHARGE] = 4, 
+    [EFFECT_STOCKPILE] = 3,
+    [EFFECT_SPIT_UP] = 3,
+    [EFFECT_SWALLOW] = 3,
+    [EFFECT_UNUSED_A3] = 1,
+    [EFFECT_HAIL] = 4,
+    [EFFECT_TORMENT] = 7,
+    [EFFECT_FLATTER] = 7,
+    [EFFECT_WILL_O_WISP] = 5,
+    [EFFECT_MEMENTO] = 7,
+    [EFFECT_FACADE] = 1,
+    [EFFECT_FOCUS_PUNCH] = 7,
+    [EFFECT_SMELLINGSALT] = 1,
+    [EFFECT_FOLLOW_ME] = 5,
+    [EFFECT_NATURE_POWER] = 0,
+    [EFFECT_CHARGE] = 4,
     [EFFECT_TAUNT] = 4,
-    [EFFECT_HELPING_HAND] = 4, 
-    [EFFECT_TRICK] = 4, 
-    [EFFECT_ROLE_PLAY] = 4, 
-    [EFFECT_WISH] = 2, 
-    [EFFECT_ASSIST] = 2, 
-    [EFFECT_INGRAIN] = 6, 
-    [EFFECT_SUPERPOWER] = 3, 
-    [EFFECT_MAGIC_COAT] = 6, 
-    [EFFECT_RECYCLE] = 4, 
-    [EFFECT_REVENGE] = 4, 
-    [EFFECT_BRICK_BREAK] = 2, 
-    [EFFECT_YAWN] = 5, 
-    [EFFECT_KNOCK_OFF] = 2, 
-    [EFFECT_ENDEAVOR] = 1, 
-    [EFFECT_ERUPTION] = 1, 
+    [EFFECT_HELPING_HAND] = 4,
+    [EFFECT_TRICK] = 4,
+    [EFFECT_ROLE_PLAY] = 4,
+    [EFFECT_WISH] = 2,
+    [EFFECT_ASSIST] = 2,
+    [EFFECT_INGRAIN] = 6,
+    [EFFECT_SUPERPOWER] = 3,
+    [EFFECT_MAGIC_COAT] = 6,
+    [EFFECT_RECYCLE] = 4,
+    [EFFECT_REVENGE] = 4,
+    [EFFECT_BRICK_BREAK] = 2,
+    [EFFECT_YAWN] = 5,
+    [EFFECT_KNOCK_OFF] = 2,
+    [EFFECT_ENDEAVOR] = 1,
+    [EFFECT_ERUPTION] = 1,
     [EFFECT_SKILL_SWAP] = 6,
-    [EFFECT_IMPRISON] = 6, 
-    [EFFECT_REFRESH] = 6, 
-    [EFFECT_GRUDGE] = 1, 
-    [EFFECT_SNATCH] = 1, 
-    [EFFECT_LOW_KICK] = 1, 
-    [EFFECT_SECRET_POWER] = 1, 
-    [EFFECT_DOUBLE_EDGE] = 2, 
-    [EFFECT_TEETER_DANCE] = 6, 
-    [EFFECT_BLAZE_KICK] = 1, 
-    [EFFECT_MUD_SPORT] = 4, 
-    [EFFECT_POISON_FANG] = 1, 
-    [EFFECT_WEATHER_BALL] = 1, 
-    [EFFECT_OVERHEAT] = 3, 
-    [EFFECT_TICKLE] = 1, 
-    [EFFECT_COSMIC_POWER] = 1, 
+    [EFFECT_IMPRISON] = 6,
+    [EFFECT_REFRESH] = 6,
+    [EFFECT_GRUDGE] = 1,
+    [EFFECT_SNATCH] = 1,
+    [EFFECT_LOW_KICK] = 1,
+    [EFFECT_SECRET_POWER] = 1,
+    [EFFECT_DOUBLE_EDGE] = 2,
+    [EFFECT_TEETER_DANCE] = 6,
+    [EFFECT_BLAZE_KICK] = 1,
+    [EFFECT_MUD_SPORT] = 4,
+    [EFFECT_POISON_FANG] = 1,
+    [EFFECT_WEATHER_BALL] = 1,
+    [EFFECT_OVERHEAT] = 3,
+    [EFFECT_TICKLE] = 1,
+    [EFFECT_COSMIC_POWER] = 1,
     [EFFECT_SKY_UPPERCUT] = 1,
-    [EFFECT_BULK_UP] = 1, 
-    [EFFECT_POISON_TAIL] = 1, 
-    [EFFECT_WATER_SPORT] = 4, 
-    [EFFECT_CALM_MIND] = 1, 
-    [EFFECT_DRAGON_DANCE] = 1, 
+    [EFFECT_BULK_UP] = 1,
+    [EFFECT_POISON_TAIL] = 1,
+    [EFFECT_WATER_SPORT] = 4,
+    [EFFECT_CALM_MIND] = 1,
+    [EFFECT_DRAGON_DANCE] = 1,
     [EFFECT_CAMOUFLAGE] = 3
 };
 
@@ -312,93 +312,93 @@ static const u16 sPoints_SetUp[] =
 {
     4, // Future Sight
     4, // Doom Desire
-    6, 
+    6,
     6, // Wish
     7, // Grudge
-    6, 
+    6,
     2  // Ingrain
 };
 static const u16 sPoints_RainMoves[] =
 {
-    MOVE_BUBBLE, 3, 
-    MOVE_WHIRLPOOL, 3, 
-    MOVE_OCTAZOOKA, 3, 
-    MOVE_CLAMP, 3, 
-    MOVE_WITHDRAW, 3, 
-    MOVE_CRABHAMMER, 3, 
-    MOVE_WATER_SPOUT, 3, 
+    MOVE_BUBBLE, 3,
+    MOVE_WHIRLPOOL, 3,
+    MOVE_OCTAZOOKA, 3,
+    MOVE_CLAMP, 3,
+    MOVE_WITHDRAW, 3,
+    MOVE_CRABHAMMER, 3,
+    MOVE_WATER_SPOUT, 3,
     MOVE_DIVE, 3,
-    MOVE_WATERFALL, 3, 
-    MOVE_MUDDY_WATER, 3, 
-    MOVE_SURF, 3, 
-    MOVE_HYDRO_CANNON, 3, 
-    MOVE_HYDRO_PUMP, 3, 
-    MOVE_BUBBLE_BEAM, 3, 
+    MOVE_WATERFALL, 3,
+    MOVE_MUDDY_WATER, 3,
+    MOVE_SURF, 3,
+    MOVE_HYDRO_CANNON, 3,
+    MOVE_HYDRO_PUMP, 3,
+    MOVE_BUBBLE_BEAM, 3,
     MOVE_WATER_SPORT, 0, // Unnecessary, unlisted moves are already given 0 points
     MOVE_WATER_GUN, 3,
-    MOVE_WATER_PULSE, 3, 
-    MOVE_WEATHER_BALL, 3, 
-    MOVE_THUNDER, 3, 
-    MOVE_SOLAR_BEAM, -4, 
-    MOVE_OVERHEAT, -4, 
-    MOVE_FLAME_WHEEL, -4, 
-    MOVE_FLAMETHROWER, -4, 
+    MOVE_WATER_PULSE, 3,
+    MOVE_WEATHER_BALL, 3,
+    MOVE_THUNDER, 3,
+    MOVE_SOLAR_BEAM, -4,
+    MOVE_OVERHEAT, -4,
+    MOVE_FLAME_WHEEL, -4,
+    MOVE_FLAMETHROWER, -4,
     MOVE_SACRED_FIRE, -4,
-    MOVE_FIRE_BLAST, -4, 
-    MOVE_HEAT_WAVE, -4, 
-    MOVE_EMBER, -4, 
-    MOVE_BLAST_BURN, -4, 
-    MOVE_BLAZE_KICK, -4, 
-    MOVE_ERUPTION, -4, 
-    MOVE_FIRE_SPIN, -4, 
+    MOVE_FIRE_BLAST, -4,
+    MOVE_HEAT_WAVE, -4,
+    MOVE_EMBER, -4,
+    MOVE_BLAST_BURN, -4,
+    MOVE_BLAZE_KICK, -4,
+    MOVE_ERUPTION, -4,
+    MOVE_FIRE_SPIN, -4,
     MOVE_FIRE_PUNCH, -4,
     MOVE_SOLAR_BEAM, -4, // Repeated
     TABLE_END, 0
 };
 static const u16 sPoints_SunMoves[] =
 {
-    MOVE_OVERHEAT, 3, 
-    MOVE_FLAME_WHEEL, 3, 
-    MOVE_FLAMETHROWER, 3, 
-    MOVE_SACRED_FIRE, 3, 
-    MOVE_FIRE_BLAST, 3, 
-    MOVE_HEAT_WAVE, 3, 
-    MOVE_EMBER, 3, 
+    MOVE_OVERHEAT, 3,
+    MOVE_FLAME_WHEEL, 3,
+    MOVE_FLAMETHROWER, 3,
+    MOVE_SACRED_FIRE, 3,
+    MOVE_FIRE_BLAST, 3,
+    MOVE_HEAT_WAVE, 3,
+    MOVE_EMBER, 3,
     MOVE_BLAST_BURN, 3,
-    MOVE_BLAZE_KICK, 3, 
-    MOVE_ERUPTION, 3, 
-    MOVE_FIRE_SPIN, 3, 
-    MOVE_FIRE_PUNCH, 3, 
-    MOVE_SOLAR_BEAM, 5, 
-    MOVE_SYNTHESIS, 3, 
-    MOVE_MORNING_SUN, 3, 
+    MOVE_BLAZE_KICK, 3,
+    MOVE_ERUPTION, 3,
+    MOVE_FIRE_SPIN, 3,
+    MOVE_FIRE_PUNCH, 3,
+    MOVE_SOLAR_BEAM, 5,
+    MOVE_SYNTHESIS, 3,
+    MOVE_MORNING_SUN, 3,
     MOVE_MOONLIGHT, 3,
-    MOVE_WEATHER_BALL, 3, 
+    MOVE_WEATHER_BALL, 3,
     TABLE_END, 0
 };
 static const u16 sPoints_SandstormMoves[] =
 {
-    MOVE_WEATHER_BALL, 3, 
-    MOVE_SOLAR_BEAM, -3, 
+    MOVE_WEATHER_BALL, 3,
+    MOVE_SOLAR_BEAM, -3,
     TABLE_END, 0
 };
 static const u16 sPoints_HailMoves[] =
 {
-    MOVE_WEATHER_BALL, 3, 
-    MOVE_SOLAR_BEAM, -3, 
+    MOVE_WEATHER_BALL, 3,
+    MOVE_SOLAR_BEAM, -3,
     TABLE_END, 0
 };
 static const u16 sPoints_ElectricMoves[] =
 {
-    MOVE_THUNDERBOLT, 3, 
-    MOVE_THUNDER_PUNCH, 3, 
-    MOVE_SPARK, 3, 
-    MOVE_THUNDER_SHOCK, 3, 
-    MOVE_ZAP_CANNON, 3, 
-    MOVE_SHOCK_WAVE, 3, 
+    MOVE_THUNDERBOLT, 3,
+    MOVE_THUNDER_PUNCH, 3,
+    MOVE_SPARK, 3,
+    MOVE_THUNDER_SHOCK, 3,
+    MOVE_ZAP_CANNON, 3,
+    MOVE_SHOCK_WAVE, 3,
     MOVE_THUNDER_WAVE, 0, // Unnecessary, unlisted moves are already given 0 points
     MOVE_THUNDER, 3,
-    MOVE_VOLT_TACKLE, 3, 
+    MOVE_VOLT_TACKLE, 3,
     TABLE_END, 0
 };
 static const u16 sPoints_StatusDmg[] =
@@ -407,7 +407,7 @@ static const u16 sPoints_StatusDmg[] =
     3, // Leech Seed
     3, // Poison
     3, // Toxic
-    3, // Burn 
+    3, // Burn
     3, // Nightmare
     3  // Wrap (Trapping move)
 };
@@ -434,62 +434,62 @@ static const u16 sPoints_Flinched[] = { 4 };
 
 static const u16 sPoints_StatIncrease1[NUM_BATTLE_STATS - 1] =
 {
-    [STAT_ATK - 1]     = 2, 
-    [STAT_DEF - 1]     = 2, 
-    [STAT_SPEED - 1]   = 2, 
-    [STAT_SPATK - 1]   = 2, 
-    [STAT_SPDEF - 1]   = 2, 
-    [STAT_ACC - 1]     = 2, 
+    [STAT_ATK - 1]     = 2,
+    [STAT_DEF - 1]     = 2,
+    [STAT_SPEED - 1]   = 2,
+    [STAT_SPATK - 1]   = 2,
+    [STAT_SPDEF - 1]   = 2,
+    [STAT_ACC - 1]     = 2,
     [STAT_EVASION - 1] = 2
 };
 static const u16 sPoints_StatIncrease2[NUM_BATTLE_STATS - 1] =
 {
-    [STAT_ATK - 1]     = 4, 
-    [STAT_DEF - 1]     = 4, 
-    [STAT_SPEED - 1]   = 4, 
-    [STAT_SPATK - 1]   = 4, 
-    [STAT_SPDEF - 1]   = 4, 
-    [STAT_ACC - 1]     = 4, 
+    [STAT_ATK - 1]     = 4,
+    [STAT_DEF - 1]     = 4,
+    [STAT_SPEED - 1]   = 4,
+    [STAT_SPATK - 1]   = 4,
+    [STAT_SPDEF - 1]   = 4,
+    [STAT_ACC - 1]     = 4,
     [STAT_EVASION - 1] = 4
 };
 static const u16 sPoints_StatDecreaseSelf[NUM_BATTLE_STATS - 1] =
 {
-    [STAT_ATK - 1]     = -1, 
-    [STAT_DEF - 1]     = -1, 
-    [STAT_SPEED - 1]   = -1, 
-    [STAT_SPATK - 1]   = -1, 
-    [STAT_SPDEF - 1]   = -1, 
-    [STAT_ACC - 1]     = -1, 
+    [STAT_ATK - 1]     = -1,
+    [STAT_DEF - 1]     = -1,
+    [STAT_SPEED - 1]   = -1,
+    [STAT_SPATK - 1]   = -1,
+    [STAT_SPDEF - 1]   = -1,
+    [STAT_ACC - 1]     = -1,
     [STAT_EVASION - 1] = -1
 };
 static const u16 sPoints_StatDecrease1[NUM_BATTLE_STATS - 1] =
 {
-    [STAT_ATK - 1]     = 2, 
-    [STAT_DEF - 1]     = 2, 
-    [STAT_SPEED - 1]   = 2, 
-    [STAT_SPATK - 1]   = 2, 
-    [STAT_SPDEF - 1]   = 2, 
-    [STAT_ACC - 1]     = 2, 
+    [STAT_ATK - 1]     = 2,
+    [STAT_DEF - 1]     = 2,
+    [STAT_SPEED - 1]   = 2,
+    [STAT_SPATK - 1]   = 2,
+    [STAT_SPDEF - 1]   = 2,
+    [STAT_ACC - 1]     = 2,
     [STAT_EVASION - 1] = 2
 };
 static const u16 sPoints_StatDecrease2[NUM_BATTLE_STATS - 1] =
 {
-    [STAT_ATK - 1]     = 4, 
-    [STAT_DEF - 1]     = 4, 
-    [STAT_SPEED - 1]   = 4, 
-    [STAT_SPATK - 1]   = 4, 
-    [STAT_SPDEF - 1]   = 4, 
-    [STAT_ACC - 1]     = 4, 
+    [STAT_ATK - 1]     = 4,
+    [STAT_DEF - 1]     = 4,
+    [STAT_SPEED - 1]   = 4,
+    [STAT_SPATK - 1]   = 4,
+    [STAT_SPDEF - 1]   = 4,
+    [STAT_ACC - 1]     = 4,
     [STAT_EVASION - 1] = 4
 };
 static const u16 sPoints_StatIncreaseNotSelf[NUM_BATTLE_STATS - 1] =
 {
-    [STAT_ATK - 1]     = -2, 
-    [STAT_DEF - 1]     = -2, 
-    [STAT_SPEED - 1]   = -2, 
+    [STAT_ATK - 1]     = -2,
+    [STAT_DEF - 1]     = -2,
+    [STAT_SPEED - 1]   = -2,
     [STAT_SPATK - 1]   = -2,
-    [STAT_SPDEF - 1]   = -2, 
-    [STAT_ACC - 1]     = -2, 
+    [STAT_SPDEF - 1]   = -2,
+    [STAT_ACC - 1]     = -2,
     [STAT_EVASION - 1] = -2
 };
 
@@ -1246,7 +1246,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3)
         break;
     case PTS_REFLECT:
         // If hit Reflect with damaging physical move
-        if (type < TYPE_MYSTERY && power != 0 && tvPtr->side[defSide].reflectMonId != 0)
+        if (IS_TYPE_PHYSICAL(type) && power != 0 && tvPtr->side[defSide].reflectMonId != 0)
         {
             u32 id = (tvPtr->side[defSide].reflectMonId - 1) * 4;
             movePoints->points[defSide][id + tvPtr->side[defSide].reflectMoveSlot] += sPointsArray[caseId][0];
@@ -1254,7 +1254,7 @@ static void AddMovePoints(u8 caseId, u16 arg1, u8 arg2, u8 arg3)
         break;
     case PTS_LIGHT_SCREEN:
         // If hit Light Screen with damaging special move
-        if (type >= TYPE_MYSTERY && power != 0 && tvPtr->side[defSide].lightScreenMonId != 0)
+        if (!IS_TYPE_PHYSICAL(type) && power != 0 && tvPtr->side[defSide].lightScreenMonId != 0)
         {
             u32 id = (tvPtr->side[defSide].lightScreenMonId - 1) * 4;
             movePoints->points[defSide][id + tvPtr->side[defSide].lightScreenMoveSlot] += sPointsArray[caseId][0];
@@ -1593,12 +1593,12 @@ u8 GetBattlerMoveSlotId(u8 battlerId, u16 moveId)
 
 static void AddPointsBasedOnWeather(u16 weatherFlags, u16 moveId, u8 moveSlot)
 {
-    if (weatherFlags & WEATHER_RAIN_ANY)
+    if (weatherFlags & B_WEATHER_RAIN)
         AddMovePoints(PTS_RAIN, moveId, moveSlot, 0);
-    else if (weatherFlags & WEATHER_SUN_ANY)
+    else if (weatherFlags & B_WEATHER_SUN)
         AddMovePoints(PTS_SUN, moveId, moveSlot, 0);
-    else if (weatherFlags & WEATHER_SANDSTORM_ANY)
+    else if (weatherFlags & B_WEATHER_SANDSTORM)
         AddMovePoints(PTS_SANDSTORM, moveId, moveSlot, 0);
-    else if (weatherFlags & WEATHER_HAIL_ANY)
+    else if (weatherFlags & B_WEATHER_HAIL)
         AddMovePoints(PTS_HAIL, moveId, moveSlot, 0);
 }
diff --git a/src/battle_util.c b/src/battle_util.c
index cbcd445b7..8617134dc 100644
--- a/src/battle_util.c
+++ b/src/battle_util.c
@@ -646,9 +646,9 @@ void HandleAction_NothingIsFainted(void)
     gCurrentActionFuncId = gActionsByTurnOrder[gCurrentTurnActionNumber];
     gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
                     | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR
-                    | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000
-                    | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT
-                    | HITMARKER_CHARGING | HITMARKER_x4000000);
+                    | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_PASSIVE_DAMAGE
+                    | HITMARKER_OBEYS | HITMARKER_WAKE_UP_CLEAR | HITMARKER_SYNCHRONISE_EFFECT
+                    | HITMARKER_CHARGING | HITMARKER_NEVER_SET);
 }
 
 void HandleAction_ActionFinished(void)
@@ -659,9 +659,9 @@ void HandleAction_ActionFinished(void)
     SpecialStatusesClear();
     gHitMarker &= ~(HITMARKER_DESTINYBOND | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_ATTACKSTRING_PRINTED
                     | HITMARKER_NO_PPDEDUCT | HITMARKER_IGNORE_SAFEGUARD | HITMARKER_IGNORE_ON_AIR
-                    | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_x100000
-                    | HITMARKER_OBEYS | HITMARKER_x10 | HITMARKER_SYNCHRONISE_EFFECT
-                    | HITMARKER_CHARGING | HITMARKER_x4000000);
+                    | HITMARKER_IGNORE_UNDERGROUND | HITMARKER_IGNORE_UNDERWATER | HITMARKER_PASSIVE_DAMAGE
+                    | HITMARKER_OBEYS | HITMARKER_WAKE_UP_CLEAR | HITMARKER_SYNCHRONISE_EFFECT
+                    | HITMARKER_CHARGING | HITMARKER_NEVER_SET);
 
     gCurrentMove = 0;
     gBattleMoveDamage = 0;
@@ -1320,22 +1320,22 @@ u8 DoFieldEndTurnEffects(void)
             }
             break;
         case ENDTURN_RAIN:
-            if (gBattleWeather & WEATHER_RAIN_ANY)
+            if (gBattleWeather & B_WEATHER_RAIN)
             {
-                if (!(gBattleWeather & WEATHER_RAIN_PERMANENT))
+                if (!(gBattleWeather & B_WEATHER_RAIN_PERMANENT))
                 {
                     if (--gWishFutureKnock.weatherDuration == 0)
                     {
-                        gBattleWeather &= ~WEATHER_RAIN_TEMPORARY;
-                        gBattleWeather &= ~WEATHER_RAIN_DOWNPOUR;
+                        gBattleWeather &= ~B_WEATHER_RAIN_TEMPORARY;
+                        gBattleWeather &= ~B_WEATHER_RAIN_DOWNPOUR;
                         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_RAIN_STOPPED;
                     }
-                    else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR)
+                    else if (gBattleWeather & B_WEATHER_RAIN_DOWNPOUR)
                         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_DOWNPOUR_CONTINUES;
                     else
                         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_RAIN_CONTINUES;
                 }
-                else if (gBattleWeather & WEATHER_RAIN_DOWNPOUR)
+                else if (gBattleWeather & B_WEATHER_RAIN_DOWNPOUR)
                 {
                     gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_DOWNPOUR_CONTINUES;
                 }
@@ -1350,11 +1350,11 @@ u8 DoFieldEndTurnEffects(void)
             gBattleStruct->turnCountersTracker++;
             break;
         case ENDTURN_SANDSTORM:
-            if (gBattleWeather & WEATHER_SANDSTORM_ANY)
+            if (gBattleWeather & B_WEATHER_SANDSTORM)
             {
-                if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
+                if (!(gBattleWeather & B_WEATHER_SANDSTORM_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
                 {
-                    gBattleWeather &= ~WEATHER_SANDSTORM_TEMPORARY;
+                    gBattleWeather &= ~B_WEATHER_SANDSTORM_TEMPORARY;
                     gBattlescriptCurrInstr = BattleScript_SandStormHailEnds;
                 }
                 else
@@ -1370,11 +1370,11 @@ u8 DoFieldEndTurnEffects(void)
             gBattleStruct->turnCountersTracker++;
             break;
         case ENDTURN_SUN:
-            if (gBattleWeather & WEATHER_SUN_ANY)
+            if (gBattleWeather & B_WEATHER_SUN)
             {
-                if (!(gBattleWeather & WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
+                if (!(gBattleWeather & B_WEATHER_SUN_PERMANENT) && --gWishFutureKnock.weatherDuration == 0)
                 {
-                    gBattleWeather &= ~WEATHER_SUN_TEMPORARY;
+                    gBattleWeather &= ~B_WEATHER_SUN_TEMPORARY;
                     gBattlescriptCurrInstr = BattleScript_SunlightFaded;
                 }
                 else
@@ -1388,11 +1388,11 @@ u8 DoFieldEndTurnEffects(void)
             gBattleStruct->turnCountersTracker++;
             break;
         case ENDTURN_HAIL:
-            if (gBattleWeather & WEATHER_HAIL_ANY)
+            if (gBattleWeather & B_WEATHER_HAIL)
             {
                 if (--gWishFutureKnock.weatherDuration == 0)
                 {
-                    gBattleWeather &= ~WEATHER_HAIL;
+                    gBattleWeather &= ~B_WEATHER_HAIL_TEMPORARY;
                     gBattlescriptCurrInstr = BattleScript_SandStormHailEnds;
                 }
                 else
@@ -1443,7 +1443,7 @@ u8 DoBattlerEndTurnEffects(void)
 {
     u8 effect = 0;
 
-    gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
+    gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK);
     while (gBattleStruct->turnEffectsBattlerId < gBattlersCount && gBattleStruct->turnEffectsTracker <= ENDTURN_BATTLER_COUNT)
     {
         gActiveBattler = gBattlerAttacker = gBattlerByTurnOrder[gBattleStruct->turnEffectsBattlerId];
@@ -1756,13 +1756,13 @@ u8 DoBattlerEndTurnEffects(void)
                 return effect;
         }
     }
-    gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_x20);
+    gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK);
     return 0;
 }
 
 bool8 HandleWishPerishSongOnTurnEnd(void)
 {
-    gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_x20);
+    gHitMarker |= (HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK);
 
     switch (gBattleStruct->wishPerishSongState)
     {
@@ -1862,7 +1862,7 @@ bool8 HandleWishPerishSongOnTurnEnd(void)
         break;
     }
 
-    gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_x20);
+    gHitMarker &= ~(HITMARKER_GRUDGE | HITMARKER_SKIP_DMG_TRACK);
 
     return FALSE;
 }
@@ -2389,22 +2389,22 @@ u8 CastformDataTypeChange(u8 battler)
     }
     if (!WEATHER_HAS_EFFECT)
         return CASTFORM_NO_CHANGE;
-    if (!(gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SUN_ANY | WEATHER_HAIL_ANY)) && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL))
+    if (!(gBattleWeather & (B_WEATHER_RAIN | B_WEATHER_SUN | B_WEATHER_HAIL)) && !IS_BATTLER_OF_TYPE(battler, TYPE_NORMAL))
     {
         SET_BATTLER_TYPE(battler, TYPE_NORMAL);
         formChange = CASTFORM_TO_NORMAL;
     }
-    if (gBattleWeather & WEATHER_SUN_ANY && !IS_BATTLER_OF_TYPE(battler, TYPE_FIRE))
+    if (gBattleWeather & B_WEATHER_SUN && !IS_BATTLER_OF_TYPE(battler, TYPE_FIRE))
     {
         SET_BATTLER_TYPE(battler, TYPE_FIRE);
         formChange = CASTFORM_TO_FIRE;
     }
-    if (gBattleWeather & WEATHER_RAIN_ANY && !IS_BATTLER_OF_TYPE(battler, TYPE_WATER))
+    if (gBattleWeather & B_WEATHER_RAIN && !IS_BATTLER_OF_TYPE(battler, TYPE_WATER))
     {
         SET_BATTLER_TYPE(battler, TYPE_WATER);
         formChange = CASTFORM_TO_WATER;
     }
-    if (gBattleWeather & WEATHER_HAIL_ANY && !IS_BATTLER_OF_TYPE(battler, TYPE_ICE))
+    if (gBattleWeather & B_WEATHER_HAIL && !IS_BATTLER_OF_TYPE(battler, TYPE_ICE))
     {
         SET_BATTLER_TYPE(battler, TYPE_ICE);
         formChange = CASTFORM_TO_ICE;
@@ -2480,27 +2480,27 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                     case WEATHER_RAIN:
                     case WEATHER_RAIN_THUNDERSTORM:
                     case WEATHER_DOWNPOUR:
-                        if (!(gBattleWeather & WEATHER_RAIN_ANY))
+                        if (!(gBattleWeather & B_WEATHER_RAIN))
                         {
-                            gBattleWeather = (WEATHER_RAIN_TEMPORARY | WEATHER_RAIN_PERMANENT);
+                            gBattleWeather = (B_WEATHER_RAIN_TEMPORARY | B_WEATHER_RAIN_PERMANENT);
                             gBattleScripting.animArg1 = B_ANIM_RAIN_CONTINUES;
                             gBattleScripting.battler = battler;
                             effect++;
                         }
                         break;
                     case WEATHER_SANDSTORM:
-                        if (!(gBattleWeather & WEATHER_SANDSTORM_ANY))
+                        if (!(gBattleWeather & B_WEATHER_SANDSTORM))
                         {
-                            gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY);
+                            gBattleWeather = B_WEATHER_SANDSTORM;
                             gBattleScripting.animArg1 = B_ANIM_SANDSTORM_CONTINUES;
                             gBattleScripting.battler = battler;
                             effect++;
                         }
                         break;
                     case WEATHER_DROUGHT:
-                        if (!(gBattleWeather & WEATHER_SUN_ANY))
+                        if (!(gBattleWeather & B_WEATHER_SUN))
                         {
-                            gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY);
+                            gBattleWeather = B_WEATHER_SUN;
                             gBattleScripting.animArg1 = B_ANIM_SUN_CONTINUES;
                             gBattleScripting.battler = battler;
                             effect++;
@@ -2515,27 +2515,27 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 }
                 break;
             case ABILITY_DRIZZLE:
-                if (!(gBattleWeather & WEATHER_RAIN_PERMANENT))
+                if (!(gBattleWeather & B_WEATHER_RAIN_PERMANENT))
                 {
-                    gBattleWeather = (WEATHER_RAIN_PERMANENT | WEATHER_RAIN_TEMPORARY);
+                    gBattleWeather = (B_WEATHER_RAIN_PERMANENT | B_WEATHER_RAIN_TEMPORARY);
                     BattleScriptPushCursorAndCallback(BattleScript_DrizzleActivates);
                     gBattleScripting.battler = battler;
                     effect++;
                 }
                 break;
             case ABILITY_SAND_STREAM:
-                if (!(gBattleWeather & WEATHER_SANDSTORM_PERMANENT))
+                if (!(gBattleWeather & B_WEATHER_SANDSTORM_PERMANENT))
                 {
-                    gBattleWeather = (WEATHER_SANDSTORM_PERMANENT | WEATHER_SANDSTORM_TEMPORARY);
+                    gBattleWeather = B_WEATHER_SANDSTORM;
                     BattleScriptPushCursorAndCallback(BattleScript_SandstreamActivates);
                     gBattleScripting.battler = battler;
                     effect++;
                 }
                 break;
             case ABILITY_DROUGHT:
-                if (!(gBattleWeather & WEATHER_SUN_PERMANENT))
+                if (!(gBattleWeather & B_WEATHER_SUN_PERMANENT))
                 {
-                    gBattleWeather = (WEATHER_SUN_PERMANENT | WEATHER_SUN_TEMPORARY);
+                    gBattleWeather = B_WEATHER_SUN;
                     BattleScriptPushCursorAndCallback(BattleScript_DroughtActivates);
                     gBattleScripting.battler = battler;
                     effect++;
@@ -2590,7 +2590,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveA
                 switch (gLastUsedAbility)
                 {
                 case ABILITY_RAIN_DISH:
-                    if (WEATHER_HAS_EFFECT && (gBattleWeather & WEATHER_RAIN_ANY)
+                    if (WEATHER_HAS_EFFECT && (gBattleWeather & B_WEATHER_RAIN)
                      && gBattleMons[battler].maxHP > gBattleMons[battler].hp)
                     {
                         gLastUsedAbility = ABILITY_RAIN_DISH; // why
@@ -3458,7 +3458,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 break;
             // copy/paste again, smh
             case HOLD_EFFECT_ATTACK_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam 
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam
                     && !moveTurn && gBattleMons[battlerId].statStages[STAT_ATK] < MAX_STAT_STAGE)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_ATK);
@@ -3473,7 +3473,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_DEFENSE_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn 
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn
                     && gBattleMons[battlerId].statStages[STAT_DEF] < MAX_STAT_STAGE)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_DEF);
@@ -3487,7 +3487,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_SPEED_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn 
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn
                     && gBattleMons[battlerId].statStages[STAT_SPEED] < MAX_STAT_STAGE)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPEED);
@@ -3501,7 +3501,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_SP_ATTACK_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn 
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn
                     && gBattleMons[battlerId].statStages[STAT_SPATK] < MAX_STAT_STAGE)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPATK);
@@ -3515,7 +3515,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_SP_DEFENSE_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn 
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn
                     && gBattleMons[battlerId].statStages[STAT_SPDEF] < MAX_STAT_STAGE)
                 {
                     PREPARE_STAT_BUFFER(gBattleTextBuff1, STAT_SPDEF);
@@ -3529,7 +3529,7 @@ u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn)
                 }
                 break;
             case HOLD_EFFECT_CRITICAL_UP:
-                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn 
+                if (gBattleMons[battlerId].hp <= gBattleMons[battlerId].maxHP / battlerHoldEffectParam && !moveTurn
                     && !(gBattleMons[battlerId].status2 & STATUS2_FOCUS_ENERGY))
                 {
                     gBattleMons[battlerId].status2 |= STATUS2_FOCUS_ENERGY;
@@ -4067,7 +4067,7 @@ u8 IsMonDisobedient(void)
             gCalledMove = gBattleMons[gBattlerAttacker].moves[gCurrMovePos];
             gBattlescriptCurrInstr = BattleScript_IgnoresAndUsesRandomMove;
             gBattlerTarget = GetMoveTarget(gCalledMove, 0);
-            gHitMarker |= HITMARKER_x200000;
+            gHitMarker |= HITMARKER_DISOBEDIENT_MOVE;
             return 2;
         }
     }
diff --git a/src/battle_util2.c b/src/battle_util2.c
index def7302d3..3838f22bb 100644
--- a/src/battle_util2.c
+++ b/src/battle_util2.c
@@ -121,7 +121,9 @@ void SwitchPartyOrderInGameMulti(u8 battlerId, u8 arg1)
     }
 }
 
-u32 sub_805725C(u8 battlerId)
+// Called when a Pokémon is unable to attack during a Battle Palace battle.
+// Check if it was because they are frozen/asleep, and if so try to cure the status.
+u32 BattlePalace_TryEscapeStatus(u8 battlerId)
 {
     u32 effect = 0;
 
@@ -134,6 +136,7 @@ u32 sub_805725C(u8 battlerId)
             {
                 if (UproarWakeUpCheck(battlerId))
                 {
+                    // Wake up from Uproar
                     gBattleMons[battlerId].status1 &= ~(STATUS1_SLEEP);
                     gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
                     BattleScriptPushCursor();
@@ -150,6 +153,7 @@ u32 sub_805725C(u8 battlerId)
                     else
                         toSub = 1;
 
+                    // Reduce number of sleep turns
                     if ((gBattleMons[battlerId].status1 & STATUS1_SLEEP) < toSub)
                         gBattleMons[battlerId].status1 &= ~(STATUS1_SLEEP);
                     else
@@ -157,11 +161,13 @@ u32 sub_805725C(u8 battlerId)
 
                     if (gBattleMons[battlerId].status1 & STATUS1_SLEEP)
                     {
+                        // Still asleep
                         gBattlescriptCurrInstr = BattleScript_MoveUsedIsAsleep;
                         effect = 2;
                     }
                     else
                     {
+                        // Wake up
                         gBattleMons[battlerId].status2 &= ~(STATUS2_NIGHTMARE);
                         BattleScriptPushCursor();
                         gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_WOKE_UP;
@@ -177,10 +183,12 @@ u32 sub_805725C(u8 battlerId)
             {
                 if (Random() % 5 != 0)
                 {
+                    // Still frozen
                     gBattlescriptCurrInstr = BattleScript_MoveUsedIsFrozen;
                 }
                 else
                 {
+                    // Unfreeze
                     gBattleMons[battlerId].status1 &= ~(STATUS1_FREEZE);
                     BattleScriptPushCursor();
                     gBattlescriptCurrInstr = BattleScript_MoveUsedUnfroze;
@@ -193,7 +201,7 @@ u32 sub_805725C(u8 battlerId)
         case 2:
             break;
         }
-
+        // Loop until reaching the final state, or stop early if Pokémon was Asleep/Frozen
     } while (gBattleCommunication[MULTIUSE_STATE] != 2 && effect == 0);
 
     if (effect == 2)
diff --git a/src/berry_blender.c b/src/berry_blender.c
index 46ed5dee6..cccc80c18 100644
--- a/src/berry_blender.c
+++ b/src/berry_blender.c
@@ -402,17 +402,17 @@ static const struct WindowTemplate sYesNoWindowTemplate_ContinuePlaying =
 
 static const s8 sPlayerArrowQuadrant[BLENDER_MAX_PLAYERS][2] =
 {
-    {-1, -1}, 
-    { 1, -1}, 
-    {-1,  1}, 
+    {-1, -1},
+    { 1, -1},
+    {-1,  1},
     { 1,  1}
 };
 
 static const u8 sPlayerArrowPos[BLENDER_MAX_PLAYERS][2] =
 {
-    { 72,  32}, 
-    {168,  32}, 
-    { 72, 128}, 
+    { 72,  32},
+    {168,  32},
+    { 72, 128},
     {168, 128}
 };
 
@@ -427,16 +427,16 @@ static const u8 sPlayerIdMap[BLENDER_MAX_PLAYERS - 1][BLENDER_MAX_PLAYERS] =
 // Blender arrow positions:
 //
 //           0x0000 (limit 0x10000)
-//            .  .  
+//            .  .
 //         .        .
 // 0x4000 .          . 0xC000
 //        .          .
 //         .        .
-//            .  .  
+//            .  .
 //           0x8000
-//   
+//
 static const u16 sArrowStartPos[] = {
-    0, 
+    0,
     MAX_ARROW_POS / 4 * 3, // 0xC000
     MAX_ARROW_POS / 4,     // 0x4000
     MAX_ARROW_POS / 4 * 2  // 0x8000
@@ -446,8 +446,8 @@ static const u8 sArrowHitRangeStart[BLENDER_MAX_PLAYERS] = {32, 224, 96, 160};
 
 static const TaskFunc sLocalOpponentTasks[] =
 {
-    Task_HandleOpponent1, 
-    Task_HandleOpponent2, 
+    Task_HandleOpponent1,
+    Task_HandleOpponent2,
     Task_HandleOpponent3
 };
 
@@ -873,7 +873,7 @@ static const u8 sOpponentBerrySets[NUM_NPC_BERRIES * 2][3] =
     {ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1, ITEM_TO_BERRY(ITEM_CHERI_BERRY) - 1,  ITEM_TO_BERRY(ITEM_ASPEAR_BERRY) - 1},  // player chose Pecha Berry
     {ITEM_TO_BERRY(ITEM_PECHA_BERRY) - 1,  ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1, ITEM_TO_BERRY(ITEM_CHERI_BERRY) - 1},   // player chose Rawst Berry
     {ITEM_TO_BERRY(ITEM_RAWST_BERRY) - 1,  ITEM_TO_BERRY(ITEM_PECHA_BERRY) - 1,  ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1},  // player chose Aspear Berry
-    
+
     // These sets are used if the player chose a different berry (set is selected by player's berry % 5)
     {ITEM_TO_BERRY(ITEM_CHERI_BERRY) - 1,  ITEM_TO_BERRY(ITEM_PECHA_BERRY) - 1,  ITEM_TO_BERRY(ITEM_RAWST_BERRY) - 1},   // player chose Leppa, Figy, ...
     {ITEM_TO_BERRY(ITEM_CHESTO_BERRY) - 1, ITEM_TO_BERRY(ITEM_RAWST_BERRY) - 1,  ITEM_TO_BERRY(ITEM_ASPEAR_BERRY) - 1},  // player chose Oran, Wiki, ...
@@ -885,14 +885,14 @@ static const u8 sOpponentBerrySets[NUM_NPC_BERRIES * 2][3] =
 // Berry master's berries follow the same rules as above, but instead of explicitly listing
 // the alternate sets if the player chooses one of these berries, it implicitly uses these berries - 5, i.e. Tamato - Nomel
 static const u8 sBerryMasterBerries[] = {
-    ITEM_TO_BERRY(ITEM_SPELON_BERRY) - 1, 
-    ITEM_TO_BERRY(ITEM_PAMTRE_BERRY) - 1, 
-    ITEM_TO_BERRY(ITEM_WATMEL_BERRY) - 1, 
-    ITEM_TO_BERRY(ITEM_DURIN_BERRY) - 1, 
+    ITEM_TO_BERRY(ITEM_SPELON_BERRY) - 1,
+    ITEM_TO_BERRY(ITEM_PAMTRE_BERRY) - 1,
+    ITEM_TO_BERRY(ITEM_WATMEL_BERRY) - 1,
+    ITEM_TO_BERRY(ITEM_DURIN_BERRY) - 1,
     ITEM_TO_BERRY(ITEM_BELUE_BERRY) - 1
 };
 
-// "0 players" is link 
+// "0 players" is link
 static const u8 sNumPlayersToSpeedDivisor[] = {1, 1, 2, 3, 4};
 
 // Black pokeblocks will use one of these random combinations of flavors
@@ -1162,8 +1162,8 @@ static void SpriteCB_Berry(struct Sprite* sprite)
         else
             PlaySE(SE_BALL_TRAY_EXIT);
     }
-    sprite->pos1.x = sprite->sX;
-    sprite->pos1.y = sprite->sY;
+    sprite->x = sprite->sX;
+    sprite->y = sprite->sY;
 }
 
 static void SetBerrySpriteData(struct Sprite* sprite, s16 x, s16 y, s16 bounceSpeed, s16 xSpeed, s16 ySpeed)
@@ -1191,11 +1191,11 @@ static void SetBerrySpriteData(struct Sprite* sprite, s16 x, s16 y, s16 bounceSp
 static void CreateBerrySprite(u16 a0, u8 playerId)
 {
     u8 spriteId = CreateSpinningBerrySprite(a0 + FIRST_BERRY_INDEX - 10, 0, 80, playerId & 1);
-    SetBerrySpriteData(&gSprites[spriteId], 
-                        sBerrySpriteData[playerId][0], 
-                        sBerrySpriteData[playerId][1], 
-                        sBerrySpriteData[playerId][2], 
-                        sBerrySpriteData[playerId][3], 
+    SetBerrySpriteData(&gSprites[spriteId],
+                        sBerrySpriteData[playerId][0],
+                        sBerrySpriteData[playerId][1],
+                        sBerrySpriteData[playerId][2],
+                        sBerrySpriteData[playerId][3],
                         sBerrySpriteData[playerId][4]);
 }
 
@@ -2135,12 +2135,12 @@ static void UpdateOpponentScores(void)
             // BUG: Should be [i][BLENDER_COMM_SCORE] below, not [BLENDER_COMM_SCORE][i]
             // As a result the music tempo updates if any player misses, but only if 1 specific player hits
             #ifdef BUGFIX
-            if (gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_MISS 
-             || gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_BEST 
+            if (gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_MISS
+             || gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_BEST
              || gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_GOOD)
             #else
-            if (gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_MISS 
-             || gRecvCmds[BLENDER_COMM_SCORE][i] == LINKCMD_BLENDER_SCORE_BEST 
+            if (gRecvCmds[i][BLENDER_COMM_SCORE] == LINKCMD_BLENDER_SCORE_MISS
+             || gRecvCmds[BLENDER_COMM_SCORE][i] == LINKCMD_BLENDER_SCORE_BEST
              || gRecvCmds[BLENDER_COMM_SCORE][i] == LINKCMD_BLENDER_SCORE_GOOD)
             #endif
             {
@@ -2204,7 +2204,7 @@ static void HandlePlayerInput(void)
             sBerryBlender->speed--;
         sBerryBlender->slowdownTimer = 0;
     }
-    
+
     if (gEnableContestDebugging && JOY_NEW(L_BUTTON))
         sBerryBlender->perfectOpponents ^= 1;
 }
@@ -3030,10 +3030,10 @@ static void ProcessLinkPlayerCmds(void)
                 sBerryBlender->playerContinueResponses[0] = LINKCMD_SEND_LINK_TYPE;
             }
         }
-        
+
         // If player is link leader, check for responses to the "Continue playing" prompt (even if it's not up yet)
-        if (GetMultiplayerId() == 0 
-            && sBerryBlender->playerContinueResponses[0] != LINKCMD_BLENDER_STOP 
+        if (GetMultiplayerId() == 0
+            && sBerryBlender->playerContinueResponses[0] != LINKCMD_BLENDER_STOP
             && sBerryBlender->playerContinueResponses[0] != LINKCMD_SEND_LINK_TYPE)
         {
             u8 i;
@@ -3163,8 +3163,8 @@ static void SpriteCB_Particle(struct Sprite* sprite)
 {
     sprite->data[2] += sprite->data[0];
     sprite->data[3] += sprite->data[1];
-    sprite->pos2.x = sprite->data[2] / 8;
-    sprite->pos2.y = sprite->data[3] / 8;
+    sprite->x2 = sprite->data[2] / 8;
+    sprite->y2 = sprite->data[3] / 8;
 
     if (sprite->animEnded)
         DestroySprite(sprite);
@@ -3197,7 +3197,7 @@ static void CreateParticleSprites(void)
 static void SpriteCB_ScoreSymbol(struct Sprite* sprite)
 {
     sprite->data[0]++;
-    sprite->pos2.y = -(sprite->data[0] / 3);
+    sprite->y2 = -(sprite->data[0] / 3);
 
     if (sprite->animEnded)
         DestroySprite(sprite);
@@ -3206,10 +3206,10 @@ static void SpriteCB_ScoreSymbol(struct Sprite* sprite)
 static void SpriteCB_ScoreSymbolBest(struct Sprite* sprite)
 {
     sprite->data[0]++;
-    sprite->pos2.y = -(sprite->data[0] * 2);
+    sprite->y2 = -(sprite->data[0] * 2);
 
-    if (sprite->pos2.y < -12)
-        sprite->pos2.y = -12;
+    if (sprite->y2 < -12)
+        sprite->y2 = -12;
     if (sprite->animEnded)
         DestroySprite(sprite);
 }
@@ -3264,7 +3264,7 @@ static void SpriteCB_CountdownNumber(struct Sprite* sprite)
         break;
     }
 
-    sprite->pos2.y = sprite->sYPos;
+    sprite->y2 = sprite->sYPos;
 }
 
 #undef sState
@@ -3300,7 +3300,7 @@ static void SpriteCB_Start(struct Sprite* sprite)
         break;
     }
 
-    sprite->pos2.y = sprite->data[1];
+    sprite->y2 = sprite->data[1];
 }
 
 static void TryUpdateProgressBar(u16 current, u16 limit)
@@ -3445,8 +3445,8 @@ static bool8 UpdateBlenderLandScreenShake(void)
 
 static void SpriteCB_PlayerArrow(struct Sprite* sprite)
 {
-   sprite->pos2.x = -(sBerryBlender->bg_X);
-   sprite->pos2.y = -(sBerryBlender->bg_Y);
+   sprite->x2 = -(sBerryBlender->bg_X);
+   sprite->y2 = -(sBerryBlender->bg_Y);
 }
 
 static void TryUpdateBerryBlenderRecord(void)
diff --git a/src/berry_crush.c b/src/berry_crush.c
index aff8d28d2..dcd7363bd 100755
--- a/src/berry_crush.c
+++ b/src/berry_crush.c
@@ -171,7 +171,7 @@ enum {
 #define INPUT_FLAG_MASK ((1 << INPUT_FLAGS_PER_PLAYER) - 1)
 
 // Values for the inputState field
-enum { 
+enum {
     INPUT_STATE_NONE,
     INPUT_STATE_HIT,      // Hit the crusher
     INPUT_STATE_HIT_SYNC, // Hit the crusher at same time as another player
@@ -241,7 +241,7 @@ struct BerryCrushGame_Results
 };
 
 // playerIdsRanked above has 3 additional elements after the players.
-// Only 1 of these 2*3 is ever used, and it stores the id for which 
+// Only 1 of these 2*3 is ever used, and it stores the id for which
 // random results page to show. Its define below is for readability.
 #define randomPageId playerIdsRanked[0][7]
 
@@ -369,33 +369,33 @@ static u32 Cmd_Quit(struct BerryCrushGame *, u8 *);
 
 static EWRAM_DATA struct BerryCrushGame *sGame = NULL;
 
-static const u8 sBitTable[] = { 
-    1 << 0, 
-    1 << 1, 
-    1 << 2, 
-    1 << 3, 
-    1 << 4, 
-    1 << 5, 
-    1 << 6, 
-    1 << 7 
+static const u8 sBitTable[] = {
+    1 << 0,
+    1 << 1,
+    1 << 2,
+    1 << 3,
+    1 << 4,
+    1 << 5,
+    1 << 6,
+    1 << 7
 };
 // Additional A presses are counted depending on the number of players
 // The bonus of 5 is unobtainable
 static const u8 sSyncPressBonus[MAX_RFU_PLAYERS] = { 0, 1, 2, 3, 5 };
 ALIGNED(4)
-static const s8 sIntroOutroVibrationData[][7] = 
+static const s8 sIntroOutroVibrationData[][7] =
 {
-    { 4, 1, 0, -1,  0,  0, 0}, 
-    { 4, 2, 0, -1,  0,  0, 0}, 
-    { 4, 2, 0, -2,  0,  0, 0}, 
-    { 6, 3, 1, -1, -3, -1, 0}, 
+    { 4, 1, 0, -1,  0,  0, 0},
+    { 4, 2, 0, -1,  0,  0, 0},
+    { 4, 2, 0, -2,  0,  0, 0},
+    { 6, 3, 1, -1, -3, -1, 0},
     { 6, 4, 1, -2, -4, -2, 0},
 };
 
 ALIGNED(4)
-static const u8 sVibrationData[MAX_RFU_PLAYERS][4] = 
+static const u8 sVibrationData[MAX_RFU_PLAYERS][4] =
 {
-    {3, 2, 1, 0}, 
+    {3, 2, 1, 0},
     {3, 3, 1, 0},
     {3, 3, 2, 0},
     {3, 4, 2, 0},
@@ -433,7 +433,7 @@ static const struct BgTemplate sBgTemplates[4] =
         .screenSize = 2,
         .paletteMode = 0,
         .priority = 1,
-        .baseTile = 0, 
+        .baseTile = 0,
     },
     {
         .bg = 2,
@@ -442,7 +442,7 @@ static const struct BgTemplate sBgTemplates[4] =
         .screenSize = 0,
         .paletteMode = 0,
         .priority = 2,
-        .baseTile = 0, 
+        .baseTile = 0,
     },
     {
         .bg = 3,
@@ -451,7 +451,7 @@ static const struct BgTemplate sBgTemplates[4] =
         .screenSize = 0,
         .paletteMode = 0,
         .priority = 3,
-        .baseTile = 0, 
+        .baseTile = 0,
     },
 };
 
@@ -468,11 +468,11 @@ static const u8 sTextColorTable[][3] =
 
 static const struct WindowTemplate sWindowTemplate_Rankings =
 {
-    .bg = 0, 
-    .tilemapLeft = 3, 
-    .tilemapTop = 4, 
-    .width = 24, 
-    .height = 13, 
+    .bg = 0,
+    .tilemapLeft = 3,
+    .tilemapTop = 4,
+    .width = 24,
+    .height = 13,
     .paletteNum = 15,
     .baseBlock = 1
 };
@@ -480,48 +480,48 @@ static const struct WindowTemplate sWindowTemplate_Rankings =
 static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS + 1] =
 {
     {
-        .bg = 0, 
-        .tilemapLeft = 0, 
-        .tilemapTop = 0, 
-        .width = 9, 
-        .height = 2, 
-        .paletteNum = 8, 
+        .bg = 0,
+        .tilemapLeft = 0,
+        .tilemapTop = 0,
+        .width = 9,
+        .height = 2,
+        .paletteNum = 8,
         .baseBlock = 1005
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 0, 
-        .tilemapTop = 3, 
-        .width = 9, 
-        .height = 2, 
-        .paletteNum = 8, 
+        .bg = 0,
+        .tilemapLeft = 0,
+        .tilemapTop = 3,
+        .width = 9,
+        .height = 2,
+        .paletteNum = 8,
         .baseBlock = 987
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 0, 
-        .tilemapTop = 6, 
-        .width = 9, 
-        .height = 2, 
-        .paletteNum = 8, 
+        .bg = 0,
+        .tilemapLeft = 0,
+        .tilemapTop = 6,
+        .width = 9,
+        .height = 2,
+        .paletteNum = 8,
         .baseBlock = 969
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 21, 
-        .tilemapTop = 3, 
-        .width = 9, 
-        .height = 2, 
-        .paletteNum = 8, 
+        .bg = 0,
+        .tilemapLeft = 21,
+        .tilemapTop = 3,
+        .width = 9,
+        .height = 2,
+        .paletteNum = 8,
         .baseBlock = 951
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 21, 
-        .tilemapTop = 6, 
-        .width = 9, 
-        .height = 2, 
-        .paletteNum = 8, 
+        .bg = 0,
+        .tilemapLeft = 21,
+        .tilemapTop = 6,
+        .width = 9,
+        .height = 2,
+        .paletteNum = 8,
         .baseBlock = 933
     },
     DUMMY_WIN_TEMPLATE,
@@ -530,30 +530,30 @@ static const struct WindowTemplate sWindowTemplates_PlayerNames[MAX_RFU_PLAYERS
 static const struct WindowTemplate sWindowTemplates_Results[] =
 {
     [STATE_RESULTS_PRESSES - RESULTS_STATE_START] = {
-        .bg = 0, 
-        .tilemapLeft = 5, 
-        .tilemapTop = 2, 
-        .width = 20, 
-        .height = 16, 
-        .paletteNum = 15, 
+        .bg = 0,
+        .tilemapLeft = 5,
+        .tilemapTop = 2,
+        .width = 20,
+        .height = 16,
+        .paletteNum = 15,
         .baseBlock = 1
     },
     [STATE_RESULTS_RANDOM - RESULTS_STATE_START] = {
-        .bg = 0, 
-        .tilemapLeft = 5, 
-        .tilemapTop = 2, 
-        .width = 20, 
-        .height = 16, 
-        .paletteNum = 15, 
+        .bg = 0,
+        .tilemapLeft = 5,
+        .tilemapTop = 2,
+        .width = 20,
+        .height = 16,
+        .paletteNum = 15,
         .baseBlock = 1
     },
     [STATE_RESULTS_CRUSHING - RESULTS_STATE_START] = {
-        .bg = 0, 
-        .tilemapLeft = 4, 
-        .tilemapTop = 2, 
-        .width = 22, 
-        .height = 16, 
-        .paletteNum = 15, 
+        .bg = 0,
+        .tilemapLeft = 4,
+        .tilemapTop = 2,
+        .width = 22,
+        .height = 16,
+        .paletteNum = 15,
         .baseBlock = 1
     },
     DUMMY_WIN_TEMPLATE,
@@ -567,7 +567,7 @@ static const u8 sResultsWindowHeights[][MAX_RFU_PLAYERS - 1] =
     {12, 14, 15, 16}, // "Crushing" page
 };
 
-static const u32 sPressingSpeedConversionTable[] = 
+static const u32 sPressingSpeedConversionTable[] =
 {
     50000000, // 50
     25000000, // 25
@@ -590,9 +590,9 @@ static const u8 sCrusherTop_Tilemap[]   = INCBIN_U8("graphics/berry_crush/crushe
 static const u8 sContainerCap_Tilemap[] = INCBIN_U8("graphics/berry_crush/container_cap.bin.lz");
 static const u8 sBg_Tilemap[]           = INCBIN_U8("graphics/berry_crush/bg.bin.lz");
 
-// Takes the number of players - 2 and a player id and returns the 
+// Takes the number of players - 2 and a player id and returns the
 // index into sPlayerCoords where that player should be seated
-static const u8 sPlayerIdToPosId[MAX_RFU_PLAYERS - 1][MAX_RFU_PLAYERS] = 
+static const u8 sPlayerIdToPosId[MAX_RFU_PLAYERS - 1][MAX_RFU_PLAYERS] =
 {
     {1, 3},
     {0, 1, 3},
@@ -672,18 +672,18 @@ static const s8 sSparkleCoords[][2] =
     { 40, -16},
 };
 
-static const u16 sPlayerBerrySpriteTags[MAX_RFU_PLAYERS] = 
+static const u16 sPlayerBerrySpriteTags[MAX_RFU_PLAYERS] =
 {
-    TAG_PLAYER1_BERRY, 
-    TAG_PLAYER2_BERRY, 
-    TAG_PLAYER3_BERRY, 
-    TAG_PLAYER4_BERRY, 
+    TAG_PLAYER1_BERRY,
+    TAG_PLAYER2_BERRY,
+    TAG_PLAYER3_BERRY,
+    TAG_PLAYER4_BERRY,
     TAG_PLAYER5_BERRY
 };
 
 // sTimerDigits_Gfx is part of this array but is (apparently) uncompressed
 // It gets cast to raw uncompressed data when used in sDigitObjTemplates
-static const struct CompressedSpriteSheet sSpriteSheets[] = 
+static const struct CompressedSpriteSheet sSpriteSheets[] =
 {
     { .data = sCrusherBase_Gfx, .size = 0x800, .tag = TAG_CRUSHER_BASE },
     { .data = sImpact_Gfx,      .size = 0xE00, .tag = GFXTAG_IMPACT },
@@ -727,23 +727,23 @@ static const union AnimCmd sAnim_Impact_Big[] =
 static const union AnimCmd sAnim_Sparkle_Small[] =
 {
     ANIMCMD_FRAME(0, 2),
-    ANIMCMD_FRAME(4, 2), 
+    ANIMCMD_FRAME(4, 2),
     ANIMCMD_FRAME(8, 2),
     ANIMCMD_FRAME(12, 2),
-    ANIMCMD_FRAME(16, 2), 
-    ANIMCMD_FRAME(20, 2), 
+    ANIMCMD_FRAME(16, 2),
+    ANIMCMD_FRAME(20, 2),
     ANIMCMD_JUMP(0)
 };
 
 static const union AnimCmd sAnim_Sparkle_Big[] =
 {
-    ANIMCMD_FRAME(24, 4), 
-    ANIMCMD_FRAME(28, 4), 
-    ANIMCMD_FRAME(32, 4), 
+    ANIMCMD_FRAME(24, 4),
+    ANIMCMD_FRAME(28, 4),
+    ANIMCMD_FRAME(32, 4),
     ANIMCMD_FRAME(36, 4),
-    ANIMCMD_FRAME(40, 4), 
-    ANIMCMD_FRAME(44, 4), 
-    ANIMCMD_FRAME(48, 4), 
+    ANIMCMD_FRAME(40, 4),
+    ANIMCMD_FRAME(44, 4),
+    ANIMCMD_FRAME(48, 4),
     ANIMCMD_FRAME(52, 4),
     ANIMCMD_JUMP(0)
 };
@@ -756,7 +756,7 @@ static const union AnimCmd sAnim_Timer[] =
 
 static const union AnimCmd sAnim_PlayerBerry[] =
 {
-    ANIMCMD_FRAME(0, 0), 
+    ANIMCMD_FRAME(0, 0),
     ANIMCMD_END
 };
 
@@ -810,68 +810,68 @@ static const union AffineAnimCmd *const sAffineAnims_PlayerBerry[] =
 
 static const struct SpriteTemplate sSpriteTemplate_CrusherBase =
 {
-    .tileTag = TAG_CRUSHER_BASE, 
-    .paletteTag = TAG_CRUSHER_BASE, 
-    .oam = &gOamData_AffineOff_ObjNormal_64x64, 
-    .anims = sAnims_CrusherBase, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_CRUSHER_BASE,
+    .paletteTag = TAG_CRUSHER_BASE,
+    .oam = &gOamData_AffineOff_ObjNormal_64x64,
+    .anims = sAnims_CrusherBase,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_Impact =
 {
     .tileTag = GFXTAG_IMPACT,
-    .paletteTag = PALTAG_EFFECT, 
-    .oam = &gOamData_AffineOff_ObjNormal_32x32, 
-    .anims = sAnims_Impact, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .paletteTag = PALTAG_EFFECT,
+    .oam = &gOamData_AffineOff_ObjNormal_32x32,
+    .anims = sAnims_Impact,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_Impact
 };
 
 static const struct SpriteTemplate sSpriteTemplate_Sparkle =
 {
-    .tileTag = GFXTAG_SPARKLE, 
-    .paletteTag = PALTAG_EFFECT, 
-    .oam = &gOamData_AffineOff_ObjNormal_16x16, 
-    .anims = sAnims_Sparkle, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = GFXTAG_SPARKLE,
+    .paletteTag = PALTAG_EFFECT,
+    .oam = &gOamData_AffineOff_ObjNormal_16x16,
+    .anims = sAnims_Sparkle,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_Timer =
 {
-    .tileTag = TAG_TIMER_DIGITS, 
-    .paletteTag = TAG_TIMER_DIGITS, 
-    .oam = &gOamData_AffineOff_ObjNormal_8x16, 
-    .anims = sAnims_Timer, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_TIMER_DIGITS,
+    .paletteTag = TAG_TIMER_DIGITS,
+    .oam = &gOamData_AffineOff_ObjNormal_8x16,
+    .anims = sAnims_Timer,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_PlayerBerry =
 {
-    .tileTag = TAG_PLAYER1_BERRY, 
-    .paletteTag = TAG_PLAYER1_BERRY, 
-    .oam = &gOamData_AffineDouble_ObjNormal_32x32, 
-    .anims = sAnims_PlayerBerry, 
-    .images = NULL, 
-    .affineAnims = sAffineAnims_PlayerBerry, 
+    .tileTag = TAG_PLAYER1_BERRY,
+    .paletteTag = TAG_PLAYER1_BERRY,
+    .oam = &gOamData_AffineDouble_ObjNormal_32x32,
+    .anims = sAnims_PlayerBerry,
+    .images = NULL,
+    .affineAnims = sAffineAnims_PlayerBerry,
     .callback = SpriteCallbackDummy
 };
 
-static const struct DigitObjUtilTemplate sDigitObjTemplates[] = 
+static const struct DigitObjUtilTemplate sDigitObjTemplates[] =
 {
     { // Minutes
         .strConvMode = 1,
         .shape = 2,
         .size = 0,
         .priority = 0,
-        .oamCount = 2, 
-        .xDelta = 8, 
+        .oamCount = 2,
+        .xDelta = 8,
         .x = 156,
         .y = 0,
         .spriteSheet = (void*) &sSpriteSheets[3],
@@ -882,8 +882,8 @@ static const struct DigitObjUtilTemplate sDigitObjTemplates[] =
         .shape = 2,
         .size = 0,
         .priority = 0,
-        .oamCount = 2, 
-        .xDelta = 8, 
+        .oamCount = 2,
+        .xDelta = 8,
         .x = 180,
         .y = 0,
         .spriteSheet = (void*) &sSpriteSheets[3],
@@ -894,8 +894,8 @@ static const struct DigitObjUtilTemplate sDigitObjTemplates[] =
         .shape = 2,
         .size = 0,
         .priority = 0,
-        .oamCount = 2, 
-        .xDelta = 8, 
+        .oamCount = 2,
+        .xDelta = 8,
         .x = 204,
         .y = 0,
         .spriteSheet = (void*) &sSpriteSheets[3],
@@ -944,7 +944,7 @@ static u32 (*const sBerryCrushCommands[])(struct BerryCrushGame * game, u8 * dat
     [CMD_QUIT]             = Cmd_Quit,
 };
 
-// Per group size, the number of A presses required to increase the number of sparkles. 
+// Per group size, the number of A presses required to increase the number of sparkles.
 static const u8 sSparkleThresholds[MAX_RFU_PLAYERS - 1][4] =
 {
     {2,  4,  6,  7}, // 2 players
@@ -1387,8 +1387,8 @@ static void CreateBerrySprites(struct BerryCrushGame *game, struct BerryCrushGam
         gfx->berrySprites[i] = &gSprites[spriteId];
         gfx->berrySprites[i]->oam.priority = 3;
         gfx->berrySprites[i]->affineAnimPaused = TRUE;
-        gfx->berrySprites[i]->pos1.x = gfx->playerCoords[i]->berryXOffset + 120;
-        gfx->berrySprites[i]->pos1.y = -16;
+        gfx->berrySprites[i]->x = gfx->playerCoords[i]->berryXOffset + 120;
+        gfx->berrySprites[i]->y = -16;
         data = gfx->berrySprites[i]->data;
         speed = 512;
         sYSpeed = speed;
@@ -1404,7 +1404,7 @@ static void CreateBerrySprites(struct BerryCrushGame *game, struct BerryCrushGam
         var2 = speed + 32;
         var2 = var2 / 2;
         var1 = MathUtil_Div16Shift(7, Q_8_8(63.5), var2);
-        sX = (u16)gfx->berrySprites[i]->pos1.x * 128;
+        sX = (u16)gfx->berrySprites[i]->x * 128;
         sXSpeed = MathUtil_Div16Shift(7, distance, var1);
         var1 = MathUtil_Mul16Shift(7, var1, 85);
         sSinIdx = 0;
@@ -1420,21 +1420,21 @@ static void SpriteCB_DropBerryIntoCrusher(struct Sprite *sprite)
     s16 *data = sprite->data;
 
     sYSpeed += sYAccel;
-    sprite->pos2.y += sYSpeed >> 8;
+    sprite->y2 += sYSpeed >> 8;
     if (sBitfield & F_MOVE_HORIZ)
     {
         sprite->sX += sXSpeed;
         sSinIdx += sSinSpeed;
-        sprite->pos2.x = Sin(sSinIdx >> 7, sAmplitude);
+        sprite->x2 = Sin(sSinIdx >> 7, sAmplitude);
         if ((sBitfield & F_MOVE_HORIZ) && (sSinIdx >> 7) > 126)
         {
-            sprite->pos2.x = 0;
+            sprite->x2 = 0;
             sBitfield &= MASK_TARGET_Y;
         }
     }
 
-    sprite->pos1.x = sX >> 7;
-    if (sprite->pos1.y + sprite->pos2.y >= (sBitfield & MASK_TARGET_Y))
+    sprite->x = sX >> 7;
+    if (sprite->y + sprite->y2 >= (sBitfield & MASK_TARGET_Y))
     {
         sprite->callback = SpriteCallbackDummy;
         FreeSpriteOamMatrix(sprite);
@@ -1472,7 +1472,7 @@ static void UpdateInputEffects(struct BerryCrushGame *game, struct BerryCrushGam
 
     numPlayersPressed = 0;
     linkState = (struct BerryCrushGame_LinkState *)game->recvCmd;
-    
+
     // Read inputs and update impact effects
     for (i = 0; i < game->playerCount; i++)
     {
@@ -1490,8 +1490,8 @@ static void UpdateInputEffects(struct BerryCrushGame *game, struct BerryCrushGam
 
             gfx->impactSprites[i]->invisible = FALSE;
             gfx->impactSprites[i]->animPaused = FALSE;
-            gfx->impactSprites[i]->pos2.x = sImpactCoords[(flags % (ARRAY_COUNT(sImpactCoords) + 1)) - 1][0];
-            gfx->impactSprites[i]->pos2.y = sImpactCoords[(flags % (ARRAY_COUNT(sImpactCoords) + 1)) - 1][1];
+            gfx->impactSprites[i]->x2 = sImpactCoords[(flags % (ARRAY_COUNT(sImpactCoords) + 1)) - 1][0];
+            gfx->impactSprites[i]->y2 = sImpactCoords[(flags % (ARRAY_COUNT(sImpactCoords) + 1)) - 1][1];
         }
 
         #undef flags
@@ -1513,10 +1513,10 @@ static void UpdateInputEffects(struct BerryCrushGame *game, struct BerryCrushGam
             if (gfx->sparkleSprites[i]->invisible)
             {
                 gfx->sparkleSprites[i]->callback = SpriteCB_Sparkle_Init;
-                gfx->sparkleSprites[i]->pos1.x = sSparkleCoords[i][0] + 120;
-                gfx->sparkleSprites[i]->pos1.y = sSparkleCoords[i][1] + 136 - (yModifier * 4);
-                gfx->sparkleSprites[i]->pos2.x = sSparkleCoords[i][0] + (sSparkleCoords[i][0] / (xModifier * 4));
-                gfx->sparkleSprites[i]->pos2.y = sSparkleCoords[i][1];
+                gfx->sparkleSprites[i]->x = sSparkleCoords[i][0] + 120;
+                gfx->sparkleSprites[i]->y = sSparkleCoords[i][1] + 136 - (yModifier * 4);
+                gfx->sparkleSprites[i]->x2 = sSparkleCoords[i][0] + (sSparkleCoords[i][0] / (xModifier * 4));
+                gfx->sparkleSprites[i]->y2 = sSparkleCoords[i][1];
                 if (linkState->bigSparkle)
                     StartSpriteAnim(gfx->sparkleSprites[i], 1);
                 else
@@ -1698,13 +1698,13 @@ static void PrintCrushingResults(struct BerryCrushGame *game)
     StringExpandPlaceholders(gStringVar4, gText_StrVar1);
     x -= GetStringWidth(2, gStringVar4, -1);
     AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sTextColorTable[COLORID_GRAY], 0, gStringVar4);
-    
+
     // Print pressing speed text
     y += 14;
     AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, 0, y, sTextColorTable[COLORID_GRAY], 0, gText_PressingSpeed);
     x = 176 - (u8)GetStringWidth(2, gText_TimesPerSec, -1);
     AddTextPrinterParameterized3(game->gfx.resultsWindowId, 2, x, y, sTextColorTable[COLORID_GRAY], 0, gText_TimesPerSec);
-    
+
     // Print pressing speed value
     for (i = 0; i < 8; i++)
         if (((u8)game->pressingSpeed >> (7 - i)) & 1)
@@ -1802,7 +1802,7 @@ static void Task_ShowRankings(u8 taskId)
     u8 i = 0, j, xPos, yPos;
     u32 score = 0;
     s16 *data = gTasks[taskId].data;
-    
+
     switch (tState)
     {
     case 0:
@@ -1818,7 +1818,7 @@ static void Task_ShowRankings(u8 taskId)
         AddTextPrinterParameterized3(tWindowId, 1, xPos, 1, sTextColorTable[COLORID_BLUE], 0, gText_BerryCrush2);
         xPos = 96 - GetStringWidth(1, gText_PressingSpeedRankings, -1) / 2u;
         AddTextPrinterParameterized3(tWindowId, 1, xPos, 17, sTextColorTable[COLORID_BLUE], 0, gText_PressingSpeedRankings);
-        
+
         // Print pressing speed record for each group size, ranked
         yPos = 41;
         for (i = 0; i < MAX_RFU_PLAYERS - 1; i++)
@@ -1977,7 +1977,7 @@ static void CreateGameSprites(struct BerryCrushGame *game)
     for (i = 0; i < ARRAY_COUNT(sSpriteSheets) - 1; i++)
         LoadCompressedSpriteSheet(&sSpriteSheets[i]);
     LoadSpritePalettes(sSpritePals);
-    
+
     // Create sprite for crusher base
     spriteId = CreateSprite(&sSpriteTemplate_CrusherBase, 120, 88, 5);
     game->gfx.coreSprite = &gSprites[spriteId];
@@ -2071,8 +2071,8 @@ static void SpriteCB_Sparkle_End(struct Sprite *sprite)
     u8 i;
     for (i = 0; i < ARRAY_COUNT(sprite->data); i++)
         sprite->data[i] = 0;
-    sprite->pos2.x = 0;
-    sprite->pos2.y = 0;
+    sprite->x2 = 0;
+    sprite->y2 = 0;
     sprite->invisible = TRUE;
     sprite->animPaused = TRUE;
     sprite->callback = SpriteCallbackDummy;
@@ -2097,20 +2097,20 @@ static void SpriteCB_Sparkle(struct Sprite *sprite)
     s16 *data = sprite->data;
 
     sYSpeed += sYAccel;
-    sprite->pos2.y += sYSpeed >> 8;
+    sprite->y2 += sYSpeed >> 8;
     if (sBitfield & F_MOVE_HORIZ)
     {
         sprite->sX += sXSpeed;
         sSinIdx += sSinSpeed;
-        sprite->pos2.x = Sin(sSinIdx >> 7, sAmplitude);
+        sprite->x2 = Sin(sSinIdx >> 7, sAmplitude);
         if (sBitfield & F_MOVE_HORIZ && sSinIdx >> 7 > 126)
         {
-            sprite->pos2.x = 0;
+            sprite->x2 = 0;
             sBitfield &= MASK_TARGET_Y;
         }
     }
-    sprite->pos1.x = sX >> 7;
-    if (sprite->pos1.y + sprite->pos2.y > (sBitfield & MASK_TARGET_Y))
+    sprite->x = sX >> 7;
+    if (sprite->y + sprite->y2 > (sBitfield & MASK_TARGET_Y))
         sprite->callback = SpriteCB_Sparkle_End;
 }
 
@@ -2125,17 +2125,17 @@ static void SpriteCB_Sparkle_Init(struct Sprite *sprite)
     sYSpeed = var;
     sYAccel = 32;
     sBitfield = 168; // Setting bits in MASK_TARGET_Y
-    xMult = sprite->pos2.x * 128;
-    xDiv = MathUtil_Div16Shift(7, (168 - sprite->pos1.y) << 7, (var + 32) >> 1);
-    sprite->sX = sprite->pos1.x << 7;
+    xMult = sprite->x2 * 128;
+    xDiv = MathUtil_Div16Shift(7, (168 - sprite->y) << 7, (var + 32) >> 1);
+    sprite->sX = sprite->x << 7;
     sXSpeed = MathUtil_Div16Shift(7, xMult, xDiv);
     var = MathUtil_Mul16Shift(7, xDiv, 85);
     sSinIdx = zero;
     sSinSpeed = MathUtil_Div16Shift(7, Q_8_8(63.5), var);
-    sAmplitude = sprite->pos2.x / 4;
+    sAmplitude = sprite->x2 / 4;
     sBitfield |= F_MOVE_HORIZ;
-    sprite->pos2.y = zero;
-    sprite->pos2.x = zero;
+    sprite->y2 = zero;
+    sprite->x2 = zero;
     sprite->callback = SpriteCB_Sparkle;
     sprite->animPaused = FALSE;
     sprite->invisible = FALSE;
@@ -2372,7 +2372,7 @@ static u32 Cmd_WaitForOthersToPickBerries(struct BerryCrushGame *game, u8 *args)
     case 2:
         if (!IsLinkTaskFinished())
             return 0;
-        
+
         // Send player's chosen berry to partners
         memset(game->sendCmd, 0, sizeof(game->sendCmd));
         game->sendCmd[0] = game->players[game->localId].berryId;
@@ -2563,13 +2563,13 @@ static void HandlePartnerInput(struct BerryCrushGame *game)
     for (i = 0; i < game->playerCount; i++)
     {
         linkState = (struct BerryCrushGame_LinkState *)gRecvCmds[i];
-        
+
         // Skip player if we have not received a packet from them
         if ((linkState->rfuCmd & RFUCMD_MASK) != RFUCMD_SEND_PACKET)
             continue;
         if (linkState->sendFlag != SEND_GAME_STATE)
             continue;
-        
+
         if (linkState->pushedAButton)
         {
             game->localState.playerPressedAFlags |= sBitTable[i];
@@ -2577,10 +2577,10 @@ static void HandlePartnerInput(struct BerryCrushGame *game)
             game->players[i].numAPresses++;
             numPlayersPressed++;
             timeDiff = game->timer - game->players[i].inputTime;
-            
+
             // If the interval between inputs is regular, the input is considered "neat"
             // This counts toward the player's neatness score
-            if (timeDiff >= game->players[i].timeSincePrevInput - 1 
+            if (timeDiff >= game->players[i].timeSincePrevInput - 1
              && timeDiff <= game->players[i].timeSincePrevInput + 1)
             {
                 // On neat input streak
@@ -2595,7 +2595,7 @@ static void HandlePartnerInput(struct BerryCrushGame *game)
                 game->players[i].neatInputStreak = 0;
                 game->players[i].timeSincePrevInput = timeDiff;
             }
-            
+
             game->players[i].inputTime = game->timer;
             game->players[i].inputFlags++;
             if (game->players[i].inputFlags > F_INPUT_HIT_B)
@@ -2637,7 +2637,7 @@ static void HandlePartnerInput(struct BerryCrushGame *game)
 
     // Target number of A presses has been reached, game is complete
     game->newDepth = 32;
-    game->localState.endGame = TRUE;    
+    game->localState.endGame = TRUE;
 }
 
 // Updates the crusher, input flags, and timer to send to group members
@@ -2648,7 +2648,7 @@ static void UpdateLeaderGameState(struct BerryCrushGame *game)
     u16 flags = 0;
     u16 temp = 0;
     u8 i = 0;
-    
+
     for (i = 0; i < game->playerCount; i++)
     {
         if (game->players[i].inputState != INPUT_STATE_NONE)
@@ -2727,7 +2727,7 @@ static void HandlePlayerInput(struct BerryCrushGame *game)
     if (game->localId != 0 && !game->localState.pushedAButton)
         return;
     game->localState.sendFlag = SEND_GAME_STATE;
-    
+
     // Every 30 frames, check whether the sparkles produced should be big,
     // depending on how many A presses there were in that time
     if (game->timer % 30 == 0)
@@ -2744,7 +2744,7 @@ static void HandlePlayerInput(struct BerryCrushGame *game)
         game->bigSparkleCounter = 0;
         game->numBigSparkleChecks++;
     }
-    
+
     // Every 15 frames, update the amount of sparkles that should be produced,
     // depending on how many A presses there were in that time (including the bonus)
     if (game->timer % 15 == 0)
@@ -2787,7 +2787,7 @@ static void HandlePlayerInput(struct BerryCrushGame *game)
                 game->cmdTimer = 0;
             }
         }
-        
+
     }
     if (game->timer >= MAX_TIME)
         game->localState.endGame = TRUE;
@@ -3056,14 +3056,14 @@ static u32 Cmd_TabulateResults(struct BerryCrushGame *game, u8 *args)
             game->results.playerIdsRanked[RESULTS_PAGE_RANDOM][i] = i;
             game->results.stats[RESULTS_PAGE_PRESSES][i] = game->players[i].numAPresses;
             game->results.totalAPresses += game->results.stats[RESULTS_PAGE_PRESSES][i];
-            
+
             // Calculate value for random second results page
             switch (game->results.randomPageId)
             {
             case RESULTS_PAGE_NEATNESS:
                 if (game->players[i].numAPresses != 0)
                 {
-                    // Calculate percentage of inputs that were in largest "neat" streak 
+                    // Calculate percentage of inputs that were in largest "neat" streak
                     // "Neat" inputs are those done at a regular interval
                     temp1 = game->players[i].maxNeatInputStreak;
                     temp1 = Q_24_8(temp1);
@@ -3129,7 +3129,7 @@ static u32 Cmd_TabulateResults(struct BerryCrushGame *game, u8 *args)
                 // Calculate player rankings for "Number of Presses" by sorting arrays
                 if (game->results.stats[RESULTS_PAGE_PRESSES][j - 1] < game->results.stats[RESULTS_PAGE_PRESSES][j])
                 {
-                    SWAP(game->results.stats[RESULTS_PAGE_PRESSES][j], 
+                    SWAP(game->results.stats[RESULTS_PAGE_PRESSES][j],
                          game->results.stats[RESULTS_PAGE_PRESSES][j - 1],
                          tempStat);
                     SWAP(game->results.playerIdsRanked[RESULTS_PAGE_PRESSES][j],
@@ -3139,7 +3139,7 @@ static u32 Cmd_TabulateResults(struct BerryCrushGame *game, u8 *args)
                 // Calculate player rankings for random second results page by sorting arrays
                 if (game->results.stats[RESULTS_PAGE_RANDOM][j - 1] < game->results.stats[RESULTS_PAGE_RANDOM][j])
                 {
-                    SWAP(game->results.stats[RESULTS_PAGE_RANDOM][j], 
+                    SWAP(game->results.stats[RESULTS_PAGE_RANDOM][j],
                          game->results.stats[RESULTS_PAGE_RANDOM][j - 1],
                          tempStat);
                     SWAP(game->results.playerIdsRanked[RESULTS_PAGE_RANDOM][j],
@@ -3319,7 +3319,7 @@ static u32 Cmd_CommunicatePlayAgainResponses(struct BerryCrushGame *game, u8 *ar
     case 1:
         if (!IsLinkTaskFinished())
             return 0;
-        
+
         // Send player's Yes/No response to partners
         game->sendCmd[0] = game->playAgainState;
         game->recvCmd[0] = 0;
diff --git a/src/berry_fix_program.c b/src/berry_fix_program.c
index 31caf79cc..dc025c0a4 100644
--- a/src/berry_fix_program.c
+++ b/src/berry_fix_program.c
@@ -51,20 +51,20 @@ static const u8 sText_TransmissionFailureTryAgain[] = _("Transmission failure.\n
 
 static const struct BgTemplate sBerryFixBgTemplates[] = {
     {
-        .bg = 0, 
-        .charBaseIndex = 0, 
-        .mapBaseIndex = 30, 
-        .screenSize = 0, 
-        .paletteMode = 0, 
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
         .priority = 0,
         .baseTile = 0
-    }, 
+    },
     {
-        .bg = 1, 
-        .charBaseIndex = 1, 
-        .mapBaseIndex = 31, 
-        .screenSize = 0, 
-        .paletteMode = 0, 
+        .bg = 1,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
         .priority = 1,
         .baseTile = 0
     }
@@ -72,39 +72,39 @@ static const struct BgTemplate sBerryFixBgTemplates[] = {
 
 static const struct WindowTemplate sBerryFixWindowTemplates[] = {
     {
-        .bg = 0, 
-        .tilemapLeft = 2,  
-        .tilemapTop = 4, 
-        .width = 26, 
-        .height = 2, 
-        .paletteNum = 15, 
+        .bg = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 4,
+        .width = 26,
+        .height = 2,
+        .paletteNum = 15,
         .baseBlock = 1
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 1, 
-        .tilemapTop = 11, 
-        .width = 28, 
-        .height = 8, 
-        .paletteNum = 15, 
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 11,
+        .width = 28,
+        .height = 8,
+        .paletteNum = 15,
         .baseBlock = 53
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 0,  
-        .tilemapTop = 8, 
-        .width = 30, 
-        .height = 2, 
-        .paletteNum = 15, 
+        .bg = 0,
+        .tilemapLeft = 0,
+        .tilemapTop = 8,
+        .width = 30,
+        .height = 2,
+        .paletteNum = 15,
         .baseBlock = 277
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 8,  
-        .tilemapTop = 0, 
-        .width = 14, 
-        .height = 2, 
-        .paletteNum = 15, 
+        .bg = 0,
+        .tilemapLeft = 8,
+        .tilemapTop = 0,
+        .width = 14,
+        .height = 2,
+        .paletteNum = 15,
         .baseBlock = 337
     },
     DUMMY_WIN_TEMPLATE
@@ -148,27 +148,27 @@ static const struct {
         gBerryFixGameboy_Gfx,
         gBerryFixGameboy_Tilemap,
         gBerryFixGameboy_Pal
-    }, 
+    },
     [SCENE_TURN_OFF_POWER] = {
         gBerryFixGameboyLogo_Gfx,
         gBerryFixGameboyLogo_Tilemap,
         gBerryFixGameboyLogo_Pal
-    }, 
+    },
     [SCENE_TRANSMITTING] = {
         gBerryFixGbaTransfer_Gfx,
         gBerryFixGbaTransfer_Tilemap,
         gBerryFixGbaTransfer_Pal
-    }, 
+    },
     [SCENE_FOLLOW_INSTRUCT] = {
         gBerryFixGbaTransferHighlight_Gfx,
         gBerryFixGbaTransferHighlight_Tilemap,
         gBerryFixGbaTransferHighlight_Pal
-    }, 
+    },
     [SCENE_TRANSMIT_FAILED] = {
         gBerryFixGbaTransferError_Gfx,
         gBerryFixGbaTransferError_Tilemap,
         gBerryFixGbaTransferError_Pal
-    }, 
+    },
     [SCENE_BEGIN] = {
         gBerryFixWindow_Gfx,
         gBerryFixWindow_Tilemap,
@@ -242,22 +242,22 @@ static void BerryFix_Main(void)
             }
             else if (++sBerryFix->timer > 180)
             {
-                MultiBootStartMaster(&sBerryFix->mb, 
-                                     gMultiBootProgram_BerryGlitchFix_Start + ROM_HEADER_SIZE, 
-                                     (u32)(gMultiBootProgram_BerryGlitchFix_End - (gMultiBootProgram_BerryGlitchFix_Start + ROM_HEADER_SIZE)), 
-                                     4, 
+                MultiBootStartMaster(&sBerryFix->mb,
+                                     gMultiBootProgram_BerryGlitchFix_Start + ROM_HEADER_SIZE,
+                                     (u32)(gMultiBootProgram_BerryGlitchFix_End - (gMultiBootProgram_BerryGlitchFix_Start + ROM_HEADER_SIZE)),
+                                     4,
                                      1);
                 sBerryFix->state = MAINSTATE_TRANSMIT;
             }
             break;
         case MAINSTATE_TRANSMIT:
-            if (TryScene(SCENE_TRANSMITTING)) 
+            if (TryScene(SCENE_TRANSMITTING))
             {
                 MultiBootMain(&sBerryFix->mb);
 
-                if (MultiBootCheckComplete(&sBerryFix->mb)) 
+                if (MultiBootCheckComplete(&sBerryFix->mb))
                     sBerryFix->state = MAINSTATE_EXIT;
-                else if (!(sBerryFix->mb.client_bit & 2)) 
+                else if (!(sBerryFix->mb.client_bit & 2))
                     sBerryFix->state = MAINSTATE_FAILED;
             }
             break;
diff --git a/src/berry_powder.c b/src/berry_powder.c
index 50d280f0a..f77265412 100755
--- a/src/berry_powder.c
+++ b/src/berry_powder.c
@@ -62,66 +62,66 @@ static const u32 sUnknown[] = {0xFF, 0x00};
 static const struct WindowTemplate sBerryPowderWindowTemplates[] =
 {
     {
-        .bg = 0, 
-        .tilemapLeft = 1, 
-        .tilemapTop = 1, 
-        .width = 28, 
-        .height = 2, 
-        .paletteNum = 13, 
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 1,
+        .width = 28,
+        .height = 2,
+        .paletteNum = 13,
         .baseBlock = 19
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 1, 
-        .tilemapTop = 5, 
-        .width = 28, 
-        .height = 14, 
-        .paletteNum = 13, 
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 5,
+        .width = 28,
+        .height = 14,
+        .paletteNum = 13,
         .baseBlock = 75
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 1, 
-        .tilemapTop = 5, 
-        .width = 28, 
-        .height = 7, 
-        .paletteNum = 13, 
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 5,
+        .width = 28,
+        .height = 7,
+        .paletteNum = 13,
         .baseBlock = 75
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 1, 
-        .tilemapTop = 8, 
-        .width = 19, 
-        .height = 3, 
-        .paletteNum = 13, 
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 8,
+        .width = 19,
+        .height = 3,
+        .paletteNum = 13,
         .baseBlock = 19
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 22, 
-        .tilemapTop = 7, 
-        .width = 6, 
-        .height = 4, 
-        .paletteNum = 13, 
+        .bg = 0,
+        .tilemapLeft = 22,
+        .tilemapTop = 7,
+        .width = 6,
+        .height = 4,
+        .paletteNum = 13,
         .baseBlock = 76
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 4, 
-        .tilemapTop = 6, 
-        .width = 22, 
-        .height = 5, 
-        .paletteNum = 13, 
+        .bg = 0,
+        .tilemapLeft = 4,
+        .tilemapTop = 6,
+        .width = 22,
+        .height = 5,
+        .paletteNum = 13,
         .baseBlock = 19
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 5, 
-        .tilemapTop = 8, 
-        .width = 19, 
-        .height = 3, 
-        .paletteNum = 13, 
+        .bg = 0,
+        .tilemapLeft = 5,
+        .tilemapTop = 8,
+        .width = 19,
+        .height = 3,
+        .paletteNum = 13,
         .baseBlock = 19
     },
 };
diff --git a/src/berry_tag_screen.c b/src/berry_tag_screen.c
index 27efb7e7a..babbbb3eb 100644
--- a/src/berry_tag_screen.c
+++ b/src/berry_tag_screen.c
@@ -548,9 +548,9 @@ static void Task_HandleInput(u8 taskId)
 static void TryChangeDisplayedBerry(u8 taskId, s8 toMove)
 {
     s16 *data = gTasks[taskId].data;
-    s16 currPocketPosition = gBagPositionStruct.scrollPosition[3] + gBagPositionStruct.cursorPosition[3];
+    s16 currPocketPosition = gBagPosition.scrollPosition[BERRIES_POCKET] + gBagPosition.cursorPosition[BERRIES_POCKET];
     u32 newPocketPosition = currPocketPosition + toMove;
-    if (newPocketPosition < 46 && BagGetItemIdByPocketPosition(POCKET_BERRIES, newPocketPosition) != 0)
+    if (newPocketPosition < ITEM_TO_BERRY(MAX_BERRY_INDEX) && BagGetItemIdByPocketPosition(POCKET_BERRIES, newPocketPosition) != ITEM_NONE)
     {
         if (toMove < 0)
             data[1] = 2;
@@ -566,8 +566,8 @@ static void TryChangeDisplayedBerry(u8 taskId, s8 toMove)
 
 static void HandleBagCursorPositionChange(s8 toMove)
 {
-    u16 *scrollPos = &gBagPositionStruct.scrollPosition[3];
-    u16 *cursorPos = &gBagPositionStruct.cursorPosition[3];
+    u16 *scrollPos = &gBagPosition.scrollPosition[BERRIES_POCKET];
+    u16 *cursorPos = &gBagPosition.cursorPosition[BERRIES_POCKET];
     if (toMove > 0)
     {
         if (*cursorPos < 4 || BagGetItemIdByPocketPosition(POCKET_BERRIES, *scrollPos + 8) == 0)
@@ -674,9 +674,9 @@ static void Task_DisplayAnotherBerry(u8 taskId)
     else
         posY = data[0];
 
-    gSprites[sBerryTag->berrySpriteId].pos2.y = posY;
+    gSprites[sBerryTag->berrySpriteId].y2 = posY;
     for (i = 0; i < FLAVOR_COUNT; i++)
-        gSprites[sBerryTag->flavorCircleIds[i]].pos2.y = posY;
+        gSprites[sBerryTag->flavorCircleIds[i]].y2 = posY;
 
     ChangeBgY(1, 0x1000, data[1]);
     ChangeBgY(2, 0x1000, data[1]);
diff --git a/src/bike.c b/src/bike.c
index e97a5e04e..39433522e 100644
--- a/src/bike.c
+++ b/src/bike.c
@@ -962,7 +962,7 @@ bool8 IsBikingDisallowedByPlayer(void)
 
 bool8 IsPlayerNotUsingAcroBikeOnBumpySlope(void)
 {
-    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE) 
+    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_ACRO_BIKE)
         && MetatileBehavior_IsBumpySlope(gObjectEvents[gPlayerAvatar.objectEventId].currentMetatileBehavior))
         return FALSE;
     else
diff --git a/src/cable_car.c b/src/cable_car.c
index 733d10436..39154cd1d 100644
--- a/src/cable_car.c
+++ b/src/cable_car.c
@@ -596,13 +596,13 @@ static void SpriteCB_CableCar(struct Sprite *sprite)
     {
         if (!GOING_DOWN)
         {
-            sprite->pos1.x = sprite->sXPos - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer));
-            sprite->pos1.y = sprite->sYPos - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer));
+            sprite->x = sprite->sXPos - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer));
+            sprite->y = sprite->sYPos - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer));
         }
         else
         {
-            sprite->pos1.x = sprite->sXPos + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer));
-            sprite->pos1.y = sprite->sYPos + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer));
+            sprite->x = sprite->sXPos + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer));
+            sprite->y = sprite->sYPos + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer));
         }
     }
 }
@@ -617,20 +617,20 @@ static void SpriteCB_Player(struct Sprite *sprite)
         // Move along with cable car
         if (!GOING_DOWN)
         {
-            sprite->pos1.x = sprite->sXPos - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer));
-            sprite->pos1.y = sprite->sYPos - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer));
+            sprite->x = sprite->sXPos - (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer));
+            sprite->y = sprite->sYPos - (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer));
         }
         else
         {
-            sprite->pos1.x = sprite->sXPos + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer));
-            sprite->pos1.y = sprite->sYPos + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer));
+            sprite->x = sprite->sXPos + (u8)(0.14f * S16TOPOSFLOAT(sCableCar->timer));
+            sprite->y = sprite->sYPos + (u8)(0.067f * S16TOPOSFLOAT(sCableCar->timer));
         }
 
         // Bounce up and down
         switch (sprite->sState)
         {
         case 0:
-            sprite->pos2.y = 17;
+            sprite->y2 = 17;
             if (sprite->sTimer++ > 9)
             {
                 sprite->sTimer = 0;
@@ -638,7 +638,7 @@ static void SpriteCB_Player(struct Sprite *sprite)
             }
             break;
         default:
-            sprite->pos2.y = 16;
+            sprite->y2 = 16;
             if (sprite->sTimer++ > 9)
             {
                 sprite->sTimer = 0;
@@ -660,8 +660,8 @@ static void SpriteCB_HikerGoingUp(struct Sprite *sprite)
 {
     if (sprite->sTimer == 0)
     {
-        sprite->pos1.x += 2 * sprite->centerToCornerVecX;
-        sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+        sprite->x += 2 * sprite->centerToCornerVecX;
+        sprite->y += 16 + sprite->centerToCornerVecY;
     }
 
     if (++sprite->sTimer >= sprite->sDelay)
@@ -669,22 +669,22 @@ static void SpriteCB_HikerGoingUp(struct Sprite *sprite)
         switch (sprite->sSameDir)
         {
         case FALSE:
-            sprite->pos1.x++;
+            sprite->x++;
             if ((sprite->sTimer % 4) == 0)
-                sprite->pos1.y++;
+                sprite->y++;
             break;
         case TRUE:
             // Hiker moves slower if travelling with the Cable Car
             if ((sprite->sTimer % 2) != 0)
             {
-                sprite->pos1.x++;
-                if ((sprite->pos1.x % 4) == 0)
-                    sprite->pos1.y++;
+                sprite->x++;
+                if ((sprite->x % 4) == 0)
+                    sprite->y++;
             }
             break;
         }
 
-        if (sprite->pos1.y > DISPLAY_HEIGHT)
+        if (sprite->y > DISPLAY_HEIGHT)
             DestroySprite(sprite);
     }
 }
@@ -692,29 +692,29 @@ static void SpriteCB_HikerGoingUp(struct Sprite *sprite)
 static void SpriteCB_HikerGoingDown(struct Sprite *sprite)
 {
     if (sprite->sTimer == 0)
-        sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+        sprite->y += 16 + sprite->centerToCornerVecY;
 
     if (++sprite->sTimer >= sprite->sDelay)
     {
         switch (sprite->sSameDir)
         {
         case FALSE:
-            sprite->pos1.x--;
+            sprite->x--;
             if ((sprite->sTimer % 4) == 0)
-                sprite->pos1.y--;
+                sprite->y--;
             break;
         case TRUE:
             // Hiker moves slower if travelling with the Cable Car
             if ((sprite->sTimer % 2) != 0)
             {
-                sprite->pos1.x--;
-                if ((sprite->pos1.x % 4) == 0)
-                    sprite->pos1.y--;
+                sprite->x--;
+                if ((sprite->x % 4) == 0)
+                    sprite->y--;
             }
             break;
         }
 
-        if (sprite->pos1.y < 80)
+        if (sprite->y < 80)
             DestroySprite(sprite);
     }
 }
@@ -829,20 +829,20 @@ static void CreateCableCarSprites(void)
             if (spriteId != MAX_SPRITES)
             {
                 gSprites[spriteId].oam.priority = 2;
-                gSprites[spriteId].pos2.x = 8;
-                gSprites[spriteId].pos2.y = 16;
+                gSprites[spriteId].x2 = 8;
+                gSprites[spriteId].y2 = 16;
                 gSprites[spriteId].sXPos = 200;
                 gSprites[spriteId].sYPos = 73;
             }
             // Create car sprite
             spriteId = CreateSprite(&sSpriteTemplate_CableCar[0], 176, 43, 0x67);
-            gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 32;
+            gSprites[spriteId].x2 = gSprites[spriteId].y2 = 32;
             gSprites[spriteId].sXPos = 176;
             gSprites[spriteId].sYPos = 43;
             // Create door sprite
             spriteId = CreateSprite(&sSpriteTemplate_CableCar[1], 200, 99, 0x65);
-            gSprites[spriteId].pos2.x = 8;
-            gSprites[spriteId].pos2.y = 4;
+            gSprites[spriteId].x2 = 8;
+            gSprites[spriteId].y2 = 4;
             gSprites[spriteId].sXPos = 200;
             gSprites[spriteId].sYPos = 99;
             // Init weather
@@ -857,20 +857,20 @@ static void CreateCableCarSprites(void)
             if (spriteId != MAX_SPRITES)
             {
                 gSprites[spriteId].oam.priority = 2;
-                gSprites[spriteId].pos2.x = 8;
-                gSprites[spriteId].pos2.y = 16;
+                gSprites[spriteId].x2 = 8;
+                gSprites[spriteId].y2 = 16;
                 gSprites[spriteId].sXPos = 128;
                 gSprites[spriteId].sYPos = 39;
             }
             // Create car sprite
             spriteId = CreateSprite(&sSpriteTemplate_CableCar[0], 104, 9, 0x67);
-            gSprites[spriteId].pos2.x = gSprites[spriteId].pos2.y = 32;
+            gSprites[spriteId].x2 = gSprites[spriteId].y2 = 32;
             gSprites[spriteId].sXPos = 104;
             gSprites[spriteId].sYPos = 9;
             // Create door sprite
             spriteId = CreateSprite(&sSpriteTemplate_CableCar[1], 128, 65, 0x65);
-            gSprites[spriteId].pos2.x = 8;
-            gSprites[spriteId].pos2.y = 4;
+            gSprites[spriteId].x2 = 8;
+            gSprites[spriteId].y2 = 4;
             gSprites[spriteId].sXPos = 128;
             gSprites[spriteId].sYPos = 65;
             // Init weather
@@ -882,8 +882,8 @@ static void CreateCableCarSprites(void)
     for (i = 0; i < 9; i++)
     {
         spriteId = CreateSprite(&sSpriteTemplate_Cable, 16 * i + 96, 8 * i - 8, 0x68);
-        gSprites[spriteId].pos2.x = 8;
-        gSprites[spriteId].pos2.y = 8;
+        gSprites[spriteId].x2 = 8;
+        gSprites[spriteId].y2 = 8;
     }
 
     // 1/64 chance for an NPC to appear hiking on the ground below the Cable Car
@@ -894,9 +894,9 @@ static void CreateCableCarSprites(void)
         if (spriteId != MAX_SPRITES)
         {
             gSprites[spriteId].oam.priority = 2;
-            gSprites[spriteId].pos2.x = -gSprites[spriteId].centerToCornerVecX;
-            gSprites[spriteId].pos2.y = -gSprites[spriteId].centerToCornerVecY;
-            
+            gSprites[spriteId].x2 = -gSprites[spriteId].centerToCornerVecX;
+            gSprites[spriteId].y2 = -gSprites[spriteId].centerToCornerVecY;
+
             // Randomly choose which direction the NPC is going
             if (!GOING_DOWN)
             {
@@ -905,7 +905,7 @@ static void CreateCableCarSprites(void)
                     // Do walking west anim
                     StartSpriteAnim(&gSprites[spriteId], 6);
                     gSprites[spriteId].sSameDir = TRUE;
-                    gSprites[spriteId].pos1.y += 2;
+                    gSprites[spriteId].y += 2;
                 }
                 else
                 {
@@ -921,7 +921,7 @@ static void CreateCableCarSprites(void)
                     // Do walking east anim
                     StartSpriteAnim(&gSprites[spriteId], 7);
                     gSprites[spriteId].sSameDir = TRUE;
-                    gSprites[spriteId].pos1.y += 2;
+                    gSprites[spriteId].y += 2;
                 }
                 else
                 {
@@ -1024,7 +1024,7 @@ static void DrawNextGroundSegmentGoingDown(void)
     sCableCar->groundSegmentXStart = (sCableCar->groundSegmentXStart + 2) % 32;
     sCableCar->groundTileIdx += 2;
     sGroundSegmentY_Down = sCableCar->groundSegmentYStart;
-    
+
     // Draw next segment
     for (i = 0; i < ARRAY_COUNT(sCableCar->groundTileBuffer); i++)
     {
diff --git a/src/cable_club.c b/src/cable_club.c
index 2fbe55f88..8db583989 100644
--- a/src/cable_club.c
+++ b/src/cable_club.c
@@ -352,14 +352,14 @@ static void Task_LinkupExchangeDataWithLeader(u8 taskId)
     gSpecialVar_Result = ExchangeDataAndGetLinkupStatus(minPlayers, maxPlayers);
     if (gSpecialVar_Result == LINKUP_ONGOING)
         return;
-    if (gSpecialVar_Result == LINKUP_DIFF_SELECTIONS 
+    if (gSpecialVar_Result == LINKUP_DIFF_SELECTIONS
      || gSpecialVar_Result == LINKUP_WRONG_NUM_PLAYERS)
     {
         SetCloseLinkCallback();
         HideFieldMessageBox();
         gTasks[taskId].func = Task_StopLinkup;
     }
-    else if (gSpecialVar_Result == LINKUP_PLAYER_NOT_READY 
+    else if (gSpecialVar_Result == LINKUP_PLAYER_NOT_READY
           || gSpecialVar_Result == LINKUP_PARTNER_NOT_READY)
     {
         CloseLink();
@@ -407,7 +407,7 @@ static void Task_LinkupCheckStatusAfterConfirm(u8 taskId)
         HideFieldMessageBox();
         gTasks[taskId].func = Task_StopLinkup;
     }
-    else if (gSpecialVar_Result == LINKUP_PLAYER_NOT_READY 
+    else if (gSpecialVar_Result == LINKUP_PLAYER_NOT_READY
           || gSpecialVar_Result == LINKUP_PARTNER_NOT_READY)
     {
         CloseLink();
@@ -1023,9 +1023,9 @@ void CB2_ReturnFromCableClubBattle(void)
 
 void CleanupLinkRoomState(void)
 {
-    if (gSpecialVar_0x8004 == USING_SINGLE_BATTLE 
-     || gSpecialVar_0x8004 == USING_DOUBLE_BATTLE 
-     || gSpecialVar_0x8004 == USING_MULTI_BATTLE 
+    if (gSpecialVar_0x8004 == USING_SINGLE_BATTLE
+     || gSpecialVar_0x8004 == USING_DOUBLE_BATTLE
+     || gSpecialVar_0x8004 == USING_MULTI_BATTLE
      || gSpecialVar_0x8004 == USING_BATTLE_TOWER)
     {
         LoadPlayerParty();
diff --git a/src/contest.c b/src/contest.c
index 84d00d8ee..68cad859d 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -75,7 +75,7 @@ static void Task_FinishRoundOfAppeals(u8);
 static void Task_ReadyUpdateHeartSliders(u8);
 static void Task_UpdateHeartSliders(u8);
 static void Task_WaitForHeartSliders(u8);
-static void sub_80DA348(u8);
+static void Task_RestorePlttBufferUnfaded(u8);
 static void Task_WaitPrintRoundResult(u8);
 static void Task_PrintRoundResultText(u8);
 static void Task_ReUpdateHeartSliders(u8);
@@ -1103,10 +1103,10 @@ static void InitContestResources(void)
     eContestAI = (struct ContestAIInfo){};
     *gContestResources->excitement = (struct ContestExcitement){};
     memset(eContestGfxState, 0, CONTESTANT_COUNT * sizeof(struct ContestGraphicsState));
-    
+
     if (!(gLinkContestFlags & LINK_CONTEST_FLAG_IS_LINK))
         SortContestants(FALSE);
-    
+
     for (i = 0; i < CONTESTANT_COUNT; i++)
     {
         eContestantStatus[i].nextTurnOrder = 0xFF;
@@ -1784,7 +1784,7 @@ static void Task_DoAppeals(u8 taskId)
             gContestMons[eContest.currentContestant].otId,
             gContestMons[eContest.currentContestant].personality,
             eContest.currentContestant);
-        gSprites[spriteId].pos2.x = 120;
+        gSprites[spriteId].x2 = 120;
         gSprites[spriteId].callback = SpriteCB_MonSlideIn;
         gTasks[taskId].tMonSpriteId = spriteId;
         gBattlerSpriteIds[gBattlerAttacker] = spriteId;
@@ -2449,9 +2449,9 @@ static void Task_EndWaitForLink(u8 taskId)
 
 static void SpriteCB_MonSlideIn(struct Sprite *sprite)
 {
-    if (sprite->pos2.x != 0)
+    if (sprite->x2 != 0)
     {
-        sprite->pos2.x -= 2;
+        sprite->x2 -= 2;
     }
     else
     {
@@ -2465,8 +2465,8 @@ static void SpriteCB_MonSlideIn(struct Sprite *sprite)
 
 static void SpriteCB_MonSlideOut(struct Sprite *sprite)
 {
-    sprite->pos2.x -= 6;
-    if (sprite->pos1.x + sprite->pos2.x < -32)
+    sprite->x2 -= 6;
+    if (sprite->x + sprite->x2 < -32)
     {
         sprite->callback = SpriteCallbackDummy;
         sprite->invisible = TRUE;
@@ -2553,10 +2553,10 @@ static void Task_UpdateHeartSliders(u8 taskId)
 static void Task_WaitForHeartSliders(u8 taskId)
 {
     if (SlidersDoneUpdating())
-        gTasks[taskId].func = sub_80DA348;
+        gTasks[taskId].func = Task_RestorePlttBufferUnfaded;
 }
 
-static void sub_80DA348(u8 taskId)
+static void Task_RestorePlttBufferUnfaded(u8 taskId)
 {
     DmaCopy32Defvars(3, eContestTempSave.cachedPlttBufferUnfaded, gPlttBufferUnfaded, PLTT_BUFFER_SIZE * 2);
     gTasks[taskId].data[0] = 0;
@@ -3342,9 +3342,9 @@ static bool8 DrawStatusSymbol(u8 contestant)
     u16 symbolOffset = 0;
     u8 contestantOffset = gContestantTurnOrder[contestant] * 5 + 2;
 
-    if (eContestantStatus[contestant].resistant 
-     || eContestantStatus[contestant].immune 
-     || eContestantStatus[contestant].jamSafetyCount != 0 
+    if (eContestantStatus[contestant].resistant
+     || eContestantStatus[contestant].immune
+     || eContestantStatus[contestant].jamSafetyCount != 0
      || eContestantStatus[contestant].jamReduction != 0)
         symbolOffset = GetStatusSymbolTileOffset(STAT_SYMBOL_CIRCLE);
     else if (eContestantStatus[contestant].nervous)
@@ -3864,7 +3864,7 @@ static void UpdateHeartSlider(u8 contestant)
     gSprites[spriteId].invisible = FALSE;
     gSprites[spriteId].sContestant = contestant;
     gSprites[spriteId].sTargetX = slideTarget;
-    if (gSprites[spriteId].sTargetX > gSprites[spriteId].pos2.x)
+    if (gSprites[spriteId].sTargetX > gSprites[spriteId].x2)
         gSprites[spriteId].sMoveX = 1;
     else
         gSprites[spriteId].sMoveX = -1;
@@ -3896,14 +3896,14 @@ static bool8 SlidersDoneUpdating(void)
 
 static void SpriteCB_UpdateHeartSlider(struct Sprite *sprite)
 {
-    if (sprite->pos2.x == sprite->sTargetX)
+    if (sprite->x2 == sprite->sTargetX)
     {
         eContestGfxState[sprite->sContestant].sliderUpdating = FALSE;
         sprite->callback = SpriteCallbackDummy;
     }
     else
     {
-        sprite->pos2.x += sprite->sMoveX;
+        sprite->x2 += sprite->sMoveX;
     }
 }
 
@@ -3917,7 +3917,7 @@ static void UpdateSliderHeartSpriteYPositions(void)
     s32 i;
 
     for (i = 0; i < CONTESTANT_COUNT; i++)
-        gSprites[eContestGfxState[i].sliderHeartSpriteId].pos1.y = sSliderHeartYPositions[gContestantTurnOrder[i]];
+        gSprites[eContestGfxState[i].sliderHeartSpriteId].y = sSliderHeartYPositions[gContestantTurnOrder[i]];
 }
 
 // Used to hide (or subsequently reshow) the bottom two slider hearts that get hidden by text windows by moving them offscreen
@@ -3931,9 +3931,9 @@ static void SetBottomSliderHeartsInvisibility(bool8 invisible)
         if (gContestantTurnOrder[i] > 1)
         {
             if (!invisible)
-                gSprites[eContestGfxState[i].sliderHeartSpriteId].pos1.x = 180;
+                gSprites[eContestGfxState[i].sliderHeartSpriteId].x = 180;
             else
-                gSprites[eContestGfxState[i].sliderHeartSpriteId].pos1.x = 256;
+                gSprites[eContestGfxState[i].sliderHeartSpriteId].x = 256;
         }
     }
 }
@@ -4336,7 +4336,7 @@ void SortContestants(bool8 useRanking)
                     s32 j;
                     for (j = i; j > v3; j--)
                         gContestantTurnOrder[j] = gContestantTurnOrder[j - 1];
-                        
+
                     // Insert into the new spot.
                     gContestantTurnOrder[v3] = i;
                     break;
@@ -4351,7 +4351,7 @@ void SortContestants(bool8 useRanking)
         }
 
         // Invert gContestantTurnOrder; above, it was a list of contestant IDs. Now it's a list of turn orderings.
-        // 
+        //
         // For example, if contestant 3 had the first turn, then `gContestantTurnOrder[1] = 3`. The turn is the index,
         // the contestant is the data. After inverting the list, `gContestantTurnOrder[3] = 1`. The contestant is the index,
         // and the turn is the data.
@@ -4386,7 +4386,7 @@ void SortContestants(bool8 useRanking)
         }
 
         // Randomize the order of contestants with tied rankings using Selection Sort.
-        // 
+        //
         // Look through the array for tied ranks, and use randomOrdering to break the tie.
         // This ensures that contestants with the same rank will be randomly ordered. This
         // uses an in-place slection sort, which involves a lot of extra swapping.
@@ -4762,13 +4762,13 @@ static void Task_ApplauseOverflowAnimation(u8 taskId)
     if (++gTasks[taskId].data[0] == 1)
     {
         gTasks[taskId].data[0] = 0;
-        
+
         // Alternate between normal colors and white.
         if (gTasks[taskId].data[3] == 0)
             gTasks[taskId].data[4]++;
         else
             gTasks[taskId].data[4]--;
-        
+
         BlendPalette(264 + gTasks[taskId].data[2] * 16, 1, gTasks[taskId].data[4], RGB_WHITE);
 
         // At the maximum or minimum blending, switch directions.
@@ -4789,7 +4789,7 @@ static void Task_ApplauseOverflowAnimation(u8 taskId)
 static void SlideApplauseMeterIn(void)
 {
     CreateTask(Task_SlideApplauseMeterIn, 10);
-    gSprites[eContest.applauseMeterSpriteId].pos2.x = -70;
+    gSprites[eContest.applauseMeterSpriteId].x2 = -70;
     gSprites[eContest.applauseMeterSpriteId].invisible = FALSE;
     eContest.applauseMeterIsMoving = TRUE;
 }
@@ -4799,11 +4799,11 @@ static void Task_SlideApplauseMeterIn(u8 taskId)
     struct Sprite *sprite = &gSprites[eContest.applauseMeterSpriteId];
 
     gTasks[taskId].data[10] += 1664;
-    sprite->pos2.x += gTasks[taskId].data[10] >> 8;
+    sprite->x2 += gTasks[taskId].data[10] >> 8;
     gTasks[taskId].data[10] = gTasks[taskId].data[10] & 0xFF;
-    if (sprite->pos2.x > 0)
-        sprite->pos2.x = 0;
-    if (sprite->pos2.x == 0)
+    if (sprite->x2 > 0)
+        sprite->x2 = 0;
+    if (sprite->x2 == 0)
     {
         eContest.applauseMeterIsMoving = FALSE;
         DestroyTask(taskId);
@@ -4819,7 +4819,7 @@ static void SlideApplauseMeterOut(void)
     else
     {
         CreateTask(Task_SlideApplauseMeterOut, 10);
-        gSprites[eContest.applauseMeterSpriteId].pos2.x = 0;
+        gSprites[eContest.applauseMeterSpriteId].x2 = 0;
         eContest.applauseMeterIsMoving = TRUE;
     }
 }
@@ -4829,11 +4829,11 @@ static void Task_SlideApplauseMeterOut(u8 taskId)
     struct Sprite *sprite = &gSprites[eContest.applauseMeterSpriteId];
 
     gTasks[taskId].data[10] += 1664;
-    sprite->pos2.x -= gTasks[taskId].data[10] >> 8;
+    sprite->x2 -= gTasks[taskId].data[10] >> 8;
     gTasks[taskId].data[10] = gTasks[taskId].data[10] & 0xFF;
-    if (sprite->pos2.x < -70)
-        sprite->pos2.x = -70;
-    if (sprite->pos2.x == -70)
+    if (sprite->x2 < -70)
+        sprite->x2 = -70;
+    if (sprite->x2 == -70)
     {
         sprite->invisible = TRUE;
         eContest.applauseMeterIsMoving = FALSE;
@@ -4878,7 +4878,7 @@ static void Task_ShowAndUpdateApplauseMeter(u8 taskId)
 // Unused.
 static void HideApplauseMeterNoAnim(void)
 {
-    gSprites[eContest.applauseMeterSpriteId].pos2.x = 0;
+    gSprites[eContest.applauseMeterSpriteId].x2 = 0;
     gSprites[eContest.applauseMeterSpriteId].invisible = FALSE;
 }
 
@@ -5017,7 +5017,7 @@ static void ShowHideNextTurnGfx(bool8 show)
         if (eContestantStatus[i].turnOrderMod != 0 && show)
         {
             CpuCopy32(GetTurnOrderNumberGfx(i), (void *)(OBJ_VRAM0 + (gSprites[eContestGfxState[i].nextTurnSpriteId].oam.tileNum + 6) * 32), 32);
-            gSprites[eContestGfxState[i].nextTurnSpriteId].pos1.y = sNextTurnSpriteYPositions[gContestantTurnOrder[i]];
+            gSprites[eContestGfxState[i].nextTurnSpriteId].y = sNextTurnSpriteYPositions[gContestantTurnOrder[i]];
             gSprites[eContestGfxState[i].nextTurnSpriteId].invisible = FALSE;
         }
         else
@@ -5379,10 +5379,10 @@ static void SetBattleTargetSpritePosition(void)
 {
     struct Sprite *sprite = &gSprites[gBattlerSpriteIds[B_POSITION_OPPONENT_RIGHT]];
 
-    sprite->pos2.x = 0;
-    sprite->pos2.y = 0;
-    sprite->pos1.x = GetBattlerSpriteCoord(B_POSITION_OPPONENT_RIGHT, BATTLER_COORD_X);
-    sprite->pos1.y = GetBattlerSpriteCoord(B_POSITION_OPPONENT_RIGHT, BATTLER_COORD_Y);
+    sprite->x2 = 0;
+    sprite->y2 = 0;
+    sprite->x = GetBattlerSpriteCoord(B_POSITION_OPPONENT_RIGHT, BATTLER_COORD_X);
+    sprite->y = GetBattlerSpriteCoord(B_POSITION_OPPONENT_RIGHT, BATTLER_COORD_Y);
     sprite->invisible = TRUE;
 }
 
@@ -5956,7 +5956,7 @@ static void ContestDebugPrintBitStrings(void)
 
     if (!gEnableContestDebugging)
         return;
-    
+
     if (eContestDebugMode != CONTEST_DEBUG_MODE_PRINT_WINNER_FLAGS && eContestDebugMode != CONTEST_DEBUG_MODE_PRINT_LOSER_FLAGS)
         return;
 
diff --git a/src/contest_ai.c b/src/contest_ai.c
index 8fe339790..7aeba828a 100644
--- a/src/contest_ai.c
+++ b/src/contest_ai.c
@@ -1732,7 +1732,7 @@ static void ContestAICmd_if_user_doesnt_have_exciting_move(void)
 
 // BUG: This is checking if the user has a specific move, but when it's used in the AI script
 //      they're checking for an effect. Checking for a specific effect would make more sense,
-//      but given that effects are normally read as a single byte and this reads 2 bytes, it 
+//      but given that effects are normally read as a single byte and this reads 2 bytes, it
 //      seems reading a move was intended and the AI script is using it incorrectly.
 //      The fix below aligns the function with how it's used by the script, rather than the apparent
 //      intention of its usage
@@ -1750,7 +1750,7 @@ static void ContestAICmd_check_user_has_move(void)
         #else
         u16 move = gContestMons[eContestAI.contestantId].moves[i];
         #endif
-        
+
         if (move == targetMove)
         {
             hasMove = TRUE;
diff --git a/src/contest_effect.c b/src/contest_effect.c
index 1fe21daab..864805a54 100644
--- a/src/contest_effect.c
+++ b/src/contest_effect.c
@@ -68,9 +68,9 @@ bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove)
 
     if (lastMoveComboStarterId == 0)
         return FALSE;
-    else if (lastMoveComboStarterId == nextMoveComboMoves[0] 
-          || lastMoveComboStarterId == nextMoveComboMoves[1] 
-          || lastMoveComboStarterId == nextMoveComboMoves[2] 
+    else if (lastMoveComboStarterId == nextMoveComboMoves[0]
+          || lastMoveComboStarterId == nextMoveComboMoves[1]
+          || lastMoveComboStarterId == nextMoveComboMoves[2]
           || lastMoveComboStarterId == nextMoveComboMoves[3])
         return gComboStarterLookupTable[lastMoveComboStarterId];
     else
diff --git a/src/contest_link.c b/src/contest_link.c
index 4905fb8da..9a960e00a 100644
--- a/src/contest_link.c
+++ b/src/contest_link.c
@@ -61,7 +61,7 @@ void Task_LinkContest_Init(u8 taskId)
 
     for (i = 0; i < CONTESTANT_COUNT; i++)
         gBlockRecvBuffer[i][0] = 0xFF;
-    
+
     gTasks[taskId].tState = 0;
     gTasks[taskId].func = Task_LinkContest_StartInitFlags;
 }
@@ -99,7 +99,7 @@ bool32 LinkContest_TryLinkStandby(s16 *state)
     // Skip standby for RS cabled links
     if (gLinkContestFlags & LINK_CONTEST_FLAG_HAS_RS_PLAYER)
         return TRUE;
-    
+
     switch (*state)
     {
     case 0:
diff --git a/src/contest_link_util.c b/src/contest_link_util.c
index 31ffb5fdb..28dec1989 100644
--- a/src/contest_link_util.c
+++ b/src/contest_link_util.c
@@ -88,7 +88,7 @@ static void Task_LinkContest_SetUpContestEm(u8 taskId)
 
     for (i = 0; i < gNumLinkContestPlayers; i++)
         categories[i] = gTasks[taskId].data[i + 1];
-    
+
     // Ensure all players are doing the same category
     for (i = 0; i < gNumLinkContestPlayers && categories[0] == categories[i]; i++)
         ;
@@ -100,7 +100,7 @@ static void Task_LinkContest_SetUpContestEm(u8 taskId)
 
     for (i = 0; i < gNumLinkContestPlayers; i++)
         leaderIds[i] = gTasks[taskId].data[i + 5];
-    
+
     // If < 4 players and player is leader, set AI contestants based on rank and game clear
     if (gNumLinkContestPlayers != CONTESTANT_COUNT && GetMultiplayerId() == 0)
     {
@@ -113,7 +113,7 @@ static void Task_LinkContest_SetUpContestEm(u8 taskId)
 
         if (rank)
             rank--;
-        
+
         gameCleared = TRUE;
         for (i = 0; i < gNumLinkContestPlayers; i++)
         {
@@ -202,7 +202,7 @@ static void Task_LinkContest_CommunicateRngEm(u8 taskId)
             // Only the leader sends the RNG seed
             if (!IsLinkTaskFinished())
                 return;
-            
+
             if (LinkContest_SendBlock(&gRngValue, sizeof(gRngValue)) == 1)
                 gTasks[taskId].data[0]++;
         }
@@ -321,7 +321,7 @@ static void Task_LinkContest_CommunicateAIMonsEm(u8 taskId)
         {
             if (!IsLinkTaskFinished())
                 return;
-            
+
             if (LinkContest_SendBlock(&gContestMons[gNumLinkContestPlayers], (CONTESTANT_COUNT - gNumLinkContestPlayers) * sizeof(struct ContestPokemon)) == 1)
                 gTasks[taskId].data[0]++;
         }
diff --git a/src/contest_util.c b/src/contest_util.c
index 88ab4a7d2..66a666264 100644
--- a/src/contest_util.c
+++ b/src/contest_util.c
@@ -1194,16 +1194,16 @@ static s32 DrawResultsTextWindow(const u8 *text, u8 spriteId)
 
         for (i = 1; i < (int)ARRAY_COUNT(spriteTilePtrs); i++)
             spriteTilePtrs[i] = (void*)(gSprites[sprite->data[i - 1]].oam.tileNum * 32 + OBJ_VRAM0);
-    
+
         for (i = 0; i < (int)ARRAY_COUNT(spriteTilePtrs); i++)
             CpuFill32(0, spriteTilePtrs[i], 0x400);
-    
+
         dst = spriteTilePtrs[0];
         CpuCopy32(src, dst, 0x20);
         CpuCopy32(src + 128, dst + 0x100, 0x20);
         CpuCopy32(src + 128, dst + 0x200, 0x20);
         CpuCopy32(src + 64,  dst + 0x300, 0x20);
-    
+
         for (i = 0; i < strWidth; i++)
         {
             dst = &spriteTilePtrs[(i + 1) / 8][((i + 1) % 8) * 32];
@@ -1236,7 +1236,7 @@ static void CreateResultsTextWindowSprites(void)
         LoadSpriteSheet(&sSpriteSheets_ResultsTextWindow[i]);
 
     LoadSpritePalette(&sSpritePalette_ResultsTextWindow);
-    
+
     // Create sprites for the two window types, each made up of 4 sprites
     for (i = 0; i < (int)ARRAY_COUNT(sSpriteSheets_ResultsTextWindow); i++)
     {
@@ -1269,10 +1269,10 @@ static void CreateResultsTextWindowSprites(void)
 static void StartTextBoxSlideIn(s16 x, u16 y, u16 slideOutTimer, u16 slideIncrement)
 {
     struct Sprite *sprite = &gSprites[sContestResults->data->slidingTextBoxSpriteId];
-    sprite->pos1.x = TEXT_BOX_X;
-    sprite->pos1.y = y;
-    sprite->pos2.x = 0;
-    sprite->pos2.y = 0;
+    sprite->x = TEXT_BOX_X;
+    sprite->y = y;
+    sprite->x2 = 0;
+    sprite->y2 = 0;
     sprite->sTargetX = x + 32;
     sprite->sSlideOutTimer = slideOutTimer;
     sprite->sSlideIncrement = slideIncrement;
@@ -1284,10 +1284,10 @@ static void StartTextBoxSlideIn(s16 x, u16 y, u16 slideOutTimer, u16 slideIncrem
 static void StartTextBoxSlideOut(u16 slideIncrement)
 {
     struct Sprite *sprite = &gSprites[sContestResults->data->slidingTextBoxSpriteId];
-    sprite->pos1.x += sprite->pos2.x;
-    sprite->pos1.y += sprite->pos2.y;
-    sprite->pos2.y = 0;
-    sprite->pos2.x = 0;
+    sprite->x += sprite->x2;
+    sprite->y += sprite->y2;
+    sprite->y2 = 0;
+    sprite->x2 = 0;
     sprite->sSlideIncrement = slideIncrement;
     sprite->sDistance = 0;
     sprite->callback = SpriteCB_TextBoxSlideOut;
@@ -1296,10 +1296,10 @@ static void StartTextBoxSlideOut(u16 slideIncrement)
 
 static void EndTextBoxSlideOut(struct Sprite *sprite)
 {
-    sprite->pos1.x = TEXT_BOX_X;
-    sprite->pos1.y = TEXT_BOX_Y;
-    sprite->pos2.y = 0;
-    sprite->pos2.x = 0;
+    sprite->x = TEXT_BOX_X;
+    sprite->y = TEXT_BOX_Y;
+    sprite->y2 = 0;
+    sprite->x2 = 0;
     sprite->callback = SpriteCallbackDummy;
     sContestResults->data->slidingTextBoxState = SLIDING_TEXT_OFFSCREEN;
 }
@@ -1309,21 +1309,21 @@ static void SpriteCB_TextBoxSlideIn(struct Sprite *sprite)
     int i;
 
     s16 delta = sprite->sDistance + sprite->sSlideIncrement;
-    sprite->pos1.x -= delta >> 8;
+    sprite->x -= delta >> 8;
     sprite->sDistance += sprite->sSlideIncrement;
     sprite->sDistance &= 0xFF;
 
     // Prevent overshooting target
-    if (sprite->pos1.x < sprite->sTargetX)
-        sprite->pos1.x = sprite->sTargetX;
+    if (sprite->x < sprite->sTargetX)
+        sprite->x = sprite->sTargetX;
 
     for (i = 0; i < 3; i++)
     {
         struct Sprite *sprite2 = &gSprites[sprite->data[i]];
-        sprite2->pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64;
+        sprite2->x = sprite->x + sprite->x2 + (i + 1) * 64;
     }
 
-    if (sprite->pos1.x == sprite->sTargetX)
+    if (sprite->x == sprite->sTargetX)
         sprite->callback = SpriteCB_EndTextBoxSlideIn;
 }
 
@@ -1343,16 +1343,16 @@ static void SpriteCB_TextBoxSlideOut(struct Sprite *sprite)
     s16 delta;
 
     delta = sprite->sDistance + sprite->sSlideIncrement;
-    sprite->pos1.x -= delta >> 8;
+    sprite->x -= delta >> 8;
     sprite->sDistance += sprite->sSlideIncrement;
     sprite->sDistance &= 0xFF;
     for (i = 0; i < 3; i++)
     {
         struct Sprite *sprite2 = &gSprites[sprite->data[i]];
-        sprite2->pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64;
+        sprite2->x = sprite->x + sprite->x2 + (i + 1) * 64;
     }
 
-    if (sprite->pos1.x + sprite->pos2.x < -224)
+    if (sprite->x + sprite->x2 < -224)
         EndTextBoxSlideOut(sprite);
 }
 
@@ -1364,18 +1364,18 @@ static void ShowLinkResultsTextBox(const u8 *text)
 
     x = DrawResultsTextWindow(text, sContestResults->data->linkTextBoxSpriteId);
     sprite = &gSprites[sContestResults->data->linkTextBoxSpriteId];
-    sprite->pos1.x = x + 32;
-    sprite->pos1.y = 80;
+    sprite->x = x + 32;
+    sprite->y = 80;
     sprite->invisible = FALSE;
     for (i = 0; i < 3; i++)
     {
-        gSprites[sprite->data[i]].pos1.x = sprite->pos1.x + sprite->pos2.x + (i + 1) * 64;
-        gSprites[sprite->data[i]].pos1.y = sprite->pos1.y;
+        gSprites[sprite->data[i]].x = sprite->x + sprite->x2 + (i + 1) * 64;
+        gSprites[sprite->data[i]].y = sprite->y;
         gSprites[sprite->data[i]].invisible = FALSE;
     }
 
     gBattle_WIN0H = WIN_RANGE(0, DISPLAY_WIDTH);
-    gBattle_WIN0V = WIN_RANGE(sprite->pos1.y - 16, sprite->pos1.y + 16);
+    gBattle_WIN0V = WIN_RANGE(sprite->y - 16, sprite->y + 16);
     SetGpuReg(REG_OFFSET_WININ, WININ_WIN1_BG_ALL | WININ_WIN1_OBJ | WININ_WIN1_CLR
         | WININ_WIN0_BG1 | WININ_WIN0_BG2 | WININ_WIN0_BG3 | WININ_WIN0_OBJ | WININ_WIN0_CLR);
 }
@@ -1585,13 +1585,13 @@ static void SpriteCB_WinnerMonSlideIn(struct Sprite *sprite)
     else
     {
         s16 delta = sprite->data[1] + 0x600;
-        sprite->pos1.x -= delta >> 8;
+        sprite->x -= delta >> 8;
         sprite->data[1] += 0x600;
         sprite->data[1] &= 0xFF;
-        if (sprite->pos1.x < DISPLAY_WIDTH / 2)
-            sprite->pos1.x = DISPLAY_WIDTH / 2;
+        if (sprite->x < DISPLAY_WIDTH / 2)
+            sprite->x = DISPLAY_WIDTH / 2;
 
-        if (sprite->pos1.x == DISPLAY_WIDTH / 2)
+        if (sprite->x == DISPLAY_WIDTH / 2)
         {
             sprite->callback = SpriteCallbackDummy;
             sprite->data[1] = 0;
@@ -1603,10 +1603,10 @@ static void SpriteCB_WinnerMonSlideIn(struct Sprite *sprite)
 static void SpriteCB_WinnerMonSlideOut(struct Sprite *sprite)
 {
     s16 delta = sprite->data[1] + 0x600;
-    sprite->pos1.x -= delta >> 8;
+    sprite->x -= delta >> 8;
     sprite->data[1] += + 0x600;
     sprite->data[1] &= 0xFF;
-    if (sprite->pos1.x < -32)
+    if (sprite->x < -32)
     {
         sprite->callback = SpriteCallbackDummy;
         sprite->invisible = TRUE;
@@ -1639,17 +1639,17 @@ static void SpriteCB_Confetti(struct Sprite *sprite)
     s16 delta;
 
     sprite->data[3] += sprite->data[0];
-    sprite->pos2.x = Sin(sprite->data[3] >> 8, sprite->data[1]);
+    sprite->x2 = Sin(sprite->data[3] >> 8, sprite->data[1]);
     delta = sprite->data[4] + sprite->data[2];
-    sprite->pos1.x += delta >> 8;
+    sprite->x += delta >> 8;
     sprite->data[4] += sprite->data[2];
     sprite->data[4] &= 0xff;
 
-    sprite->pos1.y++;
+    sprite->y++;
     if (sContestResults->data->destroyConfetti)
         sprite->invisible = TRUE;
 
-    if (sprite->pos1.x > DISPLAY_WIDTH + 8 || sprite->pos1.y > 116)
+    if (sprite->x > DISPLAY_WIDTH + 8 || sprite->y > 116)
     {
         DestroySprite(sprite);
         sContestResults->data->confettiCount--;
diff --git a/src/credits.c b/src/credits.c
index b32949754..519cfe39e 100644
--- a/src/credits.c
+++ b/src/credits.c
@@ -759,7 +759,7 @@ static void Task_UpdatePage(u8 taskId)
                 for (i = 0; i < ENTRIES_PER_PAGE; i++)
                     PrintCreditsText(
                         sCreditsEntryPointerTable[gTasks[taskId].tCurrentPage][i]->text,
-                         5 + i * 16, 
+                         5 + i * 16,
                          sCreditsEntryPointerTable[gTasks[taskId].tCurrentPage][i]->isTitle);
                 CopyWindowToVram(0, 2);
 
@@ -911,9 +911,9 @@ static void Task_ShowMons(u8 taskId)
     case 2:
         if (sCreditsData->imgCounter == NUM_MON_SLIDES || gTasks[gTasks[taskId].tMainTaskId].func != Task_CreditsMain)
             break;
-        spriteId = CreateCreditsMonSprite(sCreditsData->monToShow[sCreditsData->currShownMon], 
-                                    sMonSpritePos[sCreditsData->nextImgPos][0], 
-                                    sMonSpritePos[sCreditsData->nextImgPos][1], 
+        spriteId = CreateCreditsMonSprite(sCreditsData->monToShow[sCreditsData->currShownMon],
+                                    sMonSpritePos[sCreditsData->nextImgPos][0],
+                                    sMonSpritePos[sCreditsData->nextImgPos][1],
                                     sCreditsData->nextImgPos);
         if (sCreditsData->currShownMon < sCreditsData->numMonToShow - 1)
         {
@@ -1103,10 +1103,10 @@ static void SetBikeScene(u8 scene, u8 taskId)
     case SCENE_OCEAN_MORNING:
         gSprites[gTasks[taskId].tPlayerSpriteId].invisible = FALSE;
         gSprites[gTasks[taskId].tRivalSpriteId].invisible = FALSE;
-        gSprites[gTasks[taskId].tPlayerSpriteId].pos1.x = DISPLAY_WIDTH + 32;
-        gSprites[gTasks[taskId].tRivalSpriteId].pos1.x = DISPLAY_WIDTH + 32;
-        gSprites[gTasks[taskId].tPlayerSpriteId].pos1.y = 46;
-        gSprites[gTasks[taskId].tRivalSpriteId].pos1.y = 46;
+        gSprites[gTasks[taskId].tPlayerSpriteId].x = DISPLAY_WIDTH + 32;
+        gSprites[gTasks[taskId].tRivalSpriteId].x = DISPLAY_WIDTH + 32;
+        gSprites[gTasks[taskId].tPlayerSpriteId].y = 46;
+        gSprites[gTasks[taskId].tRivalSpriteId].y = 46;
         gSprites[gTasks[taskId].tPlayerSpriteId].data[0] = 0;
         gSprites[gTasks[taskId].tRivalSpriteId].data[0] = 0;
         gTasks[taskId].tTaskId_BgScenery = CreateBicycleBgAnimationTask(0, 0x2000, 0x20, 8);
@@ -1114,10 +1114,10 @@ static void SetBikeScene(u8 scene, u8 taskId)
     case SCENE_OCEAN_SUNSET:
         gSprites[gTasks[taskId].tPlayerSpriteId].invisible = FALSE;
         gSprites[gTasks[taskId].tRivalSpriteId].invisible = FALSE;
-        gSprites[gTasks[taskId].tPlayerSpriteId].pos1.x = 120;
-        gSprites[gTasks[taskId].tRivalSpriteId].pos1.x = DISPLAY_WIDTH + 32;
-        gSprites[gTasks[taskId].tPlayerSpriteId].pos1.y = 46;
-        gSprites[gTasks[taskId].tRivalSpriteId].pos1.y = 46;
+        gSprites[gTasks[taskId].tPlayerSpriteId].x = 120;
+        gSprites[gTasks[taskId].tRivalSpriteId].x = DISPLAY_WIDTH + 32;
+        gSprites[gTasks[taskId].tPlayerSpriteId].y = 46;
+        gSprites[gTasks[taskId].tRivalSpriteId].y = 46;
         gSprites[gTasks[taskId].tPlayerSpriteId].data[0] = 0;
         gSprites[gTasks[taskId].tRivalSpriteId].data[0] = 0;
         gTasks[taskId].tTaskId_BgScenery = CreateBicycleBgAnimationTask(0, 0x2000, 0x20, 8);
@@ -1125,10 +1125,10 @@ static void SetBikeScene(u8 scene, u8 taskId)
     case SCENE_FOREST_RIVAL_ARRIVE:
         gSprites[gTasks[taskId].tPlayerSpriteId].invisible = FALSE;
         gSprites[gTasks[taskId].tRivalSpriteId].invisible = FALSE;
-        gSprites[gTasks[taskId].tPlayerSpriteId].pos1.x = 120;
-        gSprites[gTasks[taskId].tRivalSpriteId].pos1.x = DISPLAY_WIDTH + 32;
-        gSprites[gTasks[taskId].tPlayerSpriteId].pos1.y = 46;
-        gSprites[gTasks[taskId].tRivalSpriteId].pos1.y = 46;
+        gSprites[gTasks[taskId].tPlayerSpriteId].x = 120;
+        gSprites[gTasks[taskId].tRivalSpriteId].x = DISPLAY_WIDTH + 32;
+        gSprites[gTasks[taskId].tPlayerSpriteId].y = 46;
+        gSprites[gTasks[taskId].tRivalSpriteId].y = 46;
         gSprites[gTasks[taskId].tPlayerSpriteId].data[0] = 0;
         gSprites[gTasks[taskId].tRivalSpriteId].data[0] = 0;
         gTasks[taskId].tTaskId_BgScenery = CreateBicycleBgAnimationTask(1, 0x2000, 0x200, 8);
@@ -1136,10 +1136,10 @@ static void SetBikeScene(u8 scene, u8 taskId)
     case SCENE_FOREST_CATCH_RIVAL:
         gSprites[gTasks[taskId].tPlayerSpriteId].invisible = FALSE;
         gSprites[gTasks[taskId].tRivalSpriteId].invisible = FALSE;
-        gSprites[gTasks[taskId].tPlayerSpriteId].pos1.x = 120;
-        gSprites[gTasks[taskId].tRivalSpriteId].pos1.x = -32;
-        gSprites[gTasks[taskId].tPlayerSpriteId].pos1.y = 46;
-        gSprites[gTasks[taskId].tRivalSpriteId].pos1.y = 46;
+        gSprites[gTasks[taskId].tPlayerSpriteId].x = 120;
+        gSprites[gTasks[taskId].tRivalSpriteId].x = -32;
+        gSprites[gTasks[taskId].tPlayerSpriteId].y = 46;
+        gSprites[gTasks[taskId].tRivalSpriteId].y = 46;
         gSprites[gTasks[taskId].tPlayerSpriteId].data[0] = 0;
         gSprites[gTasks[taskId].tRivalSpriteId].data[0] = 0;
         gTasks[taskId].tTaskId_BgScenery = CreateBicycleBgAnimationTask(1, 0x2000, 0x200, 8);
@@ -1147,10 +1147,10 @@ static void SetBikeScene(u8 scene, u8 taskId)
     case SCENE_CITY_NIGHT:
         gSprites[gTasks[taskId].tPlayerSpriteId].invisible = FALSE;
         gSprites[gTasks[taskId].tRivalSpriteId].invisible = FALSE;
-        gSprites[gTasks[taskId].tPlayerSpriteId].pos1.x = 88;
-        gSprites[gTasks[taskId].tRivalSpriteId].pos1.x = 152;
-        gSprites[gTasks[taskId].tPlayerSpriteId].pos1.y = 46;
-        gSprites[gTasks[taskId].tRivalSpriteId].pos1.y = 46;
+        gSprites[gTasks[taskId].tPlayerSpriteId].x = 88;
+        gSprites[gTasks[taskId].tRivalSpriteId].x = 152;
+        gSprites[gTasks[taskId].tPlayerSpriteId].y = 46;
+        gSprites[gTasks[taskId].tRivalSpriteId].y = 46;
         gSprites[gTasks[taskId].tPlayerSpriteId].data[0] = 0;
         gSprites[gTasks[taskId].tRivalSpriteId].data[0] = 0;
         gTasks[taskId].tTaskId_BgScenery = CreateBicycleBgAnimationTask(2, 0x2000, 0x200, 8);
@@ -1359,8 +1359,8 @@ static void SpriteCB_Player(struct Sprite *sprite)
         break;
     case 1:
         StartSpriteAnimIfDifferent(sprite, 1);
-        if (sprite->pos1.x > -32)
-            sprite->pos1.x--;
+        if (sprite->x > -32)
+            sprite->x--;
         break;
     case 2:
         StartSpriteAnimIfDifferent(sprite, 2);
@@ -1370,13 +1370,13 @@ static void SpriteCB_Player(struct Sprite *sprite)
         break;
     case 4:
         StartSpriteAnimIfDifferent(sprite, 0);
-        if (sprite->pos1.x > 120)
-            sprite->pos1.x--;
+        if (sprite->x > 120)
+            sprite->x--;
         break;
     case 5:
         StartSpriteAnimIfDifferent(sprite, 0);
-        if (sprite->pos1.x > -32)
-            sprite->pos1.x--;
+        if (sprite->x > -32)
+            sprite->x--;
         break;
     }
 }
@@ -1392,28 +1392,28 @@ static void SpriteCB_Rival(struct Sprite *sprite)
     switch (sprite->sState)
     {
     case 0:
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         StartSpriteAnimIfDifferent(sprite, 0);
         break;
     case 1:
-        if (sprite->pos1.x > 200)
+        if (sprite->x > 200)
             StartSpriteAnimIfDifferent(sprite, 1);
         else
             StartSpriteAnimIfDifferent(sprite, 2);
-        if (sprite->pos1.x > -32)
-            sprite->pos1.x -= 2;
-        sprite->pos2.y = -gIntroCredits_MovingSceneryVOffset;
+        if (sprite->x > -32)
+            sprite->x -= 2;
+        sprite->y2 = -gIntroCredits_MovingSceneryVOffset;
         break;
     case 2:
         sprite->data[7]++;
         StartSpriteAnimIfDifferent(sprite, 0);
         if ((sprite->data[7] & 3) == 0)
-            sprite->pos1.x++;
+            sprite->x++;
         break;
     case 3:
         StartSpriteAnimIfDifferent(sprite, 0);
-        if (sprite->pos1.x > -32)
-            sprite->pos1.x--;
+        if (sprite->x > -32)
+            sprite->x--;
         break;
     }
 }
@@ -1455,15 +1455,15 @@ static void SpriteCB_CreditsMon(struct Sprite *sprite)
         {
         case POS_LEFT + 1:
             if ((sprite->data[7] & 3) == 0)
-                sprite->pos1.y++;
-            sprite->pos1.x -= 2;
+                sprite->y++;
+            sprite->x -= 2;
             break;
         case POS_CENTER + 1:
             break;
         case POS_RIGHT + 1:
             if ((sprite->data[7] & 3) == 0)
-                sprite->pos1.y++;
-            sprite->pos1.x += 2;
+                sprite->y++;
+            sprite->x += 2;
             break;
         }
         break;
@@ -1522,7 +1522,7 @@ static u8 CreateCreditsMonSprite(u16 nationalDexNum, s16 x, s16 y, u16 position)
     gSprites[monSpriteId].callback = SpriteCB_CreditsMon;
     gSprites[monSpriteId].sSpriteId = monSpriteId;
 
-    bgSpriteId = CreateSprite(&sSpriteTemplate_CreditsMonBg, gSprites[monSpriteId].pos1.x, gSprites[monSpriteId].pos1.y, 1);
+    bgSpriteId = CreateSprite(&sSpriteTemplate_CreditsMonBg, gSprites[monSpriteId].x, gSprites[monSpriteId].y, 1);
     gSprites[bgSpriteId].sMonSpriteId = monSpriteId;
 
     StartSpriteAnimIfDifferent(&gSprites[bgSpriteId], position);
@@ -1532,7 +1532,7 @@ static u8 CreateCreditsMonSprite(u16 nationalDexNum, s16 x, s16 y, u16 position)
 
 static void SpriteCB_CreditsMonBg(struct Sprite *sprite)
 {
-    if (gSprites[sprite->sMonSpriteId].data[0] == 10 
+    if (gSprites[sprite->sMonSpriteId].data[0] == 10
      || gIntroCredits_MovingSceneryState != INTROCRED_SCENERY_NORMAL)
     {
         DestroySprite(sprite);
@@ -1544,8 +1544,8 @@ static void SpriteCB_CreditsMonBg(struct Sprite *sprite)
     sprite->oam.objMode = gSprites[sprite->sMonSpriteId].oam.objMode;
     sprite->oam.affineMode = gSprites[sprite->sMonSpriteId].oam.affineMode;
     sprite->oam.matrixNum = gSprites[sprite->sMonSpriteId].oam.matrixNum;
-    sprite->pos1.x = gSprites[sprite->sMonSpriteId].pos1.x;
-    sprite->pos1.y = gSprites[sprite->sMonSpriteId].pos1.y;
+    sprite->x = gSprites[sprite->sMonSpriteId].x;
+    sprite->y = gSprites[sprite->sMonSpriteId].y;
 }
 
 static void DeterminePokemonToShow(void)
@@ -1554,7 +1554,7 @@ static void DeterminePokemonToShow(void)
     u16 page;
     u16 dexNum;
     u16 j;
-    
+
     // Go through the Pokedex, and anything that has gotten caught we put into our massive array.
     // This basically packs all of the caught pokemon into the front of the array
     for (dexNum = 1, j = 0; dexNum < NATIONAL_DEX_COUNT; dexNum++)
@@ -1584,7 +1584,7 @@ static void DeterminePokemonToShow(void)
         // Select a random mon, insert into array
         page = Random() % sCreditsData->numCaughtMon;
         sCreditsData->monToShow[j] = sCreditsData->caughtMonIds[page];
-        
+
         // Remove the select mon from the array, and condense array entries
         j++;
         sCreditsData->caughtMonIds[page] = 0;
diff --git a/src/crt0.s b/src/crt0.s
index 385e340a5..835522589 100644
--- a/src/crt0.s
+++ b/src/crt0.s
@@ -52,7 +52,7 @@ GPIOPortReadEnable: @ 80000C8
 	.4byte gMoveNames
 	.4byte gDecorations
 
-	.4byte 0x00001270 @ offsetof(struct SaveBlock1, flags) 
+	.4byte 0x00001270 @ offsetof(struct SaveBlock1, flags)
 	.4byte 0x0000139c @ offsetof(struct SaveBlock1, vars)
 	.4byte 0x00000018 @ offsetof(struct SaveBlock2, pokedex)
 	.4byte 0x00000988 @ offsetof(struct SaveBlock1, seen1)
diff --git a/src/data/battle_frontier/apprentice.h b/src/data/battle_frontier/apprentice.h
index 144129743..c190ea09b 100644
--- a/src/data/battle_frontier/apprentice.h
+++ b/src/data/battle_frontier/apprentice.h
@@ -934,18 +934,18 @@ static const bool8 sValidApprenticeMoves[MOVES_COUNT] =
 // WHICH_MOVE has max 5 occurrences, defined as NUM_WHICH_MOVE_QUESTIONS
 // WHICH_FIRST has max 1 occurrence, lead mon should only be chosen once
 // WHICH_SPEECH has max 1 occurrence, as the apprentice leaves after its asked
-static const u8 sQuestionPossibilities[MAX_APPRENTICE_QUESTIONS] = 
+static const u8 sQuestionPossibilities[MAX_APPRENTICE_QUESTIONS] =
 {
     QUESTION_ID_WHAT_ITEM,
-    QUESTION_ID_WHAT_ITEM, 
-    QUESTION_ID_WHAT_ITEM, 
+    QUESTION_ID_WHAT_ITEM,
+    QUESTION_ID_WHAT_ITEM,
+    QUESTION_ID_WHICH_MOVE,
+    QUESTION_ID_WHICH_MOVE,
+    QUESTION_ID_WHICH_MOVE,
+    QUESTION_ID_WHICH_MOVE,
     QUESTION_ID_WHICH_MOVE,
-    QUESTION_ID_WHICH_MOVE, 
-    QUESTION_ID_WHICH_MOVE, 
-    QUESTION_ID_WHICH_MOVE, 
-    QUESTION_ID_WHICH_MOVE, 
-    QUESTION_ID_WHICH_FIRST, 
-    QUESTION_ID_WIN_SPEECH 
+    QUESTION_ID_WHICH_FIRST,
+    QUESTION_ID_WIN_SPEECH
 };
 
 static void (* const sApprenticeFunctions[])(void) =
diff --git a/src/data/battle_frontier/battle_frontier_exchange_corner.h b/src/data/battle_frontier/battle_frontier_exchange_corner.h
index d29dbdc44..426285e92 100644
--- a/src/data/battle_frontier/battle_frontier_exchange_corner.h
+++ b/src/data/battle_frontier/battle_frontier_exchange_corner.h
@@ -1,51 +1,51 @@
 static const u16 sFrontierExchangeCorner_Decor1[] =
-{ 
-    DECOR_KISS_POSTER, 
-    DECOR_KISS_CUSHION, 
-    DECOR_SMOOCHUM_DOLL, 
-    DECOR_TOGEPI_DOLL, 
-    DECOR_MEOWTH_DOLL, 
-    DECOR_CLEFAIRY_DOLL, 
-    DECOR_DITTO_DOLL, 
-    DECOR_CYNDAQUIL_DOLL, 
-    DECOR_CHIKORITA_DOLL, 
-    DECOR_TOTODILE_DOLL, 
-    0xFFFF 
+{
+    DECOR_KISS_POSTER,
+    DECOR_KISS_CUSHION,
+    DECOR_SMOOCHUM_DOLL,
+    DECOR_TOGEPI_DOLL,
+    DECOR_MEOWTH_DOLL,
+    DECOR_CLEFAIRY_DOLL,
+    DECOR_DITTO_DOLL,
+    DECOR_CYNDAQUIL_DOLL,
+    DECOR_CHIKORITA_DOLL,
+    DECOR_TOTODILE_DOLL,
+    0xFFFF
 };
 
 static const u16 sFrontierExchangeCorner_Decor2[] =
-{ 
-    DECOR_LAPRAS_DOLL, 
-    DECOR_SNORLAX_DOLL, 
-    DECOR_VENUSAUR_DOLL, 
-    DECOR_CHARIZARD_DOLL, 
-    DECOR_BLASTOISE_DOLL, 
-    0xFFFF 
+{
+    DECOR_LAPRAS_DOLL,
+    DECOR_SNORLAX_DOLL,
+    DECOR_VENUSAUR_DOLL,
+    DECOR_CHARIZARD_DOLL,
+    DECOR_BLASTOISE_DOLL,
+    0xFFFF
 };
 
 static const u16 sFrontierExchangeCorner_Vitamins[] =
-{ 
-    ITEM_PROTEIN, 
-    ITEM_CALCIUM, 
-    ITEM_IRON, 
-    ITEM_ZINC, 
-    ITEM_CARBOS, 
-    ITEM_HP_UP, 
-    0xFFFF 
+{
+    ITEM_PROTEIN,
+    ITEM_CALCIUM,
+    ITEM_IRON,
+    ITEM_ZINC,
+    ITEM_CARBOS,
+    ITEM_HP_UP,
+    0xFFFF
 };
 
 static const u16 sFrontierExchangeCorner_HoldItems[] =
-{ 
-    ITEM_LEFTOVERS, 
-    ITEM_WHITE_HERB, 
-    ITEM_QUICK_CLAW, 
-    ITEM_MENTAL_HERB, 
-    ITEM_BRIGHT_POWDER, 
-    ITEM_CHOICE_BAND, 
-    ITEM_KINGS_ROCK, 
-    ITEM_FOCUS_BAND, 
-    ITEM_SCOPE_LENS, 
-    0xFFFF 
+{
+    ITEM_LEFTOVERS,
+    ITEM_WHITE_HERB,
+    ITEM_QUICK_CLAW,
+    ITEM_MENTAL_HERB,
+    ITEM_BRIGHT_POWDER,
+    ITEM_CHOICE_BAND,
+    ITEM_KINGS_ROCK,
+    ITEM_FOCUS_BAND,
+    ITEM_SCOPE_LENS,
+    0xFFFF
 };
 
 static const u8 *const sFrontierExchangeCorner_Decor1Descriptions[] =
@@ -63,7 +63,7 @@ static const u8 *const sFrontierExchangeCorner_Decor1Descriptions[] =
     gText_Exit,
 };
 
-static const u8 *const sFrontierExchangeCorner_Decor2Descriptions[] = 
+static const u8 *const sFrontierExchangeCorner_Decor2Descriptions[] =
 {
     BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
     BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc,
@@ -73,7 +73,7 @@ static const u8 *const sFrontierExchangeCorner_Decor2Descriptions[] =
     gText_Exit
 };
 
-static const u8 *const sFrontierExchangeCorner_VitaminsDescriptions[] = 
+static const u8 *const sFrontierExchangeCorner_VitaminsDescriptions[] =
 {
     BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc,
     BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc,
@@ -84,7 +84,7 @@ static const u8 *const sFrontierExchangeCorner_VitaminsDescriptions[] =
     gText_Exit
 };
 
-static const u8 *const sFrontierExchangeCorner_HoldItemsDescriptions[] = 
+static const u8 *const sFrontierExchangeCorner_HoldItemsDescriptions[] =
 {
     BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc,
     BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc,
diff --git a/src/data/battle_frontier/battle_frontier_trainer_mons.h b/src/data/battle_frontier/battle_frontier_trainer_mons.h
index 183964f2d..efd9ef84d 100644
--- a/src/data/battle_frontier/battle_frontier_trainer_mons.h
+++ b/src/data/battle_frontier/battle_frontier_trainer_mons.h
@@ -343,7 +343,7 @@
     FRONTIER_MON_SPINDA,        \
     FRONTIER_MON_CORSOLA,       \
     FRONTIER_MON_POLIWHIRL,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_POKEFAN_M_1 \
     FRONTIER_MON_SMOOCHUM,      \
@@ -532,7 +532,7 @@
     FRONTIER_MON_LEDIAN,        \
     FRONTIER_MON_ARIADOS,       \
     FRONTIER_MON_YANMA,         \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BUG_MANIAC_1 \
     FRONTIER_MON_SHEDINJA,      \
@@ -565,7 +565,7 @@
     FRONTIER_MON_LEDIAN,        \
     FRONTIER_MON_ARIADOS,       \
     FRONTIER_MON_YANMA,         \
-    -1 
+    -1
 
 #define FRONTIER_MONS_FISHERMAN_1 \
     FRONTIER_MON_MAGIKARP,      \
@@ -612,7 +612,7 @@
     FRONTIER_MON_CORSOLA,       \
     FRONTIER_MON_MAWILE,        \
     FRONTIER_MON_ONIX,          \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PARASOL_LADY_1 \
     FRONTIER_MON_SUNKERN,       \
@@ -697,7 +697,7 @@
     FRONTIER_MON_ELEKID,        \
     FRONTIER_MON_FLAAFFY,       \
     FRONTIER_MON_MAWILE,        \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BIRD_KEEPER_1 \
     FRONTIER_MON_AZURILL,       \
@@ -769,7 +769,7 @@
     FRONTIER_MON_CORSOLA,       \
     FRONTIER_MON_POLIWHIRL,     \
     FRONTIER_MON_ONIX,          \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HIKER_1   \
     FRONTIER_MON_TYROGUE,       \
@@ -799,7 +799,7 @@
     FRONTIER_MON_LOUDRED,       \
     FRONTIER_MON_NOSEPASS,      \
     FRONTIER_MON_ONIX,          \
-    -1 
+    -1
 
 #define FRONTIER_MONS_KINDLER_1 \
     FRONTIER_MON_SLUGMA,        \
@@ -823,7 +823,7 @@
     FRONTIER_MON_NOSEPASS,      \
     FRONTIER_MON_MAWILE,        \
     FRONTIER_MON_ONIX,          \
-    -1 
+    -1
 
 #define FRONTIER_MONS_RUNNING_TRIATHLETE_1 \
     FRONTIER_MON_AZURILL,       \
@@ -870,7 +870,7 @@
     FRONTIER_MON_LOUDRED,       \
     FRONTIER_MON_SPINDA,        \
     FRONTIER_MON_ONIX,          \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SWIMMING_TRIATHLETE_1 \
     FRONTIER_MON_TYROGUE,       \
@@ -905,7 +905,7 @@
     FRONTIER_MON_SPINDA,        \
     FRONTIER_MON_CORSOLA,       \
     FRONTIER_MON_POLIWHIRL,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_CYCLING_TRIATHLETE_1 \
     FRONTIER_MON_PICHU,         \
@@ -937,7 +937,7 @@
     FRONTIER_MON_SPINDA,        \
     FRONTIER_MON_FLAAFFY,       \
     FRONTIER_MON_MAWILE,        \
-    -1 
+    -1
 
 #define FRONTIER_MONS_RUNNING_TRIATHLETE_2 \
     FRONTIER_MON_DELCATTY_1,    \
@@ -974,7 +974,7 @@
     FRONTIER_MON_STANTLER_1,    \
     FRONTIER_MON_PIDGEOT_1,     \
     FRONTIER_MON_SCYTHER_1,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SWIMMING_TRIATHLETE_2 \
     FRONTIER_MON_WAILMER_1,     \
@@ -1008,7 +1008,7 @@
     FRONTIER_MON_POLIWRATH_1,   \
     FRONTIER_MON_POLITOED_1,    \
     FRONTIER_MON_CLOYSTER_1,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_CYCLING_TRIATHLETE_2 \
     FRONTIER_MON_DELCATTY_1,    \
@@ -1042,7 +1042,7 @@
     FRONTIER_MON_MAGNETON_1,    \
     FRONTIER_MON_STANTLER_1,    \
     FRONTIER_MON_PIDGEOT_1,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1 \
     FRONTIER_MON_LICKITUNG_1,   \
@@ -1085,7 +1085,7 @@
     FRONTIER_MON_TORKOAL_1,     \
     FRONTIER_MON_CACTURNE_1,    \
     FRONTIER_MON_POLIWRATH_1,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_EXPERT_1A \
     FRONTIER_MON_DELCATTY_1,    \
@@ -1126,7 +1126,7 @@
     FRONTIER_MON_RATICATE_1,    \
     FRONTIER_MON_MASQUERAIN_1,  \
     FRONTIER_MON_FURRET_1,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_EXPERT_1B \
     FRONTIER_MON_DUNSPARCE_1,   \
@@ -1166,7 +1166,7 @@
     FRONTIER_MON_HITMONCHAN_1,  \
     FRONTIER_MON_GIRAFARIG_1,   \
     FRONTIER_MON_HITMONTOP_1,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_EXPERT_1C \
     FRONTIER_MON_BANETTE_1,     \
@@ -1199,7 +1199,7 @@
     FRONTIER_MON_PINSIR_1,      \
     FRONTIER_MON_POLITOED_1,    \
     FRONTIER_MON_CLOYSTER_1,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PSYCHIC_1 \
     FRONTIER_MON_DELCATTY_2,    \
@@ -1235,7 +1235,7 @@
     FRONTIER_MON_CACTURNE_2,    \
     FRONTIER_MON_GOREBYSS_2,    \
     FRONTIER_MON_POLITOED_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HEX_MANIAC_1 \
     FRONTIER_MON_SABLEYE_2,     \
@@ -1265,7 +1265,7 @@
     FRONTIER_MON_CRAWDAUNT_2,   \
     FRONTIER_MON_GRUMPIG_2,     \
     FRONTIER_MON_CACTURNE_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_POKEMANIAC_1 \
     FRONTIER_MON_LICKITUNG_2,   \
@@ -1299,7 +1299,7 @@
     FRONTIER_MON_MANTINE_2,     \
     FRONTIER_MON_SWALOT_2,      \
     FRONTIER_MON_TORKOAL_2,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GENTLEMAN_1A \
     FRONTIER_MON_DELCATTY_2,    \
@@ -1340,7 +1340,7 @@
     FRONTIER_MON_RATICATE_2,    \
     FRONTIER_MON_MASQUERAIN_2,  \
     FRONTIER_MON_FURRET_2,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GENTLEMAN_1B \
     FRONTIER_MON_DUNSPARCE_2,   \
@@ -1380,7 +1380,7 @@
     FRONTIER_MON_HITMONCHAN_2,  \
     FRONTIER_MON_GIRAFARIG_2,   \
     FRONTIER_MON_HITMONTOP_2,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BUG_MANIAC_2 \
     FRONTIER_MON_LEDIAN,        \
@@ -1402,7 +1402,7 @@
     FRONTIER_MON_NINJASK_2,     \
     FRONTIER_MON_SCYTHER_2,     \
     FRONTIER_MON_PINSIR_2,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_RUIN_MANIAC_2 \
     FRONTIER_MON_GRAVELER_2,    \
@@ -1427,7 +1427,7 @@
     FRONTIER_MON_RELICANTH_2,   \
     FRONTIER_MON_OMASTAR_2,     \
     FRONTIER_MON_KABUTOPS_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COLLECTOR_1 \
     FRONTIER_MON_BANETTE_2,     \
@@ -1460,7 +1460,7 @@
     FRONTIER_MON_PINSIR_2,      \
     FRONTIER_MON_POLITOED_2,    \
     FRONTIER_MON_CLOYSTER_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PARASOL_LADY_2 \
     FRONTIER_MON_GLOOM_2,       \
@@ -1475,7 +1475,7 @@
     FRONTIER_MON_HUNTAIL_2,     \
     FRONTIER_MON_GOREBYSS_2,    \
     FRONTIER_MON_OMASTAR_2,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BEAUTY_1  \
     FRONTIER_MON_DELCATTY_2,    \
@@ -1509,7 +1509,7 @@
     FRONTIER_MON_STANTLER_2,    \
     FRONTIER_MON_SWALOT_2,      \
     FRONTIER_MON_PIDGEOT_2,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_AROMA_LADY_2 \
     FRONTIER_MON_WEEPINBELL_2,  \
@@ -1530,7 +1530,7 @@
     FRONTIER_MON_GRUMPIG_2,     \
     FRONTIER_MON_CACTURNE_2,    \
     FRONTIER_MON_BELLOSSOM_2,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COOLTRAINER_1A \
     FRONTIER_MON_DUGTRIO_1,     \
@@ -1566,7 +1566,7 @@
     FRONTIER_MON_GOLEM_1,       \
     FRONTIER_MON_RHYDON_1,      \
     FRONTIER_MON_ALAKAZAM_1,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COOLTRAINER_1B \
     FRONTIER_MON_WEEZING_1,     \
@@ -1602,7 +1602,7 @@
     FRONTIER_MON_AERODACTYL_1,  \
     FRONTIER_MON_PORYGON2_1,    \
     FRONTIER_MON_GARDEVOIR_1,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COOLTRAINER_1C \
     FRONTIER_MON_EXEGGUTOR_1,   \
@@ -1635,7 +1635,7 @@
     FRONTIER_MON_SALAMENCE_1,   \
     FRONTIER_MON_METAGROSS_1,   \
     FRONTIER_MON_SLAKING_1,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PKMN_RANGER_1 \
     FRONTIER_MON_NINJASK_1,     \
@@ -1767,7 +1767,7 @@
     FRONTIER_MON_SALAMENCE_1,   \
     FRONTIER_MON_METAGROSS_1,   \
     FRONTIER_MON_SLAKING_1,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PKMN_BREEDER_F_1 \
     FRONTIER_MON_DUGTRIO_1,     \
@@ -1818,7 +1818,7 @@
     FRONTIER_MON_ARMALDO_1,     \
     FRONTIER_MON_GOLDUCK_1,     \
     FRONTIER_MON_RAPIDASH_1,    \
-    -1 
+    -1
 
 // Odd, all the other Youngster/Lass trainers of this group have Dugtrio, but one does not
 #define FRONTIER_MONS_YOUNGSTER_LASS_2_NO_DUGTRIO \
@@ -1854,7 +1854,7 @@
     FRONTIER_MON_GOLEM_2,       \
     FRONTIER_MON_RHYDON_2,      \
     FRONTIER_MON_ALAKAZAM_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_YOUNGSTER_LASS_2 \
     FRONTIER_MON_DUGTRIO_2,            \
@@ -1927,7 +1927,7 @@
     FRONTIER_MON_SALAMENCE_2,   \
     FRONTIER_MON_METAGROSS_2,   \
     FRONTIER_MON_SLAKING_2,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BUG_CATCHER_2 \
     FRONTIER_MON_NINJASK_2,     \
@@ -1953,7 +1953,7 @@
     FRONTIER_MON_VENUSAUR_2,    \
     FRONTIER_MON_MEGANIUM_2,    \
     FRONTIER_MON_SCEPTILE_2,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_NINJA_BOY_2 \
     FRONTIER_MON_PARASECT_2,    \
@@ -1988,7 +1988,7 @@
     FRONTIER_MON_VENUSAUR_2,    \
     FRONTIER_MON_ESPEON_2,      \
     FRONTIER_MON_CROBAT_2,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_TUBER_2   \
     FRONTIER_MON_QUAGSIRE_2,    \
@@ -2068,7 +2068,7 @@
     FRONTIER_MON_WAILORD_3,     \
     FRONTIER_MON_TENTACRUEL_3,  \
     FRONTIER_MON_STARMIE_3,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_RUIN_MANIAC_3 \
     FRONTIER_MON_DUGTRIO_3,     \
@@ -2093,7 +2093,7 @@
     FRONTIER_MON_AGGRON_3,      \
     FRONTIER_MON_SWAMPERT_3,    \
     FRONTIER_MON_METAGROSS_3,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COLLECTOR_2 \
     FRONTIER_MON_DUGTRIO_3,     \
@@ -2144,7 +2144,7 @@
     FRONTIER_MON_ARMALDO_3,     \
     FRONTIER_MON_GOLDUCK_3,     \
     FRONTIER_MON_RAPIDASH_3,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GUITARIST_2 \
     FRONTIER_MON_SABLEYE_2,     \
@@ -2162,7 +2162,7 @@
     FRONTIER_MON_HOUNDOOM_3,    \
     FRONTIER_MON_JOLTEON_3,     \
     FRONTIER_MON_UMBREON_3,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BIRD_KEEPER_2 \
     FRONTIER_MON_MURKROW_2,     \
@@ -2234,7 +2234,7 @@
     FRONTIER_MON_AERODACTYL_3,  \
     FRONTIER_MON_AGGRON_3,      \
     FRONTIER_MON_BLAZIKEN_3,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_KINDLER_2 \
     FRONTIER_MON_GRANBULL_3,    \
@@ -2256,7 +2256,7 @@
     FRONTIER_MON_BLISSEY_3,     \
     FRONTIER_MON_ARCANINE_3,    \
     FRONTIER_MON_SLAKING_3,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GENTLEMAN_2 \
     FRONTIER_MON_MUK_3,         \
@@ -2307,7 +2307,7 @@
     FRONTIER_MON_SALAMENCE_3,   \
     FRONTIER_MON_METAGROSS_3,   \
     FRONTIER_MON_SLAKING_3,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_YOUNGSTER_LASS_3 \
     FRONTIER_MON_DUGTRIO_4,     \
@@ -2343,7 +2343,7 @@
     FRONTIER_MON_GOLEM_4,       \
     FRONTIER_MON_RHYDON_4,      \
     FRONTIER_MON_ALAKAZAM_4,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_CAMPER_PICNICKER_2 \
     FRONTIER_MON_WEEZING_4,     \
@@ -2417,7 +2417,7 @@
     FRONTIER_MON_BLISSEY_4,     \
     FRONTIER_MON_MILOTIC_4,     \
     FRONTIER_MON_SLAKING_4,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SWIMMER_F_2 \
     FRONTIER_MON_GRANBULL_4,    \
@@ -3017,7 +3017,7 @@
     FRONTIER_MON_MANECTRIC_4,   \
     FRONTIER_MON_VILEPLUME_4,   \
     FRONTIER_MON_VICTREEBEL_4,  \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COOLTRAINER_F_2B \
     FRONTIER_MON_ELECTRODE_1,   \
@@ -3418,7 +3418,7 @@
     FRONTIER_MON_SALAMENCE_2,   \
     FRONTIER_MON_METAGROSS_2,   \
     FRONTIER_MON_SLAKING_2,     \
-    -1 
+    -1
 
 // Similar to FRONTIER_MONS_GENERAL_C but _1 (would be identical if not for re-ordering)
 // Used by Pkmn Ranger, Running Triathlete, Cycling Triathlete
@@ -4066,7 +4066,7 @@
     FRONTIER_MON_TYRANITAR_8,   \
     FRONTIER_MON_TYRANITAR_9,   \
     FRONTIER_MON_TYRANITAR_10,  \
-    -1 
+    -1
 
 // For this group, Expert M uses Tyranitar, Expert F uses Dragonite
 #define FRONTIER_MONS_EXPERT_2C(lastmon) \
@@ -4170,7 +4170,7 @@
     FRONTIER_MON_##lastmon##_8, \
     FRONTIER_MON_##lastmon##_9, \
     FRONTIER_MON_##lastmon##_10,\
-    -1 
+    -1
 
 // The strong Psychic M/F trainers all use the below pokemon
 // Additionally they use 1 of 3 legendary trios, and Latios or Latias depending on gender
@@ -4270,7 +4270,7 @@
     FRONTIER_MON_ZAPDOS_6,      \
     FRONTIER_MON_MOLTRES_5,     \
     FRONTIER_MON_MOLTRES_6,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PSYCHIC_2B(lati) \
     FRONTIER_MONS_PSYCHIC_2(lati, RAIKOU, ENTEI, SUICUNE) \
@@ -4284,7 +4284,7 @@
     FRONTIER_MON_ENTEI_6,       \
     FRONTIER_MON_SUICUNE_5,     \
     FRONTIER_MON_SUICUNE_6,     \
-    -1 
+    -1
 
 // Because the regis/latis are swapped here they cant all be merged into the same macro and match
 #define FRONTIER_MONS_PSYCHIC_2C(lati) \
@@ -4299,7 +4299,7 @@
     FRONTIER_MON_##lati##_6,    \
     FRONTIER_MON_##lati##_7,    \
     FRONTIER_MON_##lati##_8,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HEX_MANIAC_2A \
     FRONTIER_MON_SHARPEDO_2,    \
@@ -4332,7 +4332,7 @@
     FRONTIER_MON_GENGAR_6,      \
     FRONTIER_MON_GENGAR_7,      \
     FRONTIER_MON_GENGAR_8,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HEX_MANIAC_2B \
     FRONTIER_MON_SEVIPER_2,     \
@@ -4388,7 +4388,7 @@
     FRONTIER_MON_GENGAR_6,      \
     FRONTIER_MON_GENGAR_7,      \
     FRONTIER_MON_GENGAR_8,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HEX_MANIAC_2C \
     FRONTIER_MON_SEVIPER_2,     \
@@ -4450,7 +4450,7 @@
     FRONTIER_MON_GENGAR_6,      \
     FRONTIER_MON_GENGAR_7,      \
     FRONTIER_MON_GENGAR_8,      \
-    -1 
+    -1
 
 // For whatever reason FRONTIER_MON_MAROWAK_2 is in a different order than _1 _3 and _4
 // This order change is the only difference btween FRONITER_MONS_POKEMANIAC_2A and FRONTIER_MONS_POKEMANIAC_2B other than the numbered suffixes
@@ -4542,7 +4542,7 @@
     FRONTIER_MON_TYRANITAR_8,   \
     FRONTIER_MON_TYRANITAR_9,   \
     FRONTIER_MON_TYRANITAR_10,  \
-    -1 
+    -1
 
 #define FRONTIER_MONS_POKEMANIAC_2B \
     FRONTIER_MON_ZANGOOSE_2,    \
@@ -4828,7 +4828,7 @@
     FRONTIER_MON_TYRANITAR_8,   \
     FRONTIER_MON_TYRANITAR_9,   \
     FRONTIER_MON_TYRANITAR_10,  \
-    -1 
+    -1
 
 // Identical to FRONTIER_MONS_COOLTRAINER_2D but with both latias and latios
 #define FRONTIER_MONS_GENTLEMAN_3B  \
@@ -4922,7 +4922,7 @@
     FRONTIER_MON_ENTEI_6,       \
     FRONTIER_MON_SUICUNE_5,     \
     FRONTIER_MON_SUICUNE_6,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SWIMMING_TRIATHLETE_M_3 \
     FRONTIER_MON_SNEASEL_2,     \
@@ -5005,7 +5005,7 @@
     FRONTIER_MON_LAPRAS_6,      \
     FRONTIER_MON_LAPRAS_7,      \
     FRONTIER_MON_LAPRAS_8,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SWIMMING_TRIATHLETE_F_3 \
     FRONTIER_MON_SNEASEL_2,     \
@@ -5119,7 +5119,7 @@
     FRONTIER_MON_SCIZOR_4,      \
     FRONTIER_MON_HERACROSS_4,   \
     FRONTIER_MON_SHUCKLE_4,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_FISHERMAN_3 \
     FRONTIER_MON_SEAKING_2,     \
@@ -5229,7 +5229,7 @@
     FRONTIER_MON_REGICE_6,      \
     FRONTIER_MON_REGISTEEL_5,   \
     FRONTIER_MON_REGISTEEL_6,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_COLLECTOR_3 \
     FRONTIER_MON_VENUSAUR_1,    \
@@ -5268,7 +5268,7 @@
     FRONTIER_MON_CHARIZARD_4,   \
     FRONTIER_MON_TYPHLOSION_4,  \
     FRONTIER_MON_SWAMPERT_4,    \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GUITARIST_3A \
     FRONTIER_MON_ABSOL_2,       \
@@ -5330,7 +5330,7 @@
     FRONTIER_MON_ZAPDOS_6,      \
     FRONTIER_MON_MOLTRES_5,     \
     FRONTIER_MON_MOLTRES_6,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_GUITARIST_3B \
     FRONTIER_MON_MISDREAVUS_1,  \
@@ -5368,7 +5368,7 @@
     FRONTIER_MON_LATIAS_6,      \
     FRONTIER_MON_LATIOS_5,      \
     FRONTIER_MON_LATIOS_6,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BIRD_KEEPER_3 \
     FRONTIER_MON_PIDGEOT_2,     \
@@ -5432,7 +5432,7 @@
     FRONTIER_MON_SALAMENCE_6,   \
     FRONTIER_MON_SALAMENCE_7,   \
     FRONTIER_MON_SALAMENCE_8,   \
-    -1 
+    -1
 
 #define FRONTIER_MONS_SAILOR_3  \
     FRONTIER_MON_MEDICHAM_1,    \
@@ -5515,7 +5515,7 @@
     FRONTIER_MON_LAPRAS_6,      \
     FRONTIER_MON_LAPRAS_7,      \
     FRONTIER_MON_LAPRAS_8,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_HIKER_3   \
     FRONTIER_MON_DUGTRIO_1,     \
@@ -5596,7 +5596,7 @@
     FRONTIER_MON_TYRANITAR_8,   \
     FRONTIER_MON_TYRANITAR_9,   \
     FRONTIER_MON_TYRANITAR_10,  \
-    -1 
+    -1
 
 #define FRONTIER_MONS_KINDLER_3 \
     FRONTIER_MON_MISDREAVUS_1,  \
@@ -5661,7 +5661,7 @@
     FRONTIER_MON_DRAGONITE_8,   \
     FRONTIER_MON_DRAGONITE_9,   \
     FRONTIER_MON_DRAGONITE_10,  \
-    -1 
+    -1
 
 #define FRONTIER_MONS_PARASOL_LADY_3 \
     FRONTIER_MON_GLALIE_1,      \
@@ -5699,7 +5699,7 @@
     FRONTIER_MON_HOUNDOOM_4,    \
     FRONTIER_MON_VENUSAUR_4,    \
     FRONTIER_MON_FLAREON_4,     \
-    -1 
+    -1
 
 // Only used by one Beauty
 #define FRONTIER_MONS_EEVEELUTIONS \
@@ -5723,7 +5723,7 @@
     FRONTIER_MON_FLAREON_4,     \
     FRONTIER_MON_ESPEON_4,      \
     FRONTIER_MON_UMBREON_4,     \
-    -1 
+    -1
 
 #define FRONTIER_MONS_BEAUTY_2  \
     FRONTIER_MON_JYNX_1,        \
@@ -5765,7 +5765,7 @@
     FRONTIER_MON_LAPRAS_8,      \
     FRONTIER_MON_SALAMENCE_8,   \
     FRONTIER_MON_LATIAS_6,      \
-    -1 
+    -1
 
 #define FRONTIER_MONS_AROMA_LADY_3  \
     FRONTIER_MON_WOBBUFFET_1,   \
@@ -5863,1507 +5863,1507 @@
     FRONTIER_MON_STARMIE_6,     \
     FRONTIER_MON_STARMIE_7,     \
     FRONTIER_MON_STARMIE_8,     \
-    -1 
+    -1
 
-const u16 gBattleFrontierTrainerMons_Brady[] = 
+const u16 gBattleFrontierTrainerMons_Brady[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Conner[] = 
+const u16 gBattleFrontierTrainerMons_Conner[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Bradley[] = 
+const u16 gBattleFrontierTrainerMons_Bradley[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Cybil[] = 
+const u16 gBattleFrontierTrainerMons_Cybil[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Rodette[] = 
+const u16 gBattleFrontierTrainerMons_Rodette[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Peggy[] = 
+const u16 gBattleFrontierTrainerMons_Peggy[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Keith[] = 
+const u16 gBattleFrontierTrainerMons_Keith[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Grayson[] = 
+const u16 gBattleFrontierTrainerMons_Grayson[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Glenn[] = 
+const u16 gBattleFrontierTrainerMons_Glenn[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Liliana[] = 
+const u16 gBattleFrontierTrainerMons_Liliana[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Elise[] = 
+const u16 gBattleFrontierTrainerMons_Elise[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Zoey[] = 
+const u16 gBattleFrontierTrainerMons_Zoey[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Manuel[] = 
+const u16 gBattleFrontierTrainerMons_Manuel[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Russ[] = 
+const u16 gBattleFrontierTrainerMons_Russ[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Dustin[] = 
+const u16 gBattleFrontierTrainerMons_Dustin[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Tina[] = 
+const u16 gBattleFrontierTrainerMons_Tina[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Gillian[] = 
+const u16 gBattleFrontierTrainerMons_Gillian[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Zoe[] = 
+const u16 gBattleFrontierTrainerMons_Zoe[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Chen[] = 
+const u16 gBattleFrontierTrainerMons_Chen[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Al[] = 
+const u16 gBattleFrontierTrainerMons_Al[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Mitch[] = 
+const u16 gBattleFrontierTrainerMons_Mitch[] =
 {
-    FRONTIER_MONS_CAMPER_PICNICKER_1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Anne[] = 
+const u16 gBattleFrontierTrainerMons_Anne[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Alize[] = 
+const u16 gBattleFrontierTrainerMons_Alize[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Lauren[] = 
+const u16 gBattleFrontierTrainerMons_Lauren[] =
 {
-    FRONTIER_MONS_CAMPER_PICNICKER_1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kipp[] = 
+const u16 gBattleFrontierTrainerMons_Kipp[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jason[] = 
+const u16 gBattleFrontierTrainerMons_Jason[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_John[] = 
+const u16 gBattleFrontierTrainerMons_John[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Ann[] = 
+const u16 gBattleFrontierTrainerMons_Ann[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Eileen[] = 
+const u16 gBattleFrontierTrainerMons_Eileen[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Carlie[] = 
+const u16 gBattleFrontierTrainerMons_Carlie[] =
 {
     FRONTIER_MONS_TUBER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Gordon[] = 
+const u16 gBattleFrontierTrainerMons_Gordon[] =
 {
     FRONTIER_MONS_SWIMMER_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Ayden[] = 
+const u16 gBattleFrontierTrainerMons_Ayden[] =
 {
     FRONTIER_MONS_SWIMMER_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Marco[] = 
+const u16 gBattleFrontierTrainerMons_Marco[] =
 {
     FRONTIER_MONS_SWIMMER_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Cierra[] = 
+const u16 gBattleFrontierTrainerMons_Cierra[] =
 {
     FRONTIER_MONS_SWIMMER_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Marcy[] = 
+const u16 gBattleFrontierTrainerMons_Marcy[] =
 {
     FRONTIER_MONS_SWIMMER_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kathy[] = 
+const u16 gBattleFrontierTrainerMons_Kathy[] =
 {
     FRONTIER_MONS_SWIMMER_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Peyton[] = 
+const u16 gBattleFrontierTrainerMons_Peyton[] =
 {
     FRONTIER_MONS_POKEFAN_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Julian[] = 
+const u16 gBattleFrontierTrainerMons_Julian[] =
 {
     FRONTIER_MONS_POKEFAN_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Quinn[] = 
+const u16 gBattleFrontierTrainerMons_Quinn[] =
 {
     FRONTIER_MONS_POKEFAN_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Haylee[] = 
+const u16 gBattleFrontierTrainerMons_Haylee[] =
 {
-    FRONTIER_MONS_POKEFAN_F_1 
+    FRONTIER_MONS_POKEFAN_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Amanda[] = 
+const u16 gBattleFrontierTrainerMons_Amanda[] =
 {
-    FRONTIER_MONS_POKEFAN_F_1 
+    FRONTIER_MONS_POKEFAN_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Stacy[] = 
+const u16 gBattleFrontierTrainerMons_Stacy[] =
 {
     FRONTIER_MONS_POKEFAN_F_1
 };
 
 // The below 6 are the early Pkmn Breeder class trainers, which use groups from other general classes
-const u16 gBattleFrontierTrainerMons_Rafael[] = 
+const u16 gBattleFrontierTrainerMons_Rafael[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Oliver[] = 
+const u16 gBattleFrontierTrainerMons_Oliver[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Payton[] = 
+const u16 gBattleFrontierTrainerMons_Payton[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Pamela[] = 
+const u16 gBattleFrontierTrainerMons_Pamela[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Eliza[] = 
+const u16 gBattleFrontierTrainerMons_Eliza[] =
 {
-    FRONTIER_MONS_SCHOOL_KID_1 
+    FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Marisa[] = 
+const u16 gBattleFrontierTrainerMons_Marisa[] =
 {
-    FRONTIER_MONS_CAMPER_PICNICKER_1 
+    FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Lewis[] = 
+const u16 gBattleFrontierTrainerMons_Lewis[] =
 {
     FRONTIER_MONS_BUG_CATCHER_1_EXTRA(METAPOD, KAKUNA)
 };
 
-const u16 gBattleFrontierTrainerMons_Yoshi[] = 
+const u16 gBattleFrontierTrainerMons_Yoshi[] =
 {
-    FRONTIER_MONS_BUG_CATCHER_1_EXTRA(SILCOON, CASCOON) 
+    FRONTIER_MONS_BUG_CATCHER_1_EXTRA(SILCOON, CASCOON)
 };
 
-const u16 gBattleFrontierTrainerMons_Destin[] = 
+const u16 gBattleFrontierTrainerMons_Destin[] =
 {
     FRONTIER_MONS_BUG_CATCHER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Keon[] = 
+const u16 gBattleFrontierTrainerMons_Keon[] =
 {
     FRONTIER_MONS_NINJA_BOY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Stuart[] = 
+const u16 gBattleFrontierTrainerMons_Stuart[] =
 {
     FRONTIER_MONS_NINJA_BOY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Nestor[] = 
+const u16 gBattleFrontierTrainerMons_Nestor[] =
 {
-    FRONTIER_MONS_NINJA_BOY_1 
+    FRONTIER_MONS_NINJA_BOY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Derrick[] = 
+const u16 gBattleFrontierTrainerMons_Derrick[] =
 {
     FRONTIER_MONS_BUG_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Bryson[] = 
+const u16 gBattleFrontierTrainerMons_Bryson[] =
 {
     FRONTIER_MONS_BUG_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Clayton[] = 
+const u16 gBattleFrontierTrainerMons_Clayton[] =
 {
     FRONTIER_MONS_BUG_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Trenton[] = 
+const u16 gBattleFrontierTrainerMons_Trenton[] =
 {
-    FRONTIER_MONS_FISHERMAN_1 
+    FRONTIER_MONS_FISHERMAN_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jenson[] = 
+const u16 gBattleFrontierTrainerMons_Jenson[] =
 {
     FRONTIER_MONS_FISHERMAN_1
 };
 
-const u16 gBattleFrontierTrainerMons_Wesley[] = 
+const u16 gBattleFrontierTrainerMons_Wesley[] =
 {
     FRONTIER_MONS_FISHERMAN_1
 };
 
-const u16 gBattleFrontierTrainerMons_Anton[] = 
+const u16 gBattleFrontierTrainerMons_Anton[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Lawson[] = 
+const u16 gBattleFrontierTrainerMons_Lawson[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Sammy[] = 
+const u16 gBattleFrontierTrainerMons_Sammy[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_1
 };
 
 // The below 3 are the early Collector class trainers, which use groups from other general classes
-const u16 gBattleFrontierTrainerMons_Arnie[] = 
+const u16 gBattleFrontierTrainerMons_Arnie[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Adrian[] = 
+const u16 gBattleFrontierTrainerMons_Adrian[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Tristan[] = 
+const u16 gBattleFrontierTrainerMons_Tristan[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Juliana[] = 
+const u16 gBattleFrontierTrainerMons_Juliana[] =
 {
     FRONTIER_MONS_PARASOL_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Rylee[] = 
+const u16 gBattleFrontierTrainerMons_Rylee[] =
 {
     FRONTIER_MONS_PARASOL_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Chelsea[] = 
+const u16 gBattleFrontierTrainerMons_Chelsea[] =
 {
     FRONTIER_MONS_PARASOL_LADY_1
 };
 
 // The below 3 are the early Beauty class trainers, which use groups from other general classes
-const u16 gBattleFrontierTrainerMons_Danela[] = 
+const u16 gBattleFrontierTrainerMons_Danela[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_1
 };
 
-const u16 gBattleFrontierTrainerMons_Lizbeth[] = 
+const u16 gBattleFrontierTrainerMons_Lizbeth[] =
 {
     FRONTIER_MONS_SCHOOL_KID_1
 };
 
-const u16 gBattleFrontierTrainerMons_Amelia[] = 
+const u16 gBattleFrontierTrainerMons_Amelia[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jillian[] = 
+const u16 gBattleFrontierTrainerMons_Jillian[] =
 {
-    FRONTIER_MONS_AROMA_LADY_1 
+    FRONTIER_MONS_AROMA_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Abbie[] = 
+const u16 gBattleFrontierTrainerMons_Abbie[] =
 {
-    FRONTIER_MONS_AROMA_LADY_1 
+    FRONTIER_MONS_AROMA_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Briana[] = 
+const u16 gBattleFrontierTrainerMons_Briana[] =
 {
     FRONTIER_MONS_AROMA_LADY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Antonio[] = 
+const u16 gBattleFrontierTrainerMons_Antonio[] =
 {
     FRONTIER_MONS_GUITARIST_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jaden[] = 
+const u16 gBattleFrontierTrainerMons_Jaden[] =
 {
     FRONTIER_MONS_GUITARIST_1
 };
 
-const u16 gBattleFrontierTrainerMons_Dakota[] = 
+const u16 gBattleFrontierTrainerMons_Dakota[] =
 {
-    FRONTIER_MONS_GUITARIST_1 
+    FRONTIER_MONS_GUITARIST_1
 };
 
-const u16 gBattleFrontierTrainerMons_Brayden[] = 
+const u16 gBattleFrontierTrainerMons_Brayden[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Corson[] = 
+const u16 gBattleFrontierTrainerMons_Corson[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Trevin[] = 
+const u16 gBattleFrontierTrainerMons_Trevin[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Patrick[] = 
+const u16 gBattleFrontierTrainerMons_Patrick[] =
 {
     FRONTIER_MONS_SAILOR_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kaden[] = 
+const u16 gBattleFrontierTrainerMons_Kaden[] =
 {
     FRONTIER_MONS_SAILOR_1
 };
 
-const u16 gBattleFrontierTrainerMons_Maxwell[] = 
+const u16 gBattleFrontierTrainerMons_Maxwell[] =
 {
     FRONTIER_MONS_SAILOR_1
 };
 
-const u16 gBattleFrontierTrainerMons_Daryl[] = 
+const u16 gBattleFrontierTrainerMons_Daryl[] =
 {
     FRONTIER_MONS_HIKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kenneth[] = 
+const u16 gBattleFrontierTrainerMons_Kenneth[] =
 {
     FRONTIER_MONS_HIKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Rich[] = 
+const u16 gBattleFrontierTrainerMons_Rich[] =
 {
     FRONTIER_MONS_HIKER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Caden[] = 
+const u16 gBattleFrontierTrainerMons_Caden[] =
 {
     FRONTIER_MONS_KINDLER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Marlon[] = 
+const u16 gBattleFrontierTrainerMons_Marlon[] =
 {
     FRONTIER_MONS_KINDLER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Nash[] = 
+const u16 gBattleFrontierTrainerMons_Nash[] =
 {
     FRONTIER_MONS_KINDLER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Robby[] = 
+const u16 gBattleFrontierTrainerMons_Robby[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Reece[] = 
+const u16 gBattleFrontierTrainerMons_Reece[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kathryn[] = 
+const u16 gBattleFrontierTrainerMons_Kathryn[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Ellen[] = 
+const u16 gBattleFrontierTrainerMons_Ellen[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Ramon[] = 
+const u16 gBattleFrontierTrainerMons_Ramon[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Arthur[] = 
+const u16 gBattleFrontierTrainerMons_Arthur[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Alondra[] = 
+const u16 gBattleFrontierTrainerMons_Alondra[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Adriana[] = 
+const u16 gBattleFrontierTrainerMons_Adriana[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Malik[] = 
+const u16 gBattleFrontierTrainerMons_Malik[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jill[] = 
+const u16 gBattleFrontierTrainerMons_Jill[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_1
 };
 
-const u16 gBattleFrontierTrainerMons_Erik[] = 
+const u16 gBattleFrontierTrainerMons_Erik[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Yazmin[] = 
+const u16 gBattleFrontierTrainerMons_Yazmin[] =
 {
     FRONTIER_MONS_RUNNING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jamal[] = 
+const u16 gBattleFrontierTrainerMons_Jamal[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Leslie[] = 
+const u16 gBattleFrontierTrainerMons_Leslie[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Dave[] = 
+const u16 gBattleFrontierTrainerMons_Dave[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Carlo[] = 
+const u16 gBattleFrontierTrainerMons_Carlo[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Emilia[] = 
+const u16 gBattleFrontierTrainerMons_Emilia[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Dalia[] = 
+const u16 gBattleFrontierTrainerMons_Dalia[] =
 {
     FRONTIER_MONS_CYCLING_TRIATHLETE_2
 };
 
-const u16 gBattleFrontierTrainerMons_Hitomi[] = 
+const u16 gBattleFrontierTrainerMons_Hitomi[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Ricardo[] = 
+const u16 gBattleFrontierTrainerMons_Ricardo[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Shizuka[] = 
+const u16 gBattleFrontierTrainerMons_Shizuka[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Joana[] = 
+const u16 gBattleFrontierTrainerMons_Joana[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kelly[] = 
+const u16 gBattleFrontierTrainerMons_Kelly[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Rayna[] = 
+const u16 gBattleFrontierTrainerMons_Rayna[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_1
 };
 
-const u16 gBattleFrontierTrainerMons_Evan[] = 
+const u16 gBattleFrontierTrainerMons_Evan[] =
 {
     FRONTIER_MONS_EXPERT_1A
 };
 
-const u16 gBattleFrontierTrainerMons_Jordan[] = 
+const u16 gBattleFrontierTrainerMons_Jordan[] =
 {
     FRONTIER_MONS_EXPERT_1B
 };
 
-const u16 gBattleFrontierTrainerMons_Joel[] = 
+const u16 gBattleFrontierTrainerMons_Joel[] =
 {
     FRONTIER_MONS_EXPERT_1C
 };
 
-const u16 gBattleFrontierTrainerMons_Kristen[] = 
+const u16 gBattleFrontierTrainerMons_Kristen[] =
 {
     FRONTIER_MONS_EXPERT_1A
 };
 
-const u16 gBattleFrontierTrainerMons_Selphy[] = 
+const u16 gBattleFrontierTrainerMons_Selphy[] =
 {
     FRONTIER_MONS_EXPERT_1B
 };
 
-const u16 gBattleFrontierTrainerMons_Chloe[] = 
+const u16 gBattleFrontierTrainerMons_Chloe[] =
 {
     FRONTIER_MONS_EXPERT_1C
 };
 
-const u16 gBattleFrontierTrainerMons_Norton[] = 
+const u16 gBattleFrontierTrainerMons_Norton[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Lukas[] = 
+const u16 gBattleFrontierTrainerMons_Lukas[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Zach[] = 
+const u16 gBattleFrontierTrainerMons_Zach[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kaitlyn[] = 
+const u16 gBattleFrontierTrainerMons_Kaitlyn[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Breanna[] = 
+const u16 gBattleFrontierTrainerMons_Breanna[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kendra[] = 
+const u16 gBattleFrontierTrainerMons_Kendra[] =
 {
     FRONTIER_MONS_PSYCHIC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Molly[] = 
+const u16 gBattleFrontierTrainerMons_Molly[] =
 {
     FRONTIER_MONS_HEX_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jazmin[] = 
+const u16 gBattleFrontierTrainerMons_Jazmin[] =
 {
     FRONTIER_MONS_HEX_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Kelsey[] = 
+const u16 gBattleFrontierTrainerMons_Kelsey[] =
 {
     FRONTIER_MONS_HEX_MANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jalen[] = 
+const u16 gBattleFrontierTrainerMons_Jalen[] =
 {
     FRONTIER_MONS_POKEMANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Griffen[] = 
+const u16 gBattleFrontierTrainerMons_Griffen[] =
 {
     FRONTIER_MONS_POKEMANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Xander[] = 
+const u16 gBattleFrontierTrainerMons_Xander[] =
 {
     FRONTIER_MONS_POKEMANIAC_1
 };
 
-const u16 gBattleFrontierTrainerMons_Marvin[] = 
+const u16 gBattleFrontierTrainerMons_Marvin[] =
 {
     FRONTIER_MONS_GENTLEMAN_1A
 };
 
-const u16 gBattleFrontierTrainerMons_Brennan[] = 
+const u16 gBattleFrontierTrainerMons_Brennan[] =
 {
     FRONTIER_MONS_GENTLEMAN_1B
 };
 
-const u16 gBattleFrontierTrainerMons_Baley[] = 
+const u16 gBattleFrontierTrainerMons_Baley[] =
 {
     FRONTIER_MONS_BUG_MANIAC_2
 };
 
-const u16 gBattleFrontierTrainerMons_Zackary[] = 
+const u16 gBattleFrontierTrainerMons_Zackary[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_2
 };
 
-const u16 gBattleFrontierTrainerMons_Gabriel[] = 
+const u16 gBattleFrontierTrainerMons_Gabriel[] =
 {
     FRONTIER_MONS_COLLECTOR_1
 };
 
-const u16 gBattleFrontierTrainerMons_Emily[] = 
+const u16 gBattleFrontierTrainerMons_Emily[] =
 {
     FRONTIER_MONS_PARASOL_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jordyn[] = 
+const u16 gBattleFrontierTrainerMons_Jordyn[] =
 {
     FRONTIER_MONS_BEAUTY_1
 };
 
-const u16 gBattleFrontierTrainerMons_Sofia[] = 
+const u16 gBattleFrontierTrainerMons_Sofia[] =
 {
     FRONTIER_MONS_AROMA_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Braden[] = 
+const u16 gBattleFrontierTrainerMons_Braden[] =
 {
     FRONTIER_MONS_COOLTRAINER_1A
 };
 
-const u16 gBattleFrontierTrainerMons_Kayden[] = 
+const u16 gBattleFrontierTrainerMons_Kayden[] =
 {
     FRONTIER_MONS_COOLTRAINER_1B
 };
 
-const u16 gBattleFrontierTrainerMons_Cooper[] = 
+const u16 gBattleFrontierTrainerMons_Cooper[] =
 {
     FRONTIER_MONS_COOLTRAINER_1C
 };
 
-const u16 gBattleFrontierTrainerMons_Julia[] = 
+const u16 gBattleFrontierTrainerMons_Julia[] =
 {
     FRONTIER_MONS_COOLTRAINER_1A
 };
 
-const u16 gBattleFrontierTrainerMons_Amara[] = 
+const u16 gBattleFrontierTrainerMons_Amara[] =
 {
     FRONTIER_MONS_COOLTRAINER_1B
 };
 
-const u16 gBattleFrontierTrainerMons_Lynn[] = 
+const u16 gBattleFrontierTrainerMons_Lynn[] =
 {
     FRONTIER_MONS_COOLTRAINER_1C
 };
 
-const u16 gBattleFrontierTrainerMons_Jovan[] = 
+const u16 gBattleFrontierTrainerMons_Jovan[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Dominic[] = 
+const u16 gBattleFrontierTrainerMons_Dominic[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Nikolas[] = 
+const u16 gBattleFrontierTrainerMons_Nikolas[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Valeria[] = 
+const u16 gBattleFrontierTrainerMons_Valeria[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Delaney[] = 
+const u16 gBattleFrontierTrainerMons_Delaney[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Meghan[] = 
+const u16 gBattleFrontierTrainerMons_Meghan[] =
 {
     FRONTIER_MONS_PKMN_RANGER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Roberto[] = 
+const u16 gBattleFrontierTrainerMons_Roberto[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Damian[] = 
+const u16 gBattleFrontierTrainerMons_Damian[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Brody[] = 
+const u16 gBattleFrontierTrainerMons_Brody[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Graham[] = 
+const u16 gBattleFrontierTrainerMons_Graham[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_1
 };
 
-const u16 gBattleFrontierTrainerMons_Tylor[] = 
+const u16 gBattleFrontierTrainerMons_Tylor[] =
 {
     FRONTIER_MONS_POKEFAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jaren[] = 
+const u16 gBattleFrontierTrainerMons_Jaren[] =
 {
     FRONTIER_MONS_POKEFAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Cordell[] = 
+const u16 gBattleFrontierTrainerMons_Cordell[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_M_1
 };
 
-const u16 gBattleFrontierTrainerMons_Jazlyn[] = 
+const u16 gBattleFrontierTrainerMons_Jazlyn[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_F_1
 };
 
-const u16 gBattleFrontierTrainerMons_Zachery[] = 
+const u16 gBattleFrontierTrainerMons_Zachery[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_2
 };
 
-const u16 gBattleFrontierTrainerMons_Johan[] = 
+const u16 gBattleFrontierTrainerMons_Johan[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_2_NO_DUGTRIO
 };
 
-const u16 gBattleFrontierTrainerMons_Shea[] = 
+const u16 gBattleFrontierTrainerMons_Shea[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_2
 };
 
-const u16 gBattleFrontierTrainerMons_Kaila[] = 
+const u16 gBattleFrontierTrainerMons_Kaila[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_2
 };
 
-const u16 gBattleFrontierTrainerMons_Isiah[] = 
+const u16 gBattleFrontierTrainerMons_Isiah[] =
 {
     FRONTIER_MONS_SCHOOL_KID_2
 };
 
-const u16 gBattleFrontierTrainerMons_Garrett[] = 
+const u16 gBattleFrontierTrainerMons_Garrett[] =
 {
     FRONTIER_MONS_SCHOOL_KID_2
 };
 
-const u16 gBattleFrontierTrainerMons_Haylie[] = 
+const u16 gBattleFrontierTrainerMons_Haylie[] =
 {
     FRONTIER_MONS_SCHOOL_KID_2
 };
 
-const u16 gBattleFrontierTrainerMons_Megan[] = 
+const u16 gBattleFrontierTrainerMons_Megan[] =
 {
     FRONTIER_MONS_SCHOOL_KID_2
 };
 
-const u16 gBattleFrontierTrainerMons_Issac[] = 
+const u16 gBattleFrontierTrainerMons_Issac[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Quinton[] = 
+const u16 gBattleFrontierTrainerMons_Quinton[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Salma[] = 
+const u16 gBattleFrontierTrainerMons_Salma[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Ansley[] = 
+const u16 gBattleFrontierTrainerMons_Ansley[] =
 {
     FRONTIER_MONS_RICH_BOY_LADY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Holden[] = 
+const u16 gBattleFrontierTrainerMons_Holden[] =
 {
     FRONTIER_MONS_BUG_CATCHER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Luca[] = 
+const u16 gBattleFrontierTrainerMons_Luca[] =
 {
     FRONTIER_MONS_BUG_CATCHER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jamison[] = 
+const u16 gBattleFrontierTrainerMons_Jamison[] =
 {
     FRONTIER_MONS_NINJA_BOY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Gunnar[] = 
+const u16 gBattleFrontierTrainerMons_Gunnar[] =
 {
     FRONTIER_MONS_NINJA_BOY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Craig[] = 
+const u16 gBattleFrontierTrainerMons_Craig[] =
 {
     FRONTIER_MONS_TUBER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Pierce[] = 
+const u16 gBattleFrontierTrainerMons_Pierce[] =
 {
     FRONTIER_MONS_TUBER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Regina[] = 
+const u16 gBattleFrontierTrainerMons_Regina[] =
 {
     FRONTIER_MONS_TUBER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Alison[] = 
+const u16 gBattleFrontierTrainerMons_Alison[] =
 {
     FRONTIER_MONS_TUBER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Hank[] = 
+const u16 gBattleFrontierTrainerMons_Hank[] =
 {
     FRONTIER_MONS_BUG_MANIAC_3
 };
 
-const u16 gBattleFrontierTrainerMons_Earl[] = 
+const u16 gBattleFrontierTrainerMons_Earl[] =
 {
     FRONTIER_MONS_BUG_MANIAC_3
 };
 
-const u16 gBattleFrontierTrainerMons_Ramiro[] = 
+const u16 gBattleFrontierTrainerMons_Ramiro[] =
 {
     FRONTIER_MONS_FISHERMAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Hunter[] = 
+const u16 gBattleFrontierTrainerMons_Hunter[] =
 {
     FRONTIER_MONS_FISHERMAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Aiden[] = 
+const u16 gBattleFrontierTrainerMons_Aiden[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_3
 };
 
-const u16 gBattleFrontierTrainerMons_Xavier[] = 
+const u16 gBattleFrontierTrainerMons_Xavier[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_3
 };
 
-const u16 gBattleFrontierTrainerMons_Clinton[] = 
+const u16 gBattleFrontierTrainerMons_Clinton[] =
 {
     FRONTIER_MONS_COLLECTOR_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jesse[] = 
+const u16 gBattleFrontierTrainerMons_Jesse[] =
 {
     FRONTIER_MONS_COLLECTOR_2
 };
 
-const u16 gBattleFrontierTrainerMons_Eduardo[] = 
+const u16 gBattleFrontierTrainerMons_Eduardo[] =
 {
     FRONTIER_MONS_GUITARIST_2
 };
 
-const u16 gBattleFrontierTrainerMons_Hal[] = 
+const u16 gBattleFrontierTrainerMons_Hal[] =
 {
     FRONTIER_MONS_GUITARIST_2
 };
 
-const u16 gBattleFrontierTrainerMons_Gage[] = 
+const u16 gBattleFrontierTrainerMons_Gage[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Arnold[] = 
+const u16 gBattleFrontierTrainerMons_Arnold[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jarrett[] = 
+const u16 gBattleFrontierTrainerMons_Jarrett[] =
 {
     FRONTIER_MONS_SAILOR_2
 };
 
-const u16 gBattleFrontierTrainerMons_Garett[] = 
+const u16 gBattleFrontierTrainerMons_Garett[] =
 {
     FRONTIER_MONS_SAILOR_2
 };
 
-const u16 gBattleFrontierTrainerMons_Emanuel[] = 
+const u16 gBattleFrontierTrainerMons_Emanuel[] =
 {
     FRONTIER_MONS_HIKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Gustavo[] = 
+const u16 gBattleFrontierTrainerMons_Gustavo[] =
 {
     FRONTIER_MONS_HIKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Kameron[] = 
+const u16 gBattleFrontierTrainerMons_Kameron[] =
 {
     FRONTIER_MONS_KINDLER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Alfredo[] = 
+const u16 gBattleFrontierTrainerMons_Alfredo[] =
 {
     FRONTIER_MONS_KINDLER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Ruben[] = 
+const u16 gBattleFrontierTrainerMons_Ruben[] =
 {
     FRONTIER_MONS_GENTLEMAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Lamar[] = 
+const u16 gBattleFrontierTrainerMons_Lamar[] =
 {
     FRONTIER_MONS_GENTLEMAN_2
 };
 
-const u16 gBattleFrontierTrainerMons_Jaxon[] = 
+const u16 gBattleFrontierTrainerMons_Jaxon[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
-const u16 gBattleFrontierTrainerMons_Logan[] = 
+const u16 gBattleFrontierTrainerMons_Logan[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
-const u16 gBattleFrontierTrainerMons_Emilee[] = 
+const u16 gBattleFrontierTrainerMons_Emilee[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
-const u16 gBattleFrontierTrainerMons_Josie[] = 
+const u16 gBattleFrontierTrainerMons_Josie[] =
 {
     FRONTIER_MONS_YOUNGSTER_LASS_3
 };
 
-const u16 gBattleFrontierTrainerMons_Armando[] = 
+const u16 gBattleFrontierTrainerMons_Armando[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Skyler[] = 
+const u16 gBattleFrontierTrainerMons_Skyler[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Ruth[] = 
+const u16 gBattleFrontierTrainerMons_Ruth[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Melody[] = 
+const u16 gBattleFrontierTrainerMons_Melody[] =
 {
     FRONTIER_MONS_CAMPER_PICNICKER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Pedro[] = 
+const u16 gBattleFrontierTrainerMons_Pedro[] =
 {
     FRONTIER_MONS_SWIMMER_M_2
 };
 
-const u16 gBattleFrontierTrainerMons_Erick[] = 
+const u16 gBattleFrontierTrainerMons_Erick[] =
 {
     FRONTIER_MONS_SWIMMER_M_2
 };
 
-const u16 gBattleFrontierTrainerMons_Elaine[] = 
+const u16 gBattleFrontierTrainerMons_Elaine[] =
 {
     FRONTIER_MONS_SWIMMER_F_2
 };
 
-const u16 gBattleFrontierTrainerMons_Joyce[] = 
+const u16 gBattleFrontierTrainerMons_Joyce[] =
 {
     FRONTIER_MONS_SWIMMER_F_2
 };
 
-const u16 gBattleFrontierTrainerMons_Todd[] = 
+const u16 gBattleFrontierTrainerMons_Todd[] =
 {
     FRONTIER_MONS_POKEFAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Gavin[] = 
+const u16 gBattleFrontierTrainerMons_Gavin[] =
 {
     FRONTIER_MONS_POKEFAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Malory[] = 
+const u16 gBattleFrontierTrainerMons_Malory[] =
 {
     FRONTIER_MONS_POKEFAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Esther[] = 
+const u16 gBattleFrontierTrainerMons_Esther[] =
 {
     FRONTIER_MONS_POKEFAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Oscar[] = 
+const u16 gBattleFrontierTrainerMons_Oscar[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Wilson[] = 
+const u16 gBattleFrontierTrainerMons_Wilson[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Clare[] = 
+const u16 gBattleFrontierTrainerMons_Clare[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Tess[] = 
+const u16 gBattleFrontierTrainerMons_Tess[] =
 {
     FRONTIER_MONS_PKMN_BREEDER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Leon[] = 
+const u16 gBattleFrontierTrainerMons_Leon[] =
 {
     FRONTIER_MONS_COOLTRAINER_M_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Alonzo[] = 
+const u16 gBattleFrontierTrainerMons_Alonzo[] =
 {
     FRONTIER_MONS_COOLTRAINER_M_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Vince[] = 
+const u16 gBattleFrontierTrainerMons_Vince[] =
 {
     FRONTIER_MONS_COOLTRAINER_2C(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Bryon[] = 
+const u16 gBattleFrontierTrainerMons_Bryon[] =
 {
     FRONTIER_MONS_COOLTRAINER_2D(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Ava[] = 
+const u16 gBattleFrontierTrainerMons_Ava[] =
 {
     FRONTIER_MONS_COOLTRAINER_F_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Miriam[] = 
+const u16 gBattleFrontierTrainerMons_Miriam[] =
 {
     FRONTIER_MONS_COOLTRAINER_F_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Carrie[] = 
+const u16 gBattleFrontierTrainerMons_Carrie[] =
 {
     FRONTIER_MONS_COOLTRAINER_2C(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Gillian2[] = 
+const u16 gBattleFrontierTrainerMons_Gillian2[] =
 {
     FRONTIER_MONS_COOLTRAINER_2D(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Tyler[] = 
+const u16 gBattleFrontierTrainerMons_Tyler[] =
 {
     FRONTIER_MONS_GENERAL_A
 };
 
-const u16 gBattleFrontierTrainerMons_Chaz[] = 
+const u16 gBattleFrontierTrainerMons_Chaz[] =
 {
     FRONTIER_MONS_GENERAL_B
 };
 
-const u16 gBattleFrontierTrainerMons_Nelson[] = 
+const u16 gBattleFrontierTrainerMons_Nelson[] =
 {
     FRONTIER_MONS_COOLTRAINER_2D(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Shania[] = 
+const u16 gBattleFrontierTrainerMons_Shania[] =
 {
     FRONTIER_MONS_GENERAL_C
 };
 
-const u16 gBattleFrontierTrainerMons_Stella[] = 
+const u16 gBattleFrontierTrainerMons_Stella[] =
 {
     FRONTIER_MONS_GENERAL_D
 };
 
-const u16 gBattleFrontierTrainerMons_Dorine[] = 
+const u16 gBattleFrontierTrainerMons_Dorine[] =
 {
     FRONTIER_MONS_COOLTRAINER_2D(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Maddox[] = 
+const u16 gBattleFrontierTrainerMons_Maddox[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Davin[] = 
+const u16 gBattleFrontierTrainerMons_Davin[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Trevon[] = 
+const u16 gBattleFrontierTrainerMons_Trevon[] =
 {
     FRONTIER_MONS_DRAGON_TAMER_2
 };
 
-const u16 gBattleFrontierTrainerMons_Mateo[] = 
+const u16 gBattleFrontierTrainerMons_Mateo[] =
 {
     FRONTIER_MONS_BLACK_BELT_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Bret[] = 
+const u16 gBattleFrontierTrainerMons_Bret[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Raul[] = 
+const u16 gBattleFrontierTrainerMons_Raul[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2C
 };
 
-const u16 gBattleFrontierTrainerMons_Kay[] = 
+const u16 gBattleFrontierTrainerMons_Kay[] =
 {
     FRONTIER_MONS_BATTLE_GIRL_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Elena[] = 
+const u16 gBattleFrontierTrainerMons_Elena[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Alana[] = 
+const u16 gBattleFrontierTrainerMons_Alana[] =
 {
     FRONTIER_MONS_BLACK_BELT_BATTLE_GIRL_2C
 };
 
-const u16 gBattleFrontierTrainerMons_Alexas[] = 
+const u16 gBattleFrontierTrainerMons_Alexas[] =
 {
     FRONTIER_MONS_EXPERT_2A(TYRANITAR)
 };
 
-const u16 gBattleFrontierTrainerMons_Weston[] = 
+const u16 gBattleFrontierTrainerMons_Weston[] =
 {
     FRONTIER_MONS_EXPERT_2B(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Jasper[] = 
+const u16 gBattleFrontierTrainerMons_Jasper[] =
 {
     FRONTIER_MONS_EXPERT_2C(TYRANITAR)
 };
 
-const u16 gBattleFrontierTrainerMons_Nadia[] = 
+const u16 gBattleFrontierTrainerMons_Nadia[] =
 {
     FRONTIER_MONS_EXPERT_2A(DRAGONITE)
 };
 
-const u16 gBattleFrontierTrainerMons_Miranda[] = 
+const u16 gBattleFrontierTrainerMons_Miranda[] =
 {
     FRONTIER_MONS_EXPERT_2B(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Emma[] = 
+const u16 gBattleFrontierTrainerMons_Emma[] =
 {
     FRONTIER_MONS_EXPERT_2C(DRAGONITE)
 };
 
-const u16 gBattleFrontierTrainerMons_Rolando[] = 
+const u16 gBattleFrontierTrainerMons_Rolando[] =
 {
     FRONTIER_MONS_PSYCHIC_2A(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Stanly[] = 
+const u16 gBattleFrontierTrainerMons_Stanly[] =
 {
     FRONTIER_MONS_PSYCHIC_2B(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Dario[] = 
+const u16 gBattleFrontierTrainerMons_Dario[] =
 {
     FRONTIER_MONS_PSYCHIC_2C(LATIOS)
 };
 
-const u16 gBattleFrontierTrainerMons_Karlee[] = 
+const u16 gBattleFrontierTrainerMons_Karlee[] =
 {
     FRONTIER_MONS_PSYCHIC_2A(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Jaylin[] = 
+const u16 gBattleFrontierTrainerMons_Jaylin[] =
 {
     FRONTIER_MONS_PSYCHIC_2B(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Ingrid[] = 
+const u16 gBattleFrontierTrainerMons_Ingrid[] =
 {
     FRONTIER_MONS_PSYCHIC_2C(LATIAS)
 };
 
-const u16 gBattleFrontierTrainerMons_Delilah[] = 
+const u16 gBattleFrontierTrainerMons_Delilah[] =
 {
     FRONTIER_MONS_HEX_MANIAC_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Carly[] = 
+const u16 gBattleFrontierTrainerMons_Carly[] =
 {
     FRONTIER_MONS_HEX_MANIAC_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Lexie[] = 
+const u16 gBattleFrontierTrainerMons_Lexie[] =
 {
     FRONTIER_MONS_HEX_MANIAC_2C
 };
 
-const u16 gBattleFrontierTrainerMons_Miller[] = 
+const u16 gBattleFrontierTrainerMons_Miller[] =
 {
     FRONTIER_MONS_POKEMANIAC_2A
 };
 
-const u16 gBattleFrontierTrainerMons_Marv[] = 
+const u16 gBattleFrontierTrainerMons_Marv[] =
 {
     FRONTIER_MONS_POKEMANIAC_2B
 };
 
-const u16 gBattleFrontierTrainerMons_Layton[] = 
+const u16 gBattleFrontierTrainerMons_Layton[] =
 {
     FRONTIER_MONS_POKEMANIAC_2C
 };
 
-const u16 gBattleFrontierTrainerMons_Brooks[] = 
+const u16 gBattleFrontierTrainerMons_Brooks[] =
 {
     FRONTIER_MONS_GENERAL_A
 };
 
-const u16 gBattleFrontierTrainerMons_Gregory[] = 
+const u16 gBattleFrontierTrainerMons_Gregory[] =
 {
     FRONTIER_MONS_GENTLEMAN_3A
 };
 
-const u16 gBattleFrontierTrainerMons_Reese[] = 
+const u16 gBattleFrontierTrainerMons_Reese[] =
 {
     FRONTIER_MONS_GENTLEMAN_3B
 };
 
-const u16 gBattleFrontierTrainerMons_Mason[] = 
+const u16 gBattleFrontierTrainerMons_Mason[] =
 {
     FRONTIER_MONS_GENERAL_A
 };
 
-const u16 gBattleFrontierTrainerMons_Toby[] = 
+const u16 gBattleFrontierTrainerMons_Toby[] =
 {
     FRONTIER_MONS_GENERAL_B
 };
 
-const u16 gBattleFrontierTrainerMons_Dorothy[] = 
+const u16 gBattleFrontierTrainerMons_Dorothy[] =
 {
     FRONTIER_MONS_GENERAL_C
 };
 
-const u16 gBattleFrontierTrainerMons_Piper[] = 
+const u16 gBattleFrontierTrainerMons_Piper[] =
 {
     FRONTIER_MONS_GENERAL_D
 };
 
-const u16 gBattleFrontierTrainerMons_Finn[] = 
+const u16 gBattleFrontierTrainerMons_Finn[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_M_3
 };
 
-const u16 gBattleFrontierTrainerMons_Samir[] = 
+const u16 gBattleFrontierTrainerMons_Samir[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_M_3
 };
 
-const u16 gBattleFrontierTrainerMons_Fiona[] = 
+const u16 gBattleFrontierTrainerMons_Fiona[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_F_3
 };
 
-const u16 gBattleFrontierTrainerMons_Gloria[] = 
+const u16 gBattleFrontierTrainerMons_Gloria[] =
 {
     FRONTIER_MONS_SWIMMING_TRIATHLETE_F_3
 };
 
-const u16 gBattleFrontierTrainerMons_Nico[] = 
+const u16 gBattleFrontierTrainerMons_Nico[] =
 {
     FRONTIER_MONS_GENERAL_A
 };
 
-const u16 gBattleFrontierTrainerMons_Jeremy[] = 
+const u16 gBattleFrontierTrainerMons_Jeremy[] =
 {
     FRONTIER_MONS_GENERAL_B
 };
 
-const u16 gBattleFrontierTrainerMons_Caitlin[] = 
+const u16 gBattleFrontierTrainerMons_Caitlin[] =
 {
     FRONTIER_MONS_GENERAL_C
 };
 
-const u16 gBattleFrontierTrainerMons_Reena[] = 
+const u16 gBattleFrontierTrainerMons_Reena[] =
 {
     FRONTIER_MONS_GENERAL_D
 };
 
-const u16 gBattleFrontierTrainerMons_Avery[] = 
+const u16 gBattleFrontierTrainerMons_Avery[] =
 {
     FRONTIER_MONS_BUG_MANIAC_4
 };
 
-const u16 gBattleFrontierTrainerMons_Liam[] = 
+const u16 gBattleFrontierTrainerMons_Liam[] =
 {
     FRONTIER_MONS_BUG_MANIAC_4
 };
 
-const u16 gBattleFrontierTrainerMons_Theo[] = 
+const u16 gBattleFrontierTrainerMons_Theo[] =
 {
     FRONTIER_MONS_FISHERMAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Bailey[] = 
+const u16 gBattleFrontierTrainerMons_Bailey[] =
 {
     FRONTIER_MONS_FISHERMAN_3
 };
 
-const u16 gBattleFrontierTrainerMons_Hugo[] = 
+const u16 gBattleFrontierTrainerMons_Hugo[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_4
 };
 
-const u16 gBattleFrontierTrainerMons_Bryce[] = 
+const u16 gBattleFrontierTrainerMons_Bryce[] =
 {
     FRONTIER_MONS_RUIN_MANIAC_4
 };
 
-const u16 gBattleFrontierTrainerMons_Gideon[] = 
+const u16 gBattleFrontierTrainerMons_Gideon[] =
 {
     FRONTIER_MONS_COLLECTOR_3
 };
 
-const u16 gBattleFrontierTrainerMons_Triston[] = 
+const u16 gBattleFrontierTrainerMons_Triston[] =
 {
     FRONTIER_MONS_COLLECTOR_3
 };
 
-const u16 gBattleFrontierTrainerMons_Charles[] = 
+const u16 gBattleFrontierTrainerMons_Charles[] =
 {
     FRONTIER_MONS_GUITARIST_3A
 };
 
-const u16 gBattleFrontierTrainerMons_Raymond[] = 
+const u16 gBattleFrontierTrainerMons_Raymond[] =
 {
     FRONTIER_MONS_GUITARIST_3B
 };
 
-const u16 gBattleFrontierTrainerMons_Dirk[] = 
+const u16 gBattleFrontierTrainerMons_Dirk[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Harold[] = 
+const u16 gBattleFrontierTrainerMons_Harold[] =
 {
     FRONTIER_MONS_BIRD_KEEPER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Omar[] = 
+const u16 gBattleFrontierTrainerMons_Omar[] =
 {
     FRONTIER_MONS_SAILOR_3
 };
 
-const u16 gBattleFrontierTrainerMons_Peter[] = 
+const u16 gBattleFrontierTrainerMons_Peter[] =
 {
     FRONTIER_MONS_SAILOR_3
 };
 
-const u16 gBattleFrontierTrainerMons_Dev[] = 
+const u16 gBattleFrontierTrainerMons_Dev[] =
 {
     FRONTIER_MONS_HIKER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Corey[] = 
+const u16 gBattleFrontierTrainerMons_Corey[] =
 {
     FRONTIER_MONS_HIKER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Andre[] = 
+const u16 gBattleFrontierTrainerMons_Andre[] =
 {
     FRONTIER_MONS_KINDLER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Ferris[] = 
+const u16 gBattleFrontierTrainerMons_Ferris[] =
 {
     FRONTIER_MONS_KINDLER_3
 };
 
-const u16 gBattleFrontierTrainerMons_Alivia[] = 
+const u16 gBattleFrontierTrainerMons_Alivia[] =
 {
     FRONTIER_MONS_PARASOL_LADY_3
 };
 
-const u16 gBattleFrontierTrainerMons_Paige[] = 
+const u16 gBattleFrontierTrainerMons_Paige[] =
 {
     FRONTIER_MONS_PARASOL_LADY_3
 };
 
-const u16 gBattleFrontierTrainerMons_Anya[] = 
+const u16 gBattleFrontierTrainerMons_Anya[] =
 {
     FRONTIER_MONS_EEVEELUTIONS
 };
 
-const u16 gBattleFrontierTrainerMons_Dawn[] = 
+const u16 gBattleFrontierTrainerMons_Dawn[] =
 {
     FRONTIER_MONS_BEAUTY_2
 };
 
-const u16 gBattleFrontierTrainerMons_Abby[] = 
+const u16 gBattleFrontierTrainerMons_Abby[] =
 {
     FRONTIER_MONS_AROMA_LADY_3
 };
 
-const u16 gBattleFrontierTrainerMons_Gretel[] = 
+const u16 gBattleFrontierTrainerMons_Gretel[] =
 {
     FRONTIER_MONS_AROMA_LADY_3
 };
diff --git a/src/data/battle_frontier/battle_tent.h b/src/data/battle_frontier/battle_tent.h
index e1c3750bf..de08dcfd6 100644
--- a/src/data/battle_frontier/battle_tent.h
+++ b/src/data/battle_frontier/battle_tent.h
@@ -1,5 +1,5 @@
 // Slateport Battle Tent.
-const u16 gSlateportBattleTentTrainerMons_Jolie[] = 
+const u16 gSlateportBattleTentTrainerMons_Jolie[] =
 {
     SLATEPORT_TENT_MON_CACNEA_1,
     SLATEPORT_TENT_MON_LOMBRE_1,
@@ -15,7 +15,7 @@ const u16 gSlateportBattleTentTrainerMons_Jolie[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Malachi[] = 
+const u16 gSlateportBattleTentTrainerMons_Malachi[] =
 {
     SLATEPORT_TENT_MON_CACNEA_1,
     SLATEPORT_TENT_MON_GRAVELER,
@@ -31,7 +31,7 @@ const u16 gSlateportBattleTentTrainerMons_Malachi[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Kelsie[] = 
+const u16 gSlateportBattleTentTrainerMons_Kelsie[] =
 {
     SLATEPORT_TENT_MON_WAILMER_1,
     SLATEPORT_TENT_MON_WAILMER_2,
@@ -47,7 +47,7 @@ const u16 gSlateportBattleTentTrainerMons_Kelsie[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Davon[] = 
+const u16 gSlateportBattleTentTrainerMons_Davon[] =
 {
     SLATEPORT_TENT_MON_WAILMER_1,
     SLATEPORT_TENT_MON_WAILMER_2,
@@ -64,7 +64,7 @@ const u16 gSlateportBattleTentTrainerMons_Davon[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Glenda[] = 
+const u16 gSlateportBattleTentTrainerMons_Glenda[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
@@ -82,7 +82,7 @@ const u16 gSlateportBattleTentTrainerMons_Glenda[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Helena[] = 
+const u16 gSlateportBattleTentTrainerMons_Helena[] =
 {
     SLATEPORT_TENT_MON_MIGHTYENA_1,
     SLATEPORT_TENT_MON_MIGHTYENA_2,
@@ -98,7 +98,7 @@ const u16 gSlateportBattleTentTrainerMons_Helena[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Rodolfo[] = 
+const u16 gSlateportBattleTentTrainerMons_Rodolfo[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
@@ -116,7 +116,7 @@ const u16 gSlateportBattleTentTrainerMons_Rodolfo[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Davion[] = 
+const u16 gSlateportBattleTentTrainerMons_Davion[] =
 {
     SLATEPORT_TENT_MON_BALTOY,
     SLATEPORT_TENT_MON_VOLTORB,
@@ -135,7 +135,7 @@ const u16 gSlateportBattleTentTrainerMons_Davion[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Kendall[] = 
+const u16 gSlateportBattleTentTrainerMons_Kendall[] =
 {
     SLATEPORT_TENT_MON_WAILMER_1,
     SLATEPORT_TENT_MON_WINGULL_1,
@@ -154,7 +154,7 @@ const u16 gSlateportBattleTentTrainerMons_Kendall[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Colten[] = 
+const u16 gSlateportBattleTentTrainerMons_Colten[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_BEAUTIFLY,
@@ -171,7 +171,7 @@ const u16 gSlateportBattleTentTrainerMons_Colten[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Irvin[] = 
+const u16 gSlateportBattleTentTrainerMons_Irvin[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
@@ -189,7 +189,7 @@ const u16 gSlateportBattleTentTrainerMons_Irvin[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Shaun[] = 
+const u16 gSlateportBattleTentTrainerMons_Shaun[] =
 {
     SLATEPORT_TENT_MON_BALTOY,
     SLATEPORT_TENT_MON_MIGHTYENA_1,
@@ -207,7 +207,7 @@ const u16 gSlateportBattleTentTrainerMons_Shaun[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Kyler[] = 
+const u16 gSlateportBattleTentTrainerMons_Kyler[] =
 {
     SLATEPORT_TENT_MON_ELECTRIKE_1,
     SLATEPORT_TENT_MON_VOLTORB,
@@ -224,7 +224,7 @@ const u16 gSlateportBattleTentTrainerMons_Kyler[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Maggie[] = 
+const u16 gSlateportBattleTentTrainerMons_Maggie[] =
 {
     SLATEPORT_TENT_MON_LOMBRE_1,
     SLATEPORT_TENT_MON_NUZLEAF,
@@ -240,7 +240,7 @@ const u16 gSlateportBattleTentTrainerMons_Maggie[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Stephon[] = 
+const u16 gSlateportBattleTentTrainerMons_Stephon[] =
 {
     SLATEPORT_TENT_MON_PELIPPER_1,
     SLATEPORT_TENT_MON_LOMBRE_1,
@@ -256,7 +256,7 @@ const u16 gSlateportBattleTentTrainerMons_Stephon[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Rebecca[] = 
+const u16 gSlateportBattleTentTrainerMons_Rebecca[] =
 {
     SLATEPORT_TENT_MON_PELIPPER_1,
     SLATEPORT_TENT_MON_NUZLEAF,
@@ -272,7 +272,7 @@ const u16 gSlateportBattleTentTrainerMons_Rebecca[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Reggie[] = 
+const u16 gSlateportBattleTentTrainerMons_Reggie[] =
 {
     SLATEPORT_TENT_MON_MARILL_1,
     SLATEPORT_TENT_MON_WINGULL_1,
@@ -289,7 +289,7 @@ const u16 gSlateportBattleTentTrainerMons_Reggie[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Janae[] = 
+const u16 gSlateportBattleTentTrainerMons_Janae[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
@@ -306,7 +306,7 @@ const u16 gSlateportBattleTentTrainerMons_Janae[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Caiden[] = 
+const u16 gSlateportBattleTentTrainerMons_Caiden[] =
 {
     SLATEPORT_TENT_MON_LOMBRE_1,
     SLATEPORT_TENT_MON_NINJASK_1,
@@ -324,7 +324,7 @@ const u16 gSlateportBattleTentTrainerMons_Caiden[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Kirsten[] = 
+const u16 gSlateportBattleTentTrainerMons_Kirsten[] =
 {
     SLATEPORT_TENT_MON_LOMBRE_1,
     SLATEPORT_TENT_MON_GRAVELER,
@@ -342,7 +342,7 @@ const u16 gSlateportBattleTentTrainerMons_Kirsten[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Kurtis[] = 
+const u16 gSlateportBattleTentTrainerMons_Kurtis[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_1,
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
@@ -358,7 +358,7 @@ const u16 gSlateportBattleTentTrainerMons_Kurtis[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Stefan[] = 
+const u16 gSlateportBattleTentTrainerMons_Stefan[] =
 {
     SLATEPORT_TENT_MON_WAILMER_1,
     SLATEPORT_TENT_MON_WAILMER_2,
@@ -374,7 +374,7 @@ const u16 gSlateportBattleTentTrainerMons_Stefan[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Avery[] = 
+const u16 gSlateportBattleTentTrainerMons_Avery[] =
 {
     SLATEPORT_TENT_MON_BEAUTIFLY,
     SLATEPORT_TENT_MON_DUSTOX,
@@ -390,7 +390,7 @@ const u16 gSlateportBattleTentTrainerMons_Avery[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Dwane[] = 
+const u16 gSlateportBattleTentTrainerMons_Dwane[] =
 {
     SLATEPORT_TENT_MON_NINJASK_1,
     SLATEPORT_TENT_MON_NINJASK_2,
@@ -406,7 +406,7 @@ const u16 gSlateportBattleTentTrainerMons_Dwane[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Mckenna[] = 
+const u16 gSlateportBattleTentTrainerMons_Mckenna[] =
 {
     SLATEPORT_TENT_MON_CACNEA_2,
     SLATEPORT_TENT_MON_SWELLOW,
@@ -422,7 +422,7 @@ const u16 gSlateportBattleTentTrainerMons_Mckenna[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Camryn[] = 
+const u16 gSlateportBattleTentTrainerMons_Camryn[] =
 {
     SLATEPORT_TENT_MON_WAILMER_2,
     SLATEPORT_TENT_MON_MARILL_1,
@@ -439,7 +439,7 @@ const u16 gSlateportBattleTentTrainerMons_Camryn[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Natasha[] = 
+const u16 gSlateportBattleTentTrainerMons_Natasha[] =
 {
     SLATEPORT_TENT_MON_ZIGZAGOON_2,
     SLATEPORT_TENT_MON_DUSTOX,
@@ -455,7 +455,7 @@ const u16 gSlateportBattleTentTrainerMons_Natasha[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Austyn[] = 
+const u16 gSlateportBattleTentTrainerMons_Austyn[] =
 {
     SLATEPORT_TENT_MON_ARON_2,
     SLATEPORT_TENT_MON_LOUDRED,
@@ -472,7 +472,7 @@ const u16 gSlateportBattleTentTrainerMons_Austyn[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Donovan[] = 
+const u16 gSlateportBattleTentTrainerMons_Donovan[] =
 {
     SLATEPORT_TENT_MON_LOMBRE_1,
     SLATEPORT_TENT_MON_GRAVELER,
@@ -491,7 +491,7 @@ const u16 gSlateportBattleTentTrainerMons_Donovan[] =
     -1
 };
 
-const u16 gSlateportBattleTentTrainerMons_Tamia[] = 
+const u16 gSlateportBattleTentTrainerMons_Tamia[] =
 {
     SLATEPORT_TENT_MON_BEAUTIFLY,
     SLATEPORT_TENT_MON_MARILL_1,
@@ -507,7 +507,7 @@ const u16 gSlateportBattleTentTrainerMons_Tamia[] =
     -1
 };
 
-const struct BattleFrontierTrainer gSlateportBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
+const struct BattleFrontierTrainer gSlateportBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] =
 {
     [SLATEPORT_TENT_TRAINER_JOLIE] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
@@ -751,7 +751,7 @@ const struct BattleFrontierTrainer gSlateportBattleTentTrainers[NUM_BATTLE_TENT_
     }
 };
 
-const struct FacilityMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] = 
+const struct FacilityMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] =
 {
     [SLATEPORT_TENT_MON_ZIGZAGOON_1] = {
         .species = SPECIES_ZIGZAGOON,
@@ -1246,7 +1246,7 @@ const struct FacilityMon gSlateportBattleTentMons[NUM_SLATEPORT_TENT_MONS] =
 };
 
 // Verdanturf Battle Tent.
-const u16 gVerdanturfBattleTentTrainerMons_Brenna[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Brenna[] =
 {
     VERDANTURF_TENT_MON_SHROOMISH,
     VERDANTURF_TENT_MON_SWALOT,
@@ -1256,7 +1256,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Brenna[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Dilan[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Dilan[] =
 {
     VERDANTURF_TENT_MON_GRAVELER,
     VERDANTURF_TENT_MON_TRAPINCH,
@@ -1266,7 +1266,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Dilan[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Eliana[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Eliana[] =
 {
     VERDANTURF_TENT_MON_MAGIKARP,
     VERDANTURF_TENT_MON_BARBOACH,
@@ -1276,7 +1276,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Eliana[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Markus[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Markus[] =
 {
     VERDANTURF_TENT_MON_MAGIKARP,
     VERDANTURF_TENT_MON_BARBOACH,
@@ -1286,7 +1286,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Markus[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Caitlyn[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Caitlyn[] =
 {
     VERDANTURF_TENT_MON_POOCHYENA,
     VERDANTURF_TENT_MON_KECLEON,
@@ -1297,7 +1297,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Caitlyn[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Desiree[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Desiree[] =
 {
     VERDANTURF_TENT_MON_WINGULL,
     VERDANTURF_TENT_MON_KECLEON,
@@ -1307,7 +1307,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Desiree[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Ronald[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Ronald[] =
 {
     VERDANTURF_TENT_MON_ZIGZAGOON,
     VERDANTURF_TENT_MON_LINOONE,
@@ -1317,7 +1317,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Ronald[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Ashten[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Ashten[] =
 {
     VERDANTURF_TENT_MON_ARON_1,
     VERDANTURF_TENT_MON_KECLEON,
@@ -1327,7 +1327,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Ashten[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Gerard[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Gerard[] =
 {
     VERDANTURF_TENT_MON_MARILL,
     VERDANTURF_TENT_MON_BARBOACH,
@@ -1337,7 +1337,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Gerard[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Bradly[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Bradly[] =
 {
     VERDANTURF_TENT_MON_NUZLEAF,
     VERDANTURF_TENT_MON_TAILLOW,
@@ -1347,7 +1347,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Bradly[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Dennis[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Dennis[] =
 {
     VERDANTURF_TENT_MON_NINJASK,
     VERDANTURF_TENT_MON_TRAPINCH,
@@ -1357,7 +1357,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Dennis[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Prestin[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Prestin[] =
 {
     VERDANTURF_TENT_MON_KADABRA,
     VERDANTURF_TENT_MON_MIGHTYENA,
@@ -1369,7 +1369,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Prestin[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Ernesto[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Ernesto[] =
 {
     VERDANTURF_TENT_MON_MAGNEMITE,
     VERDANTURF_TENT_MON_VOLTORB,
@@ -1379,7 +1379,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Ernesto[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Nala[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Nala[] =
 {
     VERDANTURF_TENT_MON_ZIGZAGOON,
     VERDANTURF_TENT_MON_SHROOMISH,
@@ -1391,7 +1391,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Nala[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Darnell[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Darnell[] =
 {
     VERDANTURF_TENT_MON_POOCHYENA,
     VERDANTURF_TENT_MON_SOLROCK,
@@ -1402,7 +1402,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Darnell[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Ashlyn[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Ashlyn[] =
 {
     VERDANTURF_TENT_MON_SOLROCK,
     VERDANTURF_TENT_MON_MARILL,
@@ -1414,7 +1414,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Ashlyn[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Addison[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Addison[] =
 {
     VERDANTURF_TENT_MON_POOCHYENA,
     VERDANTURF_TENT_MON_ZIGZAGOON,
@@ -1424,7 +1424,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Addison[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Justine[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Justine[] =
 {
     VERDANTURF_TENT_MON_POOCHYENA,
     VERDANTURF_TENT_MON_ZIGZAGOON,
@@ -1434,7 +1434,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Justine[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Tyson[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Tyson[] =
 {
     VERDANTURF_TENT_MON_MACHOP,
     VERDANTURF_TENT_MON_MAKUHITA,
@@ -1446,7 +1446,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Tyson[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Laila[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Laila[] =
 {
     VERDANTURF_TENT_MON_MACHOP,
     VERDANTURF_TENT_MON_MAKUHITA,
@@ -1457,7 +1457,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Laila[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Waren[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Waren[] =
 {
     VERDANTURF_TENT_MON_POOCHYENA,
     VERDANTURF_TENT_MON_ARON_1,
@@ -1467,7 +1467,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Waren[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Tobias[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Tobias[] =
 {
     VERDANTURF_TENT_MON_MAGIKARP,
     VERDANTURF_TENT_MON_BARBOACH,
@@ -1477,7 +1477,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Tobias[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Josiah[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Josiah[] =
 {
     VERDANTURF_TENT_MON_WINGULL,
     VERDANTURF_TENT_MON_SWABLU,
@@ -1487,7 +1487,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Josiah[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Dion[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Dion[] =
 {
     VERDANTURF_TENT_MON_NINJASK,
     VERDANTURF_TENT_MON_DUSTOX,
@@ -1498,7 +1498,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Dion[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Kenzie[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Kenzie[] =
 {
     VERDANTURF_TENT_MON_LOTAD,
     VERDANTURF_TENT_MON_NUMEL_1,
@@ -1509,7 +1509,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Kenzie[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Lillian[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Lillian[] =
 {
     VERDANTURF_TENT_MON_GOLDEEN_2,
     VERDANTURF_TENT_MON_PELIPPER,
@@ -1519,7 +1519,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Lillian[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Lesley[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Lesley[] =
 {
     VERDANTURF_TENT_MON_NUZLEAF,
     VERDANTURF_TENT_MON_POOCHYENA,
@@ -1529,7 +1529,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Lesley[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Marquis[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Marquis[] =
 {
     VERDANTURF_TENT_MON_GOLDEEN_2,
     VERDANTURF_TENT_MON_PELIPPER,
@@ -1540,7 +1540,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Marquis[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Freddy[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Freddy[] =
 {
     VERDANTURF_TENT_MON_LOTAD,
     VERDANTURF_TENT_MON_SEVIPER,
@@ -1550,7 +1550,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Freddy[] =
     -1
 };
 
-const u16 gVerdanturfBattleTentTrainerMons_Cecilia[] = 
+const u16 gVerdanturfBattleTentTrainerMons_Cecilia[] =
 {
     VERDANTURF_TENT_MON_SWELLOW,
     VERDANTURF_TENT_MON_NUZLEAF,
@@ -1560,7 +1560,7 @@ const u16 gVerdanturfBattleTentTrainerMons_Cecilia[] =
     -1
 };
 
-const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
+const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] =
 {
     [VERDANTURF_TENT_TRAINER_BRENNA] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
@@ -1804,7 +1804,7 @@ const struct BattleFrontierTrainer gVerdanturfBattleTentTrainers[NUM_BATTLE_TENT
     }
 };
 
-const struct FacilityMon gVerdanturfBattleTentMons[NUM_VERDANTURF_TENT_MONS] = 
+const struct FacilityMon gVerdanturfBattleTentMons[NUM_VERDANTURF_TENT_MONS] =
 {
     [VERDANTURF_TENT_MON_POOCHYENA] = {
         .species = SPECIES_POOCHYENA,
@@ -2124,7 +2124,7 @@ const struct FacilityMon gVerdanturfBattleTentMons[NUM_VERDANTURF_TENT_MONS] =
 };
 
 // Fallarbor Battle Tent.
-const u16 gFallarborBattleTentTrainerMons_Amber[] = 
+const u16 gFallarborBattleTentTrainerMons_Amber[] =
 {
     FALLARBOR_TENT_MON_SWALOT,
     FALLARBOR_TENT_MON_SHROOMISH,
@@ -2135,7 +2135,7 @@ const u16 gFallarborBattleTentTrainerMons_Amber[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Javier[] = 
+const u16 gFallarborBattleTentTrainerMons_Javier[] =
 {
     FALLARBOR_TENT_MON_SOLROCK,
     FALLARBOR_TENT_MON_TRAPINCH,
@@ -2146,7 +2146,7 @@ const u16 gFallarborBattleTentTrainerMons_Javier[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Natalie[] = 
+const u16 gFallarborBattleTentTrainerMons_Natalie[] =
 {
     FALLARBOR_TENT_MON_MAGIKARP,
     FALLARBOR_TENT_MON_PELIPPER,
@@ -2156,7 +2156,7 @@ const u16 gFallarborBattleTentTrainerMons_Natalie[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Treve[] = 
+const u16 gFallarborBattleTentTrainerMons_Treve[] =
 {
     FALLARBOR_TENT_MON_WINGULL,
     FALLARBOR_TENT_MON_PELIPPER,
@@ -2166,7 +2166,7 @@ const u16 gFallarborBattleTentTrainerMons_Treve[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Arianna[] = 
+const u16 gFallarborBattleTentTrainerMons_Arianna[] =
 {
     FALLARBOR_TENT_MON_ELECTRIKE,
     FALLARBOR_TENT_MON_LINOONE_2,
@@ -2176,7 +2176,7 @@ const u16 gFallarborBattleTentTrainerMons_Arianna[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Jadyn[] = 
+const u16 gFallarborBattleTentTrainerMons_Jadyn[] =
 {
     FALLARBOR_TENT_MON_NUMEL,
     FALLARBOR_TENT_MON_LOUDRED,
@@ -2187,7 +2187,7 @@ const u16 gFallarborBattleTentTrainerMons_Jadyn[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Gerardo[] = 
+const u16 gFallarborBattleTentTrainerMons_Gerardo[] =
 {
     FALLARBOR_TENT_MON_SOLROCK,
     FALLARBOR_TENT_MON_ELECTRIKE,
@@ -2197,7 +2197,7 @@ const u16 gFallarborBattleTentTrainerMons_Gerardo[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Jonn[] = 
+const u16 gFallarborBattleTentTrainerMons_Jonn[] =
 {
     FALLARBOR_TENT_MON_ARON_1,
     FALLARBOR_TENT_MON_ARON_2,
@@ -2207,7 +2207,7 @@ const u16 gFallarborBattleTentTrainerMons_Jonn[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Esteban[] = 
+const u16 gFallarborBattleTentTrainerMons_Esteban[] =
 {
     FALLARBOR_TENT_MON_MAGIKARP,
     FALLARBOR_TENT_MON_WINGULL,
@@ -2217,7 +2217,7 @@ const u16 gFallarborBattleTentTrainerMons_Esteban[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Jameson[] = 
+const u16 gFallarborBattleTentTrainerMons_Jameson[] =
 {
     FALLARBOR_TENT_MON_LINOONE_1,
     FALLARBOR_TENT_MON_PLUSLE,
@@ -2227,7 +2227,7 @@ const u16 gFallarborBattleTentTrainerMons_Jameson[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Alanzo[] = 
+const u16 gFallarborBattleTentTrainerMons_Alanzo[] =
 {
     FALLARBOR_TENT_MON_NINCADA,
     FALLARBOR_TENT_MON_BEAUTIFLY,
@@ -2239,7 +2239,7 @@ const u16 gFallarborBattleTentTrainerMons_Alanzo[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Howard[] = 
+const u16 gFallarborBattleTentTrainerMons_Howard[] =
 {
     FALLARBOR_TENT_MON_ELECTRIKE,
     FALLARBOR_TENT_MON_LINOONE_2,
@@ -2249,7 +2249,7 @@ const u16 gFallarborBattleTentTrainerMons_Howard[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Conrad[] = 
+const u16 gFallarborBattleTentTrainerMons_Conrad[] =
 {
     FALLARBOR_TENT_MON_ELECTRIKE,
     FALLARBOR_TENT_MON_MAGNEMITE,
@@ -2259,7 +2259,7 @@ const u16 gFallarborBattleTentTrainerMons_Conrad[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Makenna[] = 
+const u16 gFallarborBattleTentTrainerMons_Makenna[] =
 {
     FALLARBOR_TENT_MON_KECLEON,
     FALLARBOR_TENT_MON_WHISMUR,
@@ -2269,7 +2269,7 @@ const u16 gFallarborBattleTentTrainerMons_Makenna[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Brayan[] = 
+const u16 gFallarborBattleTentTrainerMons_Brayan[] =
 {
     FALLARBOR_TENT_MON_NUMEL,
     FALLARBOR_TENT_MON_KECLEON,
@@ -2281,7 +2281,7 @@ const u16 gFallarborBattleTentTrainerMons_Brayan[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Mariana[] = 
+const u16 gFallarborBattleTentTrainerMons_Mariana[] =
 {
     FALLARBOR_TENT_MON_NUMEL,
     FALLARBOR_TENT_MON_KECLEON,
@@ -2293,7 +2293,7 @@ const u16 gFallarborBattleTentTrainerMons_Mariana[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Sheldon[] = 
+const u16 gFallarborBattleTentTrainerMons_Sheldon[] =
 {
     FALLARBOR_TENT_MON_PLUSLE,
     FALLARBOR_TENT_MON_POOCHYENA,
@@ -2303,7 +2303,7 @@ const u16 gFallarborBattleTentTrainerMons_Sheldon[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Gianna[] = 
+const u16 gFallarborBattleTentTrainerMons_Gianna[] =
 {
     FALLARBOR_TENT_MON_LINOONE_1,
     FALLARBOR_TENT_MON_PLUSLE,
@@ -2313,7 +2313,7 @@ const u16 gFallarborBattleTentTrainerMons_Gianna[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Yahir[] = 
+const u16 gFallarborBattleTentTrainerMons_Yahir[] =
 {
     FALLARBOR_TENT_MON_KECLEON,
     FALLARBOR_TENT_MON_MACHOKE,
@@ -2324,7 +2324,7 @@ const u16 gFallarborBattleTentTrainerMons_Yahir[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Britney[] = 
+const u16 gFallarborBattleTentTrainerMons_Britney[] =
 {
     FALLARBOR_TENT_MON_KECLEON,
     FALLARBOR_TENT_MON_MAKUHITA,
@@ -2335,7 +2335,7 @@ const u16 gFallarborBattleTentTrainerMons_Britney[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Hecter[] = 
+const u16 gFallarborBattleTentTrainerMons_Hecter[] =
 {
     FALLARBOR_TENT_MON_NUMEL,
     FALLARBOR_TENT_MON_LINOONE_1,
@@ -2346,7 +2346,7 @@ const u16 gFallarborBattleTentTrainerMons_Hecter[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Tannor[] = 
+const u16 gFallarborBattleTentTrainerMons_Tannor[] =
 {
     FALLARBOR_TENT_MON_MAGIKARP,
     FALLARBOR_TENT_MON_BARBOACH,
@@ -2356,7 +2356,7 @@ const u16 gFallarborBattleTentTrainerMons_Tannor[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Benji[] = 
+const u16 gFallarborBattleTentTrainerMons_Benji[] =
 {
     FALLARBOR_TENT_MON_SWABLU,
     FALLARBOR_TENT_MON_SKARMORY,
@@ -2366,7 +2366,7 @@ const u16 gFallarborBattleTentTrainerMons_Benji[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Rory[] = 
+const u16 gFallarborBattleTentTrainerMons_Rory[] =
 {
     FALLARBOR_TENT_MON_NINCADA,
     FALLARBOR_TENT_MON_DUSTOX,
@@ -2377,7 +2377,7 @@ const u16 gFallarborBattleTentTrainerMons_Rory[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Eleanor[] = 
+const u16 gFallarborBattleTentTrainerMons_Eleanor[] =
 {
     FALLARBOR_TENT_MON_LINOONE_2,
     FALLARBOR_TENT_MON_WINGULL,
@@ -2389,7 +2389,7 @@ const u16 gFallarborBattleTentTrainerMons_Eleanor[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Evelyn[] = 
+const u16 gFallarborBattleTentTrainerMons_Evelyn[] =
 {
     FALLARBOR_TENT_MON_PELIPPER,
     FALLARBOR_TENT_MON_WAILMER,
@@ -2399,7 +2399,7 @@ const u16 gFallarborBattleTentTrainerMons_Evelyn[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Arielle[] = 
+const u16 gFallarborBattleTentTrainerMons_Arielle[] =
 {
     FALLARBOR_TENT_MON_LINOONE_1,
     FALLARBOR_TENT_MON_POOCHYENA,
@@ -2409,7 +2409,7 @@ const u16 gFallarborBattleTentTrainerMons_Arielle[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Connar[] = 
+const u16 gFallarborBattleTentTrainerMons_Connar[] =
 {
     FALLARBOR_TENT_MON_MAKUHITA,
     FALLARBOR_TENT_MON_MACHOKE,
@@ -2420,7 +2420,7 @@ const u16 gFallarborBattleTentTrainerMons_Connar[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Maurice[] = 
+const u16 gFallarborBattleTentTrainerMons_Maurice[] =
 {
     FALLARBOR_TENT_MON_KECLEON,
     FALLARBOR_TENT_MON_MAGIKARP,
@@ -2430,7 +2430,7 @@ const u16 gFallarborBattleTentTrainerMons_Maurice[] =
     -1
 };
 
-const u16 gFallarborBattleTentTrainerMons_Kianna[] = 
+const u16 gFallarborBattleTentTrainerMons_Kianna[] =
 {
     FALLARBOR_TENT_MON_LOUDRED,
     FALLARBOR_TENT_MON_MIGHTYENA,
@@ -2441,7 +2441,7 @@ const u16 gFallarborBattleTentTrainerMons_Kianna[] =
     -1
 };
 
-const struct BattleFrontierTrainer gFallarborBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] = 
+const struct BattleFrontierTrainer gFallarborBattleTentTrainers[NUM_BATTLE_TENT_TRAINERS] =
 {
     [FALLARBOR_TENT_TRAINER_AMBER] = {
         .facilityClass = FACILITY_CLASS_AROMA_LADY,
@@ -2685,7 +2685,7 @@ const struct BattleFrontierTrainer gFallarborBattleTentTrainers[NUM_BATTLE_TENT_
     }
 };
 
-const struct FacilityMon gFallarborBattleTentMons[NUM_FALLARBOR_TENT_MONS] = 
+const struct FacilityMon gFallarborBattleTentMons[NUM_FALLARBOR_TENT_MONS] =
 {
     [FALLARBOR_TENT_MON_NUMEL] = {
         .species = SPECIES_NUMEL,
diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h
index 127eb8ed4..75785b258 100644
--- a/src/data/battle_frontier/trainer_hill.h
+++ b/src/data/battle_frontier/trainer_hill.h
@@ -194,22 +194,22 @@ static const struct TrHillFloor sDataTagJPDefault_Floors[] = {
         },
         .display = {
             .metatileData = {
-                0x31, 0x35, 0x35, 0x3b, 0x26, 0x26, 0x1b, 0x1c, 0x1d, 0x25, 0x39, 0x3a, 0x3b, 0x3b, 0x3b, 0x08, 
-                0x31, 0x2b, 0x2b, 0x3b, 0x34, 0x34, 0x2b, 0x2b, 0x34, 0x33, 0x3f, 0x3f, 0x3f, 0x3f, 0x3b, 0x08, 
-                0x31, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x34, 0x34, 0x3b, 0x33, 0x3f, 0x3f, 0x3f, 0x3b, 0x3b, 0x08, 
-                0x31, 0x2b, 0x2b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x3b, 0x33, 0x3f, 0x3f, 0x3f, 0x3b, 0x3f, 0x08, 
-                0x31, 0x2b, 0x34, 0x34, 0x34, 0x2b, 0x34, 0x34, 0x3b, 0x2c, 0x3f, 0x3f, 0x3f, 0x3b, 0x3b, 0x08, 
-                0x31, 0x2b, 0x3b, 0x35, 0x3b, 0x2b, 0x3b, 0x35, 0x3b, 0x35, 0x3b, 0x3f, 0x3f, 0x3f, 0x3b, 0x08, 
-                0x31, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x3f, 0x3f, 0x3f, 0x3b, 0x08, 
-                0x31, 0x34, 0x3b, 0x2b, 0x3b, 0x34, 0x3b, 0x2b, 0x35, 0x2b, 0x3b, 0x3b, 0x3f, 0x3b, 0x3b, 0x08, 
-                0x31, 0x3b, 0x3b, 0x34, 0x3b, 0x3b, 0x3b, 0x34, 0x34, 0x34, 0x3f, 0x3b, 0x3b, 0x3b, 0x3f, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+                0x31, 0x35, 0x35, 0x3b, 0x26, 0x26, 0x1b, 0x1c, 0x1d, 0x25, 0x39, 0x3a, 0x3b, 0x3b, 0x3b, 0x08,
+                0x31, 0x2b, 0x2b, 0x3b, 0x34, 0x34, 0x2b, 0x2b, 0x34, 0x33, 0x3f, 0x3f, 0x3f, 0x3f, 0x3b, 0x08,
+                0x31, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x34, 0x34, 0x3b, 0x33, 0x3f, 0x3f, 0x3f, 0x3b, 0x3b, 0x08,
+                0x31, 0x2b, 0x2b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x3b, 0x33, 0x3f, 0x3f, 0x3f, 0x3b, 0x3f, 0x08,
+                0x31, 0x2b, 0x34, 0x34, 0x34, 0x2b, 0x34, 0x34, 0x3b, 0x2c, 0x3f, 0x3f, 0x3f, 0x3b, 0x3b, 0x08,
+                0x31, 0x2b, 0x3b, 0x35, 0x3b, 0x2b, 0x3b, 0x35, 0x3b, 0x35, 0x3b, 0x3f, 0x3f, 0x3f, 0x3b, 0x08,
+                0x31, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x2b, 0x3b, 0x3f, 0x3f, 0x3f, 0x3b, 0x08,
+                0x31, 0x34, 0x3b, 0x2b, 0x3b, 0x34, 0x3b, 0x2b, 0x35, 0x2b, 0x3b, 0x3b, 0x3f, 0x3b, 0x3b, 0x08,
+                0x31, 0x3b, 0x3b, 0x34, 0x3b, 0x3b, 0x3b, 0x34, 0x34, 0x34, 0x3f, 0x3b, 0x3b, 0x3b, 0x3f, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
             },
             .collisionData = { 0x0381, 0x6fc1, 0x6341, 0x6041, 0x7f41, 0x4401, 0x5541, 0x5541, 0x11c1, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff },
             .coords = { COORDS_XY(8,2), COORDS_XY(8,7) },
@@ -396,22 +396,22 @@ static const struct TrHillFloor sDataTagJPDefault_Floors[] = {
         },
         .display = {
             .metatileData = {
-                0x31, 0x3b, 0x35, 0x3b, 0x39, 0x26, 0x1b, 0x1c, 0x1d, 0x25, 0x39, 0x3a, 0x3b, 0x35, 0x3b, 0x08, 
-                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08, 
-                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3e, 0x3e, 0x3b, 0x2b, 0x3b, 0x08, 
-                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08, 
-                0x3f, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3e, 0x3e, 0x2b, 0x3b, 0x08, 
-                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2c, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08, 
-                0x31, 0x3f, 0x2b, 0x3b, 0x3b, 0x2c, 0x2c, 0x3b, 0x2c, 0x2c, 0x3e, 0x3e, 0x3b, 0x2b, 0x3b, 0x08, 
-                0x31, 0x3b, 0x2b, 0x35, 0x35, 0x35, 0x35, 0x3b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x2b, 0x3b, 0x08, 
-                0x3f, 0x3b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x3b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x3b, 0x08, 
-                0x31, 0x3b, 0x3f, 0x3f, 0x3b, 0x35, 0x35, 0x3b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x08, 
-                0x31, 0x3f, 0x3f, 0x3f, 0x3b, 0x2b, 0x2b, 0x35, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x08, 
-                0x31, 0x3f, 0x3f, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x08, 
-                0x31, 0x3b, 0x3b, 0x3b, 0x3f, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
-                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 
+                0x31, 0x3b, 0x35, 0x3b, 0x39, 0x26, 0x1b, 0x1c, 0x1d, 0x25, 0x39, 0x3a, 0x3b, 0x35, 0x3b, 0x08,
+                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08,
+                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3e, 0x3e, 0x3b, 0x2b, 0x3b, 0x08,
+                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08,
+                0x3f, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x3b, 0x3e, 0x3e, 0x2b, 0x3b, 0x08,
+                0x31, 0x3b, 0x2b, 0x3b, 0x3b, 0x2b, 0x2b, 0x2c, 0x2b, 0x2b, 0x3b, 0x3b, 0x3b, 0x2b, 0x3b, 0x08,
+                0x31, 0x3f, 0x2b, 0x3b, 0x3b, 0x2c, 0x2c, 0x3b, 0x2c, 0x2c, 0x3e, 0x3e, 0x3b, 0x2b, 0x3b, 0x08,
+                0x31, 0x3b, 0x2b, 0x35, 0x35, 0x35, 0x35, 0x3b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x2b, 0x3b, 0x08,
+                0x3f, 0x3b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x3b, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x3b, 0x08,
+                0x31, 0x3b, 0x3f, 0x3f, 0x3b, 0x35, 0x35, 0x3b, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x35, 0x08,
+                0x31, 0x3f, 0x3f, 0x3f, 0x3b, 0x2b, 0x2b, 0x35, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x08,
+                0x31, 0x3f, 0x3f, 0x3b, 0x3b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x2b, 0x08,
+                0x31, 0x3b, 0x3b, 0x3b, 0x3f, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x2c, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
+                0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
             },
             .collisionData = { 0x0381, 0x27c5, 0x27c5, 0x27c5, 0x27c5, 0x27c5, 0x26c5, 0x2005, 0x3efd, 0x1, 0x6ff, 0x7ff, 0x7ff, 0xffff, 0xffff, 0xffff },
             .coords = { COORDS_XY(7,6), COORDS_XY(7,10) },
@@ -727,21 +727,21 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
         },
             .display = {
             .metatileData = {
-                0x31, 0x3B, 0x35, 0x35, 0x26, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x26, 0x3A, 0x3B, 0x35, 0x3B, 0x08, 
-                0x31, 0x3B, 0x2C, 0x2C, 0x2C, 0x2B, 0x24, 0x24, 0x24, 0x24, 0x2C, 0x3B, 0x3B, 0x2C, 0x3B, 0x08, 
-                0x2D, 0x3B, 0x3B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x3B, 0x3B, 0x35, 0x3B, 0x35, 0x35, 0x3B, 0x08, 
-                0x33, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x3B, 0x2C, 0x2B, 0x3B, 0x08, 
-                0x33, 0x35, 0x3B, 0x3B, 0x3B, 0x2C, 0x35, 0x3B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x08, 
-                0x34, 0x2C, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x32, 0x30, 0x3B, 0x2B, 0x32, 0x30, 0x2C, 0x3B, 0x08, 
-                0x31, 0x35, 0x3B, 0x3B, 0x35, 0x3B, 0x2C, 0x3B, 0x3B, 0x35, 0x2C, 0x3B, 0x3B, 0x35, 0x35, 0x08, 
-                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x35, 0x3B, 0x2B, 0x32, 0x21, 0x30, 0x2C, 0x2C, 0x08, 
-                0x31, 0x35, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x2C, 0x3B, 0x35, 0x3B, 0x3B, 0x3B, 0x08, 
-                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x2B, 0x3B, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x3B, 0x08, 
-                0x31, 0x35, 0x35, 0x35, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x35, 0x2B, 0x3B, 0x35, 0x35, 0x08, 
-                0x31, 0x2B, 0x2C, 0x2C, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x2C, 0x2C, 0x3B, 0x2C, 0x2C, 0x08, 
-                0x31, 0x2B, 0x3B, 0x3B, 0x35, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x35, 0x3B, 0x3B, 0x3B, 0x3B, 0x08, 
-                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x3B, 0x3B, 0x2C, 0x32, 0x30, 0x2C, 0x32, 0x30, 0x3B, 0x35, 0x08, 
-                0x31, 0x3B, 0x3B, 0x3B, 0x2C, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x2C, 0x08, 
+                0x31, 0x3B, 0x35, 0x35, 0x26, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x26, 0x3A, 0x3B, 0x35, 0x3B, 0x08,
+                0x31, 0x3B, 0x2C, 0x2C, 0x2C, 0x2B, 0x24, 0x24, 0x24, 0x24, 0x2C, 0x3B, 0x3B, 0x2C, 0x3B, 0x08,
+                0x2D, 0x3B, 0x3B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x3B, 0x3B, 0x35, 0x3B, 0x35, 0x35, 0x3B, 0x08,
+                0x33, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x3B, 0x2C, 0x2B, 0x3B, 0x08,
+                0x33, 0x35, 0x3B, 0x3B, 0x3B, 0x2C, 0x35, 0x3B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x08,
+                0x34, 0x2C, 0x3B, 0x32, 0x21, 0x30, 0x2B, 0x32, 0x30, 0x3B, 0x2B, 0x32, 0x30, 0x2C, 0x3B, 0x08,
+                0x31, 0x35, 0x3B, 0x3B, 0x35, 0x3B, 0x2C, 0x3B, 0x3B, 0x35, 0x2C, 0x3B, 0x3B, 0x35, 0x35, 0x08,
+                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x35, 0x3B, 0x2B, 0x32, 0x21, 0x30, 0x2C, 0x2C, 0x08,
+                0x31, 0x35, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x2C, 0x3B, 0x35, 0x3B, 0x3B, 0x3B, 0x08,
+                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x2B, 0x3B, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x3B, 0x08,
+                0x31, 0x35, 0x35, 0x35, 0x2B, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x35, 0x2B, 0x3B, 0x35, 0x35, 0x08,
+                0x31, 0x2B, 0x2C, 0x2C, 0x2C, 0x32, 0x30, 0x2B, 0x32, 0x30, 0x2C, 0x2C, 0x3B, 0x2C, 0x2C, 0x08,
+                0x31, 0x2B, 0x3B, 0x3B, 0x35, 0x3B, 0x3B, 0x2B, 0x3B, 0x3B, 0x35, 0x3B, 0x3B, 0x3B, 0x3B, 0x08,
+                0x31, 0x2C, 0x32, 0x30, 0x2B, 0x3B, 0x3B, 0x2C, 0x32, 0x30, 0x2C, 0x32, 0x30, 0x3B, 0x35, 0x08,
+                0x31, 0x3B, 0x3B, 0x3B, 0x2C, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x2C, 0x08,
                 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
             },
             .collisionData = {0x0381, 0x3FE5, 0x0401, 0xBDED, 0x8425, 0xDFBD, 0x0221, 0x7E7F, 0x0941, 0x7F7D, 0x0911, 0x7FF7, 0x4101, 0x79F9, 0x0803, 0xFFFF},
@@ -1049,21 +1049,21 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
         },
             .display = {
             .metatileData = {
-                0xD1, 0xD5, 0xD5, 0xD5, 0xD9, 0xD9, 0x1B, 0x1C, 0x1D, 0xC5, 0xC6, 0xCE, 0xD5, 0xDB, 0xD5, 0x08, 
-                0xD1, 0xCB, 0xC4, 0xC4, 0xDB, 0xDB, 0xC4, 0xC4, 0xC4, 0xCC, 0xCC, 0xCC, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xDB, 0x17, 0x17, 0x17, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xD5, 0x17, 0x17, 0x17, 0xD5, 0xD5, 0xD5, 0xD5, 0xDF, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0x17, 0x17, 0x1F, 0xCB, 0xCB, 0xC4, 0xC4, 0xDB, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xC4, 0xCB, 0xCB, 0xDF, 0xD5, 0xD5, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xDB, 0xC4, 0xC4, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xD5, 0xD5, 0xDF, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xC4, 0xC4, 0xDB, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xDF, 0xD5, 0xD5, 0xCB, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xC4, 0xC4, 0xDB, 0xC4, 0xC4, 0xC4, 0xDB, 0xCB, 0x08, 
-                0xD1, 0xCB, 0xDB, 0xCB, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0xDB, 0xD5, 0xD5, 0xD5, 0xCB, 0x08, 
-                0xD1, 0xC4, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0x08, 
-                0xD1, 0xDB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0x08, 
-                0xD1, 0xDB, 0xDB, 0xC4, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xC4, 0xC4, 0xC4, 0xC4, 0x08, 
+                0xD1, 0xD5, 0xD5, 0xD5, 0xD9, 0xD9, 0x1B, 0x1C, 0x1D, 0xC5, 0xC6, 0xCE, 0xD5, 0xDB, 0xD5, 0x08,
+                0xD1, 0xCB, 0xC4, 0xC4, 0xDB, 0xDB, 0xC4, 0xC4, 0xC4, 0xCC, 0xCC, 0xCC, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xDB, 0x17, 0x17, 0x17, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xD5, 0x17, 0x17, 0x17, 0xD5, 0xD5, 0xD5, 0xD5, 0xDF, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0x17, 0x17, 0x1F, 0xCB, 0xCB, 0xC4, 0xC4, 0xDB, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xC4, 0xCB, 0xCB, 0xDF, 0xD5, 0xD5, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xDB, 0xC4, 0xC4, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xD5, 0xD5, 0xDF, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xC4, 0xC4, 0xDB, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xCB, 0xCB, 0xDF, 0xD5, 0xD5, 0xCB, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xC4, 0xC4, 0xDB, 0xC4, 0xC4, 0xC4, 0xDB, 0xCB, 0x08,
+                0xD1, 0xCB, 0xDB, 0xCB, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0xDB, 0xD5, 0xD5, 0xD5, 0xCB, 0x08,
+                0xD1, 0xC4, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0x08,
+                0xD1, 0xDB, 0xDB, 0xCB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0x08,
+                0xD1, 0xDB, 0xDB, 0xC4, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xC4, 0xC4, 0xC4, 0xC4, 0x08,
                 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
             },
             .collisionData = {0x0381, 0x73FB, 0x400B, 0x400B, 0x51EB, 0x538B, 0x51BB, 0x518B, 0x51EB, 0x518B, 0x51BB, 0x5003, 0x501F, 0x101F, 0x101F, 0xFFFF},
@@ -1370,21 +1370,21 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
         },
             .display = {
             .metatileData = {
-                0x31, 0x35, 0x35, 0x35, 0x26, 0x26, 0x13, 0x14, 0x15, 0x38, 0x26, 0x2E, 0x35, 0x35, 0x3B, 0x08, 
-                0x69, 0x63, 0x64, 0x64, 0x64, 0x64, 0x71, 0x71, 0x71, 0x72, 0x64, 0x64, 0x64, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x43, 0x41, 0x40, 0x41, 0x42, 0x41, 0x41, 0x4A, 0x42, 0x41, 0x41, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x41, 0x43, 0x4B, 0x43, 0x43, 0x41, 0x42, 0x42, 0x40, 0x41, 0x40, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x41, 0x40, 0x42, 0x42, 0x41, 0x41, 0x42, 0x4A, 0x42, 0x41, 0x42, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x41, 0x42, 0x41, 0x43, 0x4B, 0x41, 0x41, 0x41, 0x40, 0x43, 0x41, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08, 
-                0x69, 0x63, 0x41, 0x40, 0x43, 0x41, 0x42, 0x42, 0x41, 0x4A, 0x42, 0x41, 0x42, 0x63, 0x73, 0x08, 
-                0x69, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x64, 0x73, 0x08, 
-                0x69, 0x43, 0x43, 0x41, 0x42, 0x42, 0x41, 0x43, 0x41, 0x41, 0x40, 0x42, 0x41, 0x42, 0x73, 0x08, 
+                0x31, 0x35, 0x35, 0x35, 0x26, 0x26, 0x13, 0x14, 0x15, 0x38, 0x26, 0x2E, 0x35, 0x35, 0x3B, 0x08,
+                0x69, 0x63, 0x64, 0x64, 0x64, 0x64, 0x71, 0x71, 0x71, 0x72, 0x64, 0x64, 0x64, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x43, 0x41, 0x40, 0x41, 0x42, 0x41, 0x41, 0x4A, 0x42, 0x41, 0x41, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x41, 0x43, 0x4B, 0x43, 0x43, 0x41, 0x42, 0x42, 0x40, 0x41, 0x40, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x41, 0x40, 0x42, 0x42, 0x41, 0x41, 0x42, 0x4A, 0x42, 0x41, 0x42, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x41, 0x42, 0x41, 0x43, 0x4B, 0x41, 0x41, 0x41, 0x40, 0x43, 0x41, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x63, 0x73, 0x08,
+                0x69, 0x63, 0x41, 0x40, 0x43, 0x41, 0x42, 0x42, 0x41, 0x4A, 0x42, 0x41, 0x42, 0x63, 0x73, 0x08,
+                0x69, 0x64, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x64, 0x73, 0x73, 0x73, 0x64, 0x73, 0x08,
+                0x69, 0x43, 0x43, 0x41, 0x42, 0x42, 0x41, 0x43, 0x41, 0x41, 0x40, 0x42, 0x41, 0x42, 0x73, 0x08,
                 0x69, 0x42, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x42, 0x73, 0x08,
             },
             .collisionData = {0x0381, 0x7C3D, 0x4005, 0x4005, 0x4005, 0x4045, 0x4005, 0x4805, 0x4005, 0x4045, 0x4005, 0x4205, 0x4005, 0x4045, 0x1, 0x1},
@@ -1684,21 +1684,21 @@ static const struct TrHillFloor sDataTagNormal_Floors[] =
         },
             .display = {
             .metatileData = {
-                0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                0x1F, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x24, 0x24, 0x24, 0x2B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x08, 
-                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x35, 0x35, 0x3B, 0x35, 0x35, 0x08, 
-                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x2C, 0x2C, 0x3B, 0x2C, 0x2C, 0x08, 
-                0x33, 0x17, 0x1F, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                0x34, 0x17, 0x2C, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2C, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                0x17, 0x17, 0x17, 0x17, 0x17, 0x2C, 0x3B, 0x3B, 0x3B, 0x3B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                0x1F, 0x17, 0x17, 0x17, 0x17, 0x1F, 0x17, 0x3B, 0x3B, 0x3B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x35, 0x1F, 0x17, 0x17, 0x1F, 0x17, 0x08, 
-                0x34, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x2C, 0x3B, 0x3B, 0x2B, 0x17, 0x08, 
-                0x17, 0x17, 0x17, 0x1F, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x17, 0x17, 0x2C, 0x17, 0x08, 
-                0x1F, 0x17, 0x17, 0x2C, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x3B, 0x1F, 0x3B, 0x17, 0x08, 
-                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x3B, 0x2B, 0x3B, 0x17, 0x08, 
-                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x35, 0x35, 0x35, 0x2B, 0x17, 0x3B, 0x2C, 0x3B, 0x17, 0x08, 
-                0x34, 0x17, 0x17, 0x17, 0x17, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
+                0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                0x1F, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x24, 0x24, 0x24, 0x2B, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x08,
+                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x35, 0x35, 0x3B, 0x35, 0x35, 0x08,
+                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x2C, 0x2C, 0x3B, 0x2C, 0x2C, 0x08,
+                0x33, 0x17, 0x1F, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                0x34, 0x17, 0x2C, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2C, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                0x17, 0x17, 0x17, 0x17, 0x17, 0x2C, 0x3B, 0x3B, 0x3B, 0x3B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                0x1F, 0x17, 0x17, 0x17, 0x17, 0x1F, 0x17, 0x3B, 0x3B, 0x3B, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x35, 0x1F, 0x17, 0x17, 0x1F, 0x17, 0x08,
+                0x34, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x2C, 0x3B, 0x3B, 0x2B, 0x17, 0x08,
+                0x17, 0x17, 0x17, 0x1F, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x17, 0x17, 0x2C, 0x17, 0x08,
+                0x1F, 0x17, 0x17, 0x2C, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x3B, 0x1F, 0x3B, 0x17, 0x08,
+                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x3B, 0x3B, 0x3B, 0x2B, 0x17, 0x3B, 0x2B, 0x3B, 0x17, 0x08,
+                0x33, 0x17, 0x17, 0x17, 0x17, 0x2B, 0x35, 0x35, 0x35, 0x2B, 0x17, 0x3B, 0x2C, 0x3B, 0x17, 0x08,
+                0x34, 0x17, 0x17, 0x17, 0x17, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
                 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
             },
             .collisionData = {0x0381, 0x7C1, 0x8441, 0x8477, 0x8441, 0xA441, 0x0401, 0x1, 0x8401, 0x8465, 0x0445, 0x1441, 0x8449, 0x8449, 0x87C1, 0xFFFF},
@@ -2005,21 +2005,21 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0x41, 0x41, 0x42, 0x43, 0x43, 0x43, 0x43, 0x43, 0x40, 0x41, 0x41, 0x08, 
-                    0x40, 0xFB, 0x43, 0x41, 0x41, 0x41, 0x42, 0x40, 0x43, 0x41, 0x42, 0x42, 0x42, 0xFB, 0x41, 0x08, 
-                    0x40, 0x41, 0xFB, 0x41, 0x41, 0x41, 0x42, 0x40, 0x43, 0x41, 0x43, 0x43, 0xFB, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0xFB, 0x43, 0x41, 0x42, 0x40, 0x43, 0x43, 0x43, 0xFB, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0x42, 0x42, 0x42, 0x40, 0x43, 0x43, 0x43, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x42, 0x41, 0xFE, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x42, 0x41, 0x43, 0x43, 0x43, 0x41, 0x40, 0x42, 0x42, 0x42, 0x42, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x40, 0x41, 0xFB, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0xFB, 0x41, 0x40, 0x41, 0x08, 
-                    0x40, 0x40, 0xFB, 0x43, 0x43, 0x41, 0x41, 0x41, 0x42, 0x42, 0x42, 0x42, 0xFB, 0x40, 0x41, 0x08, 
-                    0x40, 0xFB, 0x43, 0x43, 0x41, 0x41, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0xFB, 0x41, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0x41, 0x41, 0x42, 0x43, 0x43, 0x43, 0x43, 0x43, 0x40, 0x41, 0x41, 0x08,
+                    0x40, 0xFB, 0x43, 0x41, 0x41, 0x41, 0x42, 0x40, 0x43, 0x41, 0x42, 0x42, 0x42, 0xFB, 0x41, 0x08,
+                    0x40, 0x41, 0xFB, 0x41, 0x41, 0x41, 0x42, 0x40, 0x43, 0x41, 0x43, 0x43, 0xFB, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0xFB, 0x43, 0x41, 0x42, 0x40, 0x43, 0x43, 0x43, 0xFB, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0x42, 0x42, 0x42, 0x40, 0x43, 0x43, 0x43, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x42, 0x41, 0xFE, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x41, 0x41, 0x41, 0xFE, 0xFE, 0xFE, 0xFB, 0xFE, 0xFE, 0xFE, 0x41, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x42, 0x41, 0x43, 0x43, 0x43, 0x41, 0x40, 0x42, 0x42, 0x42, 0x42, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x40, 0x41, 0xFB, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0xFB, 0x41, 0x40, 0x41, 0x08,
+                    0x40, 0x40, 0xFB, 0x43, 0x43, 0x41, 0x41, 0x41, 0x42, 0x42, 0x42, 0x42, 0xFB, 0x40, 0x41, 0x08,
+                    0x40, 0xFB, 0x43, 0x43, 0x41, 0x41, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0xFB, 0x41, 0x08,
                     0x40, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x08,
                 },
                 .collisionData = {0x0381, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1},
@@ -2345,21 +2345,21 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x91, 0x9B, 0x9C, 0x96, 0x40, 0x40, 0x96, 0x9B, 0x96, 0x40, 0x40, 0x96, 0x9B, 0x9C, 0x9B, 0x08, 
-                    0x9C, 0x9B, 0x96, 0x40, 0xDB, 0xDB, 0x40, 0x96, 0x40, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x08, 
-                    0x91, 0x96, 0x40, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x42, 0x96, 0x9C, 0x08, 
-                    0x91, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x9B, 0x08, 
-                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08, 
-                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08, 
-                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08, 
-                    0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x08, 
-                    0x91, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x08, 
-                    0x91, 0x9B, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9C, 0x08, 
-                    0x9C, 0x9B, 0x9B, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0x96, 0x9B, 0x9B, 0x9B, 0x96, 0x41, 0xDB, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9C, 0x96, 0x08, 
-                    0xD6, 0x96, 0x9C, 0x9B, 0x9B, 0x96, 0x41, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9B, 0x96, 0xD6, 0x08, 
-                    0x9C, 0xD6, 0x96, 0x9B, 0x9C, 0x9B, 0x96, 0x40, 0x96, 0x9B, 0x9C, 0x9B, 0x96, 0xD6, 0x9C, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x91, 0x9B, 0x9C, 0x96, 0x40, 0x40, 0x96, 0x9B, 0x96, 0x40, 0x40, 0x96, 0x9B, 0x9C, 0x9B, 0x08,
+                    0x9C, 0x9B, 0x96, 0x40, 0xDB, 0xDB, 0x40, 0x96, 0x40, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x08,
+                    0x91, 0x96, 0x40, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0x42, 0x96, 0x9C, 0x08,
+                    0x91, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x9B, 0x08,
+                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08,
+                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08,
+                    0x96, 0x42, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0x42, 0x96, 0x08,
+                    0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x08,
+                    0x91, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x08,
+                    0x91, 0x9B, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9C, 0x08,
+                    0x9C, 0x9B, 0x9B, 0x96, 0x42, 0xDB, 0xDB, 0xD6, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9B, 0x08,
+                    0x96, 0x9B, 0x9B, 0x9B, 0x96, 0x41, 0xDB, 0xDB, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9C, 0x96, 0x08,
+                    0xD6, 0x96, 0x9C, 0x9B, 0x9B, 0x96, 0x41, 0xDB, 0x42, 0x96, 0x9B, 0x9B, 0x9B, 0x96, 0xD6, 0x08,
+                    0x9C, 0xD6, 0x96, 0x9B, 0x9C, 0x9B, 0x96, 0x40, 0x96, 0x9B, 0x9C, 0x9B, 0x96, 0xD6, 0x9C, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0x1, 0xFFFF},
@@ -2666,21 +2666,21 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x1B, 0x1C, 0x1D, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x91, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x84, 0x84, 0x84, 0x9A, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
-                    0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08, 
-                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x1B, 0x1C, 0x1D, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x91, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x84, 0x84, 0x84, 0x9A, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
+                    0x17, 0x17, 0x17, 0x17, 0xBB, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x08,
+                    0x17, 0xB2, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xA1, 0xB0, 0x17, 0xB2, 0xA1, 0x08,
                     0x17, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0x17, 0xBB, 0xBB, 0x08,
                 },
                 .collisionData = {0x0381, 0x0381, 0x7FF7, 0x1, 0x7FF7, 0x1, 0x7FF7, 0x1, 0x7FF7, 0x1, 0x7FF7, 0x1, 0x7FF7, 0x1, 0x7FF7, 0x1},
@@ -2978,21 +2978,21 @@ static const struct TrHillFloor sDataTagVariety_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x41, 0x5E, 0x41, 0x71, 0x42, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08, 
-                    0x43, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x41, 0x73, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08, 
-                    0x65, 0x40, 0x73, 0x42, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x42, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08, 
-                    0x6C, 0x73, 0x41, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x42, 0x73, 0x41, 0x08, 
-                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x43, 0x73, 0x43, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x08, 
-                    0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x08, 
-                    0x65, 0x42, 0x73, 0x42, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x42, 0x73, 0x41, 0x6D, 0x42, 0x73, 0x08, 
-                    0x6C, 0x73, 0x41, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x08, 
-                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x41, 0x6D, 0x42, 0x73, 0x43, 0x6D, 0x41, 0x73, 0x43, 0x6D, 0x08, 
-                    0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x08, 
-                    0x65, 0x42, 0x73, 0x42, 0x6D, 0x43, 0x73, 0x42, 0x6D, 0x42, 0x73, 0x41, 0x6D, 0x40, 0x73, 0x08, 
-                    0x6C, 0x73, 0x40, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x08, 
-                    0x69, 0x40, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x43, 0x73, 0x40, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x08, 
-                    0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x41, 0x5E, 0x41, 0x71, 0x42, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08,
+                    0x43, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x41, 0x73, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08,
+                    0x65, 0x40, 0x73, 0x42, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x42, 0x45, 0x45, 0x45, 0x45, 0x45, 0x08,
+                    0x6C, 0x73, 0x41, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x42, 0x73, 0x41, 0x08,
+                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x43, 0x73, 0x43, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x08,
+                    0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x08,
+                    0x65, 0x42, 0x73, 0x42, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x42, 0x73, 0x41, 0x6D, 0x42, 0x73, 0x08,
+                    0x6C, 0x73, 0x41, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x08,
+                    0x69, 0x40, 0x6D, 0x41, 0x73, 0x41, 0x6D, 0x42, 0x73, 0x43, 0x6D, 0x41, 0x73, 0x43, 0x6D, 0x08,
+                    0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x08,
+                    0x65, 0x42, 0x73, 0x42, 0x6D, 0x43, 0x73, 0x42, 0x6D, 0x42, 0x73, 0x41, 0x6D, 0x40, 0x73, 0x08,
+                    0x6C, 0x73, 0x40, 0x73, 0x64, 0x73, 0x41, 0x73, 0x64, 0x73, 0x42, 0x73, 0x64, 0x73, 0x42, 0x08,
+                    0x69, 0x40, 0x6D, 0x42, 0x73, 0x42, 0x6D, 0x43, 0x73, 0x40, 0x6D, 0x41, 0x73, 0x40, 0x6D, 0x08,
+                    0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x40, 0x73, 0x64, 0x73, 0x43, 0x73, 0x64, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x1, 0x2201, 0x1, 0x8881, 0x1, 0x2223, 0x1, 0x8889, 0x1, 0x2223, 0x1, 0x8889, 0x1, 0x2223, 0xFFFF},
@@ -3304,21 +3304,21 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0xF1, 0xF5, 0xFB, 0xF5, 0xE6, 0xE6, 0x1B, 0x14, 0x15, 0xF8, 0xF9, 0xFA, 0xFB, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xF9, 0xE6, 0xEE, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0x9B, 0x9B, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0x9B, 0xDB, 0xDB, 0x9B, 0xEC, 0xFB, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xF5, 0x95, 0x95, 0xF5, 0xF5, 0xF5, 0xEB, 0xEC, 0xEB, 0xFB, 0xEB, 0x08, 
-                    0xED, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0x08, 
-                    0xF4, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xF5, 0xFB, 0x08, 
-                    0xF1, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0x08, 
-                    0xF1, 0xF5, 0xF5, 0xEB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0xFB, 0x08, 
-                    0xF1, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0xEB, 0xFB, 0x08, 
-                    0xF1, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xFB, 0xEB, 0xFB, 0x08, 
-                    0xF1, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0xEC, 0xFB, 0x08, 
-                    0xF1, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
+                    0xF1, 0xF5, 0xFB, 0xF5, 0xE6, 0xE6, 0x1B, 0x14, 0x15, 0xF8, 0xF9, 0xFA, 0xFB, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xF9, 0xE6, 0xEE, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0x9B, 0x9B, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0x9B, 0xDB, 0xDB, 0x9B, 0xEC, 0xFB, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xF5, 0x95, 0x95, 0xF5, 0xF5, 0xF5, 0xEB, 0xEC, 0xEB, 0xFB, 0xEB, 0x08,
+                    0xED, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0x08,
+                    0xF4, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xF5, 0xFB, 0x08,
+                    0xF1, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0x08,
+                    0xF1, 0xF5, 0xF5, 0xEB, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0xFB, 0x08,
+                    0xF1, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEB, 0xFB, 0xEB, 0xFB, 0x08,
+                    0xF1, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xEB, 0xFB, 0xEB, 0xFB, 0x08,
+                    0xF1, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0xEC, 0xFB, 0x08,
+                    0xF1, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x5E01, 0x50FF, 0x5083, 0x503B, 0x5FEB, 0xC02B, 0x5FEB, 0x5009, 0x57FD, 0x1005, 0x7FF5, 0x15, 0x7FF5, 0x1, 0xFFFF},
@@ -3625,21 +3625,21 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x2D, 0x3B, 0x3B, 0x3B, 0x35, 0x2C, 0x23, 0x24, 0x23, 0x2C, 0x35, 0x3B, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x94, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x8C, 0x87, 0x8C, 0x87, 0x95, 0x87, 0x9B, 0x08, 
-                    0x91, 0x8F, 0x9B, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x95, 0x08, 
-                    0x8D, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x95, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x8C, 0x08, 
-                    0x94, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x9B, 0x9B, 0x9B, 0x87, 0x9B, 0x08, 
-                    0x91, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x95, 0x9B, 0x95, 0x8F, 0x9B, 0x08, 
-                    0x91, 0x97, 0x95, 0x97, 0x8C, 0x97, 0x95, 0x97, 0x95, 0x97, 0x8C, 0x9B, 0x8C, 0x97, 0x95, 0x08, 
-                    0x91, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x9B, 0x87, 0x95, 0x87, 0x8C, 0x08, 
-                    0x8D, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x08, 
-                    0x94, 0x97, 0x95, 0x97, 0x8C, 0x97, 0x9B, 0x97, 0x95, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x9B, 0x08, 
-                    0x91, 0x87, 0x8C, 0x87, 0x95, 0x87, 0x95, 0x87, 0x8B, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x9B, 0x08, 
-                    0x91, 0x8F, 0x95, 0x8F, 0x8B, 0x8F, 0x8C, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x08, 
-                    0x91, 0x97, 0x8C, 0x97, 0x8C, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x8B, 0x97, 0x9B, 0x08, 
-                    0x91, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x8C, 0x9B, 0x9B, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x26, 0x1B, 0x1C, 0x1D, 0x25, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x2D, 0x3B, 0x3B, 0x3B, 0x35, 0x2C, 0x23, 0x24, 0x23, 0x2C, 0x35, 0x3B, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x94, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x8C, 0x87, 0x8C, 0x87, 0x95, 0x87, 0x9B, 0x08,
+                    0x91, 0x8F, 0x9B, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x95, 0x08,
+                    0x8D, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x95, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x8C, 0x08,
+                    0x94, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x9B, 0x9B, 0x9B, 0x87, 0x9B, 0x08,
+                    0x91, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x95, 0x9B, 0x95, 0x8F, 0x9B, 0x08,
+                    0x91, 0x97, 0x95, 0x97, 0x8C, 0x97, 0x95, 0x97, 0x95, 0x97, 0x8C, 0x9B, 0x8C, 0x97, 0x95, 0x08,
+                    0x91, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x8C, 0x87, 0x8B, 0x87, 0x9B, 0x87, 0x95, 0x87, 0x8C, 0x08,
+                    0x8D, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x8C, 0x8F, 0x9B, 0x08,
+                    0x94, 0x97, 0x95, 0x97, 0x8C, 0x97, 0x9B, 0x97, 0x95, 0x97, 0x95, 0x97, 0x9B, 0x97, 0x9B, 0x08,
+                    0x91, 0x87, 0x8C, 0x87, 0x95, 0x87, 0x95, 0x87, 0x8B, 0x87, 0x8C, 0x87, 0x9B, 0x87, 0x9B, 0x08,
+                    0x91, 0x8F, 0x95, 0x8F, 0x8B, 0x8F, 0x8C, 0x8F, 0x8C, 0x8F, 0x9B, 0x8F, 0x95, 0x8F, 0x9B, 0x08,
+                    0x91, 0x97, 0x8C, 0x97, 0x8C, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x9B, 0x97, 0x8B, 0x97, 0x9B, 0x08,
+                    0x91, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x8C, 0x9B, 0x9B, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x7C1, 0x8AA1, 0x0209, 0x5557, 0xA281, 0x81, 0x5D6D, 0x2283, 0x89, 0xDD55, 0x20A1, 0xA81, 0x7D5D, 0x9, 0xFFFF},
@@ -3946,21 +3946,21 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7C, 0x46, 0x08, 
-                    0x69, 0x46, 0x7A, 0x73, 0x73, 0x73, 0x79, 0x73, 0x73, 0x73, 0x7D, 0x73, 0x73, 0x73, 0x46, 0x08, 
-                    0x69, 0x46, 0x73, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08, 
-                    0x69, 0x46, 0x73, 0x73, 0x7B, 0x73, 0x7C, 0x73, 0x7B, 0x73, 0x7A, 0x73, 0x73, 0x73, 0x46, 0x08, 
-                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7A, 0x46, 0x08, 
-                    0x69, 0x46, 0x73, 0x73, 0x73, 0x73, 0x73, 0x7D, 0x7C, 0x73, 0x7C, 0x73, 0x7B, 0x73, 0x46, 0x08, 
-                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7C, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08, 
-                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08, 
-                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08, 
-                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08, 
-                    0xF1, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x78, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08, 
-                    0xF1, 0x46, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x7A, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x7C, 0x08, 
-                    0xF1, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0xFB, 0x08, 
-                    0x7C, 0xFB, 0x7B, 0xFB, 0x7A, 0xFB, 0x79, 0xFB, 0xB3, 0xFB, 0x7D, 0xFB, 0x7E, 0xFB, 0x7D, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7C, 0x46, 0x08,
+                    0x69, 0x46, 0x7A, 0x73, 0x73, 0x73, 0x79, 0x73, 0x73, 0x73, 0x7D, 0x73, 0x73, 0x73, 0x46, 0x08,
+                    0x69, 0x46, 0x73, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08,
+                    0x69, 0x46, 0x73, 0x73, 0x7B, 0x73, 0x7C, 0x73, 0x7B, 0x73, 0x7A, 0x73, 0x73, 0x73, 0x46, 0x08,
+                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7A, 0x46, 0x08,
+                    0x69, 0x46, 0x73, 0x73, 0x73, 0x73, 0x73, 0x7D, 0x7C, 0x73, 0x7C, 0x73, 0x7B, 0x73, 0x46, 0x08,
+                    0x69, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x7C, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08,
+                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08,
+                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08,
+                    0x91, 0x46, 0x9B, 0x9B, 0x9B, 0x46, 0x3B, 0x3B, 0x3B, 0x46, 0x9B, 0x9B, 0x9B, 0x9B, 0x46, 0x08,
+                    0xF1, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x78, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08,
+                    0xF1, 0x46, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x7A, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x7C, 0x08,
+                    0xF1, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0xFB, 0x08,
+                    0x7C, 0xFB, 0x7B, 0xFB, 0x7A, 0xFB, 0x79, 0xFB, 0xB3, 0xFB, 0x7D, 0xFB, 0x7E, 0xFB, 0x7D, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x7FFB, 0x4003, 0x5FFF, 0x4003, 0x7FFB, 0x4003, 0x7EFF, 0x4443, 0x4443, 0x4443, 0x7EFF, 0x4001, 0x7FFD, 0x1, 0xFFFF},
@@ -4257,21 +4257,21 @@ static const struct TrHillFloor sDataTagUnique_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0xF1, 0xFB, 0xFB, 0xFB, 0xF9, 0xF9, 0x1B, 0x1C, 0x1D, 0xE5, 0xE6, 0xEE, 0xF5, 0xFB, 0xFB, 0x08, 
-                    0xED, 0xF5, 0xF5, 0xF5, 0xFB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEB, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0x08, 
-                    0xF4, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0x08, 
-                    0xF1, 0xEB, 0xEC, 0xEC, 0xEC, 0xEB, 0xEC, 0xEC, 0xFB, 0xEC, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xF5, 0xFB, 0xF5, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xF5, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xF5, 0xF5, 0xF5, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0x08, 
-                    0xF1, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0x08, 
-                    0xF1, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
-                    0xF1, 0xFB, 0xFB, 0xEC, 0xFB, 0xFB, 0xFB, 0xEC, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08, 
+                    0xF1, 0xFB, 0xFB, 0xFB, 0xF9, 0xF9, 0x1B, 0x1C, 0x1D, 0xE5, 0xE6, 0xEE, 0xF5, 0xFB, 0xFB, 0x08,
+                    0xED, 0xF5, 0xF5, 0xF5, 0xFB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEB, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0x08,
+                    0xF4, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0x08,
+                    0xF1, 0xEB, 0xEC, 0xEC, 0xEC, 0xEB, 0xEC, 0xEC, 0xFB, 0xEC, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xF5, 0xFB, 0xF5, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xF5, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xF5, 0xF5, 0xF5, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xEC, 0xEC, 0xEC, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xF5, 0xF5, 0xF5, 0xF5, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xFB, 0xEB, 0xF5, 0xF5, 0xF5, 0xF5, 0xFB, 0x08,
+                    0xF1, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xFB, 0xEB, 0xFB, 0xEC, 0xEC, 0xEC, 0xEC, 0xEC, 0xFB, 0x08,
+                    0xF1, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xEB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
+                    0xF1, 0xFB, 0xFB, 0xEC, 0xFB, 0xFB, 0xFB, 0xEC, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0xFB, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x3F9, 0xF041, 0x41, 0x7F5F, 0x4401, 0x4541, 0x5579, 0x5541, 0x555F, 0x5541, 0x5541, 0x557D, 0x1101, 0x1101, 0xFFFF},
@@ -4590,21 +4590,21 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x1B, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x31, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x2C, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x31, 0x3B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3B, 0x3B, 0x08, 
-                    0x69, 0x73, 0x08, 0x4D, 0x4D, 0x4D, 0x4D, 0xD1, 0x4D, 0x4D, 0x4D, 0x4D, 0x08, 0x69, 0x73, 0x08, 
-                    0x40, 0x3B, 0x08, 0x55, 0x55, 0x55, 0x55, 0xD1, 0x55, 0x55, 0x55, 0x55, 0x08, 0x31, 0x41, 0x08, 
-                    0x69, 0x41, 0x08, 0xC5, 0xD9, 0xD9, 0xD9, 0x9A, 0xD9, 0xD9, 0xD9, 0xC6, 0x08, 0x41, 0x73, 0x08, 
-                    0x69, 0x3B, 0x08, 0xD4, 0xDB, 0x9B, 0x73, 0x73, 0x73, 0x9B, 0xDB, 0xCC, 0x08, 0x31, 0x73, 0x08, 
-                    0x69, 0x3B, 0x08, 0xCD, 0x9B, 0x73, 0x73, 0x44, 0x73, 0x73, 0x9B, 0xD5, 0x08, 0x31, 0x73, 0x08, 
-                    0x69, 0x3B, 0x08, 0xD4, 0xDB, 0x9B, 0x73, 0x73, 0x73, 0x9B, 0xDB, 0xCC, 0x08, 0x31, 0x73, 0x08, 
-                    0x69, 0x41, 0x08, 0xD1, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xDB, 0xDB, 0xDB, 0x08, 0x41, 0x73, 0x08, 
-                    0x40, 0x3B, 0x08, 0x08, 0xC7, 0xC7, 0xDB, 0xDB, 0xDB, 0xC7, 0xC7, 0x08, 0x08, 0x31, 0x41, 0x08, 
-                    0x69, 0x3B, 0x4D, 0x4D, 0x67, 0x67, 0xDB, 0xDB, 0xDB, 0x67, 0x67, 0x4D, 0x4D, 0x31, 0x73, 0x08, 
-                    0x69, 0x3B, 0x55, 0x55, 0xD7, 0xD7, 0xD1, 0xDB, 0xDB, 0xD7, 0xD7, 0x55, 0x55, 0x31, 0x73, 0x08, 
-                    0x69, 0x3B, 0x39, 0x39, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x39, 0x39, 0x39, 0x39, 0x3A, 0x73, 0x08, 
-                    0x69, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x1B, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x31, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x2C, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x31, 0x3B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3B, 0x08, 0x08, 0x08, 0x08, 0x08, 0x3B, 0x3B, 0x08,
+                    0x69, 0x73, 0x08, 0x4D, 0x4D, 0x4D, 0x4D, 0xD1, 0x4D, 0x4D, 0x4D, 0x4D, 0x08, 0x69, 0x73, 0x08,
+                    0x40, 0x3B, 0x08, 0x55, 0x55, 0x55, 0x55, 0xD1, 0x55, 0x55, 0x55, 0x55, 0x08, 0x31, 0x41, 0x08,
+                    0x69, 0x41, 0x08, 0xC5, 0xD9, 0xD9, 0xD9, 0x9A, 0xD9, 0xD9, 0xD9, 0xC6, 0x08, 0x41, 0x73, 0x08,
+                    0x69, 0x3B, 0x08, 0xD4, 0xDB, 0x9B, 0x73, 0x73, 0x73, 0x9B, 0xDB, 0xCC, 0x08, 0x31, 0x73, 0x08,
+                    0x69, 0x3B, 0x08, 0xCD, 0x9B, 0x73, 0x73, 0x44, 0x73, 0x73, 0x9B, 0xD5, 0x08, 0x31, 0x73, 0x08,
+                    0x69, 0x3B, 0x08, 0xD4, 0xDB, 0x9B, 0x73, 0x73, 0x73, 0x9B, 0xDB, 0xCC, 0x08, 0x31, 0x73, 0x08,
+                    0x69, 0x41, 0x08, 0xD1, 0xDB, 0xDB, 0xDB, 0x9B, 0xDB, 0xDB, 0xDB, 0xDB, 0x08, 0x41, 0x73, 0x08,
+                    0x40, 0x3B, 0x08, 0x08, 0xC7, 0xC7, 0xDB, 0xDB, 0xDB, 0xC7, 0xC7, 0x08, 0x08, 0x31, 0x41, 0x08,
+                    0x69, 0x3B, 0x4D, 0x4D, 0x67, 0x67, 0xDB, 0xDB, 0xDB, 0x67, 0x67, 0x4D, 0x4D, 0x31, 0x73, 0x08,
+                    0x69, 0x3B, 0x55, 0x55, 0xD7, 0xD7, 0xD1, 0xDB, 0xDB, 0xD7, 0xD7, 0x55, 0x55, 0x31, 0x73, 0x08,
+                    0x69, 0x3B, 0x39, 0x39, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x39, 0x39, 0x39, 0x39, 0x3A, 0x73, 0x08,
+                    0x69, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x73, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x0201, 0x3EF9, 0x3EF9, 0x3EF9, 0x2009, 0x3019, 0x2009, 0x3019, 0x2009, 0x3019, 0x3019, 0x3C79, 0x1, 0x1, 0xFFFF},
@@ -4912,21 +4912,21 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x78, 0x08, 
-                    0x91, 0x46, 0x9B, 0x7C, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7C, 0x9B, 0x7B, 0x9B, 0x7A, 0x9B, 0x08, 
-                    0x91, 0x46, 0x7D, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08, 
-                    0x91, 0x46, 0x9B, 0x7E, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0xB3, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x9B, 0x08, 
-                    0x91, 0x46, 0x9B, 0x7D, 0x9B, 0x7C, 0x9B, 0x7B, 0x9B, 0x7A, 0x9B, 0x7C, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0x91, 0x46, 0x9B, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08, 
-                    0x91, 0x46, 0x9B, 0x7C, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0x08, 
-                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0xB3, 0x08, 
-                    0x91, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x9B, 0x08, 
-                    0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x08, 
-                    0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0x08, 
-                    0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x08, 
-                    0x91, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x9B, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x38, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x78, 0x08,
+                    0x91, 0x46, 0x9B, 0x7C, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7C, 0x9B, 0x7B, 0x9B, 0x7A, 0x9B, 0x08,
+                    0x91, 0x46, 0x7D, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08,
+                    0x91, 0x46, 0x9B, 0x7E, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0xB3, 0x9B, 0x9B, 0x9B, 0x08,
+                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x9B, 0x08,
+                    0x91, 0x46, 0x9B, 0x7D, 0x9B, 0x7C, 0x9B, 0x7B, 0x9B, 0x7A, 0x9B, 0x7C, 0x9B, 0x9B, 0x9B, 0x08,
+                    0x91, 0x46, 0x9B, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x08,
+                    0x91, 0x46, 0x9B, 0x7C, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0x9B, 0x9B, 0x7D, 0x9B, 0x7E, 0x9B, 0x08,
+                    0x91, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0xB3, 0x08,
+                    0x91, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x9B, 0x08,
+                    0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x08,
+                    0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0x08,
+                    0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xDB, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x08,
+                    0x91, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0xDB, 0xD6, 0x96, 0x9B, 0x9B, 0x96, 0xD6, 0x9B, 0x08,
                     0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08,
                 },
                 .collisionData = {0x0381, 0x7FFD, 0x4001, 0x5FFF, 0x4001, 0x7FFD, 0x4001, 0x5FFF, 0x4001, 0x7FFD, 0x1, 0x1, 0x1, 0x1, 0x1, 0xFFFF},
@@ -5234,21 +5234,21 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0xD1, 0xDB, 0xDB, 0xDB, 0xD9, 0xD9, 0x1B, 0x14, 0x15, 0x98, 0x99, 0x9A, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xDB, 0xDB, 0xD5, 0xD5, 0xC3, 0xF9, 0x86, 0x8E, 0x95, 0x9B, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xDB, 0xD5, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xD5, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xD5, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8C, 0x8B, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x08, 
-                    0xD1, 0xCB, 0xCB, 0xCB, 0xCB, 0xCC, 0xCC, 0xFB, 0xFB, 0x8C, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08, 
-                    0xD1, 0xCC, 0xCC, 0xCC, 0xCC, 0xFB, 0xF5, 0xFB, 0xF5, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08, 
-                    0xD1, 0xD5, 0xD5, 0xD5, 0xD5, 0xFB, 0xEC, 0xFB, 0xEC, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08, 
-                    0xD1, 0xCB, 0xCB, 0xCB, 0xCB, 0xF5, 0xF5, 0xFB, 0xFB, 0xF5, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08, 
-                    0xD1, 0xCC, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0xF5, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xCC, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xDB, 0xCC, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x9B, 0x9B, 0x08, 
-                    0xD1, 0xDB, 0xDB, 0xDB, 0xCC, 0xCC, 0xCB, 0xFB, 0x8C, 0x8C, 0x8C, 0x9B, 0x9B, 0x9B, 0x9B, 0x08, 
+                    0xD1, 0xDB, 0xDB, 0xDB, 0xD9, 0xD9, 0x1B, 0x14, 0x15, 0x98, 0x99, 0x9A, 0x9B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xDB, 0xDB, 0xD5, 0xD5, 0xC3, 0xF9, 0x86, 0x8E, 0x95, 0x9B, 0x9B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xDB, 0xD5, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xD5, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xD5, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8C, 0x8B, 0x8B, 0x8B, 0x8B, 0x95, 0x9B, 0x08,
+                    0xD1, 0xCB, 0xCB, 0xCB, 0xCB, 0xCC, 0xCC, 0xFB, 0xFB, 0x8C, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08,
+                    0xD1, 0xCC, 0xCC, 0xCC, 0xCC, 0xFB, 0xF5, 0xFB, 0xF5, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08,
+                    0xD1, 0xD5, 0xD5, 0xD5, 0xD5, 0xFB, 0xEC, 0xFB, 0xEC, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08,
+                    0xD1, 0xCB, 0xCB, 0xCB, 0xCB, 0xF5, 0xF5, 0xFB, 0xFB, 0xF5, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x08,
+                    0xD1, 0xCC, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xCB, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0xF5, 0x8B, 0x8B, 0x8B, 0x8B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xCC, 0xCB, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xDB, 0xCC, 0xCB, 0xCB, 0xCB, 0xFB, 0x8B, 0x8B, 0x8B, 0x8C, 0x9B, 0x9B, 0x9B, 0x08,
+                    0xD1, 0xDB, 0xDB, 0xDB, 0xCC, 0xCC, 0xCB, 0xFB, 0x8C, 0x8C, 0x8C, 0x9B, 0x9B, 0x9B, 0x9B, 0x08,
                     0xD1, 0xDB, 0xDB, 0xDB, 0xDB, 0xDB, 0xCC, 0xFB, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x9B, 0x08,
                 },
                 .collisionData = {0x0381, 0x0201, 0xEE1, 0x1EF1, 0x3EF9, 0x3EF9, 0x7E7D, 0x783D, 0x2BD, 0x783D, 0x7E7D, 0x3E79, 0x3EF9, 0x1EF1, 0xEE1, 0x201},
@@ -5548,21 +5548,21 @@ static const struct TrHillFloor sDataTagExpert_Floors[] = {
                 },
             .display = {
                 .metatileData = {
-                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08, 
-                    0x96, 0xFB, 0xF6, 0xFD, 0xF6, 0xF6, 0xFB, 0x46, 0xFB, 0xF6, 0xF6, 0xFD, 0xF6, 0xFB, 0x9B, 0x08, 
-                    0xFB, 0x9B, 0xFB, 0xF6, 0xFB, 0xFB, 0xFB, 0x46, 0xFB, 0xFB, 0xFB, 0xF6, 0xFB, 0x9B, 0xFB, 0x08, 
-                    0xF6, 0xFB, 0x9B, 0xFB, 0xFB, 0x46, 0x46, 0x9B, 0x46, 0x46, 0xFB, 0xFB, 0x9B, 0xFB, 0xF6, 0x08, 
-                    0xFD, 0xF6, 0xFB, 0x9B, 0x46, 0x36, 0x36, 0x9B, 0x36, 0x36, 0x46, 0x9B, 0xFB, 0xF6, 0xFD, 0x08, 
-                    0xF6, 0xFB, 0xFB, 0x46, 0x9B, 0x46, 0x46, 0xDB, 0x46, 0x46, 0x9B, 0x46, 0xFB, 0xFB, 0xF6, 0x08, 
-                    0xF6, 0xFB, 0x46, 0x36, 0x46, 0x9B, 0xDB, 0xD6, 0xDB, 0x9B, 0x46, 0x36, 0x46, 0xFB, 0xF6, 0x08, 
-                    0xFB, 0xFB, 0x46, 0x36, 0x9B, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0x9B, 0x36, 0x46, 0xFB, 0xFB, 0x08, 
-                    0x96, 0x9B, 0x9B, 0x9B, 0x9B, 0xD6, 0xD6, 0x96, 0xD6, 0xD6, 0xDB, 0x9B, 0x9B, 0x9B, 0x96, 0x08, 
-                    0xFB, 0xFB, 0x46, 0x36, 0x9B, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0x9B, 0x36, 0x46, 0xFB, 0xFB, 0x08, 
-                    0xF6, 0xFB, 0x46, 0x36, 0x46, 0x9B, 0xDB, 0xD6, 0xDB, 0x9B, 0x46, 0x36, 0x46, 0xFB, 0xF6, 0x08, 
-                    0xF6, 0xFB, 0xFB, 0x46, 0x9B, 0x46, 0x46, 0xDB, 0x46, 0x46, 0x9B, 0x46, 0xFB, 0xFB, 0xF6, 0x08, 
-                    0xFD, 0xF6, 0xFB, 0x9B, 0x46, 0x36, 0x36, 0x9B, 0x36, 0x36, 0x46, 0x9B, 0xFB, 0xF6, 0xFD, 0x08, 
-                    0xF6, 0xFB, 0x9B, 0xFB, 0xFB, 0x46, 0x46, 0x9B, 0x46, 0x46, 0xFB, 0xFB, 0x9B, 0xFB, 0xF6, 0x08, 
-                    0xFB, 0x9B, 0xFB, 0xF6, 0xFB, 0xFB, 0xFB, 0x46, 0xFB, 0xFB, 0xFB, 0xF6, 0xFB, 0x9B, 0xFB, 0x08, 
+                    0x31, 0x3B, 0x3B, 0x3B, 0x39, 0x39, 0x13, 0x14, 0x15, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x3B, 0x08,
+                    0x96, 0xFB, 0xF6, 0xFD, 0xF6, 0xF6, 0xFB, 0x46, 0xFB, 0xF6, 0xF6, 0xFD, 0xF6, 0xFB, 0x9B, 0x08,
+                    0xFB, 0x9B, 0xFB, 0xF6, 0xFB, 0xFB, 0xFB, 0x46, 0xFB, 0xFB, 0xFB, 0xF6, 0xFB, 0x9B, 0xFB, 0x08,
+                    0xF6, 0xFB, 0x9B, 0xFB, 0xFB, 0x46, 0x46, 0x9B, 0x46, 0x46, 0xFB, 0xFB, 0x9B, 0xFB, 0xF6, 0x08,
+                    0xFD, 0xF6, 0xFB, 0x9B, 0x46, 0x36, 0x36, 0x9B, 0x36, 0x36, 0x46, 0x9B, 0xFB, 0xF6, 0xFD, 0x08,
+                    0xF6, 0xFB, 0xFB, 0x46, 0x9B, 0x46, 0x46, 0xDB, 0x46, 0x46, 0x9B, 0x46, 0xFB, 0xFB, 0xF6, 0x08,
+                    0xF6, 0xFB, 0x46, 0x36, 0x46, 0x9B, 0xDB, 0xD6, 0xDB, 0x9B, 0x46, 0x36, 0x46, 0xFB, 0xF6, 0x08,
+                    0xFB, 0xFB, 0x46, 0x36, 0x9B, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0x9B, 0x36, 0x46, 0xFB, 0xFB, 0x08,
+                    0x96, 0x9B, 0x9B, 0x9B, 0x9B, 0xD6, 0xD6, 0x96, 0xD6, 0xD6, 0xDB, 0x9B, 0x9B, 0x9B, 0x96, 0x08,
+                    0xFB, 0xFB, 0x46, 0x36, 0x9B, 0xDB, 0xD6, 0xD6, 0xD6, 0xDB, 0x9B, 0x36, 0x46, 0xFB, 0xFB, 0x08,
+                    0xF6, 0xFB, 0x46, 0x36, 0x46, 0x9B, 0xDB, 0xD6, 0xDB, 0x9B, 0x46, 0x36, 0x46, 0xFB, 0xF6, 0x08,
+                    0xF6, 0xFB, 0xFB, 0x46, 0x9B, 0x46, 0x46, 0xDB, 0x46, 0x46, 0x9B, 0x46, 0xFB, 0xFB, 0xF6, 0x08,
+                    0xFD, 0xF6, 0xFB, 0x9B, 0x46, 0x36, 0x36, 0x9B, 0x36, 0x36, 0x46, 0x9B, 0xFB, 0xF6, 0xFD, 0x08,
+                    0xF6, 0xFB, 0x9B, 0xFB, 0xFB, 0x46, 0x46, 0x9B, 0x46, 0x46, 0xFB, 0xFB, 0x9B, 0xFB, 0xF6, 0x08,
+                    0xFB, 0x9B, 0xFB, 0xF6, 0xFB, 0xFB, 0xFB, 0x46, 0xFB, 0xFB, 0xFB, 0xF6, 0xFB, 0x9B, 0xFB, 0x08,
                     0x96, 0xFB, 0xF6, 0xFD, 0xF6, 0xF6, 0xFB, 0x46, 0xFB, 0xF6, 0xF6, 0xFD, 0xF6, 0xFB, 0x9B, 0x08,
                 },
                 .collisionData = {0x0381, 0x0101, 0x0101, 0x6C1, 0x0821, 0x16D1, 0x2829, 0x2009, 0x1, 0x2009, 0x2829, 0x16D1, 0x0821, 0x6C1, 0x0101, 0x101},
diff --git a/src/data/contest_opponents.h b/src/data/contest_opponents.h
index b5466904b..19019be91 100644
--- a/src/data/contest_opponents.h
+++ b/src/data/contest_opponents.h
@@ -99,8 +99,8 @@
 #define CONTEST_OPPONENT_TREY 94
 #define CONTEST_OPPONENT_LANE 95
 
-// All contest opponents have a common set of AI flags (which contains all of the actually 
-// useful AI scripts, as well as some dummys) and a random combination of 2-3 dummy flags. 
+// All contest opponents have a common set of AI flags (which contains all of the actually
+// useful AI scripts, as well as some dummys) and a random combination of 2-3 dummy flags.
 // Seems that like the battle AI they had more plans for this than what ended up in the final game
 #define CONTEST_AI_SET_1  (CONTEST_AI_COMMON | CONTEST_AI_DUMMY_20 | CONTEST_AI_DUMMY_21)
 #define CONTEST_AI_SET_2  (CONTEST_AI_COMMON | CONTEST_AI_DUMMY_19 | CONTEST_AI_DUMMY_25)
@@ -1166,7 +1166,7 @@ const struct ContestPokemon gContestOpponents[] =
         .personality = 0,
         .otId = 0xFFFF
     },
-    [CONTEST_OPPONENT_ARIANA] = {    
+    [CONTEST_OPPONENT_ARIANA] = {
         .species = SPECIES_KECLEON,
         .nickname = _("KECON"),
         .trainerName = _("ARIANA"),
@@ -2010,7 +2010,7 @@ const struct ContestPokemon gContestOpponents[] =
         .species = SPECIES_CUBONE,
         .nickname = _("CUBIN"),
         .trainerName = _("COLTIN"),
-        .trainerGfxId = OBJ_EVENT_GFX_MAN_4, 
+        .trainerGfxId = OBJ_EVENT_GFX_MAN_4,
         .aiFlags = CONTEST_AI_SET_2,
         .whichRank = CONTEST_RANK_HYPER,
         .aiPool_Cool = FALSE,
diff --git a/src/data/contest_text_tables.h b/src/data/contest_text_tables.h
index f893bc66a..64ad704a5 100644
--- a/src/data/contest_text_tables.h
+++ b/src/data/contest_text_tables.h
@@ -181,7 +181,7 @@ extern const u8 gText_CouldntImproveItsCondition[];
 extern const u8 gText_BadConditionResultedInWeakAppeal[];
 extern const u8 gText_MonWasUnaffected[];
 extern const u8 gText_AttractedCrowdsAttention[];
- 
+
 // sContestConditions
 extern const u8 gText_Contest_Coolness[];
 extern const u8 gText_Contest_Beauty[];
diff --git a/src/data/decoration/header.h b/src/data/decoration/header.h
index c57498828..7a151808d 100644
--- a/src/data/decoration/header.h
+++ b/src/data/decoration/header.h
@@ -11,7 +11,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SMALL_DESK,
         .tiles = DecorGfx_SMALL_DESK,
     },
- 
+
     [DECOR_SMALL_DESK] =
     {
         .id = DECOR_SMALL_DESK,
@@ -23,7 +23,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SMALL_DESK,
         .tiles = DecorGfx_SMALL_DESK,
     },
- 
+
     [DECOR_POKEMON_DESK] =
     {
         .id = DECOR_POKEMON_DESK,
@@ -35,7 +35,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_POKEMON_DESK,
         .tiles = DecorGfx_POKEMON_DESK,
     },
- 
+
     [DECOR_HEAVY_DESK] =
     {
         .id = DECOR_HEAVY_DESK,
@@ -47,7 +47,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_HEAVY_DESK,
         .tiles = DecorGfx_HEAVY_DESK,
     },
- 
+
     [DECOR_RAGGED_DESK] =
     {
         .id = DECOR_RAGGED_DESK,
@@ -59,7 +59,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_RAGGED_DESK,
         .tiles = DecorGfx_RAGGED_DESK,
     },
- 
+
     [DECOR_COMFORT_DESK] =
     {
         .id = DECOR_COMFORT_DESK,
@@ -71,7 +71,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_COMFORT_DESK,
         .tiles = DecorGfx_COMFORT_DESK,
     },
- 
+
     [DECOR_PRETTY_DESK] =
     {
         .id = DECOR_PRETTY_DESK,
@@ -83,7 +83,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_PRETTY_DESK,
         .tiles = DecorGfx_PRETTY_DESK,
     },
- 
+
     [DECOR_BRICK_DESK] =
     {
         .id = DECOR_BRICK_DESK,
@@ -95,7 +95,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BRICK_DESK,
         .tiles = DecorGfx_BRICK_DESK,
     },
- 
+
     [DECOR_CAMP_DESK] =
     {
         .id = DECOR_CAMP_DESK,
@@ -107,7 +107,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_CAMP_DESK,
         .tiles = DecorGfx_CAMP_DESK,
     },
- 
+
     [DECOR_HARD_DESK] =
     {
         .id = DECOR_HARD_DESK,
@@ -119,7 +119,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_HARD_DESK,
         .tiles = DecorGfx_HARD_DESK,
     },
- 
+
     [DECOR_SMALL_CHAIR] =
     {
         .id = DECOR_SMALL_CHAIR,
@@ -131,7 +131,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SMALL_CHAIR,
         .tiles = DecorGfx_SMALL_CHAIR,
     },
- 
+
     [DECOR_POKEMON_CHAIR] =
     {
         .id = DECOR_POKEMON_CHAIR,
@@ -143,7 +143,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_POKEMON_CHAIR,
         .tiles = DecorGfx_POKEMON_CHAIR,
     },
- 
+
     [DECOR_HEAVY_CHAIR] =
     {
         .id = DECOR_HEAVY_CHAIR,
@@ -155,7 +155,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_HEAVY_CHAIR,
         .tiles = DecorGfx_HEAVY_CHAIR,
     },
- 
+
     [DECOR_PRETTY_CHAIR] =
     {
         .id = DECOR_PRETTY_CHAIR,
@@ -167,7 +167,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_PRETTY_CHAIR,
         .tiles = DecorGfx_PRETTY_CHAIR,
     },
- 
+
     [DECOR_COMFORT_CHAIR] =
     {
         .id = DECOR_COMFORT_CHAIR,
@@ -179,7 +179,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_COMFORT_CHAIR,
         .tiles = DecorGfx_COMFORT_CHAIR,
     },
- 
+
     [DECOR_RAGGED_CHAIR] =
     {
         .id = DECOR_RAGGED_CHAIR,
@@ -191,7 +191,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_RAGGED_CHAIR,
         .tiles = DecorGfx_RAGGED_CHAIR,
     },
- 
+
     [DECOR_BRICK_CHAIR] =
     {
         .id = DECOR_BRICK_CHAIR,
@@ -203,7 +203,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BRICK_CHAIR,
         .tiles = DecorGfx_BRICK_CHAIR,
     },
- 
+
     [DECOR_CAMP_CHAIR] =
     {
         .id = DECOR_CAMP_CHAIR,
@@ -215,7 +215,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_CAMP_CHAIR,
         .tiles = DecorGfx_CAMP_CHAIR,
     },
- 
+
     [DECOR_HARD_CHAIR] =
     {
         .id = DECOR_HARD_CHAIR,
@@ -227,7 +227,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_HARD_CHAIR,
         .tiles = DecorGfx_HARD_CHAIR,
     },
- 
+
     [DECOR_RED_PLANT] =
     {
         .id = DECOR_RED_PLANT,
@@ -239,7 +239,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_RED_PLANT,
         .tiles = DecorGfx_RED_PLANT,
     },
- 
+
     [DECOR_TROPICAL_PLANT] =
     {
         .id = DECOR_TROPICAL_PLANT,
@@ -251,7 +251,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_TROPICAL_PLANT,
         .tiles = DecorGfx_TROPICAL_PLANT,
     },
- 
+
     [DECOR_PRETTY_FLOWERS] =
     {
         .id = DECOR_PRETTY_FLOWERS,
@@ -263,7 +263,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_PRETTY_FLOWERS,
         .tiles = DecorGfx_PRETTY_FLOWERS,
     },
- 
+
     [DECOR_COLORFUL_PLANT] =
     {
         .id = DECOR_COLORFUL_PLANT,
@@ -275,7 +275,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_COLORFUL_PLANT,
         .tiles = DecorGfx_COLORFUL_PLANT,
     },
- 
+
     [DECOR_BIG_PLANT] =
     {
         .id = DECOR_BIG_PLANT,
@@ -287,7 +287,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BIG_PLANT,
         .tiles = DecorGfx_BIG_PLANT,
     },
- 
+
     [DECOR_GORGEOUS_PLANT] =
     {
         .id = DECOR_GORGEOUS_PLANT,
@@ -299,7 +299,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_GORGEOUS_PLANT,
         .tiles = DecorGfx_GORGEOUS_PLANT,
     },
- 
+
     [DECOR_RED_BRICK] =
     {
         .id = DECOR_RED_BRICK,
@@ -311,7 +311,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_RED_BRICK,
         .tiles = DecorGfx_RED_BRICK,
     },
- 
+
     [DECOR_YELLOW_BRICK] =
     {
         .id = DECOR_YELLOW_BRICK,
@@ -323,7 +323,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_YELLOW_BRICK,
         .tiles = DecorGfx_YELLOW_BRICK,
     },
- 
+
     [DECOR_BLUE_BRICK] =
     {
         .id = DECOR_BLUE_BRICK,
@@ -335,7 +335,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BLUE_BRICK,
         .tiles = DecorGfx_BLUE_BRICK,
     },
- 
+
     [DECOR_RED_BALLOON] =
     {
         .id = DECOR_RED_BALLOON,
@@ -347,7 +347,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_RED_BALLOON,
         .tiles = DecorGfx_RED_BALLOON,
     },
- 
+
     [DECOR_BLUE_BALLOON] =
     {
         .id = DECOR_BLUE_BALLOON,
@@ -359,7 +359,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BLUE_BALLOON,
         .tiles = DecorGfx_BLUE_BALLOON,
     },
- 
+
     [DECOR_YELLOW_BALLOON] =
     {
         .id = DECOR_YELLOW_BALLOON,
@@ -371,7 +371,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_YELLOW_BALLOON,
         .tiles = DecorGfx_YELLOW_BALLOON,
     },
- 
+
     [DECOR_RED_TENT] =
     {
         .id = DECOR_RED_TENT,
@@ -383,7 +383,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_RED_TENT,
         .tiles = DecorGfx_RED_TENT,
     },
- 
+
     [DECOR_BLUE_TENT] =
     {
         .id = DECOR_BLUE_TENT,
@@ -395,7 +395,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BLUE_TENT,
         .tiles = DecorGfx_BLUE_TENT,
     },
- 
+
     [DECOR_SOLID_BOARD] =
     {
         .id = DECOR_SOLID_BOARD,
@@ -407,7 +407,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SOLID_BOARD,
         .tiles = DecorGfx_SOLID_BOARD,
     },
- 
+
     [DECOR_SLIDE] =
     {
         .id = DECOR_SLIDE,
@@ -419,7 +419,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SLIDE,
         .tiles = DecorGfx_SLIDE,
     },
- 
+
     [DECOR_FENCE_LENGTH] =
     {
         .id = DECOR_FENCE_LENGTH,
@@ -431,7 +431,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_FENCE_LENGTH,
         .tiles = DecorGfx_FENCE_LENGTH,
     },
- 
+
     [DECOR_FENCE_WIDTH] =
     {
         .id = DECOR_FENCE_WIDTH,
@@ -443,7 +443,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_FENCE_WIDTH,
         .tiles = DecorGfx_FENCE_WIDTH,
     },
- 
+
     [DECOR_TIRE] =
     {
         .id = DECOR_TIRE,
@@ -455,7 +455,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_TIRE,
         .tiles = DecorGfx_TIRE,
     },
- 
+
     [DECOR_STAND] =
     {
         .id = DECOR_STAND,
@@ -467,7 +467,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_STAND,
         .tiles = DecorGfx_STAND,
     },
- 
+
     [DECOR_MUD_BALL] =
     {
         .id = DECOR_MUD_BALL,
@@ -479,7 +479,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_MUD_BALL,
         .tiles = DecorGfx_MUD_BALL,
     },
- 
+
     [DECOR_BREAKABLE_DOOR] =
     {
         .id = DECOR_BREAKABLE_DOOR,
@@ -491,7 +491,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BREAKABLE_DOOR,
         .tiles = DecorGfx_BREAKABLE_DOOR,
     },
- 
+
     [DECOR_SAND_ORNAMENT] =
     {
         .id = DECOR_SAND_ORNAMENT,
@@ -503,7 +503,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SAND_ORNAMENT,
         .tiles = DecorGfx_SAND_ORNAMENT,
     },
- 
+
     [DECOR_SILVER_SHIELD] =
     {
         .id = DECOR_SILVER_SHIELD,
@@ -515,7 +515,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SILVER_SHIELD,
         .tiles = DecorGfx_SILVER_SHIELD,
     },
- 
+
     [DECOR_GOLD_SHIELD] =
     {
         .id = DECOR_GOLD_SHIELD,
@@ -527,7 +527,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_GOLD_SHIELD,
         .tiles = DecorGfx_GOLD_SHIELD,
     },
- 
+
     [DECOR_GLASS_ORNAMENT] =
     {
         .id = DECOR_GLASS_ORNAMENT,
@@ -539,7 +539,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_GLASS_ORNAMENT,
         .tiles = DecorGfx_GLASS_ORNAMENT,
     },
- 
+
     [DECOR_TV] =
     {
         .id = DECOR_TV,
@@ -551,7 +551,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_TV,
         .tiles = DecorGfx_TV,
     },
- 
+
     [DECOR_ROUND_TV] =
     {
         .id = DECOR_ROUND_TV,
@@ -563,7 +563,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_ROUND_TV,
         .tiles = DecorGfx_ROUND_TV,
     },
- 
+
     [DECOR_CUTE_TV] =
     {
         .id = DECOR_CUTE_TV,
@@ -575,7 +575,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_CUTE_TV,
         .tiles = DecorGfx_CUTE_TV,
     },
- 
+
     [DECOR_GLITTER_MAT] =
     {
         .id = DECOR_GLITTER_MAT,
@@ -587,7 +587,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_GLITTER_MAT,
         .tiles = DecorGfx_GLITTER_MAT,
     },
- 
+
     [DECOR_JUMP_MAT] =
     {
         .id = DECOR_JUMP_MAT,
@@ -599,7 +599,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_JUMP_MAT,
         .tiles = DecorGfx_JUMP_MAT,
     },
- 
+
     [DECOR_SPIN_MAT] =
     {
         .id = DECOR_SPIN_MAT,
@@ -611,7 +611,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SPIN_MAT,
         .tiles = DecorGfx_SPIN_MAT,
     },
- 
+
     [DECOR_C_LOW_NOTE_MAT] =
     {
         .id = DECOR_C_LOW_NOTE_MAT,
@@ -623,7 +623,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_C_LOW_NOTE_MAT,
         .tiles = DecorGfx_C_LOW_NOTE_MAT,
     },
- 
+
     [DECOR_D_NOTE_MAT] =
     {
         .id = DECOR_D_NOTE_MAT,
@@ -635,7 +635,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_D_NOTE_MAT,
         .tiles = DecorGfx_D_NOTE_MAT,
     },
- 
+
     [DECOR_E_NOTE_MAT] =
     {
         .id = DECOR_E_NOTE_MAT,
@@ -647,7 +647,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_E_NOTE_MAT,
         .tiles = DecorGfx_E_NOTE_MAT,
     },
- 
+
     [DECOR_F_NOTE_MAT] =
     {
         .id = DECOR_F_NOTE_MAT,
@@ -659,7 +659,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_F_NOTE_MAT,
         .tiles = DecorGfx_F_NOTE_MAT,
     },
- 
+
     [DECOR_G_NOTE_MAT] =
     {
         .id = DECOR_G_NOTE_MAT,
@@ -671,7 +671,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_G_NOTE_MAT,
         .tiles = DecorGfx_G_NOTE_MAT,
     },
- 
+
     [DECOR_A_NOTE_MAT] =
     {
         .id = DECOR_A_NOTE_MAT,
@@ -683,7 +683,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_A_NOTE_MAT,
         .tiles = DecorGfx_A_NOTE_MAT,
     },
- 
+
     [DECOR_B_NOTE_MAT] =
     {
         .id = DECOR_B_NOTE_MAT,
@@ -695,7 +695,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_B_NOTE_MAT,
         .tiles = DecorGfx_B_NOTE_MAT,
     },
- 
+
     [DECOR_C_HIGH_NOTE_MAT] =
     {
         .id = DECOR_C_HIGH_NOTE_MAT,
@@ -707,7 +707,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_C_HIGH_NOTE_MAT,
         .tiles = DecorGfx_C_HIGH_NOTE_MAT,
     },
- 
+
     [DECOR_SURF_MAT] =
     {
         .id = DECOR_SURF_MAT,
@@ -719,7 +719,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SURF_MAT,
         .tiles = DecorGfx_SURF_MAT,
     },
- 
+
     [DECOR_THUNDER_MAT] =
     {
         .id = DECOR_THUNDER_MAT,
@@ -731,7 +731,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_THUNDER_MAT,
         .tiles = DecorGfx_THUNDER_MAT,
     },
- 
+
     [DECOR_FIRE_BLAST_MAT] =
     {
         .id = DECOR_FIRE_BLAST_MAT,
@@ -743,7 +743,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_FIRE_BLAST_MAT,
         .tiles = DecorGfx_FIRE_BLAST_MAT,
     },
- 
+
     [DECOR_POWDER_SNOW_MAT] =
     {
         .id = DECOR_POWDER_SNOW_MAT,
@@ -755,7 +755,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_POWDER_SNOW_MAT,
         .tiles = DecorGfx_POWDER_SNOW_MAT,
     },
- 
+
     [DECOR_ATTRACT_MAT] =
     {
         .id = DECOR_ATTRACT_MAT,
@@ -767,7 +767,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_ATTRACT_MAT,
         .tiles = DecorGfx_ATTRACT_MAT,
     },
- 
+
     [DECOR_FISSURE_MAT] =
     {
         .id = DECOR_FISSURE_MAT,
@@ -779,7 +779,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_FISSURE_MAT,
         .tiles = DecorGfx_FISSURE_MAT,
     },
- 
+
     [DECOR_SPIKES_MAT] =
     {
         .id = DECOR_SPIKES_MAT,
@@ -791,7 +791,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SPIKES_MAT,
         .tiles = DecorGfx_SPIKES_MAT,
     },
- 
+
     [DECOR_BALL_POSTER] =
     {
         .id = DECOR_BALL_POSTER,
@@ -803,7 +803,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BALL_POSTER,
         .tiles = DecorGfx_BALL_POSTER,
     },
- 
+
     [DECOR_GREEN_POSTER] =
     {
         .id = DECOR_GREEN_POSTER,
@@ -815,7 +815,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_GREEN_POSTER,
         .tiles = DecorGfx_GREEN_POSTER,
     },
- 
+
     [DECOR_RED_POSTER] =
     {
         .id = DECOR_RED_POSTER,
@@ -827,7 +827,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_RED_POSTER,
         .tiles = DecorGfx_RED_POSTER,
     },
- 
+
     [DECOR_BLUE_POSTER] =
     {
         .id = DECOR_BLUE_POSTER,
@@ -839,7 +839,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BLUE_POSTER,
         .tiles = DecorGfx_BLUE_POSTER,
     },
- 
+
     [DECOR_CUTE_POSTER] =
     {
         .id = DECOR_CUTE_POSTER,
@@ -851,7 +851,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_CUTE_POSTER,
         .tiles = DecorGfx_CUTE_POSTER,
     },
- 
+
     [DECOR_PIKA_POSTER] =
     {
         .id = DECOR_PIKA_POSTER,
@@ -863,7 +863,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_PIKA_POSTER,
         .tiles = DecorGfx_PIKA_POSTER,
     },
- 
+
     [DECOR_LONG_POSTER] =
     {
         .id = DECOR_LONG_POSTER,
@@ -875,7 +875,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_LONG_POSTER,
         .tiles = DecorGfx_LONG_POSTER,
     },
- 
+
     [DECOR_SEA_POSTER] =
     {
         .id = DECOR_SEA_POSTER,
@@ -887,7 +887,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SEA_POSTER,
         .tiles = DecorGfx_SEA_POSTER,
     },
- 
+
     [DECOR_SKY_POSTER] =
     {
         .id = DECOR_SKY_POSTER,
@@ -899,7 +899,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SKY_POSTER,
         .tiles = DecorGfx_SKY_POSTER,
     },
- 
+
     [DECOR_KISS_POSTER] =
     {
         .id = DECOR_KISS_POSTER,
@@ -911,7 +911,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_KISS_POSTER,
         .tiles = DecorGfx_KISS_POSTER,
     },
- 
+
     [DECOR_PICHU_DOLL] =
     {
         .id = DECOR_PICHU_DOLL,
@@ -923,7 +923,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_PICHU_DOLL,
         .tiles = DecorGfx_PICHU_DOLL,
     },
- 
+
     [DECOR_PIKACHU_DOLL] =
     {
         .id = DECOR_PIKACHU_DOLL,
@@ -935,7 +935,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_PIKACHU_DOLL,
         .tiles = DecorGfx_PIKACHU_DOLL,
     },
- 
+
     [DECOR_MARILL_DOLL] =
     {
         .id = DECOR_MARILL_DOLL,
@@ -947,7 +947,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_MARILL_DOLL,
         .tiles = DecorGfx_MARILL_DOLL,
     },
- 
+
     [DECOR_TOGEPI_DOLL] =
     {
         .id = DECOR_TOGEPI_DOLL,
@@ -959,7 +959,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_TOGEPI_DOLL,
         .tiles = DecorGfx_TOGEPI_DOLL,
     },
- 
+
     [DECOR_CYNDAQUIL_DOLL] =
     {
         .id = DECOR_CYNDAQUIL_DOLL,
@@ -971,7 +971,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_CYNDAQUIL_DOLL,
         .tiles = DecorGfx_CYNDAQUIL_DOLL,
     },
- 
+
     [DECOR_CHIKORITA_DOLL] =
     {
         .id = DECOR_CHIKORITA_DOLL,
@@ -983,7 +983,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_CHIKORITA_DOLL,
         .tiles = DecorGfx_CHIKORITA_DOLL,
     },
- 
+
     [DECOR_TOTODILE_DOLL] =
     {
         .id = DECOR_TOTODILE_DOLL,
@@ -995,7 +995,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_TOTODILE_DOLL,
         .tiles = DecorGfx_TOTODILE_DOLL,
     },
- 
+
     [DECOR_JIGGLYPUFF_DOLL] =
     {
         .id = DECOR_JIGGLYPUFF_DOLL,
@@ -1007,7 +1007,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_JIGGLYPUFF_DOLL,
         .tiles = DecorGfx_JIGGLYPUFF_DOLL,
     },
- 
+
     [DECOR_MEOWTH_DOLL] =
     {
         .id = DECOR_MEOWTH_DOLL,
@@ -1019,7 +1019,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_MEOWTH_DOLL,
         .tiles = DecorGfx_MEOWTH_DOLL,
     },
- 
+
     [DECOR_CLEFAIRY_DOLL] =
     {
         .id = DECOR_CLEFAIRY_DOLL,
@@ -1031,7 +1031,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_CLEFAIRY_DOLL,
         .tiles = DecorGfx_CLEFAIRY_DOLL,
     },
- 
+
     [DECOR_DITTO_DOLL] =
     {
         .id = DECOR_DITTO_DOLL,
@@ -1043,7 +1043,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_DITTO_DOLL,
         .tiles = DecorGfx_DITTO_DOLL,
     },
- 
+
     [DECOR_SMOOCHUM_DOLL] =
     {
         .id = DECOR_SMOOCHUM_DOLL,
@@ -1055,7 +1055,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SMOOCHUM_DOLL,
         .tiles = DecorGfx_SMOOCHUM_DOLL,
     },
- 
+
     [DECOR_TREECKO_DOLL] =
     {
         .id = DECOR_TREECKO_DOLL,
@@ -1067,7 +1067,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_TREECKO_DOLL,
         .tiles = DecorGfx_TREECKO_DOLL,
     },
- 
+
     [DECOR_TORCHIC_DOLL] =
     {
         .id = DECOR_TORCHIC_DOLL,
@@ -1079,7 +1079,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_TORCHIC_DOLL,
         .tiles = DecorGfx_TORCHIC_DOLL,
     },
- 
+
     [DECOR_MUDKIP_DOLL] =
     {
         .id = DECOR_MUDKIP_DOLL,
@@ -1091,7 +1091,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_MUDKIP_DOLL,
         .tiles = DecorGfx_MUDKIP_DOLL,
     },
- 
+
     [DECOR_DUSKULL_DOLL] =
     {
         .id = DECOR_DUSKULL_DOLL,
@@ -1103,7 +1103,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_DUSKULL_DOLL,
         .tiles = DecorGfx_DUSKULL_DOLL,
     },
- 
+
     [DECOR_WYNAUT_DOLL] =
     {
         .id = DECOR_WYNAUT_DOLL,
@@ -1115,7 +1115,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_WYNAUT_DOLL,
         .tiles = DecorGfx_WYNAUT_DOLL,
     },
- 
+
     [DECOR_BALTOY_DOLL] =
     {
         .id = DECOR_BALTOY_DOLL,
@@ -1127,7 +1127,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BALTOY_DOLL,
         .tiles = DecorGfx_BALTOY_DOLL,
     },
- 
+
     [DECOR_KECLEON_DOLL] =
     {
         .id = DECOR_KECLEON_DOLL,
@@ -1139,7 +1139,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_KECLEON_DOLL,
         .tiles = DecorGfx_KECLEON_DOLL,
     },
- 
+
     [DECOR_AZURILL_DOLL] =
     {
         .id = DECOR_AZURILL_DOLL,
@@ -1151,7 +1151,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_AZURILL_DOLL,
         .tiles = DecorGfx_AZURILL_DOLL,
     },
- 
+
     [DECOR_SKITTY_DOLL] =
     {
         .id = DECOR_SKITTY_DOLL,
@@ -1163,7 +1163,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SKITTY_DOLL,
         .tiles = DecorGfx_SKITTY_DOLL,
     },
- 
+
     [DECOR_SWABLU_DOLL] =
     {
         .id = DECOR_SWABLU_DOLL,
@@ -1175,7 +1175,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SWABLU_DOLL,
         .tiles = DecorGfx_SWABLU_DOLL,
     },
- 
+
     [DECOR_GULPIN_DOLL] =
     {
         .id = DECOR_GULPIN_DOLL,
@@ -1187,7 +1187,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_GULPIN_DOLL,
         .tiles = DecorGfx_GULPIN_DOLL,
     },
- 
+
     [DECOR_LOTAD_DOLL] =
     {
         .id = DECOR_LOTAD_DOLL,
@@ -1199,7 +1199,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_LOTAD_DOLL,
         .tiles = DecorGfx_LOTAD_DOLL,
     },
- 
+
     [DECOR_SEEDOT_DOLL] =
     {
         .id = DECOR_SEEDOT_DOLL,
@@ -1211,7 +1211,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SEEDOT_DOLL,
         .tiles = DecorGfx_SEEDOT_DOLL,
     },
- 
+
     [DECOR_PIKA_CUSHION] =
     {
         .id = DECOR_PIKA_CUSHION,
@@ -1223,7 +1223,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_PIKA_CUSHION,
         .tiles = DecorGfx_PIKA_CUSHION,
     },
- 
+
     [DECOR_ROUND_CUSHION] =
     {
         .id = DECOR_ROUND_CUSHION,
@@ -1235,7 +1235,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_ROUND_CUSHION,
         .tiles = DecorGfx_ROUND_CUSHION,
     },
- 
+
     [DECOR_KISS_CUSHION] =
     {
         .id = DECOR_KISS_CUSHION,
@@ -1247,7 +1247,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_KISS_CUSHION,
         .tiles = DecorGfx_KISS_CUSHION,
     },
- 
+
     [DECOR_ZIGZAG_CUSHION] =
     {
         .id = DECOR_ZIGZAG_CUSHION,
@@ -1259,7 +1259,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_ZIGZAG_CUSHION,
         .tiles = DecorGfx_ZIGZAG_CUSHION,
     },
- 
+
     [DECOR_SPIN_CUSHION] =
     {
         .id = DECOR_SPIN_CUSHION,
@@ -1271,7 +1271,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SPIN_CUSHION,
         .tiles = DecorGfx_SPIN_CUSHION,
     },
- 
+
     [DECOR_DIAMOND_CUSHION] =
     {
         .id = DECOR_DIAMOND_CUSHION,
@@ -1283,7 +1283,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_DIAMOND_CUSHION,
         .tiles = DecorGfx_DIAMOND_CUSHION,
     },
- 
+
     [DECOR_BALL_CUSHION] =
     {
         .id = DECOR_BALL_CUSHION,
@@ -1295,7 +1295,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BALL_CUSHION,
         .tiles = DecorGfx_BALL_CUSHION,
     },
- 
+
     [DECOR_GRASS_CUSHION] =
     {
         .id = DECOR_GRASS_CUSHION,
@@ -1307,7 +1307,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_GRASS_CUSHION,
         .tiles = DecorGfx_GRASS_CUSHION,
     },
- 
+
     [DECOR_FIRE_CUSHION] =
     {
         .id = DECOR_FIRE_CUSHION,
@@ -1319,7 +1319,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_FIRE_CUSHION,
         .tiles = DecorGfx_FIRE_CUSHION,
     },
- 
+
     [DECOR_WATER_CUSHION] =
     {
         .id = DECOR_WATER_CUSHION,
@@ -1331,7 +1331,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_WATER_CUSHION,
         .tiles = DecorGfx_WATER_CUSHION,
     },
- 
+
     [DECOR_SNORLAX_DOLL] =
     {
         .id = DECOR_SNORLAX_DOLL,
@@ -1343,7 +1343,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_SNORLAX_DOLL,
         .tiles = DecorGfx_SNORLAX_DOLL,
     },
- 
+
     [DECOR_RHYDON_DOLL] =
     {
         .id = DECOR_RHYDON_DOLL,
@@ -1355,7 +1355,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_RHYDON_DOLL,
         .tiles = DecorGfx_RHYDON_DOLL,
     },
- 
+
     [DECOR_LAPRAS_DOLL] =
     {
         .id = DECOR_LAPRAS_DOLL,
@@ -1367,7 +1367,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_LAPRAS_DOLL,
         .tiles = DecorGfx_LAPRAS_DOLL,
     },
- 
+
     [DECOR_VENUSAUR_DOLL] =
     {
         .id = DECOR_VENUSAUR_DOLL,
@@ -1379,7 +1379,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_VENUSAUR_DOLL,
         .tiles = DecorGfx_VENUSAUR_DOLL,
     },
- 
+
     [DECOR_CHARIZARD_DOLL] =
     {
         .id = DECOR_CHARIZARD_DOLL,
@@ -1391,7 +1391,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_CHARIZARD_DOLL,
         .tiles = DecorGfx_CHARIZARD_DOLL,
     },
- 
+
     [DECOR_BLASTOISE_DOLL] =
     {
         .id = DECOR_BLASTOISE_DOLL,
@@ -1403,7 +1403,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_BLASTOISE_DOLL,
         .tiles = DecorGfx_BLASTOISE_DOLL,
     },
- 
+
     [DECOR_WAILMER_DOLL] =
     {
         .id = DECOR_WAILMER_DOLL,
@@ -1415,7 +1415,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_WAILMER_DOLL,
         .tiles = DecorGfx_WAILMER_DOLL,
     },
- 
+
     [DECOR_REGIROCK_DOLL] =
     {
         .id = DECOR_REGIROCK_DOLL,
@@ -1427,7 +1427,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_REGIROCK_DOLL,
         .tiles = DecorGfx_REGIROCK_DOLL,
     },
- 
+
     [DECOR_REGICE_DOLL] =
     {
         .id = DECOR_REGICE_DOLL,
@@ -1439,7 +1439,7 @@ const struct Decoration gDecorations[] =
         .description = DecorDesc_REGICE_DOLL,
         .tiles = DecorGfx_REGICE_DOLL,
     },
- 
+
     [DECOR_REGISTEEL_DOLL] =
     {
         .id = DECOR_REGISTEEL_DOLL,
diff --git a/src/data/decoration/icon.h b/src/data/decoration/icon.h
index b29dab20f..03a0e0669 100644
--- a/src/data/decoration/icon.h
+++ b/src/data/decoration/icon.h
@@ -1,4 +1,4 @@
-const u32 *const gDecorIconTable[][2] = 
+const u32 *const gDecorIconTable[][2] =
 {
     [DECOR_NONE]            = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
     [DECOR_SMALL_DESK]      = {NULL, NULL},
diff --git a/src/data/field_effects/field_effect_objects.h b/src/data/field_effects/field_effect_objects.h
index 54145efbc..598b88932 100755
--- a/src/data/field_effects/field_effect_objects.h
+++ b/src/data/field_effects/field_effect_objects.h
@@ -29,8 +29,8 @@ static const struct SpriteFrameImage sPicTable_ShadowExtraLarge[] = {
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_8x8,
     .anims = sAnimTable_Shadow,
     .images = sPicTable_ShadowSmall,
@@ -39,8 +39,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowSmall = {
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_16x8,
     .anims = sAnimTable_Shadow,
     .images = sPicTable_ShadowMedium,
@@ -49,8 +49,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowMedium = {
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_32x8,
     .anims = sAnimTable_Shadow,
     .images = sPicTable_ShadowLarge,
@@ -59,8 +59,8 @@ const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowLarge = {
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShadowExtraLarge = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_64x32,
     .anims = sAnimTable_Shadow,
     .images = sPicTable_ShadowExtraLarge,
@@ -92,7 +92,7 @@ static const union AnimCmd *const sAnimTable_TallGrass[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_TallGrass = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_TallGrass,
@@ -128,7 +128,7 @@ static const union AnimCmd *const sAnimTable_Ripple[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_Ripple = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_Ripple,
@@ -161,7 +161,7 @@ static const union AnimCmd *const sAnimTable_Ash[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_Ash = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_Ash,
@@ -209,8 +209,8 @@ static const union AnimCmd *const sAnimTable_SurfBlob[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_32x32,
     .anims = sAnimTable_SurfBlob,
     .images = sPicTable_SurfBlob,
@@ -266,8 +266,8 @@ static const union AnimCmd *const sAnimTable_Arrow[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_Arrow = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_Arrow,
     .images = sPicTable_Arrow,
@@ -295,7 +295,7 @@ static const union AnimCmd *const sAnimTable_GroundImpactDust[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_GroundImpactDust = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x8,
     .anims = sAnimTable_GroundImpactDust,
@@ -326,7 +326,7 @@ static const union AnimCmd *const sAnimTable_JumpTallGrass[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_JumpTallGrass = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
     .oam = &gObjectEventBaseOam_16x8,
     .anims = sAnimTable_JumpTallGrass,
@@ -374,7 +374,7 @@ static const union AnimCmd *const sAnimTable_SandFootprints[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_SandFootprints = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_SandFootprints,
@@ -422,7 +422,7 @@ static const union AnimCmd *const sAnimTable_DeepSandFootprints[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_DeepSandFootprints = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_DeepSandFootprints,
@@ -500,7 +500,7 @@ static const union AnimCmd *const sAnimTable_BikeTireTracks[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_BikeTireTracks = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_BikeTireTracks,
@@ -531,7 +531,7 @@ static const union AnimCmd *const sAnimTable_JumpBigSplash[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_JumpBigSplash = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_JumpBigSplash,
@@ -572,7 +572,7 @@ static const union AnimCmd *const sAnimTable_Splash[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_Splash = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x8,
     .anims = sAnimTable_Splash,
@@ -601,7 +601,7 @@ static const union AnimCmd *const sAnimTable_JumpSmallSplash[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_JumpSmallSplash = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x8,
     .anims = sAnimTable_JumpSmallSplash,
@@ -635,7 +635,7 @@ static const union AnimCmd *const sAnimTable_LongGrass[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_LongGrass = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_LongGrass,
@@ -670,7 +670,7 @@ static const union AnimCmd *const sAnimTable_JumpLongGrass[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_JumpLongGrass = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_JumpLongGrass,
@@ -711,7 +711,7 @@ static const union AnimCmd *const sAnimTable_UnusedGrass[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_UnusedGrass,
@@ -744,7 +744,7 @@ static const union AnimCmd *const sAnimTable_UnusedGrass2[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedGrass2 = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_UnusedGrass2,
@@ -775,7 +775,7 @@ static const union AnimCmd *const sAnimTable_UnusedSand[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_UnusedSand = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_UnusedSand,
@@ -804,7 +804,7 @@ static const union AnimCmd *const sAnimTable_SandPile[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_SandPile = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x8,
     .anims = sAnimTable_SandPile,
@@ -837,7 +837,7 @@ static const union AnimCmd *const sAnimTable_WaterSurfacing[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_WaterSurfacing = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_WaterSurfacing,
@@ -882,7 +882,7 @@ static const union AffineAnimCmd *const sAffineAnims_ReflectionDistortion[] =
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_ReflectionDistortion = {
     .tileTag = 0x0,
-    .paletteTag = 0xFFFF,
+    .paletteTag = TAG_NONE,
     .oam = &gDummyOamData,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -930,8 +930,8 @@ static const union AnimCmd *const sAnimTable_Sparkle[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_Sparkle = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_Sparkle,
     .images = sPicTable_Sparkle,
@@ -974,8 +974,8 @@ static const union AnimCmd *const sAnimTable_TreeDisguise[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_TreeDisguise = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_16x32,
     .anims = sAnimTable_TreeDisguise,
     .images = sPicTable_TreeDisguise,
@@ -1018,8 +1018,8 @@ static const union AnimCmd *const sAnimTable_MountainDisguise[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_MountainDisguise = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_16x32,
     .anims = sAnimTable_MountainDisguise,
     .images = sPicTable_MountainDisguise,
@@ -1038,8 +1038,8 @@ static const struct SpriteFrameImage sPicTable_SandDisguisePlaceholder[] = {
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_SandDisguisePlaceholder = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_16x32,
     .anims = sAnimTable_TreeDisguise,
     .images = sPicTable_SandDisguisePlaceholder,
@@ -1063,8 +1063,8 @@ static const union AnimCmd *const sAnimTable_Bird[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_Bird = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_32x32,
     .anims = sAnimTable_Bird,
     .images = sPicTable_Bird,
@@ -1090,7 +1090,7 @@ static const union AnimCmd *const sAnimTable_ShortGrass[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_ShortGrass = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_ShortGrass,
@@ -1115,7 +1115,7 @@ static const union AnimCmd *const sAnimTable_HotSpringsWater[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_HotSpringsWater = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_1,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_HotSpringsWater,
@@ -1149,12 +1149,12 @@ static const union AnimCmd *const sAnimTable_AshPuff[] =
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_AshPuff = 
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = FLDEFF_PAL_TAG_ASH, 
-    .oam = &gObjectEventBaseOam_16x16, 
-    .anims = sAnimTable_AshPuff, 
-    .images = sPicTable_AshPuff, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = FLDEFF_PAL_TAG_ASH,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_AshPuff,
+    .images = sPicTable_AshPuff,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_AshPuff
 };
 
@@ -1183,14 +1183,14 @@ static const union AnimCmd *const sAnimTable_AshLaunch[] =
     sAnim_AshLaunch,
 };
 
-const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch = 
+const struct SpriteTemplate gFieldEffectObjectTemplate_AshLaunch =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = FLDEFF_PAL_TAG_ASH, 
-    .oam = &gObjectEventBaseOam_16x16, 
-    .anims = sAnimTable_AshLaunch, 
-    .images = sPicTable_AshLaunch, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = FLDEFF_PAL_TAG_ASH,
+    .oam = &gObjectEventBaseOam_16x16,
+    .anims = sAnimTable_AshLaunch,
+    .images = sPicTable_AshLaunch,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_AshLaunch
 };
 
@@ -1224,7 +1224,7 @@ static const union AnimCmd *const sAnimTable_Bubbles[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_Bubbles = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &gObjectEventBaseOam_16x32,
     .anims = sAnimTable_Bubbles,
@@ -1252,7 +1252,7 @@ static const union AnimCmd *const sAnimTable_SmallSparkle[] =
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_SmallSparkle = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_SMALL_SPARKLE,
     .oam = &gObjectEventBaseOam_16x16,
     .anims = sAnimTable_SmallSparkle,
@@ -1277,8 +1277,8 @@ const struct SpriteFrameImage  sPicTable_RayquazaSpotlightEffect[] = {
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_Rayquaza = {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &gObjectEventBaseOam_32x32,
     .anims = sAnimTable_RayquazaSpotlightEffect,
     .images = sPicTable_RayquazaSpotlightEffect,
diff --git a/src/data/graphics/rayquaza_scene.h b/src/data/graphics/rayquaza_scene.h
index 633213db8..660f07416 100644
--- a/src/data/graphics/rayquaza_scene.h
+++ b/src/data/graphics/rayquaza_scene.h
@@ -24,7 +24,7 @@ const u32 gRaySceneTakesFlight_Bg_Tilemap[]       = INCBIN_U32("graphics/rayquaz
 
 // Scene 3 (RAY_ANIM_DESCENDS)
 const u32 gRaySceneDescends_Rayquaza_Gfx[]     = INCBIN_U32("graphics/rayquaza_scene/scene_3/rayquaza.4bpp.lz");
-// for some reason there are an extra 0xC bytes at the end of the original rayquaza_tail.4bpp, so in order to produce the correct lz, 
+// for some reason there are an extra 0xC bytes at the end of the original rayquaza_tail.4bpp, so in order to produce the correct lz,
 // we have to cat the bytes at the end with a make rule. not sure why those bytes are there, it may have been a bug in Game Freak's software.
 const u32 gRaySceneDescends_RayquazaTail_Gfx[] = INCBIN_U32("graphics/rayquaza_scene/scene_3/rayquaza_tail_fix.4bpp.lz");
 const u32 gRaySceneDescends_Bg_Gfx[]           = INCBIN_U32("graphics/rayquaza_scene/scene_3/bg.4bpp.lz");
diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h
index c36969ab5..ea8315e76 100644
--- a/src/data/item_icon_table.h
+++ b/src/data/item_icon_table.h
@@ -192,10 +192,9 @@ const u32 *const gItemIconTable[][2] =
     [ITEM_LANSAT_BERRY] = {gItemIcon_LansatBerry, gItemIconPalette_LansatBerry},
     [ITEM_STARF_BERRY] = {gItemIcon_StarfBerry, gItemIconPalette_StarfBerry},
     [ITEM_ENIGMA_BERRY] = {gItemIcon_EnigmaBerry, gItemIconPalette_EnigmaBerry},
-    // ????????
-    [ITEM_0B0] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
-    [ITEM_0B1] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
-    [ITEM_0B2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_UNUSED_BERRY_1] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_UNUSED_BERRY_2] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
+    [ITEM_UNUSED_BERRY_3] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
     // Hold items
     [ITEM_BRIGHT_POWDER] = {gItemIcon_BrightPowder, gItemIconPalette_BrightPowder},
     [ITEM_WHITE_HERB] = {gItemIcon_InBattleHerb, gItemIconPalette_WhiteHerb},
diff --git a/src/data/items.h b/src/data/items.h
index fc7792186..370cd2022 100644
--- a/src/data/items.h
+++ b/src/data/items.h
@@ -2148,7 +2148,7 @@ const struct Item gItems[] =
         .battleUseFunc = ItemUseInBattle_EnigmaBerry,
     },
 
-    [ITEM_0B0] =
+    [ITEM_UNUSED_BERRY_1] =
     {
         .name = _("????????"),
         .itemId = ITEM_NONE,
@@ -2159,7 +2159,7 @@ const struct Item gItems[] =
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
     },
 
-    [ITEM_0B1] =
+    [ITEM_UNUSED_BERRY_2] =
     {
         .name = _("????????"),
         .itemId = ITEM_NONE,
@@ -2170,7 +2170,7 @@ const struct Item gItems[] =
         .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
     },
 
-    [ITEM_0B2] =
+    [ITEM_UNUSED_BERRY_3] =
     {
         .name = _("????????"),
         .itemId = ITEM_NONE,
diff --git a/src/data/lilycove_lady.h b/src/data/lilycove_lady.h
index 818a5fd5f..1f1caa35f 100644
--- a/src/data/lilycove_lady.h
+++ b/src/data/lilycove_lady.h
@@ -20,7 +20,7 @@ static const u16 sLilycoveLadyGfxId[] =
 };
 
 // Quiz Lady data
-static const u16 sQuizLadyQuestion1[] =
+static const u16 sQuizLadyQuestion1[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_WHICH,
     EC_WORD_STORES,
@@ -33,9 +33,9 @@ static const u16 sQuizLadyQuestion1[] =
     EC_WORD_POKENAV
 };
 
-static const u16 sQuizLadyQuestion2[] =
+static const u16 sQuizLadyQuestion2[QUIZ_QUESTION_LEN] =
 {
-    EC_WORD_WHICH, 
+    EC_WORD_WHICH,
     EC_WORD_ISN_T,
     EC_WORD_A,
     EC_WORD_GAME,
@@ -46,7 +46,7 @@ static const u16 sQuizLadyQuestion2[] =
     EC_WORD_DARK
 };
 
-static const u16 sQuizLadyQuestion3[] =
+static const u16 sQuizLadyQuestion3[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_HOW,
     EC_WORD_DO,
@@ -59,7 +59,7 @@ static const u16 sQuizLadyQuestion3[] =
     EC_WORD_CUTE_CHARM
 };
 
-static const u16 sQuizLadyQuestion4[] =
+static const u16 sQuizLadyQuestion4[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_WHICH,
     EC_WORD_IS,
@@ -72,7 +72,7 @@ static const u16 sQuizLadyQuestion4[] =
     EC_WORD_MACHINE
 };
 
-static const u16 sQuizLadyQuestion5[] =
+static const u16 sQuizLadyQuestion5[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_WHICH,
     EC_WORD_ITEM,
@@ -85,7 +85,7 @@ static const u16 sQuizLadyQuestion5[] =
     EC_WORD_PHONE
 };
 
-static const u16 sQuizLadyQuestion6[] =
+static const u16 sQuizLadyQuestion6[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_WHICH,
     EC_WORD_WILL,
@@ -98,7 +98,7 @@ static const u16 sQuizLadyQuestion6[] =
     EC_WORD_SWIFT_SWIM
 };
 
-static const u16 sQuizLadyQuestion7[] =
+static const u16 sQuizLadyQuestion7[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_WHICH,
     EC_WORD_OF,
@@ -111,20 +111,20 @@ static const u16 sQuizLadyQuestion7[] =
     EC_WORD_ROCK
 };
 
-static const u16 sQuizLadyQuestion8[] =
+static const u16 sQuizLadyQuestion8[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_WHICH,
     EC_WORD_WILL,
     EC_MOVE2(BLOCK),
     EC_WORD_ESCAPE,
     EC_WORD_QUES,
-    EC_EMPTY_WORD, 
+    EC_EMPTY_WORD,
     EC_WORD_RUN_AWAY,
     EC_WORD_SHADOW_TAG,
     EC_WORD_WONDER_GUARD
 };
 
-static const u16 sQuizLadyQuestion9[] =
+static const u16 sQuizLadyQuestion9[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_WHICH,
     EC_WORD_WILL,
@@ -137,7 +137,7 @@ static const u16 sQuizLadyQuestion9[] =
     EC_WORD_SHED_SKIN
 };
 
-static const u16 sQuizLadyQuestion10[] =
+static const u16 sQuizLadyQuestion10[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_WHICH,
     EC_WORD_GOES,
@@ -150,7 +150,7 @@ static const u16 sQuizLadyQuestion10[] =
     EC_WORD_POKENAV
 };
 
-static const u16 sQuizLadyQuestion11[] =
+static const u16 sQuizLadyQuestion11[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_WHICH,
     EC_WORD_STORES,
@@ -163,7 +163,7 @@ static const u16 sQuizLadyQuestion11[] =
     EC_WORD_TELEVISION
 };
 
-static const u16 sQuizLadyQuestion12[] =
+static const u16 sQuizLadyQuestion12[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_WHICH,
     EC_WORD_MACHINE,
@@ -176,7 +176,7 @@ static const u16 sQuizLadyQuestion12[] =
     EC_WORD_TELEVISION
 };
 
-static const u16 sQuizLadyQuestion13[] =
+static const u16 sQuizLadyQuestion13[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_A,
     EC_WORD_POKEMON,
@@ -189,7 +189,7 @@ static const u16 sQuizLadyQuestion13[] =
     EC_WORD_LETTER
 };
 
-static const u16 sQuizLadyQuestion14[] =
+static const u16 sQuizLadyQuestion14[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_STEEL,
     EC_WORD_IS,
@@ -202,7 +202,7 @@ static const u16 sQuizLadyQuestion14[] =
     EC_EMPTY_WORD
 };
 
-static const u16 sQuizLadyQuestion15[] =
+static const u16 sQuizLadyQuestion15[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_DARK,
     EC_WORD_IS,
@@ -215,7 +215,7 @@ static const u16 sQuizLadyQuestion15[] =
     EC_EMPTY_WORD
 };
 
-static const u16 sQuizLadyQuestion16[] =
+static const u16 sQuizLadyQuestion16[QUIZ_QUESTION_LEN] =
 {
     EC_WORD_GHOST,
     EC_WORD_IS,
diff --git a/src/data/object_events/berry_tree_graphics_tables.h b/src/data/object_events/berry_tree_graphics_tables.h
index 390c82f95..fe41bda3b 100755
--- a/src/data/object_events/berry_tree_graphics_tables.h
+++ b/src/data/object_events/berry_tree_graphics_tables.h
@@ -559,7 +559,7 @@ const u8 *const gBerryTreeObjectEventGraphicsIdTablePointers[] = {
     [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
     [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
     // 3 unused berries.
-    [ITEM_0B0 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
-    [ITEM_0B1 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
-    [ITEM_0B2 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
+    [ITEM_UNUSED_BERRY_1 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
+    [ITEM_UNUSED_BERRY_2 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
+    [ITEM_UNUSED_BERRY_3 - FIRST_BERRY_INDEX] = gBerryTreeObjectEventGraphicsIdTable,
 };
diff --git a/src/data/object_events/object_event_anims.h b/src/data/object_events/object_event_anims.h
index 93f402258..a66d634b0 100755
--- a/src/data/object_events/object_event_anims.h
+++ b/src/data/object_events/object_event_anims.h
@@ -950,7 +950,7 @@ static const union AnimCmd sAnim_RayquazaFaceEast[] =
 };
 
 // Though they correspond to facing/walking movements, Rayquaza doesn't have
-// equivalent images aside from flying up. Its other frames aside from the 'normal' 
+// equivalent images aside from flying up. Its other frames aside from the 'normal'
 // frame are for the sequence where it awakens on Sky Pillar.
 // The corresponding facing/walking movements are commented alongside
 static const union AnimCmd *const sAnimTable_Rayquaza[] = {
diff --git a/src/data/object_events/object_event_graphics_info.h b/src/data/object_events/object_event_graphics_info.h
index ddc6a1cad..ea424090a 100755
--- a/src/data/object_events/object_event_graphics_info.h
+++ b/src/data/object_events/object_event_graphics_info.h
@@ -1,245 +1,245 @@
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Surfing, sPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_FieldMove, sPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump = {0xFFFF, OBJ_EVENT_PAL_TAG_QUINTY_PLUMP, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_QuintyPlump, sPicTable_QuintyPlump, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_NinjaBoy, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Twin, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Boy1, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Girl1, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Boy2, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Girl2, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_LittleBoy, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_LittleGirl, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Boy3, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Girl3, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RichBoy, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Woman1, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_FatMan, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_PokefanF, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Man1, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Woman2, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ExpertM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ExpertF, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Man2, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Woman3, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_PokefanM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Woman4, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Cook, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_LinkReceptionist, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_OldMan, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_OldWoman, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Camper, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Picnicker, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Man3, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Woman5, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Youngster, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_BugCatcher, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_PsychicM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_SchoolKidM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Maniac, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_HexManiac, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RayquazaStill = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Standard, sPicTable_RayquazaStill, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerF, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_BlackBelt, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Beauty, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Scientist1, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Lass, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Gentleman, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Sailor, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Fisherman, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_TuberF, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_TuberM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Hiker, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Nurse, sPicTable_Nurse, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_ItemBall, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, NULL, sAnimTable_BerryTree, sPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_BerryTree, sPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BerryTree, sPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ProfBirch, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Man4, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Man5, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ReporterM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ReporterF, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_CuttableTree, sPicTable_CuttableTree, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MartEmployee, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Teala, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_BreakableRock, sPicTable_BreakableRock, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_PushableBoulder, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_MayNormal, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayMachBike, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Surfing, sPicTable_MaySurfing, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_FieldMove, sPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {0xFFFF, OBJ_EVENT_PAL_TAG_TRUCK, OBJ_EVENT_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_48x48, sAnimTable_Inanimate, sPicTable_Truck, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox = {0xFFFF, OBJ_EVENT_PAL_TAG_VIGOROTH, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway = {0xFFFF, OBJ_EVENT_PAL_TAG_VIGOROTH, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_BirchsBag, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon = {0xFFFF, OBJ_EVENT_PAL_TAG_ZIGZAGOON, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {0xFFFF, OBJ_EVENT_PAL_TAG_POOCHYENA, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Poochyena, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Artist, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Surfing, sPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_FieldMove, sPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_MayNormal, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayMachBike, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Surfing, sPicTable_MaySurfing, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_FieldMove, sPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Cameraman, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {0xFFFF, OBJ_EVENT_PAL_TAG_PLAYER_UNDERWATER, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {0xFFFF, OBJ_EVENT_PAL_TAG_PLAYER_UNDERWATER, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayUnderwater, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {0xFFFF, OBJ_EVENT_PAL_TAG_MOVING_BOX, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_MovingBox, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {0xFFFF, OBJ_EVENT_PAL_TAG_CABLE_CAR, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Inanimate, sPicTable_CableCar, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Scientist2, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_DevonEmployee, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_AquaMemberM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_AquaMemberF, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MagmaMemberM, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MagmaMemberF, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Sidney, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Phoebe, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Glacia, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Drake, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Roxanne, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Brawly, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Wattson, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Flannery, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Norman, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Winona, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Liza, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Tate, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Wallace, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Steven, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Wally, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Fishing, sPicTable_BrendanFishing, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Fishing, sPicTable_MayFishing, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {0xFFFF, OBJ_EVENT_PAL_TAG_SSTIDAL, OBJ_EVENT_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, sOamTables_96x40, sAnimTable_Standard, sPicTable_SSTidal, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {0xFFFF, OBJ_EVENT_PAL_TAG_SUBMARINE_SHADOW, OBJ_EVENT_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, sOamTables_88x32, sAnimTable_Standard, sPicTable_SubmarineShadow, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_PichuDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_PikachuDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_MarillDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_TogepiDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_TotodileDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_MeowthDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_ClefairyDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_DittoDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SmoochumDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_TreeckoDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_TorchicDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_MudkipDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_DuskullDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_WynautDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_BaltoyDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_KecleonDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_AzurillDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SkittyDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SwabluDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_GulpinDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_LotadDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SeedotDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_PikaCushion, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_RoundCushion, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_KissCushion, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_ZigzagCushion, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SpinCushion, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_DiamondCushion, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_BallCushion, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_GrassCushion, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_FireCushion, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_WaterCushion, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_GameboyKid, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ContestJudge, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanWatering, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayWatering, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating = {0xFFFF, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Inanimate, sPicTable_BrendanDecorating, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Inanimate, sPicTable_MayDecorating, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Archie, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Maxie, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KyogreFront = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_KyogreFront, sAffineAnimTable_KyogreGroudon};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GroudonFront = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_GroudonFront, sAffineAnimTable_KyogreGroudon};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KyogreSide = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_KyogreSide, sAffineAnimTable_KyogreGroudon};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GroudonSide = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_GroudonSide, sPicTable_GroudonSide, sAffineAnimTable_KyogreGroudon};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_Fossil, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Regi, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Regi, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Regi, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Skitty, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Kecleon, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KyogreAsleep = {0xFFFF, OBJ_EVENT_PAL_TAG_KYOGRE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_KyogreFront, sAffineAnimTable_KyogreGroudon};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GroudonAsleep = {0xFFFF, OBJ_EVENT_PAL_TAG_GROUDON, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_GroudonFront, sAffineAnimTable_KyogreGroudon};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Rayquaza, sPicTable_Rayquaza, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Zigzagoon, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Pikachu, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Azumarill, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Wingull, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonBridgeShadow = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Kecleon, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_TuberMSwimming, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Azurill, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Mom, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {0xFFFF, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_MayNormal, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Juan, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Scott, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Inanimate, sPicTable_Statue, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Kirlia, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Dusclops, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red = {0xFFFF, OBJ_EVENT_PAL_TAG_RED_LEAF, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Red, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf = {0xFFFF, OBJ_EVENT_PAL_TAG_RED_LEAF, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Leaf, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Sudowoodo, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Mew, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys = {0xFFFF, OBJ_EVENT_PAL_TAG_DEOXYS, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Deoxys, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone = {0xFFFF, OBJ_EVENT_PAL_TAG_BIRTH_ISLAND_STONE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BirthIslandStone, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Anabel, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Tucker, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Greta, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Spenser, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Noland, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Lucy, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon = {0xFFFF, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Brandon, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan = {0xFFFF, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay = {0xFFFF, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RubySapphireMay, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {0xFFFF, OBJ_EVENT_PAL_TAG_LUGIA, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Lugia, gDummySpriteAffineAnimTable};
-const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {0xFFFF, OBJ_EVENT_PAL_TAG_HO_OH, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_HoOh, sPicTable_HoOh, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanNormal = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanMachBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanAcroBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanSurfing = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Surfing, sPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFieldMove = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_FieldMove, sPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuintyPlump = {TAG_NONE, OBJ_EVENT_PAL_TAG_QUINTY_PLUMP, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_L, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_QuintyPlump, sPicTable_QuintyPlump, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_NinjaBoy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_NinjaBoy, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Twin = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Twin, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy1 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Boy1, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl1 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Girl1, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy2 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Boy2, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl2 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Girl2, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleBoy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_LittleBoy, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LittleGirl = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_LittleGirl, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy3 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Boy3, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Girl3 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Girl3, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RichBoy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RichBoy, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Woman1, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_FatMan, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_PokefanF, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man1 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Man1, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman2 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Woman2, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ExpertM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpertF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ExpertF, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man2 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Man2, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman3 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Woman3, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokefanM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_PokefanM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman4 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Woman4, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cook = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Cook, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkReceptionist = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_LinkReceptionist, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldMan = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_OldMan, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_OldWoman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_OldWoman, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Camper = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Camper, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Picnicker = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Picnicker, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man3 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Man3, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman5 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Woman5, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Youngster = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Youngster, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_BugCatcher, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PsychicM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_PsychicM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SchoolKidM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_SchoolKidM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maniac = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Maniac, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HexManiac = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_HexManiac, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RayquazaStill = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Standard, sPicTable_RayquazaStill, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_SwimmerF, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_BlackBelt, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Beauty = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Beauty, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist1 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Scientist1, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Lass, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Gentleman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Gentleman, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sailor = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Sailor, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisherman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Fisherman, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RunningTriathleteM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RunningTriathleteF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RunningTriathleteF, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_TuberF, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_TuberM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Hiker, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_CyclingTriathleteM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyclingTriathleteF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_CyclingTriathleteF, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Nurse = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Nurse, sPicTable_Nurse, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ItemBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_ItemBall, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, NULL, sAnimTable_BerryTree, sPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_BerryTree, sPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeLateStages = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BerryTree, sPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ProfBirch = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ProfBirch, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man4 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Man4, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man5 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Man5, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ReporterM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ReporterF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ReporterF, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Bard = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hipster = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Trader = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan1, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Storyteller = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Giddy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan1 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMauvilleOldMan2 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MauvilleOldMan2, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedNatuDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedNatuDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedMagnemiteDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedMagnemiteDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedSquirtleDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedSquirtleDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedWooperDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedWooperDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPikachuDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedPikachuDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnusedPorygon2Doll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_UnusedPorygon2Doll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CuttableTree = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_CuttableTree, sPicTable_CuttableTree, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MartEmployee = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MartEmployee, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RooftopSaleWoman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RooftopSaleWoman, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Teala = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Teala, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BreakableRock = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_BreakableRock, sPicTable_BreakableRock, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PushableBoulder = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_PushableBoulder, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MrBrineysBoat = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MrBrineysBoat, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayNormal = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 16, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_MayNormal, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayMachBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayMachBike, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayAcroBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MaySurfing = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Surfing, sPicTable_MaySurfing, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFieldMove = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_FieldMove, sPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Truck = {TAG_NONE, OBJ_EVENT_PAL_TAG_TRUCK, OBJ_EVENT_PAL_TAG_NONE, 1152, 48, 48, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_48x48, sAnimTable_Inanimate, sPicTable_Truck, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothCarryingBox = {TAG_NONE, OBJ_EVENT_PAL_TAG_VIGOROTH, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_VigorothCarryingBox, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_VigorothFacingAway = {TAG_NONE, OBJ_EVENT_PAL_TAG_VIGOROTH, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_VigorothFacingAway, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirchsBag = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_BirchsBag, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_EnemyZigzagoon = {TAG_NONE, OBJ_EVENT_PAL_TAG_ZIGZAGOON, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_EnemyZigzagoon, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Poochyena = {TAG_NONE, OBJ_EVENT_PAL_TAG_POOCHYENA, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Poochyena, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Artist = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Artist, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanNormal = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanMachBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanMachBike, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanAcroBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_BrendanAcroBike, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanSurfing = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Surfing, sPicTable_BrendanSurfing, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalBrendanFieldMove = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_FieldMove, sPicTable_BrendanFieldMove, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayNormal = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_MayNormal, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayMachBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayMachBike, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayAcroBike = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_BIKE_TIRE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_AcroBike, sPicTable_MayAcroBike, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMaySurfing = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Surfing, sPicTable_MaySurfing, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RivalMayFieldMove = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_FieldMove, sPicTable_MayFieldMove, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Cameraman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Cameraman, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanUnderwater = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_UNDERWATER, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanUnderwater, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayUnderwater = {TAG_NONE, OBJ_EVENT_PAL_TAG_PLAYER_UNDERWATER, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayUnderwater, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MovingBox = {TAG_NONE, OBJ_EVENT_PAL_TAG_MOVING_BOX, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 10, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_MovingBox, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CableCar = {TAG_NONE, OBJ_EVENT_PAL_TAG_CABLE_CAR, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Inanimate, sPicTable_CableCar, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist2 = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Scientist2, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DevonEmployee = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_DevonEmployee, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_AquaMemberM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AquaMemberF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_AquaMemberF, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberM = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MagmaMemberM, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MagmaMemberF = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MagmaMemberF, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sidney = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Sidney, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Phoebe = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Phoebe, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Glacia = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Glacia, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Drake = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Drake, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Roxanne = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Roxanne, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brawly = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Brawly, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wattson = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Wattson, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Flannery = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Flannery, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Norman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Norman, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Winona = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Winona, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Liza = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Liza, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tate = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Tate, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wallace = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Wallace, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Steven = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Steven, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wally = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Wally, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireLittleBoy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_RubySapphireLittleBoy, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanFishing = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Fishing, sPicTable_BrendanFishing, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayFishing = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Fishing, sPicTable_MayFishing, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HotSpringsOldWoman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_HotSpringsOldWoman, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SSTidal = {TAG_NONE, OBJ_EVENT_PAL_TAG_SSTIDAL, OBJ_EVENT_PAL_TAG_NONE, 1920, 96, 40, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, sOamTables_96x40, sAnimTable_Standard, sPicTable_SSTidal, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SubmarineShadow = {TAG_NONE, OBJ_EVENT_PAL_TAG_SUBMARINE_SHADOW, OBJ_EVENT_PAL_TAG_NONE, 1408, 88, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_8x8, sOamTables_88x32, sAnimTable_Standard, sPicTable_SubmarineShadow, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PichuDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_PichuDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikachuDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_PikachuDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MarillDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_MarillDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TogepiDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_TogepiDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CyndaquilDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_CyndaquilDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ChikoritaDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_ChikoritaDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TotodileDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_TotodileDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_JigglypuffDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_JigglypuffDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MeowthDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_MeowthDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ClefairyDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_ClefairyDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DittoDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_DittoDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SmoochumDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SmoochumDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TreeckoDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_TreeckoDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TorchicDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_TorchicDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MudkipDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_MudkipDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskullDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_DuskullDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WynautDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_WynautDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BaltoyDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_BaltoyDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_KecleonDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_AzurillDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_AzurillDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SkittyDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SkittyDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwabluDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SwabluDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GulpinDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_GulpinDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LotadDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_LotadDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SeedotDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SeedotDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PikaCushion = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_PikaCushion, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RoundCushion = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_RoundCushion, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KissCushion = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_KissCushion, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ZigzagCushion = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_ZigzagCushion, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SpinCushion = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SpinCushion, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DiamondCushion = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 5, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_DiamondCushion, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BallCushion = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_BallCushion, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GrassCushion = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_GrassCushion, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FireCushion = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_FireCushion, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WaterCushion = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_WaterCushion, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigSnorlaxDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigSnorlaxDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRhydonDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigRhydonDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigLaprasDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigLaprasDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigVenusaurDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigVenusaurDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigCharizardDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigCharizardDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigBlastoiseDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigBlastoiseDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigWailmerDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigWailmerDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegirockDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigRegirockDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegiceDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigRegiceDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BigRegisteelDoll = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BigRegisteelDoll, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latias = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Latios = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_LatiasLatios, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GameboyKid = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_GameboyKid, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ContestJudge = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_ContestJudge, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanWatering = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_BrendanWatering, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayWatering = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 512, 32, 32, 0, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_MayWatering, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BrendanDecorating = {TAG_NONE, OBJ_EVENT_PAL_TAG_BRENDAN, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Inanimate, sPicTable_BrendanDecorating, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MayDecorating = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Inanimate, sPicTable_MayDecorating, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Archie = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Archie, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Maxie = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Maxie, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KyogreFront = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_KyogreFront, sAffineAnimTable_KyogreGroudon};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GroudonFront = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_GroudonFront, sAffineAnimTable_KyogreGroudon};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KyogreSide = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_KyogreSide, sAffineAnimTable_KyogreGroudon};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GroudonSide = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_GroudonSide, sPicTable_GroudonSide, sAffineAnimTable_KyogreGroudon};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fossil = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_Fossil, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regirock = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 3, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Regi, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Regice = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Regi, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Registeel = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Regi, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Skitty = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Skitty, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kecleon = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Kecleon, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KyogreAsleep = {TAG_NONE, OBJ_EVENT_PAL_TAG_KYOGRE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_KyogreFront, sAffineAnimTable_KyogreGroudon};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GroudonAsleep = {TAG_NONE, OBJ_EVENT_PAL_TAG_GROUDON, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_GroudonFront, sAffineAnimTable_KyogreGroudon};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rayquaza = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 2048, 64, 64, 4, SHADOW_SIZE_M, FALSE, TRUE, TRACKS_FOOT, &gObjectEventBaseOam_64x64, sOamTables_64x64, sAnimTable_Rayquaza, sPicTable_Rayquaza, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Zigzagoon = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Zigzagoon, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Pikachu = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Pikachu, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azumarill = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Azumarill, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Wingull = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Wingull, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_KecleonBridgeShadow = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 128, 16, 16, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Kecleon, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TuberMSwimming = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_2, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 3, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_TuberMSwimming, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Azurill = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Standard, sPicTable_Azurill, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mom = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Mom, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkBrendan = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_BrendanNormal, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LinkMay = {TAG_NONE, OBJ_EVENT_PAL_TAG_MAY, OBJ_EVENT_PAL_TAG_BRIDGE_REFLECTION, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_BrendanMayNormal, sPicTable_MayNormal, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Juan = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Juan, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scott = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Scott, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MysteryEventDeliveryman = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_MysteryEventDeliveryman, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Statue = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Inanimate, sPicTable_Statue, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Kirlia = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_S, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Kirlia, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Dusclops = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Dusclops, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_UnionRoomAttendant = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_UnionRoomAttendant, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Red = {TAG_NONE, OBJ_EVENT_PAL_TAG_RED_LEAF, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Red, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Leaf = {TAG_NONE, OBJ_EVENT_PAL_TAG_RED_LEAF, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Leaf, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Sudowoodo = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Sudowoodo, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Mew = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Mew, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Deoxys = {TAG_NONE, OBJ_EVENT_PAL_TAG_DEOXYS, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Deoxys, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BirthIslandStone = {TAG_NONE, OBJ_EVENT_PAL_TAG_BIRTH_ISLAND_STONE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, TRUE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Inanimate, sPicTable_BirthIslandStone, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Anabel = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Anabel, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Tucker = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Tucker, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Greta = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Greta, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Spenser = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 2, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Spenser, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Noland = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Noland, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lucy = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_4, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 5, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Lucy, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Brandon = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_3, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 4, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_Brandon, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireBrendan = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_BRENDAN, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RubySapphireBrendan, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RubySapphireMay = {TAG_NONE, OBJ_EVENT_PAL_TAG_RS_MAY, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_16x32, sOamTables_16x32, sAnimTable_Standard, sPicTable_RubySapphireMay, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lugia = {TAG_NONE, OBJ_EVENT_PAL_TAG_LUGIA, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_Standard, sPicTable_Lugia, gDummySpriteAffineAnimTable};
+const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HoOh = {TAG_NONE, OBJ_EVENT_PAL_TAG_HO_OH, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 10, SHADOW_SIZE_M, FALSE, FALSE, TRACKS_FOOT, &gObjectEventBaseOam_32x32, sOamTables_32x32, sAnimTable_HoOh, sPicTable_HoOh, gDummySpriteAffineAnimTable};
diff --git a/src/data/object_events/object_event_subsprites.h b/src/data/object_events/object_event_subsprites.h
index 0d55c2df2..b508509ca 100755
--- a/src/data/object_events/object_event_subsprites.h
+++ b/src/data/object_events/object_event_subsprites.h
@@ -1,78 +1,78 @@
 static const struct Subsprite sOamTable_16x16_0[] = {
-    { 
-        .x = -8,  
-        .y = -8, 
-        .shape = SPRITE_SHAPE(16x16), 
-        .size = SPRITE_SIZE(16x16), 
-        .tileOffset = 0, 
+    {
+        .x = -8,
+        .y = -8,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 0,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_16x16_1[] = {
-    { 
-        .x = -8,  
-        .y = -8, 
-        .shape = SPRITE_SHAPE(16x16), 
+    {
+        .x = -8,
+        .y = -8,
+        .shape = SPRITE_SHAPE(16x16),
         .size = SPRITE_SIZE(16x16),
-        .tileOffset = 0, 
+        .tileOffset = 0,
         .priority = 1
     }
 };
 
 static const struct Subsprite sOamTable_16x16_2[] = {
-    { 
-        .x = -8,  
-        .y = -8, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 0, 
-        .priority = 2
-    },
-    { 
-        .x = -8,  
-        .y =  0, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 2, 
+    {
+        .x = -8,
+        .y = -8,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 0,
+        .priority = 2
+    },
+    {
+        .x = -8,
+        .y =  0,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 2,
         .priority = 3
     }
 };
 
 static const struct Subsprite sOamTable_16x16_3[] = {
-    { 
-        .x = -8,  
-        .y = -8, 
-        .shape = SPRITE_SHAPE(16x16), 
-        .size = SPRITE_SIZE(16x16), 
-        .tileOffset = 0, 
-        .priority = 2
-    },
-    { 
-        .x = -8,  
-        .y = -8, 
-        .shape = SPRITE_SHAPE(16x16), 
-        .size = SPRITE_SIZE(16x16), 
-        .tileOffset = 0, 
+    {
+        .x = -8,
+        .y = -8,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 0,
+        .priority = 2
+    },
+    {
+        .x = -8,
+        .y = -8,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 0,
         .priority = 3
     }
 };
 
 static const struct Subsprite sOamTable_16x16_4[] = {
-    { 
-        .x = -8,  
-        .y = -8, 
-        .shape = SPRITE_SHAPE(16x16), 
-        .size = SPRITE_SIZE(16x16), 
-        .tileOffset = 0, 
+    {
+        .x = -8,
+        .y = -8,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 0,
         .priority = 1
     },
-    { 
-        .x = -8,  
-        .y = -8, 
-        .shape = SPRITE_SHAPE(16x16), 
-        .size = SPRITE_SIZE(16x16), 
-        .tileOffset = 0, 
+    {
+        .x = -8,
+        .y = -8,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 0,
         .priority = 3
     }
 };
@@ -87,88 +87,88 @@ static const struct SubspriteTable sOamTables_16x16[] = {
 };
 
 static const struct Subsprite sOamTable_16x32_0[] = {
-    { 
-        .x = -8, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(16x32), 
-        .size = SPRITE_SIZE(16x32), 
-        .tileOffset = 0, 
+    {
+        .x = -8,
+        .y = -16,
+        .shape = SPRITE_SHAPE(16x32),
+        .size = SPRITE_SIZE(16x32),
+        .tileOffset = 0,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_16x32_1[] = {
-    { 
-        .x = -8, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(16x32), 
+    {
+        .x = -8,
+        .y = -16,
+        .shape = SPRITE_SHAPE(16x32),
         .size = SPRITE_SIZE(16x32),
-        .tileOffset = 0, 
+        .tileOffset = 0,
         .priority = 1
     }
 };
 
 static const struct Subsprite sOamTable_16x32_2[] = {
-    { 
-        .x = -8, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(16x16), 
-        .size = SPRITE_SIZE(16x16), 
-        .tileOffset = 0, 
-        .priority = 2
-    },
-    { 
-        .x = -8, 
-        .y =   0, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 4, 
-        .priority = 2
-    },
-    { 
-        .x = -8, 
-        .y =   8, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 6, 
+    {
+        .x = -8,
+        .y = -16,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 0,
+        .priority = 2
+    },
+    {
+        .x = -8,
+        .y =   0,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 4,
+        .priority = 2
+    },
+    {
+        .x = -8,
+        .y =   8,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 6,
         .priority = 3
     }
 };
 
 static const struct Subsprite sOamTable_16x32_3[] = {
-    { 
-        .x = -8, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(16x16), 
-        .size = SPRITE_SIZE(16x16), 
-        .tileOffset = 0, 
-        .priority = 2
-    },
-    { 
-        .x = -8, 
-        .y =   0, 
-        .shape = SPRITE_SHAPE(16x16), 
-        .size = SPRITE_SIZE(16x16), 
-        .tileOffset = 4, 
+    {
+        .x = -8,
+        .y = -16,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 0,
+        .priority = 2
+    },
+    {
+        .x = -8,
+        .y =   0,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 4,
         .priority = 3
     }
 };
 
 static const struct Subsprite sOamTable_16x32_4[] = {
-    { 
-        .x = -8, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(16x16), 
-        .size = SPRITE_SIZE(16x16), 
-        .tileOffset = 0, 
+    {
+        .x = -8,
+        .y = -16,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 0,
         .priority = 1
     },
-    { 
-        .x = -8, 
-        .y =   0, 
-        .shape = SPRITE_SHAPE(16x16), 
-        .size = SPRITE_SIZE(16x16), 
-        .tileOffset = 4, 
+    {
+        .x = -8,
+        .y =   0,
+        .shape = SPRITE_SHAPE(16x16),
+        .size = SPRITE_SIZE(16x16),
+        .tileOffset = 4,
         .priority = 3
     }
 };
@@ -184,87 +184,87 @@ static const struct SubspriteTable sOamTables_16x32[] = {
 
 static const struct Subsprite sOamTable_32x32_0[] = {
     {
-        .x = -16, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(32x32), 
-        .size = SPRITE_SIZE(32x32), 
-        .tileOffset = 0, 
+        .x = -16,
+        .y = -16,
+        .shape = SPRITE_SHAPE(32x32),
+        .size = SPRITE_SIZE(32x32),
+        .tileOffset = 0,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_32x32_1[] = {
     {
-        .x = -16, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(32x32), 
+        .x = -16,
+        .y = -16,
+        .shape = SPRITE_SHAPE(32x32),
         .size = SPRITE_SIZE(32x32),
-        .tileOffset = 0, 
+        .tileOffset = 0,
         .priority = 1
     }
 };
 
 static const struct Subsprite sOamTable_32x32_2[] = {
     {
-        .x = -16, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(32x16), 
-        .size = SPRITE_SIZE(32x16), 
-        .tileOffset = 0, 
+        .x = -16,
+        .y = -16,
+        .shape = SPRITE_SHAPE(32x16),
+        .size = SPRITE_SIZE(32x16),
+        .tileOffset = 0,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =   0, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 8, 
+        .x = -16,
+        .y =   0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 8,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =   8, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 12, 
+        .x = -16,
+        .y =   8,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 12,
         .priority = 3
     }
 };
 
 static const struct Subsprite sOamTable_32x32_3[] = {
     {
-        .x = -16, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(32x16), 
-        .size = SPRITE_SIZE(32x16), 
-        .tileOffset = 0, 
+        .x = -16,
+        .y = -16,
+        .shape = SPRITE_SHAPE(32x16),
+        .size = SPRITE_SIZE(32x16),
+        .tileOffset = 0,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =   0, 
-        .shape = SPRITE_SHAPE(32x16), 
+        .x = -16,
+        .y =   0,
+        .shape = SPRITE_SHAPE(32x16),
         .size = SPRITE_SIZE(32x16),
-        .tileOffset = 8, 
+        .tileOffset = 8,
         .priority = 3
     }
 };
 
 static const struct Subsprite sOamTable_32x32_4[] = {
     {
-        .x = -16, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(32x16), 
+        .x = -16,
+        .y = -16,
+        .shape = SPRITE_SHAPE(32x16),
         .size = SPRITE_SIZE(32x16),
-        .tileOffset = 0, 
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y =   0, 
-        .shape = SPRITE_SHAPE(32x16), 
+        .x = -16,
+        .y =   0,
+        .shape = SPRITE_SHAPE(32x16),
         .size = SPRITE_SIZE(32x16),
-        .tileOffset = 8, 
+        .tileOffset = 8,
         .priority = 3
     }
 };
@@ -280,99 +280,99 @@ static const struct SubspriteTable sOamTables_32x32[] = {
 
 static const struct Subsprite sOamTable_48x48[] = {
     {
-        .x = -24, 
-        .y = -24, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 0, 
+        .x = -24,
+        .y = -24,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 2
     },
     {
-        .x =   8, 
-        .y = -24, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 4, 
+        .x =   8,
+        .y = -24,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 4,
         .priority = 2
     },
     {
-        .x = -24, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 6, 
+        .x = -24,
+        .y = -16,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 6,
         .priority = 2
     },
     {
-        .x =   8, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 10, 
+        .x =   8,
+        .y = -16,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 10,
         .priority = 2
     },
     {
-        .x = -24, 
-        .y =  -8, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 12, 
+        .x = -24,
+        .y =  -8,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 12,
         .priority = 2
     },
     {
-        .x =   8, 
-        .y =  -8, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 16, 
+        .x =   8,
+        .y =  -8,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 16,
         .priority = 2
     },
     {
-        .x = -24, 
-        .y =   0, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 18, 
+        .x = -24,
+        .y =   0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 18,
         .priority = 2
     },
     {
-        .x =   8, 
-        .y =   0, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 22, 
+        .x =   8,
+        .y =   0,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 22,
         .priority = 2
     },
     {
-        .x = -24, 
-        .y =   8, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 24, 
+        .x = -24,
+        .y =   8,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 24,
         .priority = 2
     },
     {
-        .x =   8, 
-        .y =   8, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 28, 
+        .x =   8,
+        .y =   8,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 28,
         .priority = 2
     },
     {
-        .x = -24, 
-        .y =  16, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 30, 
+        .x = -24,
+        .y =  16,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 30,
         .priority = 2
     },
     {
-        .x =   8, 
-        .y =  16, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 34, 
+        .x =   8,
+        .y =  16,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 34,
         .priority = 2
     }
 };
@@ -388,44 +388,44 @@ static const struct SubspriteTable sOamTables_48x48[] = {
 
 static const struct Subsprite sOamTable_64x32_0[] = {
     {
-        .x = -32, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(64x32), 
-        .size = SPRITE_SIZE(64x32), 
-        .tileOffset = 0, 
+        .x = -32,
+        .y = -16,
+        .shape = SPRITE_SHAPE(64x32),
+        .size = SPRITE_SIZE(64x32),
+        .tileOffset = 0,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_64x32_1[] = {
     {
-        .x = -32, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(64x32), 
-        .size = SPRITE_SIZE(64x32), 
-        .tileOffset = 0, 
+        .x = -32,
+        .y = -16,
+        .shape = SPRITE_SHAPE(64x32),
+        .size = SPRITE_SIZE(64x32),
+        .tileOffset = 0,
         .priority = 1
     }
 };
 
 static const struct Subsprite sOamTable_64x32_2[] = {
     {
-        .x = -32, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(64x32), 
-        .size = SPRITE_SIZE(64x32), 
-        .tileOffset = 0, 
+        .x = -32,
+        .y = -16,
+        .shape = SPRITE_SHAPE(64x32),
+        .size = SPRITE_SIZE(64x32),
+        .tileOffset = 0,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_64x32_3[] = {
     {
-        .x = -32, 
-        .y = -16, 
-        .shape = SPRITE_SHAPE(64x32), 
-        .size = SPRITE_SIZE(64x32), 
-        .tileOffset = 0, 
+        .x = -32,
+        .y = -16,
+        .shape = SPRITE_SHAPE(64x32),
+        .size = SPRITE_SIZE(64x32),
+        .tileOffset = 0,
         .priority = 2
     }
 };
@@ -442,44 +442,44 @@ static const struct SubspriteTable sOamTables_64x32[] = {
 
 static const struct Subsprite sOamTable_64x64_0[] = {
     {
-        .x = -32, 
-        .y = -32, 
-        .shape = SPRITE_SHAPE(64x64), 
-        .size = SPRITE_SIZE(64x64), 
-        .tileOffset = 0, 
+        .x = -32,
+        .y = -32,
+        .shape = SPRITE_SHAPE(64x64),
+        .size = SPRITE_SIZE(64x64),
+        .tileOffset = 0,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_64x64_1[] = {
     {
-        .x = -32, 
-        .y = -32, 
-        .shape = SPRITE_SHAPE(64x64), 
-        .size = SPRITE_SIZE(64x64), 
-        .tileOffset = 0, 
+        .x = -32,
+        .y = -32,
+        .shape = SPRITE_SHAPE(64x64),
+        .size = SPRITE_SIZE(64x64),
+        .tileOffset = 0,
         .priority = 1
     }
 };
 
 static const struct Subsprite sOamTable_64x64_2[] = {
     {
-        .x = -32, 
-        .y = -32, 
-        .shape = SPRITE_SHAPE(64x64), 
-        .size = SPRITE_SIZE(64x64), 
-        .tileOffset = 0, 
+        .x = -32,
+        .y = -32,
+        .shape = SPRITE_SHAPE(64x64),
+        .size = SPRITE_SIZE(64x64),
+        .tileOffset = 0,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_64x64_3[] = {
     {
-        .x = -32, 
-        .y = -32, 
-        .shape = SPRITE_SHAPE(64x64), 
-        .size = SPRITE_SIZE(64x64), 
-        .tileOffset = 0, 
+        .x = -32,
+        .y = -32,
+        .shape = SPRITE_SHAPE(64x64),
+        .size = SPRITE_SIZE(64x64),
+        .tileOffset = 0,
         .priority = 2
     }
 };
@@ -495,492 +495,492 @@ static const struct SubspriteTable sOamTables_64x64[] = {
 
 static const struct Subsprite sOamTable_96x40_0[] = {
     {
-        .x = -48, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 0, 
+        .x = -48,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 4, 
+        .x = -16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 8, 
+        .x =  16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 8,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 12, 
+        .x = -48,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 12,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 16, 
+        .x = -16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 16,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 20, 
+        .x =  16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 20,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 24, 
+        .x = -48,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 24,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 28, 
+        .x = -16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 28,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 32, 
+        .x =  16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 32,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 36, 
+        .x = -48,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 36,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 40, 
+        .x = -16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 40,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 44, 
+        .x =  16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 44,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 48, 
+        .x = -48,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 48,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 52, 
+        .x = -16,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 52,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 56, 
+        .x =  16,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 56,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_96x40_1[] = {
     {
-        .x = -48, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 0, 
+        .x = -48,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 4, 
+        .x = -16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 8, 
+        .x =  16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 8,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 12, 
+        .x = -48,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 12,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 16, 
+        .x = -16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 16,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 20, 
+        .x =  16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 20,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 24, 
+        .x = -48,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 24,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 28, 
+        .x = -16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 28,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 32, 
+        .x =  16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 32,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 36, 
+        .x = -48,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 36,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 40, 
+        .x = -16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 40,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 44, 
+        .x =  16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 44,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 48, 
+        .x = -48,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 48,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 52, 
+        .x = -16,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 52,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 56, 
+        .x =  16,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 56,
         .priority = 1
     }
 };
 
 static const struct Subsprite sOamTable_96x40_2[] = {
     {
-        .x = -48, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 0, 
+        .x = -48,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 4, 
+        .x = -16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 8, 
+        .x =  16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 8,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 12, 
+        .x = -48,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 12,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 16, 
+        .x = -16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 16,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 20, 
+        .x =  16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 20,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 24, 
+        .x = -48,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 24,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 28, 
+        .x = -16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 28,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 32, 
+        .x =  16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 32,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 36, 
+        .x = -48,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 36,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 40, 
+        .x = -16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 40,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 44, 
+        .x =  16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 44,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 48, 
+        .x = -48,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 48,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 52, 
+        .x = -16,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 52,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 56, 
+        .x =  16,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 56,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_96x40_3[] = {
     {
-        .x = -48, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 0, 
+        .x = -48,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 4, 
+        .x = -16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 8, 
+        .x =  16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 8,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 12, 
+        .x = -48,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 12,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 16, 
+        .x = -16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 16,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 20, 
+        .x =  16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 20,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 24, 
+        .x = -48,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 24,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 28, 
+        .x = -16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 28,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 32, 
+        .x =  16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 32,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 36, 
+        .x = -48,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 36,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 40, 
+        .x = -16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 40,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 44, 
+        .x =  16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 44,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 48, 
+        .x = -48,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 48,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 52, 
+        .x = -16,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 52,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =  12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 56, 
+        .x =  16,
+        .y =  12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 56,
         .priority = 2
     }
 };
@@ -997,524 +997,524 @@ static const struct SubspriteTable sOamTables_96x40[] = {
 
 static const struct Subsprite sOamTable_88x32_0[] = {
     {
-        .x = -48, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 0, 
+        .x = -48,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 4, 
+        .x = -16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 8, 
+        .x =  16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 8,
         .priority = 2
     },
     {
-        .x =  32, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 10, 
+        .x =  32,
+        .y = -20,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 10,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 11, 
+        .x = -48,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 11,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 15, 
+        .x = -16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 15,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 19, 
+        .x =  16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 19,
         .priority = 2
     },
     {
-        .x =  32, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 21, 
+        .x =  32,
+        .y = -12,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 21,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 22, 
+        .x = -48,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 22,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 26, 
+        .x = -16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 26,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 30, 
+        .x =  16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 30,
         .priority = 2
     },
     {
-        .x =  32, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 32, 
+        .x =  32,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 32,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 33, 
+        .x = -48,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 33,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 37, 
+        .x = -16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 37,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 41, 
+        .x =  16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 41,
         .priority = 2
     },
     {
-        .x =  32, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 43, 
+        .x =  32,
+        .y =   4,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 43,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_88x32_1[] = {
     {
-        .x = -48, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 0, 
+        .x = -48,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 4, 
+        .x = -16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 8, 
+        .x =  16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 8,
         .priority = 1
     },
     {
-        .x =  32, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 10, 
+        .x =  32,
+        .y = -20,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 10,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 11, 
+        .x = -48,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 11,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 15, 
+        .x = -16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 15,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 19, 
+        .x =  16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 19,
         .priority = 1
     },
     {
-        .x =  32, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 21, 
+        .x =  32,
+        .y = -12,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 21,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 22, 
+        .x = -48,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 22,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 26, 
+        .x = -16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 26,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 30, 
+        .x =  16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 30,
         .priority = 1
     },
     {
-        .x =  32, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 32, 
+        .x =  32,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 32,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 33, 
+        .x = -48,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 33,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 37, 
+        .x = -16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 37,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 41, 
+        .x =  16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 41,
         .priority = 1
     },
     {
-        .x =  32, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 43, 
+        .x =  32,
+        .y =   4,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 43,
         .priority = 1
     }
 };
 
 static const struct Subsprite sOamTable_88x32_2[] = {
     {
-        .x = -48, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 0, 
+        .x = -48,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 4, 
+        .x = -16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 8, 
+        .x =  16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 8,
         .priority = 2
     },
     {
-        .x =  32, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 10, 
+        .x =  32,
+        .y = -20,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 10,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 11, 
+        .x = -48,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 11,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 15, 
+        .x = -16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 15,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 19, 
+        .x =  16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 19,
         .priority = 2
     },
     {
-        .x =  32, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 21, 
+        .x =  32,
+        .y = -12,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 21,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 22, 
+        .x = -48,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 22,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 26, 
+        .x = -16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 26,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 30, 
+        .x =  16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 30,
         .priority = 2
     },
     {
-        .x =  32, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 32, 
+        .x =  32,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 32,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 33, 
+        .x = -48,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 33,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 37, 
+        .x = -16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 37,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 41, 
+        .x =  16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 41,
         .priority = 2
     },
     {
-        .x =  32, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 43, 
+        .x =  32,
+        .y =   4,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 43,
         .priority = 2
     }
 };
 
 static const struct Subsprite sOamTable_88x32_3[] = {
     {
-        .x = -48, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 0, 
+        .x = -48,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 4, 
+        .x = -16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 4,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 8, 
+        .x =  16,
+        .y = -20,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 8,
         .priority = 1
     },
     {
-        .x =  32, 
-        .y = -20, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 10, 
+        .x =  32,
+        .y = -20,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 10,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 11, 
+        .x = -48,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 11,
         .priority = 1
     },
     {
-        .x = -16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 15, 
+        .x = -16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 15,
         .priority = 1
     },
     {
-        .x =  16, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 19, 
+        .x =  16,
+        .y = -12,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 19,
         .priority = 1
     },
     {
-        .x =  32, 
-        .y = -12, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 21, 
+        .x =  32,
+        .y = -12,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 21,
         .priority = 1
     },
     {
-        .x = -48, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 22, 
+        .x = -48,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 22,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 26, 
+        .x = -16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 26,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 30, 
+        .x =  16,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 30,
         .priority = 2
     },
     {
-        .x =  32, 
-        .y =  -4, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 32, 
+        .x =  32,
+        .y =  -4,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 32,
         .priority = 2
     },
     {
-        .x = -48, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 33, 
+        .x = -48,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 33,
         .priority = 2
     },
     {
-        .x = -16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(32x8), 
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 37, 
+        .x = -16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 37,
         .priority = 2
     },
     {
-        .x =  16, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(16x8), 
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 41, 
+        .x =  16,
+        .y =   4,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 41,
         .priority = 2
     },
     {
-        .x =  32, 
-        .y =   4, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 43, 
+        .x =  32,
+        .y =   4,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 43,
         .priority = 2
     }
 };
diff --git a/src/data/party_menu.h b/src/data/party_menu.h
index 570ef738e..f3a8a50ec 100644
--- a/src/data/party_menu.h
+++ b/src/data/party_menu.h
@@ -37,9 +37,9 @@ enum
 
 static const struct PartyMenuBoxInfoRects sPartyBoxInfoRects[] =
 {
-    [PARTY_BOX_LEFT_COLUMN] = 
+    [PARTY_BOX_LEFT_COLUMN] =
     {
-        BlitBitmapToPartyWindow_LeftColumn, 
+        BlitBitmapToPartyWindow_LeftColumn,
         {
             //The below are the x, y, width, and height for each of the following info
             24, 11, 40, 13, // Nickname
@@ -48,12 +48,12 @@ static const struct PartyMenuBoxInfoRects sPartyBoxInfoRects[] =
             38, 37, 24,  8, // HP
             53, 37, 24,  8, // Max HP
             24, 35, 48,  3  // HP bar
-        }, 
+        },
         12, 34, 64, 16      // Description text (e.g. NO USE)
     },
-    [PARTY_BOX_RIGHT_COLUMN] = 
+    [PARTY_BOX_RIGHT_COLUMN] =
     {
-        BlitBitmapToPartyWindow_RightColumn, 
+        BlitBitmapToPartyWindow_RightColumn,
         {
              // See above comment
              22,  3, 40, 13, // Nickname
@@ -62,7 +62,7 @@ static const struct PartyMenuBoxInfoRects sPartyBoxInfoRects[] =
             102, 12, 24,  8, // HP
             117, 12, 24,  8, // Max HP
              88, 10, 48,  3  // HP bar
-        }, 
+        },
         77, 4, 64, 16        // Description text
     },
 };
@@ -73,7 +73,7 @@ static const struct PartyMenuBoxInfoRects sPartyBoxInfoRects[] =
 // Pokemon icon (x, y), held item (x, y), status condition (x, y), menu pokeball (x, y)
 static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] =
 {
-    [PARTY_LAYOUT_SINGLE] = 
+    [PARTY_LAYOUT_SINGLE] =
     {
         { 16,  40,  20,  50,  50,  52,  16,  34},
         {104,  18, 108,  28, 136,  27, 102,  25},
@@ -82,7 +82,7 @@ static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] =
         {104,  90, 108, 100, 136,  99, 102,  97},
         {104, 114, 108, 124, 136, 123, 102, 121},
     },
-    [PARTY_LAYOUT_DOUBLE] = 
+    [PARTY_LAYOUT_DOUBLE] =
     {
         {16, 24, 20, 34, 50, 36, 16, 18},
         {16, 80, 20, 90, 50, 92, 16, 74},
@@ -91,7 +91,7 @@ static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] =
         {104, 82, 108, 92, 136, 91, 102, 89},
         {104, 114, 108, 124, 136, 123, 102, 121},
     },
-    [PARTY_LAYOUT_MULTI] = 
+    [PARTY_LAYOUT_MULTI] =
     {
         {16, 24, 20, 34, 50, 36, 16, 18},
         {16, 80, 20, 90, 50, 92, 16, 74},
@@ -100,7 +100,7 @@ static const u8 sPartyMenuSpriteCoords[PARTY_LAYOUT_COUNT][PARTY_SIZE][4 * 2] =
         {104, 82, 106, 92, 136, 91, 102, 89},
         {104, 106, 106, 116, 136, 115, 102, 113},
     },
-    [PARTY_LAYOUT_MULTI_SHOWCASE] = 
+    [PARTY_LAYOUT_MULTI_SHOWCASE] =
     {
         {16, 32, 20, 42, 50, 44, 16, 26},
         {104, 34, 106, 44, 136, 43, 102, 41},
@@ -1171,14 +1171,14 @@ static const struct SpriteTemplate sSpriteTemplate_StatusIcons =
 // Mask for the partners party in a multi battle. TRUE if in the partners party, FALSE otherwise
 // The 7th slot is Cancel, and the 8th slot is unreachable
 // Used only to determine whether or not to show the Deoxys form icon sprite
-static const bool8 sMultiBattlePartnersPartyMask[PARTY_SIZE + 2] = 
-{
-    FALSE, 
-    TRUE, 
-    FALSE, 
-    FALSE, 
-    TRUE, 
-    TRUE, 
+static const bool8 sMultiBattlePartnersPartyMask[PARTY_SIZE + 2] =
+{
+    FALSE,
+    TRUE,
+    FALSE,
+    FALSE,
+    TRUE,
+    TRUE,
     FALSE
 };
 
diff --git a/src/data/region_map/city_map_entries.h b/src/data/region_map/city_map_entries.h
index d5478c7b4..8ff453059 100644
--- a/src/data/region_map/city_map_entries.h
+++ b/src/data/region_map/city_map_entries.h
@@ -1,4 +1,4 @@
-static const struct CityMapEntry sPokenavCityMaps[NUM_CITY_MAPS] = 
+static const struct CityMapEntry sPokenavCityMaps[NUM_CITY_MAPS] =
 {
     {
         .mapSecId = MAPSEC_LITTLEROOT_TOWN,
diff --git a/src/data/script_menu.h b/src/data/script_menu.h
index 3880c3c0c..79355748c 100644
--- a/src/data/script_menu.h
+++ b/src/data/script_menu.h
@@ -110,35 +110,35 @@ static const struct MenuAction MultichoiceList_Mechadoll1_Q1[] =
     {gTrickHouse_Mechadoll_Taillow},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll1_Q2[] = 
+static const struct MenuAction MultichoiceList_Mechadoll1_Q2[] =
 {
     {gTrickHouse_Mechadoll_Azurill},
     {gTrickHouse_Mechadoll_Lotad},
     {gTrickHouse_Mechadoll_Wingull},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll1_Q3[] = 
+static const struct MenuAction MultichoiceList_Mechadoll1_Q3[] =
 {
     {gTrickHouse_Mechadoll_Dustox},
     {gTrickHouse_Mechadoll_Zubat},
     {gTrickHouse_Mechadoll_Nincada},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll2_Q1[] = 
+static const struct MenuAction MultichoiceList_Mechadoll2_Q1[] =
 {
     {gTrickHouse_Mechadoll_Ralts},
     {gTrickHouse_Mechadoll_Zigzagoon},
     {gTrickHouse_Mechadoll_Slakoth},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll2_Q2[] = 
+static const struct MenuAction MultichoiceList_Mechadoll2_Q2[] =
 {
     {gTrickHouse_Mechadoll_Poochyena2},
     {gTrickHouse_Mechadoll_Shroomish},
     {gTrickHouse_Mechadoll_Zigzagoon2},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll2_Q3[] = 
+static const struct MenuAction MultichoiceList_Mechadoll2_Q3[] =
 {
     {gTrickHouse_Mechadoll_Poochyena3},
     {gTrickHouse_Mechadoll_Zubat2},
@@ -152,56 +152,56 @@ static const struct MenuAction MultichoiceList_Mechadoll3_Q1[] =
     {gTrickHouse_Mechadoll_SamePrice},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll3_Q2[] = 
+static const struct MenuAction MultichoiceList_Mechadoll3_Q2[] =
 {
     {gTrickHouse_Mechadoll_60Yen},
     {gTrickHouse_Mechadoll_55Yen},
     {gTrickHouse_Mechadoll_Nothing},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll3_Q3[] = 
+static const struct MenuAction MultichoiceList_Mechadoll3_Q3[] =
 {
     {gTrickHouse_Mechadoll_CostMore},
     {gTrickHouse_Mechadoll_CostLess},
     {gTrickHouse_Mechadoll_SamePrice2},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll4_Q1[] = 
+static const struct MenuAction MultichoiceList_Mechadoll4_Q1[] =
 {
     {gTrickHouse_Mechadoll_Male},
     {gTrickHouse_Mechadoll_Female},
     {gTrickHouse_Mechadoll_Neither},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll4_Q2[] = 
+static const struct MenuAction MultichoiceList_Mechadoll4_Q2[] =
 {
     {gTrickHouse_Mechadoll_ElderlyMen},
     {gTrickHouse_Mechadoll_ElderlyLadies},
     {gTrickHouse_Mechadoll_SameNumber},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll4_Q3[] = 
+static const struct MenuAction MultichoiceList_Mechadoll4_Q3[] =
 {
     {gTrickHouse_Mechadoll_None},
     {gTrickHouse_Mechadoll_One},
     {gTrickHouse_Mechadoll_Two},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll5_Q1[] = 
+static const struct MenuAction MultichoiceList_Mechadoll5_Q1[] =
 {
     {gTrickHouse_Mechadoll_Two2},
     {gTrickHouse_Mechadoll_Three},
     {gTrickHouse_Mechadoll_Four},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll5_Q2[] = 
+static const struct MenuAction MultichoiceList_Mechadoll5_Q2[] =
 {
     {gTrickHouse_Mechadoll_Six},
     {gTrickHouse_Mechadoll_Seven},
     {gTrickHouse_Mechadoll_Eight},
 };
 
-static const struct MenuAction MultichoiceList_Mechadoll5_Q3[] = 
+static const struct MenuAction MultichoiceList_Mechadoll5_Q3[] =
 {
     {gTrickHouse_Mechadoll_Six2},
     {gTrickHouse_Mechadoll_Seven2},
@@ -934,14 +934,14 @@ const u8 *const gStdStrings[] =
     [STDSTRING_BATTLE_PYRAMID] = gText_BattlePyramid,
 };
 
-static const u8 sLinkServicesMultichoiceIds[] = 
-{ 
-    MULTI_CABLE_CLUB_NO_RECORD_MIX, 
-    MULTI_WIRELESS_NO_RECORD_BERRY, 
-    MULTI_CABLE_CLUB_WITH_RECORD_MIX, 
-    MULTI_WIRELESS_NO_BERRY, 
-    MULTI_WIRELESS_NO_RECORD, 
-    MULTI_WIRELESS_ALL_SERVICES 
+static const u8 sLinkServicesMultichoiceIds[] =
+{
+    MULTI_CABLE_CLUB_NO_RECORD_MIX,
+    MULTI_WIRELESS_NO_RECORD_BERRY,
+    MULTI_CABLE_CLUB_WITH_RECORD_MIX,
+    MULTI_WIRELESS_NO_BERRY,
+    MULTI_WIRELESS_NO_RECORD,
+    MULTI_WIRELESS_ALL_SERVICES
 };
 
 static const u8 *const sPCNameStrings[] =
diff --git a/src/data/text/gift_ribbon_descriptions.h b/src/data/text/gift_ribbon_descriptions.h
index a95f9729d..0ba7a33d5 100644
--- a/src/data/text/gift_ribbon_descriptions.h
+++ b/src/data/text/gift_ribbon_descriptions.h
@@ -46,7 +46,7 @@ const u8 gGiftRibbonDescriptionPart2_LovedPokemon[] = _("for a loved POKéMON.")
 const u8 gGiftRibbonDescriptionPart1_LoveForPokemon[] = _("RIBBON that shows");
 const u8 gGiftRibbonDescriptionPart2_LoveForPokemon[] = _("love for POKéMON.");
 
-const u8 *const gGiftRibbonDescriptionPointers[MAX_GIFT_RIBBON][2] = 
+const u8 *const gGiftRibbonDescriptionPointers[MAX_GIFT_RIBBON][2] =
 {
     {gGiftRibbonDescriptionPart1_2003RegionalTourney,   gGiftRibbonDescriptionPart2_Champion},
     {gGiftRibbonDescriptionPart1_2003NationalTourney,   gGiftRibbonDescriptionPart2_Champion},
diff --git a/src/data/text/match_call_messages.h b/src/data/text/match_call_messages.h
index 6ea3b549f..c86329ee2 100644
--- a/src/data/text/match_call_messages.h
+++ b/src/data/text/match_call_messages.h
@@ -388,7 +388,7 @@ const u8 gText_MatchCallChampion_Wallace_Pokemon[] = _("I prefer POKéMON of gra
 const u8 gText_MatchCallChampion_Wallace_Intro1[] = _("I represent beauty as");
 const u8 gText_MatchCallChampion_Wallace_Intro2[] = _("well as intelligence.");
 
-const u8 *const gMatchCallFlavorTexts[REMATCH_TABLE_ENTRIES][CHECK_PAGE_ENTRY_COUNT] = 
+const u8 *const gMatchCallFlavorTexts[REMATCH_TABLE_ENTRIES][CHECK_PAGE_ENTRY_COUNT] =
 {
     [REMATCH_ROSE] = MCFLAVOR(AromaLady_Rose),
     [REMATCH_ANDRES] = MCFLAVOR(RuinManiac_Andres),
diff --git a/src/data/text/nature_names.h b/src/data/text/nature_names.h
index 601898445..d15243b09 100644
--- a/src/data/text/nature_names.h
+++ b/src/data/text/nature_names.h
@@ -24,7 +24,7 @@ static const u8 sSassyNatureName[] = _("SASSY");
 static const u8 sCarefulNatureName[] = _("CAREFUL");
 static const u8 sQuirkyNatureName[] = _("QUIRKY");
 
-const u8 *const gNatureNamePointers[NUM_NATURES] = 
+const u8 *const gNatureNamePointers[NUM_NATURES] =
 {
     [NATURE_HARDY] = sHardyNatureName,
     [NATURE_LONELY] = sLonelyNatureName,
diff --git a/src/data/text/ribbon_descriptions.h b/src/data/text/ribbon_descriptions.h
index 5db52dced..4de90d2e4 100644
--- a/src/data/text/ribbon_descriptions.h
+++ b/src/data/text/ribbon_descriptions.h
@@ -18,7 +18,7 @@ const u8 gRibbonDescriptionPart2_Artist[] = _("as a super sketch model.");
 const u8 gRibbonDescriptionPart1_Effort[] = _("RIBBON awarded for");
 const u8 gRibbonDescriptionPart2_Effort[] = _("being a hard worker.");
 
-const u8 *const gRibbonDescriptionPointers[][2] = 
+const u8 *const gRibbonDescriptionPointers[][2] =
 {
     [CHAMPION_RIBBON]      = {gRibbonDescriptionPart1_Champion,      gRibbonDescriptionPart2_Champion},
     [COOL_RIBBON_NORMAL]   = {gRibbonDescriptionPart1_CoolContest,   gRibbonDescriptionPart2_NormalRank},
diff --git a/src/data/trade.h b/src/data/trade.h
index 752971c11..7088633a8 100644
--- a/src/data/trade.h
+++ b/src/data/trade.h
@@ -1,4 +1,4 @@
-#define GFXTAG_MENU_TEXT       200 // Used as a base tag in CB2_CreateTradeMenu and CB2_ReturnToTradeMenu 
+#define GFXTAG_MENU_TEXT       200 // Used as a base tag in CB2_CreateTradeMenu and CB2_ReturnToTradeMenu
 #define GFXTAG_CURSOR          300
 #define GFXTAG_LINK_MON_GLOW   5550
 #define GFXTAG_LINK_MON_SHADOW 5552
@@ -395,7 +395,7 @@ static const struct MenuAction sSelectTradeMonActions[] =
     {sText_Trade2,   Task_DrawSelectionTrade}
 };
 
-static const u8 *const sTradeMessages[] = 
+static const u8 *const sTradeMessages[] =
 {
     [TRADE_MSG_STANDBY]                    = sText_CommunicationStandby,
     [TRADE_MSG_CANCELED]                   = sText_TheTradeHasBeenCanceled,
@@ -408,8 +408,8 @@ static const u8 *const sTradeMessages[] =
     [TRADE_MSG_FRIENDS_MON_CANT_BE_TRADED] = gText_OtherTrainersPkmnCantBeTraded
 };
 
-static const u8 sTradeTextColors[] = 
-{ 
+static const u8 sTradeTextColors[] =
+{
     TEXT_COLOR_TRANSPARENT, //bg color
     TEXT_COLOR_WHITE,       //fg color
     TEXT_COLOR_DARK_GRAY    //shadow color
@@ -1003,67 +1003,67 @@ static const union AffineAnimCmd *const sAffineAnims_CrossingMonPics[] =
 
 static const struct InGameTrade sIngameTrades[] =
 {
-    [INGAME_TRADE_SEEDOT] = 
+    [INGAME_TRADE_SEEDOT] =
     {
-        .nickname = _("DOTS"), 
+        .nickname = _("DOTS"),
         .species = SPECIES_SEEDOT,
         .ivs = {5, 4, 5, 4, 4, 4},
-        .abilityNum = 1, 
+        .abilityNum = 1,
         .otId = 38726,
         .conditions = {30, 5, 5, 5, 5},
         .personality = 0x84,
-        .heldItem = ITEM_CHESTO_BERRY, 
+        .heldItem = ITEM_CHESTO_BERRY,
         .mailNum = -1,
-        .otName = _("KOBE"), 
-        .otGender = MALE, 
+        .otName = _("KOBE"),
+        .otGender = MALE,
         .sheen = 10,
         .requestedSpecies = SPECIES_RALTS
-    }, 
-    [INGAME_TRADE_PLUSLE] = 
+    },
+    [INGAME_TRADE_PLUSLE] =
     {
-        .nickname = _("PLUSES"), 
+        .nickname = _("PLUSES"),
         .species = SPECIES_PLUSLE,
         .ivs = {4, 4, 4, 5, 5, 4},
-        .abilityNum = 0, 
+        .abilityNum = 0,
         .otId = 73996,
         .conditions = {5, 5, 30, 5, 5},
         .personality = 0x6F,
-        .heldItem = ITEM_WOOD_MAIL, 
+        .heldItem = ITEM_WOOD_MAIL,
         .mailNum = 0,
-        .otName = _("ROMAN"), 
-        .otGender = MALE, 
+        .otName = _("ROMAN"),
+        .otGender = MALE,
         .sheen = 10,
         .requestedSpecies = SPECIES_VOLBEAT
-    }, 
-    [INGAME_TRADE_HORSEA] = 
+    },
+    [INGAME_TRADE_HORSEA] =
     {
         .nickname = _("SEASOR"),
         .species = SPECIES_HORSEA,
         .ivs = {5, 4, 4, 4, 5, 4},
-        .abilityNum = 0, 
+        .abilityNum = 0,
         .otId = 46285,
         .conditions = {5, 5, 5, 5, 30},
         .personality = 0x7F,
-        .heldItem = ITEM_WAVE_MAIL, 
+        .heldItem = ITEM_WAVE_MAIL,
         .mailNum = 1,
-        .otName = _("SKYLAR"), 
-        .otGender = MALE, 
+        .otName = _("SKYLAR"),
+        .otGender = MALE,
         .sheen = 10,
         .requestedSpecies = SPECIES_BAGON
-    }, 
-    [INGAME_TRADE_MEOWTH] = 
+    },
+    [INGAME_TRADE_MEOWTH] =
     {
         .nickname = _("MEOWOW"),
         .species = SPECIES_MEOWTH,
         .ivs = {4, 5, 4, 5, 4, 4},
-        .abilityNum = 0, 
+        .abilityNum = 0,
         .otId = 91481,
         .conditions = {5, 5, 5, 30, 5},
         .personality = 0x8B,
-        .heldItem = ITEM_RETRO_MAIL, 
+        .heldItem = ITEM_RETRO_MAIL,
         .mailNum = 2,
-        .otName = _("ISIS"), 
-        .otGender = FEMALE, 
+        .otName = _("ISIS"),
+        .otGender = FEMALE,
         .sheen = 10,
         .requestedSpecies = SPECIES_SKITTY
     }
diff --git a/src/data/union_room.h b/src/data/union_room.h
index 80d1e517c..cf4b12b5d 100644
--- a/src/data/union_room.h
+++ b/src/data/union_room.h
@@ -52,14 +52,14 @@ static const u8 *const sPlayersNeededOrModeTexts[][5] = {
     {
         sText_1PlayerNeeded,
         sText_2PlayerMode
-    }, 
+    },
     // 4 players required
     {
         sText_3PlayersNeeded,
         sText_2PlayersNeeded,
         sText_1PlayerNeeded,
         sText_4PlayerMode
-    }, 
+    },
     // 2-5 players required
     {
         sText_1PlayerNeeded,
@@ -67,7 +67,7 @@ static const u8 *const sPlayersNeededOrModeTexts[][5] = {
         sText_3PlayerMode,
         sText_4PlayerMode,
         sText_5PlayerMode
-    }, 
+    },
     // 3-5 players required
     {
         sText_2PlayersNeeded,
@@ -75,7 +75,7 @@ static const u8 *const sPlayersNeededOrModeTexts[][5] = {
         sText_3PlayerMode,
         sText_4PlayerMode,
         sText_5PlayerMode
-    }, 
+    },
     // 2-4 players required
     {
         sText_1PlayerNeeded,
@@ -369,7 +369,7 @@ static const u8 *const sBattleReactionTexts[GENDER_COUNT][4] = {
         sText_UsedGoodMoveMale,
         sText_BattleSurpriseMale,
         sText_SwitchedMonsMale
-    }, 
+    },
     {
         sText_YoureToughFemale,
         sText_UsedGoodMoveFemale,
@@ -393,7 +393,7 @@ static const u8 *const sChatReactionTexts[GENDER_COUNT][4] = {
         sText_ThatsFunnyMale,
         sText_RandomChatMale1,
         sText_RandomChatMale2
-    }, 
+    },
     {
         sText_LearnedSomethingFemale,
         sText_ThatsFunnyFemale,
@@ -411,7 +411,7 @@ static const u8 *const sTrainerCardReactionTexts[GENDER_COUNT][2] = {
     {
         sText_ShowedTrainerCardMale1,
         sText_ShowedTrainerCardMale2
-    }, 
+    },
     {
         sText_ShowedTrainerCardFemale1,
         sText_ShowedTrainerCardFemale2
@@ -427,7 +427,7 @@ static const u8 *const sTradeReactionTexts[GENDER_COUNT][4] = {
     {
         sText_MaleTraded1,
         sText_MaleTraded2
-    }, 
+    },
     {
         sText_FemaleTraded1,
         sText_FemaleTraded2
@@ -495,7 +495,7 @@ ALIGNED(4) static const u8 sText_ChooseLeaderToughContest[] = _("TOUGHNESS CONTE
 ALIGNED(4) static const u8 sText_ChooseLeaderBattleTowerLv50[] = _("BATTLE TOWER LEVEL 50!\nPlease choose the LEADER.");
 ALIGNED(4) static const u8 sText_ChooseLeaderBattleTowerOpenLv[] = _("BATTLE TOWER OPEN LEVEL!\nPlease choose the LEADER.");
 
-static const u8 *const sChooseTrainerTexts[NUM_LINK_GROUP_TYPES] = 
+static const u8 *const sChooseTrainerTexts[NUM_LINK_GROUP_TYPES] =
 {
     [LINK_GROUP_SINGLE_BATTLE]     = sText_ChooseTrainerSingleBattle,
     [LINK_GROUP_DOUBLE_BATTLE]     = sText_ChooseTrainerDoubleBattle,
@@ -1027,29 +1027,29 @@ ALIGNED(4) static const u8 sAcceptedActivityIds_BerryPicking[]    = {ACTIVITY_BE
 ALIGNED(4) static const u8 sAcceptedActivityIds_WonderCard[]      = {ACTIVITY_WONDER_CARD, 0xff};
 ALIGNED(4) static const u8 sAcceptedActivityIds_WonderNews[]      = {ACTIVITY_WONDER_NEWS, 0xff};
 ALIGNED(4) static const u8 sAcceptedActivityIds_Resume[]          = {
-    IN_UNION_ROOM | ACTIVITY_NONE, 
-    IN_UNION_ROOM | ACTIVITY_BATTLE_SINGLE, 
-    IN_UNION_ROOM | ACTIVITY_TRADE, 
-    IN_UNION_ROOM | ACTIVITY_CHAT, 
-    IN_UNION_ROOM | ACTIVITY_CARD, 
-    IN_UNION_ROOM | ACTIVITY_ACCEPT, 
-    IN_UNION_ROOM | ACTIVITY_DECLINE, 
-    IN_UNION_ROOM | ACTIVITY_NPCTALK, 
-    IN_UNION_ROOM | ACTIVITY_PLYRTALK, 
+    IN_UNION_ROOM | ACTIVITY_NONE,
+    IN_UNION_ROOM | ACTIVITY_BATTLE_SINGLE,
+    IN_UNION_ROOM | ACTIVITY_TRADE,
+    IN_UNION_ROOM | ACTIVITY_CHAT,
+    IN_UNION_ROOM | ACTIVITY_CARD,
+    IN_UNION_ROOM | ACTIVITY_ACCEPT,
+    IN_UNION_ROOM | ACTIVITY_DECLINE,
+    IN_UNION_ROOM | ACTIVITY_NPCTALK,
+    IN_UNION_ROOM | ACTIVITY_PLYRTALK,
     0xff
 };
 ALIGNED(4) static const u8 sAcceptedActivityIds_Init[]            = {ACTIVITY_SEARCH, 0xff};
 ALIGNED(4) static const u8 sAcceptedActivityIds_Unk11[]           = {
-    ACTIVITY_BATTLE_SINGLE, 
-    ACTIVITY_BATTLE_DOUBLE, 
-    ACTIVITY_BATTLE_MULTI, 
-    ACTIVITY_TRADE, 
-    ACTIVITY_POKEMON_JUMP, 
-    ACTIVITY_BERRY_CRUSH, 
-    ACTIVITY_BERRY_PICK, 
-    ACTIVITY_WONDER_CARD, 
-    ACTIVITY_WONDER_NEWS, 
-    ACTIVITY_SPIN_TRADE, 
+    ACTIVITY_BATTLE_SINGLE,
+    ACTIVITY_BATTLE_DOUBLE,
+    ACTIVITY_BATTLE_MULTI,
+    ACTIVITY_TRADE,
+    ACTIVITY_POKEMON_JUMP,
+    ACTIVITY_BERRY_CRUSH,
+    ACTIVITY_BERRY_PICK,
+    ACTIVITY_WONDER_CARD,
+    ACTIVITY_WONDER_NEWS,
+    ACTIVITY_SPIN_TRADE,
     0xff
 };
 ALIGNED(4) static const u8 sAcceptedActivityIds_RecordCorner[]    = {ACTIVITY_RECORD_CORNER, 0xff};
@@ -1087,28 +1087,28 @@ static const u8 *const sAcceptedActivityIds[NUM_LINK_GROUP_TYPES] = {
     [LINK_GROUP_BATTLE_TOWER_OPEN] = sAcceptedActivityIds_BattleTowerOpen
 };
 
-static const u8 sLinkGroupToURoomActivity[NUM_LINK_GROUP_TYPES + 2] = 
+static const u8 sLinkGroupToURoomActivity[NUM_LINK_GROUP_TYPES + 2] =
 {
-    [LINK_GROUP_SINGLE_BATTLE]     = ACTIVITY_BATTLE_SINGLE, 
-    [LINK_GROUP_DOUBLE_BATTLE]     = ACTIVITY_BATTLE_DOUBLE, 
-    [LINK_GROUP_MULTI_BATTLE]      = ACTIVITY_BATTLE_MULTI, 
-    [LINK_GROUP_TRADE]             = ACTIVITY_TRADE, 
-    [LINK_GROUP_POKEMON_JUMP]      = ACTIVITY_POKEMON_JUMP, 
-    [LINK_GROUP_BERRY_CRUSH]       = ACTIVITY_BERRY_CRUSH, 
-    [LINK_GROUP_BERRY_PICKING]     = ACTIVITY_BERRY_PICK, 
+    [LINK_GROUP_SINGLE_BATTLE]     = ACTIVITY_BATTLE_SINGLE,
+    [LINK_GROUP_DOUBLE_BATTLE]     = ACTIVITY_BATTLE_DOUBLE,
+    [LINK_GROUP_MULTI_BATTLE]      = ACTIVITY_BATTLE_MULTI,
+    [LINK_GROUP_TRADE]             = ACTIVITY_TRADE,
+    [LINK_GROUP_POKEMON_JUMP]      = ACTIVITY_POKEMON_JUMP,
+    [LINK_GROUP_BERRY_CRUSH]       = ACTIVITY_BERRY_CRUSH,
+    [LINK_GROUP_BERRY_PICKING]     = ACTIVITY_BERRY_PICK,
     [LINK_GROUP_WONDER_CARD]       = ACTIVITY_WONDER_CARD,
-    [LINK_GROUP_WONDER_NEWS]       = ACTIVITY_WONDER_NEWS, 
-    [LINK_GROUP_UNION_ROOM_RESUME] = ACTIVITY_NONE, 
-    [LINK_GROUP_UNION_ROOM_INIT]   = ACTIVITY_NONE, 
-    [LINK_GROUP_UNK_11]            = ACTIVITY_NONE, 
-    [LINK_GROUP_RECORD_CORNER]     = ACTIVITY_RECORD_CORNER, 
-    [LINK_GROUP_BERRY_BLENDER]     = ACTIVITY_BERRY_BLENDER, 
-    [LINK_GROUP_UNK_14]            = ACTIVITY_NONE, 
+    [LINK_GROUP_WONDER_NEWS]       = ACTIVITY_WONDER_NEWS,
+    [LINK_GROUP_UNION_ROOM_RESUME] = ACTIVITY_NONE,
+    [LINK_GROUP_UNION_ROOM_INIT]   = ACTIVITY_NONE,
+    [LINK_GROUP_UNK_11]            = ACTIVITY_NONE,
+    [LINK_GROUP_RECORD_CORNER]     = ACTIVITY_RECORD_CORNER,
+    [LINK_GROUP_BERRY_BLENDER]     = ACTIVITY_BERRY_BLENDER,
+    [LINK_GROUP_UNK_14]            = ACTIVITY_NONE,
     [LINK_GROUP_COOL_CONTEST]      = ACTIVITY_CONTEST_COOL,
-    [LINK_GROUP_BEAUTY_CONTEST]    = ACTIVITY_CONTEST_BEAUTY, 
-    [LINK_GROUP_CUTE_CONTEST]      = ACTIVITY_CONTEST_CUTE, 
-    [LINK_GROUP_SMART_CONTEST]     = ACTIVITY_CONTEST_SMART, 
-    [LINK_GROUP_TOUGH_CONTEST]     = ACTIVITY_CONTEST_TOUGH, 
-    [LINK_GROUP_BATTLE_TOWER]      = ACTIVITY_BATTLE_TOWER, 
+    [LINK_GROUP_BEAUTY_CONTEST]    = ACTIVITY_CONTEST_BEAUTY,
+    [LINK_GROUP_CUTE_CONTEST]      = ACTIVITY_CONTEST_CUTE,
+    [LINK_GROUP_SMART_CONTEST]     = ACTIVITY_CONTEST_SMART,
+    [LINK_GROUP_TOUGH_CONTEST]     = ACTIVITY_CONTEST_TOUGH,
+    [LINK_GROUP_BATTLE_TOWER]      = ACTIVITY_BATTLE_TOWER,
     [LINK_GROUP_BATTLE_TOWER_OPEN] = ACTIVITY_BATTLE_TOWER_OPEN
 };
diff --git a/src/daycare.c b/src/daycare.c
index 6a1715049..8dd751531 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -920,7 +920,7 @@ static bool8 TryProduceOrHatchEgg(struct DayCare *daycare)
 
                 SetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP, &eggCycles);
             }
-            else 
+            else
             {
                 gSpecialVar_0x8004 = i;
                 return TRUE;
diff --git a/src/decoration.c b/src/decoration.c
index ebd7eb26c..131f6e502 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -356,7 +356,7 @@ static const struct SpriteFrameImage sDecorSelectorSpriteFrameImages =
 
 static const struct SpriteTemplate sDecorationSelectorSpriteTemplate =
 {
-    0xFFFF,
+    TAG_NONE,
     PLACE_DECORATION_SELECTOR_TAG,
     &sDecorSelectorOam,
     sDecorSelectorAnimCmds,
@@ -487,7 +487,7 @@ static const struct SpriteFrameImage sPuttingAwayCursorPicTable =
 
 static const struct SpriteTemplate sPuttingAwayCursorSpriteTemplate =
 {
-    0xFFFF,
+    TAG_NONE,
     PLACE_DECORATION_PLAYER_TAG,
     &sPuttingAwayCursorOamData,
     sPuttingAwayCursorAnimCmds,
@@ -862,12 +862,12 @@ static void InitDecorationItemsMenuLimits(void)
 
 static void InitDecorationItemsMenuScrollAndCursor(void)
 {
-    sub_812225C(&sDecorationsScrollOffset, &sDecorationsCursorPos, sDecorationItemsMenu->maxShownItems, sDecorationItemsMenu->numMenuItems);
+    SetCursorWithinListBounds(&sDecorationsScrollOffset, &sDecorationsCursorPos, sDecorationItemsMenu->maxShownItems, sDecorationItemsMenu->numMenuItems);
 }
 
 static void InitDecorationItemsMenuScrollAndCursor2(void)
 {
-    sub_8122298(&sDecorationsScrollOffset, &sDecorationsCursorPos, sDecorationItemsMenu->maxShownItems, sDecorationItemsMenu->numMenuItems, 8);
+    SetCursorScrollWithinListBounds(&sDecorationsScrollOffset, &sDecorationsCursorPos, sDecorationItemsMenu->maxShownItems, sDecorationItemsMenu->numMenuItems, 8);
 }
 
 static void PrintDecorationItemMenuItems(u8 taskId)
@@ -1382,8 +1382,8 @@ static void ConfigureCameraObjectForPlacingDecoration(struct PlaceDecorationGrap
     gFieldCamera.spriteId = gpu_pal_decompress_alloc_tag_and_upload(data, decor);
     gSprites[gFieldCamera.spriteId].oam.priority = 1;
     gSprites[gFieldCamera.spriteId].callback = InitializePuttingAwayCursorSprite;
-    gSprites[gFieldCamera.spriteId].pos1.x = sDecorationMovementInfo[data->decoration->shape].cameraX;
-    gSprites[gFieldCamera.spriteId].pos1.y = sDecorationMovementInfo[data->decoration->shape].cameraY;
+    gSprites[gFieldCamera.spriteId].x = sDecorationMovementInfo[data->decoration->shape].cameraX;
+    gSprites[gFieldCamera.spriteId].y = sDecorationMovementInfo[data->decoration->shape].cameraY;
 }
 
 static void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct PlaceDecorationGraphicsDataBuffer *data)
@@ -1650,7 +1650,7 @@ static void PlaceDecoration(u8 taskId)
         ScriptContext1_SetupScript(SecretBase_EventScript_SetDecoration);
     }
 
-    gSprites[sDecor_CameraSpriteObjectIdx1].pos1.y += 2;
+    gSprites[sDecor_CameraSpriteObjectIdx1].y += 2;
     if (gMapHeader.regionMapSectionId == MAPSEC_SECRET_BASE)
         TryPutSecretBaseVisitOnAir();
 
@@ -2121,8 +2121,8 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1
         if (spriteId == MAX_SPRITES)
             return MAX_SPRITES;
 
-        gSprites[spriteId].pos2.x = x + 4;
-        gSprites[spriteId].pos2.y = y + 4;
+        gSprites[spriteId].x2 = x + 4;
+        gSprites[spriteId].y2 = y + 4;
     }
     else if (gDecorIconTable[decor][0] == NULL)
     {
@@ -2130,11 +2130,11 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1
         if (spriteId == MAX_SPRITES)
             return MAX_SPRITES;
 
-        gSprites[spriteId].pos2.x = x;
+        gSprites[spriteId].x2 = x;
         if (decor == DECOR_SILVER_SHIELD || decor == DECOR_GOLD_SHIELD)
-            gSprites[spriteId].pos2.y = y - 4;
+            gSprites[spriteId].y2 = y - 4;
         else
-            gSprites[spriteId].pos2.y = y;
+            gSprites[spriteId].y2 = y;
     }
     else
     {
@@ -2142,8 +2142,8 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1
         if (spriteId == MAX_SPRITES)
             return MAX_SPRITES;
 
-        gSprites[spriteId].pos2.x = x + 4;
-        gSprites[spriteId].pos2.y = y + 4;
+        gSprites[spriteId].x2 = x + 4;
+        gSprites[spriteId].y2 = y + 4;
     }
 
     gSprites[spriteId].oam.priority = priority;
@@ -2332,8 +2332,8 @@ static void ContinuePuttingAwayDecorations(u8 taskId)
     gSprites[sDecor_CameraSpriteObjectIdx1].data[7] = 0;
     gSprites[sDecor_CameraSpriteObjectIdx1].invisible = FALSE;
     gSprites[sDecor_CameraSpriteObjectIdx1].callback = InitializeCameraSprite1;
-    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.x = 136;
-    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.y = 72;
+    gSprites[sDecor_CameraSpriteObjectIdx2].x = 136;
+    gSprites[sDecor_CameraSpriteObjectIdx2].y = 72;
     gTasks[taskId].tButton = 0;
     gTasks[taskId].func = Task_SelectLocation;
 }
@@ -2449,8 +2449,8 @@ static void SetCameraSpritePosition(u8 x, u8 y)
 {
     gSprites[sDecor_CameraSpriteObjectIdx1].invisible = TRUE;
     gSprites[sDecor_CameraSpriteObjectIdx1].callback = SpriteCallbackDummy;
-    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.x = x * 16 + 136;
-    gSprites[sDecor_CameraSpriteObjectIdx2].pos1.y = y * 16 + 72;
+    gSprites[sDecor_CameraSpriteObjectIdx2].x = x * 16 + 136;
+    gSprites[sDecor_CameraSpriteObjectIdx2].y = y * 16 + 72;
 }
 
 static bool8 DecorationIsUnderCursor(u8 taskId, u8 idx, struct DecorRearrangementDataBuffer *data)
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index 09a8d2afe..d193ef1f5 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -24,29 +24,29 @@
     Information about a Dewford trend is stored in a struct DewfordTrend.
     In addition to the two easy chat words that make up the trend's phrase,
     each trend has a few randomly generated values associated with it.
-    - rand: 
+    - rand:
         This is a 16 bit value generated once when the phrase is created.
         It's used in calculations for Feebas tiles, Slot Machines, and Match Call.
-    - trendiness / maxTrendiness: 
+    - trendiness / maxTrendiness:
         Initialized as a random value between 30-127 inclusive. This is used to
         compare how trendy one phrase is vs another. If a submitted phrase is
         less trendy than the current one it won't be accepted. If the trend is
-        "boring" (see below) it will lose trendiness over time until it reaches 0, 
+        "boring" (see below) it will lose trendiness over time until it reaches 0,
         at which point it will stop being boring and gain trendiness until it
         reaches maxTrendiness (then it becomes boring again and the cycle repeats).
-    - gainingTrendiness: 
+    - gainingTrendiness:
         This is a flag that determines whether a phrase should be gaining or losing
         trendiness. An NPC in Dewford Hall will comment on whether the current phrase
         is "boring" or not, and if it is gaining trendiness (or if it is still trendier
-        than the last phrase) it is not boring. This field will always be TRUE for any 
+        than the last phrase) it is not boring. This field will always be TRUE for any
         new phrase submitted after the 1st submission.
 
     ## Saving trends ##
-    Each time a potential trendy phrase is submitted, it is saved in gSaveBlock1Ptr->dewfordTrends[]. 
-    Up to SAVED_TRENDS_COUNT (5) trends may be saved at one time. The trends in this array are kept 
-    in sorted order from most trendy to least trendy. The current trendy phrase is always at 
-    gSaveBlock1Ptr->dewfordTrends[0]. If the player mixes records with another player, their own 
-    trends are replaced with their mixing partner's, unless the phrase is the same, in which case 
+    Each time a potential trendy phrase is submitted, it is saved in gSaveBlock1Ptr->dewfordTrends[].
+    Up to SAVED_TRENDS_COUNT (5) trends may be saved at one time. The trends in this array are kept
+    in sorted order from most trendy to least trendy. The current trendy phrase is always at
+    gSaveBlock1Ptr->dewfordTrends[0]. If the player mixes records with another player, their own
+    trends are replaced with their mixing partner's, unless the phrase is the same, in which case
     the version with a higher trendiness value is used (see ReceiveDewfordTrendData).
 
     ## TV Show ##
@@ -247,7 +247,7 @@ void ReceiveDewfordTrendData(struct DewfordTrend *linkedTrends, size_t size, u8
     players = GetLinkPlayerCount();
     for (i = 0; i < players; i++)
         memcpy(&linkedTrendsBuffer[i * SAVED_TRENDS_COUNT], (u8 *)linkedTrends + i * size, SAVED_TRENDS_SIZE);
-    
+
     // Determine which of the received trends should be saved.
     // savedTrendsBuffer starts empty, and when finished will contain
     // which of the linked trends to save in the saveblock.
@@ -279,7 +279,7 @@ void ReceiveDewfordTrendData(struct DewfordTrend *linkedTrends, size_t size, u8
         }
     }
     SortTrends(savedTrendsBuffer, numTrends, SORT_MODE_FULL);
-    
+
     // Overwrite current saved trends with new saved trends
     src = savedTrendsBuffer;
     dst = gSaveBlock1Ptr->dewfordTrends;
@@ -301,7 +301,7 @@ void BufferTrendyPhraseString(void)
 void IsTrendyPhraseBoring(void)
 {
     bool16 result = FALSE;
-    
+
     do
     {
         if (gSaveBlock1Ptr->dewfordTrends[0].trendiness - gSaveBlock1Ptr->dewfordTrends[1].trendiness > 1)
@@ -312,7 +312,7 @@ void IsTrendyPhraseBoring(void)
             break;
         result = TRUE;
     } while (0);
-    
+
     gSpecialVar_Result = result;
 }
 
diff --git a/src/dodrio_berry_picking.c b/src/dodrio_berry_picking.c
index 8dead44b3..2a4314c4d 100644
--- a/src/dodrio_berry_picking.c
+++ b/src/dodrio_berry_picking.c
@@ -139,7 +139,7 @@ enum {
 
 #define NUM_STATUS_SQUARES 10
 
-// Berries fall in predefined columns. 
+// Berries fall in predefined columns.
 // A total of 10 are available, though fewer will be used with < 5 players
 // The 11th column is a repeat of the 1st column wrapped around, so only
 // the values 0-9 are unique 'valid' columns
@@ -342,20 +342,20 @@ static void HandleWaitPlayAgainInput(void);
 static void ResetPickState(void);
 static u32 GetHighestScore(void);
 static void SendPacket_ReadyToStart(bool32);
-static void SendPacket_GameState(struct DodrioGame_Player *, 
-                                 struct DodrioGame_PlayerCommData *, 
-                                 struct DodrioGame_PlayerCommData *, 
-                                 struct DodrioGame_PlayerCommData *, 
-                                 struct DodrioGame_PlayerCommData *, 
-                                 struct DodrioGame_PlayerCommData *, 
+static void SendPacket_GameState(struct DodrioGame_Player *,
+                                 struct DodrioGame_PlayerCommData *,
+                                 struct DodrioGame_PlayerCommData *,
+                                 struct DodrioGame_PlayerCommData *,
+                                 struct DodrioGame_PlayerCommData *,
+                                 struct DodrioGame_PlayerCommData *,
                                  u8 , bool32 , bool32 );
-static bool32 RecvPacket_GameState(u32, 
-                                   struct DodrioGame_Player *, 
-                                   struct DodrioGame_PlayerCommData *, 
-                                   struct DodrioGame_PlayerCommData *, 
-                                   struct DodrioGame_PlayerCommData *, 
-                                   struct DodrioGame_PlayerCommData *, 
-                                   struct DodrioGame_PlayerCommData *, 
+static bool32 RecvPacket_GameState(u32,
+                                   struct DodrioGame_Player *,
+                                   struct DodrioGame_PlayerCommData *,
+                                   struct DodrioGame_PlayerCommData *,
+                                   struct DodrioGame_PlayerCommData *,
+                                   struct DodrioGame_PlayerCommData *,
+                                   struct DodrioGame_PlayerCommData *,
                                    u8 *, bool32 *, bool32 *);
 static void SendPacket_PickState(u8);
 static bool32 RecvPacket_PickState(u32, u8 *);
@@ -422,11 +422,11 @@ static void StopGfxFuncs(void);
 static void GfxIdle(void);
 
 // For each player, the array is a list of all the columns starting with the column to their left
-// Only the range of active columns is read from the array (dependent on the number of players), 
+// Only the range of active columns is read from the array (dependent on the number of players),
 // so the arrays are spaced such that the numbers in the center are where the data that's read starts and end.
 static const u8 sActiveColumnMap[MAX_RFU_PLAYERS][MAX_RFU_PLAYERS][NUM_BERRY_COLUMNS] =
 {
-    { // 1 player (never used), columns 4-6. 
+    { // 1 player (never used), columns 4-6.
       // Sometimes read to get default order regardless of the current number of players
         {0, 1, 2, 3,     4, 5, 6,     7, 8, 9, 0},
     },
@@ -526,7 +526,7 @@ static const u8 sPlayerIdAtColumn[MAX_RFU_PLAYERS][NUM_BERRY_COLUMNS] =
 {
     {__, __, __, __,  1,  1,  1, __, __, __, __}, // 1 player
     {__, __, __,  0,  0,  1,  1,  0, __, __, __}, // 2 players
-    {__, __,  2,  2,  0,  0,  1,  1,  1, __, __}, // 3 players 
+    {__, __,  2,  2,  0,  0,  1,  1,  1, __, __}, // 3 players
     {__,  3,  3,  0,  0,  1,  1,  2,  2,  3, __}, // 4 players
     { 3,  3,  4,  4,  0,  0,  1,  1,  2,  2,  3}, // 5 players
 };
@@ -592,15 +592,15 @@ ALIGNED(4)
 static const u8 sPrizeBerryIds[][10] =
 {
     { // Possible prizes with 3 players
-        ITEM_TO_BERRY(ITEM_RAZZ_BERRY) - 1, 
-        ITEM_TO_BERRY(ITEM_BLUK_BERRY) - 1, 
-        ITEM_TO_BERRY(ITEM_NANAB_BERRY) - 1, 
-        ITEM_TO_BERRY(ITEM_WEPEAR_BERRY) - 1, 
-        ITEM_TO_BERRY(ITEM_PINAP_BERRY) - 1, 
-        ITEM_TO_BERRY(ITEM_PINAP_BERRY) - 1, 
-        ITEM_TO_BERRY(ITEM_WEPEAR_BERRY) - 1, 
-        ITEM_TO_BERRY(ITEM_NANAB_BERRY) - 1, 
-        ITEM_TO_BERRY(ITEM_BLUK_BERRY) - 1, 
+        ITEM_TO_BERRY(ITEM_RAZZ_BERRY) - 1,
+        ITEM_TO_BERRY(ITEM_BLUK_BERRY) - 1,
+        ITEM_TO_BERRY(ITEM_NANAB_BERRY) - 1,
+        ITEM_TO_BERRY(ITEM_WEPEAR_BERRY) - 1,
+        ITEM_TO_BERRY(ITEM_PINAP_BERRY) - 1,
+        ITEM_TO_BERRY(ITEM_PINAP_BERRY) - 1,
+        ITEM_TO_BERRY(ITEM_WEPEAR_BERRY) - 1,
+        ITEM_TO_BERRY(ITEM_NANAB_BERRY) - 1,
+        ITEM_TO_BERRY(ITEM_BLUK_BERRY) - 1,
         ITEM_TO_BERRY(ITEM_RAZZ_BERRY) - 1
     },
     { // Possible prizes with 4 players
@@ -864,7 +864,7 @@ static void InitCountdown(void)
     default:
         sGame->startCountdown = TRUE;
         SetGameFunc(FUNC_COUNTDOWN);
-        break;    
+        break;
     }
 }
 
@@ -912,7 +912,7 @@ static void WaitGameStart(void)
     case 0:
         if (sGame->startGame)
             SetGameFunc(FUNC_PLAY_GAME);
-        break;  
+        break;
     }
 }
 
@@ -1468,15 +1468,15 @@ static void RecvLinkData_Gameplay(void)
     u8 i;
     u8 numPlayers = sGame->numPlayers;
 
-    sGame->players[0].receivedGameStatePacket = RecvPacket_GameState(0, 
-                                                  &sGame->players[0], 
-                                                  &sGame->players[0].comm, 
-                                                  &sGame->players[1].comm, 
-                                                  &sGame->players[2].comm, 
-                                                  &sGame->players[3].comm, 
-                                                  &sGame->players[4].comm, 
-                                                  &sGame->numGraySquares, 
-                                                  &sGame->berriesFalling, 
+    sGame->players[0].receivedGameStatePacket = RecvPacket_GameState(0,
+                                                  &sGame->players[0],
+                                                  &sGame->players[0].comm,
+                                                  &sGame->players[1].comm,
+                                                  &sGame->players[2].comm,
+                                                  &sGame->players[3].comm,
+                                                  &sGame->players[4].comm,
+                                                  &sGame->numGraySquares,
+                                                  &sGame->berriesFalling,
                                                   &sGame->allReadyToEnd);
     sGame->clearRecvCmds = TRUE;
 
@@ -1545,15 +1545,15 @@ static void RecvLinkData_ReadyToEnd(void)
     u8 i;
     u8 numPlayers = sGame->numPlayers;
 
-    sGame->players[0].receivedGameStatePacket = RecvPacket_GameState(0, 
-                                                  &sGame->players[0], 
-                                                  &sGame->players[0].comm, 
-                                                  &sGame->players[1].comm, 
-                                                  &sGame->players[2].comm, 
-                                                  &sGame->players[3].comm, 
-                                                  &sGame->players[4].comm, 
-                                                  &sGame->numGraySquares, 
-                                                  &sGame->berriesFalling, 
+    sGame->players[0].receivedGameStatePacket = RecvPacket_GameState(0,
+                                                  &sGame->players[0],
+                                                  &sGame->players[0].comm,
+                                                  &sGame->players[1].comm,
+                                                  &sGame->players[2].comm,
+                                                  &sGame->players[3].comm,
+                                                  &sGame->players[4].comm,
+                                                  &sGame->numGraySquares,
+                                                  &sGame->berriesFalling,
                                                   &sGame->allReadyToEnd);
     sGame->clearRecvCmds = TRUE;
 
@@ -1605,25 +1605,25 @@ static void SendLinkData_Leader(void)
     switch (sGame->funcId)
     {
     case FUNC_PLAY_GAME:
-        SendPacket_GameState(&sGame->player, 
-                             &sGame->players[0].comm, 
-                             &sGame->players[1].comm, 
-                             &sGame->players[2].comm, 
-                             &sGame->players[3].comm, 
-                             &sGame->players[4].comm, 
-                             sGame->numGraySquares, 
-                             sGame->berriesFalling, 
+        SendPacket_GameState(&sGame->player,
+                             &sGame->players[0].comm,
+                             &sGame->players[1].comm,
+                             &sGame->players[2].comm,
+                             &sGame->players[3].comm,
+                             &sGame->players[4].comm,
+                             sGame->numGraySquares,
+                             sGame->berriesFalling,
                              sGame->allReadyToEnd);
         break;
     case FUNC_WAIT_END_GAME:
-        SendPacket_GameState(&sGame->player, 
-                             &sGame->players[0].comm, 
-                             &sGame->players[1].comm, 
-                             &sGame->players[2].comm, 
-                             &sGame->players[3].comm, 
-                             &sGame->players[4].comm, 
-                             sGame->numGraySquares, 
-                             sGame->berriesFalling, 
+        SendPacket_GameState(&sGame->player,
+                             &sGame->players[0].comm,
+                             &sGame->players[1].comm,
+                             &sGame->players[2].comm,
+                             &sGame->players[3].comm,
+                             &sGame->players[4].comm,
+                             sGame->numGraySquares,
+                             sGame->berriesFalling,
                              sGame->allReadyToEnd);
         break;
     }
@@ -1634,27 +1634,27 @@ static void RecvLinkData_Member(void)
     switch (sGame->funcId)
     {
     case FUNC_PLAY_GAME:
-        RecvPacket_GameState(sGame->multiplayerId, 
-                            &sGame->players[sGame->multiplayerId], 
-                            &sGame->players[0].comm, 
-                            &sGame->players[1].comm, 
-                            &sGame->players[2].comm, 
-                            &sGame->players[3].comm, 
-                            &sGame->players[4].comm, 
-                            &sGame->numGraySquares, 
-                            &sGame->berriesFalling, 
+        RecvPacket_GameState(sGame->multiplayerId,
+                            &sGame->players[sGame->multiplayerId],
+                            &sGame->players[0].comm,
+                            &sGame->players[1].comm,
+                            &sGame->players[2].comm,
+                            &sGame->players[3].comm,
+                            &sGame->players[4].comm,
+                            &sGame->numGraySquares,
+                            &sGame->berriesFalling,
                             &sGame->allReadyToEnd);
         break;
     case FUNC_WAIT_END_GAME:
-        RecvPacket_GameState(sGame->multiplayerId, 
-                            &sGame->players[sGame->multiplayerId], 
-                            &sGame->players[0].comm, 
-                            &sGame->players[1].comm, 
-                            &sGame->players[2].comm, 
-                            &sGame->players[3].comm, 
-                            &sGame->players[4].comm, 
-                            &sGame->numGraySquares, 
-                            &sGame->berriesFalling, 
+        RecvPacket_GameState(sGame->multiplayerId,
+                            &sGame->players[sGame->multiplayerId],
+                            &sGame->players[0].comm,
+                            &sGame->players[1].comm,
+                            &sGame->players[2].comm,
+                            &sGame->players[3].comm,
+                            &sGame->players[4].comm,
+                            &sGame->numGraySquares,
+                            &sGame->berriesFalling,
                             &sGame->allReadyToEnd);
         break;
     }
@@ -1728,7 +1728,7 @@ static void HandleSound_Member(void)
     u8 i;
     if (sGame->players[sGame->multiplayerId].comm.pickState == PICK_NONE)
     {
-        if (sGame->players[sGame->multiplayerId].comm.ateBerry != TRUE 
+        if (sGame->players[sGame->multiplayerId].comm.ateBerry != TRUE
          && sGame->players[sGame->multiplayerId].comm.missedBerry != TRUE)
             sGame->playingPickSound = 0;
     }
@@ -1885,7 +1885,7 @@ static void HandlePickBerries(void)
                 column = sActiveColumnMap[0][0][j];
 
                 // Attempt has already been checked
-                if (sGame->playersAttemptingPick[column][0] == i 
+                if (sGame->playersAttemptingPick[column][0] == i
                  || sGame->playersAttemptingPick[column][1] == i)
                     break;
 
@@ -1929,14 +1929,14 @@ static void HandlePickBerries(void)
             if (++sGame->eatTimer[column] >= 6)
             {
                 sGame->eatTimer[column] = 0;
-                
-                if (sGame->playersAttemptingPick[column][0] == PLAYER_NONE 
+
+                if (sGame->playersAttemptingPick[column][0] == PLAYER_NONE
                  && sGame->playersAttemptingPick[column][1] == PLAYER_NONE)
                 {
                     // No players attempting to pick this berry
                     continue;
                 }
-                else if (sGame->playersAttemptingPick[column][0] != PLAYER_NONE 
+                else if (sGame->playersAttemptingPick[column][0] != PLAYER_NONE
                       && sGame->playersAttemptingPick[column][1] == PLAYER_NONE)
                 {
                     // One player attempting to pick this berry
@@ -2003,7 +2003,7 @@ static bool32 TryPickBerry(u8 playerId, u8 pickState, u8 column)
         pick = 2;
         break;
     }
-    
+
     // Check if berry is within range to be picked
     if (berries->fallDist[column] == EAT_FALL_DIST - 1 || berries->fallDist[column] == EAT_FALL_DIST)
     {
@@ -2054,7 +2054,7 @@ static void UpdateFallingBerries(void)
         if (sGame->berryState[i] == BERRYSTATE_NONE || sGame->berryState[i] == BERRYSTATE_PICKED)
         {
             sGame->berriesFalling = TRUE;
-            
+
             if (game->player.berries.fallDist[i] >= MAX_FALL_DIST)
             {
                 // Berry hit the ground
@@ -2591,9 +2591,9 @@ static void ResetForPlayAgainPrompt(void)
 }
 
 static const s16 sBerryScoreMultipliers[] = {
-    [BERRY_BLUE]   = 10, 
-    [BERRY_GREEN]  = 30, 
-    [BERRY_GOLD]   = 50, 
+    [BERRY_BLUE]   = 10,
+    [BERRY_GREEN]  = 30,
+    [BERRY_GOLD]   = 50,
     [BERRY_MISSED] = 50 // Subtracted
 };
 
@@ -2788,7 +2788,7 @@ static u32 SetScoreResults(void)
     u8 numPlayers = sGame->numPlayers;
 
     GetHighestScore(); // Useless call
-    
+
     if (GetHighestScore() == 0)
     {
         // No one scored any points, put everyone in last place with a score of 0.
@@ -2810,7 +2810,7 @@ static u32 SetScoreResults(void)
     {
         u32 score = GetScoreByRanking(ranking);
         u8 curRanking = nextRanking;
-        
+
         // Find all players with the score for this ranking.
         // Increment nextRanking but not curRanking to allow
         // for ties
@@ -3028,19 +3028,19 @@ static const u16 sDebug_BerryResults[MAX_RFU_PLAYERS][4] =
         [BERRY_GREEN]  = 0,
         [BERRY_GOLD]   = 90,
         [BERRY_MISSED] = MAX_BERRIES
-    }, 
+    },
     {
         [BERRY_BLUE]   = MAX_BERRIES,
         [BERRY_GREEN]  = MAX_BERRIES,
         [BERRY_GOLD]   = 70,
         [BERRY_MISSED] = MAX_BERRIES
-    }, 
+    },
     {
         [BERRY_BLUE]   = MAX_BERRIES,
         [BERRY_GREEN]  = 0,
         [BERRY_GOLD]   = MAX_BERRIES,
         [BERRY_MISSED] = 0
-    }, 
+    },
     {
         [BERRY_BLUE]   = MAX_BERRIES,
         [BERRY_GREEN]  = MAX_BERRIES,
@@ -3048,7 +3048,7 @@ static const u16 sDebug_BerryResults[MAX_RFU_PLAYERS][4] =
         [BERRY_MISSED] = 0
     },
     {
-        [BERRY_BLUE]   = MAX_BERRIES, 
+        [BERRY_BLUE]   = MAX_BERRIES,
         [BERRY_GREEN]  = MAX_BERRIES,
         [BERRY_GOLD]   = MAX_BERRIES,
         [BERRY_MISSED] = 0
@@ -3159,14 +3159,14 @@ struct GameStatePacket
     bool8 missedBerry_Player5:1;
 };
 
-static void SendPacket_GameState(struct DodrioGame_Player *player, 
-                                 struct DodrioGame_PlayerCommData *player1, 
-                                 struct DodrioGame_PlayerCommData *player2, 
-                                 struct DodrioGame_PlayerCommData *player3, 
-                                 struct DodrioGame_PlayerCommData *player4, 
-                                 struct DodrioGame_PlayerCommData *player5, 
-                                 u8 numGraySquares, 
-                                 bool32 berriesFalling, 
+static void SendPacket_GameState(struct DodrioGame_Player *player,
+                                 struct DodrioGame_PlayerCommData *player1,
+                                 struct DodrioGame_PlayerCommData *player2,
+                                 struct DodrioGame_PlayerCommData *player3,
+                                 struct DodrioGame_PlayerCommData *player4,
+                                 struct DodrioGame_PlayerCommData *player5,
+                                 u8 numGraySquares,
+                                 bool32 berriesFalling,
                                  bool32 allReadyToEnd)
 {
     struct GameStatePacket packet;
@@ -3219,15 +3219,15 @@ static void SendPacket_GameState(struct DodrioGame_Player *player,
     Rfu_SendPacket(&packet);
 }
 
-static bool32 RecvPacket_GameState(u32 playerId, 
-                                   struct DodrioGame_Player *player, 
-                                   struct DodrioGame_PlayerCommData *player1, 
-                                   struct DodrioGame_PlayerCommData *player2, 
-                                   struct DodrioGame_PlayerCommData *player3, 
-                                   struct DodrioGame_PlayerCommData *player4, 
-                                   struct DodrioGame_PlayerCommData *player5, 
-                                   u8 *numGraySquares, 
-                                   bool32 *berriesFalling, 
+static bool32 RecvPacket_GameState(u32 playerId,
+                                   struct DodrioGame_Player *player,
+                                   struct DodrioGame_PlayerCommData *player1,
+                                   struct DodrioGame_PlayerCommData *player2,
+                                   struct DodrioGame_PlayerCommData *player3,
+                                   struct DodrioGame_PlayerCommData *player4,
+                                   struct DodrioGame_PlayerCommData *player5,
+                                   u8 *numGraySquares,
+                                   bool32 *berriesFalling,
                                    bool32 *allReadyToEnd)
 {
     struct GameStatePacket *packet;
@@ -3503,7 +3503,7 @@ static const u8 sActiveColumnMap_Duplicate[MAX_RFU_PLAYERS][MAX_RFU_PLAYERS][NUM
         {6, 7, 8, 9, 0, 1, 2, 3, 4, 5, 6},
         {8, 9, 0, 1, 2, 3, 4, 5, 6, 7, 8},
     },
-}; 
+};
 
 // Unused duplicate of sDodrioHeadToColumnMap
 static const u8 sDodrioHeadToColumnMap_Duplicate[MAX_RFU_PLAYERS][MAX_RFU_PLAYERS][3] =
@@ -3913,11 +3913,11 @@ static u32 DoDodrioMissedAnim(struct Sprite *sprite)
             break;
         }
 
-        sprite->pos1.x += x;
+        sprite->x += x;
         if (++sprite->sTimer >= 40)
         {
             sprite->sState = 0;
-            sprite->pos1.x = GetDodrioXPos(0, GetNumPlayers());
+            sprite->x = GetDodrioXPos(0, GetNumPlayers());
         }
     }
 
@@ -3995,8 +3995,8 @@ static void InitStatusBarPos(void)
     for (i = 0; i < NUM_STATUS_SQUARES; i++)
     {
         struct Sprite *sprite = &gSprites[sStatusBar->spriteIds[i]];
-        sprite->pos1.x = (i * 16) + 48;
-        sprite->pos1.y = -8 - (i * 8);
+        sprite->x = (i * 16) + 48;
+        sprite->y = -8 - (i * 8);
         sStatusBar->entered[i] = FALSE;
     }
 }
@@ -4057,11 +4057,11 @@ static bool32 DoStatusBarIntro(void)
     {
         struct Sprite *sprite = &gSprites[sStatusBar->spriteIds[i]];
         sStatusBar->yChange[i] = 2;
-        if (sStatusBar->entered[i] && sprite->pos1.y == 8)
+        if (sStatusBar->entered[i] && sprite->y == 8)
             continue;
 
         animActive = TRUE;
-        if (sprite->pos1.y == 8)
+        if (sprite->y == 8)
         {
             if (sStatusBar->entered[i])
                 continue;
@@ -4072,7 +4072,7 @@ static bool32 DoStatusBarIntro(void)
             sStatusBar->yChange[i] = -16;
             PlaySE(SE_CLICK);
         }
-        sprite->pos1.y += sStatusBar->yChange[i];
+        sprite->y += sStatusBar->yChange[i];
     }
 
     if (animActive)
@@ -4117,7 +4117,7 @@ static void UpdateStatusBarAnim(u8 numEmpty)
                 StartSpriteAnim(&gSprites[sStatusBar->spriteIds[i]], STATUS_YELLOW);
             }
         }
-        
+
         // Set remaining squares gray
         for (; i < NUM_STATUS_SQUARES; i++)
             StartSpriteAnim(&gSprites[sStatusBar->spriteIds[i]], STATUS_GRAY);
@@ -4132,15 +4132,15 @@ static void SetStatusBarInvisibility(bool8 invisible)
 }
 
 static const u8 sUnusedSounds[] = {
-    SE_M_CHARM, 
-    SE_NOTE_C, 
-    SE_NOTE_D, 
-    SE_NOTE_E, 
-    SE_NOTE_F, 
-    SE_NOTE_G, 
-    SE_NOTE_A, 
-    SE_NOTE_B, 
-    SE_NOTE_C_HIGH, 
+    SE_M_CHARM,
+    SE_NOTE_C,
+    SE_NOTE_D,
+    SE_NOTE_E,
+    SE_NOTE_F,
+    SE_NOTE_G,
+    SE_NOTE_A,
+    SE_NOTE_B,
+    SE_NOTE_C_HIGH,
     SE_RG_CARD_OPEN
 };
 
@@ -4245,7 +4245,7 @@ static void SetBerryIconsInvisibility(bool8 invisible)
 
 static void SetBerryYPos(u8 id, u8 y)
 {
-    gSprites[*sBerrySpriteIds[id]].pos1.y = y * 8;
+    gSprites[*sBerrySpriteIds[id]].y = y * 8;
 }
 
 static void SetBerryAnim(u16 id, u8 animNum)
@@ -4256,8 +4256,8 @@ static void SetBerryAnim(u16 id, u8 animNum)
 // Unused
 static void UnusedSetSpritePos(u8 spriteId)
 {
-    gSprites[spriteId].pos1.x = 20 * spriteId + 50;
-    gSprites[spriteId].pos1.y = 50;
+    gSprites[spriteId].x = 20 * spriteId + 50;
+    gSprites[spriteId].y = 50;
 }
 
 // Gamefreak made a mistake there and goes out of bounds for the data array as it holds 8 elements
@@ -4279,16 +4279,16 @@ static void SpriteCB_Cloud(struct Sprite *sprite)
         {
             if (++sCloudSpriteIds[i][1] > moveDelays[i])
             {
-                sprite->pos1.x--;
+                sprite->x--;
                 sCloudSpriteIds[i][1] = 0;
             }
         }
     }
 }
 
-static const s16 sCloudStartCoords[NUM_CLOUDS][2] = 
+static const s16 sCloudStartCoords[NUM_CLOUDS][2] =
 {
-    {230, 55}, 
+    {230, 55},
     { 30, 74}
 };
 
@@ -4332,8 +4332,8 @@ static void ResetCloudPos(void)
     {
         struct Sprite *sprite = &gSprites[*sCloudSpriteIds[i]];
         sprite->sFrozen = TRUE;
-        sprite->pos1.x = sCloudStartCoords[i][0];
-        sprite->pos1.y = sCloudStartCoords[i][1];
+        sprite->x = sCloudStartCoords[i][0];
+        sprite->y = sCloudStartCoords[i][1];
     }
 }
 
@@ -4790,8 +4790,8 @@ static void ShowResults(void)
 
                 ConvertIntToDecimalStringN(gStringVar4, berriesPicked, STR_CONV_MODE_LEFT_ALIGN, 4);
                 width = GetStringWidth(1, gStringVar4, -1);
-                
-                // If player got the most of a berry type, highlight their number in red 
+
+                // If player got the most of a berry type, highlight their number in red
                 if (maxBerriesPicked == berriesPicked && maxBerriesPicked != 0)
                     AddTextPrinterParameterized3(sGfx->windowIds[1], 1, sResultsXCoords[j] - width, sResultsYCoords[i], sTextColorTable[COLORID_RED], -1, gStringVar4);
                 else
@@ -4974,7 +4974,7 @@ static void Msg_WantToPlayAgain(void)
         AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], 1, gText_No, 8, 17, -1, NULL);
         AddTextPrinterParameterized(sGfx->windowIds[WIN_YES_NO], 1, gText_SelectorArrow2, 0, ((y - 1) * 16) + 1, -1, NULL);
         CopyWindowToVram(sGfx->windowIds[WIN_YES_NO], 3);
-        
+
         // Increment state only if A or B button have been pressed.
         if (JOY_NEW(A_BUTTON))
         {
diff --git a/src/easy_chat.c b/src/easy_chat.c
index 753c2df76..79300bd52 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -857,7 +857,7 @@ static const struct WindowTemplate sEasyChatYesNoWindowTemplate = {
 
 static const u8 sText_Clear17[] = _("{CLEAR 17}");
 
-static const u8 *const sEasyChatKeyboardAlphabet[NUM_ALPHABET_ROWS] = 
+static const u8 *const sEasyChatKeyboardAlphabet[NUM_ALPHABET_ROWS] =
 {
     gText_EasyChatKeyboard_ABCDEFothers,
     gText_EasyChatKeyboard_GHIJKL,
@@ -2908,7 +2908,7 @@ static void GetQuizTitle(u8 *dst)
     u8 name[32];
     struct SaveBlock1 *saveBlock1 = gSaveBlock1Ptr;
     DynamicPlaceholderTextUtil_Reset();
-    
+
     // Buffer author's name
     if (StringLength(saveBlock1->lilycoveLady.quiz.playerName) != 0)
     {
@@ -4118,7 +4118,7 @@ static void BufferFrameTilemap(u16 *tilemap)
         // These frames fill the screen, no need to draw top/bottom edges
         right = sPhraseFrameDimensions[frameId].left + sPhraseFrameDimensions[frameId].width;
         bottom = sPhraseFrameDimensions[frameId].top + sPhraseFrameDimensions[frameId].height;
-        
+
         // Draw middle section
         for (y = sPhraseFrameDimensions[frameId].top; y < bottom; y++)
         {
@@ -4516,7 +4516,7 @@ static void BufferLowerWindowFrame(int left, int top, int width, int height)
     bottom = top + height - 1;
     x = left;
     y = top;
-    
+
     // Draw top edge
     tilemap[y * 32 + x] = FRAME_OFFSET_GREEN + FRAME_TILE_TOP_L_CORNER;
     x++;
@@ -4635,17 +4635,17 @@ static void SpriteCB_Cursor(struct Sprite *sprite)
         if (++sprite->sDelayTimer > 2)
         {
             sprite->sDelayTimer = 0;
-            if (++sprite->pos2.x > 0)
-                sprite->pos2.x = -6;
+            if (++sprite->x2 > 0)
+                sprite->x2 = -6;
         }
     }
 }
 
 static void SetMainCursorPos(u8 x, u8 y)
 {
-    sScreenControl->mainCursorSprite->pos1.x = x;
-    sScreenControl->mainCursorSprite->pos1.y = y;
-    sScreenControl->mainCursorSprite->pos2.x = 0;
+    sScreenControl->mainCursorSprite->x = x;
+    sScreenControl->mainCursorSprite->y = y;
+    sScreenControl->mainCursorSprite->x2 = 0;
     sScreenControl->mainCursorSprite->sDelayTimer = 0;
 }
 
@@ -4653,7 +4653,7 @@ static void StopMainCursorAnim(void)
 {
     sScreenControl->mainCursorSprite->sDelayTimer = 0;
     sScreenControl->mainCursorSprite->sAnimateCursor = FALSE;
-    sScreenControl->mainCursorSprite->pos2.x = 0;
+    sScreenControl->mainCursorSprite->x2 = 0;
 }
 
 static void StartMainCursorAnim(void)
@@ -4665,11 +4665,11 @@ static void CreateRectangleCursorSprites(void)
 {
     u8 spriteId = CreateSprite(&sSpriteTemplate_RectangleCursor, 0, 0, 3);
     sScreenControl->rectangleCursorSpriteRight = &gSprites[spriteId];
-    sScreenControl->rectangleCursorSpriteRight->pos2.x = 32;
+    sScreenControl->rectangleCursorSpriteRight->x2 = 32;
 
     spriteId = CreateSprite(&sSpriteTemplate_RectangleCursor, 0, 0, 3);
     sScreenControl->rectangleCursorSpriteLeft = &gSprites[spriteId];
-    sScreenControl->rectangleCursorSpriteLeft->pos2.x = -32;
+    sScreenControl->rectangleCursorSpriteLeft->x2 = -32;
 
     sScreenControl->rectangleCursorSpriteRight->hFlip = TRUE;
     UpdateRectangleCursorPos();
@@ -4688,7 +4688,7 @@ static void UpdateRectangleCursorPos(void)
     s8 column;
     s8 row;
 
-    if (sScreenControl->rectangleCursorSpriteRight 
+    if (sScreenControl->rectangleCursorSpriteRight
      && sScreenControl->rectangleCursorSpriteLeft)
     {
         GetKeyboardCursorColAndRow(&column, &row);
@@ -4705,23 +4705,23 @@ static void SetRectangleCursorPos_GroupMode(s8 column, s8 row)
     {
         // In group name window
         StartSpriteAnim(sScreenControl->rectangleCursorSpriteRight, RECTCURSOR_ANIM_ON_GROUP);
-        sScreenControl->rectangleCursorSpriteRight->pos1.x = column * 84 + 58;
-        sScreenControl->rectangleCursorSpriteRight->pos1.y = row * 16 + 96;
+        sScreenControl->rectangleCursorSpriteRight->x = column * 84 + 58;
+        sScreenControl->rectangleCursorSpriteRight->y = row * 16 + 96;
 
         StartSpriteAnim(sScreenControl->rectangleCursorSpriteLeft, RECTCURSOR_ANIM_ON_GROUP);
-        sScreenControl->rectangleCursorSpriteLeft->pos1.x = column * 84 + 58;
-        sScreenControl->rectangleCursorSpriteLeft->pos1.y = row * 16 + 96;
+        sScreenControl->rectangleCursorSpriteLeft->x = column * 84 + 58;
+        sScreenControl->rectangleCursorSpriteLeft->y = row * 16 + 96;
     }
     else
     {
         // In button window
         StartSpriteAnim(sScreenControl->rectangleCursorSpriteRight, RECTCURSOR_ANIM_ON_BUTTON);
-        sScreenControl->rectangleCursorSpriteRight->pos1.x = 216;
-        sScreenControl->rectangleCursorSpriteRight->pos1.y = row * 16 + 112;
+        sScreenControl->rectangleCursorSpriteRight->x = 216;
+        sScreenControl->rectangleCursorSpriteRight->y = row * 16 + 112;
 
         StartSpriteAnim(sScreenControl->rectangleCursorSpriteLeft, RECTCURSOR_ANIM_ON_BUTTON);
-        sScreenControl->rectangleCursorSpriteLeft->pos1.x = 216;
-        sScreenControl->rectangleCursorSpriteLeft->pos1.y = row * 16 + 112;
+        sScreenControl->rectangleCursorSpriteLeft->x = 216;
+        sScreenControl->rectangleCursorSpriteLeft->y = row * 16 + 112;
     }
 }
 
@@ -4748,23 +4748,23 @@ static void SetRectangleCursorPos_AlphabetMode(s8 column, s8 row)
         }
 
         StartSpriteAnim(sScreenControl->rectangleCursorSpriteRight, anim);
-        sScreenControl->rectangleCursorSpriteRight->pos1.x = x;
-        sScreenControl->rectangleCursorSpriteRight->pos1.y = y;
+        sScreenControl->rectangleCursorSpriteRight->x = x;
+        sScreenControl->rectangleCursorSpriteRight->y = y;
 
         StartSpriteAnim(sScreenControl->rectangleCursorSpriteLeft, anim);
-        sScreenControl->rectangleCursorSpriteLeft->pos1.x = x;
-        sScreenControl->rectangleCursorSpriteLeft->pos1.y = y;
+        sScreenControl->rectangleCursorSpriteLeft->x = x;
+        sScreenControl->rectangleCursorSpriteLeft->y = y;
     }
     else
     {
         // In button window
         StartSpriteAnim(sScreenControl->rectangleCursorSpriteRight, RECTCURSOR_ANIM_ON_BUTTON);
-        sScreenControl->rectangleCursorSpriteRight->pos1.x = 216;
-        sScreenControl->rectangleCursorSpriteRight->pos1.y = row * 16 + 112;
+        sScreenControl->rectangleCursorSpriteRight->x = 216;
+        sScreenControl->rectangleCursorSpriteRight->y = row * 16 + 112;
 
         StartSpriteAnim(sScreenControl->rectangleCursorSpriteLeft, RECTCURSOR_ANIM_ON_BUTTON);
-        sScreenControl->rectangleCursorSpriteLeft->pos1.x = 216;
-        sScreenControl->rectangleCursorSpriteLeft->pos1.y = row * 16 + 112;
+        sScreenControl->rectangleCursorSpriteLeft->x = 216;
+        sScreenControl->rectangleCursorSpriteLeft->y = row * 16 + 112;
     }
 }
 
@@ -4784,8 +4784,8 @@ static void SpriteCB_WordSelectCursor(struct Sprite *sprite)
     if (++sprite->sDelayTimer > 2)
     {
         sprite->sDelayTimer = 0;
-        if (++sprite->pos2.x > 0)
-            sprite->pos2.x = -6;
+        if (++sprite->x2 > 0)
+            sprite->x2 = -6;
     }
 }
 
@@ -4804,9 +4804,9 @@ static void SetWordSelectCursorPos(u8 x, u8 y)
 {
     if (sScreenControl->wordSelectCursorSprite)
     {
-        sScreenControl->wordSelectCursorSprite->pos1.x = x;
-        sScreenControl->wordSelectCursorSprite->pos1.y = y;
-        sScreenControl->wordSelectCursorSprite->pos2.x = 0;
+        sScreenControl->wordSelectCursorSprite->x = x;
+        sScreenControl->wordSelectCursorSprite->y = y;
+        sScreenControl->wordSelectCursorSprite->x2 = 0;
         sScreenControl->wordSelectCursorSprite->sDelayTimer = 0;
     }
 }
@@ -4824,7 +4824,7 @@ static void CreateSideWindowSprites(void)
 {
     u8 spriteId = CreateSprite(&sSpriteTemplate_ButtonWindow, 208, 128, 6);
     sScreenControl->buttonWindowSprite = &gSprites[spriteId];
-    sScreenControl->buttonWindowSprite->pos2.x = -64;
+    sScreenControl->buttonWindowSprite->x2 = -64;
 
     spriteId = CreateSprite(&sSpriteTemplate_ModeWindow, 208, 80, 5);
     sScreenControl->modeWindowSprite = &gSprites[spriteId];
@@ -4839,10 +4839,10 @@ static bool8 ShowSideWindow(void)
         return FALSE;
     case 0:
         // Slide button window on
-        sScreenControl->buttonWindowSprite->pos2.x += 8;
-        if (sScreenControl->buttonWindowSprite->pos2.x >= 0)
+        sScreenControl->buttonWindowSprite->x2 += 8;
+        if (sScreenControl->buttonWindowSprite->x2 >= 0)
         {
-            sScreenControl->buttonWindowSprite->pos2.x = 0;
+            sScreenControl->buttonWindowSprite->x2 = 0;
 
             // Set mode window anim
             if (!GetInAlphabetMode())
@@ -4881,8 +4881,8 @@ static bool8 DestroySideWindowSprites(void)
             sScreenControl->modeWindowState = 1;
         break;
     case 1:
-        sScreenControl->buttonWindowSprite->pos2.x -= 8;
-        if (sScreenControl->buttonWindowSprite->pos2.x <= -64)
+        sScreenControl->buttonWindowSprite->x2 -= 8;
+        if (sScreenControl->buttonWindowSprite->x2 <= -64)
         {
             DestroySprite(sScreenControl->modeWindowSprite);
             DestroySprite(sScreenControl->buttonWindowSprite);
@@ -4947,14 +4947,14 @@ static void SetScrollIndicatorXPos(bool32 inWordSelect)
     if (!inWordSelect)
     {
         // Keyboard (only relevant for group mode, can't scroll in alphabet mode)
-        sScreenControl->scrollIndicatorUpSprite->pos1.x = 96;
-        sScreenControl->scrollIndicatorDownSprite->pos1.x = 96;
+        sScreenControl->scrollIndicatorUpSprite->x = 96;
+        sScreenControl->scrollIndicatorDownSprite->x = 96;
     }
     else
     {
         // Word select
-        sScreenControl->scrollIndicatorUpSprite->pos1.x = 120;
-        sScreenControl->scrollIndicatorDownSprite->pos1.x = 120;
+        sScreenControl->scrollIndicatorUpSprite->x = 120;
+        sScreenControl->scrollIndicatorDownSprite->x = 120;
     }
 }
 
@@ -5532,16 +5532,16 @@ void InitEasyChatPhrases(void)
 
     for (i = 0; i < ARRAY_COUNT(sDefaultProfileWords); i++)
         gSaveBlock1Ptr->easyChatProfile[i] = sDefaultProfileWords[i];
-    
+
     for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
         gSaveBlock1Ptr->easyChatBattleStart[i] = sDefaultBattleStartWords[i];
-    
+
     for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
         gSaveBlock1Ptr->easyChatBattleWon[i] = sDefaultBattleWonWords[i];
-    
+
     for (i = 0; i < EASY_CHAT_BATTLE_WORDS_COUNT; i++)
         gSaveBlock1Ptr->easyChatBattleLost[i] = sDefaultBattleLostWords[i];
-    
+
     for (i = 0; i < MAIL_COUNT; i++)
     {
         for (j = 0; j < MAIL_WORDS_COUNT; j++)
@@ -5585,11 +5585,11 @@ static void SetUnlockedEasyChatGroups(void)
     sWordData->numUnlockedGroups = 0;
     if (GetNationalPokedexCount(FLAG_GET_SEEN))
         sWordData->unlockedGroupIds[sWordData->numUnlockedGroups++] = EC_GROUP_POKEMON;
-    
+
     // These groups are unlocked automatically
     for (i = EC_GROUP_TRAINER; i <= EC_GROUP_ADJECTIVES; i++)
         sWordData->unlockedGroupIds[sWordData->numUnlockedGroups++] = i;
-    
+
     if (FlagGet(FLAG_SYS_GAME_CLEAR))
     {
         sWordData->unlockedGroupIds[sWordData->numUnlockedGroups++] = EC_GROUP_EVENTS;
@@ -5627,7 +5627,7 @@ static u8 *BufferEasyChatWordGroupName(u8 *dest, u8 groupId, u16 totalChars)
         *str = CHAR_SPACE;
         str++;
     }
-    
+
     *str = EOS;
     return str;
 }
@@ -5646,7 +5646,7 @@ static u8 *CopyEasyChatWordPadded(u8 *dest, u16 easyChatWord, u16 totalChars)
         *str = CHAR_SPACE;
         str++;
     }
-    
+
     *str = EOS;
     return str;
 }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 576e5c0d9..4b668881a 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -716,7 +716,7 @@ static void SpriteCB_Egg_0(struct Sprite* sprite)
     else
     {
         sprite->data[1] = (sprite->data[1] + 20) & 0xFF;
-        sprite->pos2.x = Sin(sprite->data[1], 1);
+        sprite->x2 = Sin(sprite->data[1], 1);
         if (sprite->data[0] == 15)
         {
             PlaySE(SE_BALL);
@@ -739,7 +739,7 @@ static void SpriteCB_Egg_1(struct Sprite* sprite)
         else
         {
             sprite->data[1] = (sprite->data[1] + 20) & 0xFF;
-            sprite->pos2.x = Sin(sprite->data[1], 2);
+            sprite->x2 = Sin(sprite->data[1], 2);
             if (sprite->data[0] == 15)
             {
                 PlaySE(SE_BALL);
@@ -760,13 +760,13 @@ static void SpriteCB_Egg_2(struct Sprite* sprite)
             sprite->callback = SpriteCB_Egg_3;
             sprite->data[0] = 0;
             species = GetMonData(&gPlayerParty[sEggHatchData->eggPartyID], MON_DATA_SPECIES);
-            gSprites[sEggHatchData->pokeSpriteID].pos2.x = 0;
-            gSprites[sEggHatchData->pokeSpriteID].pos2.y = 0;
+            gSprites[sEggHatchData->pokeSpriteID].x2 = 0;
+            gSprites[sEggHatchData->pokeSpriteID].y2 = 0;
         }
         else
         {
             sprite->data[1] = (sprite->data[1] + 20) & 0xFF;
-            sprite->pos2.x = Sin(sprite->data[1], 2);
+            sprite->x2 = Sin(sprite->data[1], 2);
             if (sprite->data[0] == 15)
             {
                 PlaySE(SE_BALL);
@@ -819,7 +819,7 @@ static void SpriteCB_Egg_5(struct Sprite* sprite)
     if (sprite->data[0] == 8)
         BeginNormalPaletteFade(PALETTES_ALL, -1, 0x10, 0, RGB_WHITEALPHA);
     if (sprite->data[0] <= 9)
-        gSprites[sEggHatchData->pokeSpriteID].pos1.y -= 1;
+        gSprites[sEggHatchData->pokeSpriteID].y -= 1;
     if (sprite->data[0] > 40)
         sprite->callback = SpriteCallbackDummy;
     sprite->data[0]++;
@@ -830,12 +830,12 @@ static void SpriteCB_EggShard(struct Sprite* sprite)
     sprite->data[4] += sprite->data[1];
     sprite->data[5] += sprite->data[2];
 
-    sprite->pos2.x = sprite->data[4] / 256;
-    sprite->pos2.y = sprite->data[5] / 256;
+    sprite->x2 = sprite->data[4] / 256;
+    sprite->y2 = sprite->data[5] / 256;
 
     sprite->data[2] += sprite->data[3];
 
-    if (sprite->pos1.y + sprite->pos2.y > sprite->pos1.y + 20 && sprite->data[2] > 0)
+    if (sprite->y + sprite->y2 > sprite->y + 20 && sprite->data[2] > 0)
         DestroySprite(sprite);
 }
 
diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index eef2a15d8..9f265143c 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -745,7 +745,7 @@ int EReaderHandleTransfer(u8 mode, size_t size, const void * data, void * recvBu
     }
 
     return (sSendRecvMgr.xferState << EREADER_XFER_SHIFT)
-         | (sSendRecvMgr.cancellationReason << EREADER_CANCEL_SHIFT) 
+         | (sSendRecvMgr.cancellationReason << EREADER_CANCEL_SHIFT)
          | (sSendRecvMgr.checksumResult << EREADER_CHECKSUM_SHIFT);
 }
 
diff --git a/src/ereader_screen.c b/src/ereader_screen.c
index 438c4bec9..f5edbc628 100755
--- a/src/ereader_screen.c
+++ b/src/ereader_screen.c
@@ -240,7 +240,7 @@ static bool32 sub_81D5064(u16 *arg0, u16 arg1)
         *arg0 = 0;
         return TRUE;
     }
-    
+
     return FALSE;
 }
 
diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 67f203dcd..ba4f38419 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -157,7 +157,7 @@ const u8 gReflectionEffectPaletteMap[] = {1, 1, 6, 7, 8, 9, 6, 7, 8, 9, 11, 11,
 
 static const struct SpriteTemplate sCameraSpriteTemplate = {
     .tileTag = 0,
-    .paletteTag = 0xFFFF,
+    .paletteTag = TAG_NONE,
     .oam = &gDummyOamData,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -1406,7 +1406,7 @@ static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTempl
     if (objectEvent->movementType == MOVEMENT_TYPE_INVISIBLE)
         objectEvent->invisible = TRUE;
 
-    *(u16 *)&spriteTemplate->paletteTag = 0xFFFF;
+    *(u16 *)&spriteTemplate->paletteTag = TAG_NONE;
     spriteId = CreateSprite(spriteTemplate, 0, 0, 0);
     if (spriteId == MAX_SPRITES)
     {
@@ -1415,11 +1415,11 @@ static u8 TrySetupObjectEventSprite(struct ObjectEventTemplate *objectEventTempl
     }
 
     sprite = &gSprites[spriteId];
-    GetMapCoordsFromSpritePos(objectEvent->currentCoords.x + cameraX, objectEvent->currentCoords.y + cameraY, &sprite->pos1.x, &sprite->pos1.y);
+    GetMapCoordsFromSpritePos(objectEvent->currentCoords.x + cameraX, objectEvent->currentCoords.y + cameraY, &sprite->x, &sprite->y);
     sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
     sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
-    sprite->pos1.x += 8;
-    sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+    sprite->x += 8;
+    sprite->y += 16 + sprite->centerToCornerVecY;
     sprite->oam.paletteNum = paletteSlot;
     sprite->coordOffsetEnabled = TRUE;
     sprite->sObjEventId = objectEventId;
@@ -1531,7 +1531,7 @@ u8 AddPseudoObjectEvent(u16 graphicsId, void (*callback)(struct Sprite *), s16 x
 
     spriteTemplate = malloc(sizeof(struct SpriteTemplate));
     MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, callback, spriteTemplate, &subspriteTables);
-    if (spriteTemplate->paletteTag != 0xFFFF)
+    if (spriteTemplate->paletteTag != TAG_NONE)
     {
         LoadObjectEventPalette(spriteTemplate->paletteTag);
     }
@@ -1559,7 +1559,7 @@ u8 CreateObjectSprite(u8 graphicsId, u8 objectEventId, s16 x, s16 y, u8 z, u8 di
 
     graphicsInfo = GetObjectEventGraphicsInfo(graphicsId);
     MakeObjectTemplateFromObjectEventGraphicsInfo(graphicsId, UpdateObjectEventSprite, &spriteTemplate, &subspriteTables);
-    *(u16 *)&spriteTemplate.paletteTag = 0xFFFF;
+    *(u16 *)&spriteTemplate.paletteTag = TAG_NONE;
     x += 7;
     y += 7;
     SetSpritePosToOffsetMapCoords(&x, &y, 8, 16);
@@ -1569,7 +1569,7 @@ u8 CreateObjectSprite(u8 graphicsId, u8 objectEventId, s16 x, s16 y, u8 z, u8 di
         sprite = &gSprites[spriteId];
         sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
         sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
-        sprite->pos1.y += sprite->centerToCornerVecY;
+        sprite->y += sprite->centerToCornerVecY;
         sprite->oam.paletteNum = graphicsInfo->paletteSlot;
         if (sprite->oam.paletteNum >= 16)
         {
@@ -1705,7 +1705,7 @@ static void SpawnObjectEventOnReturnToField(u8 objectEventId, s16 x, s16 y)
     MakeObjectTemplateFromObjectEventGraphicsInfoWithCallbackIndex(objectEvent->graphicsId, objectEvent->movementType, &spriteTemplate, &subspriteTables);
     spriteTemplate.images = &spriteFrameImage;
 
-    *(u16 *)&spriteTemplate.paletteTag = 0xFFFF;
+    *(u16 *)&spriteTemplate.paletteTag = TAG_NONE;
     paletteSlot = graphicsInfo->paletteSlot;
     if (paletteSlot == 0)
     {
@@ -1720,17 +1720,17 @@ static void SpawnObjectEventOnReturnToField(u8 objectEventId, s16 x, s16 y)
         paletteSlot -= 16;
         _PatchObjectPalette(graphicsInfo->paletteTag, paletteSlot);
     }
-    *(u16 *)&spriteTemplate.paletteTag = 0xFFFF;
+    *(u16 *)&spriteTemplate.paletteTag = TAG_NONE;
 
     i = CreateSprite(&spriteTemplate, 0, 0, 0);
     if (i != MAX_SPRITES)
     {
         sprite = &gSprites[i];
-        GetMapCoordsFromSpritePos(x + objectEvent->currentCoords.x, y + objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+        GetMapCoordsFromSpritePos(x + objectEvent->currentCoords.x, y + objectEvent->currentCoords.y, &sprite->x, &sprite->y);
         sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
         sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
-        sprite->pos1.x += 8;
-        sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+        sprite->x += 8;
+        sprite->y += 16 + sprite->centerToCornerVecY;
         sprite->images = graphicsInfo->images;
         if (objectEvent->movementType == MOVEMENT_TYPE_PLAYER)
         {
@@ -1803,11 +1803,11 @@ void ObjectEventSetGraphicsId(struct ObjectEvent *objectEvent, u8 graphicsId)
     sprite->oam.paletteNum = paletteSlot;
     objectEvent->inanimate = graphicsInfo->inanimate;
     objectEvent->graphicsId = graphicsId;
-    SetSpritePosToMapCoords(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    SetSpritePosToMapCoords(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->x, &sprite->y);
     sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
     sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
-    sprite->pos1.x += 8;
-    sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+    sprite->x += 8;
+    sprite->y += 16 + sprite->centerToCornerVecY;
     if (objectEvent->trackedByCamera)
     {
         CameraObjectReset1();
@@ -1891,7 +1891,7 @@ const struct ObjectEventGraphicsInfo *GetObjectEventGraphicsInfo(u8 graphicsId)
     {
         graphicsId = OBJ_EVENT_GFX_NINJA_BOY;
     }
-    
+
     return gObjectEventGraphicsInfoPointers[graphicsId];
 }
 
@@ -1969,8 +1969,8 @@ void SetObjectEventSpritePosByLocalIdAndMap(u8 localId, u8 mapNum, u8 mapGroup,
     if (!TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId))
     {
         sprite = &gSprites[gObjectEvents[objectEventId].spriteId];
-        sprite->pos2.x = x;
-        sprite->pos2.y = y;
+        sprite->x2 = x;
+        sprite->y2 = y;
     }
 }
 
@@ -2105,11 +2105,11 @@ void MoveObjectEventToMapCoords(struct ObjectEvent *objectEvent, s16 x, s16 y)
     sprite = &gSprites[objectEvent->spriteId];
     graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
     SetObjectEventCoords(objectEvent, x, y);
-    SetSpritePosToMapCoords(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->pos1.x, &sprite->pos1.y);
+    SetSpritePosToMapCoords(objectEvent->currentCoords.x, objectEvent->currentCoords.y, &sprite->x, &sprite->y);
     sprite->centerToCornerVecX = -(graphicsInfo->width >> 1);
     sprite->centerToCornerVecY = -(graphicsInfo->height >> 1);
-    sprite->pos1.x += 8;
-    sprite->pos1.y += 16 + sprite->centerToCornerVecY;
+    sprite->x += 8;
+    sprite->y += 16 + sprite->centerToCornerVecY;
     ResetObjectEventFldEffData(objectEvent);
     if (objectEvent->trackedByCamera)
         CameraObjectReset1();
@@ -2211,8 +2211,8 @@ static void SpriteCB_CameraObject(struct Sprite *sprite)
 
 static void CameraObject_0(struct Sprite *sprite)
 {
-    sprite->pos1.x = gSprites[sprite->sLinkedSpriteId].pos1.x;
-    sprite->pos1.y = gSprites[sprite->sLinkedSpriteId].pos1.y;
+    sprite->x = gSprites[sprite->sLinkedSpriteId].x;
+    sprite->y = gSprites[sprite->sLinkedSpriteId].y;
     sprite->invisible = TRUE;
     sprite->sState = 1;
     CameraObject_1(sprite);
@@ -2220,19 +2220,19 @@ static void CameraObject_0(struct Sprite *sprite)
 
 static void CameraObject_1(struct Sprite *sprite)
 {
-    s16 x = gSprites[sprite->sLinkedSpriteId].pos1.x;
-    s16 y = gSprites[sprite->sLinkedSpriteId].pos1.y;
+    s16 x = gSprites[sprite->sLinkedSpriteId].x;
+    s16 y = gSprites[sprite->sLinkedSpriteId].y;
 
-    sprite->data[2] = x - sprite->pos1.x;
-    sprite->data[3] = y - sprite->pos1.y;
-    sprite->pos1.x = x;
-    sprite->pos1.y = y;
+    sprite->data[2] = x - sprite->x;
+    sprite->data[3] = y - sprite->y;
+    sprite->x = x;
+    sprite->y = y;
 }
 
 static void CameraObject_2(struct Sprite *sprite)
 {
-    sprite->pos1.x = gSprites[sprite->sLinkedSpriteId].pos1.x;
-    sprite->pos1.y = gSprites[sprite->sLinkedSpriteId].pos1.y;
+    sprite->x = gSprites[sprite->sLinkedSpriteId].x;
+    sprite->y = gSprites[sprite->sLinkedSpriteId].y;
     sprite->data[2] = 0;
     sprite->data[3] = 0;
 }
@@ -2311,8 +2311,8 @@ u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)
         if (!gSprites[i].inUse)
         {
             gSprites[i] = *sprite;
-            gSprites[i].pos1.x = x;
-            gSprites[i].pos1.y = y;
+            gSprites[i].x = x;
+            gSprites[i].y = y;
             gSprites[i].subpriority = subpriority;
             break;
         }
@@ -2329,8 +2329,8 @@ u8 CreateCopySpriteAt(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)
         if (!gSprites[i].inUse)
         {
             gSprites[i] = *sprite;
-            gSprites[i].pos1.x = x;
-            gSprites[i].pos1.y = y;
+            gSprites[i].x = x;
+            gSprites[i].y = y;
             gSprites[i].subpriority = subpriority;
             return i;
         }
@@ -7361,14 +7361,14 @@ bool8 MovementAction_Levitate_Step0(struct ObjectEvent *objectEvent, struct Spri
 bool8 MovementAction_StopLevitate_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     DestroyLevitateMovementTask(objectEvent->warpArrowSpriteId);
-    sprite->pos2.y = 0;
+    sprite->y2 = 0;
     sprite->sActionFuncId = 1;
     return TRUE;
 }
 
 bool8 MovementAction_StopLevitateAtTop_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    if (sprite->pos2.y == 0)
+    if (sprite->y2 == 0)
     {
         DestroyLevitateMovementTask(objectEvent->warpArrowSpriteId);
         sprite->sActionFuncId = 1;
@@ -7423,13 +7423,13 @@ static void UpdateObjectEventOffscreen(struct ObjectEvent *objectEvent, struct S
     graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
     if (sprite->coordOffsetEnabled)
     {
-        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
-        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
+        x = sprite->x + sprite->x2 + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
+        y = sprite->y + sprite->y2 + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
     }
     else
     {
-        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
-        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+        x = sprite->x + sprite->x2 + sprite->centerToCornerVecX;
+        y = sprite->y + sprite->y2 + sprite->centerToCornerVecY;
     }
     x2 = graphicsInfo->width;
     x2 += x;
@@ -7497,7 +7497,7 @@ static void ObjectEventUpdateMetatileBehaviors(struct ObjectEvent *objEvent)
 
 static void GetGroundEffectFlags_Reflection(struct ObjectEvent *objEvent, u32 *flags)
 {
-    u32 reflectionFlags[NUM_REFLECTION_TYPES - 1] = { 
+    u32 reflectionFlags[NUM_REFLECTION_TYPES - 1] = {
         [REFL_TYPE_ICE   - 1] = GROUND_EFFECT_FLAG_ICE_REFLECTION,
         [REFL_TYPE_WATER - 1] = GROUND_EFFECT_FLAG_WATER_REFLECTION
     };
@@ -7715,7 +7715,7 @@ static u8 ObjectEventGetNearbyReflectionType(struct ObjectEvent *objEvent)
             RETURN_REFLECTION_TYPE_AT(objEvent->previousCoords.x - j, objEvent->previousCoords.y + one + i)
         }
     }
-    
+
     return REFL_TYPE_NONE;
 }
 
@@ -7843,7 +7843,7 @@ void ObjectEventUpdateZCoord(struct ObjectEvent *objEvent)
 void SetObjectSubpriorityByZCoord(u8 elevation, struct Sprite *sprite, u8 subpriority)
 {
     s32 tmp = sprite->centerToCornerVecY;
-    u32 tmpa = *(u16 *)&sprite->pos1.y;
+    u32 tmpa = *(u16 *)&sprite->y;
     u32 tmpb = *(u16 *)&gSpriteCoordOffsetY;
     s32 tmp2 = (tmpa - tmp) + tmpb;
     u16 tmp3 = (16 - ((((u32)tmp2 + 8) & 0xFF) >> 4)) * 2;
@@ -8250,32 +8250,32 @@ void UnfreezeObjectEvents(void)
 
 static void Step1(struct Sprite *sprite, u8 dir)
 {
-    sprite->pos1.x += sDirectionToVectors[dir].x;
-    sprite->pos1.y += sDirectionToVectors[dir].y;
+    sprite->x += sDirectionToVectors[dir].x;
+    sprite->y += sDirectionToVectors[dir].y;
 }
 
 static void Step2(struct Sprite *sprite, u8 dir)
 {
-    sprite->pos1.x += 2 * (u16) sDirectionToVectors[dir].x;
-    sprite->pos1.y += 2 * (u16) sDirectionToVectors[dir].y;
+    sprite->x += 2 * (u16) sDirectionToVectors[dir].x;
+    sprite->y += 2 * (u16) sDirectionToVectors[dir].y;
 }
 
 static void Step3(struct Sprite *sprite, u8 dir)
 {
-    sprite->pos1.x += 2 * (u16) sDirectionToVectors[dir].x + (u16) sDirectionToVectors[dir].x;
-    sprite->pos1.y += 2 * (u16) sDirectionToVectors[dir].y + (u16) sDirectionToVectors[dir].y;
+    sprite->x += 2 * (u16) sDirectionToVectors[dir].x + (u16) sDirectionToVectors[dir].x;
+    sprite->y += 2 * (u16) sDirectionToVectors[dir].y + (u16) sDirectionToVectors[dir].y;
 }
 
 static void Step4(struct Sprite *sprite, u8 dir)
 {
-    sprite->pos1.x += 4 * (u16) sDirectionToVectors[dir].x;
-    sprite->pos1.y += 4 * (u16) sDirectionToVectors[dir].y;
+    sprite->x += 4 * (u16) sDirectionToVectors[dir].x;
+    sprite->y += 4 * (u16) sDirectionToVectors[dir].y;
 }
 
 static void Step8(struct Sprite *sprite, u8 dir)
 {
-    sprite->pos1.x += 8 * (u16) sDirectionToVectors[dir].x;
-    sprite->pos1.y += 8 * (u16) sDirectionToVectors[dir].y;
+    sprite->x += 8 * (u16) sDirectionToVectors[dir].x;
+    sprite->y += 8 * (u16) sDirectionToVectors[dir].y;
 }
 
 #define sTimer data[5]
@@ -8445,20 +8445,20 @@ static bool8 AnimateSpriteInFigure8(struct Sprite *sprite)
     switch(sprite->data[7])
     {
     case 0:
-        sprite->pos2.x += GetFigure8XOffset(sprite->data[6]);
-        sprite->pos2.y += GetFigure8YOffset(sprite->data[6]);
+        sprite->x2 += GetFigure8XOffset(sprite->data[6]);
+        sprite->y2 += GetFigure8YOffset(sprite->data[6]);
         break;
     case 1:
-        sprite->pos2.x -= GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
-        sprite->pos2.y += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
+        sprite->x2 -= GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
+        sprite->y2 += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
         break;
     case 2:
-        sprite->pos2.x -= GetFigure8XOffset(sprite->data[6]);
-        sprite->pos2.y += GetFigure8YOffset(sprite->data[6]);
+        sprite->x2 -= GetFigure8XOffset(sprite->data[6]);
+        sprite->y2 += GetFigure8YOffset(sprite->data[6]);
         break;
     case 3:
-        sprite->pos2.x += GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
-        sprite->pos2.y += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
+        sprite->x2 += GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
+        sprite->y2 += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->data[6]);
         break;
     }
     if (++sprite->data[6] == FIGURE_8_LENGTH)
@@ -8468,8 +8468,8 @@ static bool8 AnimateSpriteInFigure8(struct Sprite *sprite)
     }
     if (sprite->data[7] == 4)
     {
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
+        sprite->y2 = 0;
+        sprite->x2 = 0;
         finished = TRUE;
     }
     return finished;
@@ -8521,7 +8521,7 @@ static u8 DoJumpSpriteMovement(struct Sprite *sprite)
     if (sprite->sSpeed)
         Step1(sprite, sprite->sDirection);
 
-    sprite->pos2.y = GetJumpY(sprite->sTimer >> speedToShift[sprite->sSpeed], sprite->sJumpType);
+    sprite->y2 = GetJumpY(sprite->sTimer >> speedToShift[sprite->sSpeed], sprite->sJumpType);
 
     sprite->sTimer++;
 
@@ -8530,7 +8530,7 @@ static u8 DoJumpSpriteMovement(struct Sprite *sprite)
 
     if (sprite->sTimer >= speedToTime[sprite->sSpeed])
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         result = JUMP_FINISHED;
     }
 
@@ -8546,7 +8546,7 @@ static u8 DoJumpSpecialSpriteMovement(struct Sprite *sprite)
     if (sprite->sSpeed && !(sprite->sTimer & 1))
         Step1(sprite, sprite->sDirection);
 
-    sprite->pos2.y = GetJumpY(sprite->sTimer >> speedToShift[sprite->sSpeed], sprite->sJumpType);
+    sprite->y2 = GetJumpY(sprite->sTimer >> speedToShift[sprite->sSpeed], sprite->sJumpType);
 
     sprite->sTimer++;
 
@@ -8555,7 +8555,7 @@ static u8 DoJumpSpecialSpriteMovement(struct Sprite *sprite)
 
     if (sprite->sTimer >= speedToTime[sprite->sSpeed])
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         result = JUMP_FINISHED;
     }
 
@@ -8603,13 +8603,13 @@ void UpdateObjectEventSpriteInvisibility(struct Sprite *sprite, bool8 invisible)
 
     if (sprite->coordOffsetEnabled)
     {
-        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
-        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
+        x = sprite->x + sprite->x2 + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
+        y = sprite->y + sprite->y2 + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
     }
     else
     {
-        x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
-        y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
+        x = sprite->x + sprite->x2 + sprite->centerToCornerVecX;
+        y = sprite->y + sprite->y2 + sprite->centerToCornerVecY;
     }
 
     x2 = x - (sprite->centerToCornerVecX >> 1);
@@ -8735,13 +8735,13 @@ static void MoveUnionRoomObjectUp(struct Sprite *sprite)
     switch(sprite->sAnimState)
     {
         case 0:
-            sprite->pos2.y = 0;
+            sprite->y2 = 0;
             sprite->sAnimState++;
         case 1:
-            sprite->pos2.y -= 8;
-            if (sprite->pos2.y == -DISPLAY_HEIGHT)
+            sprite->y2 -= 8;
+            if (sprite->y2 == -DISPLAY_HEIGHT)
             {
-                sprite->pos2.y = 0;
+                sprite->y2 = 0;
                 sprite->sInvisible = TRUE;
                 sprite->sAnimNum = 0;
                 sprite->sAnimState = 0;
@@ -8754,11 +8754,11 @@ static void MoveUnionRoomObjectDown(struct Sprite *sprite)
     switch(sprite->sAnimState)
     {
         case 0:
-            sprite->pos2.y = -DISPLAY_HEIGHT;
+            sprite->y2 = -DISPLAY_HEIGHT;
             sprite->sAnimState++;
         case 1:
-            sprite->pos2.y += 8;
-            if(sprite->pos2.y == 0)
+            sprite->y2 += 8;
+            if(sprite->y2 == 0)
             {
                 sprite->sAnimNum = 0;
                 sprite->sAnimState = 0;
@@ -8815,8 +8815,8 @@ static void DoShadowFieldEffect(struct ObjectEvent *objectEvent)
 static void DoRippleFieldEffect(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
     const struct ObjectEventGraphicsInfo *graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
-    gFieldEffectArguments[0] = sprite->pos1.x;
-    gFieldEffectArguments[1] = sprite->pos1.y + (graphicsInfo->height >> 1) - 2;
+    gFieldEffectArguments[0] = sprite->x;
+    gFieldEffectArguments[1] = sprite->y + (graphicsInfo->height >> 1) - 2;
     gFieldEffectArguments[2] = 151;
     gFieldEffectArguments[3] = 3;
     FieldEffectStart(FLDEFF_RIPPLE);
@@ -8950,7 +8950,7 @@ static void ApplyLevitateMovement(u8 taskId)
     sprite = &gSprites[objectEvent->spriteId];
 
     if(!(task->data[2] & 3))
-        sprite->pos2.y += task->data[3];
+        sprite->y2 += task->data[3];
 
     if(!(task->data[2] & 15))
         task->data[3] = -task->data[3];
@@ -8982,32 +8982,32 @@ void FreezeObjectEventsExceptTwo(u8 objectEventId1, u8 objectEventId2)
 
 u8 MovementAction_FlyUp_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    sprite->pos2.y = 0;
+    sprite->y2 = 0;
     sprite->sActionFuncId++;
     return FALSE;
 }
 
 u8 MovementAction_FlyUp_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    sprite->pos2.y -= 8;
+    sprite->y2 -= 8;
 
-    if(sprite->pos2.y == -DISPLAY_HEIGHT)
+    if(sprite->y2 == -DISPLAY_HEIGHT)
         sprite->sActionFuncId++;
     return FALSE;
 }
 
 u8 MovementAction_FlyDown_Step0(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    sprite->pos2.y = -DISPLAY_HEIGHT;
+    sprite->y2 = -DISPLAY_HEIGHT;
     sprite->sActionFuncId++;
     return FALSE;
 }
 
 u8 MovementAction_FlyDown_Step1(struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    sprite->pos2.y += 8;
+    sprite->y2 += 8;
 
-    if(!sprite->pos2.y)
+    if(!sprite->y2)
         sprite->sActionFuncId++;
     return FALSE;
 }
diff --git a/src/evolution_graphics.c b/src/evolution_graphics.c
index 2a3aaa9e8..50098743d 100644
--- a/src/evolution_graphics.c
+++ b/src/evolution_graphics.c
@@ -115,18 +115,18 @@ static void SetEvoSparklesMatrices(void)
 
 static void SpriteCB_Sparkle_SpiralUpward(struct Sprite* sprite)
 {
-    if (sprite->pos1.y > 8)
+    if (sprite->y > 8)
     {
         u8 matrixNum;
 
-        sprite->pos1.y = 88 - (sprite->data[7] * sprite->data[7]) / 80;
-        sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4;
-        sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]);
+        sprite->y = 88 - (sprite->data[7] * sprite->data[7]) / 80;
+        sprite->y2 = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4;
+        sprite->x2 = Cos((u8)(sprite->data[6]), sprite->data[5]);
         sprite->data[6] += 4;
         if (sprite->data[7] & 1)
             sprite->data[5]--;
         sprite->data[7]++;
-        if (sprite->pos2.y > 0)
+        if (sprite->y2 > 0)
             sprite->subpriority = 1;
         else
             sprite->subpriority = 20;
@@ -155,11 +155,11 @@ static void CreateSparkle_SpiralUpward(u8 arg0)
 
 static void SpriteCB_Sparkle_ArcDown(struct Sprite* sprite)
 {
-    if (sprite->pos1.y < 88)
+    if (sprite->y < 88)
     {
-        sprite->pos1.y = 8 + (sprite->data[7] * sprite->data[7]) / 5;
-        sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4;
-        sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]);
+        sprite->y = 8 + (sprite->data[7] * sprite->data[7]) / 5;
+        sprite->y2 = Sin((u8)(sprite->data[6]), sprite->data[5]) / 4;
+        sprite->x2 = Cos((u8)(sprite->data[6]), sprite->data[5]);
         sprite->data[5] = 8 + Sin((u8)(sprite->data[7] * 4), 40);
         sprite->data[7]++;
     }
@@ -186,8 +186,8 @@ static void SpriteCB_Sparkle_CircleInward(struct Sprite* sprite)
 {
     if (sprite->data[5] > 8)
     {
-        sprite->pos2.y = Sin((u8)(sprite->data[6]), sprite->data[5]);
-        sprite->pos2.x = Cos((u8)(sprite->data[6]), sprite->data[5]);
+        sprite->y2 = Sin((u8)(sprite->data[6]), sprite->data[5]);
+        sprite->x2 = Cos((u8)(sprite->data[6]), sprite->data[5]);
         sprite->data[5] -= sprite->data[3];
         sprite->data[6] += 4;
     }
@@ -214,13 +214,13 @@ static void CreateSparkle_CircleInward(u8 arg0, u8 arg1)
 static void SpriteCB_Sparkle_Spray(struct Sprite* sprite)
 {
     if (!(sprite->data[7] & 3))
-        sprite->pos1.y++;
+        sprite->y++;
     if (sprite->data[6] < 128)
     {
         u8 matrixNum;
 
-        sprite->pos2.y = -Sin((u8)(sprite->data[6]), sprite->data[5]);
-        sprite->pos1.x = 120 + (sprite->data[3] * sprite->data[7]) / 3;
+        sprite->y2 = -Sin((u8)(sprite->data[6]), sprite->data[5]);
+        sprite->x = 120 + (sprite->data[3] * sprite->data[7]) / 3;
         sprite->data[6]++;
         matrixNum = 31 - (sprite->data[6] * 12 / 128);
         if (sprite->data[6] > 64)
diff --git a/src/evolution_scene.c b/src/evolution_scene.c
index 08f816f4f..bd76993dc 100644
--- a/src/evolution_scene.c
+++ b/src/evolution_scene.c
@@ -82,7 +82,7 @@ static const u8 sText_ShedinjaJapaneseName[] = _("ヌケニン");
 // The below table is used by Task_UpdateBgPalette to control the speed at which the bg color updates.
 // The first two values are indexes into sBgAnim_PalIndexes (indirectly, via sBgAnimPal), and are
 // the start and end of the range of colors in sBgAnim_PalIndexes it will move through incrementally
-// before starting over. It will repeat this cycle x number of times, where x = the 3rd value, 
+// before starting over. It will repeat this cycle x number of times, where x = the 3rd value,
 // delaying each increment by y, where y = the 4th value.
 // Once it has cycled x number of times, it will move to the next array in this table.
 static const u8 sBgAnim_PaletteControl[][4] =
diff --git a/src/field_door.c b/src/field_door.c
index 8aeb1d491..3f2034ea6 100644
--- a/src/field_door.c
+++ b/src/field_door.c
@@ -307,7 +307,7 @@ static void door_build_blockdef(u16 *a, u16 b, const u8 *c)
 static void DrawCurrentDoorAnimFrame(const struct DoorGraphics *gfx, u32 x, u32 y, const u8 *pal)
 {
     u16 arr[24];
-    
+
     if (gfx->size == 2)
     {
         door_build_blockdef(&arr[8], 0x3F0, pal);
@@ -524,7 +524,7 @@ bool8 FieldIsDoorAnimationRunning(void)
 u32 GetDoorSoundEffect(u32 x, u32 y)
 {
     int sound = GetDoorSoundType(sDoorAnimGraphicsTable, x, y);
-    
+
     if (sound == DOOR_SOUND_NORMAL)
         return SE_DOOR;
     else if (sound == DOOR_SOUND_SLIDING)
@@ -540,7 +540,7 @@ static bool8 ShouldUseMultiCorridorDoor(void)
 {
     if (FlagGet(FLAG_ENABLE_MULTI_CORRIDOR_DOOR))
     {
-        if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR) 
+        if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR)
             && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR))
         {
             return TRUE;
diff --git a/src/field_effect.c b/src/field_effect.c
index 8152f19bb..90d43c809 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -348,7 +348,7 @@ static const union AnimCmd *const sAnimTable_NewGameBirch[] =
 
 static const struct SpriteTemplate sSpriteTemplate_NewGameBirch =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = 0x1006,
     .oam = &sOam_64x64,
     .anims = sAnimTable_NewGameBirch,
@@ -407,35 +407,35 @@ static const struct SpriteFrameImage sPicTable_HofMonitorSmall[] =
 static const struct Subsprite sSubsprites_PokecenterMonitor[] =
 {
     {
-        .x = -12, 
-        .y =  -8, 
-        .shape = SPRITE_SHAPE(16x8), 
+        .x = -12,
+        .y =  -8,
+        .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
-        .tileOffset = 0, 
+        .tileOffset = 0,
         .priority = 2
     },
     {
-        .x =  4, 
+        .x =  4,
         .y = -8,
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 2, 
-        .priority = 2 
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 2,
+        .priority = 2
     },
     {
-        .x = -12, 
-        .y =   0, 
-        .shape = SPRITE_SHAPE(16x8), 
+        .x = -12,
+        .y =   0,
+        .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
-        .tileOffset = 3, 
+        .tileOffset = 3,
         .priority = 2
     },
     {
-        .x = 4, 
-        .y = 0, 
-        .shape = SPRITE_SHAPE(8x8), 
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 5, 
+        .x = 4,
+        .y = 0,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 5,
         .priority = 2
     }
 };
@@ -445,35 +445,35 @@ static const struct SubspriteTable sSubspriteTable_PokecenterMonitor = subsprite
 static const struct Subsprite sSubsprites_HofMonitorBig[] =
 {
     {
-        .x = -32, 
-        .y = -8, 
-        .shape = SPRITE_SHAPE(32x8), 
+        .x = -32,
+        .y = -8,
+        .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
-        .tileOffset = 0, 
+        .tileOffset = 0,
         .priority = 2
     },
     {
-        .x =  0, 
-        .y = -8, 
-        .shape = SPRITE_SHAPE(32x8), 
+        .x =  0,
+        .y = -8,
+        .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
-        .tileOffset = 4, 
+        .tileOffset = 4,
         .priority = 2
     },
     {
-        .x = -32, 
-        .y =  0, 
-        .shape = SPRITE_SHAPE(32x8), 
+        .x = -32,
+        .y =  0,
+        .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
-        .tileOffset = 8, 
+        .tileOffset = 8,
         .priority = 2
     },
     {
-        .x =   0, 
-        .y =  0, 
-        .shape = SPRITE_SHAPE(32x8), 
+        .x =   0,
+        .y =  0,
+        .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
-        .tileOffset = 12, 
+        .tileOffset = 12,
         .priority = 2
     }
 };
@@ -513,7 +513,7 @@ static const union AnimCmd *const sAnims_HofMonitor[] =
 
 static const struct SpriteTemplate sSpriteTemplate_PokeballGlow =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_POKEBALL_GLOW,
     .oam = &sOam_8x8,
     .anims = sAnims_Flicker,
@@ -524,7 +524,7 @@ static const struct SpriteTemplate sSpriteTemplate_PokeballGlow =
 
 static const struct SpriteTemplate sSpriteTemplate_PokecenterMonitor =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &sOam_16x16,
     .anims = sAnims_Flicker,
@@ -535,7 +535,7 @@ static const struct SpriteTemplate sSpriteTemplate_PokecenterMonitor =
 
 static const struct SpriteTemplate sSpriteTemplate_HofMonitorBig =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_HOF_MONITOR,
     .oam = &sOam_16x16,
     .anims = sAnims_HofMonitor,
@@ -546,7 +546,7 @@ static const struct SpriteTemplate sSpriteTemplate_HofMonitorBig =
 
 static const struct SpriteTemplate sSpriteTemplate_HofMonitorSmall =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_HOF_MONITOR,
     .oam = &sOam_32x16,
     .anims = sAnims_HofMonitor,
@@ -809,7 +809,7 @@ void FieldEffectFreeTilesIfUnused(u16 tileStart)
     u8 i;
     u16 tag = GetSpriteTileTagByTileStart(tileStart);
 
-    if (tag != 0xFFFF)
+    if (tag != TAG_NONE)
     {
         for (i = 0; i < MAX_SPRITES; i++)
             if (gSprites[i].inUse && gSprites[i].usingSheet && tileStart == gSprites[i].sheetTileStart)
@@ -823,7 +823,7 @@ void FieldEffectFreePaletteIfUnused(u8 paletteNum)
     u8 i;
     u16 tag = GetSpritePaletteTagByPaletteNum(paletteNum);
 
-    if (tag != 0xFFFF)
+    if (tag != TAG_NONE)
     {
         for (i = 0; i < MAX_SPRITES; i++)
             if (gSprites[i].inUse && gSprites[i].oam.paletteNum == paletteNum)
@@ -937,19 +937,19 @@ void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
 {
     int curRed, curGreen, curBlue;
     u16 color = gPlttBufferUnfaded[i];
-    
+
     curRed   = (color & RGB_RED);
     curGreen = (color & RGB_GREEN) >>  5;
     curBlue  = (color & RGB_BLUE)  >> 10;
-    
+
     curRed   += (((0x1F - curRed)   * r) >> 4);
     curGreen += (((0x1F - curGreen) * g) >> 4);
     curBlue  += (((0x1F - curBlue)  * b) >> 4);
-    
+
     color  = curRed;
     color |= (curGreen <<  5);
     color |= (curBlue  << 10);
-    
+
     gPlttBufferFaded[i] = color;
 }
 
@@ -958,19 +958,19 @@ void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
 {
     int curRed, curGreen, curBlue;
     u16 color = gPlttBufferUnfaded[i];
-    
+
     curRed   = (color & RGB_RED);
     curGreen = (color & RGB_GREEN) >>  5;
     curBlue  = (color & RGB_BLUE)  >> 10;
-    
+
     curRed   -= ((curRed   * r) >> 4);
     curGreen -= ((curGreen * g) >> 4);
     curBlue  -= ((curBlue  * b) >> 4);
-    
+
     color  = curRed;
     color |= (curGreen <<  5);
     color |= (curBlue  << 10);
-    
+
     gPlttBufferFaded[i] = color;
 }
 
@@ -1118,8 +1118,8 @@ static u8 CreateGlowingPokeballsEffect(s16 numMons, s16 x, s16 y, bool16 playHea
     struct Sprite *sprite;
     spriteId = CreateInvisibleSprite(SpriteCB_PokeballGlowEffect);
     sprite = &gSprites[spriteId];
-    sprite->pos2.x = x;
-    sprite->pos2.y = y;
+    sprite->x2 = x;
+    sprite->y2 = y;
     sprite->sPlayHealSe = playHealSe;
     sprite->sNumMons = numMons;
     sprite->sSpriteId = spriteId;
@@ -1137,7 +1137,7 @@ static void PokeballGlowEffect_PlaceBalls(struct Sprite *sprite)
     if (sprite->sTimer == 0 || (--sprite->sTimer) == 0)
     {
         sprite->sTimer = 25;
-        spriteId = CreateSpriteAtEnd(&sSpriteTemplate_PokeballGlow, sPokeballCoordOffsets[sprite->sCounter].x + sprite->pos2.x, sPokeballCoordOffsets[sprite->sCounter].y + sprite->pos2.y, 0);
+        spriteId = CreateSpriteAtEnd(&sSpriteTemplate_PokeballGlow, sPokeballCoordOffsets[sprite->sCounter].x + sprite->x2, sPokeballCoordOffsets[sprite->sCounter].y + sprite->y2, 0);
         gSprites[spriteId].oam.priority = 2;
         gSprites[spriteId].sEffectSpriteId = sprite->sSpriteId;
         sprite->sCounter++;
@@ -1461,7 +1461,7 @@ static bool8 FallWarpEffect_StartFall(struct Task *task)
     s16 centerToCornerVecY;
     sprite = &gSprites[gPlayerAvatar.spriteId];
     centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
-    sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
+    sprite->y2 = -(sprite->y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
     task->tFallOffset = 1;
     task->tTotalFall = 0;
     gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE;
@@ -1477,7 +1477,7 @@ static bool8 FallWarpEffect_Fall(struct Task *task)
 
     objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     sprite = &gSprites[gPlayerAvatar.spriteId];
-    sprite->pos2.y += task->tFallOffset;
+    sprite->y2 += task->tFallOffset;
     if (task->tFallOffset < 8)
     {
         task->tTotalFall += task->tFallOffset;
@@ -1485,19 +1485,19 @@ static bool8 FallWarpEffect_Fall(struct Task *task)
         if (task->tTotalFall & 0xf)
             task->tFallOffset <<= 1;
     }
-    if (task->tSetTrigger == FALSE && sprite->pos2.y >= -16)
+    if (task->tSetTrigger == FALSE && sprite->y2 >= -16)
     {
         task->tSetTrigger++;
         objectEvent->fixedPriority = 0;
         sprite->subspriteMode = task->tSubsprMode;
         objectEvent->triggerGroundEffectsOnMove = 1;
     }
-    if (sprite->pos2.y >= 0)
+    if (sprite->y2 >= 0)
     {
         PlaySE(SE_M_STRENGTH);
         objectEvent->triggerGroundEffectsOnStop = 1;
         objectEvent->landingJump = 1;
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         task->tState++;
     }
     return FALSE;
@@ -1635,8 +1635,8 @@ static void RideUpEscalatorOut(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
-    sprite->pos2.x = Cos(0x84, task->data[2]);
-    sprite->pos2.y = Sin(0x94, task->data[2]);
+    sprite->x2 = Cos(0x84, task->data[2]);
+    sprite->y2 = Sin(0x94, task->data[2]);
     task->data[3]++;
     if (task->data[3] & 1)
     {
@@ -1648,8 +1648,8 @@ static void RideDownEscalatorOut(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
-    sprite->pos2.x = Cos(0x7c, task->data[2]);
-    sprite->pos2.y = Sin(0x76, task->data[2]);
+    sprite->x2 = Cos(0x7c, task->data[2]);
+    sprite->y2 = Sin(0x76, task->data[2]);
     task->data[3]++;
     if (task->data[3] & 1)
     {
@@ -1715,7 +1715,7 @@ static bool8 EscalatorWarpIn_Init(struct Task *task)
         // If dest is down escalator tile, player is riding up
         behavior = TRUE;
         task->tState = 3; // jump to EscalatorWarpIn_Up_Init
-    } 
+    }
     else // MB_UP_ESCALATOR
     {
         // If dest is up escalator tile, player is riding down
@@ -1729,8 +1729,8 @@ static bool8 EscalatorWarpIn_Down_Init(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
-    sprite->pos2.x = Cos(0x84, task->data[1]);
-    sprite->pos2.y = Sin(0x94, task->data[1]);
+    sprite->x2 = Cos(0x84, task->data[1]);
+    sprite->y2 = Sin(0x94, task->data[1]);
     task->tState++;
     return FALSE;
 }
@@ -1739,8 +1739,8 @@ static bool8 EscalatorWarpIn_Down_Ride(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
-    sprite->pos2.x = Cos(0x84, task->data[1]);
-    sprite->pos2.y = Sin(0x94, task->data[1]);
+    sprite->x2 = Cos(0x84, task->data[1]);
+    sprite->y2 = Sin(0x94, task->data[1]);
     task->data[2]++;
     if (task->data[2] & 1)
     {
@@ -1748,8 +1748,8 @@ static bool8 EscalatorWarpIn_Down_Ride(struct Task *task)
     }
     if (task->data[1] == 0)
     {
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         task->tState = 5;
     }
     return FALSE;
@@ -1759,8 +1759,8 @@ static bool8 EscalatorWarpIn_Up_Init(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
-    sprite->pos2.x = Cos(0x7c, task->data[1]);
-    sprite->pos2.y = Sin(0x76, task->data[1]);
+    sprite->x2 = Cos(0x7c, task->data[1]);
+    sprite->y2 = Sin(0x76, task->data[1]);
     task->tState++;
     return FALSE;
 }
@@ -1769,8 +1769,8 @@ static bool8 EscalatorWarpIn_Up_Ride(struct Task *task)
 {
     struct Sprite *sprite;
     sprite = &gSprites[gPlayerAvatar.spriteId];
-    sprite->pos2.x = Cos(0x7c, task->data[1]);
-    sprite->pos2.y = Sin(0x76, task->data[1]);
+    sprite->x2 = Cos(0x7c, task->data[1]);
+    sprite->y2 = Sin(0x76, task->data[1]);
     task->data[2]++;
     if (task->data[2] & 1)
     {
@@ -1778,8 +1778,8 @@ static bool8 EscalatorWarpIn_Up_Ride(struct Task *task)
     }
     if (task->data[1] == 0)
     {
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         task->tState++;
     }
     return FALSE;
@@ -1972,7 +1972,7 @@ static bool8 LavaridgeGymB1FWarpEffect_CameraShake(struct Task *task, struct Obj
 
 static bool8 LavaridgeGymB1FWarpEffect_Launch(struct Task *task, struct ObjectEvent *objectEvent, struct Sprite *sprite)
 {
-    sprite->pos2.y = 0;
+    sprite->y2 = 0;
     task->data[3] = 1;
     gFieldEffectArguments[0] = objectEvent->currentCoords.x;
     gFieldEffectArguments[1] = objectEvent->currentCoords.y;
@@ -2001,9 +2001,9 @@ static bool8 LavaridgeGymB1FWarpEffect_Rise(struct Task *task, struct ObjectEven
     if (task->data[2] > 6)
     {
         centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
-        if (sprite->pos2.y > -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY))
+        if (sprite->y2 > -(sprite->y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY))
         {
-            sprite->pos2.y -= task->data[3];
+            sprite->y2 -= task->data[3];
             if (task->data[3] <= 7)
             {
                 task->data[3]++;
@@ -2013,7 +2013,7 @@ static bool8 LavaridgeGymB1FWarpEffect_Rise(struct Task *task, struct ObjectEven
             task->data[4] = 1;
         }
     }
-    if (task->data[5] == 0 && sprite->pos2.y < -0x10)
+    if (task->data[5] == 0 && sprite->y2 < -0x10)
     {
         task->data[5]++;
         objectEvent->fixedPriority = 1;
@@ -2265,7 +2265,7 @@ static void EscapeRopeWarpOutEffect_Spin(struct Task *task)
             gFieldCallback = FieldCallback_EscapeRopeWarpIn;
             SetMainCallback2(CB2_LoadMap);
             DestroyTask(FindTaskIdByFunc(Task_EscapeRopeWarpOut));
-        } 
+        }
         else if (task->tSpinDelay == 0 || (--task->tSpinDelay) == 0)
         {
             ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(spinDirections[objectEvent->facingDirection]));
@@ -2396,7 +2396,7 @@ static void TeleportWarpOutFieldEffect_SpinExit(struct Task *task)
         task->data[1] = 4;
         ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]);
     }
-    sprite->pos1.y -= task->data[3];
+    sprite->y -= task->data[3];
     task->data[4] += task->data[3];
     if ((--task->data[2]) <= 0 && (task->data[2] = 4, task->data[3] < 8))
     {
@@ -2466,7 +2466,7 @@ static void TeleportWarpInFieldEffect_Init(struct Task *task)
     {
         sprite = &gSprites[gPlayerAvatar.spriteId];
         centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
-        sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
+        sprite->y2 = -(sprite->y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
         gObjectEvents[gPlayerAvatar.objectEventId].invisible = FALSE;
         task->data[0]++;
         task->data[1] = 8;
@@ -2482,7 +2482,7 @@ static void TeleportWarpInFieldEffect_SpinEnter(struct Task *task)
     u8 spinDirections[5] = {DIR_SOUTH, DIR_WEST, DIR_EAST, DIR_NORTH, DIR_SOUTH};
     struct ObjectEvent *objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
     struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId];
-    if ((sprite->pos2.y += task->data[1]) >= -8)
+    if ((sprite->y2 += task->data[1]) >= -8)
     {
         if (task->data[13] == 0)
         {
@@ -2498,7 +2498,7 @@ static void TeleportWarpInFieldEffect_SpinEnter(struct Task *task)
             sprite->subspriteMode = SUBSPRITES_IGNORE_PRIORITY;
         }
     }
-    if (sprite->pos2.y >= -0x30 && task->data[1] > 1 && !(sprite->pos2.y & 1))
+    if (sprite->y2 >= -0x30 && task->data[1] > 1 && !(sprite->y2 & 1))
     {
         task->data[1]--;
     }
@@ -2507,9 +2507,9 @@ static void TeleportWarpInFieldEffect_SpinEnter(struct Task *task)
         task->data[2] = 4;
         ObjectEventTurn(objectEvent, spinDirections[objectEvent->facingDirection]);
     }
-    if (sprite->pos2.y >= 0)
+    if (sprite->y2 >= 0)
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         task->data[0]++;
         task->data[1] = 1;
         task->data[2] = 0;
@@ -2929,9 +2929,9 @@ static u8 InitFieldMoveMonSprite(u32 species, u32 otId, u32 personality)
 
 static void SpriteCB_FieldMoveMonSlideOnscreen(struct Sprite *sprite)
 {
-    if ((sprite->pos1.x -= 20) <= DISPLAY_WIDTH / 2)
+    if ((sprite->x -= 20) <= DISPLAY_WIDTH / 2)
     {
-        sprite->pos1.x = DISPLAY_WIDTH / 2;
+        sprite->x = DISPLAY_WIDTH / 2;
         sprite->sOnscreenTimer = 30;
         sprite->callback = SpriteCB_FieldMoveMonWaitAfterCry;
         if (sprite->data[6])
@@ -2953,10 +2953,10 @@ static void SpriteCB_FieldMoveMonWaitAfterCry(struct Sprite *sprite)
 
 static void SpriteCB_FieldMoveMonSlideOffscreen(struct Sprite *sprite)
 {
-    if (sprite->pos1.x < -64)
+    if (sprite->x < -64)
         sprite->sSlidOffscreen = TRUE;
     else
-        sprite->pos1.x -= 20;
+        sprite->x -= 20;
 }
 
 #undef tState
@@ -3078,7 +3078,7 @@ u8 FldEff_RayquazaSpotlight(void)
     sprite->data[1] = 0;
     sprite->data[2] = 0;
     sprite->data[3] = -1;
-    sprite->data[4] = sprite->pos1.y;
+    sprite->data[4] = sprite->y;
     sprite->data[5] = 0;
     SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG1 | BLDCNT_TGT2_BG2 | BLDCNT_TGT2_BG3 | BLDCNT_TGT2_OBJ | BLDCNT_TGT2_BD);
     SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(14, 14));
@@ -3120,17 +3120,17 @@ static void SpriteCB_NPCFlyOut(struct Sprite *sprite)
 {
     struct Sprite *npcSprite;
 
-    sprite->pos2.x = Cos(sprite->data[2], 0x8c);
-    sprite->pos2.y = Sin(sprite->data[2], 0x48);
+    sprite->x2 = Cos(sprite->data[2], 0x8c);
+    sprite->y2 = Sin(sprite->data[2], 0x48);
     sprite->data[2] = (sprite->data[2] + 4) & 0xff;
     if (sprite->data[0])
     {
         npcSprite = &gSprites[sprite->data[1]];
         npcSprite->coordOffsetEnabled = FALSE;
-        npcSprite->pos1.x = sprite->pos1.x + sprite->pos2.x;
-        npcSprite->pos1.y = sprite->pos1.y + sprite->pos2.y - 8;
-        npcSprite->pos2.x = 0;
-        npcSprite->pos2.y = 0;
+        npcSprite->x = sprite->x + sprite->x2;
+        npcSprite->y = sprite->y + sprite->y2 - 8;
+        npcSprite->x2 = 0;
+        npcSprite->y2 = 0;
     }
 
     if (sprite->data[2] >= 0x80)
@@ -3306,10 +3306,10 @@ static void StartFlyBirdSwoopDown(u8 spriteId)
     struct Sprite *sprite;
     sprite = &gSprites[spriteId];
     sprite->callback = SpriteCB_FlyBirdSwoopDown;
-    sprite->pos1.x = DISPLAY_WIDTH / 2;
-    sprite->pos1.y = 0;
-    sprite->pos2.x = 0;
-    sprite->pos2.y = 0;
+    sprite->x = DISPLAY_WIDTH / 2;
+    sprite->y = 0;
+    sprite->x2 = 0;
+    sprite->y2 = 0;
     memset(&sprite->data[0], 0, 8 * sizeof(u16) /* zero all data cells */);
     sprite->sPlayerSpriteId = MAX_SPRITES;
 }
@@ -3346,15 +3346,15 @@ static void SpriteCB_FlyBirdLeaveBall(struct Sprite *sprite)
             sprite->affineAnims = sAffineAnims_FlyBird;
             InitSpriteAffineAnim(sprite);
             StartSpriteAffineAnim(sprite, 0);
-            sprite->pos1.x = 0x76;
-            sprite->pos1.y = -0x30;
+            sprite->x = 0x76;
+            sprite->y = -0x30;
             sprite->data[0]++;
             sprite->data[1] = 0x40;
             sprite->data[2] = 0x100;
         }
         sprite->data[1] += (sprite->data[2] >> 8);
-        sprite->pos2.x = Cos(sprite->data[1], 0x78);
-        sprite->pos2.y = Sin(sprite->data[1], 0x78);
+        sprite->x2 = Cos(sprite->data[1], 0x78);
+        sprite->y2 = Sin(sprite->data[1], 0x78);
         if (sprite->data[2] < 0x800)
         {
             sprite->data[2] += 0x60;
@@ -3371,17 +3371,17 @@ static void SpriteCB_FlyBirdLeaveBall(struct Sprite *sprite)
 
 static void SpriteCB_FlyBirdSwoopDown(struct Sprite *sprite)
 {
-    sprite->pos2.x = Cos(sprite->data[2], 0x8c);
-    sprite->pos2.y = Sin(sprite->data[2], 0x48);
+    sprite->x2 = Cos(sprite->data[2], 0x8c);
+    sprite->y2 = Sin(sprite->data[2], 0x48);
     sprite->data[2] = (sprite->data[2] + 4) & 0xff;
     if (sprite->sPlayerSpriteId != MAX_SPRITES)
     {
         struct Sprite *sprite1 = &gSprites[sprite->sPlayerSpriteId];
         sprite1->coordOffsetEnabled = FALSE;
-        sprite1->pos1.x = sprite->pos1.x + sprite->pos2.x;
-        sprite1->pos1.y = sprite->pos1.y + sprite->pos2.y - 8;
-        sprite1->pos2.x = 0;
-        sprite1->pos2.y = 0;
+        sprite1->x = sprite->x + sprite->x2;
+        sprite1->y = sprite->y + sprite->y2 - 8;
+        sprite1->x2 = 0;
+        sprite1->y2 = 0;
     }
     if (sprite->data[2] >= 0x80)
     {
@@ -3399,8 +3399,8 @@ static void SpriteCB_FlyBirdReturnToBall(struct Sprite *sprite)
             sprite->affineAnims = sAffineAnims_FlyBird;
             InitSpriteAffineAnim(sprite);
             StartSpriteAffineAnim(sprite, 1);
-            sprite->pos1.x = 0x5e;
-            sprite->pos1.y = -0x20;
+            sprite->x = 0x5e;
+            sprite->y = -0x20;
             sprite->data[0]++;
             sprite->data[1] = 0xf0;
             sprite->data[2] = 0x800;
@@ -3409,8 +3409,8 @@ static void SpriteCB_FlyBirdReturnToBall(struct Sprite *sprite)
         sprite->data[1] += sprite->data[2] >> 8;
         sprite->data[3] += sprite->data[2] >> 8;
         sprite->data[1] &= 0xff;
-        sprite->pos2.x = Cos(sprite->data[1], 0x20);
-        sprite->pos2.y = Sin(sprite->data[1], 0x78);
+        sprite->x2 = Cos(sprite->data[1], 0x20);
+        sprite->y2 = Sin(sprite->data[1], 0x78);
         if (sprite->data[2] > 0x100)
         {
             sprite->data[2] -= sprite->data[4];
@@ -3495,10 +3495,10 @@ static void FlyInFieldEffect_FlyInWithBird(struct Task *task)
         objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
         sprite = &gSprites[objectEvent->spriteId];
         SetFlyBirdPlayerSpriteId(task->tBirdSpriteId, MAX_SPRITES);
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         task->tState++;
         task->tTimer = 0;
     }
@@ -3527,7 +3527,7 @@ static void FlyInFieldEffect_JumpOffBird(struct Task *task)
         8
     };
     struct Sprite *sprite = &gSprites[gPlayerAvatar.spriteId];
-    sprite->pos2.y = sYPositions[task->tTimer];
+    sprite->y2 = sYPositions[task->tTimer];
 
     if ((++task->tTimer) >= (int)ARRAY_COUNT(sYPositions))
         task->tState++;
@@ -3543,8 +3543,8 @@ static void FlyInFieldEffect_FieldMovePose(struct Task *task)
         sprite = &gSprites[objectEvent->spriteId];
         objectEvent->inanimate = FALSE;
         MoveObjectEventToMapCoords(objectEvent, objectEvent->currentCoords.x, objectEvent->currentCoords.y);
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->coordOffsetEnabled = TRUE;
         SetPlayerAvatarFieldMove();
         ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
@@ -3768,7 +3768,7 @@ static const union AnimCmd *const sAnims_DeoxysRockFragment[] = {
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DeoxysRockFragment = {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = 4378,
     .oam = &sOam_8x8,
     .anims = sAnims_DeoxysRockFragment,
@@ -3780,8 +3780,8 @@ static const struct SpriteTemplate sSpriteTemplate_DeoxysRockFragment = {
 static void CreateDeoxysRockFragments(struct Sprite* sprite)
 {
     int i;
-    int xPos = (s16)gTotalCameraPixelOffsetX + sprite->pos1.x + sprite->pos2.x;
-    int yPos = (s16)gTotalCameraPixelOffsetY + sprite->pos1.y + sprite->pos2.y - 4;
+    int xPos = (s16)gTotalCameraPixelOffsetX + sprite->x + sprite->x2;
+    int yPos = (s16)gTotalCameraPixelOffsetY + sprite->y + sprite->y2 - 4;
 
     for (i = 0; i < 4; i++)
     {
@@ -3801,23 +3801,23 @@ static void SpriteCB_DeoxysRockFragment(struct Sprite* sprite)
     switch (sprite->data[0])
     {
     case 0:
-        sprite->pos1.x -= 16;
-        sprite->pos1.y -= 12;
+        sprite->x -= 16;
+        sprite->y -= 12;
         break;
     case 1:
-        sprite->pos1.x += 16;
-        sprite->pos1.y -= 12;
+        sprite->x += 16;
+        sprite->y -= 12;
         break;
     case 2:
-        sprite->pos1.x -= 16;
-        sprite->pos1.y += 12;
+        sprite->x -= 16;
+        sprite->y += 12;
         break;
     case 3:
-        sprite->pos1.x += 16;
-        sprite->pos1.y += 12;
+        sprite->x += 16;
+        sprite->y += 12;
         break;
     }
-    if ((u16)(sprite->pos1.x + 4) > DISPLAY_WIDTH + 8 || sprite->pos1.y < -4 || sprite->pos1.y > DISPLAY_HEIGHT + 4)
+    if ((u16)(sprite->x + 4) > DISPLAY_WIDTH + 8 || sprite->y < -4 || sprite->y > DISPLAY_HEIGHT + 4)
         DestroySprite(sprite);
 }
 
@@ -3837,8 +3837,8 @@ bool8 FldEff_MoveDeoxysRock(struct Sprite* sprite)
         ShiftObjectEventCoords(object, gFieldEffectArguments[3] + 7, gFieldEffectArguments[4] + 7);
         taskId = CreateTask(Task_MoveDeoxysRock, 80);
         gTasks[taskId].data[1] = object->spriteId;
-        gTasks[taskId].data[2] = gSprites[object->spriteId].pos1.x + xPos;
-        gTasks[taskId].data[3] = gSprites[object->spriteId].pos1.y + yPos;
+        gTasks[taskId].data[2] = gSprites[object->spriteId].x + xPos;
+        gTasks[taskId].data[3] = gSprites[object->spriteId].y + yPos;
         gTasks[taskId].data[8] = gFieldEffectArguments[5];
         gTasks[taskId].data[9] = objectEventIdBuffer;
     }
@@ -3852,8 +3852,8 @@ static void Task_MoveDeoxysRock(u8 taskId)
     switch (data[0])
     {
         case 0:
-            data[4] = sprite->pos1.x << 4;
-            data[5] = sprite->pos1.y << 4;
+            data[4] = sprite->x << 4;
+            data[5] = sprite->y << 4;
             data[6] = SAFE_DIV(data[2] * 16 - data[4], data[8]);
             data[7] = SAFE_DIV(data[3] * 16 - data[5], data[8]);
             data[0]++;
@@ -3863,14 +3863,14 @@ static void Task_MoveDeoxysRock(u8 taskId)
                 data[8]--;
                 data[4] += data[6];
                 data[5] += data[7];
-                sprite->pos1.x = data[4] >> 4;
-                sprite->pos1.y = data[5] >> 4;
+                sprite->x = data[4] >> 4;
+                sprite->y = data[5] >> 4;
             }
             else
             {
                 struct ObjectEvent *object = &gObjectEvents[data[9]];
-                sprite->pos1.x = data[2];
-                sprite->pos1.y = data[3];
+                sprite->x = data[2];
+                sprite->y = data[3];
                 ShiftStillObjectEventCoords(object);
                 object->triggerGroundEffectsOnStop = TRUE;
                 FieldEffectActiveListRemove(FLDEFF_MOVE_DEOXYS_ROCK);
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 67a151aaa..bcc02efe9 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -37,14 +37,14 @@ static u32 ShowDisguiseFieldEffect(u8, u8, u8);
 
 #define sReflectionObjEventId       data[0]
 #define sReflectionObjEventLocalId  data[1]
-#define sReflectionVerticalOffset   data[2] 
+#define sReflectionVerticalOffset   data[2]
 #define sIsStillReflection          data[7]
 
 void SetUpReflection(struct ObjectEvent *objectEvent, struct Sprite *sprite, bool8 stillReflection)
 {
     struct Sprite *reflectionSprite;
 
-    reflectionSprite = &gSprites[CreateCopySpriteAt(sprite, sprite->pos1.x, sprite->pos1.y, 0x98)];
+    reflectionSprite = &gSprites[CreateCopySpriteAt(sprite, sprite->x, sprite->y, 0x98)];
     reflectionSprite->callback = UpdateObjectReflectionSprite;
     reflectionSprite->oam.priority = 3;
     reflectionSprite->oam.paletteNum = gReflectionEffectPaletteMap[reflectionSprite->oam.paletteNum];
@@ -142,12 +142,12 @@ static void UpdateObjectReflectionSprite(struct Sprite *reflectionSprite)
         reflectionSprite->subspriteTables = mainSprite->subspriteTables;
         reflectionSprite->subspriteTableNum = mainSprite->subspriteTableNum;
         reflectionSprite->invisible = mainSprite->invisible;
-        reflectionSprite->pos1.x = mainSprite->pos1.x;
-        reflectionSprite->pos1.y = mainSprite->pos1.y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->sReflectionVerticalOffset;
+        reflectionSprite->x = mainSprite->x;
+        reflectionSprite->y = mainSprite->y + GetReflectionVerticalOffset(objectEvent) + reflectionSprite->sReflectionVerticalOffset;
         reflectionSprite->centerToCornerVecX = mainSprite->centerToCornerVecX;
         reflectionSprite->centerToCornerVecY = mainSprite->centerToCornerVecY;
-        reflectionSprite->pos2.x = mainSprite->pos2.x;
-        reflectionSprite->pos2.y = -mainSprite->pos2.y;
+        reflectionSprite->x2 = mainSprite->x2;
+        reflectionSprite->y2 = -mainSprite->y2;
         reflectionSprite->coordOffsetEnabled = mainSprite->coordOffsetEnabled;
 
         if (objectEvent->hideReflection == TRUE)
@@ -204,8 +204,8 @@ void ShowWarpArrowSprite(u8 spriteId, u8 direction, s16 x, s16 y)
     {
         SetSpritePosToMapCoords(x, y, &x2, &y2);
         sprite = &gSprites[spriteId];
-        sprite->pos1.x = x2 + 8;
-        sprite->pos1.y = y2 + 8;
+        sprite->x = x2 + 8;
+        sprite->y = y2 + 8;
         sprite->invisible = FALSE;
         sprite->data[0] = x;
         sprite->data[1] = y;
@@ -262,8 +262,8 @@ void UpdateShadowFieldEffect(struct Sprite *sprite)
         objectEvent = &gObjectEvents[objectEventId];
         linkedSprite = &gSprites[objectEvent->spriteId];
         sprite->oam.priority = linkedSprite->oam.priority;
-        sprite->pos1.x = linkedSprite->pos1.x;
-        sprite->pos1.y = linkedSprite->pos1.y + sprite->data[3];
+        sprite->x = linkedSprite->x;
+        sprite->y = linkedSprite->y + sprite->data[3];
         if (!objectEvent->active || !objectEvent->hasShadow
          || MetatileBehavior_IsPokeGrass(objectEvent->currentMetatileBehavior)
          || MetatileBehavior_IsSurfableWaterOrUnderwater(objectEvent->currentMetatileBehavior)
@@ -337,8 +337,8 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite)
     mapGroup = sprite->sMapGroup;
     metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->sX, sprite->sY);
 
-    if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) 
-     || !MetatileBehavior_IsTallGrass(metatileBehavior) 
+    if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)
+     || !MetatileBehavior_IsTallGrass(metatileBehavior)
      || (sprite->sObjectMoved && sprite->animEnded))
     {
         FieldEffectStop(sprite, FLDEFF_TALL_GRASS);
@@ -347,8 +347,8 @@ void UpdateTallGrassFieldEffect(struct Sprite *sprite)
     {
         // Check if the object that triggered the effect has moved away
         objectEvent = &gObjectEvents[objectEventId];
-        if ((objectEvent->currentCoords.x != sprite->sX 
-          || objectEvent->currentCoords.y != sprite->sY) 
+        if ((objectEvent->currentCoords.x != sprite->sX
+          || objectEvent->currentCoords.y != sprite->sY)
         && (objectEvent->previousCoords.x != sprite->sX
          || objectEvent->previousCoords.y != sprite->sY))
             sprite->sObjectMoved = TRUE;
@@ -391,10 +391,10 @@ u8 FindTallGrassFieldEffectSpriteId(u8 localId, u8 mapNum, u8 mapGroup, s16 x, s
         if (gSprites[i].inUse)
         {
             sprite = &gSprites[i];
-            if (sprite->callback == UpdateTallGrassFieldEffect 
-                && (x == sprite->sX && y == sprite->sY) 
-                && localId == (u8)(sprite->sLocalId) 
-                && mapNum == (sprite->sMapNum & 0xFF) 
+            if (sprite->callback == UpdateTallGrassFieldEffect
+                && (x == sprite->sX && y == sprite->sY)
+                && localId == (u8)(sprite->sLocalId)
+                && mapNum == (sprite->sMapNum & 0xFF)
                 && mapGroup == sprite->sMapGroup)
                 return i;
         }
@@ -452,8 +452,8 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite)
     mapNum = sprite->sMapNum;
     mapGroup = sprite->sMapGroup;
     metatileBehavior = MapGridGetMetatileBehaviorAt(sprite->data[1], sprite->data[2]);
-    if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId) 
-     || !MetatileBehavior_IsLongGrass(metatileBehavior) 
+    if (TryGetObjectEventIdByLocalIdAndMap(localId, mapNum, mapGroup, &objectEventId)
+     || !MetatileBehavior_IsLongGrass(metatileBehavior)
      || (sprite->sObjectMoved && sprite->animEnded))
     {
         FieldEffectStop(sprite, FLDEFF_LONG_GRASS);
@@ -462,9 +462,9 @@ void UpdateLongGrassFieldEffect(struct Sprite *sprite)
     {
         // Check if the object that triggered the effect has moved away
         objectEvent = &gObjectEvents[objectEventId];
-        if ((objectEvent->currentCoords.x != sprite->data[1] 
-          || objectEvent->currentCoords.y != sprite->data[2]) 
-        && (objectEvent->previousCoords.x != sprite->data[1] 
+        if ((objectEvent->currentCoords.x != sprite->data[1]
+          || objectEvent->currentCoords.y != sprite->data[2])
+        && (objectEvent->previousCoords.x != sprite->data[1]
          || objectEvent->previousCoords.y != sprite->data[2]))
             sprite->sObjectMoved = TRUE;
 
@@ -517,8 +517,8 @@ u32 FldEff_ShortGrass(void)
         sprite->data[0] = gFieldEffectArguments[0];
         sprite->data[1] = gFieldEffectArguments[1];
         sprite->data[2] = gFieldEffectArguments[2];
-        sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x;
-        sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y;
+        sprite->data[3] = gSprites[objectEvent->spriteId].x;
+        sprite->data[4] = gSprites[objectEvent->spriteId].y;
     }
     return 0;
 }
@@ -539,8 +539,8 @@ void UpdateShortGrassFieldEffect(struct Sprite *sprite)
     {
         graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId);
         linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId];
-        y = linkedSprite->pos1.y;
-        x = linkedSprite->pos1.x;
+        y = linkedSprite->y;
+        x = linkedSprite->x;
         if (x != sprite->data[3] || y != sprite->data[4])
         {
             sprite->data[3] = x;
@@ -550,9 +550,9 @@ void UpdateShortGrassFieldEffect(struct Sprite *sprite)
                 StartSpriteAnim(sprite, 0);
             }
         }
-        sprite->pos1.x = x;
-        sprite->pos1.y = y;
-        sprite->pos2.y = (graphicsInfo->height >> 1) - 8;
+        sprite->x = x;
+        sprite->y = y;
+        sprite->y2 = (graphicsInfo->height >> 1) - 8;
         sprite->subpriority = linkedSprite->subpriority - 1;
         sprite->oam.priority = linkedSprite->oam.priority;
         UpdateObjectEventSpriteInvisibility(sprite, linkedSprite->invisible);
@@ -665,7 +665,7 @@ u32 FldEff_Splash(void)
         sprite->data[0] = gFieldEffectArguments[0];
         sprite->data[1] = gFieldEffectArguments[1];
         sprite->data[2] = gFieldEffectArguments[2];
-        sprite->pos2.y = (graphicsInfo->height >> 1) - 4;
+        sprite->y2 = (graphicsInfo->height >> 1) - 4;
         PlaySE(SE_PUDDLE);
     }
     return 0;
@@ -681,8 +681,8 @@ void UpdateSplashFieldEffect(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos1.x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x;
-        sprite->pos1.y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y;
+        sprite->x = gSprites[gObjectEvents[objectEventId].spriteId].x;
+        sprite->y = gSprites[gObjectEvents[objectEventId].spriteId].y;
         UpdateObjectEventSpriteInvisibility(sprite, FALSE);
     }
 }
@@ -746,7 +746,7 @@ u32 FldEff_FeetInFlowingWater(void)
         sprite->data[2] = gFieldEffectArguments[2];
         sprite->data[3] = -1;
         sprite->data[4] = -1;
-        sprite->pos2.y = (graphicsInfo->height >> 1) - 4;
+        sprite->y2 = (graphicsInfo->height >> 1) - 4;
         StartSpriteAnim(sprite, 1);
     }
     return 0;
@@ -766,8 +766,8 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *sprite)
     {
         objectEvent = &gObjectEvents[objectEventId];
         linkedSprite = &gSprites[objectEvent->spriteId];
-        sprite->pos1.x = linkedSprite->pos1.x;
-        sprite->pos1.y = linkedSprite->pos1.y;
+        sprite->x = linkedSprite->x;
+        sprite->y = linkedSprite->y;
         sprite->subpriority = linkedSprite->subpriority;
         UpdateObjectEventSpriteInvisibility(sprite, FALSE);
         if (objectEvent->currentCoords.x != sprite->data[3] || objectEvent->currentCoords.y != sprite->data[4])
@@ -816,8 +816,8 @@ u32 FldEff_HotSpringsWater(void)
         sprite->data[0] = gFieldEffectArguments[0];
         sprite->data[1] = gFieldEffectArguments[1];
         sprite->data[2] = gFieldEffectArguments[2];
-        sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x;
-        sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y;
+        sprite->data[3] = gSprites[objectEvent->spriteId].x;
+        sprite->data[4] = gSprites[objectEvent->spriteId].y;
     }
     return 0;
 }
@@ -836,8 +836,8 @@ void UpdateHotSpringsWaterFieldEffect(struct Sprite *sprite)
     {
         graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId);
         linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId];
-        sprite->pos1.x = linkedSprite->pos1.x;
-        sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 8;
+        sprite->x = linkedSprite->x;
+        sprite->y = (graphicsInfo->height >> 1) + linkedSprite->y - 8;
         sprite->subpriority = linkedSprite->subpriority - 1;
         UpdateObjectEventSpriteInvisibility(sprite, FALSE);
     }
@@ -1092,7 +1092,7 @@ void SynchroniseSurfPosition(struct ObjectEvent *playerObj, struct Sprite *sprit
     u8 i;
     s16 x = playerObj->currentCoords.x;
     s16 y = playerObj->currentCoords.y;
-    s32 spriteY = sprite->pos2.y;
+    s32 spriteY = sprite->y2;
 
     if (spriteY == 0 && (x != sprite->data[6] || y != sprite->data[7]))
     {
@@ -1120,7 +1120,7 @@ static void UpdateBobbingEffect(struct ObjectEvent *playerObj, struct Sprite *pl
         // Update bobbing position of surf blob
         if (((u16)(++sprite->data[4]) & intervals[sprite->data[5]]) == 0)
         {
-            sprite->pos2.y += sprite->data[3];
+            sprite->y2 += sprite->data[3];
         }
         if ((sprite->data[4] & 15) == 0)
         {
@@ -1130,11 +1130,11 @@ static void UpdateBobbingEffect(struct ObjectEvent *playerObj, struct Sprite *pl
         {
             // Update bobbing position of player
             if (!GetSurfBlob_HasPlayerOffset(sprite))
-                playerSprite->pos2.y = sprite->pos2.y;
+                playerSprite->y2 = sprite->y2;
             else
-                playerSprite->pos2.y = sprite->tPlayerOffset + sprite->pos2.y;
-            sprite->pos1.x = playerSprite->pos1.x;
-            sprite->pos1.y = playerSprite->pos1.y + 8;
+                playerSprite->y2 = sprite->tPlayerOffset + sprite->y2;
+            sprite->x = playerSprite->x;
+            sprite->y = playerSprite->y + 8;
         }
     }
 }
@@ -1167,7 +1167,7 @@ static void SpriteCB_UnderwaterSurfBlob(struct Sprite *sprite)
     blobSprite = &gSprites[sprite->sSpriteId];
     if (((sprite->sTimer++) & 3) == 0)
     {
-        blobSprite->pos2.y += sprite->sBobY;
+        blobSprite->y2 += sprite->sBobY;
     }
     if ((sprite->sTimer & 15) == 0)
     {
@@ -1217,9 +1217,9 @@ u32 FldEff_SandPile(void)
         sprite->data[0] = gFieldEffectArguments[0];
         sprite->data[1] = gFieldEffectArguments[1];
         sprite->data[2] = gFieldEffectArguments[2];
-        sprite->data[3] = gSprites[objectEvent->spriteId].pos1.x;
-        sprite->data[4] = gSprites[objectEvent->spriteId].pos1.y;
-        sprite->pos2.y = (graphicsInfo->height >> 1) - 2;
+        sprite->data[3] = gSprites[objectEvent->spriteId].x;
+        sprite->data[4] = gSprites[objectEvent->spriteId].y;
+        sprite->y2 = (graphicsInfo->height >> 1) - 2;
         SeekSpriteAnim(sprite, 2);
     }
     return 0;
@@ -1237,8 +1237,8 @@ void UpdateSandPileFieldEffect(struct Sprite *sprite)
     }
     else
     {
-        y = gSprites[gObjectEvents[objectEventId].spriteId].pos1.y;
-        x = gSprites[gObjectEvents[objectEventId].spriteId].pos1.x;
+        y = gSprites[gObjectEvents[objectEventId].spriteId].y;
+        x = gSprites[gObjectEvents[objectEventId].spriteId].x;
         if (x != sprite->data[3] || y != sprite->data[4])
         {
             sprite->data[3] = x;
@@ -1248,8 +1248,8 @@ void UpdateSandPileFieldEffect(struct Sprite *sprite)
                 StartSpriteAnim(sprite, 0);
             }
         }
-        sprite->pos1.x = x;
-        sprite->pos1.y = y;
+        sprite->x = x;
+        sprite->y = y;
         sprite->subpriority = gSprites[gObjectEvents[objectEventId].spriteId].subpriority;
         UpdateObjectEventSpriteInvisibility(sprite, FALSE);
     }
@@ -1275,7 +1275,7 @@ void UpdateBubblesFieldEffect(struct Sprite *sprite)
 {
     sprite->data[0] += 0x80;
     sprite->data[0] &= 0x100;
-    sprite->pos1.y -= sprite->data[0] >> 8;
+    sprite->y -= sprite->data[0] >> 8;
     UpdateObjectEventSpriteInvisibility(sprite, FALSE);
     if (sprite->invisible || sprite->animEnded)
     {
@@ -1359,8 +1359,8 @@ void UpdateDisguiseFieldEffect(struct Sprite *sprite)
     graphicsInfo = GetObjectEventGraphicsInfo(gObjectEvents[objectEventId].graphicsId);
     linkedSprite = &gSprites[gObjectEvents[objectEventId].spriteId];
     sprite->invisible = linkedSprite->invisible;
-    sprite->pos1.x = linkedSprite->pos1.x;
-    sprite->pos1.y = (graphicsInfo->height >> 1) + linkedSprite->pos1.y - 16;
+    sprite->x = linkedSprite->x;
+    sprite->y = (graphicsInfo->height >> 1) + linkedSprite->y - 16;
     sprite->subpriority = linkedSprite->subpriority - 1;
 
     if (sprite->sState == 1)
@@ -1468,25 +1468,25 @@ static bool8 AnimateRayquazaInFigure8(struct Sprite *sprite)
     switch (sprite->sAnimState)
     {
     case 0:
-        sprite->pos2.x += GetFigure8XOffset(sprite->sAnimCounter);
-        sprite->pos2.y += GetFigure8YOffset(sprite->sAnimCounter);
+        sprite->x2 += GetFigure8XOffset(sprite->sAnimCounter);
+        sprite->y2 += GetFigure8YOffset(sprite->sAnimCounter);
         break;
     case 1:
-        sprite->pos2.x -= GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
-        sprite->pos2.y += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
+        sprite->x2 -= GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
+        sprite->y2 += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
         break;
     case 2:
-        sprite->pos2.x -= GetFigure8XOffset(sprite->sAnimCounter);
-        sprite->pos2.y += GetFigure8YOffset(sprite->sAnimCounter);
+        sprite->x2 -= GetFigure8XOffset(sprite->sAnimCounter);
+        sprite->y2 += GetFigure8YOffset(sprite->sAnimCounter);
         break;
     case 3:
-        sprite->pos2.x += GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
-        sprite->pos2.y += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
+        sprite->x2 += GetFigure8XOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
+        sprite->y2 += GetFigure8YOffset((FIGURE_8_LENGTH - 1) - sprite->sAnimCounter);
         break;
     }
 
     // Update spotlight to sweep left and right with Rayquaza
-    SetGpuReg(REG_OFFSET_BG0HOFS, -sprite->pos2.x);
+    SetGpuReg(REG_OFFSET_BG0HOFS, -sprite->x2);
 
     if (++sprite->sAnimCounter == FIGURE_8_LENGTH)
     {
@@ -1495,8 +1495,8 @@ static bool8 AnimateRayquazaInFigure8(struct Sprite *sprite)
     }
     if (sprite->sAnimState == 4)
     {
-        sprite->pos2.y = 0;
-        sprite->pos2.x = 0;
+        sprite->y2 = 0;
+        sprite->x2 = 0;
         finished = TRUE;
     }
 
@@ -1528,7 +1528,7 @@ void UpdateRayquazaSpotlightEffect(struct Sprite *sprite)
             }
             break;
         case 1:
-            sprite->pos1.y = (gSineTable[sprite->sTimer / 3] >> 2) + sprite->sStartY;
+            sprite->y = (gSineTable[sprite->sTimer / 3] >> 2) + sprite->sStartY;
             if (sprite->sTimer == 189)
             {
                 sprite->sState = 2;
@@ -1549,7 +1549,7 @@ void UpdateRayquazaSpotlightEffect(struct Sprite *sprite)
             }
             break;
         case 3:
-            if (sprite->pos2.y == 0)
+            if (sprite->y2 == 0)
             {
                 sprite->sTimer = 0;
                 sprite->sState++;
@@ -1557,10 +1557,10 @@ void UpdateRayquazaSpotlightEffect(struct Sprite *sprite)
             if (sprite->sTimer == 5)
             {
                 sprite->sTimer = 0;
-                if (sprite->pos2.y > 0)
-                    sprite->pos2.y--;
+                if (sprite->y2 > 0)
+                    sprite->y2--;
                 else
-                    sprite->pos2.y++;
+                    sprite->y2++;
             }
             break;
         case 4:
@@ -1614,7 +1614,7 @@ void UpdateRayquazaSpotlightEffect(struct Sprite *sprite)
     if (sprite->sState == 1)
     {
         if ((sprite->data[1] & 7) == 0)
-            sprite->pos2.y += sprite->data[3];
+            sprite->y2 += sprite->data[3];
         if ((sprite->data[1] & 15) == 0)
             sprite->data[3] = -sprite->data[3];
         sprite->data[1]++;
@@ -1667,13 +1667,13 @@ static void UpdateGrassFieldEffectSubpriority(struct Sprite *sprite, u8 z, u8 of
         {
             graphicsInfo = GetObjectEventGraphicsInfo(objectEvent->graphicsId);
             linkedSprite = &gSprites[objectEvent->spriteId];
-            xhi = sprite->pos1.x + sprite->centerToCornerVecX;
-            var = sprite->pos1.x - sprite->centerToCornerVecX;
-            if (xhi < linkedSprite->pos1.x && var > linkedSprite->pos1.x)
+            xhi = sprite->x + sprite->centerToCornerVecX;
+            var = sprite->x - sprite->centerToCornerVecX;
+            if (xhi < linkedSprite->x && var > linkedSprite->x)
             {
-                lyhi = linkedSprite->pos1.y + linkedSprite->centerToCornerVecY;
-                var = linkedSprite->pos1.y;
-                ylo = sprite->pos1.y - sprite->centerToCornerVecY;
+                lyhi = linkedSprite->y + linkedSprite->centerToCornerVecY;
+                var = linkedSprite->y;
+                ylo = sprite->y - sprite->centerToCornerVecY;
                 yhi = ylo + linkedSprite->centerToCornerVecY;
                 if ((lyhi < yhi || lyhi < ylo) && var > yhi && sprite->subpriority <= linkedSprite->subpriority)
                 {
diff --git a/src/field_message_box.c b/src/field_message_box.c
index 69d470b84..74afb5677 100755
--- a/src/field_message_box.c
+++ b/src/field_message_box.c
@@ -105,7 +105,7 @@ static bool8 ForceShowFieldAutoScrollMessage(const u8 *str)
     return TRUE;
 }
 
-// Same as ShowFieldMessage, but instead of accepting a 
+// Same as ShowFieldMessage, but instead of accepting a
 // string arg it just prints whats already in gStringVar4
 bool8 ShowFieldMessageFromBuffer(void)
 {
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 970899369..c4d069cb5 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1687,7 +1687,7 @@ static bool8 (*const sFishingStateFuncs[])(struct Task *) =
 {
     Fishing_Init,
     Fishing_GetRodOut,
-    Fishing_WaitBeforeDots, 
+    Fishing_WaitBeforeDots,
     Fishing_InitDots,       // FISHING_START_ROUND
     Fishing_ShowDots,
     Fishing_CheckForBite,
@@ -1729,13 +1729,13 @@ static bool8 Fishing_GetRodOut(struct Task *task)
 {
     struct ObjectEvent *playerObjEvent;
     const s16 minRounds1[] = {
-        [OLD_ROD]   = 1, 
-        [GOOD_ROD]  = 1, 
+        [OLD_ROD]   = 1,
+        [GOOD_ROD]  = 1,
         [SUPER_ROD] = 1
     };
     const s16 minRounds2[] = {
-        [OLD_ROD]   = 1, 
-        [GOOD_ROD]  = 3, 
+        [OLD_ROD]   = 1,
+        [GOOD_ROD]  = 3,
         [SUPER_ROD] = 6
     };
 
@@ -1865,8 +1865,8 @@ static bool8 Fishing_GotBite(struct Task *task)
 static bool8 Fishing_WaitForA(struct Task *task)
 {
     const s16 reelTimeouts[3] = {
-        [OLD_ROD]   = 36, 
-        [GOOD_ROD]  = 33, 
+        [OLD_ROD]   = 36,
+        [GOOD_ROD]  = 33,
         [SUPER_ROD] = 30
     };
 
@@ -1933,8 +1933,8 @@ static bool8 Fishing_StartEncounter(struct Task *task)
             ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection);
             if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
                 SetSurfBlob_PlayerOffset(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, FALSE, 0);
-            gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
-            gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
+            gSprites[gPlayerAvatar.spriteId].x2 = 0;
+            gSprites[gPlayerAvatar.spriteId].y2 = 0;
             ClearDialogWindowAndFrame(0, TRUE);
             task->tFrameCounter++;
             return FALSE;
@@ -1990,8 +1990,8 @@ static bool8 Fishing_PutRodAway(struct Task *task)
         ObjectEventTurn(playerObjEvent, playerObjEvent->movementDirection);
         if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
             SetSurfBlob_PlayerOffset(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, FALSE, 0);
-        gSprites[gPlayerAvatar.spriteId].pos2.x = 0;
-        gSprites[gPlayerAvatar.spriteId].pos2.y = 0;
+        gSprites[gPlayerAvatar.spriteId].x2 = 0;
+        gSprites[gPlayerAvatar.spriteId].y2 = 0;
         task->tStep++;
     }
     return FALSE;
@@ -2023,8 +2023,8 @@ static void AlignFishingAnimationFrames(void)
     u8 animType;
 
     AnimateSprite(playerSprite);
-    playerSprite->pos2.x = 0;
-    playerSprite->pos2.y = 0;
+    playerSprite->x2 = 0;
+    playerSprite->y2 = 0;
     animCmdIndex = playerSprite->animCmdIndex;
     if (playerSprite->anims[playerSprite->animNum][animCmdIndex].type == -1)
     {
@@ -2039,16 +2039,16 @@ static void AlignFishingAnimationFrames(void)
     animType = playerSprite->anims[playerSprite->animNum][animCmdIndex].type;
     if (animType == 1 || animType == 2 || animType == 3)
     {
-        playerSprite->pos2.x = 8;
+        playerSprite->x2 = 8;
         if (GetPlayerFacingDirection() == 3)
-            playerSprite->pos2.x = -8;
+            playerSprite->x2 = -8;
     }
     if (animType == 5)
-        playerSprite->pos2.y = -8;
+        playerSprite->y2 = -8;
     if (animType == 10 || animType == 11)
-        playerSprite->pos2.y = 8;
+        playerSprite->y2 = 8;
     if (gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
-        SetSurfBlob_PlayerOffset(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, TRUE, playerSprite->pos2.y);
+        SetSurfBlob_PlayerOffset(gObjectEvents[gPlayerAvatar.objectEventId].fieldEffectSpriteId, TRUE, playerSprite->y2);
 }
 
 void SetSpinStartFacingDir(u8 direction)
@@ -2090,8 +2090,8 @@ static void Task_DoPlayerSpinExit(u8 taskId)
             SetSpinStartFacingDir(object->facingDirection);
             tSpinDelayTimer = 0;
             tSpeed = 1;
-            tCurY = (u16)(sprite->pos1.y + sprite->pos2.y) << 4;
-            sprite->pos2.y = 0;
+            tCurY = (u16)(sprite->y + sprite->y2) << 4;
+            sprite->y2 = 0;
             CameraObjectReset2();
             object->fixedPriority = TRUE;
             sprite->oam.priority = 0;
@@ -2100,14 +2100,14 @@ static void Task_DoPlayerSpinExit(u8 taskId)
             tState++;
         case 1: // Spin while rising
             TrySpinPlayerForWarp(object, &tSpinDelayTimer);
-            
+
             // Rise and accelerate
             tCurY -= tSpeed;
             tSpeed += 3;
-            sprite->pos1.y = tCurY >> 4;
+            sprite->y = tCurY >> 4;
 
             // Check if offscreen
-            if (sprite->pos1.y + (s16)gTotalCameraPixelOffsetY < -32)
+            if (sprite->y + (s16)gTotalCameraPixelOffsetY < -32)
                 tState++;
             break;
         case 2:
@@ -2156,11 +2156,11 @@ static void Task_DoPlayerSpinEntrance(u8 taskId)
             ObjectEventForceSetHeldMovement(object, GetFaceDirectionMovementAction(sSpinDirections[tStartDir]));
             tSpinDelayTimer = 0;
             tSpeed = 116;
-            tDestY = sprite->pos1.y;
+            tDestY = sprite->y;
             tPriority = sprite->oam.priority;
             tSubpriority = sprite->subpriority;
-            tCurY = -((u16)sprite->pos2.y + 32) * 16;
-            sprite->pos2.y = 0;
+            tCurY = -((u16)sprite->y2 + 32) * 16;
+            sprite->y2 = 0;
             CameraObjectReset2();
             object->fixedPriority = TRUE;
             sprite->oam.priority = 1;
@@ -2175,12 +2175,12 @@ static void Task_DoPlayerSpinEntrance(u8 taskId)
             tSpeed -= 3;
             if (tSpeed < 4)
                 tSpeed = 4;
-            sprite->pos1.y = tCurY >> 4;
+            sprite->y = tCurY >> 4;
 
             // Check if reached dest
-            if (sprite->pos1.y >= tDestY)
+            if (sprite->y >= tDestY)
             {
-                sprite->pos1.y = tDestY;
+                sprite->y = tDestY;
                 tGroundTimer = 0;
                 tState++;
             }
diff --git a/src/field_special_scene.c b/src/field_special_scene.c
index 3c7016bd1..cb2d0e901 100644
--- a/src/field_special_scene.c
+++ b/src/field_special_scene.c
@@ -33,15 +33,15 @@ enum
 //. rodata
 static const s8 gTruckCamera_HorizontalTable[] = {0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0};
 
-static const u8 sSSTidalSailEastMovementScript[] = 
+static const u8 sSSTidalSailEastMovementScript[] =
 {
-    MOVEMENT_ACTION_WALK_FAST_RIGHT, 
+    MOVEMENT_ACTION_WALK_FAST_RIGHT,
     MOVEMENT_ACTION_STEP_END
 };
 
-static const u8 sSSTidalSailWestMovementScript[] = 
+static const u8 sSSTidalSailWestMovementScript[] =
 {
-    MOVEMENT_ACTION_WALK_FAST_LEFT, 
+    MOVEMENT_ACTION_WALK_FAST_LEFT,
     MOVEMENT_ACTION_STEP_END
 };
 
diff --git a/src/field_specials.c b/src/field_specials.c
index fd5760c3b..131099ab7 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -521,9 +521,9 @@ void SpawnLinkPartnerObjectEvent(void)
     s16 x = 0;
     s16 y = 0;
     u8 movementTypes[] = {
-        MOVEMENT_TYPE_FACE_UP, 
-        MOVEMENT_TYPE_FACE_LEFT, 
-        MOVEMENT_TYPE_FACE_DOWN, 
+        MOVEMENT_TYPE_FACE_UP,
+        MOVEMENT_TYPE_FACE_LEFT,
+        MOVEMENT_TYPE_FACE_DOWN,
         MOVEMENT_TYPE_FACE_RIGHT
     };
     s8 coordOffsets[][2] = {
@@ -1422,8 +1422,8 @@ bool8 Special_AreLeadMonEVsMaxedOut(void)
 
 u8 TryUpdateRusturfTunnelState(void)
 {
-    if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) 
-        && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) 
+    if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED)
+        && gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL)
         && gSaveBlock1Ptr->location.mapNum == MAP_NUM(RUSTURF_TUNNEL))
     {
         if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1))
@@ -1710,7 +1710,7 @@ void OffsetCameraForBattle(void)
     SetCameraPanning(8, 0);
 }
 
-const struct WindowTemplate gElevatorFloor_WindowTemplate = 
+const struct WindowTemplate gElevatorFloor_WindowTemplate =
 {
     .bg = 0,
     .tilemapLeft = 21,
@@ -2020,27 +2020,27 @@ void BufferVarsForIVRater(void)
 
 bool8 UsedPokemonCenterWarp(void)
 {
-    static const u16 sPokemonCenters[] = 
-    { 
-        MAP_OLDALE_TOWN_POKEMON_CENTER_1F, 
-        MAP_DEWFORD_TOWN_POKEMON_CENTER_1F, 
-        MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F, 
-        MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F, 
-        MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F, 
-        MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F, 
-        MAP_PETALBURG_CITY_POKEMON_CENTER_1F, 
-        MAP_SLATEPORT_CITY_POKEMON_CENTER_1F, 
-        MAP_MAUVILLE_CITY_POKEMON_CENTER_1F, 
-        MAP_RUSTBORO_CITY_POKEMON_CENTER_1F, 
-        MAP_FORTREE_CITY_POKEMON_CENTER_1F, 
-        MAP_LILYCOVE_CITY_POKEMON_CENTER_1F, 
-        MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F, 
-        MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F, 
-        MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F, 
-        MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F, 
-        MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F, 
-        MAP_UNION_ROOM, 
-        0xFFFF 
+    static const u16 sPokemonCenters[] =
+    {
+        MAP_OLDALE_TOWN_POKEMON_CENTER_1F,
+        MAP_DEWFORD_TOWN_POKEMON_CENTER_1F,
+        MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F,
+        MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F,
+        MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F,
+        MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F,
+        MAP_PETALBURG_CITY_POKEMON_CENTER_1F,
+        MAP_SLATEPORT_CITY_POKEMON_CENTER_1F,
+        MAP_MAUVILLE_CITY_POKEMON_CENTER_1F,
+        MAP_RUSTBORO_CITY_POKEMON_CENTER_1F,
+        MAP_FORTREE_CITY_POKEMON_CENTER_1F,
+        MAP_LILYCOVE_CITY_POKEMON_CENTER_1F,
+        MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F,
+        MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F,
+        MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F,
+        MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F,
+        MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F,
+        MAP_UNION_ROOM,
+        0xFFFF
     };
 
     int i;
@@ -2073,71 +2073,71 @@ void UpdateFrontierManiac(u16 daysSince)
 
 void ShowFrontierManiacMessage(void)
 {
-    static const u8 *const sFrontierManiacMessages[][FRONTIER_MANIAC_MESSAGE_COUNT] = 
+    static const u8 *const sFrontierManiacMessages[][FRONTIER_MANIAC_MESSAGE_COUNT] =
     {
         [FRONTIER_MANIAC_BATTLE_TOWER_SINGLES] =
-        { 
-            BattleFrontier_Lounge2_Text_SalonMaidenIsThere, 
-            BattleFrontier_Lounge2_Text_SalonMaidenSilverMons, 
-            BattleFrontier_Lounge2_Text_SalonMaidenGoldMons 
+        {
+            BattleFrontier_Lounge2_Text_SalonMaidenIsThere,
+            BattleFrontier_Lounge2_Text_SalonMaidenSilverMons,
+            BattleFrontier_Lounge2_Text_SalonMaidenGoldMons
         },
         [FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES] =
-        { 
-            BattleFrontier_Lounge2_Text_DoubleBattleAdvice1, 
-            BattleFrontier_Lounge2_Text_DoubleBattleAdvice2, 
-            BattleFrontier_Lounge2_Text_DoubleBattleAdvice3 
+        {
+            BattleFrontier_Lounge2_Text_DoubleBattleAdvice1,
+            BattleFrontier_Lounge2_Text_DoubleBattleAdvice2,
+            BattleFrontier_Lounge2_Text_DoubleBattleAdvice3
         },
-        [FRONTIER_MANIAC_BATTLE_TOWER_MULTIS] = 
-        { 
-            BattleFrontier_Lounge2_Text_MultiBattleAdvice, 
-            BattleFrontier_Lounge2_Text_MultiBattleAdvice, 
-            BattleFrontier_Lounge2_Text_MultiBattleAdvice 
+        [FRONTIER_MANIAC_BATTLE_TOWER_MULTIS] =
+        {
+            BattleFrontier_Lounge2_Text_MultiBattleAdvice,
+            BattleFrontier_Lounge2_Text_MultiBattleAdvice,
+            BattleFrontier_Lounge2_Text_MultiBattleAdvice
         },
         [FRONTIER_MANIAC_BATTLE_TOWER_LINK] =
-        { 
-            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice, 
-            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice, 
-            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice 
+        {
+            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice,
+            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice,
+            BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice
         },
         [FRONTIER_MANIAC_BATTLE_DOME] =
-        { 
-            BattleFrontier_Lounge2_Text_DomeAceIsThere, 
-            BattleFrontier_Lounge2_Text_DomeAceSilverMons, 
-            BattleFrontier_Lounge2_Text_DomeAceGoldMons 
+        {
+            BattleFrontier_Lounge2_Text_DomeAceIsThere,
+            BattleFrontier_Lounge2_Text_DomeAceSilverMons,
+            BattleFrontier_Lounge2_Text_DomeAceGoldMons
         },
         [FRONTIER_MANIAC_BATTLE_FACTORY] =
-        { 
-            BattleFrontier_Lounge2_Text_FactoryHeadIsThere, 
-            BattleFrontier_Lounge2_Text_FactoryHeadSilverMons, 
-            BattleFrontier_Lounge2_Text_FactoryHeadGoldMons 
+        {
+            BattleFrontier_Lounge2_Text_FactoryHeadIsThere,
+            BattleFrontier_Lounge2_Text_FactoryHeadSilverMons,
+            BattleFrontier_Lounge2_Text_FactoryHeadGoldMons
         },
         [FRONTIER_MANIAC_BATTLE_PALACE] =
-        { 
-            BattleFrontier_Lounge2_Text_PalaceMavenIsThere, 
-            BattleFrontier_Lounge2_Text_PalaceMavenSilverMons, 
-            BattleFrontier_Lounge2_Text_PalaceMavenGoldMons 
+        {
+            BattleFrontier_Lounge2_Text_PalaceMavenIsThere,
+            BattleFrontier_Lounge2_Text_PalaceMavenSilverMons,
+            BattleFrontier_Lounge2_Text_PalaceMavenGoldMons
         },
         [FRONTIER_MANIAC_BATTLE_ARENA] =
-        { 
-            BattleFrontier_Lounge2_Text_ArenaTycoonIsThere, 
-            BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons, 
-            BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons 
+        {
+            BattleFrontier_Lounge2_Text_ArenaTycoonIsThere,
+            BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons,
+            BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons
         },
-        [FRONTIER_MANIAC_BATTLE_PIKE] = 
-        { 
-            BattleFrontier_Lounge2_Text_PikeQueenIsThere, 
-            BattleFrontier_Lounge2_Text_PikeQueenSilverMons, 
-            BattleFrontier_Lounge2_Text_PikeQueenGoldMons 
+        [FRONTIER_MANIAC_BATTLE_PIKE] =
+        {
+            BattleFrontier_Lounge2_Text_PikeQueenIsThere,
+            BattleFrontier_Lounge2_Text_PikeQueenSilverMons,
+            BattleFrontier_Lounge2_Text_PikeQueenGoldMons
         },
         [FRONTIER_MANIAC_BATTLE_PYRAMID] =
-        { 
-            BattleFrontier_Lounge2_Text_PyramidKingIsThere, 
-            BattleFrontier_Lounge2_Text_PyramidKingSilverMons, 
-            BattleFrontier_Lounge2_Text_PyramidKingGoldMons 
+        {
+            BattleFrontier_Lounge2_Text_PyramidKingIsThere,
+            BattleFrontier_Lounge2_Text_PyramidKingSilverMons,
+            BattleFrontier_Lounge2_Text_PyramidKingGoldMons
         },
     };
 
-    static const u8 sFrontierManiacStreakThresholds[][FRONTIER_MANIAC_MESSAGE_COUNT - 1] = 
+    static const u8 sFrontierManiacStreakThresholds[][FRONTIER_MANIAC_MESSAGE_COUNT - 1] =
     {
         [FRONTIER_MANIAC_BATTLE_TOWER_SINGLES] = { 21, 56 },
         [FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES] = { 21, 35 },
@@ -2161,7 +2161,7 @@ void ShowFrontierManiacMessage(void)
         case FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES:
         case FRONTIER_MANIAC_BATTLE_TOWER_MULTIS:
         case FRONTIER_MANIAC_BATTLE_TOWER_LINK:
-            if (gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_50] 
+            if (gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_50]
                 >= gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_OPEN])
             {
                 winStreak = gSaveBlock2Ptr->frontier.towerWinStreaks[facility][FRONTIER_LVL_50];
@@ -2172,7 +2172,7 @@ void ShowFrontierManiacMessage(void)
             }
             break;
         case FRONTIER_MANIAC_BATTLE_DOME:
-            if (gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50] 
+            if (gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50]
                 >= gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN])
             {
                 winStreak = gSaveBlock2Ptr->frontier.domeWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50];
@@ -2183,7 +2183,7 @@ void ShowFrontierManiacMessage(void)
             }
             break;
         case FRONTIER_MANIAC_BATTLE_FACTORY:
-            if (gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50] 
+            if (gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50]
                 >= gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN])
             {
                 winStreak = gSaveBlock2Ptr->frontier.factoryWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50];
@@ -2194,7 +2194,7 @@ void ShowFrontierManiacMessage(void)
             }
             break;
         case FRONTIER_MANIAC_BATTLE_PALACE:
-            if (gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50] 
+            if (gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50]
                 >= gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_OPEN])
             {
                 winStreak = gSaveBlock2Ptr->frontier.palaceWinStreaks[FRONTIER_MODE_SINGLES][FRONTIER_LVL_50];
@@ -2205,7 +2205,7 @@ void ShowFrontierManiacMessage(void)
             }
             break;
         case FRONTIER_MANIAC_BATTLE_ARENA:
-            if (gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_50] 
+            if (gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_50]
                 >= gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_OPEN])
             {
                 winStreak = gSaveBlock2Ptr->frontier.arenaWinStreaks[FRONTIER_LVL_50];
@@ -2216,7 +2216,7 @@ void ShowFrontierManiacMessage(void)
             }
             break;
         case FRONTIER_MANIAC_BATTLE_PIKE:
-            if (gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_50] 
+            if (gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_50]
                 >= gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_OPEN])
             {
                 winStreak = gSaveBlock2Ptr->frontier.pikeWinStreaks[FRONTIER_LVL_50];
@@ -2227,7 +2227,7 @@ void ShowFrontierManiacMessage(void)
             }
             break;
         case FRONTIER_MANIAC_BATTLE_PYRAMID:
-            if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_50] 
+            if (gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_50]
                 >= gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_OPEN])
             {
                 winStreak = gSaveBlock2Ptr->frontier.pyramidWinStreaks[FRONTIER_LVL_50];
@@ -2429,13 +2429,13 @@ void ShowScrollableMultichoice(void)
     }
 }
 
-static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH] = 
+static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH] =
 {
-    [SCROLL_MULTI_NONE] = 
+    [SCROLL_MULTI_NONE] =
     {
         gText_Exit
     },
-    [SCROLL_MULTI_GLASS_WORKSHOP_VENDOR] = 
+    [SCROLL_MULTI_GLASS_WORKSHOP_VENDOR] =
     {
         gText_BlueFlute,
         gText_YellowFlute,
@@ -2446,7 +2446,7 @@ static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH]
         gText_PrettyDesk,
         gText_Exit
     },
-    [SCROLL_MULTI_POKEMON_FAN_CLUB_RATER] = 
+    [SCROLL_MULTI_POKEMON_FAN_CLUB_RATER] =
     {
         gText_0Pts,
         gText_10Pts,
@@ -2461,7 +2461,7 @@ static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH]
         gText_100Pts,
         gText_QuestionMark
     },
-    [SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1] = 
+    [SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1] =
     {
         gText_KissPoster16BP,
         gText_KissCushion32BP,
@@ -2535,7 +2535,7 @@ static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH]
         gText_ExchangeService,
         gText_Exit
     },
-    [SCROLL_MULTI_BF_MOVE_TUTOR_1] = 
+    [SCROLL_MULTI_BF_MOVE_TUTOR_1] =
     {
         gText_Softboiled16BP,
         gText_SeismicToss24BP,
@@ -2549,7 +2549,7 @@ static const u8 *const sScrollableMultichoiceOptions[][MAX_SCROLL_MULTI_LENGTH]
         gText_SwordsDance48BP,
         gText_Exit
     },
-    [SCROLL_MULTI_BF_MOVE_TUTOR_2] = 
+    [SCROLL_MULTI_BF_MOVE_TUTOR_2] =
     {
         gText_DefenseCurl16BP,
         gText_Snore24BP,
@@ -2896,7 +2896,7 @@ void UpdateFrontierGambler(u16 daysSince)
 
 void ShowFrontierGamblerLookingMessage(void)
 {
-    static const u8 *const sFrontierGamblerLookingMessages[] = 
+    static const u8 *const sFrontierGamblerLookingMessages[] =
     {
         BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle,
         BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble,
@@ -2919,7 +2919,7 @@ void ShowFrontierGamblerLookingMessage(void)
 
 void ShowFrontierGamblerGoMessage(void)
 {
-    static const u8 *const sFrontierGamblerGoMessages[] = 
+    static const u8 *const sFrontierGamblerGoMessages[] =
     {
         BattleFrontier_Lounge3_Text_GetToBattleTowerSingle,
         BattleFrontier_Lounge3_Text_GetToBattleTowerDouble,
@@ -2940,19 +2940,19 @@ void ShowFrontierGamblerGoMessage(void)
 
 void FrontierGamblerSetWonOrLost(bool8 won)
 {
-    static const u16 sFrontierChallenges[] = 
+    static const u16 sFrontierChallenges[] =
     {
         FRONTIER_CHALLENGE(FRONTIER_FACILITY_TOWER,   FRONTIER_MODE_SINGLES),
         FRONTIER_CHALLENGE(FRONTIER_FACILITY_TOWER,   FRONTIER_MODE_DOUBLES),
         FRONTIER_CHALLENGE(FRONTIER_FACILITY_TOWER,   FRONTIER_MODE_MULTIS),
         FRONTIER_CHALLENGE(FRONTIER_FACILITY_DOME,    FRONTIER_MODE_SINGLES),
         FRONTIER_CHALLENGE(FRONTIER_FACILITY_DOME,    FRONTIER_MODE_DOUBLES),
-        FRONTIER_CHALLENGE(FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_SINGLES), 
-        FRONTIER_CHALLENGE(FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_DOUBLES), 
-        FRONTIER_CHALLENGE(FRONTIER_FACILITY_PALACE,  FRONTIER_MODE_SINGLES), 
-        FRONTIER_CHALLENGE(FRONTIER_FACILITY_PALACE,  FRONTIER_MODE_DOUBLES), 
-        FRONTIER_CHALLENGE(FRONTIER_FACILITY_ARENA,   FRONTIER_MODE_SINGLES), 
-        FRONTIER_CHALLENGE(FRONTIER_FACILITY_PIKE,    FRONTIER_MODE_SINGLES), 
+        FRONTIER_CHALLENGE(FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_SINGLES),
+        FRONTIER_CHALLENGE(FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_DOUBLES),
+        FRONTIER_CHALLENGE(FRONTIER_FACILITY_PALACE,  FRONTIER_MODE_SINGLES),
+        FRONTIER_CHALLENGE(FRONTIER_FACILITY_PALACE,  FRONTIER_MODE_DOUBLES),
+        FRONTIER_CHALLENGE(FRONTIER_FACILITY_ARENA,   FRONTIER_MODE_SINGLES),
+        FRONTIER_CHALLENGE(FRONTIER_FACILITY_PIKE,    FRONTIER_MODE_SINGLES),
         FRONTIER_CHALLENGE(FRONTIER_FACILITY_PYRAMID, FRONTIER_MODE_SINGLES)
     };
 
@@ -3117,8 +3117,8 @@ static void ShowFrontierExchangeCornerItemIcon(u16 item)
     if (sScrollableMultichoice_ItemSpriteId != MAX_SPRITES)
     {
         gSprites[sScrollableMultichoice_ItemSpriteId].oam.priority = 0;
-        gSprites[sScrollableMultichoice_ItemSpriteId].pos1.x = 36;
-        gSprites[sScrollableMultichoice_ItemSpriteId].pos1.y = 92;
+        gSprites[sScrollableMultichoice_ItemSpriteId].x = 36;
+        gSprites[sScrollableMultichoice_ItemSpriteId].y = 92;
     }
 }
 
@@ -3140,31 +3140,31 @@ static void HideFrontierExchangeCornerItemIcon(u16 menu, u16 unused)
 }
 
 static const u16 sBattleFrontier_TutorMoves1[] =
-{ 
-    MOVE_SOFT_BOILED, 
-    MOVE_SEISMIC_TOSS, 
-    MOVE_DREAM_EATER, 
-    MOVE_MEGA_PUNCH, 
-    MOVE_MEGA_KICK, 
-    MOVE_BODY_SLAM, 
-    MOVE_ROCK_SLIDE, 
-    MOVE_COUNTER, 
-    MOVE_THUNDER_WAVE, 
-    MOVE_SWORDS_DANCE 
+{
+    MOVE_SOFT_BOILED,
+    MOVE_SEISMIC_TOSS,
+    MOVE_DREAM_EATER,
+    MOVE_MEGA_PUNCH,
+    MOVE_MEGA_KICK,
+    MOVE_BODY_SLAM,
+    MOVE_ROCK_SLIDE,
+    MOVE_COUNTER,
+    MOVE_THUNDER_WAVE,
+    MOVE_SWORDS_DANCE
 };
 
 static const u16 sBattleFrontier_TutorMoves2[] =
-{ 
-    MOVE_DEFENSE_CURL, 
-    MOVE_SNORE, 
-    MOVE_MUD_SLAP, 
-    MOVE_SWIFT, 
-    MOVE_ICY_WIND, 
-    MOVE_ENDURE, 
-    MOVE_PSYCH_UP, 
-    MOVE_ICE_PUNCH, 
-    MOVE_THUNDER_PUNCH, 
-    MOVE_FIRE_PUNCH 
+{
+    MOVE_DEFENSE_CURL,
+    MOVE_SNORE,
+    MOVE_MUD_SLAP,
+    MOVE_SWIFT,
+    MOVE_ICY_WIND,
+    MOVE_ENDURE,
+    MOVE_PSYCH_UP,
+    MOVE_ICE_PUNCH,
+    MOVE_THUNDER_PUNCH,
+    MOVE_FIRE_PUNCH
 };
 
 void BufferBattleFrontierTutorMoveName(void)
@@ -3181,7 +3181,7 @@ void BufferBattleFrontierTutorMoveName(void)
 
 static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection)
 {
-    static const struct WindowTemplate sBattleFrontierTutor_WindowTemplate = 
+    static const struct WindowTemplate sBattleFrontierTutor_WindowTemplate =
     {
         .bg = 0,
         .tilemapLeft = 1,
@@ -3205,7 +3205,7 @@ static void ShowBattleFrontierTutorWindow(u8 menu, u16 selection)
 
 static void ShowBattleFrontierTutorMoveDescription(u8 menu, u16 selection)
 {
-    static const u8 *const sBattleFrontier_TutorMoveDescriptions1[] = 
+    static const u8 *const sBattleFrontier_TutorMoveDescriptions1[] =
     {
         BattleFrontier_Lounge7_Text_SoftboiledDesc,
         BattleFrontier_Lounge7_Text_SeismicTossDesc,
@@ -3220,7 +3220,7 @@ static void ShowBattleFrontierTutorMoveDescription(u8 menu, u16 selection)
         gText_Exit,
     };
 
-    static const u8 *const sBattleFrontier_TutorMoveDescriptions2[] = 
+    static const u8 *const sBattleFrontier_TutorMoveDescriptions2[] =
     {
         BattleFrontier_Lounge7_Text_DefenseCurlDesc,
         BattleFrontier_Lounge7_Text_SnoreDesc,
@@ -3335,20 +3335,20 @@ void sub_813AF48(void)
 }
 
 // Undefine Scrollable Multichoice task data macros
-#undef tMaxItemsOnScreen  
-#undef tNumItems           
-#undef tLeft               
-#undef tTop                 
-#undef tWidth              
-#undef tHeight             
-#undef tKeepOpenAfterSelect 
-#undef tScrollOffset      
-#undef tSelectedRow        
-#undef tScrollMultiId       
-#undef tScrollArrowId       
-#undef tWindowId            
-#undef tListTaskId         
-#undef tTaskId              
+#undef tMaxItemsOnScreen
+#undef tNumItems
+#undef tLeft
+#undef tTop
+#undef tWidth
+#undef tHeight
+#undef tKeepOpenAfterSelect
+#undef tScrollOffset
+#undef tSelectedRow
+#undef tScrollMultiId
+#undef tScrollArrowId
+#undef tWindowId
+#undef tListTaskId
+#undef tTaskId
 
 void DoDeoxysRockInteraction(void)
 {
@@ -3730,7 +3730,7 @@ bool32 ShouldDistributeEonTicket(void)
 {
     if (!VarGet(VAR_DISTRIBUTE_EON_TICKET))
         return FALSE;
-    
+
     return TRUE;
 }
 
@@ -3794,17 +3794,17 @@ static void Task_LinkRetireStatusWithBattleTowerPartner(u8 taskId)
                 gSpecialVar_0x8005 = gBlockRecvBuffer[1][0];
                 ResetBlockReceivedFlag(1);
 
-                if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE 
+                if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE
                  && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE)
                 {
                     gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_BOTH_RETIRE;
                 }
-                else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_CONTINUE 
+                else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_CONTINUE
                       && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_RETIRE)
                 {
                     gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_MEMBER_RETIRE;
                 }
-                else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE 
+                else if (gSpecialVar_0x8004 == BATTLE_TOWER_LINK_RETIRE
                       && gSpecialVar_0x8005 == BATTLE_TOWER_LINK_CONTINUE)
                 {
                     gSpecialVar_Result = BATTLE_TOWER_LINKSTAT_LEADER_RETIRE;
@@ -4026,13 +4026,13 @@ bool8 InPokemonCenter(void)
 }
 
 /*  Summary of the Lilycove Trainer Fan Club, because it's a little messy
-    
+
     ## The Fan Club room itself
     There are initially 4 members of the Fan Club (+ an interviewer), none of whom are fans of the player
     After becoming the champion there will be 8 members of the Fan Club, 3 of whom are automatically fans of the player
     After this point, if a club member is a fan of the player they will sit at the front table and comment on the player
     If they are not fans of the player, they will sit at the far table and can make comments about a different trainer (see BufferFanClubTrainerName)
-    
+
     ## Gaining/losing fans
     After every link battle the player will gain a fan if they won, or lose a fan if they lost
     If the player has at least 3 fans, this is the only way to gain fans
@@ -4101,16 +4101,16 @@ void UpdateTrainerFanClubGameClear(void)
 }
 
 // If the player has < 3 fans, gain a new fan whenever the counter reaches 20+
-// Defeating Drake or participating in a Contest increments the counter by 2 
+// Defeating Drake or participating in a Contest increments the counter by 2
 // Participating at Battle Tower or in a Secret Base battle increments the counter by 1
 u8 TryGainNewFanFromCounter(u8 incrementId)
 {
-    static const u8 sCounterIncrements[] = 
-    { 
-        [FANCOUNTER_DEFEATED_DRAKE]    = 2, 
-        [FANCOUNTER_BATTLED_AT_BASE]   = 1, 
-        [FANCOUNTER_FINISHED_CONTEST]  = 2, 
-        [FANCOUNTER_USED_BATTLE_TOWER] = 1 
+    static const u8 sCounterIncrements[] =
+    {
+        [FANCOUNTER_DEFEATED_DRAKE]    = 2,
+        [FANCOUNTER_BATTLED_AT_BASE]   = 1,
+        [FANCOUNTER_FINISHED_CONTEST]  = 2,
+        [FANCOUNTER_USED_BATTLE_TOWER] = 1
     };
 
     if (VarGet(VAR_LILYCOVE_FAN_CLUB_STATE) == 2)
@@ -4143,16 +4143,16 @@ u8 TryGainNewFanFromCounter(u8 incrementId)
 // If all the members are already fans of the player then this redundantly sets the first fan in the list to be a fan
 static u16 PlayerGainRandomTrainerFan(void)
 {
-    static const u8 sFanClubMemberIds[NUM_TRAINER_FAN_CLUB_MEMBERS] = 
-    { 
-        FANCLUB_MEMBER1, 
-        FANCLUB_MEMBER2, 
-        FANCLUB_MEMBER3, 
-        FANCLUB_MEMBER4, 
-        FANCLUB_MEMBER5, 
+    static const u8 sFanClubMemberIds[NUM_TRAINER_FAN_CLUB_MEMBERS] =
+    {
+        FANCLUB_MEMBER1,
+        FANCLUB_MEMBER2,
+        FANCLUB_MEMBER3,
+        FANCLUB_MEMBER4,
+        FANCLUB_MEMBER5,
         FANCLUB_MEMBER6,
-        FANCLUB_MEMBER7, 
-        FANCLUB_MEMBER8 
+        FANCLUB_MEMBER7,
+        FANCLUB_MEMBER8
     };
 
     u8 i;
@@ -4179,16 +4179,16 @@ static u16 PlayerGainRandomTrainerFan(void)
 // If no fan was lost while looping, the last current fan in the list will stop being a fan
 static u16 PlayerLoseRandomTrainerFan(void)
 {
-    static const u8 sFanClubMemberIds[NUM_TRAINER_FAN_CLUB_MEMBERS] = 
-    { 
-        FANCLUB_MEMBER1, 
-        FANCLUB_MEMBER6, 
-        FANCLUB_MEMBER7, 
-        FANCLUB_MEMBER4, 
-        FANCLUB_MEMBER3, 
-        FANCLUB_MEMBER5, 
-        FANCLUB_MEMBER8, 
-        FANCLUB_MEMBER2 
+    static const u8 sFanClubMemberIds[NUM_TRAINER_FAN_CLUB_MEMBERS] =
+    {
+        FANCLUB_MEMBER1,
+        FANCLUB_MEMBER6,
+        FANCLUB_MEMBER7,
+        FANCLUB_MEMBER4,
+        FANCLUB_MEMBER3,
+        FANCLUB_MEMBER5,
+        FANCLUB_MEMBER8,
+        FANCLUB_MEMBER2
     };
 
     u8 i;
diff --git a/src/field_weather.c b/src/field_weather.c
index 4b9c6a863..c067e8ebd 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -110,8 +110,8 @@ void (*const gWeatherPalStateFuncs[])(void) =
 {
     [WEATHER_PAL_STATE_CHANGING_WEATHER]  = UpdateWeatherGammaShift,
     [WEATHER_PAL_STATE_SCREEN_FADING_IN]  = FadeInScreenWithWeather,
-    [WEATHER_PAL_STATE_SCREEN_FADING_OUT] = DoNothing,               
-    [WEATHER_PAL_STATE_IDLE]              = DoNothing,             
+    [WEATHER_PAL_STATE_SCREEN_FADING_OUT] = DoNothing,
+    [WEATHER_PAL_STATE_IDLE]              = DoNothing,
 };
 
 // This table specifies which of the gamma shift tables should be
diff --git a/src/field_weather_effect.c b/src/field_weather_effect.c
index 0d1e6958c..732158733 100644
--- a/src/field_weather_effect.c
+++ b/src/field_weather_effect.c
@@ -189,7 +189,7 @@ static void CreateCloudSprites(void)
         {
             gWeatherPtr->sprites.s1.cloudSprites[i] = &gSprites[spriteId];
             sprite = gWeatherPtr->sprites.s1.cloudSprites[i];
-            SetSpritePosToMapCoords(sCloudSpriteMapCoords[i].x + 7, sCloudSpriteMapCoords[i].y + 7, &sprite->pos1.x, &sprite->pos1.y);
+            SetSpritePosToMapCoords(sCloudSpriteMapCoords[i].x + 7, sCloudSpriteMapCoords[i].y + 7, &sprite->x, &sprite->y);
             sprite->coordOffsetEnabled = TRUE;
         }
         else
@@ -223,7 +223,7 @@ static void UpdateCloudSprite(struct Sprite *sprite)
     // Move 1 pixel left every 2 frames.
     sprite->data[0] = (sprite->data[0] + 1) & 1;
     if (sprite->data[0])
-        sprite->pos1.x--;
+        sprite->x--;
 }
 
 //------------------------------------------------------------------------------
@@ -593,12 +593,12 @@ static void UpdateRainSprite(struct Sprite *sprite)
         // Raindrop is in its "falling" motion.
         sprite->tPosX += sRainSpriteMovement[gWeatherPtr->isDownpour][0];
         sprite->tPosY += sRainSpriteMovement[gWeatherPtr->isDownpour][1];
-        sprite->pos1.x = sprite->tPosX >> 4;
-        sprite->pos1.y = sprite->tPosY >> 4;
+        sprite->x = sprite->tPosX >> 4;
+        sprite->y = sprite->tPosY >> 4;
 
         if (sprite->tActive
-         && (sprite->pos1.x >= -8 && sprite->pos1.x <= 248)
-         && sprite->pos1.y >= -16 && sprite->pos1.y <= 176)
+         && (sprite->x >= -8 && sprite->x <= 248)
+         && sprite->y >= -16 && sprite->y <= 176)
             sprite->invisible = FALSE;
         else
             sprite->invisible = TRUE;
@@ -608,8 +608,8 @@ static void UpdateRainSprite(struct Sprite *sprite)
             // Make raindrop splash on the ground
             StartSpriteAnim(sprite, gWeatherPtr->isDownpour + 1);
             sprite->tState = 1;
-            sprite->pos1.x -= gSpriteCoordOffsetX;
-            sprite->pos1.y -= gSpriteCoordOffsetY;
+            sprite->x -= gSpriteCoordOffsetX;
+            sprite->y -= gSpriteCoordOffsetY;
             sprite->coordOffsetEnabled = TRUE;
         }
     }
@@ -878,7 +878,7 @@ static const union AnimCmd *const sSnowflakeAnimCmds[] =
 
 static const struct SpriteTemplate sSnowflakeSpriteTemplate =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = PALTAG_WEATHER,
     .oam = &sSnowflakeSpriteOamData,
     .anims = sSnowflakeAnimCmds,
@@ -925,10 +925,10 @@ static void InitSnowflakeSpriteMovement(struct Sprite *sprite)
     u16 rand;
     u16 x = ((sprite->tSnowflakeId * 5) & 7) * 30 + (Random() % 30);
 
-    sprite->pos1.y = -3 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
-    sprite->pos1.x = x - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
-    sprite->tPosY = sprite->pos1.y * 128;
-    sprite->pos2.x = 0;
+    sprite->y = -3 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
+    sprite->x = x - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
+    sprite->tPosY = sprite->y * 128;
+    sprite->x2 = 0;
     rand = Random();
     sprite->tDeltaY = (rand & 3) * 5 + 64;
     sprite->tDeltaY2 = sprite->tDeltaY;
@@ -946,8 +946,8 @@ static void WaitSnowflakeSprite(struct Sprite *sprite)
     {
         sprite->invisible = FALSE;
         sprite->callback = UpdateSnowflakeSprite;
-        sprite->pos1.y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
-        sprite->tPosY = sprite->pos1.y * 128;
+        sprite->y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
+        sprite->tPosY = sprite->y * 128;
         gWeatherPtr->snowflakeTimer = 0;
     }
 }
@@ -958,32 +958,32 @@ static void UpdateSnowflakeSprite(struct Sprite *sprite)
     s16 y;
 
     sprite->tPosY += sprite->tDeltaY;
-    sprite->pos1.y = sprite->tPosY >> 7;
+    sprite->y = sprite->tPosY >> 7;
     sprite->tWaveIndex += sprite->tWaveDelta;
     sprite->tWaveIndex &= 0xFF;
-    sprite->pos2.x = gSineTable[sprite->tWaveIndex] / 64;
+    sprite->x2 = gSineTable[sprite->tWaveIndex] / 64;
 
-    x = (sprite->pos1.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF;
+    x = (sprite->x + sprite->centerToCornerVecX + gSpriteCoordOffsetX) & 0x1FF;
     if (x & 0x100)
         x |= -0x100;
 
     if (x < -3)
-        sprite->pos1.x = 242 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
+        sprite->x = 242 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
     else if (x > 242)
-        sprite->pos1.x = -3 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
+        sprite->x = -3 - (gSpriteCoordOffsetX + sprite->centerToCornerVecX);
 
-    y = (sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY) & 0xFF;
+    y = (sprite->y + sprite->centerToCornerVecY + gSpriteCoordOffsetY) & 0xFF;
     if (y > 163 && y < 171)
     {
-        sprite->pos1.y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
-        sprite->tPosY = sprite->pos1.y * 128;
+        sprite->y = 250 - (gSpriteCoordOffsetY + sprite->centerToCornerVecY);
+        sprite->tPosY = sprite->y * 128;
         sprite->tFallCounter = 0;
         sprite->tFallDuration = 220;
     }
     else if (y > 242 && y < 250)
     {
-        sprite->pos1.y = 163;
-        sprite->tPosY = sprite->pos1.y * 128;
+        sprite->y = 163;
+        sprite->tPosY = sprite->y * 128;
         sprite->tFallCounter = 0;
         sprite->tFallDuration = 220;
         sprite->invisible = TRUE;
@@ -993,7 +993,7 @@ static void UpdateSnowflakeSprite(struct Sprite *sprite)
     if (++sprite->tFallCounter == sprite->tFallDuration)
     {
         InitSnowflakeSpriteMovement(sprite);
-        sprite->pos1.y = 250;
+        sprite->y = 250;
         sprite->invisible = TRUE;
         sprite->callback = WaitSnowflakeSprite;
     }
@@ -1441,12 +1441,12 @@ bool8 FogHorizontal_Finish(void)
 
 static void FogHorizontalSpriteCallback(struct Sprite *sprite)
 {
-    sprite->pos2.y = (u8)gSpriteCoordOffsetY;
-    sprite->pos1.x = gWeatherPtr->fogHScrollPosX + 32 + sprite->tSpriteColumn * 64;
-    if (sprite->pos1.x > 271)
+    sprite->y2 = (u8)gSpriteCoordOffsetY;
+    sprite->x = gWeatherPtr->fogHScrollPosX + 32 + sprite->tSpriteColumn * 64;
+    if (sprite->x > 271)
     {
-        sprite->pos1.x = 480 + gWeatherPtr->fogHScrollPosX - (4 - sprite->tSpriteColumn) * 64;
-        sprite->pos1.x &= 0x1FF;
+        sprite->x = 480 + gWeatherPtr->fogHScrollPosX - (4 - sprite->tSpriteColumn) * 64;
+        sprite->x &= 0x1FF;
     }
 }
 
@@ -1471,8 +1471,8 @@ static void CreateFogHorizontalSprites(void)
             {
                 sprite = &gSprites[spriteId];
                 sprite->tSpriteColumn = i % 5;
-                sprite->pos1.x = (i % 5) * 64 + 32;
-                sprite->pos1.y = (i / 5) * 64 + 32;
+                sprite->x = (i % 5) * 64 + 32;
+                sprite->y = (i / 5) * 64 + 32;
                 gWeatherPtr->sprites.s2.fogHSprites[i] = sprite;
             }
             else
@@ -1700,12 +1700,12 @@ static void UpdateAshSprite(struct Sprite *sprite)
         sprite->tOffsetY++;
     }
 
-    sprite->pos1.y = gSpriteCoordOffsetY + sprite->tOffsetY;
-    sprite->pos1.x = gWeatherPtr->ashBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
-    if (sprite->pos1.x > 271)
+    sprite->y = gSpriteCoordOffsetY + sprite->tOffsetY;
+    sprite->x = gWeatherPtr->ashBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
+    if (sprite->x > 271)
     {
-        sprite->pos1.x = gWeatherPtr->ashBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
-        sprite->pos1.x &= 0x1FF;
+        sprite->x = gWeatherPtr->ashBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
+        sprite->x &= 0x1FF;
     }
 }
 
@@ -1910,12 +1910,12 @@ static void DestroyFogDiagonalSprites(void)
 
 static void UpdateFogDiagonalSprite(struct Sprite *sprite)
 {
-    sprite->pos2.y = gWeatherPtr->fogDPosY;
-    sprite->pos1.x = gWeatherPtr->fogDBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
-    if (sprite->pos1.x > 271)
+    sprite->y2 = gWeatherPtr->fogDPosY;
+    sprite->x = gWeatherPtr->fogDBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
+    if (sprite->x > 271)
     {
-        sprite->pos1.x = gWeatherPtr->fogDBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
-        sprite->pos1.x &= 0x1FF;
+        sprite->x = gWeatherPtr->fogDBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
+        sprite->x &= 0x1FF;
     }
 }
 
@@ -2186,12 +2186,12 @@ static void CreateSwirlSandstormSprites(void)
 
 static void UpdateSandstormSprite(struct Sprite *sprite)
 {
-    sprite->pos2.y = gWeatherPtr->sandstormPosY;
-    sprite->pos1.x = gWeatherPtr->sandstormBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
-    if (sprite->pos1.x > 271)
+    sprite->y2 = gWeatherPtr->sandstormPosY;
+    sprite->x = gWeatherPtr->sandstormBaseSpritesX + 32 + sprite->tSpriteColumn * 64;
+    if (sprite->x > 271)
     {
-        sprite->pos1.x = gWeatherPtr->sandstormBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
-        sprite->pos1.x &= 0x1FF;
+        sprite->x = gWeatherPtr->sandstormBaseSpritesX + 480 - (4 - sprite->tSpriteColumn) * 64;
+        sprite->x &= 0x1FF;
     }
 }
 
@@ -2205,16 +2205,16 @@ static void UpdateSandstormSwirlSprite(struct Sprite *sprite)
 {
     u32 x, y;
 
-    if (--sprite->pos1.y < -48)
+    if (--sprite->y < -48)
     {
-        sprite->pos1.y = 208;
+        sprite->y = 208;
         sprite->tRadius = 4;
     }
 
     x = sprite->tRadius * gSineTable[sprite->tWaveIndex];
     y = sprite->tRadius * gSineTable[sprite->tWaveIndex + 0x40];
-    sprite->pos2.x = x >> 8;
-    sprite->pos2.y = y >> 8;
+    sprite->x2 = x >> 8;
+    sprite->y2 = y >> 8;
     sprite->tWaveIndex = (sprite->tWaveIndex + 10) & 0xFF;
     if (++sprite->tRadiusCounter > 8)
     {
@@ -2404,17 +2404,17 @@ static void UpdateBubbleSprite(struct Sprite *sprite)
         sprite->tScrollXCounter = 0;
         if (sprite->tScrollXDir == 0)
         {
-            if (++sprite->pos2.x > 4)
+            if (++sprite->x2 > 4)
                 sprite->tScrollXDir = 1;
         }
         else
         {
-            if (--sprite->pos2.x <= 0)
+            if (--sprite->x2 <= 0)
                 sprite->tScrollXDir = 0;
         }
     }
 
-    sprite->pos1.y -= 3;
+    sprite->y -= 3;
     if (++sprite->tCounter >= 120)
         DestroySprite(sprite);
 }
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 044e25a8f..daa46ad76 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -125,7 +125,7 @@ const struct SpritePalette gSpritePalette_CutGrass = {gFieldEffectPal_CutGrass,
 
 static const struct SpriteTemplate sSpriteTemplate_CutGrass =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_CUT_GRASS,
     .oam = &sOamData_CutGrass,
     .anims = sSpriteAnimTable_CutGrass,
@@ -555,8 +555,8 @@ static void CutGrassSpriteCallback1(struct Sprite *sprite)
 
 static void CutGrassSpriteCallback2(struct Sprite *sprite)
 {
-    sprite->pos2.x = Sin(sprite->data[2], sprite->data[0]);
-    sprite->pos2.y = Cos(sprite->data[2], sprite->data[0]);
+    sprite->x2 = Sin(sprite->data[2], sprite->data[0]);
+    sprite->y2 = Cos(sprite->data[2], sprite->data[0]);
 
     sprite->data[2] = (sprite->data[2] + 8) & 0xFF;
     sprite->data[0] += 1 + (sprite->data[3] >> 2); // right shift by 2 is dividing by 4
diff --git a/src/fldeff_escalator.c b/src/fldeff_escalator.c
index 733dca722..769e73562 100644
--- a/src/fldeff_escalator.c
+++ b/src/fldeff_escalator.c
@@ -71,7 +71,7 @@ static void SetEscalatorMetatile(u8 taskId, const s16 *metatileIds, u16 metatile
     s16 i;
     s16 j;
 
-    // Check all the escalator sections and only progress the selected one to the next stage    
+    // Check all the escalator sections and only progress the selected one to the next stage
     if (!gTasks[taskId].tGoingUp)
     {
         for (i = 0; i < 3; i++)
@@ -178,7 +178,7 @@ void StopEscalator(void)
 
 bool8 IsEscalatorMoving(void)
 {
-    if (gTasks[sEscalatorAnim_TaskId].tDrawingEscalator == FALSE 
+    if (gTasks[sEscalatorAnim_TaskId].tDrawingEscalator == FALSE
      && gTasks[sEscalatorAnim_TaskId].tTransitionStage == LAST_ESCALATOR_STAGE)
         return FALSE;
     else
diff --git a/src/fldeff_misc.c b/src/fldeff_misc.c
index 3d3b83fef..c01babb68 100644
--- a/src/fldeff_misc.c
+++ b/src/fldeff_misc.c
@@ -193,7 +193,7 @@ static const struct SpriteFrameImage sPicTable_SecretPowerShrub[] =
 
 static const struct SpriteTemplate sSpriteTemplate_SecretPowerCave =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_SECRET_POWER_TREE,
     .oam = &sOam_SecretPower,
     .anims = sAnimTable_SecretPowerCave,
@@ -204,7 +204,7 @@ static const struct SpriteTemplate sSpriteTemplate_SecretPowerCave =
 
 static const struct SpriteTemplate sSpriteTemplate_SecretPowerTree =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_SECRET_POWER_PLANT,
     .oam = &sOam_SecretPower,
     .anims = sAnimTable_SecretPowerTree,
@@ -215,7 +215,7 @@ static const struct SpriteTemplate sSpriteTemplate_SecretPowerTree =
 
 static const struct SpriteTemplate sSpriteTemplate_SecretPowerShrub =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_SECRET_POWER_PLANT,
     .oam = &sOam_SecretPower,
     .anims = sAnimTable_SecretPowerShrub,
@@ -261,7 +261,7 @@ static const struct SpriteFrameImage sPicTable_SandPillar[] =
 
 static const struct SpriteTemplate sSpriteTemplate_SandPillar =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_SAND_PILLAR,
     .oam = &sOam_SandPillar,
     .anims = sAnimTable_SandPillar,
@@ -299,7 +299,7 @@ static const union AnimCmd *const sAnimTable_RecordMixLights[] =
 
 static const struct SpriteTemplate sSpriteTemplate_RecordMixLights =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = 0x1000,
     .oam = &gObjectEventBaseOam_32x8,
     .anims = sAnimTable_RecordMixLights,
@@ -1297,10 +1297,10 @@ u8 CreateRecordMixingLights(void)
     else
     {
         struct Sprite *sprite = &gSprites[spriteId];
-        GetMapCoordsFromSpritePos(16, 13, &sprite->pos1.x, &sprite->pos1.y);
+        GetMapCoordsFromSpritePos(16, 13, &sprite->x, &sprite->y);
         sprite->coordOffsetEnabled = TRUE;
-        sprite->pos1.x += 16;
-        sprite->pos1.y += 2;
+        sprite->x += 16;
+        sprite->y += 2;
     }
     return spriteId;
 }
diff --git a/src/frontier_pass.c b/src/frontier_pass.c
index 4081aaabf..53bd68eac 100644
--- a/src/frontier_pass.c
+++ b/src/frontier_pass.c
@@ -38,14 +38,14 @@ enum
     WINDOW_BATTLE_RECORD,
     WINDOW_BATTLE_POINTS,
     WINDOW_DESCRIPTION,
-    WINDOW_4,
+    WINDOW_DUMMY,
     WINDOW_COUNT
 };
 
 // Windows displayed in the facilities map view.
 enum
 {
-    MAP_WINDOW_0,
+    MAP_WINDOW_UNUSED, // Overlaps the "Battle Frontier" title area of the map
     MAP_WINDOW_NAME,
     MAP_WINDOW_DESCRIPTION,
     MAP_WINDOW_COUNT
@@ -59,9 +59,39 @@ enum
     CURSOR_AREA_RECORD,
     CURSOR_AREA_CANCEL,
     CURSOR_AREA_POINTS,
-    CURSOR_AREA_EARNED_SYMBOLS, // The window.
-    CURSOR_AREA_SYMBOL, // All 7 symbols.
-    CURSOR_AREA_COUNT = CURSOR_AREA_SYMBOL + NUM_FRONTIER_FACILITIES,
+    CURSOR_AREA_EARNED_SYMBOLS, // The window containing the symbols
+    CURSOR_AREA_SYMBOL_TOWER,
+    CURSOR_AREA_SYMBOL_DOME,
+    CURSOR_AREA_SYMBOL_PALACE,
+    CURSOR_AREA_SYMBOL_ARENA,
+    CURSOR_AREA_SYMBOL_FACTORY,
+    CURSOR_AREA_SYMBOL_PIKE,
+    CURSOR_AREA_SYMBOL_PYRAMID,
+    CURSOR_AREA_COUNT
+};
+
+// Start of symbol cursor areas
+#define CURSOR_AREA_SYMBOL CURSOR_AREA_SYMBOL_TOWER
+
+enum {
+    MAP_INDICATOR_RECTANGLE,
+    MAP_INDICATOR_SQUARE,
+};
+
+enum {
+    TAG_CURSOR,
+    TAG_MAP_INDICATOR,
+    TAG_MEDAL_SILVER,
+    TAG_MEDAL_GOLD,
+    TAG_HEAD_MALE,
+    TAG_HEAD_FEMALE,
+};
+
+// Error return codes. Never read
+enum {
+    SUCCESS,
+    ERR_ALREADY_DONE,
+    ERR_ALLOC_FAILED,
 };
 
 struct FrontierPassData
@@ -73,25 +103,26 @@ struct FrontierPassData
     s16 cursorY;
     u8 cursorArea;
     u8 previousCursorArea;
-    u8 hasBattleRecord:1;
-    u8 unkE:3;
+    bool8 hasBattleRecord:1;
+    u8 areaToShow:3;
     u8 trainerStars:4;
-    u8 facilitySymbols[NUM_FRONTIER_FACILITIES];
+    u8 facilitySymbols[NUM_FRONTIER_FACILITIES]; // 0: no symbol, 1: silver, 2: gold
 };
 
 struct FrontierPassGfx
 {
     struct Sprite *cursorSprite;
     struct Sprite *symbolSprites[NUM_FRONTIER_FACILITIES];
-    u8 *unk20;
-    u8 *unk24;
-    u8 *unk28;
-    bool8 setAffine;
-    s16 unk2E;
-    s16 unk30;
-    u8 tilemapBuff1[0x1000];
-    u8 tilemapBuff2[0x1000];
-    u8 tilemapBuff3[0x400];
+    // These 3 tilemaps are used to overwrite the respective area when highlighted
+    u8 *mapAndCardZoomTilemap;
+    u8 *mapAndCardTilemap;
+    u8 *battleRecordTilemap;
+    bool8 zooming;
+    s16 scaleX;
+    s16 scaleY;
+    u8 tilemapBuff1[BG_SCREEN_SIZE * 2];
+    u8 tilemapBuff2[BG_SCREEN_SIZE * 2];
+    u8 tilemapBuff3[BG_SCREEN_SIZE / 2];
 };
 
 struct FrontierPassSaved
@@ -109,9 +140,9 @@ struct FrontierMapData
     struct Sprite *mapIndicatorSprite;
     u8 cursorPos;
     u8 unused;
-    u8 tilemapBuff0[0x1000];
-    u8 tilemapBuff1[0x1000];
-    u8 tilemapBuff2[0x1000];
+    u8 tilemapBuff0[BG_SCREEN_SIZE * 2];
+    u8 tilemapBuff1[BG_SCREEN_SIZE * 2];
+    u8 tilemapBuff2[BG_SCREEN_SIZE * 2];
 };
 
 static EWRAM_DATA struct FrontierPassData *sPassData = NULL;
@@ -119,37 +150,39 @@ static EWRAM_DATA struct FrontierPassGfx *sPassGfx = NULL;
 static EWRAM_DATA struct FrontierMapData *sMapData = NULL;
 static EWRAM_DATA struct FrontierPassSaved sSavedPassData = {0};
 
-// This file's functions.
 static u32 AllocateFrontierPassData(void (*callback)(void));
 static void ShowFrontierMap(void (*callback)(void));
 static void CB2_InitFrontierPass(void);
-static void sub_80C629C(void);
+static void DrawFrontierPassBg(void);
 static void FreeCursorAndSymbolSprites(void);
 static void LoadCursorAndSymbolSprites(void);
 static u32 FreeFrontierPassData(void);
 static bool32 InitFrontierPass(void);
 static bool32 HideFrontierPass(void);
-static void Task_HandleFrontierPassInput(u8 taskId);
-static void Task_DoFadeEffect(u8 taskId);
-static void sub_80C6104(u8 cursorArea, u8 previousCursorArea);
-static void PrintAreaDescription(u8 cursorArea);
-static void sub_80C5F58(bool8 arg0, bool8 arg1);
-static void SpriteCb_Dummy(struct Sprite *sprite);
-
-// Const rom data.
-static const u16 sMaleHeadPalette[] = INCBIN_U16("graphics/frontier_pass/map_heads.gbapal");
-static const u16 sFemaleHeadPalette[] = INCBIN_U16("graphics/frontier_pass/map_heads_female.gbapal");
-static const u32 gUnknown_0856FBBC[] = INCBIN_U32("graphics/frontier_pass/map_screen.4bpp.lz");
-static const u32 sCursorGfx[] = INCBIN_U32("graphics/frontier_pass/cursor.4bpp.lz");
-static const u32 sHeadsGfx[] = INCBIN_U32("graphics/frontier_pass/map_heads.4bpp.lz");
-static const u32 sMapCursorGfx[] = INCBIN_U32("graphics/frontier_pass/map_cursor.4bpp.lz");
-static const u32 gUnknown_08570E00[] = INCBIN_U32("graphics/frontier_pass/map_screen.bin.lz");
-static const u32 gUnknown_08571060[] = INCBIN_U32("graphics/frontier_pass/small_map_and_card.bin.lz");
-static const u32 gUnknown_08571298[] = INCBIN_U32("graphics/frontier_pass/unknown_571298.bin");
-static const u32 gUnknown_085712C0[] = INCBIN_U32("graphics/frontier_pass/record_frame.bin.lz");
-static const u32 gUnknown_085712F8[] = INCBIN_U32("graphics/frontier_pass/small_map_and_card_affine.bin.lz");
-
-static const s16 gUnknown_085713E0[][2] = {{216, 32}, {216, 128}};
+static void Task_HandleFrontierPassInput(u8);
+static void Task_PassAreaZoom(u8);
+static void UpdateAreaHighlight(u8, u8);
+static void PrintAreaDescription(u8);
+static void ShowHideZoomingArea(bool8, bool8);
+static void SpriteCB_PlayerHead(struct Sprite *);
+
+static const u16 sMaleHead_Pal[]                 = INCBIN_U16("graphics/frontier_pass/map_heads.gbapal");
+static const u16 sFemaleHead_Pal[]               = INCBIN_U16("graphics/frontier_pass/map_heads_female.gbapal");
+static const u32 sMapScreen_Gfx[]                = INCBIN_U32("graphics/frontier_pass/map_screen.4bpp.lz");
+static const u32 sCursor_Gfx[]                   = INCBIN_U32("graphics/frontier_pass/cursor.4bpp.lz");
+static const u32 sHeads_Gfx[]                    = INCBIN_U32("graphics/frontier_pass/map_heads.4bpp.lz");
+static const u32 sMapCursor_Gfx[]                = INCBIN_U32("graphics/frontier_pass/map_cursor.4bpp.lz");
+static const u32 sMapScreen_Tilemap[]            = INCBIN_U32("graphics/frontier_pass/map_screen.bin.lz");
+static const u32 sMapAndCard_ZoomedOut_Tilemap[] = INCBIN_U32("graphics/frontier_pass/small_map_and_card.bin.lz");
+static const u32 sUnusedData[]                   = INCBIN_U32("graphics/frontier_pass/unused.bin");
+static const u32 sBattleRecord_Tilemap[]         = INCBIN_U32("graphics/frontier_pass/record_frame.bin.lz");
+static const u32 sMapAndCard_Zooming_Tilemap[]   = INCBIN_U32("graphics/frontier_pass/small_map_and_card_affine.bin.lz");
+
+static const s16 sBgAffineCoords[][2] =
+{
+    [CURSOR_AREA_MAP - 1]  = {216,  32},
+    [CURSOR_AREA_CARD - 1] = {216, 128}
+};
 
 static const struct BgTemplate sPassBgTemplates[] =
 {
@@ -213,9 +246,9 @@ static const struct BgTemplate sMapBgTemplates[] =
     },
 };
 
-static const struct WindowTemplate sPassWindowTemplates[] =
+static const struct WindowTemplate sPassWindowTemplates[WINDOW_COUNT] =
 {
-    {
+    [WINDOW_EARNED_SYMBOLS] = {
         .bg = 0,
         .tilemapLeft = 2,
         .tilemapTop = 3,
@@ -224,7 +257,7 @@ static const struct WindowTemplate sPassWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x1,
     },
-    {
+    [WINDOW_BATTLE_RECORD] = {
         .bg = 0,
         .tilemapLeft = 2,
         .tilemapTop = 10,
@@ -233,7 +266,7 @@ static const struct WindowTemplate sPassWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x26,
     },
-    {
+    [WINDOW_BATTLE_POINTS] = {
         .bg = 0,
         .tilemapLeft = 2,
         .tilemapTop = 13,
@@ -242,7 +275,7 @@ static const struct WindowTemplate sPassWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x4B,
     },
-    {
+    [WINDOW_DESCRIPTION] = {
         .bg = 0,
         .tilemapLeft = 0,
         .tilemapTop = 18,
@@ -256,7 +289,7 @@ static const struct WindowTemplate sPassWindowTemplates[] =
 
 static const struct WindowTemplate sMapWindowTemplates[] =
 {
-    {
+    [MAP_WINDOW_UNUSED] = {
         .bg = 0,
         .tilemapLeft = 0,
         .tilemapTop = 1,
@@ -265,7 +298,7 @@ static const struct WindowTemplate sMapWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x1,
     },
-    {
+    [MAP_WINDOW_NAME] = {
         .bg = 0,
         .tilemapLeft = 20,
         .tilemapTop = 1,
@@ -274,7 +307,7 @@ static const struct WindowTemplate sMapWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x4D,
     },
-    {
+    [MAP_WINDOW_DESCRIPTION] = {
         .bg = 0,
         .tilemapLeft = 2,
         .tilemapTop = 16,
@@ -300,159 +333,162 @@ struct
     s16 xStart;
     s16 xEnd;
 }
-static const sPassAreasLayout[] =
-{
-    {28, 76, 132, 220},
-    {84, 132, 132, 220},
-    {80, 102, 20, 108},
-    {0, 16, 152, 240},
-    {108, 134, 20, 108},
-    {24, 48, 20, 108},
-    {50, 66, 20, 36},
-    {66, 82, 32, 48},
-    {50, 66, 44, 60},
-    {66, 82, 56, 72},
-    {50, 66, 68, 84},
-    {66, 82, 80, 96},
-    {50, 66, 92, 108},
+static const sPassAreasLayout[CURSOR_AREA_COUNT - 1] =
+{
+    [CURSOR_AREA_MAP - 1]            = { 28,  76, 132, 220},
+    [CURSOR_AREA_CARD - 1]           = { 84, 132, 132, 220},
+    [CURSOR_AREA_RECORD - 1]         = { 80, 102,  20, 108},
+    [CURSOR_AREA_CANCEL - 1]         = {  0,  16, 152, 240},
+    [CURSOR_AREA_POINTS - 1]         = {108, 134,  20, 108},
+    [CURSOR_AREA_EARNED_SYMBOLS - 1] = { 24,  48,  20, 108},
+    [CURSOR_AREA_SYMBOL_TOWER - 1]   = { 50,  66,  20,  36},
+    [CURSOR_AREA_SYMBOL_DOME - 1]    = { 66,  82,  32,  48},
+    [CURSOR_AREA_SYMBOL_PALACE - 1]  = { 50,  66,  44,  60},
+    [CURSOR_AREA_SYMBOL_ARENA - 1]   = { 66,  82,  56,  72},
+    [CURSOR_AREA_SYMBOL_FACTORY - 1] = { 50,  66,  68,  84},
+    [CURSOR_AREA_SYMBOL_PIKE - 1]    = { 66,  82,  80,  96},
+    [CURSOR_AREA_SYMBOL_PYRAMID - 1] = { 50,  66,  92, 108},
 };
 
 static const struct CompressedSpriteSheet sCursorSpriteSheets[] =
 {
-    {sCursorGfx, 0x100, 0},
-    {sMapCursorGfx, 0x400, 1},
-    {gFrontierPassMedals_Gfx, 0x380, 2},
+    {sCursor_Gfx, 0x100, TAG_CURSOR},
+    {sMapCursor_Gfx, 0x400, TAG_MAP_INDICATOR},
+    {gFrontierPassMedals_Gfx, 0x380, TAG_MEDAL_SILVER},
 };
 
 static const struct CompressedSpriteSheet sHeadsSpriteSheet[] =
 {
-    {sHeadsGfx, 0x100, 4},
+    {sHeads_Gfx, 0x100, TAG_HEAD_MALE},
     {}
 };
 
 static const struct SpritePalette sSpritePalettes[] =
 {
-    {gFrontierPassCursor_Pal, 0},
-    {gFrontierPassMapCursor_Pal, 1},
-    {gFrontierPassMedalsSilver_Pal, 2},
-    {gFrontierPassMedalsGold_Pal, 3},
-    {sMaleHeadPalette, 4},
-    {sFemaleHeadPalette, 5},
+    {gFrontierPassCursor_Pal,       TAG_CURSOR},
+    {gFrontierPassMapCursor_Pal,    TAG_MAP_INDICATOR},
+    {gFrontierPassMedalsSilver_Pal, TAG_MEDAL_SILVER},
+    {gFrontierPassMedalsGold_Pal,   TAG_MEDAL_GOLD},
+    {sMaleHead_Pal,                 TAG_HEAD_MALE},
+    {sFemaleHead_Pal,               TAG_HEAD_FEMALE},
     {}
 };
 
-static const union AnimCmd sSpriteAnim_857151C[] =
+static const union AnimCmd sAnim_Frame1_Unused[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd sSpriteAnim_8571524[] =
+static const union AnimCmd sAnim_Frame1[] =
 {
     ANIMCMD_FRAME(0, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd sSpriteAnim_857152C[] =
+static const union AnimCmd sAnim_Frame2[] =
 {
     ANIMCMD_FRAME(4, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd sSpriteAnim_8571534[] =
+static const union AnimCmd sAnim_Frame3[] =
 {
     ANIMCMD_FRAME(8, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd sSpriteAnim_857153C[] =
+static const union AnimCmd sAnim_Frame4[] =
 {
     ANIMCMD_FRAME(12, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd sSpriteAnim_8571544[] =
+static const union AnimCmd sAnim_Frame5[] =
 {
     ANIMCMD_FRAME(16, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd sSpriteAnim_857154C[] =
+static const union AnimCmd sAnim_Frame6[] =
 {
     ANIMCMD_FRAME(20, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd sSpriteAnim_8571554[] =
+static const union AnimCmd sAnim_Frame7[] =
 {
     ANIMCMD_FRAME(24, 0),
     ANIMCMD_END
 };
 
-static const union AnimCmd sSpriteAnim_857155C[] =
+static const union AnimCmd sAnim_MapIndicatorCursor_Rectangle[] =
 {
     ANIMCMD_FRAME(0, 45),
     ANIMCMD_FRAME(8, 45),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd sSpriteAnim_8571568[] =
+static const union AnimCmd sAnim_MapIndicatorCursor_Square[] =
 {
     ANIMCMD_FRAME(16, 45),
     ANIMCMD_FRAME(24, 45),
     ANIMCMD_JUMP(0)
 };
 
-static const union AnimCmd *const sSpriteAnimTable_8571574[] =
+// Used both by the cursor and the map head icons
+static const union AnimCmd *const sAnims_TwoFrame[] =
 {
-    sSpriteAnim_8571524,
-    sSpriteAnim_857152C
+    sAnim_Frame1,
+    sAnim_Frame2
 };
 
-static const union AnimCmd *const sSpriteAnimTable_857157C[] =
+static const union AnimCmd *const sAnims_Medal[] =
 {
-    sSpriteAnim_8571524,
-    sSpriteAnim_857152C,
-    sSpriteAnim_8571534,
-    sSpriteAnim_857153C,
-    sSpriteAnim_8571544,
-    sSpriteAnim_857154C,
-    sSpriteAnim_8571554
+    [CURSOR_AREA_SYMBOL_TOWER   - CURSOR_AREA_SYMBOL] = sAnim_Frame1,
+    [CURSOR_AREA_SYMBOL_DOME    - CURSOR_AREA_SYMBOL] = sAnim_Frame2,
+    [CURSOR_AREA_SYMBOL_PALACE  - CURSOR_AREA_SYMBOL] = sAnim_Frame3,
+    [CURSOR_AREA_SYMBOL_ARENA   - CURSOR_AREA_SYMBOL] = sAnim_Frame4,
+    [CURSOR_AREA_SYMBOL_FACTORY - CURSOR_AREA_SYMBOL] = sAnim_Frame5,
+    [CURSOR_AREA_SYMBOL_PIKE    - CURSOR_AREA_SYMBOL] = sAnim_Frame6,
+    [CURSOR_AREA_SYMBOL_PYRAMID - CURSOR_AREA_SYMBOL] = sAnim_Frame7
 };
 
-static const union AnimCmd *const sSpriteAnimTable_8571598[] =
+static const union AnimCmd *const sAnims_MapIndicatorCursor[] =
 {
-    sSpriteAnim_857155C,
-    sSpriteAnim_8571568
+    [MAP_INDICATOR_RECTANGLE] = sAnim_MapIndicatorCursor_Rectangle,
+    [MAP_INDICATOR_SQUARE]    = sAnim_MapIndicatorCursor_Square
 };
 
-static const union AffineAnimCmd sSpriteAffineAnim_85715A0[] =
+static const union AffineAnimCmd sAffineAnim_Unused[] =
 {
     AFFINEANIMCMD_FRAME(256, 256, 0, 0),
     AFFINEANIMCMD_END
 };
 
-static const union AffineAnimCmd *const sSpriteAffineAnimTable_85715B0[] =
+static const union AffineAnimCmd *const sAffineAnims_Unused[] =
 {
-    sSpriteAffineAnim_85715A0
+    sAffineAnim_Unused
 };
 
 static const struct SpriteTemplate sSpriteTemplates_Cursors[] =
 {
+    // Triangular cursor
     {
-        .tileTag = 0,
-        .paletteTag = 0,
+        .tileTag = TAG_CURSOR,
+        .paletteTag = TAG_CURSOR,
         .oam = &gOamData_AffineOff_ObjNormal_16x16,
-        .anims = sSpriteAnimTable_8571574,
+        .anims = sAnims_TwoFrame,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
     },
+    // Map indicator cursor
     {
-        .tileTag = 1,
-        .paletteTag = 1,
+        .tileTag = TAG_MAP_INDICATOR,
+        .paletteTag = TAG_MAP_INDICATOR,
         .oam = &gOamData_AffineOff_ObjNormal_32x16,
-        .anims = sSpriteAnimTable_8571598,
+        .anims = sAnims_MapIndicatorCursor,
         .images = NULL,
         .affineAnims = gDummySpriteAffineAnimTable,
         .callback = SpriteCallbackDummy,
@@ -461,43 +497,43 @@ static const struct SpriteTemplate sSpriteTemplates_Cursors[] =
 
 static const struct SpriteTemplate sSpriteTemplate_Medal =
 {
-    .tileTag = 2,
-    .paletteTag = 2,
+    .tileTag = TAG_MEDAL_SILVER,
+    .paletteTag = TAG_MEDAL_SILVER,
     .oam = &gOamData_AffineOff_ObjNormal_16x16,
-    .anims = sSpriteAnimTable_857157C,
+    .anims = sAnims_Medal,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy,
 };
 
-static const struct SpriteTemplate sSpriteTemplate_Head =
+static const struct SpriteTemplate sSpriteTemplate_PlayerHead =
 {
-    .tileTag = 4,
-    .paletteTag = 4,
+    .tileTag = TAG_HEAD_MALE,
+    .paletteTag = TAG_HEAD_MALE,
     .oam = &gOamData_AffineOff_ObjNormal_16x16,
-    .anims = sSpriteAnimTable_8571574,
+    .anims = sAnims_TwoFrame,
     .images = NULL,
     .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCb_Dummy,
+    .callback = SpriteCB_PlayerHead,
 };
 
-static const u8 *const sPassAreaDescriptions[] =
-{
-    gText_ThereIsNoBattleRecord,
-    gText_CheckFrontierMap,
-    gText_CheckTrainerCard,
-    gText_ViewRecordedBattle,
-    gText_PutAwayFrontierPass,
-    gText_CurrentBattlePoints,
-    gText_CollectedSymbols,
-    gText_BattleTowerAbilitySymbol,
-    gText_BattleDomeTacticsSymbol,
-    gText_BattlePalaceSpiritsSymbol,
-    gText_BattleArenaGutsSymbol,
-    gText_BattleFactoryKnowledgeSymbol,
-    gText_BattlePikeLuckSymbol,
-    gText_BattlePyramidBraveSymbol,
-    gText_EmptyString7,
+static const u8 *const sPassAreaDescriptions[CURSOR_AREA_COUNT + 1] =
+{
+    [CURSOR_AREA_NOTHING]        = gText_ThereIsNoBattleRecord, // NOTHING is re-used for CURSOR_AREA_RECORD when no Record is present
+    [CURSOR_AREA_MAP]            = gText_CheckFrontierMap,
+    [CURSOR_AREA_CARD]           = gText_CheckTrainerCard,
+    [CURSOR_AREA_RECORD]         = gText_ViewRecordedBattle,
+    [CURSOR_AREA_CANCEL]         = gText_PutAwayFrontierPass,
+    [CURSOR_AREA_POINTS]         = gText_CurrentBattlePoints,
+    [CURSOR_AREA_EARNED_SYMBOLS] = gText_CollectedSymbols,
+    [CURSOR_AREA_SYMBOL_TOWER]   = gText_BattleTowerAbilitySymbol,
+    [CURSOR_AREA_SYMBOL_DOME]    = gText_BattleDomeTacticsSymbol,
+    [CURSOR_AREA_SYMBOL_PALACE]  = gText_BattlePalaceSpiritsSymbol,
+    [CURSOR_AREA_SYMBOL_ARENA]   = gText_BattleArenaGutsSymbol,
+    [CURSOR_AREA_SYMBOL_FACTORY] = gText_BattleFactoryKnowledgeSymbol,
+    [CURSOR_AREA_SYMBOL_PIKE]    = gText_BattlePikeLuckSymbol,
+    [CURSOR_AREA_SYMBOL_PYRAMID] = gText_BattlePyramidBraveSymbol,
+    [CURSOR_AREA_COUNT]          = gText_EmptyString7,
 };
 
 struct
@@ -507,18 +543,17 @@ struct
     s16 x;
     s16 y;
     u8 animNum;
-} static const sMapLandmarks[] =
-{
-    {gText_BattleTower3,   gText_BattleTowerDesc,   0x59, 0x28, 1},
-    {gText_BattleDome2,    gText_BattleDomeDesc,    0x21, 0x2A, 1},
-    {gText_BattlePalace2,  gText_BattlePalaceDesc,  0x78, 0x56, 0},
-    {gText_BattleArena2,   gText_BattleArenaDesc,   0x72, 0x3B, 0},
-    {gText_BattleFactory2, gText_BattleFactoryDesc, 0x19, 0x43, 0},
-    {gText_BattlePike2,    gText_BattlePikeDesc,    0x39, 0x39, 1},
-    {gText_BattlePyramid2, gText_BattlePyramidDesc, 0x86, 0x29, 1},
+} static const sMapLandmarks[NUM_FRONTIER_FACILITIES] =
+{
+    [FRONTIER_FACILITY_TOWER]   = {gText_BattleTower3,   gText_BattleTowerDesc,    89,  40, MAP_INDICATOR_SQUARE},
+    [FRONTIER_FACILITY_DOME]    = {gText_BattleDome2,    gText_BattleDomeDesc,     33,  42, MAP_INDICATOR_SQUARE},
+    [FRONTIER_FACILITY_PALACE]  = {gText_BattlePalace2,  gText_BattlePalaceDesc,  120,  86, MAP_INDICATOR_RECTANGLE},
+    [FRONTIER_FACILITY_ARENA]   = {gText_BattleArena2,   gText_BattleArenaDesc,   114,  59, MAP_INDICATOR_RECTANGLE},
+    [FRONTIER_FACILITY_FACTORY] = {gText_BattleFactory2, gText_BattleFactoryDesc,  25,  67, MAP_INDICATOR_RECTANGLE},
+    [FRONTIER_FACILITY_PIKE]    = {gText_BattlePike2,    gText_BattlePikeDesc,     57,  57, MAP_INDICATOR_SQUARE},
+    [FRONTIER_FACILITY_PYRAMID] = {gText_BattlePyramid2, gText_BattlePyramidDesc, 134,  41, MAP_INDICATOR_SQUARE},
 };
 
-// code
 static void ResetGpuRegsAndBgs(void)
 {
     SetGpuReg(REG_OFFSET_DISPCNT, 0);
@@ -564,30 +599,34 @@ static u32 AllocateFrontierPassData(void (*callback)(void))
     u8 i;
 
     if (sPassData != NULL)
-        return 1;
+        return ERR_ALREADY_DONE;
 
     sPassData = AllocZeroed(sizeof(*sPassData));
     if (sPassData == NULL)
-        return 2;
+        return ERR_ALLOC_FAILED;
 
     sPassData->callback = callback;
     i = GetCurrentRegionMapSectionId();
     if (i != MAPSEC_BATTLE_FRONTIER && i != MAPSEC_ARTISAN_CAVE)
     {
+        // Player is not in the frontier, set
+        // cursor position to the Trainer Card
         sPassData->cursorX = 176;
         sPassData->cursorY = 104;
     }
     else
     {
+        // Player is in the frontier, set
+        // cursor position to the frontier map
         sPassData->cursorX = 176;
         sPassData->cursorY = 48;
     }
 
     sPassData->battlePoints = gSaveBlock2Ptr->frontier.battlePoints;
     sPassData->hasBattleRecord = CanCopyRecordedBattleSaveData();
-    sPassData->unkE = 0;
+    sPassData->areaToShow = CURSOR_AREA_NOTHING;
     sPassData->trainerStars = CountPlayerTrainerStars();
-    for (i = 0; i < 7; i++)
+    for (i = 0; i < NUM_FRONTIER_FACILITIES; i++)
     {
         if (FlagGet(FLAG_SYS_TOWER_SILVER + i * 2))
             sPassData->facilitySymbols[i]++;
@@ -595,60 +634,57 @@ static u32 AllocateFrontierPassData(void (*callback)(void))
             sPassData->facilitySymbols[i]++;
     }
 
-    return 0;
+    return SUCCESS;
 }
 
 static u32 FreeFrontierPassData(void)
 {
     if (sPassData == NULL)
-        return 1;
+        return ERR_ALREADY_DONE;
 
     memset(sPassData, 0, sizeof(*sPassData)); // Why clear data, if it's going to be freed anyway?
     FREE_AND_SET_NULL(sPassData);
-    return 0;
+    return SUCCESS;
 }
 
 static u32 AllocateFrontierPassGfx(void)
 {
     if (sPassGfx != NULL)
-        return 1;
+        return ERR_ALREADY_DONE;
 
     sPassGfx = AllocZeroed(sizeof(*sPassGfx));
     if (sPassGfx == NULL)
-        return 2;
+        return ERR_ALLOC_FAILED;
 
-    return 0;
+    return SUCCESS;
 }
 
 static u32 FreeFrontierPassGfx(void)
 {
     FreeAllWindowBuffers();
     if (sPassGfx == NULL)
-        return 1;
+        return ERR_ALREADY_DONE;
 
-    if (sPassGfx->unk28 != NULL)
-        FREE_AND_SET_NULL(sPassGfx->unk28);
-    if (sPassGfx->unk24 != NULL)
-        FREE_AND_SET_NULL(sPassGfx->unk24);
-    if (sPassGfx->unk20 != NULL)
-        FREE_AND_SET_NULL(sPassGfx->unk20);
+    TRY_FREE_AND_SET_NULL(sPassGfx->battleRecordTilemap);
+    TRY_FREE_AND_SET_NULL(sPassGfx->mapAndCardTilemap);
+    TRY_FREE_AND_SET_NULL(sPassGfx->mapAndCardZoomTilemap);
 
     memset(sPassGfx, 0, sizeof(*sPassGfx)); // Why clear data, if it's going to be freed anyway?
     FREE_AND_SET_NULL(sPassGfx);
-    return 0;
+    return SUCCESS;
 }
 
-static void VblankCb_FrontierPass(void)
+static void VBlankCB_FrontierPass(void)
 {
-    if (sPassGfx->setAffine)
+    if (sPassGfx->zooming)
     {
         SetBgAffine(2,
-                    gUnknown_085713E0[sPassData->unkE - 1][0] << 8,
-                    gUnknown_085713E0[sPassData->unkE - 1][1] << 8,
-                    gUnknown_085713E0[sPassData->unkE - 1][0],
-                    gUnknown_085713E0[sPassData->unkE - 1][1],
-                    sPassGfx->unk2E,
-                    sPassGfx->unk30,
+                    sBgAffineCoords[sPassData->areaToShow - 1][0] << 8,
+                    sBgAffineCoords[sPassData->areaToShow - 1][1] << 8,
+                    sBgAffineCoords[sPassData->areaToShow - 1][0],
+                    sBgAffineCoords[sPassData->areaToShow - 1][1],
+                    sPassGfx->scaleX,
+                    sPassGfx->scaleY,
                     0);
     }
     LoadOam();
@@ -716,11 +752,11 @@ static bool32 InitFrontierPass(void)
         DeactivateAllTextPrinters();
         break;
     case 6:
-        sPassGfx->unk20 = malloc_and_decompress(gUnknown_085712F8, &sizeOut);
-        sPassGfx->unk24 = malloc_and_decompress(gUnknown_08571060, &sizeOut);
-        sPassGfx->unk28 = malloc_and_decompress(gUnknown_085712C0, &sizeOut);
-        DecompressAndCopyTileDataToVram(1, gUnknown_08DE08C8, 0, 0, 0);
-        DecompressAndCopyTileDataToVram(2, gUnknown_08DE2084, 0, 0, 0);
+        sPassGfx->mapAndCardZoomTilemap = malloc_and_decompress(sMapAndCard_Zooming_Tilemap, &sizeOut);
+        sPassGfx->mapAndCardTilemap = malloc_and_decompress(sMapAndCard_ZoomedOut_Tilemap, &sizeOut);
+        sPassGfx->battleRecordTilemap = malloc_and_decompress(sBattleRecord_Tilemap, &sizeOut);
+        DecompressAndCopyTileDataToVram(1, gFrontierPassBg_Gfx, 0, 0, 0);
+        DecompressAndCopyTileDataToVram(2, gFrontierPassMapAndCard_Gfx, 0, 0, 0);
         break;
     case 7:
         if (FreeTempTileDataBuffersIfPossible())
@@ -733,12 +769,12 @@ static bool32 InitFrontierPass(void)
         CopyBgTilemapBufferToVram(2);
         break;
     case 8:
-        LoadPalette(gUnknown_08DE07C8[0], 0, 0x1A0);
-        LoadPalette(gUnknown_08DE07C8[1 + sPassData->trainerStars], 0x10, 0x20);
+        LoadPalette(gFrontierPassBg_Pal[0], 0, 0x1A0);
+        LoadPalette(gFrontierPassBg_Pal[1 + sPassData->trainerStars], 0x10, 0x20);
         LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20);
-        sub_80C629C();
-        sub_80C6104(sPassData->cursorArea, sPassData->previousCursorArea);
-        if (sPassData->unkE == 1 || sPassData->unkE == 2)
+        DrawFrontierPassBg();
+        UpdateAreaHighlight(sPassData->cursorArea, sPassData->previousCursorArea);
+        if (sPassData->areaToShow == CURSOR_AREA_MAP || sPassData->areaToShow == CURSOR_AREA_CARD)
         {
             sPassData->state = 0;
             return TRUE;
@@ -750,9 +786,9 @@ static bool32 InitFrontierPass(void)
         ShowBg(1);
         ShowBg(2);
         LoadCursorAndSymbolSprites();
-        SetVBlankCallback(VblankCb_FrontierPass);
-        BlendPalettes(PALETTES_ALL, 0x10, RGB_BLACK);
-        BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_BLACK);
+        SetVBlankCallback(VBlankCB_FrontierPass);
+        BlendPalettes(PALETTES_ALL, 16, RGB_BLACK);
+        BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_BLACK);
         break;
     case 10:
         AnimateSprites();
@@ -773,9 +809,9 @@ static bool32 HideFrontierPass(void)
     switch (sPassData->state)
     {
     case 0:
-        if (sPassData->unkE != 1 && sPassData->unkE != 2)
+        if (sPassData->areaToShow != CURSOR_AREA_MAP && sPassData->areaToShow != CURSOR_AREA_CARD)
         {
-            BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
+            BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
         }
         else
         {
@@ -822,11 +858,11 @@ static u8 GetCursorAreaFromCoords(s16 x, s16 y)
 {
     u8 i;
 
-    // Minus/Plus 1, because the table doesn't take into account the nothing field.
+    // Minus/Plus 1, because the table doesn't take CURSOR_AREA_NOTHING into account.
     for (i = 0; i < CURSOR_AREA_COUNT - 1; i++)
     {
         if (sPassAreasLayout[i].yStart <= y && sPassAreasLayout[i].yEnd >= y
-            && sPassAreasLayout[i].xStart <= x && sPassAreasLayout[i].xEnd >= x)
+         && sPassAreasLayout[i].xStart <= x && sPassAreasLayout[i].xEnd >= x)
         {
             if (i >= CURSOR_AREA_SYMBOL - 1 && sPassData->facilitySymbols[i - CURSOR_AREA_SYMBOL + 1] == 0)
                 break;
@@ -835,9 +871,12 @@ static u8 GetCursorAreaFromCoords(s16 x, s16 y)
         }
     }
 
-    return 0;
+    return CURSOR_AREA_NOTHING;
 }
 
+// For Task_PassAreaZoom
+#define tZoomOut data[0]
+
 void CB2_ReshowFrontierPass(void)
 {
     u8 taskId;
@@ -845,16 +884,16 @@ void CB2_ReshowFrontierPass(void)
     if (!InitFrontierPass())
         return;
 
-    switch (sPassData->unkE)
+    switch (sPassData->areaToShow)
     {
-    case 1:
-    case 2:
-        taskId = CreateTask(Task_DoFadeEffect, 0);
-        gTasks[taskId].data[0] = TRUE;
+    case CURSOR_AREA_MAP:
+    case CURSOR_AREA_CARD:
+        taskId = CreateTask(Task_PassAreaZoom, 0);
+        gTasks[taskId].tZoomOut = TRUE;
         break;
-    case 3:
+    case CURSOR_AREA_RECORD:
     default:
-        sPassData->unkE = 0;
+        sPassData->areaToShow = CURSOR_AREA_NOTHING;
         taskId = CreateTask(Task_HandleFrontierPassInput, 0);
         break;
     }
@@ -889,19 +928,19 @@ static void CB2_ShowFrontierPassFeature(void)
     if (!HideFrontierPass())
         return;
 
-    switch (sPassData->unkE)
+    switch (sPassData->areaToShow)
     {
-    case 1:
+    case CURSOR_AREA_MAP:
         ShowFrontierMap(CB2_ReshowFrontierPass);
         break;
-    case 3:
+    case CURSOR_AREA_RECORD:
         sSavedPassData.callback = sPassData->callback;
         sSavedPassData.cursorX = sPassData->cursorX;
         sSavedPassData.cursorY = sPassData->cursorY;
         FreeFrontierPassData();
         PlayRecordedBattle(CB2_ReturnFromRecord);
         break;
-    case 2:
+    case CURSOR_AREA_CARD:
         ShowPlayerTrainerCard(CB2_ReshowFrontierPass);
         break;
     }
@@ -914,22 +953,22 @@ static bool32 TryCallPassAreaFunction(u8 taskId, u8 cursorArea)
     case CURSOR_AREA_RECORD:
         if (!sPassData->hasBattleRecord)
             return FALSE;
-        sPassData->unkE = 3;
+        sPassData->areaToShow = CURSOR_AREA_RECORD;
         DestroyTask(taskId);
         SetMainCallback2(CB2_ShowFrontierPassFeature);
         break;
     case CURSOR_AREA_MAP:
     case CURSOR_AREA_CARD:
-        sPassData->unkE = cursorArea;
-        gTasks[taskId].func = Task_DoFadeEffect;
-        gTasks[taskId].data[0] = FALSE;
+        sPassData->areaToShow = cursorArea;
+        gTasks[taskId].func = Task_PassAreaZoom;
+        gTasks[taskId].tZoomOut = FALSE;
         break;
     default:
         return FALSE;
     }
 
-    sPassData->cursorX = sPassGfx->cursorSprite->pos1.x;
-    sPassData->cursorY = sPassGfx->cursorSprite->pos1.y;
+    sPassData->cursorX = sPassGfx->cursorSprite->x;
+    sPassData->cursorY = sPassGfx->cursorSprite->y;
     return TRUE;
 }
 
@@ -937,33 +976,33 @@ static void Task_HandleFrontierPassInput(u8 taskId)
 {
     u8 var = FALSE; // Reused, first informs whether the cursor moves, then used as the new cursor area.
 
-    if (JOY_HELD(DPAD_UP) && sPassGfx->cursorSprite->pos1.y >= 9)
+    if (JOY_HELD(DPAD_UP) && sPassGfx->cursorSprite->y >= 9)
     {
-        sPassGfx->cursorSprite->pos1.y -= 2;
-        if (sPassGfx->cursorSprite->pos1.y <= 7)
-            sPassGfx->cursorSprite->pos1.y = 2;
+        sPassGfx->cursorSprite->y -= 2;
+        if (sPassGfx->cursorSprite->y <= 7)
+            sPassGfx->cursorSprite->y = 2;
         var = TRUE;
     }
-    if (JOY_HELD(DPAD_DOWN) && sPassGfx->cursorSprite->pos1.y <= 135)
+    if (JOY_HELD(DPAD_DOWN) && sPassGfx->cursorSprite->y <= 135)
     {
-        sPassGfx->cursorSprite->pos1.y += 2;
-        if (sPassGfx->cursorSprite->pos1.y >= 137)
-            sPassGfx->cursorSprite->pos1.y = 136;
+        sPassGfx->cursorSprite->y += 2;
+        if (sPassGfx->cursorSprite->y >= 137)
+            sPassGfx->cursorSprite->y = 136;
         var = TRUE;
     }
 
-    if (JOY_HELD(DPAD_LEFT) && sPassGfx->cursorSprite->pos1.x >= 6)
+    if (JOY_HELD(DPAD_LEFT) && sPassGfx->cursorSprite->x >= 6)
     {
-        sPassGfx->cursorSprite->pos1.x -= 2;
-        if (sPassGfx->cursorSprite->pos1.x <= 4)
-            sPassGfx->cursorSprite->pos1.x = 5;
+        sPassGfx->cursorSprite->x -= 2;
+        if (sPassGfx->cursorSprite->x <= 4)
+            sPassGfx->cursorSprite->x = 5;
         var = TRUE;
     }
-    if (JOY_HELD(DPAD_RIGHT) && sPassGfx->cursorSprite->pos1.x <= 231)
+    if (JOY_HELD(DPAD_RIGHT) && sPassGfx->cursorSprite->x <= 231)
     {
-        sPassGfx->cursorSprite->pos1.x += 2;
-        if (sPassGfx->cursorSprite->pos1.x >= 233)
-            sPassGfx->cursorSprite->pos1.x = 232;
+        sPassGfx->cursorSprite->x += 2;
+        if (sPassGfx->cursorSprite->x >= 233)
+            sPassGfx->cursorSprite->x = 232;
         var = TRUE;
     }
 
@@ -998,83 +1037,98 @@ static void Task_HandleFrontierPassInput(u8 taskId)
     }
     else
     {
-        var = GetCursorAreaFromCoords(sPassGfx->cursorSprite->pos1.x - 5, sPassGfx->cursorSprite->pos1.y + 5);
+        var = GetCursorAreaFromCoords(sPassGfx->cursorSprite->x - 5, sPassGfx->cursorSprite->y + 5);
         if (sPassData->cursorArea != var)
         {
             PrintAreaDescription(var);
             sPassData->previousCursorArea = sPassData->cursorArea;
             sPassData->cursorArea = var;
-            sub_80C6104(sPassData->cursorArea, sPassData->previousCursorArea);
+            UpdateAreaHighlight(sPassData->cursorArea, sPassData->previousCursorArea);
         }
     }
 }
 
-static void Task_DoFadeEffect(u8 taskId)
+#define tScaleX      data[1]
+#define tScaleY      data[2]
+#define tScaleSpeedX data[3]
+#define tScaleSpeedY data[4]
+
+// Zoom in/out for the Frontier map or the trainer card
+static void Task_PassAreaZoom(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
     switch (sPassData->state)
     {
     case 0:
-        if (!data[0])
+        // Initialize the zoom, start fading in/out
+        if (!tZoomOut)
         {
-            sub_80C5F58(TRUE, FALSE);
-            data[1] = Q_8_8(1);
-            data[2] = Q_8_8(1);
-            data[3] = 0x15;
-            data[4] = 0x15;
-            BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_WHITE);
+            // Zooming in to map/card screen
+            ShowHideZoomingArea(TRUE, FALSE);
+            tScaleX = Q_8_8(1);
+            tScaleY = Q_8_8(1);
+            tScaleSpeedX = 0x15;
+            tScaleSpeedY = 0x15;
+            BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_WHITE);
         }
         else
         {
-            data[1] = Q_8_8(1.984375); // 1 and 63/64
-            data[2] = Q_8_8(1.984375);
-            data[3] = -0x15;
-            data[4] = -0x15;
+            // Zooming out of map/card screen back to frontier pass
+            tScaleX = Q_8_8(1.984375); // 1 and 63/64
+            tScaleY = Q_8_8(1.984375);
+            tScaleSpeedX = -0x15;
+            tScaleSpeedY = -0x15;
             SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP);
             ShowBg(0);
             ShowBg(1);
             ShowBg(2);
             LoadCursorAndSymbolSprites();
-            SetVBlankCallback(VblankCb_FrontierPass);
-            BlendPalettes(PALETTES_ALL, 0x10, RGB_WHITE);
-            BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_WHITE);
+            SetVBlankCallback(VBlankCB_FrontierPass);
+            BlendPalettes(PALETTES_ALL, 16, RGB_WHITE);
+            BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_WHITE);
         }
-        sPassGfx->setAffine = TRUE;
-        sPassGfx->unk2E = MathUtil_Inv16(data[1]);
-        sPassGfx->unk30 = MathUtil_Inv16(data[2]);
+        sPassGfx->zooming = TRUE;
+        sPassGfx->scaleX = MathUtil_Inv16(tScaleX);
+        sPassGfx->scaleY = MathUtil_Inv16(tScaleY);
         break;
     case 1:
+        // Update the fade and zoom
         UpdatePaletteFade();
-        data[1] += data[3];
-        data[2] += data[4];
-        sPassGfx->unk2E = MathUtil_Inv16(data[1]);
-        sPassGfx->unk30 = MathUtil_Inv16(data[2]);
-        if (!data[0])
+        tScaleX += tScaleSpeedX;
+        tScaleY += tScaleSpeedY;
+        sPassGfx->scaleX = MathUtil_Inv16(tScaleX);
+        sPassGfx->scaleY = MathUtil_Inv16(tScaleY);
+
+        // Check if zoom hasn't reached target
+        if (!tZoomOut)
         {
-            if (data[1] <= Q_8_8(1.984375))
+            if (tScaleX <= Q_8_8(1.984375))
                 return;
         }
         else
         {
-            if (data[1] != Q_8_8(1))
+            if (tScaleX != Q_8_8(1))
                 return;
         }
         break;
     case 2:
-        if (sPassGfx->setAffine) // Nonsensical check.
-            sPassGfx->setAffine = FALSE;
+        if (sPassGfx->zooming)
+            sPassGfx->zooming = FALSE;
         if (UpdatePaletteFade())
             return;
-        if (!data[0])
+
+        if (!tZoomOut)
         {
+            // Zoomed in and faded out, switch to map or trainer card
             DestroyTask(taskId);
             SetMainCallback2(CB2_ShowFrontierPassFeature);
         }
         else
         {
-            sub_80C5F58(FALSE, FALSE);
-            sPassData->unkE = 0;
+            // Zoomed out and faded in, return to frontier pass
+            ShowHideZoomingArea(FALSE, FALSE);
+            sPassData->areaToShow = CURSOR_AREA_NOTHING;
             gTasks[taskId].func = Task_HandleFrontierPassInput;
         }
         SetBgAttribute(2, BG_ATTR_WRAPAROUND, 0);
@@ -1120,8 +1174,9 @@ static void ShowAndPrintWindows(void)
 static void PrintAreaDescription(u8 cursorArea)
 {
     FillWindowPixelBuffer(WINDOW_DESCRIPTION, PIXEL_FILL(0));
+
     if (cursorArea == CURSOR_AREA_RECORD && !sPassData->hasBattleRecord)
-        AddTextPrinterParameterized3(WINDOW_DESCRIPTION, 1, 2, 0, sTextColors[1], 0, sPassAreaDescriptions[0]);
+        AddTextPrinterParameterized3(WINDOW_DESCRIPTION, 1, 2, 0, sTextColors[1], 0, sPassAreaDescriptions[CURSOR_AREA_NOTHING]);
     else if (cursorArea != CURSOR_AREA_NOTHING)
         AddTextPrinterParameterized3(WINDOW_DESCRIPTION, 1, 2, 0, sTextColors[1], 0, sPassAreaDescriptions[cursorArea]);
 
@@ -1129,19 +1184,19 @@ static void PrintAreaDescription(u8 cursorArea)
     CopyBgTilemapBufferToVram(0);
 }
 
-static void sub_80C5F58(bool8 arg0, bool8 arg1)
+static void ShowHideZoomingArea(bool8 show, bool8 zoomedIn)
 {
-    switch (sPassData->unkE)
+    switch (sPassData->areaToShow)
     {
-    case 1:
-        if (arg0)
-            CopyToBgTilemapBufferRect_ChangePalette(2, sPassGfx->unk20, 16, 3, 12, 7, 16);
+    case CURSOR_AREA_MAP:
+        if (show)
+            CopyToBgTilemapBufferRect_ChangePalette(2, sPassGfx->mapAndCardZoomTilemap, 16, 3, 12, 7, 16);
         else
             FillBgTilemapBufferRect(2, 0, 16, 3, 12, 7, 16);
         break;
-    case 2:
-        if (arg0)
-            CopyToBgTilemapBufferRect_ChangePalette(2, sPassGfx->unk20 + 84, 16, 10, 12, 7, 16);
+    case CURSOR_AREA_CARD:
+        if (show)
+            CopyToBgTilemapBufferRect_ChangePalette(2, sPassGfx->mapAndCardZoomTilemap + 84, 16, 10, 12, 7, 16);
         else
             FillBgTilemapBufferRect(2, 0, 16, 10, 12, 7, 16);
         break;
@@ -1150,13 +1205,13 @@ static void sub_80C5F58(bool8 arg0, bool8 arg1)
     }
 
     CopyBgTilemapBufferToVram(2);
-    if (arg1)
+    if (zoomedIn)
     {
         SetBgAffine(2,
-                    gUnknown_085713E0[sPassData->unkE - 1][0] << 8,
-                    gUnknown_085713E0[sPassData->unkE - 1][1] << 8,
-                    gUnknown_085713E0[sPassData->unkE - 1][0],
-                    gUnknown_085713E0[sPassData->unkE - 1][1],
+                    sBgAffineCoords[sPassData->areaToShow - 1][0] << 8,
+                    sBgAffineCoords[sPassData->areaToShow - 1][1] << 8,
+                    sBgAffineCoords[sPassData->areaToShow - 1][0],
+                    sBgAffineCoords[sPassData->areaToShow - 1][1],
                     MathUtil_Inv16(Q_8_8(1.984375)), // 1 and 63/64
                     MathUtil_Inv16(Q_8_8(1.984375)),
                     0);
@@ -1164,71 +1219,75 @@ static void sub_80C5F58(bool8 arg0, bool8 arg1)
     else
     {
         SetBgAffine(2,
-                    gUnknown_085713E0[sPassData->unkE - 1][0] << 8,
-                    gUnknown_085713E0[sPassData->unkE - 1][1] << 8,
-                    gUnknown_085713E0[sPassData->unkE - 1][0],
-                    gUnknown_085713E0[sPassData->unkE - 1][1],
+                    sBgAffineCoords[sPassData->areaToShow - 1][0] << 8,
+                    sBgAffineCoords[sPassData->areaToShow - 1][1] << 8,
+                    sBgAffineCoords[sPassData->areaToShow - 1][0],
+                    sBgAffineCoords[sPassData->areaToShow - 1][1],
                     MathUtil_Inv16(Q_8_8(1)),
                     MathUtil_Inv16(Q_8_8(1)),
                     0);
     }
 }
 
-static void sub_80C6104(u8 cursorArea, u8 previousCursorArea)
+static void UpdateAreaHighlight(u8 cursorArea, u8 previousCursorArea)
 {
+    #define NON_HIGHLIGHT_AREA(area)((area) == CURSOR_AREA_NOTHING || (area) > CURSOR_AREA_CANCEL)
+
+    // If moving off highlightable area, unhighlight it
     switch (previousCursorArea)
     {
     case CURSOR_AREA_MAP:
-        CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->unk24, 16, 3, 12, 7, 17);
+        CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->mapAndCardTilemap, 16, 3, 12, 7, 17);
         break;
     case CURSOR_AREA_CARD:
-        CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->unk24 + 336, 16, 10, 12, 7, 17);
+        CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->mapAndCardTilemap + 336, 16, 10, 12, 7, 17);
         break;
     case CURSOR_AREA_RECORD:
         if (sPassData->hasBattleRecord)
-            CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->unk28, 2, 10, 12, 3, 17);
-        else if (cursorArea == CURSOR_AREA_NOTHING || cursorArea > CURSOR_AREA_CANCEL)
+            CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->battleRecordTilemap, 2, 10, 12, 3, 17);
+        else if (NON_HIGHLIGHT_AREA(cursorArea))
             return;
         break;
     case CURSOR_AREA_CANCEL:
-        CopyToBgTilemapBufferRect_ChangePalette(1, gUnknown_08DE3350, 21, 0, 9, 2, 17);
+        CopyToBgTilemapBufferRect_ChangePalette(1, gFrontierPassCancelButton_Tilemap, 21, 0, 9, 2, 17);
         break;
     default:
-        if (cursorArea == CURSOR_AREA_NOTHING || cursorArea > CURSOR_AREA_CANCEL)
+        if (NON_HIGHLIGHT_AREA(cursorArea))
             return;
         break;
     }
-    
+
+    // If moving on to highlightable area, highlight it
     switch (cursorArea)
     {
     case CURSOR_AREA_MAP:
-        CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->unk24 + 168, 16, 3, 12, 7, 17);
+        CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->mapAndCardTilemap + 168, 16, 3, 12, 7, 17);
         break;
     case CURSOR_AREA_CARD:
-        CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->unk24 + 504, 16, 10, 12, 7, 17);
+        CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->mapAndCardTilemap + 504, 16, 10, 12, 7, 17);
         break;
     case CURSOR_AREA_RECORD:
         if (sPassData->hasBattleRecord)
-            CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->unk28 + 72, 2, 10, 12, 3, 17);
+            CopyToBgTilemapBufferRect_ChangePalette(1, sPassGfx->battleRecordTilemap + 72, 2, 10, 12, 3, 17);
         else
             return;
-        break; //needed to match
+        break;
     case CURSOR_AREA_CANCEL:
-        CopyToBgTilemapBufferRect_ChangePalette(1, gUnknown_08DE3374, 21, 0, 9, 2, 17);
+        CopyToBgTilemapBufferRect_ChangePalette(1, gFrontierPassCancelButtonHighlighted_Tilemap, 21, 0, 9, 2, 17);
         break;
     default:
-        if (previousCursorArea == CURSOR_AREA_NOTHING || previousCursorArea > CURSOR_AREA_CANCEL)
+        if (NON_HIGHLIGHT_AREA(previousCursorArea))
             return;
     }
 
     CopyBgTilemapBufferToVram(1);
 }
 
-static void sub_80C629C(void)
+static void DrawFrontierPassBg(void)
 {
-    CopyToBgTilemapBuffer(1, gUnknown_08DE3060, 0, 0);
-    sub_80C6104(sPassData->cursorArea, sPassData->previousCursorArea);
-    sub_80C5F58(TRUE, sPassData->unkE);
+    CopyToBgTilemapBuffer(1, gFrontierPassBg_Tilemap, 0, 0);
+    UpdateAreaHighlight(sPassData->cursorArea, sPassData->previousCursorArea);
+    ShowHideZoomingArea(TRUE, sPassData->areaToShow); // If returning to frontier pass from map/card (areaToShow will be != 0)
     ShowAndPrintWindows();
     CopyBgTilemapBufferToVram(1);
 }
@@ -1253,7 +1312,7 @@ static void LoadCursorAndSymbolSprites(void)
         {
             struct SpriteTemplate sprite = sSpriteTemplate_Medal;
 
-            sprite.paletteTag += sPassData->facilitySymbols[i] - 1;
+            sprite.paletteTag += sPassData->facilitySymbols[i] - 1; // Adds 1 if gold for TAG_MEDAL_GOLD
             spriteId = CreateSprite(&sprite, sPassAreasLayout[i + CURSOR_AREA_SYMBOL - 1].xStart + 8, sPassAreasLayout[i + CURSOR_AREA_SYMBOL - 1].yStart + 6, i + 1);
             sPassGfx->symbolSprites[i] = &gSprites[spriteId];
             sPassGfx->symbolSprites[i]->oam.priority = 2;
@@ -1277,11 +1336,11 @@ static void FreeCursorAndSymbolSprites(void)
         }
     }
     FreeAllSpritePalettes();
-    FreeSpriteTilesByTag(2);
-    FreeSpriteTilesByTag(0);
+    FreeSpriteTilesByTag(TAG_MEDAL_SILVER);
+    FreeSpriteTilesByTag(TAG_CURSOR);
 }
 
-static void SpriteCb_Dummy(struct Sprite *sprite)
+static void SpriteCB_PlayerHead(struct Sprite *sprite)
 {
 
 }
@@ -1349,14 +1408,14 @@ static bool32 InitFrontierMap(void)
         InitWindows(sMapWindowTemplates);
         DeactivateAllTextPrinters();
         PrintOnFrontierMap();
-        DecompressAndCopyTileDataToVram(1, gUnknown_0856FBBC, 0, 0, 0);
+        DecompressAndCopyTileDataToVram(1, sMapScreen_Gfx, 0, 0, 0);
         break;
     case 5:
         if (FreeTempTileDataBuffersIfPossible())
             return FALSE;
-        LoadPalette(gUnknown_08DE07C8[0], 0, 0x1A0);
+        LoadPalette(gFrontierPassBg_Pal[0], 0, 0x1A0);
         LoadPalette(GetTextWindowPalette(0), 0xF0, 0x20);
-        CopyToBgTilemapBuffer(2, gUnknown_08570E00, 0, 0);
+        CopyToBgTilemapBuffer(2, sMapScreen_Tilemap, 0, 0);
         CopyBgTilemapBufferToVram(2);
         break;
     case 6:
@@ -1365,9 +1424,9 @@ static bool32 InitFrontierMap(void)
         ShowBg(1);
         ShowBg(2);
         InitFrontierMapSprites();
-        SetVBlankCallback(VblankCb_FrontierPass);
-        BlendPalettes(PALETTES_ALL, 0x10, RGB_WHITE);
-        BeginNormalPaletteFade(PALETTES_ALL, 0, 0x10, 0, RGB_WHITE);
+        SetVBlankCallback(VBlankCB_FrontierPass);
+        BlendPalettes(PALETTES_ALL, 16, RGB_WHITE);
+        BeginNormalPaletteFade(PALETTES_ALL, 0, 16, 0, RGB_WHITE);
         break;
     case 7:
         if (UpdatePaletteFade())
@@ -1385,7 +1444,7 @@ static bool32 ExitFrontierMap(void)
     switch (sPassData->state)
     {
     case 0:
-        BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_WHITE);
+        BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_WHITE);
         break;
     case 1:
         if (UpdatePaletteFade())
@@ -1404,17 +1463,17 @@ static bool32 ExitFrontierMap(void)
         if (sMapData->cursorSprite != NULL)
         {
             DestroySprite(sMapData->cursorSprite);
-            FreeSpriteTilesByTag(0);
+            FreeSpriteTilesByTag(TAG_CURSOR);
         }
         if (sMapData->mapIndicatorSprite != NULL)
         {
             DestroySprite(sMapData->mapIndicatorSprite);
-            FreeSpriteTilesByTag(1);
+            FreeSpriteTilesByTag(TAG_MAP_INDICATOR);
         }
         if (sMapData->playerHeadSprite != NULL)
         {
             DestroySprite(sMapData->playerHeadSprite);
-            FreeSpriteTilesByTag(4);
+            FreeSpriteTilesByTag(TAG_HEAD_MALE);
         }
         FreeAllWindowBuffers();
         break;
@@ -1435,11 +1494,14 @@ static bool32 ExitFrontierMap(void)
     return FALSE;
 }
 
+#define tState     data[0]
+#define tMoveSteps data[1]
+
 static void Task_HandleFrontierMap(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    switch (data[0])
+    switch (tState)
     {
     case 0:
         if (InitFrontierMap())
@@ -1449,47 +1511,47 @@ static void Task_HandleFrontierMap(u8 taskId)
         if (JOY_NEW(B_BUTTON))
         {
             PlaySE(SE_PC_OFF);
-            data[0] = 4;
+            tState = 4;
         }
         else if (JOY_NEW(DPAD_DOWN))
         {
             if (sMapData->cursorPos >= NUM_FRONTIER_FACILITIES - 1)
                 HandleFrontierMapCursorMove(0);
             else
-                data[0] = 2;
+                tState = 2;
         }
         else if (JOY_NEW(DPAD_UP))
         {
             if (sMapData->cursorPos == 0)
                 HandleFrontierMapCursorMove(1);
             else
-                data[0] = 3;
+                tState = 3;
         }
         return;
     case 2:
-        if (data[1] > 3)
+        if (tMoveSteps > 3)
         {
             HandleFrontierMapCursorMove(0);
-            data[1] = 0;
-            data[0] = 1;
+            tMoveSteps = 0;
+            tState = 1;
         }
         else
         {
-            sMapData->cursorSprite->pos1.y += 4;
-            data[1]++;
+            sMapData->cursorSprite->y += 4;
+            tMoveSteps++;
         }
         return;
     case 3:
-        if (data[1] > 3)
+        if (tMoveSteps > 3)
         {
             HandleFrontierMapCursorMove(1);
-            data[1] = 0;
-            data[0] = 1;
+            tMoveSteps = 0;
+            tState = 1;
         }
         else
         {
-            sMapData->cursorSprite->pos1.y -= 4;
-            data[1]++;
+            sMapData->cursorSprite->y -= 4;
+            tMoveSteps++;
         }
         return;
     case 4:
@@ -1502,31 +1564,42 @@ static void Task_HandleFrontierMap(u8 taskId)
         return;
     }
 
-    data[0]++;
+    tState++;
 }
 
 static u8 MapNumToFrontierFacilityId(u16 mapNum) // id + 1, zero means not a frontier map number
 {
+    // In Battle Tower
     if ((mapNum >= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_LOBBY) && mapNum <= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM))
-        || (mapNum >= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM) && mapNum <= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM)))
+     || (mapNum >= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM) && mapNum <= MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM)))
         return FRONTIER_FACILITY_TOWER + 1;
+
+    // In Battle Dome
     else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_DOME_LOBBY)
              || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR)
              || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM)
              || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM))
         return FRONTIER_FACILITY_DOME + 1;
+
+    // In Battle Palace
     else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PALACE_LOBBY)
         || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR)
         || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM))
         return FRONTIER_FACILITY_PALACE + 1;
+
+    // In Battle Arena
     else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_ARENA_LOBBY)
         || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR)
         || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM))
         return FRONTIER_FACILITY_ARENA + 1;
+
+    // In Battle Factory
     else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY)
         || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM)
         || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM))
         return FRONTIER_FACILITY_FACTORY + 1;
+
+    // In Battle Pike
     else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_LOBBY)
              || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR)
              || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM)
@@ -1534,10 +1607,13 @@ static u8 MapNumToFrontierFacilityId(u16 mapNum) // id + 1, zero means not a fro
              || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_ROOM_FINAL)
              || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS))
         return FRONTIER_FACILITY_PIKE + 1;
+
+    // In Battle Pyramid
     else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY)
         || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
         || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_TOP))
         return FRONTIER_FACILITY_PYRAMID + 1;
+
     else
         return 0;
 }
@@ -1606,8 +1682,8 @@ static void InitFrontierMapSprites(void)
         }
 
         LoadCompressedSpriteSheet(sHeadsSpriteSheet);
-        sprite = sSpriteTemplate_Head;
-        sprite.paletteTag = gSaveBlock2Ptr->playerGender + 4;
+        sprite = sSpriteTemplate_PlayerHead;
+        sprite.paletteTag = gSaveBlock2Ptr->playerGender + TAG_HEAD_MALE; // TAG_HEAD_FEMALE if gender is FEMALE
         if (id != 0)
         {
             spriteId = CreateSprite(&sprite, x, y, 0);
@@ -1670,15 +1746,15 @@ static void HandleFrontierMapCursorMove(u8 direction)
     AddTextPrinterParameterized3(MAP_WINDOW_NAME, 7, 4, (oldCursorPos * 16) + 1, sTextColors[1], 0, sMapLandmarks[oldCursorPos].name);
     AddTextPrinterParameterized3(MAP_WINDOW_NAME, 7, 4, (sMapData->cursorPos * 16) + 1, sTextColors[2], 0, sMapLandmarks[sMapData->cursorPos].name);
 
-    sMapData->cursorSprite->pos1.y = (sMapData->cursorPos * 16) + 8;
+    sMapData->cursorSprite->y = (sMapData->cursorPos * 16) + 8;
 
     StartSpriteAnim(sMapData->mapIndicatorSprite, sMapLandmarks[sMapData->cursorPos].animNum);
-    sMapData->mapIndicatorSprite->pos1.x = sMapLandmarks[sMapData->cursorPos].x;
-    sMapData->mapIndicatorSprite->pos1.y = sMapLandmarks[sMapData->cursorPos].y;
+    sMapData->mapIndicatorSprite->x = sMapLandmarks[sMapData->cursorPos].x;
+    sMapData->mapIndicatorSprite->y = sMapLandmarks[sMapData->cursorPos].y;
     FillWindowPixelBuffer(MAP_WINDOW_DESCRIPTION, PIXEL_FILL(0));
     AddTextPrinterParameterized3(MAP_WINDOW_DESCRIPTION, 1, 4, 0, sTextColors[0], 0, sMapLandmarks[sMapData->cursorPos].description);
 
-    for (i = 0; i < 3; i++)
+    for (i = 0; i < MAP_WINDOW_COUNT; i++)
         CopyWindowToVram(i, 3);
 
     CopyBgTilemapBufferToVram(0);
diff --git a/src/frontier_util.c b/src/frontier_util.c
index 4aec27944..352c14b01 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -2397,7 +2397,7 @@ void ClearRankingHallRecords(void)
         {
             for (k = 0; k < 3; k++)
             {
-                CopyTrainerId(gSaveBlock2Ptr->hallRecords1P[i][j][k].id, ZERO); 
+                CopyTrainerId(gSaveBlock2Ptr->hallRecords1P[i][j][k].id, ZERO);
                 gSaveBlock2Ptr->hallRecords1P[i][j][k].name[0] = EOS;
                 gSaveBlock2Ptr->hallRecords1P[i][j][k].winStreak = 0;
             }
diff --git a/src/graphics.c b/src/graphics.c
index c3ac6c2df..4e820caec 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -355,7 +355,6 @@ const u16 gBattleInterface_BallStatusBarPal[] = INCBIN_U16("graphics/battle_inte
 
 const u16 gBattleInterface_BallDisplayPal[] = INCBIN_U16("graphics/battle_interface/ball_display.gbapal");
 
-//Originally an array?
 const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpbar.4bpp",
                                                   "graphics/battle_interface/expbar.4bpp",
                                                   "graphics/battle_interface/status_psn.4bpp",
@@ -365,17 +364,14 @@ const u8 gHealthboxElementsGfxTable[] = INCBIN_U8("graphics/battle_interface/hpb
                                                   "graphics/battle_interface/status_brn.4bpp",
                                                   "graphics/battle_interface/misc.4bpp",
                                                   "graphics/battle_interface/hpbar_anim.4bpp",
-                                                  "graphics/battle_interface/misc_frameend.4bpp");
-
-const u8 gBattleInterface_BallDisplayGfx[] = INCBIN_U8("graphics/battle_interface/ball_display.4bpp");
-
-//Originally an array?
-const u8 gUnknown_08C1249C[] = INCBIN_U8("graphics/battle_interface/ball_display_unused_extra.4bpp");
-const u8 gBattleInterfaceGfx_Status2[] = INCBIN_U8("graphics/battle_interface/status2.4bpp"); // these three duplicate sets of graphics are for the opponent pokemon
-const u8 gBattleInterfaceGfx_Status3[] = INCBIN_U8("graphics/battle_interface/status3.4bpp"); // and are also for use in double battles. they use dynamic palettes so
-const u8 gBattleInterfaceGfx_Status4[] = INCBIN_U8("graphics/battle_interface/status4.4bpp"); // coloring them is an extreme headache and wont be done for now
-const u8 gUnknown_D12FEC[] = INCBIN_U8("graphics/unknown/unknown_D12FEC.4bpp");
-const u8 gUnknown_D1300C[] = INCBIN_U8("graphics/unknown/unknown_D1300C.4bpp");
+                                                  "graphics/battle_interface/misc_frameend.4bpp",
+                                                  "graphics/battle_interface/ball_display.4bpp",
+                                                  "graphics/battle_interface/ball_display_unused_extra.4bpp",
+                                                  "graphics/battle_interface/status2.4bpp",  // these three duplicate sets of graphics are for the opponent pokemon
+                                                  "graphics/battle_interface/status3.4bpp",  // and are also for use in double battles. they use dynamic palettes so
+                                                  "graphics/battle_interface/status4.4bpp",  // coloring them is an extreme headache and wont be done for now
+                                                  "graphics/battle_interface/healthbox_doubles_frameend.4bpp",
+                                                  "graphics/battle_interface/healthbox_doubles_frameend_bar.4bpp");
 const u32 gBattleInterfaceGfx_UnusedWindow3[] = INCBIN_U32("graphics/battle_interface/unused_window3.4bpp.lz");
 const u32 gBattleInterfaceGfx_UnusedWindow4[] = INCBIN_U32("graphics/battle_interface/unused_window4.4bpp.lz");
 
@@ -1533,14 +1529,12 @@ const u32 gTitleScreenPressStartGfx[] = INCBIN_U32("graphics/title_screen/press_
 
 const u32 gUnknown_08DE0644[] = INCBIN_U32("graphics/title_screen/title_screen2.bin.lz");
 
-// more trainer card stuff
-
-const u16 gUnknown_08DE07C8[][16] = INCBIN_U16("graphics/frontier_pass/tiles.gbapal");// size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well
-const u32 gUnknown_08DE08C8[] = INCBIN_U32("graphics/frontier_pass/tiles.4bpp.lz");
-const u32 gUnknown_08DE2084[] = INCBIN_U32("graphics/frontier_pass/tiles2.8bpp.lz");
-const u32 gUnknown_08DE3060[] = INCBIN_U32("graphics/frontier_pass/tiles.bin.lz");
-const u16 gUnknown_08DE3350[] = INCBIN_U16("graphics/frontier_pass/tilemap1.bin");
-const u16 gUnknown_08DE3374[] = INCBIN_U16("graphics/frontier_pass/tilemap2.bin");
+const u16 gFrontierPassBg_Pal[][16] = INCBIN_U16("graphics/frontier_pass/bg.gbapal");// size in LoadPalette calls is reported as 0xD0 << 1, which is 0x1A0, but palette is only 0x100 bytes long so it loads garbage as well
+const u32 gFrontierPassBg_Gfx[] = INCBIN_U32("graphics/frontier_pass/bg.4bpp.lz");
+const u32 gFrontierPassMapAndCard_Gfx[] = INCBIN_U32("graphics/frontier_pass/map_and_card.8bpp.lz");
+const u32 gFrontierPassBg_Tilemap[] = INCBIN_U32("graphics/frontier_pass/bg.bin.lz");
+const u16 gFrontierPassCancelButton_Tilemap[]            = INCBIN_U16("graphics/frontier_pass/cancel.bin");
+const u16 gFrontierPassCancelButtonHighlighted_Tilemap[] = INCBIN_U16("graphics/frontier_pass/cancel_highlighted.bin");
 
 // Berry Crush
 const u16 gBerryCrush_Crusher_Pal[] = INCBIN_U16("graphics/berry_crush/crusher.gbapal");
diff --git a/src/hall_of_fame.c b/src/hall_of_fame.c
index 5746260f3..69e16ee84 100644
--- a/src/hall_of_fame.c
+++ b/src/hall_of_fame.c
@@ -298,21 +298,21 @@ static const union AnimCmd sAnim_WhiteConfettiC[] =
 
 static const union AnimCmd * const sAnims_Confetti[] =
 {
-    sAnim_PinkConfettiA, 
-    sAnim_RedConfettiA, 
-    sAnim_BlueConfettiA, 
+    sAnim_PinkConfettiA,
+    sAnim_RedConfettiA,
+    sAnim_BlueConfettiA,
     sAnim_RedConfettiB,
-    sAnim_BlueConfettiB, 
-    sAnim_YellowConfettiA, 
-    sAnim_WhiteConfettiA, 
+    sAnim_BlueConfettiB,
+    sAnim_YellowConfettiA,
+    sAnim_WhiteConfettiA,
     sAnim_GreenConfettiA,
-    sAnim_PinkConfettiB, 
-    sAnim_BlueConfettiC, 
-    sAnim_YellowConfettiB, 
+    sAnim_PinkConfettiB,
+    sAnim_BlueConfettiC,
+    sAnim_YellowConfettiB,
     sAnim_WhiteConfettiB,
-    sAnim_GreenConfettiB, 
-    sAnim_PinkConfettiC, 
-    sAnim_RedConfettiC, 
+    sAnim_GreenConfettiB,
+    sAnim_PinkConfettiC,
+    sAnim_RedConfettiC,
     sAnim_YellowConfettiC,
     sAnim_WhiteConfettiC
 };
@@ -334,17 +334,17 @@ static const u32 sHallOfFame_Gfx[] = INCBIN_U32("graphics/misc/japanese_hof.4bpp
 
 static const struct HallofFameMon sDummyFameMon =
 {
-    .tid = 0x3EA03EA, 
-    .personality = 0, 
-    .species = SPECIES_NONE, 
-    .lvl = 0, 
+    .tid = 0x3EA03EA,
+    .personality = 0,
+    .species = SPECIES_NONE,
+    .lvl = 0,
     .nick = {0}
 };
 
 // Unused, order of party slots on Hall of Fame screen
 static const u8 sHallOfFame_SlotOrder[] = {
-    2, 1, 3, 
-    6, 4, 5, 
+    2, 1, 3,
+    6, 4, 5,
     0, 0
 };
 
@@ -588,7 +588,7 @@ static void Task_Hof_DisplayMon(u8 taskId)
     if (currMon->species == SPECIES_EGG)
         destY += 10;
 
-    spriteId = CreatePicSprite2(currMon->species, currMon->tid, currMon->personality, 1, startX, startY, currMonId, 0xFFFF);
+    spriteId = CreatePicSprite2(currMon->species, currMon->tid, currMon->personality, 1, startX, startY, currMonId, TAG_NONE);
     gSprites[spriteId].tDestinationX = destX;
     gSprites[spriteId].tDestinationY = destY;
     gSprites[spriteId].data[0] = 0;
@@ -662,7 +662,7 @@ static void Task_Hof_DoConfetti(u8 taskId)
     if (gTasks[taskId].tFrameCount != 0)
     {
         gTasks[taskId].tFrameCount--;
-        
+
         // Create new confetti every 4th frame for the first 290 frames
         // For the last 110 frames wait for the existing confetti to fall offscreen
         if ((gTasks[taskId].tFrameCount & 3) == 0 && gTasks[taskId].tFrameCount > 110)
@@ -703,7 +703,7 @@ static void Task_Hof_DisplayPlayer(u8 taskId)
     ShowBg(0);
     ShowBg(1);
     ShowBg(3);
-    gTasks[taskId].tPlayerSpriteID = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId_Debug(gSaveBlock2Ptr->playerGender, TRUE), 1, 120, 72, 6, 0xFFFF);
+    gTasks[taskId].tPlayerSpriteID = CreateTrainerPicSprite(PlayerGenderToFrontTrainerPicId_Debug(gSaveBlock2Ptr->playerGender, TRUE), 1, 120, 72, 6, TAG_NONE);
     AddWindow(&sHof_WindowTemplate);
     LoadWindowGfx(1, gSaveBlock2Ptr->optionsWindowFrameType, 0x21D, 0xD0);
     LoadPalette(GetTextWindowPalette(1), 0xE0, 0x20);
@@ -717,9 +717,9 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
     {
         gTasks[taskId].tFrameCount--;
     }
-    else if (gSprites[gTasks[taskId].tPlayerSpriteID].pos1.x != 192)
+    else if (gSprites[gTasks[taskId].tPlayerSpriteID].x != 192)
     {
-        gSprites[gTasks[taskId].tPlayerSpriteID].pos1.x++;
+        gSprites[gTasks[taskId].tPlayerSpriteID].x++;
     }
     else
     {
@@ -936,7 +936,7 @@ static void Task_HofPC_DrawSpritesPrintText(u8 taskId)
             if (currMon->species == SPECIES_EGG)
                 posY += 10;
 
-            spriteId = CreateMonPicSprite_HandleDeoxys(currMon->species, currMon->tid, currMon->personality, 1, posX, posY, i, 0xFFFF);
+            spriteId = CreateMonPicSprite_HandleDeoxys(currMon->species, currMon->tid, currMon->personality, 1, posX, posY, i, TAG_NONE);
             gSprites[spriteId].oam.priority = 1;
             gTasks[taskId].tMonSpriteId(i) = spriteId;
         }
@@ -978,7 +978,7 @@ static void Task_HofPC_PrintMonInfo(u8 taskId)
 
     currMonID = gTasks[taskId].tMonSpriteId(gTasks[taskId].tCurrMonId);
     gSprites[currMonID].oam.priority = 0;
-    sHofFadePalettes = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ 0xFFFF0000;
+    sHofFadePalettes = (0x10000 << gSprites[currMonID].oam.paletteNum) ^ PALETTES_OBJECTS;
     BlendPalettesUnfaded(sHofFadePalettes, 0xC, RGB(16, 29, 24));
 
     currMon = &savedTeams->mon[gTasks[taskId].tCurrMonId];
@@ -1345,18 +1345,18 @@ static bool8 LoadHofBgs(void)
 
 static void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite)
 {
-    if (sprite->pos1.x != sprite->tDestinationX
-        || sprite->pos1.y != sprite->tDestinationY)
+    if (sprite->x != sprite->tDestinationX
+        || sprite->y != sprite->tDestinationY)
     {
-        if (sprite->pos1.x < sprite->tDestinationX)
-            sprite->pos1.x += 15;
-        if (sprite->pos1.x > sprite->tDestinationX)
-            sprite->pos1.x -= 15;
-
-        if (sprite->pos1.y < sprite->tDestinationY)
-            sprite->pos1.y += 10;
-        if (sprite->pos1.y > sprite->tDestinationY)
-            sprite->pos1.y -= 10;
+        if (sprite->x < sprite->tDestinationX)
+            sprite->x += 15;
+        if (sprite->x > sprite->tDestinationX)
+            sprite->x -= 15;
+
+        if (sprite->y < sprite->tDestinationY)
+            sprite->y += 10;
+        if (sprite->y > sprite->tDestinationY)
+            sprite->y -= 10;
     }
     else
     {
@@ -1378,7 +1378,7 @@ static void SpriteCB_GetOnScreenAndAnimate(struct Sprite *sprite)
 
 static void SpriteCB_HofConfetti(struct Sprite* sprite)
 {
-    if (sprite->pos2.y > 120)
+    if (sprite->y2 > 120)
     {
         DestroySprite(sprite);
     }
@@ -1387,12 +1387,12 @@ static void SpriteCB_HofConfetti(struct Sprite* sprite)
         u16 rand;
         u8 sineIdx;
 
-        sprite->pos2.y++;
-        sprite->pos2.y += sprite->sExtraY;
+        sprite->y2++;
+        sprite->y2 += sprite->sExtraY;
 
         sineIdx = sprite->sSineIdx;
         rand = (Random() % 4) + 8;
-        sprite->pos2.x = rand * gSineTable[sineIdx] / 256;
+        sprite->x2 = rand * gSineTable[sineIdx] / 256;
 
         sprite->sSineIdx += 4;
     }
@@ -1507,12 +1507,12 @@ static void Task_DoDomeConfetti(u8 taskId)
         if (tTimer != 0 && tTimer % 3 == 0)
         {
             // Create new confetti every 3 frames
-            id = ConfettiUtil_AddNew(&sOamData_Confetti, 
-                              TAG_CONFETTI, 
-                              TAG_CONFETTI, 
-                              Random() % DISPLAY_WIDTH, 
-                              -(Random() % 8), 
-                              Random() % ARRAY_COUNT(sAnims_Confetti), 
+            id = ConfettiUtil_AddNew(&sOamData_Confetti,
+                              TAG_CONFETTI,
+                              TAG_CONFETTI,
+                              Random() % DISPLAY_WIDTH,
+                              -(Random() % 8),
+                              Random() % ARRAY_COUNT(sAnims_Confetti),
                               id);
             if (id != 0xFF)
             {
diff --git a/src/image_processing_effects.c b/src/image_processing_effects.c
index fa6867f2c..60b105163 100644
--- a/src/image_processing_effects.c
+++ b/src/image_processing_effects.c
@@ -733,11 +733,11 @@ static u16 QuantizePixel_BlurHard(u16 *prevPixel, u16 *curPixel, u16 *nextPixel)
     red   = GET_R(*curPixel);
     green = GET_G(*curPixel);
     blue  = GET_B(*curPixel);
-    
+
     prevAvg = (GET_R(*prevPixel) + GET_G(*prevPixel) + GET_B(*prevPixel)) / 3;
     curAvg  = (GET_R(*curPixel)  + GET_G(*curPixel)  + GET_B(*curPixel))  / 3;
     nextAvg = (GET_R(*nextPixel) + GET_G(*nextPixel) + GET_B(*nextPixel)) / 3;
-    
+
     if (prevAvg == curAvg && nextAvg == curAvg)
         return *curPixel;
 
@@ -1096,7 +1096,7 @@ static u16 QuantizePixel_PrimaryColors(u16* color)
     u16 red =   GET_R(*color);
     u16 green = GET_G(*color);
     u16 blue =  GET_B(*color);
-    
+
     if (red < 12 && green < 11 && blue < 11)
         return 1;
 
diff --git a/src/international_string_util.c b/src/international_string_util.c
index ab812de89..eb2ec16e7 100644
--- a/src/international_string_util.c
+++ b/src/international_string_util.c
@@ -34,11 +34,11 @@ int GetStringWidthDifference(int fontId, const u8 *str, int totalWidth, int lett
         return 0;
 }
 
-int GetMaxWidthInMenuTable(const struct MenuAction *str, int arg1)
+int GetMaxWidthInMenuTable(const struct MenuAction *str, int numActions)
 {
     int i, var;
 
-    for (var = 0, i = 0; i < arg1; i++)
+    for (var = 0, i = 0; i < numActions; i++)
     {
         int stringWidth = GetStringWidth(1, str[i].text, 0);
         if (stringWidth > var)
diff --git a/src/intro.c b/src/intro.c
index e032d78f5..5cf99c97e 100644
--- a/src/intro.c
+++ b/src/intro.c
@@ -1421,7 +1421,7 @@ static void Task_Scene2_BikeRide(u8 taskId)
         gIntroCredits_MovingSceneryState = INTROCRED_SCENERY_FROZEN;
         DestroyTask(gTasks[taskId].tBgAnimTaskId);
     }
-    
+
     if (gIntroFrameCounter > TIMER_END_SCENE_2)
     {
         // Fade out to next scene
@@ -1490,8 +1490,8 @@ static void SpriteCB_Volbeat(struct Sprite *sprite)
         sprite->sState++;
         // fallthrough
     case VOLBEAT_ENTER:
-        sprite->pos1.x -= 4;
-        if (sprite->pos1.x == 60)
+        sprite->x -= 4;
+        if (sprite->x == 60)
         {
             sprite->sState = VOLBEAT_WAIT_STATE;
             sprite->sStateDelay = 20;
@@ -1499,9 +1499,9 @@ static void SpriteCB_Volbeat(struct Sprite *sprite)
         }
         break;
     case VOLBEAT_ZIP_BACKWARD:
-        sprite->pos1.x += 8;
-        sprite->pos1.y -= 2;
-        if (sprite->pos1.x == 124)
+        sprite->x += 8;
+        sprite->y -= 2;
+        if (sprite->x == 124)
         {
             sprite->sState = VOLBEAT_WAIT_STATE;
             sprite->sStateDelay = 20;
@@ -1509,8 +1509,8 @@ static void SpriteCB_Volbeat(struct Sprite *sprite)
         }
         break;
     case VOLBEAT_ZIP_DOWN:
-        sprite->pos1.y += 4;
-        if (sprite->pos1.y == 80)
+        sprite->y += 4;
+        if (sprite->y == 80)
         {
             sprite->sState = VOLBEAT_WAIT_STATE;
             sprite->sStateDelay = 10;
@@ -1518,9 +1518,9 @@ static void SpriteCB_Volbeat(struct Sprite *sprite)
         }
         break;
     case VOLBEAT_ZIP_FORWARD:
-        sprite->pos1.x -= 8;
-        sprite->pos1.y -= 2;
-        if (sprite->pos1.x == 60)
+        sprite->x -= 8;
+        sprite->y -= 2;
+        if (sprite->x == 60)
         {
             sprite->sState = VOLBEAT_WAIT_STATE;
             sprite->sStateDelay = 10;
@@ -1528,15 +1528,15 @@ static void SpriteCB_Volbeat(struct Sprite *sprite)
         }
         break;
     case VOLBEAT_INIT_FIGURE_8:
-        sprite->pos1.x += 60;
+        sprite->x += 60;
         sprite->sSinXIdx = 0xC0;
         sprite->sSinYIdx = 0x80;
         sprite->sFig8Loops = 3;
         sprite->sState++;
         // fallthrough
     case VOLBEAT_FIGURE_8:
-        sprite->pos2.x = Sin((u8)sprite->sSinXIdx, 0x3C);
-        sprite->pos2.y = Sin((u8)sprite->sSinYIdx, 0x14);
+        sprite->x2 = Sin((u8)sprite->sSinXIdx, 0x3C);
+        sprite->y2 = Sin((u8)sprite->sSinYIdx, 0x14);
         sprite->sSinXIdx += 2;
         sprite->sSinYIdx += 4;
         if ((sprite->sSinXIdx & 0xFF) == 64)
@@ -1544,22 +1544,22 @@ static void SpriteCB_Volbeat(struct Sprite *sprite)
             sprite->hFlip = FALSE;
             if (--sprite->sFig8Loops == 0)
             {
-                sprite->pos1.x += sprite->pos2.x;
-                sprite->pos2.x = 0;
+                sprite->x += sprite->x2;
+                sprite->x2 = 0;
                 sprite->sState++;
             }
         }
         break;
     case VOLBEAT_EXIT:
-        sprite->pos1.x -= 2;
-        sprite->pos2.y = Sin((u8)sprite->sSinYIdx, 0x14);
+        sprite->x -= 2;
+        sprite->y2 = Sin((u8)sprite->sSinYIdx, 0x14);
         sprite->sSinYIdx += 4;
-        if (sprite->pos1.x < -16)
+        if (sprite->x < -16)
             DestroySprite(sprite);
         break;
     case VOLBEAT_WAIT_STATE:
         // Wait for state progression, fly idly until then
-        sprite->pos2.y = Cos((u8)sprite->sCosYIdx, 2);
+        sprite->y2 = Cos((u8)sprite->sCosYIdx, 2);
         if (!--sprite->sStateDelay)
             sprite->sState = sprite->sNextState;
         break;
@@ -1598,7 +1598,7 @@ static void SpriteCB_Torchic(struct Sprite *sprite)
             sprite->sMoveTimer += 64;
             if (sprite->sMoveTimer & 0xFF00)
             {
-                sprite->pos1.x--;
+                sprite->x--;
                 sprite->sMoveTimer &= 0xFF;
             }
         }
@@ -1609,7 +1609,7 @@ static void SpriteCB_Torchic(struct Sprite *sprite)
             sprite->sMoveTimer += 32;
             if (sprite->sMoveTimer & 0xFF00)
             {
-                sprite->pos1.x++;
+                sprite->x++;
                 sprite->sMoveTimer &= 0xFF;
             }
         }
@@ -1626,7 +1626,7 @@ static void SpriteCB_Torchic(struct Sprite *sprite)
             sprite->sMoveTimer += 64;
             if (sprite->sMoveTimer & 0xFF00)
             {
-                sprite->pos1.x--;
+                sprite->x--;
                 sprite->sMoveTimer &= 0xFF;
             }
         }
@@ -1638,9 +1638,9 @@ static void SpriteCB_Torchic(struct Sprite *sprite)
         break;
     case 4:
         if (sprite->animEnded)
-            sprite->pos1.x += 4;
+            sprite->x += 4;
 
-        if (sprite->pos1.x > 336)
+        if (sprite->x > 336)
         {
             StartSpriteAnim(sprite, TORCHIC_ANIM_RUN);
             sprite->sState++;
@@ -1648,7 +1648,7 @@ static void SpriteCB_Torchic(struct Sprite *sprite)
         break;
     case 5:
         if (gIntroFrameCounter >= TIMER_TORCHIC_EXIT)
-            sprite->pos1.x -= 2;
+            sprite->x -= 2;
         break;
     }
 }
@@ -1668,18 +1668,18 @@ static void SpriteCB_Manectric(struct Sprite *sprite)
             sprite->sState++;
         break;
     case 1:
-        sprite->pos1.x -= 2;
+        sprite->x -= 2;
         if (gIntroFrameCounter != TIMER_MANECTRIC_RUN_CIRCULAR)
             break;
-        
+
         // Initialize circular pattern running
-        sprite->pos1.y -= 12;
+        sprite->y -= 12;
         sprite->sSinIdx = 0x80;
         sprite->sCosIdx = 0;
         sprite->sState++;
         // fallthrough
     case 2:
-        if (sprite->pos1.x + sprite->pos2.x <= -32)
+        if (sprite->x + sprite->x2 <= -32)
         {
             // Manectric is offscreen now, destroy it
             DestroySprite(sprite);
@@ -1689,16 +1689,16 @@ static void SpriteCB_Manectric(struct Sprite *sprite)
             // Run in circular pattern
             if ((sprite->sSinIdx & 0xFF) < 64)
             {
-                sprite->pos2.x = Sin((u8)sprite->sSinIdx, 16);
+                sprite->x2 = Sin((u8)sprite->sSinIdx, 16);
             }
             else
             {
                 if ((sprite->sSinIdx & 0xFF) == 64)
-                    sprite->pos1.x -= 48;
-                sprite->pos2.x = Sin((u8)sprite->sSinIdx, 64);
+                    sprite->x -= 48;
+                sprite->x2 = Sin((u8)sprite->sSinIdx, 64);
             }
             sprite->sSinIdx++;
-            sprite->pos2.y = Cos((u8)sprite->sCosIdx, 12);
+            sprite->y2 = Cos((u8)sprite->sCosIdx, 12);
             sprite->sCosIdx++;
         }
         break;
@@ -2001,14 +2001,14 @@ static void SpriteCB_GroudonRocks(struct Sprite *sprite)
     // Introduce some wobble to the floating
     sprite->sTimer++;
     if (sprite->sTimer % 2 == 0)
-        sprite->pos2.y ^= 3;
+        sprite->y2 ^= 3;
 
     switch(sprite->sState)
     {
     case 0:
         // Rock floats up
         sprite->sSpeed += sGroudonRockData[sprite->sRockId][2];
-        sprite->pos1.y -= (sprite->sSpeed & 0xFF00) >> 8;
+        sprite->y -= (sprite->sSpeed & 0xFF00) >> 8;
         sprite->sSpeed &= 0xFF;
 
         // Check if Groudon scene is ending
@@ -2017,15 +2017,15 @@ static void SpriteCB_GroudonRocks(struct Sprite *sprite)
         break;
     case 1:
         // Scene zooms in, move rock offscreen
-        if (sprite->pos1.x < DISPLAY_WIDTH / 2)
-            sprite->pos1.x -= 2;
+        if (sprite->x < DISPLAY_WIDTH / 2)
+            sprite->x -= 2;
         else
-            sprite->pos1.x += 2;
+            sprite->x += 2;
 
-        if (sprite->pos1.y < DISPLAY_HEIGHT / 2)
-            sprite->pos1.y -= 2;
+        if (sprite->y < DISPLAY_HEIGHT / 2)
+            sprite->y -= 2;
         else
-            sprite->pos1.y += 2;
+            sprite->y += 2;
         break;
     }
 }
@@ -2205,7 +2205,7 @@ static void Task_Scene3_Kyogre(u8 taskId)
     }
 }
 
-#undef tScreenX 
+#undef tScreenX
 #undef tScreenY
 #undef tZoom
 #undef tDelay
@@ -2219,7 +2219,7 @@ static void Task_Scene3_Kyogre(u8 taskId)
 #define sUnk    data[7] // Never read
 
 // taskId is used inconsistently for these two functions.
-// The sprite callback for the bubbles will always read it, unless delay is 0 to 
+// The sprite callback for the bubbles will always read it, unless delay is 0 to
 // start (it never is), but the first function is often passed 0 instead of a
 // taskId, and the second function doesn't take/assign a taskId at all.
 // The only time an actual taskId is given is when it actually needs the
@@ -2233,9 +2233,9 @@ static void CreateKyogreBubbleSprites_Body(u8 taskId)
 
     for (i = 0; i < NUM_BUBBLES_IN_SET; i++)
     {
-        spriteId = CreateSprite(&sSpriteTemplate_Bubbles, 
-                                sKyogreBubbleData[i][0], 
-                                sKyogreBubbleData[i][1], 
+        spriteId = CreateSprite(&sSpriteTemplate_Bubbles,
+                                sKyogreBubbleData[i][0],
+                                sKyogreBubbleData[i][1],
                                 i);
         gSprites[spriteId].invisible = TRUE;
         gSprites[spriteId].sTaskId = taskId;
@@ -2252,14 +2252,14 @@ static void CreateKyogreBubbleSprites_Fins(void)
 
     for (i = 0; i < NUM_BUBBLES_IN_SET; i++)
     {
-        spriteId = CreateSprite(&sSpriteTemplate_Bubbles, 
-                                sKyogreBubbleData[i + NUM_BUBBLES_IN_SET][0], 
-                                sKyogreBubbleData[i + NUM_BUBBLES_IN_SET][1], 
+        spriteId = CreateSprite(&sSpriteTemplate_Bubbles,
+                                sKyogreBubbleData[i + NUM_BUBBLES_IN_SET][0],
+                                sKyogreBubbleData[i + NUM_BUBBLES_IN_SET][1],
                                 i);
         gSprites[spriteId].invisible = TRUE;
 #ifdef BUGFIX
         gSprites[spriteId].sDelay = sKyogreBubbleData[i + NUM_BUBBLES_IN_SET][2];
-#else        
+#else
         gSprites[spriteId].sDelay = sKyogreBubbleData[i][2]; // Using the wrong set of delays here
 #endif
         gSprites[spriteId].sUnk = 64;
@@ -2275,9 +2275,9 @@ static void SpriteCB_KyogreBubbles(struct Sprite *sprite)
         {
             // Animation has started, float bubbles up
             sprite->sSinIdx = (sprite->sSinIdx + 11) & 0xFF;
-            sprite->pos2.x = Sin(sprite->sSinIdx, 4);
+            sprite->x2 = Sin(sprite->sSinIdx, 4);
             sprite->sBaseY += 48;
-            sprite->pos2.y = -(sprite->sBaseY >> 8);
+            sprite->y2 = -(sprite->sBaseY >> 8);
             if (sprite->animEnded)
                 DestroySprite(sprite);
         }
@@ -2295,17 +2295,17 @@ static void SpriteCB_KyogreBubbles(struct Sprite *sprite)
         break;
     case 1:
         // Scene zooms in, move bubbles offscreen
-        if (sprite->pos1.x < DISPLAY_WIDTH / 2)
-            sprite->pos1.x -= 3;
+        if (sprite->x < DISPLAY_WIDTH / 2)
+            sprite->x -= 3;
         else
-            sprite->pos1.x += 3;
+            sprite->x += 3;
 
-        if (sprite->pos1.y < DISPLAY_HEIGHT / 2)
-            sprite->pos1.y -= 3;
+        if (sprite->y < DISPLAY_HEIGHT / 2)
+            sprite->y -= 3;
         else
-            sprite->pos1.y += 3;
+            sprite->y += 3;
 
-        if ((u16)(sprite->pos1.y - 20) > DISPLAY_HEIGHT - 20)
+        if ((u16)(sprite->y - 20) > DISPLAY_HEIGHT - 20)
             DestroySprite(sprite);
         break;
     }
@@ -2853,8 +2853,8 @@ static void SpriteCB_WaterDropHalf(struct Sprite *sprite)
     if (gSprites[sprite->data[7]].data[7] != 0)
     {
         sprite->invisible = TRUE;
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
         StartSpriteAnim(sprite, DROP_ANIM_RIPPLE);
         sprite->data[2] = 1024;
         sprite->data[3] = 8 * (sprite->data[1] & 3);
@@ -2865,10 +2865,10 @@ static void SpriteCB_WaterDropHalf(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos2.x = gSprites[sprite->data[7]].pos2.x;
-        sprite->pos2.y = gSprites[sprite->data[7]].pos2.y;
-        sprite->pos1.x = gSprites[sprite->data[7]].pos1.x;
-        sprite->pos1.y = gSprites[sprite->data[7]].pos1.y;
+        sprite->x2 = gSprites[sprite->data[7]].x2;
+        sprite->y2 = gSprites[sprite->data[7]].y2;
+        sprite->x = gSprites[sprite->data[7]].x;
+        sprite->y = gSprites[sprite->data[7]].y;
     }
 }
 
@@ -2881,12 +2881,12 @@ static void SpriteCB_WaterDrop(struct Sprite *sprite)
 
 static void SpriteCB_WaterDrop_Slide(struct Sprite *sprite)
 {
-    if (sprite->pos1.x <= 116)
+    if (sprite->x <= 116)
     {
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.y = 0;
-        sprite->pos1.x += 4;
-        sprite->pos2.x = -4;
+        sprite->y += sprite->y2;
+        sprite->y2 = 0;
+        sprite->x += 4;
+        sprite->x2 = -4;
         sprite->data[4] = 128;
         sprite->callback = SpriteCB_WaterDrop_ReachLeafEnd;
     }
@@ -2909,10 +2909,10 @@ static void SpriteCB_WaterDrop_Slide(struct Sprite *sprite)
         sin1 = gSineTable[(u8)data4];
         sin2 = gSineTable[(u8)(data4 + 64)];
         sprite->data[4] += 2;
-        sprite->pos2.y = sin1 / 32;
-        sprite->pos1.x--;
-        if (sprite->pos1.x & 1)
-            sprite->pos1.y++;
+        sprite->y2 = sin1 / 32;
+        sprite->x--;
+        if (sprite->x & 1)
+            sprite->y++;
         temp = -sin2 / 16;
         data2 = sprite->data[2];
         data3 = sprite->data[3];
@@ -2938,8 +2938,8 @@ static void SpriteCB_WaterDrop_ReachLeafEnd(struct Sprite *sprite)
         u16 sinIdx;
         sprite->data[4] -= 8;
         sinIdx = sprite->data[4];
-        sprite->pos2.x = gSineTable[(u8)(sinIdx + 64)] / 64;
-        sprite->pos2.y = gSineTable[(u8)sinIdx] / 64;
+        sprite->x2 = gSineTable[(u8)(sinIdx + 64)] / 64;
+        sprite->y2 = gSineTable[(u8)sinIdx] / 64;
     }
     else
     {
@@ -2956,8 +2956,8 @@ static void SpriteCB_WaterDrop_DangleFromLeaf(struct Sprite *sprite)
 
         sprite->data[4] += 8;
         r2 = gSineTable[(u8)sprite->data[4]] / 16 + 64;
-        sprite->pos2.x = gSineTable[(u8)(r2 + 64)] / 64;
-        sprite->pos2.y = gSineTable[(u8)r2] / 64;
+        sprite->x2 = gSineTable[(u8)(r2 + 64)] / 64;
+        sprite->y2 = gSineTable[(u8)r2] / 64;
     }
     else
     {
@@ -2967,16 +2967,16 @@ static void SpriteCB_WaterDrop_DangleFromLeaf(struct Sprite *sprite)
 
 static void SpriteCB_WaterDrop_Fall(struct Sprite *sprite)
 {
-    if (sprite->pos1.y < sprite->data[5])
+    if (sprite->y < sprite->data[5])
     {
-        sprite->pos1.y += 4;
+        sprite->y += 4;
     }
     else
     {
         sprite->data[7] = 1;
         sprite->invisible = TRUE;
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
         StartSpriteAnim(sprite, DROP_ANIM_RIPPLE);
         sprite->data[2] = 1024;
         sprite->data[3] = 8 * (sprite->data[1] & 3);
@@ -2991,16 +2991,16 @@ static void SpriteCB_WaterDrop_Fall(struct Sprite *sprite)
 // Used by the 2nd and 3rd water drops to skip the leaf slide
 static void SpriteCB_WaterDropShort(struct Sprite *sprite)
 {
-    if (sprite->pos1.y < sprite->data[5])
+    if (sprite->y < sprite->data[5])
     {
-        sprite->pos1.y += 4;
+        sprite->y += 4;
     }
     else
     {
         sprite->data[7] = 1;
         sprite->invisible = TRUE;
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
         StartSpriteAnim(sprite, DROP_ANIM_RIPPLE);
         sprite->data[2] = 1024;
         sprite->data[3] = 8 * (sprite->data[1] & 3);
@@ -3071,27 +3071,27 @@ static void SpriteCB_PlayerOnBicycle(struct Sprite *sprite)
     case 0:
         // Move forwards
         StartSpriteAnimIfDifferent(sprite, 0);
-        sprite->pos1.x--;
+        sprite->x--;
         break;
     case 1:
         // Drift backwards slowly
         StartSpriteAnimIfDifferent(sprite, 0);
         if (gIntroFrameCounter & 7)
             return;
-        sprite->pos1.x++;
+        sprite->x++;
         break;
     case 2:
         // Move backwards
-        if (sprite->pos1.x <= 120 || gIntroFrameCounter & 7)
-            sprite->pos1.x++;
+        if (sprite->x <= 120 || gIntroFrameCounter & 7)
+            sprite->x++;
         break;
     case 3:
         // Bike in place
         break;
     case 4:
         // Exit to the left
-        if (sprite->pos1.x > -32)
-            sprite->pos1.x -= 2;
+        if (sprite->x > -32)
+            sprite->x -= 2;
         break;
     }
 
@@ -3099,10 +3099,10 @@ static void SpriteCB_PlayerOnBicycle(struct Sprite *sprite)
         return;
 
     // Adjust y position
-    if (sprite->pos2.y != 0)
+    if (sprite->y2 != 0)
     {
         // Return to neutral after wobble
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
     }
     else
     {
@@ -3110,14 +3110,14 @@ static void SpriteCB_PlayerOnBicycle(struct Sprite *sprite)
         switch (Random() & 3)
         {
         case 0:
-            sprite->pos2.y = -1;
+            sprite->y2 = -1;
             break;
         case 1:
-            sprite->pos2.y = 1;
+            sprite->y2 = 1;
             break;
         case 2:
         case 3:
-            sprite->pos2.y = 0;
+            sprite->y2 = 0;
             break;
         }
     }
@@ -3133,23 +3133,23 @@ static void SpriteCB_Flygon(struct Sprite *sprite)
     case 0:
         break;
     case 1:
-        if (sprite->pos2.x + sprite->pos1.x < DISPLAY_WIDTH + 64)
-            sprite->pos2.x += 8;
+        if (sprite->x2 + sprite->x < DISPLAY_WIDTH + 64)
+            sprite->x2 += 8;
         else
             sprite->sState = 2;
         break;
     case 2:
-        if (sprite->pos2.x + sprite->pos1.x > 120)
-            sprite->pos2.x -= 1;
+        if (sprite->x2 + sprite->x > 120)
+            sprite->x2 -= 1;
         else
             sprite->sState = 3;
         break;
     case 3:
-        if (sprite->pos2.x > 0)
-            sprite->pos2.x -= 2;
+        if (sprite->x2 > 0)
+            sprite->x2 -= 2;
         break;
     }
-    sprite->pos2.y = Sin((u8)sprite->sSinIdx, 8) - sFlygonYOffset;
+    sprite->y2 = Sin((u8)sprite->sSinIdx, 8) - sFlygonYOffset;
     sprite->sSinIdx += 4;
 }
 
@@ -3249,12 +3249,12 @@ static void SpriteCB_LogoLetter(struct Sprite *sprite)
     case 5:
         // Spread the letters out as they grow
         sprite->sLetterX += sGameFreakLettersMoveSpeed[sprite->sLetterId];
-        sprite->pos2.x = (sprite->sLetterX & 0xFF00) >> 8;
+        sprite->x2 = (sprite->sLetterX & 0xFF00) >> 8;
         if (sprite->sLetterId < 4)
         {
             // Is in first 4 letters, i.e. "Game"
-            s16 temp = sprite->pos2.x;
-            sprite->pos2.x = -temp;
+            s16 temp = sprite->x2;
+            sprite->x2 = -temp;
         }
         if (sprite->affineAnimEnded)
             DestroySprite(sprite);
@@ -3358,24 +3358,24 @@ static void SpriteCB_FlygonSilhouette(struct Sprite *sprite)
         sprite->data[3] = 0;
         break;
     case 1:
-        sprite->pos2.x = -Sin((u8)sprite->data[3], 140);
-        sprite->pos2.y = -Sin((u8)sprite->data[3], 120);
+        sprite->x2 = -Sin((u8)sprite->data[3], 140);
+        sprite->y2 = -Sin((u8)sprite->data[3], 120);
         sprite->data[1] += 7;
         sprite->data[3] += 3;
-        if (sprite->pos1.x + sprite->pos2.x <= -16)
+        if (sprite->x + sprite->x2 <= -16)
         {
             sprite->oam.priority = 3;
             sprite->sState++;
-            sprite->pos1.x = 20;
-            sprite->pos1.y = 40;
+            sprite->x = 20;
+            sprite->y = 40;
             sprite->data[1] = 0x200;
             sprite->data[2] = 0;
             sprite->data[3] = 0x10;
         }
         break;
     case 2:
-        sprite->pos2.x = Sin((u8)sprite->data[3], 34);
-        sprite->pos2.y = -Cos((u8)sprite->data[3], 60);
+        sprite->x2 = Sin((u8)sprite->data[3], 34);
+        sprite->y2 = -Cos((u8)sprite->data[3], 60);
         sprite->data[1] += 2;
         if (sprite->data[7] % 5 == 0)
             sprite->data[3]++;
diff --git a/src/intro_credits_graphics.c b/src/intro_credits_graphics.c
index 1f196b268..e7039e02b 100644
--- a/src/intro_credits_graphics.c
+++ b/src/intro_credits_graphics.c
@@ -13,7 +13,7 @@
     and the credit sequence, where the player bikes along a grassy path.
 
     These graphics are placed in graphics/intro/scene_2 to keep
-    all of the intro graphics files together, though it includes 
+    all of the intro graphics files together, though it includes
     the related graphics that are used only by the credits.
 */
 
@@ -79,7 +79,7 @@ static void SpriteCB_FlygonLeftHalf(struct Sprite *sprite);
 static const struct SpriteTemplate sSpriteTemplate_MovingScenery =
 {
     .tileTag = TAG_MOVING_SCENERY,
-    .paletteTag = 0xFFFF,
+    .paletteTag = TAG_NONE,
     .oam = &gDummyOamData,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -1039,7 +1039,7 @@ static void SpriteCB_MovingScenery(struct Sprite *sprite)
 {
     s32 x;
     s16 state = gIntroCredits_MovingSceneryState;
-    
+
     if (state != INTROCRED_SCENERY_FROZEN)
     {
         switch (state)
@@ -1048,15 +1048,15 @@ static void SpriteCB_MovingScenery(struct Sprite *sprite)
             DestroySprite(sprite);
             break;
         case INTROCRED_SCENERY_NORMAL:
-            x = ((sprite->pos1.x << 16) | (u16)sprite->tXPos) + (u16)sprite->tXOffset;
-            sprite->pos1.x = x >> 16;
+            x = ((sprite->x << 16) | (u16)sprite->tXPos) + (u16)sprite->tXOffset;
+            sprite->x = x >> 16;
             sprite->tXPos = x;
-            if (sprite->pos1.x > 255)
-                sprite->pos1.x = -32;
+            if (sprite->x > 255)
+                sprite->x = -32;
             if (sprite->tHasVerticalMove)
-                sprite->pos2.y = -(gIntroCredits_MovingSceneryVBase + gIntroCredits_MovingSceneryVOffset);
+                sprite->y2 = -(gIntroCredits_MovingSceneryVBase + gIntroCredits_MovingSceneryVOffset);
             else
-                sprite->pos2.y = -gIntroCredits_MovingSceneryVBase;
+                sprite->y2 = -gIntroCredits_MovingSceneryVBase;
             break;
         }
     }
@@ -1110,10 +1110,10 @@ static void SpriteCB_Player(struct Sprite *sprite)
 static void SpriteCB_Bicycle(struct Sprite* sprite)
 {
     sprite->invisible = gSprites[sprite->sPlayerSpriteId].invisible;
-    sprite->pos1.x = gSprites[sprite->sPlayerSpriteId].pos1.x;
-    sprite->pos1.y = gSprites[sprite->sPlayerSpriteId].pos1.y + 8;
-    sprite->pos2.x = gSprites[sprite->sPlayerSpriteId].pos2.x;
-    sprite->pos2.y = gSprites[sprite->sPlayerSpriteId].pos2.y;
+    sprite->x = gSprites[sprite->sPlayerSpriteId].x;
+    sprite->y = gSprites[sprite->sPlayerSpriteId].y + 8;
+    sprite->x2 = gSprites[sprite->sPlayerSpriteId].x2;
+    sprite->y2 = gSprites[sprite->sPlayerSpriteId].y2;
 }
 
 u8 CreateIntroBrendanSprite(s16 x, s16 y)
@@ -1143,9 +1143,9 @@ static void SpriteCB_FlygonLeftHalf(struct Sprite *sprite)
 static void SpriteCB_FlygonRightHalf(struct Sprite* sprite)
 {
     sprite->invisible = gSprites[sprite->sLeftSpriteId].invisible;
-    sprite->pos1.y = gSprites[sprite->sLeftSpriteId].pos1.y;
-    sprite->pos2.x = gSprites[sprite->sLeftSpriteId].pos2.x;
-    sprite->pos2.y = gSprites[sprite->sLeftSpriteId].pos2.y;
+    sprite->y = gSprites[sprite->sLeftSpriteId].y;
+    sprite->x2 = gSprites[sprite->sLeftSpriteId].x2;
+    sprite->y2 = gSprites[sprite->sLeftSpriteId].y2;
 }
 
 // In RS these were for Latios/Latias. In Emerald both are replaced with Flygon and now only 1 is used
diff --git a/src/item_menu.c b/src/item_menu.c
index 39abf883a..8ada7ff62 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -7,12 +7,11 @@
 #include "battle_pyramid_bag.h"
 #include "berry_tag_screen.h"
 #include "bg.h"
-#include "constants/items.h"
-#include "constants/songs.h"
 #include "data.h"
 #include "decompress.h"
 #include "event_data.h"
 #include "event_object_movement.h"
+#include "event_scripts.h"
 #include "field_player_avatar.h"
 #include "field_specials.h"
 #include "graphics.h"
@@ -49,113 +48,168 @@
 #include "window.h"
 #include "apprentice.h"
 #include "battle_pike.h"
+#include "constants/items.h"
 #include "constants/rgb.h"
+#include "constants/songs.h"
 
-enum
-{
+#define TAG_POCKET_SCROLL_ARROW 110
+#define TAG_BAG_SCROLL_ARROW    111
+
+// The buffer for the bag item list needs to be large enough to hold the maximum
+// number of item slots that could fit in a single pocket, + 1 for Cancel.
+// This constant picks the max of the existing pocket sizes.
+// By default, the largest pocket is BAG_TMHM_COUNT at 64.
+#define MAX_POCKET_ITEMS  ((max(BAG_TMHM_COUNT,              \
+                            max(BAG_BERRIES_COUNT,           \
+                            max(BAG_ITEMS_COUNT,             \
+                            max(BAG_KEYITEMS_COUNT,          \
+                                BAG_POKEBALLS_COUNT))))) + 1)
+
+// Up to 8 item slots can be visible at a time
+#define MAX_ITEMS_SHOWN 8
+
+enum {
     SWITCH_POCKET_NONE,
     SWITCH_POCKET_LEFT,
     SWITCH_POCKET_RIGHT
 };
 
-void GoToBagMenu(u8 bagMenuType, u8 pocketId, void (*postExitMenuMainCallback2)());
-void CB2_Bag(void);
-bool8 SetupBagMenu(void);
-void BagMenu_InitBGs(void);
-bool8 LoadBagMenu_Graphics(void);
-void SetupBagMenu_Textboxes(void);
-void AllocateBagItemListBuffers(void);
-void LoadBagItemListBuffers(u8);
-void BagMenu_PrintPocketNames(const u8*, const u8*);
-void BagMenu_CopyPocketNameToWindow(u32);
-static void DrawPocketIndicatorSquare(u8 x, bool8 isCurrentPocket);
-void CreatePocketScrollArrowPair(void);
-void CreatePocketSwitchArrowPair(void);
-void BagMenu_PrepareTMHMMoveWindow(void);
-bool8 IsWallysBag(void);
-void Task_WallyTutorialBagMenu(u8);
-void Task_BagMenu_HandleInput(u8);
-void GetItemName(s8*, u16);
-u16 ItemIdToBattleMoveId(u16);
-u16 BagGetItemIdByPocketPosition(u8, u16);
-void BagMenu_PrintDescription(int);
-void BagMenu_PrintCursor(u8, u8);
-void BagMenu_Print(u8, u8, const u8*, u8, u8, u8, u8, u8, u8);
-bool8 ItemId_GetImportance(u16);
-u16 BagGetQuantityByPocketPosition(u8, u16);
-void BagDestroyPocketSwitchArrowPair(void);
-void TaskCloseBagMenu_2(u8);
-u8 AddItemMessageWindow(u8);
-void BagMenu_RemoveBagItemMessageWindow(u8);
-void set_callback3_to_bag(u8);
-void PrintItemDepositAmount(u8, s16);
+enum {
+    ACTION_USE,
+    ACTION_TOSS,
+    ACTION_REGISTER,
+    ACTION_GIVE,
+    ACTION_CANCEL,
+    ACTION_BATTLE_USE,
+    ACTION_CHECK,
+    ACTION_WALK,
+    ACTION_DESELECT,
+    ACTION_CHECK_TAG,
+    ACTION_CONFIRM,
+    ACTION_SHOW,
+    ACTION_GIVE_FAVOR_LADY,
+    ACTION_CONFIRM_QUIZ_LADY,
+    ACTION_DUMMY,
+};
+
+enum {
+    WIN_ITEM_LIST,
+    WIN_DESCRIPTION,
+    WIN_POCKET_NAME,
+    WIN_TMHM_INFO_ICONS,
+    WIN_TMHM_INFO,
+    WIN_MESSAGE, // Identical to ITEMWIN_MESSAGE. Unused?
+};
+
+// Item list ID for toSwapPos to indicate an item is not currently being swapped
+#define NOT_SWAPPING 0xFF
+
+struct ListBuffer1 {
+    struct ListMenuItem subBuffers[MAX_POCKET_ITEMS];
+};
+
+struct ListBuffer2 {
+    s8 name[MAX_POCKET_ITEMS][ITEM_NAME_LENGTH + 10];
+};
+
+struct TempWallyBag {
+    struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT];
+    struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT];
+    u16 cursorPosition[POCKETS_COUNT];
+    u16 scrollPosition[POCKETS_COUNT];
+    u16 unused;
+    u16 pocket;
+};
+
+static void CB2_Bag(void);
+static bool8 SetupBagMenu(void);
+static void BagMenu_InitBGs(void);
+static bool8 LoadBagMenu_Graphics(void);
+static void LoadBagMenuTextWindows(void);
+static void AllocateBagItemListBuffers(void);
+static void LoadBagItemListBuffers(u8);
+static void PrintPocketNames(const u8*, const u8*);
+static void CopyPocketNameToWindow(u32);
+static void DrawPocketIndicatorSquare(u8, bool8);
+static void CreatePocketScrollArrowPair(void);
+static void CreatePocketSwitchArrowPair(void);
+static void DestroyPocketSwitchArrowPair(void);
+static void PrepareTMHMMoveWindow(void);
+static bool8 IsWallysBag(void);
+static void Task_WallyTutorialBagMenu(u8);
+static void Task_BagMenu_HandleInput(u8);
+static void GetItemName(s8*, u16);
+static void PrintItemDescription(int);
+static void BagMenu_PrintCursorAtPos(u8, u8);
+static void BagMenu_Print(u8, u8, const u8*, u8, u8, u8, u8, u8, u8);
+static void Task_CloseBagMenu(u8);
+static u8 AddItemMessageWindow(u8);
+static void RemoveItemMessageWindow(u8);
+static void ReturnToItemList(u8);
+static void PrintItemQuantity(u8, s16);
 static u8 BagMenu_AddWindow(u8);
 static u8 GetSwitchBagPocketDirection(void);
-static void SwitchBagPocket(u8, s16, u16);
+static void SwitchBagPocket(u8, s16, bool16);
 static bool8 CanSwapItems(void);
-static void BagMenu_SwapItems(u8 taskId);
-static void sub_81AC10C(u8);
+static void StartItemSwap(u8 taskId);
+static void Task_SwitchBagPocket(u8);
 static void Task_HandleSwappingItemsInput(u8);
-void sub_81AC498(u8);
-void sub_81AC590(u8);
-void PrintTMHMMoveData(u16);
-void sub_81ACAF8(u8);
-void sub_81ACB54(u8, u8, u8);
-void Task_HandleInBattleItemMenuInput(u8);
-void Task_HandleOutOfBattleItemMenuInput(u8);
-bool8 sub_81ACDFC(s8);
-void BagMenu_RemoveWindow(u8);
-void BagMenu_PrintThereIsNoPokemon(u8);
-void Task_ChooseHowManyToToss(u8);
-void BagMenu_TossItems(u8);
-void BagMenu_YesNo(u8, u8, const struct YesNoFuncTable*);
-void Task_ActuallyToss(u8);
-void ItemMenu_Cancel(u8);
-void sub_81AD350(u8);
-static void BagMenu_PrintItemCantBeHeld(u8);
+static void DoItemSwap(u8);
+static void CancelItemSwap(u8);
+static void PrintTMHMMoveData(u16);
+static void PrintContextMenuItems(u8);
+static void PrintContextMenuItemGrid(u8, u8, u8);
+static void Task_ItemContext_SingleRow(u8);
+static void Task_ItemContext_MultipleRows(u8);
+static bool8 IsValidContextMenuPos(s8);
+static void BagMenu_RemoveWindow(u8);
+static void PrintThereIsNoPokemon(u8);
+static void Task_ChooseHowManyToToss(u8);
+static void AskTossItems(u8);
+static void Task_RemoveItemFromBag(u8);
+static void ItemMenu_Cancel(u8);
+static void HandleErrorMessage(u8);
+static void PrintItemCantBeHeld(u8);
 static void DisplayCurrentMoneyWindow(void);
 static void DisplaySellItemPriceAndConfirm(u8);
-void sub_81AD730(u8);
-void sub_81AD6E4(u8);
+static void InitSellHowManyInput(u8);
+static void AskSellItems(u8);
 static void RemoveMoneyWindow(void);
-static void Task_SellHowManyDialogueHandleInput(u8);
-static void BagMenu_Sell_UpdateItemListAndMoney(u8);
-static void BagMenu_Sell_WaitForABPress(u8);
-static void BagMenu_TryDepositItem(u8);
+static void Task_ChooseHowManyToSell(u8);
+static void SellItem(u8);
+static void WaitAfterItemSell(u8);
+static void TryDepositItem(u8);
 static void Task_ChooseHowManyToDeposit(u8 taskId);
-static void BagMenu_Deposit_WaitForABPress(u8);
-void CB2_ApprenticeExitBagMenu(void);
-void CB2_FavorLadyExitBagMenu(void);
-void CB2_QuizLadyExitBagMenu(void);
-void All_CalculateNItemsAndMaxShowed(void);
-static void SetPocketListPositions(void);
-void UpdatePocketScrollPositions(void);
-u8 CreateBagInputHandlerTask(u8);
-void sub_81AC23C(u8);
-void BagMenu_MoveCursorCallback(s32 a, bool8 b, struct ListMenu*);
-void BagMenu_ItemPrintCallback(u8 windowId, u32 itemIndex, u8 a);
-void ItemMenu_UseOutOfBattle(u8 taskId);
-void ItemMenu_Toss(u8 taskId);
-void ItemMenu_Register(u8 taskId);
-void ItemMenu_Give(u8 taskId);
-void ItemMenu_Cancel(u8 taskId);
-void ItemMenu_UseInBattle(u8 taskId);
-void ItemMenu_CheckTag(u8 taskId);
-void Task_FadeAndCloseBagMenu(u8 taskId);
-void unknown_ItemMenu_Show(u8 taskId);
-void unknown_ItemMenu_Give2(u8 taskId);
-void unknown_ItemMenu_Confirm2(u8 taskId);
-void Task_ItemContext_FieldOrBattle(u8 taskId);
-void Task_ItemContext_FieldGive(u8 taskId);
-void Task_ItemContext_Sell(u8 taskId);
-void Task_ItemContext_Deposit(u8 taskId);
-void Task_ItemContext_ItemPC_2(u8 taskId);
-void BagMenu_ConfirmToss(u8 taskId);
-void BagMenu_CancelToss(u8 taskId);
-void BagMenu_ConfirmSell(u8 taskId);
-void BagMenu_CancelSell(u8 taskId);
-
-// .rodata
+static void WaitDepositErrorMessage(u8);
+static void CB2_ApprenticeExitBagMenu(void);
+static void CB2_FavorLadyExitBagMenu(void);
+static void CB2_QuizLadyExitBagMenu(void);
+static void UpdatePocketItemLists(void);
+static void InitPocketListPositions(void);
+static void InitPocketScrollPositions(void);
+static u8 CreateBagInputHandlerTask(u8);
+static void DrawItemListBgRow(u8);
+static void BagMenu_MoveCursorCallback(s32, bool8, struct ListMenu*);
+static void BagMenu_ItemPrintCallback(u8, u32, u8);
+static void ItemMenu_UseOutOfBattle(u8);
+static void ItemMenu_Toss(u8);
+static void ItemMenu_Register(u8);
+static void ItemMenu_Give(u8);
+static void ItemMenu_Cancel(u8);
+static void ItemMenu_UseInBattle(u8);
+static void ItemMenu_CheckTag(u8);
+static void ItemMenu_Show(u8);
+static void ItemMenu_GiveFavorLady(u8);
+static void ItemMenu_ConfirmQuizLady(u8);
+static void Task_ItemContext_Normal(u8);
+static void Task_ItemContext_GiveToParty(u8);
+static void Task_ItemContext_Sell(u8);
+static void Task_ItemContext_Deposit(u8);
+static void Task_ItemContext_GiveToPC(u8);
+static void ConfirmToss(u8);
+static void CancelToss(u8);
+static void ConfirmSell(u8);
+static void CancelSell(u8);
 
 static const struct BgTemplate sBgTemplates_ItemMenu[] =
 {
@@ -211,98 +265,98 @@ static const struct ListMenuTemplate sItemListMenu =
 };
 
 static const struct MenuAction sItemMenuActions[] = {
-    [ITEMMENUACTION_USE] =          {gMenuText_Use, ItemMenu_UseOutOfBattle},
-    [ITEMMENUACTION_TOSS] =         {gMenuText_Toss, ItemMenu_Toss},
-    [ITEMMENUACTION_REGISTER] =     {gMenuText_Register, ItemMenu_Register},
-    [ITEMMENUACTION_GIVE] =         {gMenuText_Give, ItemMenu_Give},
-    [ITEMMENUACTION_CANCEL] =       {gText_Cancel2, ItemMenu_Cancel},
-    [ITEMMENUACTION_BATTLE_USE] =   {gMenuText_Use, ItemMenu_UseInBattle},
-    [ITEMMENUACTION_CHECK] =        {gMenuText_Check, ItemMenu_UseOutOfBattle},
-    [ITEMMENUACTION_WALK] =         {gMenuText_Walk, ItemMenu_UseOutOfBattle},
-    [ITEMMENUACTION_DESELECT] =     {gMenuText_Deselect, ItemMenu_Register},
-    [ITEMMENUACTION_CHECK_TAG] =    {gMenuText_CheckTag, ItemMenu_CheckTag},
-    [ITEMMENUACTION_CONFIRM] =      {gMenuText_Confirm, Task_FadeAndCloseBagMenu},
-    [ITEMMENUACTION_SHOW] =         {gMenuText_Show, unknown_ItemMenu_Show},
-    [ITEMMENUACTION_GIVE_2] =       {gMenuText_Give2, unknown_ItemMenu_Give2},
-    [ITEMMENUACTION_CONFIRM_2] =    {gMenuText_Confirm, unknown_ItemMenu_Confirm2},
-    [ITEMMENUACTION_DUMMY] =        {gText_EmptyString2, NULL}
+    [ACTION_USE]               = {gMenuText_Use,      ItemMenu_UseOutOfBattle},
+    [ACTION_TOSS]              = {gMenuText_Toss,     ItemMenu_Toss},
+    [ACTION_REGISTER]          = {gMenuText_Register, ItemMenu_Register},
+    [ACTION_GIVE]              = {gMenuText_Give,     ItemMenu_Give},
+    [ACTION_CANCEL]            = {gText_Cancel2,      ItemMenu_Cancel},
+    [ACTION_BATTLE_USE]        = {gMenuText_Use,      ItemMenu_UseInBattle},
+    [ACTION_CHECK]             = {gMenuText_Check,    ItemMenu_UseOutOfBattle},
+    [ACTION_WALK]              = {gMenuText_Walk,     ItemMenu_UseOutOfBattle},
+    [ACTION_DESELECT]          = {gMenuText_Deselect, ItemMenu_Register},
+    [ACTION_CHECK_TAG]         = {gMenuText_CheckTag, ItemMenu_CheckTag},
+    [ACTION_CONFIRM]           = {gMenuText_Confirm,  Task_FadeAndCloseBagMenu},
+    [ACTION_SHOW]              = {gMenuText_Show,     ItemMenu_Show},
+    [ACTION_GIVE_FAVOR_LADY]   = {gMenuText_Give2,    ItemMenu_GiveFavorLady},
+    [ACTION_CONFIRM_QUIZ_LADY] = {gMenuText_Confirm,  ItemMenu_ConfirmQuizLady},
+    [ACTION_DUMMY]             = {gText_EmptyString2, NULL}
 };
 
 // these are all 2D arrays with a width of 2 but are represented as 1D arrays
-// ITEMMENUACTION_DUMMY is used to represent blank spaces
+// ACTION_DUMMY is used to represent blank spaces
 static const u8 sContextMenuItems_ItemsPocket[] = {
-    ITEMMENUACTION_USE,         ITEMMENUACTION_GIVE,
-    ITEMMENUACTION_TOSS,        ITEMMENUACTION_CANCEL
+    ACTION_USE,         ACTION_GIVE,
+    ACTION_TOSS,        ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_KeyItemsPocket[] = {
-    ITEMMENUACTION_USE,         ITEMMENUACTION_REGISTER,
-    ITEMMENUACTION_DUMMY,       ITEMMENUACTION_CANCEL
+    ACTION_USE,         ACTION_REGISTER,
+    ACTION_DUMMY,       ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_BallsPocket[] = {
-    ITEMMENUACTION_GIVE,        ITEMMENUACTION_DUMMY,
-    ITEMMENUACTION_TOSS,        ITEMMENUACTION_CANCEL
+    ACTION_GIVE,        ACTION_DUMMY,
+    ACTION_TOSS,        ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_TmHmPocket[] = {
-    ITEMMENUACTION_USE,         ITEMMENUACTION_GIVE,
-    ITEMMENUACTION_DUMMY,       ITEMMENUACTION_CANCEL
+    ACTION_USE,         ACTION_GIVE,
+    ACTION_DUMMY,       ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_BerriesPocket[] = {
-    ITEMMENUACTION_CHECK_TAG,   ITEMMENUACTION_DUMMY,
-    ITEMMENUACTION_USE,         ITEMMENUACTION_GIVE,
-    ITEMMENUACTION_TOSS,        ITEMMENUACTION_CANCEL
+    ACTION_CHECK_TAG,   ACTION_DUMMY,
+    ACTION_USE,         ACTION_GIVE,
+    ACTION_TOSS,        ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_BattleUse[] = {
-    ITEMMENUACTION_BATTLE_USE,  ITEMMENUACTION_CANCEL
+    ACTION_BATTLE_USE,  ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_Give[] = {
-    ITEMMENUACTION_GIVE,        ITEMMENUACTION_CANCEL
+    ACTION_GIVE,        ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_Cancel[] = {
-    ITEMMENUACTION_CANCEL
+    ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_BerryBlenderCrush[] = {
-    ITEMMENUACTION_CONFIRM,     ITEMMENUACTION_CHECK_TAG,
-    ITEMMENUACTION_DUMMY,       ITEMMENUACTION_CANCEL
+    ACTION_CONFIRM,     ACTION_CHECK_TAG,
+    ACTION_DUMMY,       ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_Apprentice[] = {
-    ITEMMENUACTION_SHOW,        ITEMMENUACTION_CANCEL
+    ACTION_SHOW,        ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_FavorLady[] = {
-    ITEMMENUACTION_GIVE_2,      ITEMMENUACTION_CANCEL
+    ACTION_GIVE_FAVOR_LADY, ACTION_CANCEL
 };
 
 static const u8 sContextMenuItems_QuizLady[] = {
-    ITEMMENUACTION_CONFIRM_2,   ITEMMENUACTION_CANCEL
+    ACTION_CONFIRM_QUIZ_LADY, ACTION_CANCEL
 };
 
-static const TaskFunc gUnknown_08614054[] = {
-    [ITEMMENULOCATION_FIELD] =                  Task_ItemContext_FieldOrBattle,
-    [ITEMMENULOCATION_BATTLE] =                 Task_ItemContext_FieldOrBattle,
-    [ITEMMENULOCATION_PARTY] =                  Task_ItemContext_FieldGive,
+static const TaskFunc sContextMenuFuncs[] = {
+    [ITEMMENULOCATION_FIELD] =                  Task_ItemContext_Normal,
+    [ITEMMENULOCATION_BATTLE] =                 Task_ItemContext_Normal,
+    [ITEMMENULOCATION_PARTY] =                  Task_ItemContext_GiveToParty,
     [ITEMMENULOCATION_SHOP] =                   Task_ItemContext_Sell,
     [ITEMMENULOCATION_BERRY_TREE] =             Task_FadeAndCloseBagMenu,
-    [ITEMMENULOCATION_BERRY_BLENDER_CRUSH] =    Task_ItemContext_FieldOrBattle,
+    [ITEMMENULOCATION_BERRY_BLENDER_CRUSH] =    Task_ItemContext_Normal,
     [ITEMMENULOCATION_ITEMPC] =                 Task_ItemContext_Deposit,
-    [ITEMMENULOCATION_FAVOR_LADY] =             Task_ItemContext_FieldOrBattle,
-    [ITEMMENULOCATION_QUIZ_LADY] =              Task_ItemContext_FieldOrBattle,
-    [ITEMMENULOCATION_APPRENTICE] =             Task_ItemContext_FieldOrBattle,
+    [ITEMMENULOCATION_FAVOR_LADY] =             Task_ItemContext_Normal,
+    [ITEMMENULOCATION_QUIZ_LADY] =              Task_ItemContext_Normal,
+    [ITEMMENULOCATION_APPRENTICE] =             Task_ItemContext_Normal,
     [ITEMMENULOCATION_WALLY] =                  NULL,
-    [ITEMMENULOCATION_PCBOX] =                  Task_ItemContext_ItemPC_2
+    [ITEMMENULOCATION_PCBOX] =                  Task_ItemContext_GiveToPC
 };
 
-static const struct YesNoFuncTable sYesNoTossFunctions = {BagMenu_ConfirmToss, BagMenu_CancelToss};
+static const struct YesNoFuncTable sYesNoTossFunctions = {ConfirmToss, CancelToss};
 
-static const struct YesNoFuncTable sYesNoSellItemFunctions = {BagMenu_ConfirmSell, BagMenu_CancelSell};
+static const struct YesNoFuncTable sYesNoSellItemFunctions = {ConfirmSell, CancelSell};
 
 static const struct ScrollArrowsTemplate sBagScrollArrowsTemplate = {
     .firstArrowType = SCROLL_ARROW_LEFT,
@@ -313,25 +367,33 @@ static const struct ScrollArrowsTemplate sBagScrollArrowsTemplate = {
     .secondY = 16,
     .fullyUpThreshold = -1,
     .fullyDownThreshold = -1,
-    .tileTag = 111,
-    .palTag = 111,
+    .tileTag = TAG_BAG_SCROLL_ARROW,
+    .palTag = TAG_BAG_SCROLL_ARROW,
     .palNum = 0,
 };
 
 static const u8 sRegisteredSelect_Gfx[] = INCBIN_U8("graphics/interface/select_button.4bpp");
 
+enum {
+    COLORID_NORMAL,
+    COLORID_POCKET_NAME,
+    COLORID_GRAY_CURSOR,
+    COLORID_UNUSED,
+    COLORID_TMHM_INFO,
+    COLORID_NONE = 0xFF
+};
 static const u8 sFontColorTable[][3] = {
-// bgColor, textColor, shadowColor
-    {0, 1, 3},
-    {0, 1, 4},
-    {0, 3, 6},
-    {2, 1, 3},
-    {0, 14, 10}
+                            // bgColor, textColor, shadowColor
+    [COLORID_NORMAL]      = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE,      TEXT_COLOR_LIGHT_GRAY},
+    [COLORID_POCKET_NAME] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE,      TEXT_COLOR_RED},
+    [COLORID_GRAY_CURSOR] = {TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_GREEN},
+    [COLORID_UNUSED]      = {TEXT_COLOR_DARK_GRAY,   TEXT_COLOR_WHITE,      TEXT_COLOR_LIGHT_GRAY},
+    [COLORID_TMHM_INFO]   = {TEXT_COLOR_TRANSPARENT, TEXT_DYNAMIC_COLOR_5,  TEXT_DYNAMIC_COLOR_1}
 };
 
-const struct WindowTemplate sDefaultBagWindows[] =
+static const struct WindowTemplate sDefaultBagWindows[] =
 {
-    { // Item names
+    [WIN_ITEM_LIST] = {
         .bg = 0,
         .tilemapLeft = 14,
         .tilemapTop = 2,
@@ -340,7 +402,7 @@ const struct WindowTemplate sDefaultBagWindows[] =
         .paletteNum = 1,
         .baseBlock = 0x27,
     },
-    { // Description
+    [WIN_DESCRIPTION] = {
         .bg = 0,
         .tilemapLeft = 0,
         .tilemapTop = 13,
@@ -349,7 +411,7 @@ const struct WindowTemplate sDefaultBagWindows[] =
         .paletteNum = 1,
         .baseBlock = 0x117,
     },
-    { // Pocket name
+    [WIN_POCKET_NAME] = {
         .bg = 0,
         .tilemapLeft = 4,
         .tilemapTop = 1,
@@ -358,7 +420,7 @@ const struct WindowTemplate sDefaultBagWindows[] =
         .paletteNum = 1,
         .baseBlock = 0x1A1,
     },
-    { // TM/HM info icons
+    [WIN_TMHM_INFO_ICONS] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 13,
@@ -367,7 +429,7 @@ const struct WindowTemplate sDefaultBagWindows[] =
         .paletteNum = 12,
         .baseBlock = 0x16B,
     },
-    {// TM/HM info
+    [WIN_TMHM_INFO] = {
         .bg = 0,
         .tilemapLeft = 7,
         .tilemapTop = 13,
@@ -376,7 +438,7 @@ const struct WindowTemplate sDefaultBagWindows[] =
         .paletteNum = 12,
         .baseBlock = 0x189,
     },
-    { // Field message box
+    [WIN_MESSAGE] = {
         .bg = 1,
         .tilemapLeft = 2,
         .tilemapTop = 15,
@@ -388,9 +450,9 @@ const struct WindowTemplate sDefaultBagWindows[] =
     DUMMY_WIN_TEMPLATE,
 };
 
-const struct WindowTemplate sContextMenuWindowTemplates[] =
+static const struct WindowTemplate sContextMenuWindowTemplates[] =
 {
-    {
+    [ITEMWIN_1x1] = {
         .bg = 1,
         .tilemapLeft = 22,
         .tilemapTop = 17,
@@ -399,7 +461,7 @@ const struct WindowTemplate sContextMenuWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x21D,
     },
-    {
+    [ITEMWIN_1x2] = {
         .bg = 1,
         .tilemapLeft = 22,
         .tilemapTop = 15,
@@ -408,7 +470,7 @@ const struct WindowTemplate sContextMenuWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x21D,
     },
-    {
+    [ITEMWIN_2x2] = {
         .bg = 1,
         .tilemapLeft = 15,
         .tilemapTop = 15,
@@ -417,7 +479,7 @@ const struct WindowTemplate sContextMenuWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x21D,
     },
-    {
+    [ITEMWIN_2x3] = {
         .bg = 1,
         .tilemapLeft = 15,
         .tilemapTop = 13,
@@ -426,7 +488,7 @@ const struct WindowTemplate sContextMenuWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x21D,
     },
-    {
+    [ITEMWIN_MESSAGE] = {
         .bg = 1,
         .tilemapLeft = 2,
         .tilemapTop = 15,
@@ -435,7 +497,7 @@ const struct WindowTemplate sContextMenuWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x1B1,
     },
-    {
+    [ITEMWIN_YESNO_LOW] = { // Yes/No tucked in corner, for toss confirm
         .bg = 1,
         .tilemapLeft = 24,
         .tilemapTop = 15,
@@ -444,7 +506,7 @@ const struct WindowTemplate sContextMenuWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x21D,
     },
-    {
+    [ITEMWIN_YESNO_HIGH] = { // Yes/No higher up, positioned above a lower message box
         .bg = 1,
         .tilemapLeft = 21,
         .tilemapTop = 9,
@@ -453,7 +515,7 @@ const struct WindowTemplate sContextMenuWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x21D,
     },
-    {
+    [ITEMWIN_QUANTITY] = { // Used for quantity of items to Toss/Deposit
         .bg = 1,
         .tilemapLeft = 24,
         .tilemapTop = 17,
@@ -462,7 +524,7 @@ const struct WindowTemplate sContextMenuWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x21D,
     },
-    {
+    [ITEMWIN_QUANTITY_WIDE] = { // Used for quantity and price of items to Sell
         .bg = 1,
         .tilemapLeft = 18,
         .tilemapTop = 11,
@@ -471,7 +533,7 @@ const struct WindowTemplate sContextMenuWindowTemplates[] =
         .paletteNum = 15,
         .baseBlock = 0x245,
     },
-    {
+    [ITEMWIN_MONEY] = {
         .bg = 1,
         .tilemapLeft = 1,
         .tilemapTop = 1,
@@ -482,41 +544,18 @@ const struct WindowTemplate sContextMenuWindowTemplates[] =
     },
 };
 
-// .text
-
-struct ListBuffer1 {
-    struct ListMenuItem subBuffers[MAX_POCKET_ITEMS];
-};
-
-struct ListBuffer2 {
-    s8 name[MAX_POCKET_ITEMS][24];
-};
-
-struct TempWallyStruct {
-    struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT];
-    struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT];
-    u16 cursorPosition[POCKETS_COUNT];
-    u16 scrollPosition[POCKETS_COUNT];
-    u8 filler[2];
-    u16 pocket;
-};
-
-EWRAM_DATA struct BagMenuStruct *gBagMenu = 0;
-EWRAM_DATA struct BagStruct gBagPositionStruct = {0};
+EWRAM_DATA struct BagMenu *gBagMenu = 0;
+EWRAM_DATA struct BagPosition gBagPosition = {0};
 static EWRAM_DATA struct ListBuffer1 *sListBuffer1 = 0;
 static EWRAM_DATA struct ListBuffer2 *sListBuffer2 = 0;
 EWRAM_DATA u16 gSpecialVar_ItemId = 0;
-static EWRAM_DATA struct TempWallyStruct *sTempWallyBag = 0;
-
-extern u8 *const gPocketNamesStringsTable[];
-extern const u8 EventScript_SelectWithoutRegisteredItem[];
-extern const u16 gUnknown_0860F074[];
+static EWRAM_DATA struct TempWallyBag *sTempWallyBag = 0;
 
 void ResetBagScrollPositions(void)
 {
-    gBagPositionStruct.pocket = ITEMS_POCKET;
-    memset(gBagPositionStruct.cursorPosition, 0, 10);
-    memset(gBagPositionStruct.scrollPosition, 0, 10);
+    gBagPosition.pocket = ITEMS_POCKET;
+    memset(gBagPosition.cursorPosition, 0, sizeof(gBagPosition.cursorPosition));
+    memset(gBagPosition.scrollPosition, 0, sizeof(gBagPosition.scrollPosition));
 }
 
 void CB2_BagMenuFromStartMenu(void)
@@ -551,7 +590,7 @@ void CB2_GoToSellMenu(void)
 
 void CB2_GoToItemDepositMenu(void)
 {
-    GoToBagMenu(ITEMMENULOCATION_ITEMPC, POCKETS_COUNT, sub_816B31C);
+    GoToBagMenu(ITEMMENULOCATION_ITEMPC, POCKETS_COUNT, CB2_PlayerPCExitBagMenu);
 }
 
 void ApprenticeOpenBagMenu(void)
@@ -573,30 +612,31 @@ void QuizLadyOpenBagMenu(void)
     gSpecialVar_Result = FALSE;
 }
 
-void GoToBagMenu(u8 location, u8 pocket, void ( *postExitMenuMainCallback2)())
+void GoToBagMenu(u8 location, u8 pocket, void ( *exitCallback)())
 {
-    gBagMenu = AllocZeroed(sizeof(struct BagMenuStruct));
+    gBagMenu = AllocZeroed(sizeof(*gBagMenu));
     if (gBagMenu == NULL)
     {
-        SetMainCallback2(postExitMenuMainCallback2);
+        // Alloc failed, exit
+        SetMainCallback2(exitCallback);
     }
     else
     {
         if (location != ITEMMENULOCATION_LAST)
-            gBagPositionStruct.location = location;
-        if (postExitMenuMainCallback2)
-            gBagPositionStruct.bagCallback = postExitMenuMainCallback2;
+            gBagPosition.location = location;
+        if (exitCallback)
+            gBagPosition.exitCallback = exitCallback;
         if (pocket < POCKETS_COUNT)
-            gBagPositionStruct.pocket = pocket;
-        if (gBagPositionStruct.location == ITEMMENULOCATION_BERRY_TREE ||
-            gBagPositionStruct.location == ITEMMENULOCATION_BERRY_BLENDER_CRUSH)
+            gBagPosition.pocket = pocket;
+        if (gBagPosition.location == ITEMMENULOCATION_BERRY_TREE ||
+            gBagPosition.location == ITEMMENULOCATION_BERRY_BLENDER_CRUSH)
             gBagMenu->pocketSwitchDisabled = TRUE;
-        gBagMenu->exitCallback = NULL;
-        gBagMenu->itemOriginalLocation = 0xFF;
+        gBagMenu->newScreenCallback = NULL;
+        gBagMenu->toSwapPos = NOT_SWAPPING;
         gBagMenu->pocketScrollArrowsTask = TASK_NONE;
         gBagMenu->pocketSwitchArrowsTask = TASK_NONE;
-        memset(gBagMenu->spriteId, 0xFF, sizeof(gBagMenu->spriteId));
-        memset(gBagMenu->windowPointers, 0xFF, 10);
+        memset(gBagMenu->spriteIds, SPRITE_NONE, sizeof(gBagMenu->spriteIds));
+        memset(gBagMenu->windowIds, WINDOW_NONE, sizeof(gBagMenu->windowIds));
         SetMainCallback2(CB2_Bag);
     }
 }
@@ -617,14 +657,23 @@ void VBlankCB_BagMenuRun(void)
     TransferPlttBuffer();
 }
 
-#define tItemCount data[8]
+#define tListTaskId        data[0]
+#define tListPosition      data[1]
+#define tQuantity          data[2]
+#define tNeverRead         data[3]
+#define tItemCount         data[8]
+#define tMsgWindowId       data[10]
+#define tPocketSwitchDir   data[11]
+#define tPocketSwitchTimer data[12]
+#define tPocketSwitchState data[13]
 
-void CB2_Bag(void)
+static void CB2_Bag(void)
 {
-    while(MenuHelpers_CallLinkSomething() != TRUE && SetupBagMenu() != TRUE && MenuHelpers_LinkSomething() != TRUE) {};
+    while(MenuHelpers_CallLinkSomething() != TRUE && SetupBagMenu() != TRUE && MenuHelpers_LinkSomething() != TRUE)
+        {};
 }
 
-bool8 SetupBagMenu(void)
+static bool8 SetupBagMenu(void)
 {
     u8 taskId;
 
@@ -671,13 +720,13 @@ bool8 SetupBagMenu(void)
         gMain.state++;
         break;
     case 9:
-        SetupBagMenu_Textboxes();
+        LoadBagMenuTextWindows();
         gMain.state++;
         break;
     case 10:
-        All_CalculateNItemsAndMaxShowed();
-        SetPocketListPositions();
-        UpdatePocketScrollPositions();
+        UpdatePocketItemLists();
+        InitPocketListPositions();
+        InitPocketScrollPositions();
         gMain.state++;
         break;
     case 11:
@@ -685,24 +734,24 @@ bool8 SetupBagMenu(void)
         gMain.state++;
         break;
     case 12:
-        LoadBagItemListBuffers(gBagPositionStruct.pocket);
+        LoadBagItemListBuffers(gBagPosition.pocket);
         gMain.state++;
         break;
     case 13:
-        BagMenu_PrintPocketNames(gPocketNamesStringsTable[gBagPositionStruct.pocket], 0);
-        BagMenu_CopyPocketNameToWindow(0);
-        DrawPocketIndicatorSquare(gBagPositionStruct.pocket, TRUE);
+        PrintPocketNames(gPocketNamesStringsTable[gBagPosition.pocket], 0);
+        CopyPocketNameToWindow(0);
+        DrawPocketIndicatorSquare(gBagPosition.pocket, TRUE);
         gMain.state++;
         break;
     case 14:
-        taskId = CreateBagInputHandlerTask(gBagPositionStruct.location);
-        gTasks[taskId].data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]);
-        gTasks[taskId].data[3] = 0;
+        taskId = CreateBagInputHandlerTask(gBagPosition.location);
+        gTasks[taskId].tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, gBagPosition.scrollPosition[gBagPosition.pocket], gBagPosition.cursorPosition[gBagPosition.pocket]);
+        gTasks[taskId].tNeverRead = 0;
         gTasks[taskId].tItemCount = 0;
         gMain.state++;
         break;
     case 15:
-        AddBagVisualSprite(gBagPositionStruct.pocket);
+        AddBagVisualSprite(gBagPosition.pocket);
         gMain.state++;
         break;
     case 16:
@@ -715,7 +764,7 @@ bool8 SetupBagMenu(void)
         gMain.state++;
         break;
     case 18:
-        BagMenu_PrepareTMHMMoveWindow();
+        PrepareTMHMMoveWindow();
         gMain.state++;
         break;
     case 19:
@@ -735,10 +784,10 @@ bool8 SetupBagMenu(void)
     return FALSE;
 }
 
-void BagMenu_InitBGs(void)
+static void BagMenu_InitBGs(void)
 {
     ResetVramOamAndBgCntRegs();
-    memset(gBagMenu->tilemapBuffer, 0, 0x800);
+    memset(gBagMenu->tilemapBuffer, 0, sizeof(gBagMenu->tilemapBuffer));
     ResetBgsAndClearDma3BusyFlags(0);
     InitBgsFromTemplates(0, sBgTemplates_ItemMenu, ARRAY_COUNT(sBgTemplates_ItemMenu));
     SetBgTilemapBuffer(2, gBagMenu->tilemapBuffer);
@@ -751,49 +800,49 @@ void BagMenu_InitBGs(void)
     SetGpuReg(REG_OFFSET_BLDCNT, 0);
 }
 
-bool8 LoadBagMenu_Graphics(void)
+static bool8 LoadBagMenu_Graphics(void)
 {
     switch (gBagMenu->graphicsLoadState)
     {
-        case 0:
-            ResetTempTileDataBuffers();
-            DecompressAndCopyTileDataToVram(2, gBagScreen_Gfx, 0, 0, 0);
-            gBagMenu->graphicsLoadState++;
-            break;
-        case 1:
-            if (FreeTempTileDataBuffersIfPossible() != TRUE)
-            {
-                LZDecompressWram(gBagScreen_GfxTileMap, gBagMenu->tilemapBuffer);
-                gBagMenu->graphicsLoadState++;
-            }
-            break;
-        case 2:
-            if (!IsWallysBag() && gSaveBlock2Ptr->playerGender != MALE)
-                LoadCompressedPalette(gBagScreenFemale_Pal, 0, 0x40);
-            else
-                LoadCompressedPalette(gBagScreenMale_Pal, 0, 0x40);
-            gBagMenu->graphicsLoadState++;
-            break;
-        case 3:
-            if (IsWallysBag() == TRUE || gSaveBlock2Ptr->playerGender == MALE)
-                LoadCompressedSpriteSheet(&gBagMaleSpriteSheet);
-            else
-                LoadCompressedSpriteSheet(&gBagFemaleSpriteSheet);
-            gBagMenu->graphicsLoadState++;
-            break;
-        case 4:
-            LoadCompressedSpritePalette(&gBagPaletteTable);
+    case 0:
+        ResetTempTileDataBuffers();
+        DecompressAndCopyTileDataToVram(2, gBagScreen_Gfx, 0, 0, 0);
+        gBagMenu->graphicsLoadState++;
+        break;
+    case 1:
+        if (FreeTempTileDataBuffersIfPossible() != TRUE)
+        {
+            LZDecompressWram(gBagScreen_GfxTileMap, gBagMenu->tilemapBuffer);
             gBagMenu->graphicsLoadState++;
-            break;
-        default:
-            LoadListMenuSwapLineGfx();
-            gBagMenu->graphicsLoadState = 0;
-            return TRUE;
+        }
+        break;
+    case 2:
+        if (!IsWallysBag() && gSaveBlock2Ptr->playerGender != MALE)
+            LoadCompressedPalette(gBagScreenFemale_Pal, 0, 0x40);
+        else
+            LoadCompressedPalette(gBagScreenMale_Pal, 0, 0x40);
+        gBagMenu->graphicsLoadState++;
+        break;
+    case 3:
+        if (IsWallysBag() == TRUE || gSaveBlock2Ptr->playerGender == MALE)
+            LoadCompressedSpriteSheet(&gBagMaleSpriteSheet);
+        else
+            LoadCompressedSpriteSheet(&gBagFemaleSpriteSheet);
+        gBagMenu->graphicsLoadState++;
+        break;
+    case 4:
+        LoadCompressedSpritePalette(&gBagPaletteTable);
+        gBagMenu->graphicsLoadState++;
+        break;
+    default:
+        LoadListMenuSwapLineGfx();
+        gBagMenu->graphicsLoadState = 0;
+        return TRUE;
     }
     return FALSE;
 }
 
-u8 CreateBagInputHandlerTask(u8 location)
+static u8 CreateBagInputHandlerTask(u8 location)
 {
     u8 taskId;
     if (location == ITEMMENULOCATION_WALLY)
@@ -803,13 +852,13 @@ u8 CreateBagInputHandlerTask(u8 location)
     return taskId;
 }
 
-void AllocateBagItemListBuffers(void)
+static void AllocateBagItemListBuffers(void)
 {
-    sListBuffer1 = Alloc(sizeof(struct ListBuffer1));
-    sListBuffer2 = Alloc(sizeof(struct ListBuffer2));
+    sListBuffer1 = Alloc(sizeof(*sListBuffer1));
+    sListBuffer2 = Alloc(sizeof(*sListBuffer2));
 }
 
-void LoadBagItemListBuffers(u8 pocketId)
+static void LoadBagItemListBuffers(u8 pocketId)
 {
     u16 i;
     struct BagPocket *pocket = &gBagPockets[pocketId];
@@ -845,55 +894,57 @@ void LoadBagItemListBuffers(u8 pocketId)
     gMultiuseListMenuTemplate.maxShowed = gBagMenu->numShownItems[pocketId];
 }
 
-void GetItemName(s8 *dest, u16 itemId)
+static void GetItemName(s8 *dest, u16 itemId)
 {
-    switch (gBagPositionStruct.pocket)
+    switch (gBagPosition.pocket)
     {
-        case TMHM_POCKET:
-            StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]);
-            if (itemId >= ITEM_HM01)
-            {
-                ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_HM01 + 1, STR_CONV_MODE_LEADING_ZEROS, 1);
-                StringExpandPlaceholders(dest, gText_ClearTo11Var1Clear5Var2);
-            }
-            else
-            {
-                ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_TM01 + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
-                StringExpandPlaceholders(dest, gText_NumberVar1Clear7Var2);
-            }
-            break;
-        case BERRIES_POCKET:
-            ConvertIntToDecimalStringN(gStringVar1, itemId - FIRST_BERRY_INDEX + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
-            CopyItemName(itemId, gStringVar2);
-            StringExpandPlaceholders(dest, gText_NumberVar1Clear7Var2);
-            break;
-        default:
-            CopyItemName(itemId, dest);
-            break;
+    case TMHM_POCKET:
+        StringCopy(gStringVar2, gMoveNames[ItemIdToBattleMoveId(itemId)]);
+        if (itemId >= ITEM_HM01)
+        {
+            // Get HM number
+            ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_HM01 + 1, STR_CONV_MODE_LEADING_ZEROS, 1);
+            StringExpandPlaceholders(dest, gText_NumberItem_HM);
+        }
+        else
+        {
+            // Get TM number
+            ConvertIntToDecimalStringN(gStringVar1, itemId - ITEM_TM01 + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
+            StringExpandPlaceholders(dest, gText_NumberItem_TMBerry);
+        }
+        break;
+    case BERRIES_POCKET:
+        ConvertIntToDecimalStringN(gStringVar1, itemId - FIRST_BERRY_INDEX + 1, STR_CONV_MODE_LEADING_ZEROS, 2);
+        CopyItemName(itemId, gStringVar2);
+        StringExpandPlaceholders(dest, gText_NumberItem_TMBerry);
+        break;
+    default:
+        CopyItemName(itemId, dest);
+        break;
     }
 }
 
-void BagMenu_MoveCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list)
+static void BagMenu_MoveCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list)
 {
     if (onInit != TRUE)
     {
         PlaySE(SE_SELECT);
         ShakeBagSprite();
     }
-    if (gBagMenu->itemOriginalLocation == 0xFF)
+    if (gBagMenu->toSwapPos == NOT_SWAPPING)
     {
         RemoveBagItemIconSprite(gBagMenu->itemIconSlot ^ 1);
         if (itemIndex != LIST_CANCEL)
-           AddBagItemIconSprite(BagGetItemIdByPocketPosition(gBagPositionStruct.pocket + 1, itemIndex), gBagMenu->itemIconSlot);
+           AddBagItemIconSprite(BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, itemIndex), gBagMenu->itemIconSlot);
         else
            AddBagItemIconSprite(-1, gBagMenu->itemIconSlot);
         gBagMenu->itemIconSlot ^= 1;
         if (!gBagMenu->inhibitItemDescriptionPrint)
-            BagMenu_PrintDescription(itemIndex);
+            PrintItemDescription(itemIndex);
     }
 }
 
-void BagMenu_ItemPrintCallback(u8 windowId, u32 itemIndex, u8 y)
+static void BagMenu_ItemPrintCallback(u8 windowId, u32 itemIndex, u8 y)
 {
     u16 itemId;
     u16 itemQuantity;
@@ -901,74 +952,80 @@ void BagMenu_ItemPrintCallback(u8 windowId, u32 itemIndex, u8 y)
 
     if (itemIndex != LIST_CANCEL)
     {
-        if (gBagMenu->itemOriginalLocation != 0xFF)
+        if (gBagMenu->toSwapPos != NOT_SWAPPING)
         {
-            if (gBagMenu->itemOriginalLocation == (u8)itemIndex)
-                BagMenu_PrintCursor(y, 2);
+            // Swapping items, draw cursor at original item's location
+            if (gBagMenu->toSwapPos == (u8)itemIndex)
+                BagMenu_PrintCursorAtPos(y, COLORID_GRAY_CURSOR);
             else
-                BagMenu_PrintCursor(y, 0xFF);
+                BagMenu_PrintCursorAtPos(y, COLORID_NONE);
         }
 
-        itemId = BagGetItemIdByPocketPosition(gBagPositionStruct.pocket + 1, itemIndex);
-        itemQuantity = BagGetQuantityByPocketPosition(gBagPositionStruct.pocket + 1, itemIndex);
+        itemId = BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, itemIndex);
+        itemQuantity = BagGetQuantityByPocketPosition(gBagPosition.pocket + 1, itemIndex);
 
+        // Draw HM icon
         if (itemId >= ITEM_HM01 && itemId <= ITEM_HM08)
             BlitBitmapToWindow(windowId, gBagMenuHMIcon_Gfx, 8, y - 1, 16, 16);
 
-        if (gBagPositionStruct.pocket == BERRIES_POCKET)
+        if (gBagPosition.pocket == BERRIES_POCKET)
         {
+            // Print berry quantity
             ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, BERRY_CAPACITY_DIGITS);
             StringExpandPlaceholders(gStringVar4, gText_xVar1);
             offset = GetStringRightAlignXOffset(7, gStringVar4, 119);
-            BagMenu_Print(windowId, 7, gStringVar4, offset, y, 0, 0, -1, 0);
+            BagMenu_Print(windowId, 7, gStringVar4, offset, y, 0, 0, TEXT_SPEED_FF, COLORID_NORMAL);
         }
-        else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && ItemId_GetImportance(itemId) == FALSE)
+        else if (gBagPosition.pocket != KEYITEMS_POCKET && ItemId_GetImportance(itemId) == FALSE)
         {
+            // Print item quantity
             ConvertIntToDecimalStringN(gStringVar1, itemQuantity, STR_CONV_MODE_RIGHT_ALIGN, BAG_ITEM_CAPACITY_DIGITS);
             StringExpandPlaceholders(gStringVar4, gText_xVar1);
             offset = GetStringRightAlignXOffset(7, gStringVar4, 119);
-            BagMenu_Print(windowId, 7, gStringVar4, offset, y, 0, 0, -1, 0);
+            BagMenu_Print(windowId, 7, gStringVar4, offset, y, 0, 0, TEXT_SPEED_FF, COLORID_NORMAL);
         }
         else
         {
+            // Print registered icon
             if (gSaveBlock1Ptr->registeredItem && gSaveBlock1Ptr->registeredItem == itemId)
                 BlitBitmapToWindow(windowId, sRegisteredSelect_Gfx, 96, y - 1, 24, 16);
         }
     }
 }
 
-void BagMenu_PrintDescription(int itemIndex)
+static void PrintItemDescription(int itemIndex)
 {
     const u8 *str;
     if (itemIndex != LIST_CANCEL)
     {
-        str = ItemId_GetDescription(BagGetItemIdByPocketPosition(gBagPositionStruct.pocket + 1, itemIndex));
+        str = ItemId_GetDescription(BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, itemIndex));
     }
     else
     {
-        StringCopy(gStringVar1, gBagMenu_ReturnToStrings[gBagPositionStruct.location]);
+        // Print 'Cancel' description
+        StringCopy(gStringVar1, gBagMenu_ReturnToStrings[gBagPosition.location]);
         StringExpandPlaceholders(gStringVar4, gText_ReturnToVar1);
         str = gStringVar4;
     }
-    FillWindowPixelBuffer(1, PIXEL_FILL(0));
-    BagMenu_Print(1, 1, str, 3, 1, 0, 0, 0, 0);
+    FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
+    BagMenu_Print(WIN_DESCRIPTION, 1, str, 3, 1, 0, 0, 0, COLORID_NORMAL);
 }
 
-void BagMenu_PrintCursor_(u8 listTaskId, u8 colorIndex)
+static void BagMenu_PrintCursor(u8 listTaskId, u8 colorIndex)
 {
-    BagMenu_PrintCursor(ListMenuGetYCoordForPrintingArrowCursor(listTaskId), colorIndex);
+    BagMenu_PrintCursorAtPos(ListMenuGetYCoordForPrintingArrowCursor(listTaskId), colorIndex);
 }
 
-void BagMenu_PrintCursor(u8 y, u8 colorIndex)
+static void BagMenu_PrintCursorAtPos(u8 y, u8 colorIndex)
 {
-    if (colorIndex == 0xFF)
-        FillWindowPixelRect(0, PIXEL_FILL(0), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
+    if (colorIndex == COLORID_NONE)
+        FillWindowPixelRect(WIN_ITEM_LIST, PIXEL_FILL(0), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
     else
-        BagMenu_Print(0, 1, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIndex);
+        BagMenu_Print(WIN_ITEM_LIST, 1, gText_SelectorArrow2, 0, y, 0, 0, 0, colorIndex);
 
 }
 
-void CreatePocketScrollArrowPair(void)
+static void CreatePocketScrollArrowPair(void)
 {
     if (gBagMenu->pocketScrollArrowsTask == TASK_NONE)
         gBagMenu->pocketScrollArrowsTask = AddScrollIndicatorArrowPairParameterized(
@@ -976,10 +1033,10 @@ void CreatePocketScrollArrowPair(void)
             172,
             12,
             148,
-            gBagMenu->numItemStacks[gBagPositionStruct.pocket] - gBagMenu->numShownItems[gBagPositionStruct.pocket],
-            110,
-            110,
-            &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket]);
+            gBagMenu->numItemStacks[gBagPosition.pocket] - gBagMenu->numShownItems[gBagPosition.pocket],
+            TAG_POCKET_SCROLL_ARROW,
+            TAG_POCKET_SCROLL_ARROW,
+            &gBagPosition.scrollPosition[gBagPosition.pocket]);
 }
 
 void BagDestroyPocketScrollArrowPair(void)
@@ -989,16 +1046,16 @@ void BagDestroyPocketScrollArrowPair(void)
         RemoveScrollIndicatorArrowPair(gBagMenu->pocketScrollArrowsTask);
         gBagMenu->pocketScrollArrowsTask = TASK_NONE;
     }
-    BagDestroyPocketSwitchArrowPair();
+    DestroyPocketSwitchArrowPair();
 }
 
-void CreatePocketSwitchArrowPair(void)
+static void CreatePocketSwitchArrowPair(void)
 {
     if (gBagMenu->pocketSwitchDisabled != TRUE && gBagMenu->pocketSwitchArrowsTask == TASK_NONE)
-        gBagMenu->pocketSwitchArrowsTask = AddScrollIndicatorArrowPair(&sBagScrollArrowsTemplate, &gBagPositionStruct.unk6);
+        gBagMenu->pocketSwitchArrowsTask = AddScrollIndicatorArrowPair(&sBagScrollArrowsTemplate, &gBagPosition.pocketSwitchArrowPos);
 }
 
-void BagDestroyPocketSwitchArrowPair(void)
+static void DestroyPocketSwitchArrowPair(void)
 {
     if (gBagMenu->pocketSwitchArrowsTask != TASK_NONE)
     {
@@ -1007,7 +1064,7 @@ void BagDestroyPocketSwitchArrowPair(void)
     }
 }
 
-void FreeBagItemListBuffers(void)
+static void FreeBagMenu(void)
 {
     Free(sListBuffer2);
     Free(sListBuffer1);
@@ -1018,23 +1075,27 @@ void FreeBagItemListBuffers(void)
 void Task_FadeAndCloseBagMenu(u8 taskId)
 {
     BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
-    gTasks[taskId].func = TaskCloseBagMenu_2;
+    gTasks[taskId].func = Task_CloseBagMenu;
 }
 
-void TaskCloseBagMenu_2(u8 taskId)
+static void Task_CloseBagMenu(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
     if (!gPaletteFade.active)
     {
-        DestroyListMenuTask(data[0], &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]);
-        if (gBagMenu->exitCallback != NULL)
-            SetMainCallback2(gBagMenu->exitCallback);
+        DestroyListMenuTask(tListTaskId, &gBagPosition.scrollPosition[gBagPosition.pocket], &gBagPosition.cursorPosition[gBagPosition.pocket]);
+
+        // If ready for a new screen (e.g. party menu for giving an item) go to that screen
+        // Otherwise exit the bag and use callback set up when the bag was first opened
+        if (gBagMenu->newScreenCallback != NULL)
+            SetMainCallback2(gBagMenu->newScreenCallback);
         else
-            SetMainCallback2(gBagPositionStruct.bagCallback);
+            SetMainCallback2(gBagPosition.exitCallback);
+
         BagDestroyPocketScrollArrowPair();
         ResetSpriteData();
         FreeAllSpritePalettes();
-        FreeBagItemListBuffers();
+        FreeBagMenu();
         DestroyTask(taskId);
     }
 }
@@ -1045,13 +1106,13 @@ void UpdatePocketItemList(u8 pocketId)
     struct BagPocket *pocket = &gBagPockets[pocketId];
     switch (pocketId)
     {
-        case TMHM_POCKET:
-        case BERRIES_POCKET:
-            SortBerriesOrTMHMs(pocket);
-            break;
-        default:
-            CompactItemsInBagPocket(pocket);
-            break;
+    case TMHM_POCKET:
+    case BERRIES_POCKET:
+        SortBerriesOrTMHMs(pocket);
+        break;
+    default:
+        CompactItemsInBagPocket(pocket);
+        break;
     }
 
     gBagMenu->numItemStacks[pocketId] = 0;
@@ -1062,160 +1123,161 @@ void UpdatePocketItemList(u8 pocketId)
     if (!gBagMenu->hideCloseBagText)
         gBagMenu->numItemStacks[pocketId]++;
 
-    if (gBagMenu->numItemStacks[pocketId] > 8)
-        gBagMenu->numShownItems[pocketId] = 8;
+    if (gBagMenu->numItemStacks[pocketId] > MAX_ITEMS_SHOWN)
+        gBagMenu->numShownItems[pocketId] = MAX_ITEMS_SHOWN;
     else
         gBagMenu->numShownItems[pocketId] = gBagMenu->numItemStacks[pocketId];
 }
 
-void All_CalculateNItemsAndMaxShowed(void)
+static void UpdatePocketItemLists(void)
 {
     u8 i;
     for (i = 0; i < POCKETS_COUNT; i++)
         UpdatePocketItemList(i);
 }
 
-void SetInitialScrollAndCursorPositions(u8 pocketId)
+void UpdatePocketListPosition(u8 pocketId)
 {
-    sub_812225C(&gBagPositionStruct.scrollPosition[pocketId], &gBagPositionStruct.cursorPosition[pocketId], gBagMenu->numShownItems[pocketId], gBagMenu->numItemStacks[pocketId]);
+    SetCursorWithinListBounds(&gBagPosition.scrollPosition[pocketId], &gBagPosition.cursorPosition[pocketId], gBagMenu->numShownItems[pocketId], gBagMenu->numItemStacks[pocketId]);
 }
 
-static void SetPocketListPositions(void)
+static void InitPocketListPositions(void)
 {
     u8 i;
     for (i = 0; i < POCKETS_COUNT; i++)
-        SetInitialScrollAndCursorPositions(i);
+        UpdatePocketListPosition(i);
 }
 
-void UpdatePocketScrollPositions(void)
+static void InitPocketScrollPositions(void)
 {
     u8 i;
     for (i = 0; i < POCKETS_COUNT; i++)
-        sub_8122298(&gBagPositionStruct.scrollPosition[i], &gBagPositionStruct.cursorPosition[i], gBagMenu->numShownItems[i], gBagMenu->numItemStacks[i], 8);
+        SetCursorScrollWithinListBounds(&gBagPosition.scrollPosition[i], &gBagPosition.cursorPosition[i], gBagMenu->numShownItems[i], gBagMenu->numItemStacks[i], MAX_ITEMS_SHOWN);
 }
 
 u8 GetItemListPosition(u8 pocketId)
 {
-    return gBagPositionStruct.scrollPosition[pocketId] + gBagPositionStruct.cursorPosition[pocketId];
+    return gBagPosition.scrollPosition[pocketId] + gBagPosition.cursorPosition[pocketId];
 }
 
 void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void (*callback)(u8 taskId))
 {
     s16* data = gTasks[taskId].data;
 
-    data[10] = AddItemMessageWindow(4);
-    FillWindowPixelBuffer(data[10], PIXEL_FILL(1));
-    DisplayMessageAndContinueTask(taskId, data[10], 10, 13, fontId, GetPlayerTextSpeedDelay(), str, callback);
+    tMsgWindowId = AddItemMessageWindow(ITEMWIN_MESSAGE);
+    FillWindowPixelBuffer(tMsgWindowId, PIXEL_FILL(1));
+    DisplayMessageAndContinueTask(taskId, tMsgWindowId, 10, 13, fontId, GetPlayerTextSpeedDelay(), str, callback);
     ScheduleBgCopyTilemapToVram(1);
 }
 
-void BagMenu_InitListsMenu(u8 taskId)
+void CloseItemMessage(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket];
-    u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
-    BagMenu_RemoveBagItemMessageWindow(4);
-    DestroyListMenuTask(data[0], scrollPos, cursorPos);
-    UpdatePocketItemList(gBagPositionStruct.pocket);
-    SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket);
-    LoadBagItemListBuffers(gBagPositionStruct.pocket);
-    data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
+    u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+    u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
+    RemoveItemMessageWindow(ITEMWIN_MESSAGE);
+    DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
+    UpdatePocketItemList(gBagPosition.pocket);
+    UpdatePocketListPosition(gBagPosition.pocket);
+    LoadBagItemListBuffers(gBagPosition.pocket);
+    tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
     ScheduleBgCopyTilemapToVram(0);
-    set_callback3_to_bag(taskId);
+    ReturnToItemList(taskId);
 }
 
-void sub_81ABC3C(u8 a)
+static void AddItemQuantityWindow(u8 windowType)
 {
-    PrintItemDepositAmount(BagMenu_AddWindow(a), 1);
+    PrintItemQuantity(BagMenu_AddWindow(windowType), 1);
 }
 
-void PrintItemDepositAmount(u8 windowId, s16 numDeposited)
+static void PrintItemQuantity(u8 windowId, s16 quantity)
 {
-    u8 numDigits = (gBagPositionStruct.pocket == BERRIES_POCKET) ? BERRY_CAPACITY_DIGITS : BAG_ITEM_CAPACITY_DIGITS;
-    ConvertIntToDecimalStringN(gStringVar1, numDeposited, STR_CONV_MODE_LEADING_ZEROS, numDigits);
+    u8 numDigits = (gBagPosition.pocket == BERRIES_POCKET) ? BERRY_CAPACITY_DIGITS : BAG_ITEM_CAPACITY_DIGITS;
+    ConvertIntToDecimalStringN(gStringVar1, quantity, STR_CONV_MODE_LEADING_ZEROS, numDigits);
     StringExpandPlaceholders(gStringVar4, gText_xVar1);
     AddTextPrinterParameterized(windowId, 1, gStringVar4, GetStringCenterAlignXOffset(1, gStringVar4, 0x28), 2, 0, 0);
 }
 
-void PrintItemSoldAmount(int windowId, int numSold, int moneyEarned)
+// Prints the quantity of items to be sold and the amount that would be earned
+static void PrintItemSoldAmount(int windowId, int numSold, int moneyEarned)
 {
-    u8 numDigits = (gBagPositionStruct.pocket == BERRIES_POCKET) ? BERRY_CAPACITY_DIGITS : BAG_ITEM_CAPACITY_DIGITS;
+    u8 numDigits = (gBagPosition.pocket == BERRIES_POCKET) ? BERRY_CAPACITY_DIGITS : BAG_ITEM_CAPACITY_DIGITS;
     ConvertIntToDecimalStringN(gStringVar1, numSold, STR_CONV_MODE_LEADING_ZEROS, numDigits);
     StringExpandPlaceholders(gStringVar4, gText_xVar1);
-    AddTextPrinterParameterized(windowId, 1, gStringVar4, 0, 1, -1, 0);
+    AddTextPrinterParameterized(windowId, 1, gStringVar4, 0, 1, TEXT_SPEED_FF, 0);
     PrintMoneyAmount(windowId, 38, 1, moneyEarned, 0);
 }
 
-void Task_BagMenu_HandleInput(u8 taskId)
+static void Task_BagMenu_HandleInput(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket];
-    u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
+    u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+    u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
     s32 listPosition;
 
     if (MenuHelpers_CallLinkSomething() != TRUE && !gPaletteFade.active)
     {
         switch (GetSwitchBagPocketDirection())
         {
-            case SWITCH_POCKET_LEFT:
-                SwitchBagPocket(taskId, MENU_CURSOR_DELTA_LEFT, 0);
-                return;
-            case SWITCH_POCKET_RIGHT:
-                SwitchBagPocket(taskId, MENU_CURSOR_DELTA_RIGHT, 0);
-                return;
-            default:
-                if (JOY_NEW(SELECT_BUTTON))
+        case SWITCH_POCKET_LEFT:
+            SwitchBagPocket(taskId, MENU_CURSOR_DELTA_LEFT, FALSE);
+            return;
+        case SWITCH_POCKET_RIGHT:
+            SwitchBagPocket(taskId, MENU_CURSOR_DELTA_RIGHT, FALSE);
+            return;
+        default:
+            if (JOY_NEW(SELECT_BUTTON))
+            {
+                if (CanSwapItems() == TRUE)
                 {
-                    if (CanSwapItems() == TRUE)
+                    ListMenuGetScrollAndRow(tListTaskId, scrollPos, cursorPos);
+                    if ((*scrollPos + *cursorPos) != gBagMenu->numItemStacks[gBagPosition.pocket] - 1)
                     {
-                        ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos);
-                        if ((*scrollPos + *cursorPos) != gBagMenu->numItemStacks[gBagPositionStruct.pocket] - 1)
-                        {
-                            PlaySE(SE_SELECT);
-                            BagMenu_SwapItems(taskId);
-                        }
+                        PlaySE(SE_SELECT);
+                        StartItemSwap(taskId);
                     }
-                    return;
                 }
-                break;
+                return;
+            }
+            break;
         }
 
-        listPosition = ListMenu_ProcessInput(data[0]);
-        ListMenuGetScrollAndRow(data[0], scrollPos, cursorPos);
+        listPosition = ListMenu_ProcessInput(tListTaskId);
+        ListMenuGetScrollAndRow(tListTaskId, scrollPos, cursorPos);
         switch (listPosition)
         {
-            case LIST_NOTHING_CHOSEN:
-                break;
-            case LIST_CANCEL:
-                if (gBagPositionStruct.location == ITEMMENULOCATION_BERRY_BLENDER_CRUSH)
-                {
-                    PlaySE(SE_FAILURE);
-                    break;
-                }
-                PlaySE(SE_SELECT);
-                gSpecialVar_ItemId = ITEM_NONE;
-                gTasks[taskId].func = Task_FadeAndCloseBagMenu;
-                break;
-            default: // A_BUTTON
-                PlaySE(SE_SELECT);
-                BagDestroyPocketScrollArrowPair();
-                BagMenu_PrintCursor_(data[0], 2);
-                data[1] = listPosition;
-                data[2] = BagGetQuantityByPocketPosition(gBagPositionStruct.pocket + 1, listPosition);
-                gSpecialVar_ItemId = BagGetItemIdByPocketPosition(gBagPositionStruct.pocket + 1, listPosition);
-                gUnknown_08614054[gBagPositionStruct.location](taskId);
+        case LIST_NOTHING_CHOSEN:
+            break;
+        case LIST_CANCEL:
+            if (gBagPosition.location == ITEMMENULOCATION_BERRY_BLENDER_CRUSH)
+            {
+                PlaySE(SE_FAILURE);
                 break;
+            }
+            PlaySE(SE_SELECT);
+            gSpecialVar_ItemId = ITEM_NONE;
+            gTasks[taskId].func = Task_FadeAndCloseBagMenu;
+            break;
+        default: // A_BUTTON
+            PlaySE(SE_SELECT);
+            BagDestroyPocketScrollArrowPair();
+            BagMenu_PrintCursor(tListTaskId, COLORID_GRAY_CURSOR);
+            tListPosition = listPosition;
+            tQuantity = BagGetQuantityByPocketPosition(gBagPosition.pocket + 1, listPosition);
+            gSpecialVar_ItemId = BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, listPosition);
+            sContextMenuFuncs[gBagPosition.location](taskId);
+            break;
         }
     }
 }
 
-void set_callback3_to_bag(u8 taskId)
+static void ReturnToItemList(u8 taskId)
 {
     CreatePocketScrollArrowPair();
     CreatePocketSwitchArrowPair();
-    ClearWindowTilemap(3);
-    ClearWindowTilemap(4);
-    PutWindowTilemap(1);
+    ClearWindowTilemap(WIN_TMHM_INFO_ICONS);
+    ClearWindowTilemap(WIN_TMHM_INFO);
+    PutWindowTilemap(WIN_DESCRIPTION);
     ScheduleBgCopyTilemapToVram(0);
     gTasks[taskId].func = Task_BagMenu_HandleInput;
 }
@@ -1226,12 +1288,12 @@ static u8 GetSwitchBagPocketDirection(void)
     if (gBagMenu->pocketSwitchDisabled)
         return SWITCH_POCKET_NONE;
     LRKeys = GetLRKeysPressed();
-    if ((JOY_NEW(DPAD_LEFT)) || LRKeys == MENU_L_PRESSED)
+    if (JOY_NEW(DPAD_LEFT) || LRKeys == MENU_L_PRESSED)
     {
         PlaySE(SE_SELECT);
         return SWITCH_POCKET_LEFT;
     }
-    if ((JOY_NEW(DPAD_RIGHT)) || LRKeys == MENU_R_PRESSED)
+    if (JOY_NEW(DPAD_RIGHT) || LRKeys == MENU_R_PRESSED)
     {
         PlaySE(SE_SELECT);
         return SWITCH_POCKET_RIGHT;
@@ -1241,54 +1303,54 @@ static u8 GetSwitchBagPocketDirection(void)
 
 static void ChangeBagPocketId(u8 *bagPocketId, s8 deltaBagPocketId)
 {
-    if (deltaBagPocketId == 1 && *bagPocketId == POCKETS_COUNT - 1)
+    if (deltaBagPocketId == MENU_CURSOR_DELTA_RIGHT && *bagPocketId == POCKETS_COUNT - 1)
         *bagPocketId = 0;
-    else if (deltaBagPocketId == -1 && *bagPocketId == 0)
+    else if (deltaBagPocketId == MENU_CURSOR_DELTA_LEFT && *bagPocketId == 0)
         *bagPocketId = POCKETS_COUNT - 1;
     else
         *bagPocketId += deltaBagPocketId;
 }
 
-static void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, u16 a3)
+static void SwitchBagPocket(u8 taskId, s16 deltaBagPocketId, bool16 skipEraseList)
 {
     s16* data = gTasks[taskId].data;
-    u8 pocketId;
+    u8 newPocket;
 
-    data[13] = 0;
-    data[12] = 0;
-    data[11] = deltaBagPocketId;
-    if (a3 == 0)
+    tPocketSwitchState = 0;
+    tPocketSwitchTimer = 0;
+    tPocketSwitchDir = deltaBagPocketId;
+    if (!skipEraseList)
     {
-        ClearWindowTilemap(0);
-        ClearWindowTilemap(1);
-        DestroyListMenuTask(data[0], &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]);
+        ClearWindowTilemap(WIN_ITEM_LIST);
+        ClearWindowTilemap(WIN_DESCRIPTION);
+        DestroyListMenuTask(tListTaskId, &gBagPosition.scrollPosition[gBagPosition.pocket], &gBagPosition.cursorPosition[gBagPosition.pocket]);
         ScheduleBgCopyTilemapToVram(0);
-        gSprites[gBagMenu->spriteId[2 + (gBagMenu->itemIconSlot ^ 1)]].invisible = TRUE;
+        gSprites[gBagMenu->spriteIds[ITEMMENUSPRITE_ITEM + (gBagMenu->itemIconSlot ^ 1)]].invisible = TRUE;
         BagDestroyPocketScrollArrowPair();
     }
-    pocketId = gBagPositionStruct.pocket;
-    ChangeBagPocketId(&pocketId, deltaBagPocketId);
+    newPocket = gBagPosition.pocket;
+    ChangeBagPocketId(&newPocket, deltaBagPocketId);
     if (deltaBagPocketId == MENU_CURSOR_DELTA_RIGHT)
     {
-        BagMenu_PrintPocketNames(gPocketNamesStringsTable[gBagPositionStruct.pocket], gPocketNamesStringsTable[pocketId]);
-        BagMenu_CopyPocketNameToWindow(0);
+        PrintPocketNames(gPocketNamesStringsTable[gBagPosition.pocket], gPocketNamesStringsTable[newPocket]);
+        CopyPocketNameToWindow(0);
     }
     else
     {
-        BagMenu_PrintPocketNames(gPocketNamesStringsTable[pocketId], gPocketNamesStringsTable[gBagPositionStruct.pocket]);
-        BagMenu_CopyPocketNameToWindow(8);
+        PrintPocketNames(gPocketNamesStringsTable[newPocket], gPocketNamesStringsTable[gBagPosition.pocket]);
+        CopyPocketNameToWindow(8);
     }
-    DrawPocketIndicatorSquare(gBagPositionStruct.pocket, FALSE);
-    DrawPocketIndicatorSquare(pocketId, TRUE);
+    DrawPocketIndicatorSquare(gBagPosition.pocket, FALSE);
+    DrawPocketIndicatorSquare(newPocket, TRUE);
     FillBgTilemapBufferRect_Palette0(2, 11, 14, 2, 15, 16);
     ScheduleBgCopyTilemapToVram(2);
-    SetBagVisualPocketId(pocketId, 1);
-    RemoveBagSprite(1);
+    SetBagVisualPocketId(newPocket, 1);
+    RemoveBagSprite(ITEMMENUSPRITE_BALL);
     AddSwitchPocketRotatingBallSprite(deltaBagPocketId);
-    SetTaskFuncWithFollowupFunc(taskId, sub_81AC10C, gTasks[taskId].func);
+    SetTaskFuncWithFollowupFunc(taskId, Task_SwitchBagPocket, gTasks[taskId].func);
 }
 
-void sub_81AC10C(u8 taskId)
+static void Task_SwitchBagPocket(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
@@ -1296,48 +1358,50 @@ void sub_81AC10C(u8 taskId)
     {
         switch (GetSwitchBagPocketDirection())
         {
-            case SWITCH_POCKET_LEFT:
-                ChangeBagPocketId(&gBagPositionStruct.pocket, data[11]);
-                SwitchTaskToFollowupFunc(taskId);
-                SwitchBagPocket(taskId, MENU_CURSOR_DELTA_LEFT, 1);
-                return;
-            case SWITCH_POCKET_RIGHT:
-                ChangeBagPocketId(&gBagPositionStruct.pocket, data[11]);
-                SwitchTaskToFollowupFunc(taskId);
-                SwitchBagPocket(taskId, MENU_CURSOR_DELTA_RIGHT, 1);
-                return;
+        case SWITCH_POCKET_LEFT:
+            ChangeBagPocketId(&gBagPosition.pocket, tPocketSwitchDir);
+            SwitchTaskToFollowupFunc(taskId);
+            SwitchBagPocket(taskId, MENU_CURSOR_DELTA_LEFT, TRUE);
+            return;
+        case SWITCH_POCKET_RIGHT:
+            ChangeBagPocketId(&gBagPosition.pocket, tPocketSwitchDir);
+            SwitchTaskToFollowupFunc(taskId);
+            SwitchBagPocket(taskId, MENU_CURSOR_DELTA_RIGHT, TRUE);
+            return;
         }
     }
-    switch (data[13])
+    switch (tPocketSwitchState)
     {
-        case 0:
-            sub_81AC23C(data[12]);
-            if (!(++data[12] & 1))
-            {
-                if (data[11] == 1)
-                    BagMenu_CopyPocketNameToWindow((u8)(data[12] >> 1));
-                else
-                    BagMenu_CopyPocketNameToWindow((u8)(8 - (data[12] >> 1)));
-            }
-            if (data[12] == 16)
-                data[13]++;
-            break;
-        case 1:
-            ChangeBagPocketId(&gBagPositionStruct.pocket, data[11]);
-            LoadBagItemListBuffers(gBagPositionStruct.pocket);
-            data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]);
-            PutWindowTilemap(1);
-            PutWindowTilemap(2);
-            ScheduleBgCopyTilemapToVram(0);
-            CreatePocketScrollArrowPair();
-            CreatePocketSwitchArrowPair();
-            SwitchTaskToFollowupFunc(taskId);
+    case 0:
+        DrawItemListBgRow(tPocketSwitchTimer);
+        if (!(++tPocketSwitchTimer & 1))
+        {
+            if (tPocketSwitchDir == MENU_CURSOR_DELTA_RIGHT)
+                CopyPocketNameToWindow((u8)(tPocketSwitchTimer >> 1));
+            else
+                CopyPocketNameToWindow((u8)(8 - (tPocketSwitchTimer >> 1)));
+        }
+        if (tPocketSwitchTimer == 16)
+            tPocketSwitchState++;
+        break;
+    case 1:
+        ChangeBagPocketId(&gBagPosition.pocket, tPocketSwitchDir);
+        LoadBagItemListBuffers(gBagPosition.pocket);
+        tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, gBagPosition.scrollPosition[gBagPosition.pocket], gBagPosition.cursorPosition[gBagPosition.pocket]);
+        PutWindowTilemap(WIN_DESCRIPTION);
+        PutWindowTilemap(WIN_POCKET_NAME);
+        ScheduleBgCopyTilemapToVram(0);
+        CreatePocketScrollArrowPair();
+        CreatePocketSwitchArrowPair();
+        SwitchTaskToFollowupFunc(taskId);
     }
 }
 
-void sub_81AC23C(u8 a)
+// The background of the item list is a lighter color than the surrounding menu
+// When the pocket is switched this lighter background is redrawn row by row
+static void DrawItemListBgRow(u8 y)
 {
-    FillBgTilemapBufferRect_Palette0(2, 17, 14, a + 2, 15, 1);
+    FillBgTilemapBufferRect_Palette0(2, 17, 14, y + 2, 15, 1);
     ScheduleBgCopyTilemapToVram(2);
 }
 
@@ -1352,299 +1416,308 @@ static void DrawPocketIndicatorSquare(u8 x, bool8 isCurrentPocket)
 
 static bool8 CanSwapItems(void)
 {
-    if (gBagPositionStruct.location <= ITEMMENULOCATION_BATTLE)
+    // Swaps can only be done from the field or in battle (as opposed to while selling items, for example)
+    if (gBagPosition.location == ITEMMENULOCATION_FIELD
+     || gBagPosition.location == ITEMMENULOCATION_BATTLE)
     {
-        u8 temp = gBagPositionStruct.pocket - 2;
-        if (temp > 1)
+        // TMHMs and berries are numbered, and so may not be swapped
+        if (gBagPosition.pocket != TMHM_POCKET
+         && gBagPosition.pocket != BERRIES_POCKET)
             return TRUE;
     }
     return FALSE;
 }
 
-void BagMenu_SwapItems(u8 taskId)
+static void StartItemSwap(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    ListMenuSetUnkIndicatorsStructField(data[0], 16, 1);
-    data[1] = gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket] + gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
-    gBagMenu->itemOriginalLocation = data[1];
-    CopyItemName(BagGetItemIdByPocketPosition(gBagPositionStruct.pocket + 1, data[1]), gStringVar1);
+    ListMenuSetUnkIndicatorsStructField(tListTaskId, 16, 1);
+    tListPosition = gBagPosition.scrollPosition[gBagPosition.pocket] + gBagPosition.cursorPosition[gBagPosition.pocket];
+    gBagMenu->toSwapPos = tListPosition;
+    CopyItemName(BagGetItemIdByPocketPosition(gBagPosition.pocket + 1, tListPosition), gStringVar1);
     StringExpandPlaceholders(gStringVar4, gText_MoveVar1Where);
-    FillWindowPixelBuffer(1, PIXEL_FILL(0));
-    BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
-    UpdateItemMenuSwapLinePos(data[1]);
-    BagDestroyPocketSwitchArrowPair();
-    BagMenu_PrintCursor_(data[0], 2);
+    FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
+    BagMenu_Print(WIN_DESCRIPTION, 1, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL);
+    UpdateItemMenuSwapLinePos(tListPosition);
+    DestroyPocketSwitchArrowPair();
+    BagMenu_PrintCursor(tListTaskId, COLORID_GRAY_CURSOR);
     gTasks[taskId].func = Task_HandleSwappingItemsInput;
 }
 
 static void Task_HandleSwappingItemsInput(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    int input;
 
     if (MenuHelpers_CallLinkSomething() != TRUE)
     {
         if (JOY_NEW(SELECT_BUTTON))
         {
             PlaySE(SE_SELECT);
-            ListMenuGetScrollAndRow(data[0], &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]);
-            sub_81AC498(taskId);
+            ListMenuGetScrollAndRow(tListTaskId, &gBagPosition.scrollPosition[gBagPosition.pocket], &gBagPosition.cursorPosition[gBagPosition.pocket]);
+            DoItemSwap(taskId);
         }
         else
         {
-            input = ListMenu_ProcessInput(data[0]);
-            ListMenuGetScrollAndRow(data[0], &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket], &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]);
+            s32 input = ListMenu_ProcessInput(tListTaskId);
+            ListMenuGetScrollAndRow(tListTaskId, &gBagPosition.scrollPosition[gBagPosition.pocket], &gBagPosition.cursorPosition[gBagPosition.pocket]);
             SetItemMenuSwapLineInvisibility(FALSE);
-            UpdateItemMenuSwapLinePos(gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]);
+            UpdateItemMenuSwapLinePos(gBagPosition.cursorPosition[gBagPosition.pocket]);
             switch (input)
             {
-                case LIST_NOTHING_CHOSEN:
-                    break;
-                case LIST_CANCEL:
-                    PlaySE(SE_SELECT);
-                    if (JOY_NEW(A_BUTTON))
-                        sub_81AC498(taskId);
-                    else
-                        sub_81AC590(taskId);
-                    break;
-                default:
-                    PlaySE(SE_SELECT);
-                    sub_81AC498(taskId);
+            case LIST_NOTHING_CHOSEN:
+                break;
+            case LIST_CANCEL:
+                PlaySE(SE_SELECT);
+                if (JOY_NEW(A_BUTTON))
+                    DoItemSwap(taskId);
+                else
+                    CancelItemSwap(taskId);
+                break;
+            default:
+                PlaySE(SE_SELECT);
+                DoItemSwap(taskId);
+                break;
             }
         }
     }
 }
 
-void sub_81AC498(u8 taskId)
+static void DoItemSwap(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket];
-    u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
+    u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+    u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
     u16 realPos = (*scrollPos + *cursorPos);
 
-    if (data[1] == realPos || data[1] == (realPos - 1))
-        sub_81AC590(taskId);
+    if (tListPosition == realPos || tListPosition == realPos - 1)
+    {
+        // Position is the same as the original, cancel
+        CancelItemSwap(taskId);
+    }
     else
     {
-        MoveItemSlotInList(gBagPockets[gBagPositionStruct.pocket].itemSlots, data[1], realPos);
-        gBagMenu->itemOriginalLocation = -1;
-        DestroyListMenuTask(data[0], scrollPos, cursorPos);
-        if (data[1] < realPos)
-            gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]--;
-        LoadBagItemListBuffers(gBagPositionStruct.pocket);
-        data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
+        MoveItemSlotInList(gBagPockets[gBagPosition.pocket].itemSlots, tListPosition, realPos);
+        gBagMenu->toSwapPos = NOT_SWAPPING;
+        DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
+        if (tListPosition < realPos)
+            gBagPosition.cursorPosition[gBagPosition.pocket]--;
+        LoadBagItemListBuffers(gBagPosition.pocket);
+        tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
         SetItemMenuSwapLineInvisibility(TRUE);
         CreatePocketSwitchArrowPair();
         gTasks[taskId].func = Task_BagMenu_HandleInput;
     }
 }
 
-void sub_81AC590(u8 taskId)
+static void CancelItemSwap(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket];
-    u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
-
-    gBagMenu->itemOriginalLocation = -1;
-    DestroyListMenuTask(data[0], scrollPos, cursorPos);
-    if (data[1] < (*scrollPos + *cursorPos))
-        gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket]--;
-    LoadBagItemListBuffers(gBagPositionStruct.pocket);
-    data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
+    u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+    u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
+
+    gBagMenu->toSwapPos = NOT_SWAPPING;
+    DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
+    if (tListPosition < *scrollPos + *cursorPos)
+        gBagPosition.cursorPosition[gBagPosition.pocket]--;
+    LoadBagItemListBuffers(gBagPosition.pocket);
+    tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
     SetItemMenuSwapLineInvisibility(TRUE);
     CreatePocketSwitchArrowPair();
     gTasks[taskId].func = Task_BagMenu_HandleInput;
 }
 
-static void OpenContextMenu(u8 unused)
+static void OpenContextMenu(u8 taskId)
 {
-    switch (gBagPositionStruct.location)
+    switch (gBagPosition.location)
     {
-        case ITEMMENULOCATION_BATTLE:
-        case ITEMMENULOCATION_WALLY:
-            if (ItemId_GetBattleUsage(gSpecialVar_ItemId))
-            {
-                gBagMenu->contextMenuItemsPtr = sContextMenuItems_BattleUse;
-                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BattleUse);
-            }
-            else
-            {
-                gBagMenu->contextMenuItemsPtr = sContextMenuItems_Cancel;
-                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Cancel);
-            }
-            break;
-        case ITEMMENULOCATION_BERRY_BLENDER_CRUSH:
-            gBagMenu->contextMenuItemsPtr = sContextMenuItems_BerryBlenderCrush;
-            gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BerryBlenderCrush);
-            break;
-        case ITEMMENULOCATION_APPRENTICE:
-            if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
-            {
-                gBagMenu->contextMenuItemsPtr = sContextMenuItems_Apprentice;
-                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Apprentice);
-            }
-            else
-            {
-                gBagMenu->contextMenuItemsPtr = sContextMenuItems_Cancel;
-                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Cancel);
-            }
-            break;
-        case ITEMMENULOCATION_FAVOR_LADY:
-            if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
-            {
-                gBagMenu->contextMenuItemsPtr = sContextMenuItems_FavorLady;
-                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_FavorLady);
-            }
-            else
+    case ITEMMENULOCATION_BATTLE:
+    case ITEMMENULOCATION_WALLY:
+        if (ItemId_GetBattleUsage(gSpecialVar_ItemId))
+        {
+            gBagMenu->contextMenuItemsPtr = sContextMenuItems_BattleUse;
+            gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BattleUse);
+        }
+        else
+        {
+            gBagMenu->contextMenuItemsPtr = sContextMenuItems_Cancel;
+            gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Cancel);
+        }
+        break;
+    case ITEMMENULOCATION_BERRY_BLENDER_CRUSH:
+        gBagMenu->contextMenuItemsPtr = sContextMenuItems_BerryBlenderCrush;
+        gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BerryBlenderCrush);
+        break;
+    case ITEMMENULOCATION_APPRENTICE:
+        if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
+        {
+            gBagMenu->contextMenuItemsPtr = sContextMenuItems_Apprentice;
+            gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Apprentice);
+        }
+        else
+        {
+            gBagMenu->contextMenuItemsPtr = sContextMenuItems_Cancel;
+            gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Cancel);
+        }
+        break;
+    case ITEMMENULOCATION_FAVOR_LADY:
+        if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
+        {
+            gBagMenu->contextMenuItemsPtr = sContextMenuItems_FavorLady;
+            gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_FavorLady);
+        }
+        else
+        {
+            gBagMenu->contextMenuItemsPtr = sContextMenuItems_Cancel;
+            gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Cancel);
+        }
+        break;
+    case ITEMMENULOCATION_QUIZ_LADY:
+        if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
+        {
+            gBagMenu->contextMenuItemsPtr = sContextMenuItems_QuizLady;
+            gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_QuizLady);
+        }
+        else
+        {
+            gBagMenu->contextMenuItemsPtr = sContextMenuItems_Cancel;
+            gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Cancel);
+        }
+        break;
+    case ITEMMENULOCATION_PARTY:
+    case ITEMMENULOCATION_SHOP:
+    case ITEMMENULOCATION_BERRY_TREE:
+    case ITEMMENULOCATION_ITEMPC:
+    default:
+        if (MenuHelpers_LinkSomething() == TRUE || InUnionRoom() == TRUE)
+        {
+            if (gBagPosition.pocket == KEYITEMS_POCKET || !IsHoldingItemAllowed(gSpecialVar_ItemId))
             {
                 gBagMenu->contextMenuItemsPtr = sContextMenuItems_Cancel;
                 gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Cancel);
             }
-            break;
-        case ITEMMENULOCATION_QUIZ_LADY:
-            if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
-            {
-                gBagMenu->contextMenuItemsPtr = sContextMenuItems_QuizLady;
-                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_QuizLady);
-            }
             else
             {
-                gBagMenu->contextMenuItemsPtr = sContextMenuItems_Cancel;
-                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Cancel);
-            }
-            break;
-        case ITEMMENULOCATION_PARTY:
-        case ITEMMENULOCATION_SHOP:
-        case ITEMMENULOCATION_BERRY_TREE:
-        case ITEMMENULOCATION_ITEMPC:
-        default:
-            if (MenuHelpers_LinkSomething() == TRUE || InUnionRoom() == TRUE)
-            {
-                if (gBagPositionStruct.pocket == KEYITEMS_POCKET || !sub_8122148(gSpecialVar_ItemId))
-                {
-                    gBagMenu->contextMenuItemsPtr = sContextMenuItems_Cancel;
-                    gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Cancel);
-                }
-                else
-                {
-                    gBagMenu->contextMenuItemsPtr = sContextMenuItems_Give;
-                    gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Give);
-                }
+                gBagMenu->contextMenuItemsPtr = sContextMenuItems_Give;
+                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_Give);
             }
-            else
+        }
+        else
+        {
+            switch (gBagPosition.pocket)
             {
-                switch (gBagPositionStruct.pocket)
+            case ITEMS_POCKET:
+                gBagMenu->contextMenuItemsPtr = gBagMenu->contextMenuItemsBuffer;
+                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_ItemsPocket);
+                memcpy(&gBagMenu->contextMenuItemsBuffer, &sContextMenuItems_ItemsPocket, sizeof(sContextMenuItems_ItemsPocket));
+                if (ItemIsMail(gSpecialVar_ItemId) == TRUE)
+                    gBagMenu->contextMenuItemsBuffer[0] = ACTION_CHECK;
+                break;
+            case KEYITEMS_POCKET:
+                gBagMenu->contextMenuItemsPtr = gBagMenu->contextMenuItemsBuffer;
+                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_KeyItemsPocket);
+                memcpy(&gBagMenu->contextMenuItemsBuffer, &sContextMenuItems_KeyItemsPocket, sizeof(sContextMenuItems_KeyItemsPocket));
+                if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId)
+                    gBagMenu->contextMenuItemsBuffer[1] = ACTION_DESELECT;
+                if (gSpecialVar_ItemId == ITEM_MACH_BIKE || gSpecialVar_ItemId == ITEM_ACRO_BIKE)
                 {
-                    case ITEMS_POCKET:
-                        gBagMenu->contextMenuItemsPtr = gBagMenu->contextMenuItemsBuffer;
-                        gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_ItemsPocket);
-                        memcpy(&gBagMenu->contextMenuItemsBuffer, &sContextMenuItems_ItemsPocket, sizeof(sContextMenuItems_ItemsPocket));
-                        if (ItemIsMail(gSpecialVar_ItemId) == TRUE)
-                            gBagMenu->contextMenuItemsBuffer[0] = ITEMMENUACTION_CHECK;
-                        break;
-                    case KEYITEMS_POCKET:
-                        gBagMenu->contextMenuItemsPtr = gBagMenu->contextMenuItemsBuffer;
-                        gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_KeyItemsPocket);
-                        memcpy(&gBagMenu->contextMenuItemsBuffer, &sContextMenuItems_KeyItemsPocket, sizeof(sContextMenuItems_KeyItemsPocket));
-                        if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId)
-                            gBagMenu->contextMenuItemsBuffer[1] = ITEMMENUACTION_DESELECT;
-                        if (gSpecialVar_ItemId == ITEM_MACH_BIKE || gSpecialVar_ItemId == ITEM_ACRO_BIKE)
-                        {
-                            if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
-                                gBagMenu->contextMenuItemsBuffer[0] = ITEMMENUACTION_WALK;
-                        }
-                        break;
-                    case BALLS_POCKET:
-                        gBagMenu->contextMenuItemsPtr = sContextMenuItems_BallsPocket;
-                        gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BallsPocket);
-                        break;
-                    case TMHM_POCKET:
-                        gBagMenu->contextMenuItemsPtr = sContextMenuItems_TmHmPocket;
-                        gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_TmHmPocket);
-                        break;
-                    case BERRIES_POCKET:
-                        gBagMenu->contextMenuItemsPtr = sContextMenuItems_BerriesPocket;
-                        gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BerriesPocket);
-                        break;
+                    if (TestPlayerAvatarFlags(PLAYER_AVATAR_FLAG_MACH_BIKE | PLAYER_AVATAR_FLAG_ACRO_BIKE))
+                        gBagMenu->contextMenuItemsBuffer[0] = ACTION_WALK;
                 }
+                break;
+            case BALLS_POCKET:
+                gBagMenu->contextMenuItemsPtr = sContextMenuItems_BallsPocket;
+                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BallsPocket);
+                break;
+            case TMHM_POCKET:
+                gBagMenu->contextMenuItemsPtr = sContextMenuItems_TmHmPocket;
+                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_TmHmPocket);
+                break;
+            case BERRIES_POCKET:
+                gBagMenu->contextMenuItemsPtr = sContextMenuItems_BerriesPocket;
+                gBagMenu->contextMenuNumItems = ARRAY_COUNT(sContextMenuItems_BerriesPocket);
+                break;
             }
+        }
     }
-    if (gBagPositionStruct.pocket == TMHM_POCKET)
+    if (gBagPosition.pocket == TMHM_POCKET)
     {
-        ClearWindowTilemap(1);
+        ClearWindowTilemap(WIN_DESCRIPTION);
         PrintTMHMMoveData(gSpecialVar_ItemId);
-        PutWindowTilemap(3);
-        PutWindowTilemap(4);
+        PutWindowTilemap(WIN_TMHM_INFO_ICONS);
+        PutWindowTilemap(WIN_TMHM_INFO);
         ScheduleBgCopyTilemapToVram(0);
     }
     else
     {
         CopyItemName(gSpecialVar_ItemId, gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_Var1IsSelected);
-        FillWindowPixelBuffer(1, PIXEL_FILL(0));
-        BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
+        FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
+        BagMenu_Print(WIN_DESCRIPTION, 1, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL);
     }
     if (gBagMenu->contextMenuNumItems == 1)
-        sub_81ACAF8(BagMenu_AddWindow(0));
+        PrintContextMenuItems(BagMenu_AddWindow(ITEMWIN_1x1));
     else if (gBagMenu->contextMenuNumItems == 2)
-        sub_81ACAF8(BagMenu_AddWindow(1));
+        PrintContextMenuItems(BagMenu_AddWindow(ITEMWIN_1x2));
     else if (gBagMenu->contextMenuNumItems == 4)
-        sub_81ACB54(BagMenu_AddWindow(2), 2, 2);
+        PrintContextMenuItemGrid(BagMenu_AddWindow(ITEMWIN_2x2), 2, 2);
     else
-        sub_81ACB54(BagMenu_AddWindow(3), 2, 3);
+        PrintContextMenuItemGrid(BagMenu_AddWindow(ITEMWIN_2x3), 2, 3);
 }
 
-void sub_81ACAF8(u8 a)
+static void PrintContextMenuItems(u8 windowId)
 {
-    AddItemMenuActionTextPrinters(a, 7, 8, 1, 0, 16, gBagMenu->contextMenuNumItems, sItemMenuActions, gBagMenu->contextMenuItemsPtr);
-    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(a, gBagMenu->contextMenuNumItems, 0);
+    AddItemMenuActionTextPrinters(windowId, 7, 8, 1, 0, 16, gBagMenu->contextMenuNumItems, sItemMenuActions, gBagMenu->contextMenuItemsPtr);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, gBagMenu->contextMenuNumItems, 0);
 }
 
-void sub_81ACB54(u8 a, u8 b, u8 c)
+static void PrintContextMenuItemGrid(u8 windowId, u8 columns, u8 rows)
 {
-    PrintMenuActionGrid(a, 7, 8, 1, 0x38, b, c, sItemMenuActions, gBagMenu->contextMenuItemsPtr);
-    InitMenuActionGrid(a, 0x38, b, c, 0);
+    PrintMenuActionGrid(windowId, 7, 8, 1, 56, columns, rows, sItemMenuActions, gBagMenu->contextMenuItemsPtr);
+    InitMenuActionGrid(windowId, 56, columns, rows, 0);
 }
 
-void Task_ItemContext_FieldOrBattle(u8 taskId)
+static void Task_ItemContext_Normal(u8 taskId)
 {
     OpenContextMenu(taskId);
+
+    // Context menu width is never greater than 2 columns, so if
+    // there are more than 2 items then there are multiple rows
     if (gBagMenu->contextMenuNumItems <= 2)
-        gTasks[taskId].func = Task_HandleInBattleItemMenuInput;
+        gTasks[taskId].func = Task_ItemContext_SingleRow;
     else
-        gTasks[taskId].func = Task_HandleOutOfBattleItemMenuInput;
+        gTasks[taskId].func = Task_ItemContext_MultipleRows;
 }
 
-void Task_HandleInBattleItemMenuInput(u8 taskId)
+static void Task_ItemContext_SingleRow(u8 taskId)
 {
     if (MenuHelpers_CallLinkSomething() != TRUE)
     {
         s8 selection = Menu_ProcessInputNoWrap();
         switch (selection)
         {
-            case MENU_NOTHING_CHOSEN:
-                break;
-            case MENU_B_PRESSED:
-                PlaySE(SE_SELECT);
-                sItemMenuActions[ITEMMENUACTION_CANCEL].func.void_u8(taskId);
-                break;
-            default:
-                PlaySE(SE_SELECT);
-                sItemMenuActions[gBagMenu->contextMenuItemsPtr[selection]].func.void_u8(taskId);
-                break;
+        case MENU_NOTHING_CHOSEN:
+            break;
+        case MENU_B_PRESSED:
+            PlaySE(SE_SELECT);
+            sItemMenuActions[ACTION_CANCEL].func.void_u8(taskId);
+            break;
+        default:
+            PlaySE(SE_SELECT);
+            sItemMenuActions[gBagMenu->contextMenuItemsPtr[selection]].func.void_u8(taskId);
+            break;
         }
     }
 }
 
-void Task_HandleOutOfBattleItemMenuInput(u8 taskId)
+static void Task_ItemContext_MultipleRows(u8 taskId)
 {
     if (MenuHelpers_CallLinkSomething() != TRUE)
     {
         s8 cursorPos = Menu_GetCursorPos();
         if (JOY_NEW(DPAD_UP))
         {
-            if (cursorPos > 0 && sub_81ACDFC(cursorPos - 2))
+            if (cursorPos > 0 && IsValidContextMenuPos(cursorPos - 2))
             {
                 PlaySE(SE_SELECT);
                 ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_UP);
@@ -1652,23 +1725,23 @@ void Task_HandleOutOfBattleItemMenuInput(u8 taskId)
         }
         else if (JOY_NEW(DPAD_DOWN))
         {
-            if (cursorPos < (gBagMenu->contextMenuNumItems - 2) && sub_81ACDFC(cursorPos + 2))
+            if (cursorPos < (gBagMenu->contextMenuNumItems - 2) && IsValidContextMenuPos(cursorPos + 2))
             {
                 PlaySE(SE_SELECT);
                 ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_NONE, MENU_CURSOR_DELTA_DOWN);
             }
         }
-        else if ((JOY_NEW(DPAD_LEFT)) || GetLRKeysPressed() == MENU_L_PRESSED)
+        else if (JOY_NEW(DPAD_LEFT) || GetLRKeysPressed() == MENU_L_PRESSED)
         {
-            if ((cursorPos & 1) && sub_81ACDFC(cursorPos - 1))
+            if ((cursorPos & 1) && IsValidContextMenuPos(cursorPos - 1))
             {
                 PlaySE(SE_SELECT);
                 ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_LEFT, MENU_CURSOR_DELTA_NONE);
             }
         }
-        else if ((JOY_NEW(DPAD_RIGHT)) || GetLRKeysPressed() == MENU_R_PRESSED)
+        else if (JOY_NEW(DPAD_RIGHT) || GetLRKeysPressed() == MENU_R_PRESSED)
         {
-            if (!(cursorPos & 1) && sub_81ACDFC(cursorPos + 1))
+            if (!(cursorPos & 1) && IsValidContextMenuPos(cursorPos + 1))
             {
                 PlaySE(SE_SELECT);
                 ChangeListMenuCursorPosition(MENU_CURSOR_DELTA_RIGHT, MENU_CURSOR_DELTA_NONE);
@@ -1682,50 +1755,48 @@ void Task_HandleOutOfBattleItemMenuInput(u8 taskId)
         else if (JOY_NEW(B_BUTTON))
         {
             PlaySE(SE_SELECT);
-            sItemMenuActions[ITEMMENUACTION_CANCEL].func.void_u8(taskId);
+            sItemMenuActions[ACTION_CANCEL].func.void_u8(taskId);
         }
     }
 }
 
-bool8 sub_81ACDFC(s8 a)
+static bool8 IsValidContextMenuPos(s8 cursorPos)
 {
-    if (a < 0)
+    if (cursorPos < 0)
         return FALSE;
-    if (a > gBagMenu->contextMenuNumItems)
+    if (cursorPos > gBagMenu->contextMenuNumItems)
         return FALSE;
-    if (gBagMenu->contextMenuItemsPtr[a] == 14)
+    if (gBagMenu->contextMenuItemsPtr[cursorPos] == ACTION_DUMMY)
         return FALSE;
     return TRUE;
 }
 
-void BagMenu_RemoveSomeWindow(void)
+static void RemoveContextWindow(void)
 {
     if (gBagMenu->contextMenuNumItems == 1)
-        BagMenu_RemoveWindow(0);
+        BagMenu_RemoveWindow(ITEMWIN_1x1);
     else if (gBagMenu->contextMenuNumItems == 2)
-    {
-        BagMenu_RemoveWindow(1);
-    }
+        BagMenu_RemoveWindow(ITEMWIN_1x2);
     else if (gBagMenu->contextMenuNumItems == 4)
-    {
-        BagMenu_RemoveWindow(2);
-    }
+        BagMenu_RemoveWindow(ITEMWIN_2x2);
     else
-        BagMenu_RemoveWindow(3);
+        BagMenu_RemoveWindow(ITEMWIN_2x3);
 }
 
-void ItemMenu_UseOutOfBattle(u8 taskId)
+static void ItemMenu_UseOutOfBattle(u8 taskId)
 {
     if (ItemId_GetFieldFunc(gSpecialVar_ItemId))
     {
-        BagMenu_RemoveSomeWindow();
+        RemoveContextWindow();
         if (CalculatePlayerPartyCount() == 0 && ItemId_GetType(gSpecialVar_ItemId) == ITEM_USE_PARTY_MENU)
-            BagMenu_PrintThereIsNoPokemon(taskId);
+        {
+            PrintThereIsNoPokemon(taskId);
+        }
         else
         {
-            FillWindowPixelBuffer(1, PIXEL_FILL(0));
+            FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
             ScheduleBgCopyTilemapToVram(0);
-            if (gBagPositionStruct.pocket != BERRIES_POCKET)
+            if (gBagPosition.pocket != BERRIES_POCKET)
                 ItemId_GetFieldFunc(gSpecialVar_ItemId)(taskId);
             else
                 ItemUseOutOfBattle_Berry(taskId);
@@ -1733,186 +1804,190 @@ void ItemMenu_UseOutOfBattle(u8 taskId)
     }
 }
 
-void ItemMenu_Toss(u8 taskId)
+static void ItemMenu_Toss(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    BagMenu_RemoveSomeWindow();
+    RemoveContextWindow();
     tItemCount = 1;
-    if (data[2] == 1)
+    if (tQuantity == 1)
     {
-        BagMenu_TossItems(taskId);
+        AskTossItems(taskId);
     }
     else
     {
         CopyItemName(gSpecialVar_ItemId, gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_TossHowManyVar1s);
-        FillWindowPixelBuffer(1, PIXEL_FILL(0));
-        BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
-        sub_81ABC3C(7);
+        FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
+        BagMenu_Print(WIN_DESCRIPTION, 1, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL);
+        AddItemQuantityWindow(ITEMWIN_QUANTITY);
         gTasks[taskId].func = Task_ChooseHowManyToToss;
     }
 }
 
-void BagMenu_TossItems(u8 taskId)
+static void AskTossItems(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
     CopyItemName(gSpecialVar_ItemId, gStringVar1);
     ConvertIntToDecimalStringN(gStringVar2, tItemCount, STR_CONV_MODE_LEFT_ALIGN, MAX_ITEM_DIGITS);
     StringExpandPlaceholders(gStringVar4, gText_ConfirmTossItems);
-    FillWindowPixelBuffer(1, PIXEL_FILL(0));
-    BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
-    BagMenu_YesNo(taskId, 5, &sYesNoTossFunctions);
+    FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
+    BagMenu_Print(WIN_DESCRIPTION, 1, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL);
+    BagMenu_YesNo(taskId, ITEMWIN_YESNO_LOW, &sYesNoTossFunctions);
 }
 
-void BagMenu_CancelToss(u8 taskId)
+static void CancelToss(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    BagMenu_PrintDescription(data[1]);
-    BagMenu_PrintCursor_(data[0], 0);
-    set_callback3_to_bag(taskId);
+    PrintItemDescription(tListPosition);
+    BagMenu_PrintCursor(tListTaskId, COLORID_NORMAL);
+    ReturnToItemList(taskId);
 }
 
-void Task_ChooseHowManyToToss(u8 taskId)
+static void Task_ChooseHowManyToToss(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    if (AdjustQuantityAccordingToDPadInput(&tItemCount, data[2]) == TRUE)
+    if (AdjustQuantityAccordingToDPadInput(&tItemCount, tQuantity) == TRUE)
     {
-        PrintItemDepositAmount(gBagMenu->windowPointers[7], tItemCount);
+        PrintItemQuantity(gBagMenu->windowIds[ITEMWIN_QUANTITY], tItemCount);
     }
     else if (JOY_NEW(A_BUTTON))
     {
         PlaySE(SE_SELECT);
-        BagMenu_RemoveWindow(7);
-        BagMenu_TossItems(taskId);
+        BagMenu_RemoveWindow(ITEMWIN_QUANTITY);
+        AskTossItems(taskId);
     }
     else if (JOY_NEW(B_BUTTON))
     {
         PlaySE(SE_SELECT);
-        BagMenu_RemoveWindow(7);
-        BagMenu_CancelToss(taskId);
+        BagMenu_RemoveWindow(ITEMWIN_QUANTITY);
+        CancelToss(taskId);
     }
 }
 
-void BagMenu_ConfirmToss(u8 taskId)
+static void ConfirmToss(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
     CopyItemName(gSpecialVar_ItemId, gStringVar1);
     ConvertIntToDecimalStringN(gStringVar2, tItemCount, STR_CONV_MODE_LEFT_ALIGN, MAX_ITEM_DIGITS);
     StringExpandPlaceholders(gStringVar4, gText_ThrewAwayVar2Var1s);
-    FillWindowPixelBuffer(1, PIXEL_FILL(0));
-    BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
-    gTasks[taskId].func = Task_ActuallyToss;
+    FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
+    BagMenu_Print(WIN_DESCRIPTION, 1, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL);
+    gTasks[taskId].func = Task_RemoveItemFromBag;
 }
 
-void Task_ActuallyToss(u8 taskId)
+// Remove selected item(s) from the bag and update list
+// For when items are tossed or deposited
+static void Task_RemoveItemFromBag(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket];
-    u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
+    u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+    u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
 
     if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
         PlaySE(SE_SELECT);
         RemoveBagItem(gSpecialVar_ItemId, tItemCount);
-        DestroyListMenuTask(data[0], scrollPos, cursorPos);
-        UpdatePocketItemList(gBagPositionStruct.pocket);
-        SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket);
-        LoadBagItemListBuffers(gBagPositionStruct.pocket);
-        data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
+        DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
+        UpdatePocketItemList(gBagPosition.pocket);
+        UpdatePocketListPosition(gBagPosition.pocket);
+        LoadBagItemListBuffers(gBagPosition.pocket);
+        tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
         ScheduleBgCopyTilemapToVram(0);
-        set_callback3_to_bag(taskId);
+        ReturnToItemList(taskId);
     }
 }
 
-void ItemMenu_Register(u8 taskId)
+static void ItemMenu_Register(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket];
-    u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
+    u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+    u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
 
     if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId)
         gSaveBlock1Ptr->registeredItem = 0;
     else
         gSaveBlock1Ptr->registeredItem = gSpecialVar_ItemId;
-    DestroyListMenuTask(data[0], scrollPos, cursorPos);
-    LoadBagItemListBuffers(gBagPositionStruct.pocket);
-    data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
+    DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
+    LoadBagItemListBuffers(gBagPosition.pocket);
+    tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
     ScheduleBgCopyTilemapToVram(0);
     ItemMenu_Cancel(taskId);
 }
 
-void ItemMenu_Give(u8 taskId)
+static void ItemMenu_Give(u8 taskId)
 {
-    BagMenu_RemoveSomeWindow();
+    RemoveContextWindow();
     if (!IsWritingMailAllowed(gSpecialVar_ItemId))
     {
-        DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350);
+        DisplayItemMessage(taskId, 1, gText_CantWriteMail, HandleErrorMessage);
     }
     else if (!ItemId_GetImportance(gSpecialVar_ItemId))
     {
         if (CalculatePlayerPartyCount() == 0)
-            BagMenu_PrintThereIsNoPokemon(taskId);
+        {
+            PrintThereIsNoPokemon(taskId);
+        }
         else
         {
-            gBagMenu->exitCallback = CB2_ChooseMonToGiveItem;
+            gBagMenu->newScreenCallback = CB2_ChooseMonToGiveItem;
             Task_FadeAndCloseBagMenu(taskId);
         }
     }
     else
     {
-        BagMenu_PrintItemCantBeHeld(taskId);
+        PrintItemCantBeHeld(taskId);
     }
 }
 
-void BagMenu_PrintThereIsNoPokemon(u8 taskId)
+static void PrintThereIsNoPokemon(u8 taskId)
 {
-    DisplayItemMessage(taskId, 1, gText_NoPokemon, sub_81AD350);
+    DisplayItemMessage(taskId, 1, gText_NoPokemon, HandleErrorMessage);
 }
 
-static void BagMenu_PrintItemCantBeHeld(u8 taskId)
+static void PrintItemCantBeHeld(u8 taskId)
 {
     CopyItemName(gSpecialVar_ItemId, gStringVar1);
     StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeld);
-    DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD350);
+    DisplayItemMessage(taskId, 1, gStringVar4, HandleErrorMessage);
 }
 
-void sub_81AD350(u8 taskId)
+static void HandleErrorMessage(u8 taskId)
 {
     if (JOY_NEW(A_BUTTON))
     {
         PlaySE(SE_SELECT);
-        BagMenu_InitListsMenu(taskId);
+        CloseItemMessage(taskId);
     }
 }
 
-void ItemMenu_CheckTag(u8 taskId)
+static void ItemMenu_CheckTag(u8 taskId)
 {
-    gBagMenu->exitCallback = DoBerryTagScreen;
+    gBagMenu->newScreenCallback = DoBerryTagScreen;
     Task_FadeAndCloseBagMenu(taskId);
 }
 
-void ItemMenu_Cancel(u8 taskId)
+static void ItemMenu_Cancel(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    BagMenu_RemoveSomeWindow();
-    BagMenu_PrintDescription(data[1]);
+    RemoveContextWindow();
+    PrintItemDescription(tListPosition);
     ScheduleBgCopyTilemapToVram(0);
     ScheduleBgCopyTilemapToVram(1);
-    BagMenu_PrintCursor_(data[0], 0);
-    set_callback3_to_bag(taskId);
+    BagMenu_PrintCursor(tListTaskId, COLORID_NORMAL);
+    ReturnToItemList(taskId);
 }
 
-void ItemMenu_UseInBattle(u8 taskId)
+static void ItemMenu_UseInBattle(u8 taskId)
 {
     if (ItemId_GetBattleFunc(gSpecialVar_ItemId))
     {
-        BagMenu_RemoveSomeWindow();
+        RemoveContextWindow();
         ItemId_GetBattleFunc(gSpecialVar_ItemId)(taskId);
     }
 }
@@ -1922,39 +1997,40 @@ void CB2_ReturnToBagMenuPocket(void)
     GoToBagMenu(ITEMMENULOCATION_LAST, POCKETS_COUNT, NULL);
 }
 
-void Task_ItemContext_FieldGive(u8 taskId)
+static void Task_ItemContext_GiveToParty(u8 taskId)
 {
     if (!IsWritingMailAllowed(gSpecialVar_ItemId))
     {
-        DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350);
+        DisplayItemMessage(taskId, 1, gText_CantWriteMail, HandleErrorMessage);
     }
-    else if (!sub_8122148(gSpecialVar_ItemId))
+    else if (!IsHoldingItemAllowed(gSpecialVar_ItemId))
     {
         CopyItemName(gSpecialVar_ItemId, gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeldHere);
-        DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD350);
+        DisplayItemMessage(taskId, 1, gStringVar4, HandleErrorMessage);
     }
-    else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId))
+    else if (gBagPosition.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId))
     {
         Task_FadeAndCloseBagMenu(taskId);
     }
     else
     {
-        BagMenu_PrintItemCantBeHeld(taskId);
+        PrintItemCantBeHeld(taskId);
     }
 }
 
-void Task_ItemContext_ItemPC_2(u8 taskId)
+// Selected item to give to a Pokémon in PC storage
+static void Task_ItemContext_GiveToPC(u8 taskId)
 {
     if (ItemIsMail(gSpecialVar_ItemId) == TRUE)
-        DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350);
-    else if (gBagPositionStruct.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId))
+        DisplayItemMessage(taskId, 1, gText_CantWriteMail, HandleErrorMessage);
+    else if (gBagPosition.pocket != KEYITEMS_POCKET && !ItemId_GetImportance(gSpecialVar_ItemId))
         gTasks[taskId].func = Task_FadeAndCloseBagMenu;
     else
-        BagMenu_PrintItemCantBeHeld(taskId);
+        PrintItemCantBeHeld(taskId);
 }
 
-#define tUsingRegisteredKeyItem data[3]
+#define tUsingRegisteredKeyItem data[3] // See usage in item_use.c
 
 bool8 UseRegisteredKeyItemOnField(void)
 {
@@ -1988,7 +2064,7 @@ bool8 UseRegisteredKeyItemOnField(void)
 
 #undef tUsingRegisteredKeyItem
 
-void Task_ItemContext_Sell(u8 taskId)
+static void Task_ItemContext_Sell(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
@@ -1996,12 +2072,12 @@ void Task_ItemContext_Sell(u8 taskId)
     {
         CopyItemName(gSpecialVar_ItemId, gStringVar2);
         StringExpandPlaceholders(gStringVar4, gText_CantBuyKeyItem);
-        DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu);
+        DisplayItemMessage(taskId, 1, gStringVar4, CloseItemMessage);
     }
     else
     {
         tItemCount = 1;
-        if (data[2] == 1)
+        if (tQuantity == 1)
         {
             DisplayCurrentMoneyWindow();
             DisplaySellItemPriceAndConfirm(taskId);
@@ -2010,7 +2086,7 @@ void Task_ItemContext_Sell(u8 taskId)
         {
             CopyItemName(gSpecialVar_ItemId, gStringVar2);
             StringExpandPlaceholders(gStringVar4, gText_HowManyToSell);
-            DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD730);
+            DisplayItemMessage(taskId, 1, gStringVar4, InitSellHowManyInput);
         }
     }
 }
@@ -2021,114 +2097,114 @@ static void DisplaySellItemPriceAndConfirm(u8 taskId)
 
     ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6);
     StringExpandPlaceholders(gStringVar4, gText_ICanPayVar1);
-    DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD6E4);
+    DisplayItemMessage(taskId, 1, gStringVar4, AskSellItems);
 }
 
-void sub_81AD6E4(u8 taskId)
+static void AskSellItems(u8 taskId)
 {
-    BagMenu_YesNo(taskId, 6, &sYesNoSellItemFunctions);
+    BagMenu_YesNo(taskId, ITEMWIN_YESNO_HIGH, &sYesNoSellItemFunctions);
 }
 
-void BagMenu_CancelSell(u8 taskId)
+static void CancelSell(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
     RemoveMoneyWindow();
-    BagMenu_RemoveBagItemMessageWindow(4);
-    BagMenu_PrintCursor_(data[0], 0);
-    set_callback3_to_bag(taskId);
+    RemoveItemMessageWindow(ITEMWIN_MESSAGE);
+    BagMenu_PrintCursor(tListTaskId, COLORID_NORMAL);
+    ReturnToItemList(taskId);
 }
 
-void sub_81AD730(u8 taskId)
+static void InitSellHowManyInput(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    u8 windowId = BagMenu_AddWindow(8);
+    u8 windowId = BagMenu_AddWindow(ITEMWIN_QUANTITY_WIDE);
 
     PrintItemSoldAmount(windowId, 1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount);
     DisplayCurrentMoneyWindow();
-    gTasks[taskId].func = Task_SellHowManyDialogueHandleInput;
+    gTasks[taskId].func = Task_ChooseHowManyToSell;
 }
 
-static void Task_SellHowManyDialogueHandleInput(u8 taskId)
+static void Task_ChooseHowManyToSell(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    if (AdjustQuantityAccordingToDPadInput(&tItemCount, data[2]) == TRUE)
+    if (AdjustQuantityAccordingToDPadInput(&tItemCount, tQuantity) == TRUE)
     {
-        PrintItemSoldAmount(gBagMenu->windowPointers[8], tItemCount, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount);
+        PrintItemSoldAmount(gBagMenu->windowIds[ITEMWIN_QUANTITY_WIDE], tItemCount, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount);
     }
     else if (JOY_NEW(A_BUTTON))
     {
         PlaySE(SE_SELECT);
-        BagMenu_RemoveWindow(8);
+        BagMenu_RemoveWindow(ITEMWIN_QUANTITY_WIDE);
         DisplaySellItemPriceAndConfirm(taskId);
     }
     else if (JOY_NEW(B_BUTTON))
     {
         PlaySE(SE_SELECT);
-        BagMenu_PrintCursor_(data[0], 0);
+        BagMenu_PrintCursor(tListTaskId, COLORID_NORMAL);
         RemoveMoneyWindow();
-        BagMenu_RemoveWindow(8);
-        BagMenu_RemoveBagItemMessageWindow(4);
-        set_callback3_to_bag(taskId);
+        BagMenu_RemoveWindow(ITEMWIN_QUANTITY_WIDE);
+        RemoveItemMessageWindow(ITEMWIN_MESSAGE);
+        ReturnToItemList(taskId);
     }
 }
 
-void BagMenu_ConfirmSell(u8 taskId)
+static void ConfirmSell(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
     CopyItemName(gSpecialVar_ItemId, gStringVar2);
     ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount, STR_CONV_MODE_LEFT_ALIGN, 6);
     StringExpandPlaceholders(gStringVar4, gText_TurnedOverVar1ForVar2);
-    DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_Sell_UpdateItemListAndMoney);
+    DisplayItemMessage(taskId, 1, gStringVar4, SellItem);
 }
 
-static void BagMenu_Sell_UpdateItemListAndMoney(u8 taskId)
+static void SellItem(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
-    u16* scrollPos = &gBagPositionStruct.scrollPosition[gBagPositionStruct.pocket];
-    u16* cursorPos = &gBagPositionStruct.cursorPosition[gBagPositionStruct.pocket];
+    u16* scrollPos = &gBagPosition.scrollPosition[gBagPosition.pocket];
+    u16* cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
 
     PlaySE(SE_SHOP);
     RemoveBagItem(gSpecialVar_ItemId, tItemCount);
     AddMoney(&gSaveBlock1Ptr->money, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * tItemCount);
-    DestroyListMenuTask(data[0], scrollPos, cursorPos);
-    UpdatePocketItemList(gBagPositionStruct.pocket);
-    SetInitialScrollAndCursorPositions(gBagPositionStruct.pocket);
-    LoadBagItemListBuffers(gBagPositionStruct.pocket);
-    data[0] = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
-    BagMenu_PrintCursor_(data[0], 2);
-    PrintMoneyAmountInMoneyBox(gBagMenu->windowPointers[9], GetMoney(&gSaveBlock1Ptr->money), 0);
-    gTasks[taskId].func = BagMenu_Sell_WaitForABPress;
+    DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);
+    UpdatePocketItemList(gBagPosition.pocket);
+    UpdatePocketListPosition(gBagPosition.pocket);
+    LoadBagItemListBuffers(gBagPosition.pocket);
+    tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, *scrollPos, *cursorPos);
+    BagMenu_PrintCursor(tListTaskId, COLORID_GRAY_CURSOR);
+    PrintMoneyAmountInMoneyBox(gBagMenu->windowIds[ITEMWIN_MONEY], GetMoney(&gSaveBlock1Ptr->money), 0);
+    gTasks[taskId].func = WaitAfterItemSell;
 }
 
-static void BagMenu_Sell_WaitForABPress(u8 taskId)
+static void WaitAfterItemSell(u8 taskId)
 {
     if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
         PlaySE(SE_SELECT);
         RemoveMoneyWindow();
-        BagMenu_InitListsMenu(taskId);
+        CloseItemMessage(taskId);
     }
 }
 
-void Task_ItemContext_Deposit(u8 taskId)
+static void Task_ItemContext_Deposit(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
     tItemCount = 1;
-    if (data[2] == 1)
+    if (tQuantity == 1)
     {
-        BagMenu_TryDepositItem(taskId);
+        TryDepositItem(taskId);
     }
     else
     {
         CopyItemName(gSpecialVar_ItemId, gStringVar1);
         StringExpandPlaceholders(gStringVar4, gText_DepositHowManyVar1);
-        FillWindowPixelBuffer(1, PIXEL_FILL(0));
-        BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
-        sub_81ABC3C(7);
+        FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
+        BagMenu_Print(WIN_DESCRIPTION, 1, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL);
+        AddItemQuantityWindow(ITEMWIN_QUANTITY);
         gTasks[taskId].func = Task_ChooseHowManyToDeposit;
     }
 }
@@ -2137,100 +2213,103 @@ static void Task_ChooseHowManyToDeposit(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    if (AdjustQuantityAccordingToDPadInput(&tItemCount, data[2]) == TRUE)
+    if (AdjustQuantityAccordingToDPadInput(&tItemCount, tQuantity) == TRUE)
     {
-        PrintItemDepositAmount(gBagMenu->windowPointers[7], tItemCount);
+        PrintItemQuantity(gBagMenu->windowIds[ITEMWIN_QUANTITY], tItemCount);
     }
     else if (JOY_NEW(A_BUTTON))
     {
         PlaySE(SE_SELECT);
-        BagMenu_RemoveWindow(7);
-        BagMenu_TryDepositItem(taskId);
+        BagMenu_RemoveWindow(ITEMWIN_QUANTITY);
+        TryDepositItem(taskId);
     }
     else if (JOY_NEW(B_BUTTON))
     {
         PlaySE(SE_SELECT);
-        BagMenu_PrintDescription(data[1]);
-        BagMenu_PrintCursor_(data[0], 0);
-        BagMenu_RemoveWindow(7);
-        set_callback3_to_bag(taskId);
+        PrintItemDescription(tListPosition);
+        BagMenu_PrintCursor(tListTaskId, COLORID_NORMAL);
+        BagMenu_RemoveWindow(ITEMWIN_QUANTITY);
+        ReturnToItemList(taskId);
     }
 }
 
-static void BagMenu_TryDepositItem(u8 taskId)
+static void TryDepositItem(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    FillWindowPixelBuffer(1, PIXEL_FILL(0));
+    FillWindowPixelBuffer(WIN_DESCRIPTION, PIXEL_FILL(0));
     if (ItemId_GetImportance(gSpecialVar_ItemId))
     {
-        BagMenu_Print(1, 1, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, 0);
-        gTasks[taskId].func = BagMenu_Deposit_WaitForABPress;
+        // Can't deposit important items
+        BagMenu_Print(WIN_DESCRIPTION, 1, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, COLORID_NORMAL);
+        gTasks[taskId].func = WaitDepositErrorMessage;
     }
     else if (AddPCItem(gSpecialVar_ItemId, tItemCount) == TRUE)
     {
+        // Successfully deposited
         CopyItemName(gSpecialVar_ItemId, gStringVar1);
         ConvertIntToDecimalStringN(gStringVar2, tItemCount, STR_CONV_MODE_LEFT_ALIGN, MAX_ITEM_DIGITS);
         StringExpandPlaceholders(gStringVar4, gText_DepositedVar2Var1s);
-        BagMenu_Print(1, 1, gStringVar4, 3, 1, 0, 0, 0, 0);
-        gTasks[taskId].func = Task_ActuallyToss;
+        BagMenu_Print(WIN_DESCRIPTION, 1, gStringVar4, 3, 1, 0, 0, 0, COLORID_NORMAL);
+        gTasks[taskId].func = Task_RemoveItemFromBag;
     }
     else
     {
-        BagMenu_Print(1, 1, gText_NoRoomForItems, 3, 1, 0, 0, 0, 0);
-        gTasks[taskId].func = BagMenu_Deposit_WaitForABPress;
+        // No room to deposit
+        BagMenu_Print(WIN_DESCRIPTION, 1, gText_NoRoomForItems, 3, 1, 0, 0, 0, COLORID_NORMAL);
+        gTasks[taskId].func = WaitDepositErrorMessage;
     }
 }
 
-static void BagMenu_Deposit_WaitForABPress(u8 taskId)
+static void WaitDepositErrorMessage(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
     if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
         PlaySE(SE_SELECT);
-        BagMenu_PrintDescription(data[1]);
-        BagMenu_PrintCursor_(data[0], 0);
-        set_callback3_to_bag(taskId);
+        PrintItemDescription(tListPosition);
+        BagMenu_PrintCursor(tListTaskId, COLORID_NORMAL);
+        ReturnToItemList(taskId);
     }
 }
 
-bool8 IsWallysBag(void)
+static bool8 IsWallysBag(void)
 {
-    if (gBagPositionStruct.location == 10)
+    if (gBagPosition.location == ITEMMENULOCATION_WALLY)
         return TRUE;
     return FALSE;
 }
 
-void PrepareBagForWallyTutorial(void)
+static void PrepareBagForWallyTutorial(void)
 {
     u32 i;
 
-    sTempWallyBag = AllocZeroed(sizeof(struct TempWallyStruct));
+    sTempWallyBag = AllocZeroed(sizeof(*sTempWallyBag));
     memcpy(sTempWallyBag->bagPocket_Items, gSaveBlock1Ptr->bagPocket_Items, sizeof(gSaveBlock1Ptr->bagPocket_Items));
     memcpy(sTempWallyBag->bagPocket_PokeBalls, gSaveBlock1Ptr->bagPocket_PokeBalls, sizeof(gSaveBlock1Ptr->bagPocket_PokeBalls));
-    sTempWallyBag->pocket = gBagPositionStruct.pocket;
-    for (i = 0; i <= 4; i++)
+    sTempWallyBag->pocket = gBagPosition.pocket;
+    for (i = 0; i < POCKETS_COUNT; i++)
     {
-        sTempWallyBag->cursorPosition[i] = gBagPositionStruct.cursorPosition[i];
-        sTempWallyBag->scrollPosition[i] = gBagPositionStruct.scrollPosition[i];
+        sTempWallyBag->cursorPosition[i] = gBagPosition.cursorPosition[i];
+        sTempWallyBag->scrollPosition[i] = gBagPosition.scrollPosition[i];
     }
     ClearItemSlots(gSaveBlock1Ptr->bagPocket_Items, BAG_ITEMS_COUNT);
     ClearItemSlots(gSaveBlock1Ptr->bagPocket_PokeBalls, BAG_POKEBALLS_COUNT);
     ResetBagScrollPositions();
 }
 
-void RestoreBagAfterWallyTutorial(void)
+static void RestoreBagAfterWallyTutorial(void)
 {
     u32 i;
 
     memcpy(gSaveBlock1Ptr->bagPocket_Items, sTempWallyBag->bagPocket_Items, sizeof(sTempWallyBag->bagPocket_Items));
     memcpy(gSaveBlock1Ptr->bagPocket_PokeBalls, sTempWallyBag->bagPocket_PokeBalls, sizeof(sTempWallyBag->bagPocket_PokeBalls));
-    gBagPositionStruct.pocket = sTempWallyBag->pocket;
-    for (i = 0; i <= 4; i++)
+    gBagPosition.pocket = sTempWallyBag->pocket;
+    for (i = 0; i < POCKETS_COUNT; i++)
     {
-        gBagPositionStruct.cursorPosition[i] = sTempWallyBag->cursorPosition[i];
-        gBagPositionStruct.scrollPosition[i] = sTempWallyBag->scrollPosition[i];
+        gBagPosition.cursorPosition[i] = sTempWallyBag->cursorPosition[i];
+        gBagPosition.scrollPosition[i] = sTempWallyBag->scrollPosition[i];
     }
     Free(sTempWallyBag);
 }
@@ -2243,86 +2322,93 @@ void DoWallyTutorialBagMenu(void)
     GoToBagMenu(ITEMMENULOCATION_WALLY, ITEMS_POCKET, CB2_SetUpReshowBattleScreenAfterMenu2);
 }
 
-void Task_WallyTutorialBagMenu(u8 taskId)
+#define tTimer data[8]
+#define WALLY_BAG_DELAY 102 // The number of frames between each action Wally takes in the bag
+
+static void Task_WallyTutorialBagMenu(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
     if (!gPaletteFade.active)
     {
-        switch (data[8])
+        switch (tTimer)
         {
-            case 0x66:
-                PlaySE(SE_SELECT);
-                SwitchBagPocket(taskId, MENU_CURSOR_DELTA_RIGHT, 0);
-                data[8]++;
-                break;
-            case 0xCC:
-                PlaySE(SE_SELECT);
-                BagMenu_PrintCursor_(data[0], 2);
-                gSpecialVar_ItemId = ITEM_POKE_BALL;
-                OpenContextMenu(taskId);
-                data[8]++;
-                break;
-            case 0x132:
-                PlaySE(SE_SELECT);
-                BagMenu_RemoveSomeWindow();
-                DestroyListMenuTask(data[0], 0, 0);
-                RestoreBagAfterWallyTutorial();
-                Task_FadeAndCloseBagMenu(taskId);
-                break;
-            default:
-                data[8]++;
-                break;
+        case WALLY_BAG_DELAY * 1:
+            PlaySE(SE_SELECT);
+            SwitchBagPocket(taskId, MENU_CURSOR_DELTA_RIGHT, FALSE);
+            tTimer++;
+            break;
+        case WALLY_BAG_DELAY * 2:
+            PlaySE(SE_SELECT);
+            BagMenu_PrintCursor(tListTaskId, COLORID_GRAY_CURSOR);
+            gSpecialVar_ItemId = ITEM_POKE_BALL;
+            OpenContextMenu(taskId);
+            tTimer++;
+            break;
+        case WALLY_BAG_DELAY * 3:
+            PlaySE(SE_SELECT);
+            RemoveContextWindow();
+            DestroyListMenuTask(tListTaskId, 0, 0);
+            RestoreBagAfterWallyTutorial();
+            Task_FadeAndCloseBagMenu(taskId);
+            break;
+        default:
+            tTimer++;
+            break;
         }
     }
 }
 
-#undef tItemCount
+#undef tTimer
 
-void unknown_ItemMenu_Show(u8 taskId)
+// This action is used to show the Apprentice an item when
+// they ask what item they should make their Pokémon hold
+static void ItemMenu_Show(u8 taskId)
 {
     gSpecialVar_0x8005 = gSpecialVar_ItemId;
-    gSpecialVar_Result = 1;
-    BagMenu_RemoveSomeWindow();
+    gSpecialVar_Result = TRUE;
+    RemoveContextWindow();
     Task_FadeAndCloseBagMenu(taskId);
 }
 
-void CB2_ApprenticeExitBagMenu(void)
+static void CB2_ApprenticeExitBagMenu(void)
 {
     gFieldCallback = Apprentice_EnableBothScriptContexts;
     SetMainCallback2(CB2_ReturnToField);
 }
 
-void unknown_ItemMenu_Give2(u8 taskId)
+static void ItemMenu_GiveFavorLady(u8 taskId)
 {
     RemoveBagItem(gSpecialVar_ItemId, 1);
-    gSpecialVar_Result = 1;
-    BagMenu_RemoveSomeWindow();
+    gSpecialVar_Result = TRUE;
+    RemoveContextWindow();
     Task_FadeAndCloseBagMenu(taskId);
 }
 
-void CB2_FavorLadyExitBagMenu(void)
+static void CB2_FavorLadyExitBagMenu(void)
 {
     gFieldCallback = FieldCallback_FavorLadyEnableScriptContexts;
     SetMainCallback2(CB2_ReturnToField);
 }
 
-void unknown_ItemMenu_Confirm2(u8 taskId)
+// This action is used to confirm which item to use as
+// a prize for a custom quiz with the Lilycove Quiz Lady
+static void ItemMenu_ConfirmQuizLady(u8 taskId)
 {
-    gSpecialVar_Result = 1;
-    BagMenu_RemoveSomeWindow();
+    gSpecialVar_Result = TRUE;
+    RemoveContextWindow();
     Task_FadeAndCloseBagMenu(taskId);
 }
 
-void CB2_QuizLadyExitBagMenu(void)
+static void CB2_QuizLadyExitBagMenu(void)
 {
     gFieldCallback = FieldCallback_QuizLadyEnableScriptContexts;
     SetMainCallback2(CB2_ReturnToField);
 }
 
-void BagMenu_PrintPocketNames(const u8 *pocketName1, const u8 *pocketName2)
+static void PrintPocketNames(const u8 *pocketName1, const u8 *pocketName2)
 {
-    struct WindowTemplate window = {0, 0, 0, 0, 0, 0, 0};
+    struct WindowTemplate window = {0};
     u16 windowId;
     int offset;
 
@@ -2331,32 +2417,32 @@ void BagMenu_PrintPocketNames(const u8 *pocketName1, const u8 *pocketName2)
     windowId = AddWindow(&window);
     FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
     offset = GetStringCenterAlignXOffset(1, pocketName1, 0x40);
-    BagMenu_Print(windowId, 1, pocketName1, offset, 1, 0, 0, -1, 1);
+    BagMenu_Print(windowId, 1, pocketName1, offset, 1, 0, 0, TEXT_SPEED_FF, COLORID_POCKET_NAME);
     if (pocketName2)
     {
         offset = GetStringCenterAlignXOffset(1, pocketName2, 0x40);
-        BagMenu_Print(windowId, 1, pocketName2, offset + 0x40, 1, 0, 0, -1, 1);
+        BagMenu_Print(windowId, 1, pocketName2, offset + 0x40, 1, 0, 0, TEXT_SPEED_FF, COLORID_POCKET_NAME);
     }
-    CpuCopy32((u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gBagMenu->pocketNameBuffer, 0x400);
+    CpuCopy32((u8*)GetWindowAttribute(windowId, WINDOW_TILE_DATA), gBagMenu->pocketNameBuffer, sizeof(gBagMenu->pocketNameBuffer));
     RemoveWindow(windowId);
 }
 
-void BagMenu_CopyPocketNameToWindow(u32 a)
+static void CopyPocketNameToWindow(u32 a)
 {
-    u8 (* r4)[32][32];
-    u8* windowAttribute;
+    u8 (* tileDataBuffer)[32][32];
+    u8* windowTileData;
     int b;
     if (a > 8)
         a = 8;
-    r4 = &gBagMenu->pocketNameBuffer;
-    windowAttribute = (u8*)GetWindowAttribute(2, WINDOW_TILE_DATA);
-    CpuCopy32(r4[0][a], windowAttribute, 0x100);
+    tileDataBuffer = &gBagMenu->pocketNameBuffer;
+    windowTileData = (u8*)GetWindowAttribute(2, WINDOW_TILE_DATA);
+    CpuCopy32(tileDataBuffer[0][a], windowTileData, 0x100); // Top half of pocket name
     b = a + 16;
-    CpuCopy32(r4[0][b], windowAttribute + 0x100, 0x100);
-    CopyWindowToVram(2, 2);
+    CpuCopy32(tileDataBuffer[0][b], windowTileData + 0x100, 0x100); // Bottom half of pocket name
+    CopyWindowToVram(WIN_POCKET_NAME, 2);
 }
 
-void SetupBagMenu_Textboxes(void)
+static void LoadBagMenuTextWindows(void)
 {
     u8 i;
 
@@ -2366,7 +2452,7 @@ void SetupBagMenu_Textboxes(void)
     LoadMessageBoxGfx(0, 10, 0xD0);
     ListMenuLoadStdPalAt(0xC0, 1);
     LoadPalette(&gUnknown_0860F074, 0xF0, 0x20);
-    for (i = 0; i < 3; i++)
+    for (i = 0; i <= WIN_POCKET_NAME; i++)
     {
         FillWindowPixelBuffer(i, PIXEL_FILL(0));
         PutWindowTilemap(i);
@@ -2375,109 +2461,111 @@ void SetupBagMenu_Textboxes(void)
     ScheduleBgCopyTilemapToVram(1);
 }
 
-void BagMenu_Print(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIndex)
+static void BagMenu_Print(u8 windowId, u8 fontId, const u8 *str, u8 left, u8 top, u8 letterSpacing, u8 lineSpacing, u8 speed, u8 colorIndex)
 {
     AddTextPrinterParameterized4(windowId, fontId, left, top, letterSpacing, lineSpacing, sFontColorTable[colorIndex], speed, str);
 }
 
-//Unused
-u8 sub_81AE124(u8 which)
+// Unused
+static u8 BagMenu_GetWindowId(u8 windowType)
 {
-    return gBagMenu->windowPointers[which];
+    return gBagMenu->windowIds[windowType];
 }
 
-u8 BagMenu_AddWindow(u8 which)
+static u8 BagMenu_AddWindow(u8 windowType)
 {
-    u8 *ptr = &gBagMenu->windowPointers[which];
-    if (*ptr == WINDOW_NONE)
+    u8 *windowId = &gBagMenu->windowIds[windowType];
+    if (*windowId == WINDOW_NONE)
     {
-        *ptr = AddWindow(&sContextMenuWindowTemplates[which]);
-        DrawStdFrameWithCustomTileAndPalette(*ptr, 0, 1, 14);
+        *windowId = AddWindow(&sContextMenuWindowTemplates[windowType]);
+        DrawStdFrameWithCustomTileAndPalette(*windowId, 0, 1, 14);
         ScheduleBgCopyTilemapToVram(1);
     }
-    return *ptr;
+    return *windowId;
 }
 
-void BagMenu_RemoveWindow(u8 which)
+static void BagMenu_RemoveWindow(u8 windowType)
 {
-    u8 *ptr = &gBagMenu->windowPointers[which];
-    if (*ptr != WINDOW_NONE)
+    u8 *windowId = &gBagMenu->windowIds[windowType];
+    if (*windowId != WINDOW_NONE)
     {
-        ClearStdWindowAndFrameToTransparent(*ptr, FALSE);
-        ClearWindowTilemap(*ptr);
-        RemoveWindow(*ptr);
+        ClearStdWindowAndFrameToTransparent(*windowId, FALSE);
+        ClearWindowTilemap(*windowId);
+        RemoveWindow(*windowId);
         ScheduleBgCopyTilemapToVram(1);
-        *ptr = WINDOW_NONE;
+        *windowId = WINDOW_NONE;
     }
 }
 
-u8 AddItemMessageWindow(u8 which)
+static u8 AddItemMessageWindow(u8 windowType)
 {
-    u8 *ptr = &gBagMenu->windowPointers[which];
-    if (*ptr == WINDOW_NONE)
-        *ptr = AddWindow(&sContextMenuWindowTemplates[which]);
-    return *ptr;
+    u8 *windowId = &gBagMenu->windowIds[windowType];
+    if (*windowId == WINDOW_NONE)
+        *windowId = AddWindow(&sContextMenuWindowTemplates[windowType]);
+    return *windowId;
 }
 
-void BagMenu_RemoveBagItemMessageWindow(u8 which)
+static void RemoveItemMessageWindow(u8 windowType)
 {
-    u8 *ptr = &gBagMenu->windowPointers[which];
-    if (*ptr != WINDOW_NONE)
+    u8 *windowId = &gBagMenu->windowIds[windowType];
+    if (*windowId != WINDOW_NONE)
     {
-        ClearDialogWindowAndFrameToTransparent(*ptr, FALSE);
+        ClearDialogWindowAndFrameToTransparent(*windowId, FALSE);
         // This ClearWindowTilemap call is redundant, since ClearDialogWindowAndFrameToTransparent already calls it.
-        ClearWindowTilemap(*ptr);
-        RemoveWindow(*ptr);
+        ClearWindowTilemap(*windowId);
+        RemoveWindow(*windowId);
         ScheduleBgCopyTilemapToVram(1);
-        *ptr = WINDOW_NONE;
+        *windowId = WINDOW_NONE;
     }
 }
 
-void BagMenu_YesNo(u8 a, u8 b, const struct YesNoFuncTable *funcTable)
+void BagMenu_YesNo(u8 taskId, u8 windowType, const struct YesNoFuncTable *funcTable)
 {
-    CreateYesNoMenuWithCallbacks(a, &sContextMenuWindowTemplates[b], 1, 0, 2, 1, 14, funcTable);
+    CreateYesNoMenuWithCallbacks(taskId, &sContextMenuWindowTemplates[windowType], 1, 0, 2, 1, 14, funcTable);
 }
 
 static void DisplayCurrentMoneyWindow(void)
 {
-    u8 windowId = BagMenu_AddWindow(9);
+    u8 windowId = BagMenu_AddWindow(ITEMWIN_MONEY);
     PrintMoneyAmountInMoneyBoxWithBorder(windowId, 1, 14, GetMoney(&gSaveBlock1Ptr->money));
     AddMoneyLabelObject(19, 11);
 }
 
 static void RemoveMoneyWindow(void)
 {
-    BagMenu_RemoveWindow(9);
+    BagMenu_RemoveWindow(ITEMWIN_MONEY);
     RemoveMoneyLabelObject();
 }
 
-void BagMenu_PrepareTMHMMoveWindow(void)
+static void PrepareTMHMMoveWindow(void)
 {
-    FillWindowPixelBuffer(3, PIXEL_FILL(0));
-    BlitMenuInfoIcon(3, MENU_INFO_ICON_TYPE, 0, 0);
-    BlitMenuInfoIcon(3, MENU_INFO_ICON_POWER, 0, 12);
-    BlitMenuInfoIcon(3, MENU_INFO_ICON_ACCURACY, 0, 24);
-    BlitMenuInfoIcon(3, MENU_INFO_ICON_PP, 0, 36);
-    CopyWindowToVram(3, 2);
+    FillWindowPixelBuffer(WIN_TMHM_INFO_ICONS, PIXEL_FILL(0));
+    BlitMenuInfoIcon(WIN_TMHM_INFO_ICONS, MENU_INFO_ICON_TYPE, 0, 0);
+    BlitMenuInfoIcon(WIN_TMHM_INFO_ICONS, MENU_INFO_ICON_POWER, 0, 12);
+    BlitMenuInfoIcon(WIN_TMHM_INFO_ICONS, MENU_INFO_ICON_ACCURACY, 0, 24);
+    BlitMenuInfoIcon(WIN_TMHM_INFO_ICONS, MENU_INFO_ICON_PP, 0, 36);
+    CopyWindowToVram(WIN_TMHM_INFO_ICONS, 2);
 }
 
-void PrintTMHMMoveData(u16 itemId)
+static void PrintTMHMMoveData(u16 itemId)
 {
     u8 i;
     u16 moveId;
     const u8* text;
 
-    FillWindowPixelBuffer(4, PIXEL_FILL(0));
+    FillWindowPixelBuffer(WIN_TMHM_INFO, PIXEL_FILL(0));
     if (itemId == ITEM_NONE)
     {
         for (i = 0; i < 4; i++)
-            BagMenu_Print(4, 1, gText_ThreeDashes, 7, i * 12, 0, 0, -1, 4);
-        CopyWindowToVram(4, 2);
+            BagMenu_Print(WIN_TMHM_INFO, 1, gText_ThreeDashes, 7, i * 12, 0, 0, TEXT_SPEED_FF, COLORID_TMHM_INFO);
+        CopyWindowToVram(WIN_TMHM_INFO, 2);
     }
     else
     {
         moveId = ItemIdToBattleMoveId(itemId);
-        BlitMenuInfoIcon(4, gBattleMoves[moveId].type + 1, 0, 0);
+        BlitMenuInfoIcon(WIN_TMHM_INFO, gBattleMoves[moveId].type + 1, 0, 0);
+
+        // Print TMHM power
         if (gBattleMoves[moveId].power <= 1)
         {
             text = gText_ThreeDashes;
@@ -2487,7 +2575,9 @@ void PrintTMHMMoveData(u16 itemId)
             ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].power, STR_CONV_MODE_RIGHT_ALIGN, 3);
             text = gStringVar1;
         }
-        BagMenu_Print(4, 1, text, 7, 12, 0, 0, -1, 4);
+        BagMenu_Print(WIN_TMHM_INFO, 1, text, 7, 12, 0, 0, TEXT_SPEED_FF, COLORID_TMHM_INFO);
+
+        // Print TMHM accuracy
         if (gBattleMoves[moveId].accuracy == 0)
         {
             text = gText_ThreeDashes;
@@ -2497,9 +2587,12 @@ void PrintTMHMMoveData(u16 itemId)
             ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].accuracy, STR_CONV_MODE_RIGHT_ALIGN, 3);
             text = gStringVar1;
         }
-        BagMenu_Print(4, 1, text, 7, 24, 0, 0, -1, 4);
+        BagMenu_Print(WIN_TMHM_INFO, 1, text, 7, 24, 0, 0, TEXT_SPEED_FF, COLORID_TMHM_INFO);
+
+        // Print TMHM pp
         ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[moveId].pp, STR_CONV_MODE_RIGHT_ALIGN, 3);
-        BagMenu_Print(4, 1, gStringVar1, 7, 36, 0, 0, -1, 4);
-        CopyWindowToVram(4, 2);
+        BagMenu_Print(WIN_TMHM_INFO, 1, gStringVar1, 7, 36, 0, 0, TEXT_SPEED_FF, COLORID_TMHM_INFO);
+
+        CopyWindowToVram(WIN_TMHM_INFO, 2);
     }
 }
diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c
index c728a720f..60de132b0 100644
--- a/src/item_menu_icons.c
+++ b/src/item_menu_icons.c
@@ -11,6 +11,15 @@
 #include "window.h"
 #include "constants/items.h"
 
+enum {
+    TAG_BAG_GFX = 100,
+    TAG_ROTATING_BALL_GFX,
+    TAG_ITEM_ICON,
+    TAG_ITEM_ICON_ALT,
+};
+#define TAG_BERRY_CHECK_CIRCLE_GFX 10000
+#define TAG_BERRY_PIC_PAL 30020
+
 struct CompressedTilesPal
 {
     const u32 *tiles;
@@ -128,7 +137,7 @@ const struct CompressedSpritePalette gBagPaletteTable =
     gBagPalette, TAG_BAG_GFX
 };
 
-static const struct SpriteTemplate gBagSpriteTemplate =
+static const struct SpriteTemplate sBagSpriteTemplate =
 {
     .tileTag = TAG_BAG_GFX,
     .paletteTag = TAG_BAG_GFX,
@@ -189,17 +198,17 @@ static const union AffineAnimCmd *const sRotatingBallAnimCmds_FullRotation[] =
     sSpriteAffineAnim_RotatingBallRotation2,
 };
 
-static const struct SpriteSheet gRotatingBallTable =
+static const struct SpriteSheet sRotatingBallTable =
 {
     gRotatingBall, 0x80, TAG_ROTATING_BALL_GFX
 };
 
-static const struct SpritePalette gRotatingBallPaletteTable =
+static const struct SpritePalette sRotatingBallPaletteTable =
 {
     gRotatingBall_Pal, TAG_ROTATING_BALL_GFX
 };
 
-static const struct SpriteTemplate gRotatingBallSpriteTemplate =
+static const struct SpriteTemplate sRotatingBallSpriteTemplate =
 {
     .tileTag = TAG_ROTATING_BALL_GFX,
     .paletteTag = TAG_ROTATING_BALL_GFX,
@@ -262,7 +271,7 @@ static const struct SpriteFrameImage sBerryPicSpriteImageTable[] =
 
 static const struct SpriteTemplate gBerryPicSpriteTemplate =
 {
-    .tileTag = TAG_BERRY_PIC_TILE,
+    .tileTag = TAG_NONE,
     .paletteTag = TAG_BERRY_PIC_PAL,
     .oam = &sBerryPicOamData,
     .anims = sBerryPicSpriteAnimTable,
@@ -301,7 +310,7 @@ static const union AffineAnimCmd *const sBerryPicRotatingAnimCmds[] =
 
 static const struct SpriteTemplate gBerryPicRotatingSpriteTemplate =
 {
-    .tileTag = TAG_BERRY_PIC_TILE,
+    .tileTag = TAG_NONE,
     .paletteTag = TAG_BERRY_PIC_PAL,
     .oam = &sBerryPicRotatingOamData,
     .anims = sBerryPicSpriteAnimTable,
@@ -409,11 +418,11 @@ static const struct SpriteTemplate gBerryCheckCircleSpriteTemplate =
 // code
 void RemoveBagSprite(u8 id)
 {
-    u8 *spriteId = &gBagMenu->spriteId[id];
+    u8 *spriteId = &gBagMenu->spriteIds[id];
     if (*spriteId != SPRITE_NONE)
     {
-        FreeSpriteTilesByTag(id + 100);
-        FreeSpritePaletteByTag(id + 100);
+        FreeSpriteTilesByTag(id + TAG_BAG_GFX);
+        FreeSpritePaletteByTag(id + TAG_BAG_GFX);
         FreeSpriteOamMatrix(&gSprites[*spriteId]);
         DestroySprite(&gSprites[*spriteId]);
         *spriteId = SPRITE_NONE;
@@ -422,17 +431,17 @@ void RemoveBagSprite(u8 id)
 
 void AddBagVisualSprite(u8 bagPocketId)
 {
-    u8 *spriteId = &gBagMenu->spriteId[0];
-    *spriteId = CreateSprite(&gBagSpriteTemplate, 68, 66, 0);
+    u8 *spriteId = &gBagMenu->spriteIds[ITEMMENUSPRITE_BAG];
+    *spriteId = CreateSprite(&sBagSpriteTemplate, 68, 66, 0);
     SetBagVisualPocketId(bagPocketId, FALSE);
 }
 
 void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets)
 {
-    struct Sprite *sprite = &gSprites[gBagMenu->spriteId[0]];
+    struct Sprite *sprite = &gSprites[gBagMenu->spriteIds[ITEMMENUSPRITE_BAG]];
     if (isSwitchingPockets)
     {
-        sprite->pos2.y = -5;
+        sprite->y2 = -5;
         sprite->callback = SpriteCB_BagVisualSwitchingPockets;
         sprite->data[0] = bagPocketId + 1;
         StartSpriteAnim(sprite, 0);
@@ -445,9 +454,9 @@ void SetBagVisualPocketId(u8 bagPocketId, bool8 isSwitchingPockets)
 
 static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite)
 {
-    if (sprite->pos2.y != 0)
+    if (sprite->y2 != 0)
     {
-        sprite->pos2.y++;
+        sprite->y2++;
     }
     else
     {
@@ -458,7 +467,7 @@ static void SpriteCB_BagVisualSwitchingPockets(struct Sprite *sprite)
 
 void ShakeBagSprite(void)
 {
-    struct Sprite *sprite = &gSprites[gBagMenu->spriteId[0]];
+    struct Sprite *sprite = &gSprites[gBagMenu->spriteIds[ITEMMENUSPRITE_BAG]];
     if (sprite->affineAnimEnded)
     {
         StartSpriteAffineAnim(sprite, 1);
@@ -477,10 +486,10 @@ static void SpriteCB_ShakeBagSprite(struct Sprite *sprite)
 
 void AddSwitchPocketRotatingBallSprite(s16 rotationDirection)
 {
-    u8 *spriteId = &gBagMenu->spriteId[1];
-    LoadSpriteSheet(&gRotatingBallTable);
-    LoadSpritePalette(&gRotatingBallPaletteTable);
-    *spriteId = CreateSprite(&gRotatingBallSpriteTemplate, 16, 16, 0);
+    u8 *spriteId = &gBagMenu->spriteIds[ITEMMENUSPRITE_BALL];
+    LoadSpriteSheet(&sRotatingBallTable);
+    LoadSpritePalette(&sRotatingBallPaletteTable);
+    *spriteId = CreateSprite(&sRotatingBallSpriteTemplate, 16, 16, 0);
     gSprites[*spriteId].data[0] = rotationDirection;
 }
 
@@ -510,65 +519,74 @@ static void SpriteCB_SwitchPocketRotatingBallContinue(struct Sprite *sprite)
     sprite->data[3]++;
     UpdateSwitchPocketRotatingBallCoords(sprite);
     if (sprite->data[3] == 16)
-        RemoveBagSprite(1);
+        RemoveBagSprite(ITEMMENUSPRITE_BALL);
 }
 
 void AddBagItemIconSprite(u16 itemId, u8 id)
 {
-    u8 *spriteId = &gBagMenu->spriteId[id + 2];
+    u8 *spriteId = &gBagMenu->spriteIds[id + ITEMMENUSPRITE_ITEM];
     if (*spriteId == SPRITE_NONE)
     {
         u8 iconSpriteId;
 
-        FreeSpriteTilesByTag(id + 102);
-        FreeSpritePaletteByTag(id + 102);
-        iconSpriteId = AddItemIconSprite(id + 102, id + 102, itemId);
+        // Either TAG_ITEM_ICON or TAG_ITEM_ICON_ALT
+        FreeSpriteTilesByTag(id + TAG_ITEM_ICON);
+        FreeSpritePaletteByTag(id + TAG_ITEM_ICON);
+        iconSpriteId = AddItemIconSprite(id + TAG_ITEM_ICON, id + TAG_ITEM_ICON, itemId);
         if (iconSpriteId != MAX_SPRITES)
         {
             *spriteId = iconSpriteId;
-            gSprites[iconSpriteId].pos2.x = 24;
-            gSprites[iconSpriteId].pos2.y = 88;
+            gSprites[iconSpriteId].x2 = 24;
+            gSprites[iconSpriteId].y2 = 88;
         }
     }
 }
 
 void RemoveBagItemIconSprite(u8 id)
 {
-    RemoveBagSprite(id + 2);
+    RemoveBagSprite(id + ITEMMENUSPRITE_ITEM);
 }
 
 void CreateItemMenuSwapLine(void)
 {
-    CreateSwapLineSprites(&gBagMenu->spriteId[4], 8);
+    CreateSwapLineSprites(&gBagMenu->spriteIds[ITEMMENUSPRITE_SWAP_LINE], ITEMMENU_SWAP_LINE_LENGTH);
 }
 
 void SetItemMenuSwapLineInvisibility(bool8 invisible)
 {
-    SetSwapLineSpritesInvisibility(&gBagMenu->spriteId[4], 8, invisible);
+    SetSwapLineSpritesInvisibility(&gBagMenu->spriteIds[ITEMMENUSPRITE_SWAP_LINE], ITEMMENU_SWAP_LINE_LENGTH, invisible);
 }
 
 void UpdateItemMenuSwapLinePos(u8 y)
 {
-    UpdateSwapLineSpritesPos(&gBagMenu->spriteId[4], 136, 120, (y + 1) * 16);
+    UpdateSwapLineSpritesPos(&gBagMenu->spriteIds[ITEMMENUSPRITE_SWAP_LINE], ITEMMENU_SWAP_LINE_LENGTH | SWAP_LINE_HAS_MARGIN, 120, (y + 1) * 16);
 }
 
-static void sub_80D5018(void *mem0, void *mem1)
+static void ArrangeBerryGfx(void *src, void *dest)
 {
     u8 i, j;
 
-    memset(mem1, 0, 0x800);
-    mem1 += 0x100;
+    memset(dest, 0, 0x800);
+
+    // Create top margin
+    dest += 0x100;
+
     for (i = 0; i < 6; i++)
     {
-        mem1 += 0x20;
+        // Create left margin
+        dest += 0x20;
+
+        // Copy one row of berry's icon
         for (j = 0; j < 6; j++)
         {
-            memcpy(mem1, mem0, 0x20);
-            mem1 += 0x20;
-            mem0 += 0x20;
+            memcpy(dest, src, 0x20);
+            dest += 0x20;
+            src += 0x20;
         }
+
+        // Create right margin
         if (i != 5)
-            mem1 += 0x20;
+            dest += 0x20;
     }
 }
 
@@ -585,7 +603,7 @@ static void LoadBerryGfx(u8 berryId)
     pal.tag = TAG_BERRY_PIC_PAL;
     LoadCompressedSpritePalette(&pal);
     LZDecompressWram(sBerryPicTable[berryId].tiles, &gDecompressionBuffer[0x1000]);
-    sub_80D5018(&gDecompressionBuffer[0x1000], &gDecompressionBuffer[0]);
+    ArrangeBerryGfx(&gDecompressionBuffer[0x1000], &gDecompressionBuffer[0]);
 }
 
 u8 CreateBerryTagSprite(u8 id, s16 x, s16 y)
diff --git a/src/item_use.c b/src/item_use.c
index c9087e929..c350d9d0b 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -91,7 +91,7 @@ static const u8 sClockwiseDirections[] = {DIR_NORTH, DIR_EAST, DIR_SOUTH, DIR_WE
 static const struct YesNoFuncTable sUseTMHMYesNoFuncTable =
 {
     .yesFunc = UseTMHM,
-    .noFunc = BagMenu_InitListsMenu,
+    .noFunc = CloseItemMessage,
 };
 
 #define tEnigmaBerryType data[4]
@@ -104,12 +104,12 @@ static void SetUpItemUseCallback(u8 taskId)
         type = ItemId_GetType(gSpecialVar_ItemId) - 1;
     if (!InBattlePyramid())
     {
-        gBagMenu->exitCallback = sItemUseCallbacks[type];
+        gBagMenu->newScreenCallback = sItemUseCallbacks[type];
         Task_FadeAndCloseBagMenu(taskId);
     }
     else
     {
-        gPyramidBagMenu->exitCallback = sItemUseCallbacks[type];
+        gPyramidBagMenu->newScreenCallback = sItemUseCallbacks[type];
         CloseBattlePyramidBag(taskId);
     }
 }
@@ -143,7 +143,7 @@ static void DisplayCannotUseItemMessage(u8 taskId, bool8 isUsingRegisteredKeyIte
     if (!isUsingRegisteredKeyItemOnField)
     {
         if (!InBattlePyramid())
-            DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu);
+            DisplayItemMessage(taskId, 1, gStringVar4, CloseItemMessage);
         else
             DisplayItemMessageInBattlePyramid(taskId, gText_DadsAdvice, Task_CloseBattlePyramidBagMessage);
     }
@@ -189,7 +189,7 @@ static void CB2_CheckMail(void)
 
 void ItemUseOutOfBattle_Mail(u8 taskId)
 {
-    gBagMenu->exitCallback = CB2_CheckMail;
+    gBagMenu->newScreenCallback = CB2_CheckMail;
     Task_FadeAndCloseBagMenu(taskId);
 }
 
@@ -509,7 +509,7 @@ static void SetDistanceOfClosestHiddenItem(u8 taskId, s16 itemDistanceX, s16 ite
         }
         else
         {
-            if (oldItemAbsX + oldItemAbsY == newItemAbsX + newItemAbsY 
+            if (oldItemAbsX + oldItemAbsY == newItemAbsX + newItemAbsY
             && (oldItemAbsY > newItemAbsY || (oldItemAbsY == newItemAbsY && tItemDistanceY < itemDistanceY)))
             {
                 // If items are equal distance, use whichever is closer on the Y axis or further south
@@ -614,7 +614,7 @@ void ItemUseOutOfBattle_PokeblockCase(u8 taskId)
     }
     else if (gTasks[taskId].tUsingRegisteredKeyItem != TRUE)
     {
-        gBagMenu->exitCallback = CB2_OpenPokeblockFromBag;
+        gBagMenu->newScreenCallback = CB2_OpenPokeblockFromBag;
         Task_FadeAndCloseBagMenu(taskId);
     }
     else
@@ -647,7 +647,7 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId)
 
     if (!gTasks[taskId].tUsingRegisteredKeyItem)
     {
-        DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu);
+        DisplayItemMessage(taskId, 1, gStringVar4, CloseItemMessage);
     }
     else
     {
@@ -662,7 +662,7 @@ void ItemUseOutOfBattle_PowderJar(u8 taskId)
 
     if (!gTasks[taskId].tUsingRegisteredKeyItem)
     {
-        DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu);
+        DisplayItemMessage(taskId, 1, gStringVar4, CloseItemMessage);
     }
     else
     {
@@ -676,7 +676,7 @@ void ItemUseOutOfBattle_Berry(u8 taskId)
     {
         sItemUseOnFieldCB = ItemUseOnFieldCB_Berry;
         gFieldCallback = FieldCB_UseItemOnField;
-        gBagMenu->exitCallback = CB2_ReturnToField;
+        gBagMenu->newScreenCallback = CB2_ReturnToField;
         Task_FadeAndCloseBagMenu(taskId);
     }
     else
@@ -801,7 +801,7 @@ static void Task_ShowTMHMContainedMessage(u8 taskId)
 
 static void UseTMHMYesNo(u8 taskId)
 {
-    BagMenu_YesNo(taskId, 6, &sUseTMHMYesNoFuncTable);
+    BagMenu_YesNo(taskId, ITEMWIN_YESNO_HIGH, &sUseTMHMYesNoFuncTable);
 }
 
 static void UseTMHM(u8 taskId)
@@ -818,7 +818,7 @@ static void RemoveUsedItem(void)
     if (!InBattlePyramid())
     {
         UpdatePocketItemList(ItemId_GetPocket(gSpecialVar_ItemId));
-        SetInitialScrollAndCursorPositions(ItemId_GetPocket(gSpecialVar_ItemId));
+        UpdatePocketListPosition(ItemId_GetPocket(gSpecialVar_ItemId));
     }
     else
     {
@@ -832,7 +832,7 @@ void ItemUseOutOfBattle_Repel(u8 taskId)
     if (VarGet(VAR_REPEL_STEP_COUNT) == 0)
         gTasks[taskId].func = Task_StartUseRepel;
     else if (!InBattlePyramid())
-        DisplayItemMessage(taskId, 1, gText_RepelEffectsLingered, BagMenu_InitListsMenu);
+        DisplayItemMessage(taskId, 1, gText_RepelEffectsLingered, CloseItemMessage);
     else
         DisplayItemMessageInBattlePyramid(taskId, gText_RepelEffectsLingered, Task_CloseBattlePyramidBagMessage);
 }
@@ -856,7 +856,7 @@ static void Task_UseRepel(u8 taskId)
         VarSet(VAR_REPEL_STEP_COUNT, ItemId_GetHoldEffectParam(gSpecialVar_ItemId));
         RemoveUsedItem();
         if (!InBattlePyramid())
-            DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu);
+            DisplayItemMessage(taskId, 1, gStringVar4, CloseItemMessage);
         else
             DisplayItemMessageInBattlePyramid(taskId, gStringVar4, Task_CloseBattlePyramidBagMessage);
     }
@@ -868,7 +868,7 @@ static void Task_UsedBlackWhiteFlute(u8 taskId)
     {
         PlaySE(SE_GLASS_FLUTE);
         if (!InBattlePyramid())
-            DisplayItemMessage(taskId, 1, gStringVar4, BagMenu_InitListsMenu);
+            DisplayItemMessage(taskId, 1, gStringVar4, CloseItemMessage);
         else
             DisplayItemMessageInBattlePyramid(taskId, gStringVar4, Task_CloseBattlePyramidBagMessage);
     }
@@ -947,7 +947,7 @@ void ItemUseInBattle_PokeBall(u8 taskId)
     }
     else if (!InBattlePyramid())
     {
-        DisplayItemMessage(taskId, 1, gText_BoxFull, BagMenu_InitListsMenu);
+        DisplayItemMessage(taskId, 1, gText_BoxFull, CloseItemMessage);
     }
     else
         DisplayItemMessageInBattlePyramid(taskId, gText_BoxFull, Task_CloseBattlePyramidBagMessage);
@@ -985,7 +985,7 @@ void ItemUseInBattle_StatIncrease(u8 taskId)
     if (ExecuteTableBasedItemEffect(&gPlayerParty[partyId], gSpecialVar_ItemId, partyId, 0) != FALSE)
     {
         if (!InBattlePyramid())
-            DisplayItemMessage(taskId, 1, gText_WontHaveEffect, BagMenu_InitListsMenu);
+            DisplayItemMessage(taskId, 1, gText_WontHaveEffect, CloseItemMessage);
         else
             DisplayItemMessageInBattlePyramid(taskId, gText_WontHaveEffect, Task_CloseBattlePyramidBagMessage);
     }
@@ -1000,12 +1000,12 @@ static void ItemUseInBattle_ShowPartyMenu(u8 taskId)
 {
     if (!InBattlePyramid())
     {
-        gBagMenu->exitCallback = ChooseMonForInBattleItem;
+        gBagMenu->newScreenCallback = ChooseMonForInBattleItem;
         Task_FadeAndCloseBagMenu(taskId);
     }
     else
     {
-        gPyramidBagMenu->exitCallback = ChooseMonForInBattleItem;
+        gPyramidBagMenu->newScreenCallback = ChooseMonForInBattleItem;
         CloseBattlePyramidBag(taskId);
     }
 }
diff --git a/src/librfu_rfu.c b/src/librfu_rfu.c
index 55c80580e..9a5db6d9d 100644
--- a/src/librfu_rfu.c
+++ b/src/librfu_rfu.c
@@ -169,7 +169,7 @@ u16 rfu_initializeAPI(u32 *APIBuffer, u16 buffByteSize, IntrFunc *sioIntrTable_p
         gRfuSlotStatusNI[i] = &gRfuSlotStatusNI[i - 1][1];
         gRfuSlotStatusUNI[i] = &gRfuSlotStatusUNI[i - 1][1];
     }
-    // remaining space in API buffer is used for `struct RfuIntrStruct`. 
+    // remaining space in API buffer is used for `struct RfuIntrStruct`.
     gRfuFixed->STWIBuffer = (struct RfuIntrStruct *)&gRfuSlotStatusUNI[3][1];
     STWI_init_all((struct RfuIntrStruct *)&gRfuSlotStatusUNI[3][1], sioIntrTable_p, copyInterruptToRam);
     rfu_STC_clearAPIVariables();
diff --git a/src/librfu_stwi.c b/src/librfu_stwi.c
index 0287b358a..8d8d10c40 100644
--- a/src/librfu_stwi.c
+++ b/src/librfu_stwi.c
@@ -40,7 +40,7 @@ void STWI_init_all(struct RfuIntrStruct *interruptStruct, IntrFunc *interrupt, b
     gSTWIStatus->error = 0;
     gSTWIStatus->recoveryCount = 0;
     gSTWIStatus->sending = 0;
-    REG_RCNT = 0x100; // TODO: mystery bit? 
+    REG_RCNT = 0x100; // TODO: mystery bit?
     REG_SIOCNT = SIO_INTR_ENABLE | SIO_32BIT_MODE | SIO_115200_BPS;
     STWI_init_Callback_M();
     STWI_init_Callback_S();
@@ -118,7 +118,7 @@ void STWI_init_Callback_S(void)
     STWI_set_Callback_S(NULL);
 }
 
-// The callback can take 2 or 3 arguments. 
+// The callback can take 2 or 3 arguments.
 void STWI_set_Callback_M(void *callbackM)
 {
     gSTWIStatus->callbackM = callbackM;
@@ -594,7 +594,7 @@ static s32 STWI_start_Command(void)
 {
     u16 imeTemp;
 
-    // equivalent to gSTWIStatus->txPacket->rfuPacket32.command, 
+    // equivalent to gSTWIStatus->txPacket->rfuPacket32.command,
     // but the cast here is required to avoid register issue
     *(u32 *)gSTWIStatus->txPacket->rfuPacket8.data = 0x99660000 | (gSTWIStatus->reqLength << 8) | gSTWIStatus->reqActiveCommand;
     REG_SIODATA32 = gSTWIStatus->txPacket->rfuPacket32.command;
diff --git a/src/lilycove_lady.c b/src/lilycove_lady.c
index 6fa8ba4eb..0b2be39b5 100644
--- a/src/lilycove_lady.c
+++ b/src/lilycove_lady.c
@@ -65,15 +65,15 @@ void InitLilycoveLady(void)
     id >>= 1;
     switch (id)
     {
-        case LILYCOVE_LADY_QUIZ:
-            InitLilycoveQuizLady();
-            break;
-        case LILYCOVE_LADY_FAVOR:
-            InitLilycoveFavorLady();
-            break;
-        case LILYCOVE_LADY_CONTEST:
-            InitLilycoveContestLady();
-            break;
+    case LILYCOVE_LADY_QUIZ:
+        InitLilycoveQuizLady();
+        break;
+    case LILYCOVE_LADY_FAVOR:
+        InitLilycoveFavorLady();
+        break;
+    case LILYCOVE_LADY_CONTEST:
+        InitLilycoveContestLady();
+        break;
     }
 }
 
@@ -81,15 +81,15 @@ void ResetLilycoveLadyForRecordMix(void)
 {
     switch (GetLilycoveLadyId())
     {
-        case LILYCOVE_LADY_QUIZ:
-            ResetQuizLadyForRecordMix();
-            break;
-        case LILYCOVE_LADY_FAVOR:
-            ResetFavorLadyForRecordMix();
-            break;
-        case LILYCOVE_LADY_CONTEST:
-            ResetContestLadyForRecordMix();
-            break;
+    case LILYCOVE_LADY_QUIZ:
+        ResetQuizLadyForRecordMix();
+        break;
+    case LILYCOVE_LADY_FAVOR:
+        ResetFavorLadyForRecordMix();
+        break;
+    case LILYCOVE_LADY_CONTEST:
+        ResetContestLadyForRecordMix();
+        break;
     }
 }
 
@@ -100,15 +100,15 @@ void InitLilycoveLadyRandomly(void)
 
     switch (lady)
     {
-        case LILYCOVE_LADY_QUIZ:
-            InitLilycoveQuizLady();
-            break;
-        case LILYCOVE_LADY_FAVOR:
-            InitLilycoveFavorLady();
-            break;
-        case LILYCOVE_LADY_CONTEST:
-            InitLilycoveContestLady();
-            break;
+    case LILYCOVE_LADY_QUIZ:
+        InitLilycoveQuizLady();
+        break;
+    case LILYCOVE_LADY_FAVOR:
+        InitLilycoveFavorLady();
+        break;
+    case LILYCOVE_LADY_CONTEST:
+        InitLilycoveContestLady();
+        break;
     }
 }
 
@@ -119,10 +119,10 @@ void Script_GetLilycoveLadyId(void)
 
 static u8 GetNumAcceptedItems(const u16 *itemsArray)
 {
-    u8 items;
+    u8 numItems;
 
-    for (items = 0; *itemsArray != ITEM_NONE; items ++, itemsArray ++);
-    return items;
+    for (numItems = 0; *itemsArray != ITEM_NONE; numItems++, itemsArray++);
+    return numItems;
 }
 
 static void FavorLadyPickFavorAndBestItem(void)
@@ -160,17 +160,11 @@ u8 GetFavorLadyState(void)
 {
     sFavorLadyPtr = &gSaveBlock1Ptr->lilycoveLady.favor;
     if (sFavorLadyPtr->state == LILYCOVE_LADY_STATE_PRIZE)
-    {
         return LILYCOVE_LADY_STATE_PRIZE;
-    }
     else if (sFavorLadyPtr->state == LILYCOVE_LADY_STATE_COMPLETED)
-    {
         return LILYCOVE_LADY_STATE_COMPLETED;
-    }
     else
-    {
         return LILYCOVE_LADY_STATE_READY;
-    }
 }
 
 static const u8 *GetFavorLadyRequest(u8 idx)
@@ -209,7 +203,7 @@ void BufferFavorLadyItemName(void)
 
 static void SetFavorLadyPlayerName(const u8 *src, u8 *dest)
 {
-    memset(dest, 0xFF, 8);
+    memset(dest, EOS, PLAYER_NAME_LENGTH + 1);
     StringCopy7(dest, src);
 }
 
@@ -254,9 +248,7 @@ static bool8 DoesFavorLadyLikeItem(u16 itemId)
             sFavorLadyPtr->numItemsGiven++;
             sFavorLadyPtr->likedItem = TRUE;
             if (sFavorLadyPtr->bestItem == itemId)
-            {
                 sFavorLadyPtr->numItemsGiven = LILYCOVE_LADY_GIFT_THRESHOLD;
-            }
             break;
         }
         sFavorLadyPtr->likedItem = FALSE;
@@ -312,9 +304,7 @@ static void QuizLadyPickQuestion(void)
 
     questionId = Random() % ARRAY_COUNT(sQuizLadyQuizQuestions);
     for (i = 0; i < QUIZ_QUESTION_LEN; i ++)
-    {
         sQuizLadyPtr->question[i] = sQuizLadyQuizQuestions[questionId][i];
-    }
     sQuizLadyPtr->correctAnswer = sQuizLadyQuizAnswers[questionId];
     sQuizLadyPtr->prize = sQuizLadyPrizes[questionId];
     sQuizLadyPtr->questionId = questionId;
@@ -328,16 +318,16 @@ static void InitLilycoveQuizLady(void)
     sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
     sQuizLadyPtr->id = LILYCOVE_LADY_QUIZ;
     sQuizLadyPtr->state = LILYCOVE_LADY_STATE_READY;
+
     for (i = 0; i < QUIZ_QUESTION_LEN; i ++)
-    {
-        sQuizLadyPtr->question[i] = -1;
-    }
-    sQuizLadyPtr->correctAnswer = -1;
-    sQuizLadyPtr->playerAnswer = -1;
+        sQuizLadyPtr->question[i] = EC_EMPTY_WORD;
+
+    sQuizLadyPtr->correctAnswer = EC_EMPTY_WORD;
+    sQuizLadyPtr->playerAnswer = EC_EMPTY_WORD;
+
     for (i = 0; i < TRAINER_ID_LENGTH; i ++)
-    {
         sQuizLadyPtr->playerTrainerId[i] = 0;
-    }
+
     sQuizLadyPtr->prize = ITEM_NONE;
     sQuizLadyPtr->waitingForChallenger = FALSE;
     sQuizLadyPtr->prevQuestionId = ARRAY_COUNT(sQuizLadyQuizQuestions);
@@ -351,48 +341,37 @@ static void ResetQuizLadyForRecordMix(void)
     sQuizLadyPtr->id = LILYCOVE_LADY_QUIZ;
     sQuizLadyPtr->state = LILYCOVE_LADY_STATE_READY;
     sQuizLadyPtr->waitingForChallenger = FALSE;
-    sQuizLadyPtr->playerAnswer = -1;
+    sQuizLadyPtr->playerAnswer = EC_EMPTY_WORD;
 }
 
 u8 GetQuizLadyState(void)
 {
     sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
     if (sQuizLadyPtr->state == LILYCOVE_LADY_STATE_PRIZE)
-    {
         return LILYCOVE_LADY_STATE_PRIZE;
-    }
     else if (sQuizLadyPtr->state == LILYCOVE_LADY_STATE_COMPLETED)
-    {
         return LILYCOVE_LADY_STATE_COMPLETED;
-    }
     else
-    {
         return LILYCOVE_LADY_STATE_READY;
-    }
 }
 
 u8 GetQuizAuthor(void)
 {
-    int i;
-    int j;
+    s32 i, j;
     u8 authorNameId;
-    struct LilycoveLadyQuiz *quiz;
+    struct LilycoveLadyQuiz *quiz = &gSaveBlock1Ptr->lilycoveLady.quiz;
 
-    quiz = &gSaveBlock1Ptr->lilycoveLady.quiz;
     if (IsEasyChatAnswerUnlocked(quiz->correctAnswer) == FALSE)
     {
         i = quiz->questionId;
         do
         {
-            if (++ i >= (int)(ARRAY_COUNT(sQuizLadyQuizQuestions)))
-            {
+            if (++i >= (int)ARRAY_COUNT(sQuizLadyQuizQuestions))
                 i = 0;
-            }
         } while (IsEasyChatAnswerUnlocked(sQuizLadyQuizAnswers[i]) == FALSE);
-        for (j = 0; j < QUIZ_QUESTION_LEN; j ++)
-        {
+
+        for (j = 0; j < QUIZ_QUESTION_LEN; j++)
             quiz->question[j] = sQuizLadyQuizQuestions[i][j];
-        }
         quiz->correctAnswer = sQuizLadyQuizAnswers[i];
         quiz->prize = sQuizLadyPrizes[i];
         quiz->questionId = i;
@@ -400,17 +379,11 @@ u8 GetQuizAuthor(void)
     }
     authorNameId = BufferQuizAuthorName();
     if (authorNameId == QUIZ_AUTHOR_NAME_LADY)
-    {
         return QUIZ_AUTHOR_LADY;
-    }
     else if (authorNameId == QUIZ_AUTHOR_NAME_OTHER_PLAYER || IsQuizTrainerIdNotPlayer())
-    {
         return QUIZ_AUTHOR_OTHER_PLAYER;
-    }
     else
-    {
         return QUIZ_AUTHOR_PLAYER;
-    }
 }
 
 static u8 BufferQuizAuthorName(void)
@@ -434,7 +407,7 @@ static u8 BufferQuizAuthorName(void)
         if (nameLen == GetPlayerNameLength(gSaveBlock2Ptr->playerName))
         {
             u8 *name = sQuizLadyPtr->playerName;
-            for (i = 0; i < nameLen; i ++)
+            for (i = 0; i < nameLen; i++)
             {
                 name = sQuizLadyPtr->playerName;
                 if (name[i] != gSaveBlock2Ptr->playerName[i])
@@ -456,7 +429,7 @@ static bool8 IsQuizTrainerIdNotPlayer(void)
 
     sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
     notPlayer = FALSE;
-    for (i = 0; i < TRAINER_ID_LENGTH; i ++)
+    for (i = 0; i < TRAINER_ID_LENGTH; i++)
     {
         if (sQuizLadyPtr->playerTrainerId[i] != gSaveBlock2Ptr->playerTrainerId[i])
         {
@@ -472,7 +445,7 @@ static u8 GetPlayerNameLength(const u8 *playerName)
     u8 len;
     const u8 *ptr;
 
-    for (len = 0, ptr = playerName; *ptr != EOS; len ++, ptr ++);
+    for (len = 0, ptr = playerName; *ptr != EOS; len++, ptr++);
     return len;
 }
 
@@ -517,7 +490,7 @@ void BufferQuizPrizeItem(void)
     gSpecialVar_0x8005 = sQuizLadyPtr->prize;
 }
 
-void SetQuizLadyState_Complete(void) 
+void SetQuizLadyState_Complete(void)
 {
     sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
     sQuizLadyPtr->state = LILYCOVE_LADY_STATE_COMPLETED;
@@ -532,7 +505,7 @@ void SetQuizLadyState_GivePrize(void)
 void ClearQuizLadyPlayerAnswer(void)
 {
     sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    sQuizLadyPtr->playerAnswer = -1;
+    sQuizLadyPtr->playerAnswer = EC_EMPTY_WORD;
 }
 
 void Script_QuizLadyOpenBagMenu(void)
@@ -544,13 +517,9 @@ void QuizLadyPickNewQuestion(void)
 {
     sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
     if (BufferQuizAuthorNameAndCheckIfLady())
-    {
         sQuizLadyPtr->prevQuestionId = sQuizLadyPtr->questionId;
-    }
     else
-    {
         sQuizLadyPtr->prevQuestionId = ARRAY_COUNT(sQuizLadyQuizQuestions);
-    }
     QuizLadyPickQuestion();
 }
 
@@ -559,11 +528,9 @@ void ClearQuizLadyQuestionAndAnswer(void)
     u8 i;
 
     sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    for (i = 0; i < QUIZ_QUESTION_LEN; i ++)
-    {
-        sQuizLadyPtr->question[i] = -1;
-    }
-    sQuizLadyPtr->correctAnswer = -1;
+    for (i = 0; i < QUIZ_QUESTION_LEN; i++)
+        sQuizLadyPtr->question[i] = EC_EMPTY_WORD;
+    sQuizLadyPtr->correctAnswer = EC_EMPTY_WORD;
 }
 
 void QuizLadySetCustomQuestion(void)
@@ -583,10 +550,8 @@ void QuizLadyRecordCustomQuizData(void)
 
     sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
     sQuizLadyPtr->prize = gSpecialVar_ItemId;
-    for (i = 0; i < TRAINER_ID_LENGTH; i ++)
-    {
+    for (i = 0; i < TRAINER_ID_LENGTH; i++)
         sQuizLadyPtr->playerTrainerId[i] = gSaveBlock2Ptr->playerTrainerId[i];
-    }
     StringCopy7(sQuizLadyPtr->playerName, gSaveBlock2Ptr->playerName);
     sQuizLadyPtr->language = gGameLanguage;
 }
@@ -614,21 +579,18 @@ void QuizLadyClearQuestionForRecordMix(const LilycoveLady *lilycoveLady)
     u8 i;
 
     sQuizLadyPtr = &gSaveBlock1Ptr->lilycoveLady.quiz;
-    if (lilycoveLady->quiz.prevQuestionId < ARRAY_COUNT(sQuizLadyQuizQuestions) 
+    if (lilycoveLady->quiz.prevQuestionId < ARRAY_COUNT(sQuizLadyQuizQuestions)
         && sQuizLadyPtr->id == LILYCOVE_LADY_QUIZ)
     {
-        for (i = 0; i < 4; i ++)
+        for (i = 0; i < 4; i++)
         {
             if (lilycoveLady->quiz.prevQuestionId != sQuizLadyPtr->questionId)
-            {
                 break;
-            }
             sQuizLadyPtr->questionId = Random() % ARRAY_COUNT(sQuizLadyQuizQuestions);
         }
         if (lilycoveLady->quiz.prevQuestionId == sQuizLadyPtr->questionId)
-        {
-            sQuizLadyPtr->questionId = (sQuizLadyPtr->questionId + 1) % (int)(ARRAY_COUNT(sQuizLadyQuizQuestions));
-        }
+            sQuizLadyPtr->questionId = (sQuizLadyPtr->questionId + 1) % (int)ARRAY_COUNT(sQuizLadyQuizQuestions);
+
         sQuizLadyPtr->prevQuestionId = lilycoveLady->quiz.prevQuestionId;
     }
 }
@@ -656,11 +618,10 @@ static void ResetContestLadyForRecordMix(void)
     sContestLadyPtr = &gSaveBlock1Ptr->lilycoveLady.contest;
     sContestLadyPtr->id = LILYCOVE_LADY_CONTEST;
     sContestLadyPtr->givenPokeblock = FALSE;
-    if (sContestLadyPtr->numGoodPokeblocksGiven == LILYCOVE_LADY_GIFT_THRESHOLD 
+
+    if (sContestLadyPtr->numGoodPokeblocksGiven == LILYCOVE_LADY_GIFT_THRESHOLD
      || sContestLadyPtr->numOtherPokeblocksGiven == LILYCOVE_LADY_GIFT_THRESHOLD)
-    {
         ResetContestLadyContestData();
-    }
 }
 
 static void ContestLadySavePlayerNameIfHighSheen(u8 sheen)
@@ -683,41 +644,41 @@ bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock)
     sContestLadyPtr = &gSaveBlock1Ptr->lilycoveLady.contest;
     switch (sContestLadyPtr->category)
     {
-        case CONTEST_CATEGORY_COOL:
-            if (pokeblock->spicy != 0)
-            {
-                sheen = pokeblock->spicy;
-                correctFlavor = TRUE;
-            }
-            break;
-        case CONTEST_CATEGORY_BEAUTY:
-            if (pokeblock->dry != 0)
-            {
-                sheen = pokeblock->dry;
-                correctFlavor = TRUE;
-            }
-            break;
-        case CONTEST_CATEGORY_CUTE:
-            if (pokeblock->sweet != 0)
-            {
-                sheen = pokeblock->sweet;
-                correctFlavor = TRUE;
-            }
-            break;
-        case CONTEST_CATEGORY_SMART:
-            if (pokeblock->bitter != 0)
-            {
-                sheen = pokeblock->bitter;
-                correctFlavor = TRUE;
-            }
-            break;
-        case CONTEST_CATEGORY_TOUGH:
-            if (pokeblock->sour != 0)
-            {
-                sheen = pokeblock->sour;
-                correctFlavor = TRUE;
-            }
-            break;
+    case CONTEST_CATEGORY_COOL:
+        if (pokeblock->spicy != 0)
+        {
+            sheen = pokeblock->spicy;
+            correctFlavor = TRUE;
+        }
+        break;
+    case CONTEST_CATEGORY_BEAUTY:
+        if (pokeblock->dry != 0)
+        {
+            sheen = pokeblock->dry;
+            correctFlavor = TRUE;
+        }
+        break;
+    case CONTEST_CATEGORY_CUTE:
+        if (pokeblock->sweet != 0)
+        {
+            sheen = pokeblock->sweet;
+            correctFlavor = TRUE;
+        }
+        break;
+    case CONTEST_CATEGORY_SMART:
+        if (pokeblock->bitter != 0)
+        {
+            sheen = pokeblock->bitter;
+            correctFlavor = TRUE;
+        }
+        break;
+    case CONTEST_CATEGORY_TOUGH:
+        if (pokeblock->sour != 0)
+        {
+            sheen = pokeblock->sour;
+            correctFlavor = TRUE;
+        }
+        break;
     }
     if (correctFlavor == TRUE)
     {
@@ -731,18 +692,18 @@ bool8 GivePokeblockToContestLady(struct Pokeblock *pokeblock)
     return correctFlavor;
 }
 
-static void BufferContestLadyCategoryAndMonName(u8 *dest1, u8 *dest2)
+static void BufferContestLadyCategoryAndMonName(u8 *category, u8 *nickname)
 {
     sContestLadyPtr = &gSaveBlock1Ptr->lilycoveLady.contest;
-    StringCopy(dest1, sContestLadyCategoryNames[sContestLadyPtr->category]);
-    StringCopy10(dest2, sContestLadyMonNames[sContestLadyPtr->category]);
+    StringCopy(category, sContestLadyCategoryNames[sContestLadyPtr->category]);
+    StringCopy10(nickname, sContestLadyMonNames[sContestLadyPtr->category]);
 }
 
-void BufferContestLadyMonName(u8 *dest1, u8 *dest2)
+void BufferContestLadyMonName(u8 *category, u8 *nickname)
 {
     sContestLadyPtr = &gSaveBlock1Ptr->lilycoveLady.contest;
-    *dest1 = sContestLadyPtr->category;
-    StringCopy(dest2, sContestLadyMonNames[sContestLadyPtr->category]);
+    *category = sContestLadyPtr->category;
+    StringCopy(nickname, sContestLadyMonNames[sContestLadyPtr->category]);
 }
 
 void BufferContestLadyPlayerName(u8 *dest)
@@ -779,9 +740,7 @@ bool8 HasPlayerGivenContestLadyPokeblock(void)
 {
     sContestLadyPtr = &gSaveBlock1Ptr->lilycoveLady.contest;
     if (sContestLadyPtr->givenPokeblock == TRUE)
-    {
         return TRUE;
-    }
     return FALSE;
 }
 
@@ -790,11 +749,10 @@ bool8 ShouldContestLadyShowGoOnAir(void)
     bool8 putOnAir = FALSE;
 
     sContestLadyPtr = &gSaveBlock1Ptr->lilycoveLady.contest;
-    if (sContestLadyPtr->numGoodPokeblocksGiven >= LILYCOVE_LADY_GIFT_THRESHOLD 
+    if (sContestLadyPtr->numGoodPokeblocksGiven >= LILYCOVE_LADY_GIFT_THRESHOLD
      || sContestLadyPtr->numOtherPokeblocksGiven >= LILYCOVE_LADY_GIFT_THRESHOLD)
-    {
         putOnAir = TRUE;
-    }
+
     return putOnAir;
 }
 
diff --git a/src/link.c b/src/link.c
index 1f06eef66..66549f648 100644
--- a/src/link.c
+++ b/src/link.c
@@ -758,7 +758,7 @@ static int AreAnyLinkPlayersUsingVersions(u32 version1, u32 version2)
     nPlayers = GetLinkPlayerCount();
     for (i = 0; i < nPlayers; i++)
     {
-        if ((gLinkPlayers[i].version & 0xFF) == version1 
+        if ((gLinkPlayers[i].version & 0xFF) == version1
          || (gLinkPlayers[i].version & 0xFF) == version2)
             return 1;
     }
@@ -867,7 +867,7 @@ u8 GetLinkPlayerDataExchangeStatusTimed(int minPlayers, int maxPlayers)
                 sPlayerDataExchangeStatus = EXCHANGE_DIFF_SELECTIONS;
                 linkType1 = gLinkPlayers[GetMultiplayerId()].linkType;
                 linkType2 = gLinkPlayers[GetMultiplayerId() ^ 1].linkType;
-                if ((linkType1 == LINKTYPE_BATTLE_TOWER_50 && linkType2 == LINKTYPE_BATTLE_TOWER_OPEN) 
+                if ((linkType1 == LINKTYPE_BATTLE_TOWER_50 && linkType2 == LINKTYPE_BATTLE_TOWER_OPEN)
                  || (linkType1 == LINKTYPE_BATTLE_TOWER_OPEN && linkType2 == LINKTYPE_BATTLE_TOWER_50))
                 {
                     // 3 below indicates partner made different level mode selection
@@ -1344,7 +1344,7 @@ void CheckLinkPlayersMatchSaved(void)
 
     for (i = 0; i < gSavedLinkPlayerCount; i++)
     {
-        if (sSavedLinkPlayers[i].trainerId != gLinkPlayers[i].trainerId 
+        if (sSavedLinkPlayers[i].trainerId != gLinkPlayers[i].trainerId
          || StringCompare(sSavedLinkPlayers[i].name, gLinkPlayers[i].name) != 0)
         {
             gLinkErrorOccurred = TRUE;
@@ -1774,7 +1774,7 @@ void LinkPlayerFromBlock(u32 who)
     *player = block->linkPlayer;
     ConvertLinkPlayerName(player);
 
-    if (strcmp(block->magic1, sASCIIGameFreakInc) != 0 
+    if (strcmp(block->magic1, sASCIIGameFreakInc) != 0
      || strcmp(block->magic2, sASCIIGameFreakInc) != 0)
         SetMainCallback2(CB2_LinkError);
 }
diff --git a/src/link_rfu_2.c b/src/link_rfu_2.c
index 657d90074..63c54587a 100644
--- a/src/link_rfu_2.c
+++ b/src/link_rfu_2.c
@@ -118,7 +118,7 @@ static void Debug_PrintEmpty(void);
 static void Task_Idle(u8);
 
 static const INIT_PARAM sRfuReqConfigTemplate = {
-    .maxMFrame = 4, 
+    .maxMFrame = 4,
     .MC_TimerCount = 32,
     .availSlot_flag = 0,
     .mboot_flag = 0,
@@ -127,7 +127,7 @@ static const INIT_PARAM sRfuReqConfigTemplate = {
     .userName = gHostRfuUsername,
     .fastSearchParent_flag = TRUE,
     .linkRecovery_enable = FALSE,
-    .linkRecovery_period = 600, 
+    .linkRecovery_period = 600,
     .NI_failCounter_limit = 300
 };
 
@@ -226,7 +226,7 @@ static const struct BlockRequest sBlockRequests[] = {
 
 static const u16 sAcceptedSerialNos[] = {
     RFU_SERIAL_GAME,
-    RFU_SERIAL_WONDER_DISTRIBUTOR, 
+    RFU_SERIAL_WONDER_DISTRIBUTOR,
     RFU_SERIAL_UNKNOWN,
     RFU_SERIAL_END
 };
@@ -1613,10 +1613,10 @@ static bool8 CheckForLeavingGroupMembers(void)
     bool8 memberLeft = FALSE;
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if (gRfu.partnerSendStatuses[i] < RFU_STATUS_JOIN_GROUP_OK 
+        if (gRfu.partnerSendStatuses[i] < RFU_STATUS_JOIN_GROUP_OK
          || gRfu.partnerSendStatuses[i] > RFU_STATUS_JOIN_GROUP_NO)
         {
-            if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS 
+            if (gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS
              || gRfuSlotStatusNI[i]->recv.state == SLOT_STATE_RECV_SUCCESS_AND_SENDSIDE_UNKNOWN)
             {
                 if (gRfu.partnerRecvStatuses[i] == RFU_STATUS_LEAVE_GROUP_NOTICE)
@@ -1664,7 +1664,7 @@ bool32 RfuTryDisconnectLeavingChildren(void)
     // Return true if any children have left or are still waiting to leave
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if (gRfu.partnerRecvStatuses[i] == RFU_STATUS_CHILD_LEAVE_READY 
+        if (gRfu.partnerRecvStatuses[i] == RFU_STATUS_CHILD_LEAVE_READY
          || gRfu.partnerRecvStatuses[i] == RFU_STATUS_CHILD_LEAVE)
             return TRUE;
     }
@@ -1713,7 +1713,7 @@ static void UpdateChildStatuses(void)
     CheckForLeavingGroupMembers();
     for (i = 0; i < RFU_CHILD_MAX; i++)
     {
-        if (gRfuSlotStatusNI[i]->send.state == SLOT_STATE_SEND_SUCCESS 
+        if (gRfuSlotStatusNI[i]->send.state == SLOT_STATE_SEND_SUCCESS
          || gRfuSlotStatusNI[i]->send.state == SLOT_STATE_SEND_FAILED)
         {
             if (gRfu.partnerRecvStatuses[i] == RFU_STATUS_CHILD_LEAVE_READY)
@@ -1728,7 +1728,7 @@ static s32 GetJoinGroupStatus(void)
     s32 status = RFU_STATUS_OK;
     if (gRfu.leaveGroupStatus == RFU_STATUS_LEAVE_GROUP_NOTICE)
     {
-        if (gRfuSlotStatusNI[gRfu.childSlot]->send.state == SLOT_STATE_SEND_SUCCESS 
+        if (gRfuSlotStatusNI[gRfu.childSlot]->send.state == SLOT_STATE_SEND_SUCCESS
          || gRfuSlotStatusNI[gRfu.childSlot]->send.state == SLOT_STATE_SEND_FAILED)
             rfu_clearSlot(TYPE_NI_SEND, gRfu.childSlot);
     }
@@ -2756,7 +2756,7 @@ static void Task_RfuReconnectWithParent(u8 taskId)
                 if (TryReconnectParent())
                     DestroyTask(taskId);
             }
-            else if (GetHostRfuGameData()->activity == ACTIVITY_WONDER_CARD 
+            else if (GetHostRfuGameData()->activity == ACTIVITY_WONDER_CARD
                   || GetHostRfuGameData()->activity == ACTIVITY_WONDER_NEWS)
             {
                 tTime++;
diff --git a/src/link_rfu_3.c b/src/link_rfu_3.c
index acac57d35..162c23a57 100644
--- a/src/link_rfu_3.c
+++ b/src/link_rfu_3.c
@@ -39,82 +39,82 @@ static const u32 sWirelessLinkIconPic[] = INCBIN_U32("graphics/interface/wireles
 
 // Most of the below two tables won't make sense with ASCII encoding.
 static const u8 sWireless_ASCIItoRSETable[256] = {
-    EOS, 
+    EOS,
     0x95, 0x96, 0x97, 0x98, 0x99, 0x9a, 0x37,
     0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
     0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
     0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-    [' '] = CHAR_SPACE, 
-    ['!'] = CHAR_EXCL_MARK, 
+    [' '] = CHAR_SPACE,
+    ['!'] = CHAR_EXCL_MARK,
     0xb5, 0xb6, 0xb1, 0x00, 0x00, 0x00,
     0x00, 0x00, 0xb2, 0xf1, 0x00,
-    ['-'] = CHAR_HYPHEN, 
-    ['.'] = CHAR_PERIOD, 
+    ['-'] = CHAR_HYPHEN,
+    ['.'] = CHAR_PERIOD,
     ['/'] = CHAR_SLASH,
     ['0'] = CHAR_0,
-    ['1'] = CHAR_1, 
-    ['2'] = CHAR_2, 
-    ['3'] = CHAR_3, 
-    ['4'] = CHAR_4, 
-    ['5'] = CHAR_5, 
-    ['6'] = CHAR_6, 
+    ['1'] = CHAR_1,
+    ['2'] = CHAR_2,
+    ['3'] = CHAR_3,
+    ['4'] = CHAR_4,
+    ['5'] = CHAR_5,
+    ['6'] = CHAR_6,
     ['7'] = CHAR_7,
-    ['8'] = CHAR_8, 
-    ['9'] = CHAR_9,  
-    0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0x00, 
-    ['A'] = CHAR_A, 
-    ['B'] = CHAR_B, 
-    ['C'] = CHAR_C, 
-    ['D'] = CHAR_D, 
-    ['E'] = CHAR_E, 
-    ['F'] = CHAR_F, 
+    ['8'] = CHAR_8,
+    ['9'] = CHAR_9,
+    0x00, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0x00,
+    ['A'] = CHAR_A,
+    ['B'] = CHAR_B,
+    ['C'] = CHAR_C,
+    ['D'] = CHAR_D,
+    ['E'] = CHAR_E,
+    ['F'] = CHAR_F,
     ['G'] = CHAR_G,
-    ['H'] = CHAR_H, 
-    ['I'] = CHAR_I, 
-    ['J'] = CHAR_J, 
-    ['K'] = CHAR_K, 
-    ['L'] = CHAR_L, 
-    ['M'] = CHAR_M, 
-    ['N'] = CHAR_N, 
+    ['H'] = CHAR_H,
+    ['I'] = CHAR_I,
+    ['J'] = CHAR_J,
+    ['K'] = CHAR_K,
+    ['L'] = CHAR_L,
+    ['M'] = CHAR_M,
+    ['N'] = CHAR_N,
     ['O'] = CHAR_O,
-    ['P'] = CHAR_P, 
-    ['Q'] = CHAR_Q, 
-    ['R'] = CHAR_R, 
-    ['S'] = CHAR_S, 
-    ['T'] = CHAR_T, 
-    ['U'] = CHAR_U, 
+    ['P'] = CHAR_P,
+    ['Q'] = CHAR_Q,
+    ['R'] = CHAR_R,
+    ['S'] = CHAR_S,
+    ['T'] = CHAR_T,
+    ['U'] = CHAR_U,
     ['V'] = CHAR_V,
     ['W'] = CHAR_W,
-    ['X'] = CHAR_X, 
-    ['Y'] = CHAR_Y, 
-    ['Z'] = CHAR_Z, 
-    0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0x00, 
-    ['a'] = CHAR_a, 
-    ['b'] = CHAR_b, 
-    ['c'] = CHAR_c, 
-    ['d'] = CHAR_d, 
-    ['e'] = CHAR_e, 
-    ['f'] = CHAR_f, 
+    ['X'] = CHAR_X,
+    ['Y'] = CHAR_Y,
+    ['Z'] = CHAR_Z,
+    0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0x00,
+    ['a'] = CHAR_a,
+    ['b'] = CHAR_b,
+    ['c'] = CHAR_c,
+    ['d'] = CHAR_d,
+    ['e'] = CHAR_e,
+    ['f'] = CHAR_f,
     ['g'] = CHAR_g,
-    ['h'] = CHAR_h, 
-    ['i'] = CHAR_i, 
-    ['j'] = CHAR_j, 
-    ['k'] = CHAR_k, 
-    ['l'] = CHAR_l, 
-    ['m'] = CHAR_m, 
-    ['n'] = CHAR_n, 
+    ['h'] = CHAR_h,
+    ['i'] = CHAR_i,
+    ['j'] = CHAR_j,
+    ['k'] = CHAR_k,
+    ['l'] = CHAR_l,
+    ['m'] = CHAR_m,
+    ['n'] = CHAR_n,
     ['o'] = CHAR_o,
-    ['p'] = CHAR_p, 
-    ['q'] = CHAR_q, 
-    ['r'] = CHAR_r, 
-    ['s'] = CHAR_s, 
-    ['t'] = CHAR_t, 
-    ['u'] = CHAR_u, 
-    ['v'] = CHAR_v, 
+    ['p'] = CHAR_p,
+    ['q'] = CHAR_q,
+    ['r'] = CHAR_r,
+    ['s'] = CHAR_s,
+    ['t'] = CHAR_t,
+    ['u'] = CHAR_u,
+    ['v'] = CHAR_v,
     ['w'] = CHAR_w,
-    ['x'] = CHAR_x, 
-    ['y'] = CHAR_y, 
-    ['z'] = CHAR_z, 
+    ['x'] = CHAR_x,
+    ['y'] = CHAR_y,
+    ['z'] = CHAR_z,
     0x2d, 0x2f, 0x30, 0x31, 0x32,
     0x33, 0x34, 0x35, 0x36, 0x50, 0x00, 0x01, 0x02,
     0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
@@ -135,102 +135,102 @@ static const u8 sWireless_ASCIItoRSETable[256] = {
 };
 
 static const u8 sWireless_RSEtoASCIITable[256] = {
-    [CHAR_SPACE] = ' ', 
-    0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 
-    0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 
-    0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 
-    0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 
-    0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 
-    0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c, 0x7d, 
-    0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07, 0x08, 
-    0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 
-    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 
-    0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x84, 
-    0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8, 
-    0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 
-    0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 
-    0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 
-    0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 
-    0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7, 0xa8, 
-    0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2, 0xf3, 
-    0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 
-    0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03, 0x04, 
-    0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0xaf, 
-    [CHAR_0] = '0', 
-    [CHAR_1] = '1', 
-    [CHAR_2] = '2', 
-    [CHAR_3] = '3', 
-    [CHAR_4] = '4', 
-    [CHAR_5] = '5', 
+    [CHAR_SPACE] = ' ',
+    0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d,
+    0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95,
+    0x96, 0x97, 0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d,
+    0x9e, 0x9f, 0xa0, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4,
+    0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec,
+    0xed, 0xee, 0xef, 0xf0, 0x7b, 0xf1, 0x7c, 0x7d,
+    0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x07, 0x08,
+    0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
+    0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
+    0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x84,
+    0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7, 0xb8,
+    0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0,
+    0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8,
+    0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0,
+    0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8,
+    0xd9, 0xda, 0xdb, 0xdc, 0xa6, 0xdd, 0xa7, 0xa8,
+    0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xf2, 0xf3,
+    0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xf9, 0xfa, 0xfb,
+    0xfc, 0xfd, 0xfe, 0xff, 0x01, 0x02, 0x03, 0x04,
+    0x05, 0x06, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0xaf,
+    [CHAR_0] = '0',
+    [CHAR_1] = '1',
+    [CHAR_2] = '2',
+    [CHAR_3] = '3',
+    [CHAR_4] = '4',
+    [CHAR_5] = '5',
     [CHAR_6] = '6',
-    [CHAR_7] = '7', 
-    [CHAR_8] = '8', 
-    [CHAR_9] = '9', 
-    [CHAR_EXCL_MARK] = '!', 
-    0xdf, 0xa1, 0xb0, 0xa5, 0xde, 0x24, 0x2a, 
-    0xa2, 0xa3, 0x22, 0x23, 0x20, 0xa4, 0x20, 
-    [CHAR_SLASH] = '/', 
-    [CHAR_A] = 'A', 
-    [CHAR_B] = 'B', 
-    [CHAR_C] = 'C', 
-    [CHAR_D] = 'D', 
+    [CHAR_7] = '7',
+    [CHAR_8] = '8',
+    [CHAR_9] = '9',
+    [CHAR_EXCL_MARK] = '!',
+    0xdf, 0xa1, 0xb0, 0xa5, 0xde, 0x24, 0x2a,
+    0xa2, 0xa3, 0x22, 0x23, 0x20, 0xa4, 0x20,
+    [CHAR_SLASH] = '/',
+    [CHAR_A] = 'A',
+    [CHAR_B] = 'B',
+    [CHAR_C] = 'C',
+    [CHAR_D] = 'D',
     [CHAR_E] = 'E',
-    [CHAR_F] = 'F', 
-    [CHAR_G] = 'G', 
-    [CHAR_H] = 'H', 
-    [CHAR_I] = 'I', 
-    [CHAR_J] = 'J', 
-    [CHAR_K] = 'K', 
-    [CHAR_L] = 'L', 
+    [CHAR_F] = 'F',
+    [CHAR_G] = 'G',
+    [CHAR_H] = 'H',
+    [CHAR_I] = 'I',
+    [CHAR_J] = 'J',
+    [CHAR_K] = 'K',
+    [CHAR_L] = 'L',
     [CHAR_M] = 'M',
-    [CHAR_N] = 'N', 
-    [CHAR_O] = 'O', 
-    [CHAR_P] = 'P', 
-    [CHAR_Q] = 'Q', 
-    [CHAR_R] = 'R', 
-    [CHAR_S] = 'S', 
-    [CHAR_T] = 'T', 
+    [CHAR_N] = 'N',
+    [CHAR_O] = 'O',
+    [CHAR_P] = 'P',
+    [CHAR_Q] = 'Q',
+    [CHAR_R] = 'R',
+    [CHAR_S] = 'S',
+    [CHAR_T] = 'T',
     [CHAR_U] = 'U',
-    [CHAR_V] = 'V', 
-    [CHAR_W] = 'W', 
-    [CHAR_X] = 'X', 
-    [CHAR_Y] = 'Y', 
-    [CHAR_Z] = 'Z', 
-    [CHAR_a] = 'a', 
-    [CHAR_b] = 'b', 
+    [CHAR_V] = 'V',
+    [CHAR_W] = 'W',
+    [CHAR_X] = 'X',
+    [CHAR_Y] = 'Y',
+    [CHAR_Z] = 'Z',
+    [CHAR_a] = 'a',
+    [CHAR_b] = 'b',
     [CHAR_c] = 'c',
-    [CHAR_d] = 'd', 
-    [CHAR_e] = 'e', 
-    [CHAR_f] = 'f', 
-    [CHAR_g] = 'g', 
-    [CHAR_h] = 'h', 
-    [CHAR_i] = 'i', 
-    [CHAR_j] = 'j', 
+    [CHAR_d] = 'd',
+    [CHAR_e] = 'e',
+    [CHAR_f] = 'f',
+    [CHAR_g] = 'g',
+    [CHAR_h] = 'h',
+    [CHAR_i] = 'i',
+    [CHAR_j] = 'j',
     [CHAR_k] = 'k',
-    [CHAR_l] = 'l', 
-    [CHAR_m] = 'm', 
-    [CHAR_n] = 'n', 
-    [CHAR_o] = 'o', 
-    [CHAR_p] = 'p', 
-    [CHAR_q] = 'q', 
-    [CHAR_r] = 'r', 
+    [CHAR_l] = 'l',
+    [CHAR_m] = 'm',
+    [CHAR_n] = 'n',
+    [CHAR_o] = 'o',
+    [CHAR_p] = 'p',
+    [CHAR_q] = 'q',
+    [CHAR_r] = 'r',
     [CHAR_s] = 's',
-    [CHAR_t] = 't', 
-    [CHAR_u] = 'u', 
-    [CHAR_v] = 'v', 
-    [CHAR_w] = 'w', 
-    [CHAR_x] = 'x', 
-    [CHAR_y] = 'y', 
-    [CHAR_z] = 'z', 
-    0x20, 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f, 
+    [CHAR_t] = 't',
+    [CHAR_u] = 'u',
+    [CHAR_v] = 'v',
+    [CHAR_w] = 'w',
+    [CHAR_x] = 'x',
+    [CHAR_y] = 'y',
+    [CHAR_z] = 'z',
+    0x20, 0x20, 0x2b, 0x5b, 0x5c, 0x5d, 0x5e, 0x5f,
     [CHAR_DYNAMIC] = ' ',
-    [CHAR_KEYPAD_ICON] = ' ', 
-    [CHAR_EXTRA_SYMBOL] = ' ', 
-    [CHAR_PROMPT_SCROLL] = ' ', 
-    [CHAR_PROMPT_CLEAR] = ' ', 
-    [EXT_CTRL_CODE_BEGIN] = ' ', 
-    [PLACEHOLDER_BEGIN] = ' ', 
-    [CHAR_NEWLINE] = ' ', 
+    [CHAR_KEYPAD_ICON] = ' ',
+    [CHAR_EXTRA_SYMBOL] = ' ',
+    [CHAR_PROMPT_SCROLL] = ' ',
+    [CHAR_PROMPT_CLEAR] = ' ',
+    [EXT_CTRL_CODE_BEGIN] = ' ',
+    [PLACEHOLDER_BEGIN] = ' ',
+    [CHAR_NEWLINE] = ' ',
     [EOS] = 0
 };
 
@@ -872,8 +872,8 @@ void UpdateWirelessStatusIndicatorSprite(void)
             sprite->sFrameDelay++;
         }
         gMain.oamBuffer[125] = sWirelessStatusIndicatorOamData;
-        gMain.oamBuffer[125].x = sprite->pos1.x + sprite->centerToCornerVecX;
-        gMain.oamBuffer[125].y = sprite->pos1.y + sprite->centerToCornerVecY;
+        gMain.oamBuffer[125].x = sprite->x + sprite->centerToCornerVecX;
+        gMain.oamBuffer[125].y = sprite->y + sprite->centerToCornerVecY;
         gMain.oamBuffer[125].paletteNum = sprite->oam.paletteNum;
         gMain.oamBuffer[125].tileNum = sprite->sTileStart + sprite->anims[sprite->sCurrAnimNum][sprite->sFrameIdx].frame.imageValue;
         CpuCopy16(&gMain.oamBuffer[125], (struct OamData *)OAM + 125, sizeof(struct OamData));
diff --git a/src/list_menu.c b/src/list_menu.c
index 9ac9b87ab..84b917eec 100644
--- a/src/list_menu.c
+++ b/src/list_menu.c
@@ -683,7 +683,7 @@ static u8 ListMenuAddCursorObject(struct ListMenu *list, u32 cursorKind)
     cursor.rowWidth = GetWindowAttribute(list->template.windowId, WINDOW_WIDTH) * 8 + 2;
     cursor.rowHeight = GetFontAttribute(list->template.fontId, FONTATTR_MAX_LETTER_HEIGHT) + 2;
     cursor.tileTag = 0x4000;
-    cursor.palTag = SPRITE_INVALID_TAG;
+    cursor.palTag = TAG_NONE;
     cursor.palNum = 15;
 
     return ListMenuAddCursorObjectInternal(&cursor, cursorKind);
@@ -1024,11 +1024,11 @@ static void SpriteCallback_ScrollIndicatorArrow(struct Sprite *sprite)
         {
         case 0:
             multiplier = sprite->tMultiplier;
-            sprite->pos2.x = (gSineTable[(u8)(sprite->tSinePos)] * multiplier) / 256;
+            sprite->x2 = (gSineTable[(u8)(sprite->tSinePos)] * multiplier) / 256;
             break;
         case 1:
             multiplier = sprite->tMultiplier;
-            sprite->pos2.y = (gSineTable[(u8)(sprite->tSinePos)] * multiplier) / 256;
+            sprite->y2 = (gSineTable[(u8)(sprite->tSinePos)] * multiplier) / 256;
             break;
         }
         sprite->tSinePos += sprite->tFrequency;
@@ -1076,7 +1076,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
     spriteSheet.tag = arrowInfo->tileTag;
     LoadCompressedSpriteSheet(&spriteSheet);
 
-    if (arrowInfo->palTag == SPRITE_INVALID_TAG)
+    if (arrowInfo->palTag == TAG_NONE)
     {
         LoadPalette(sRedArrowPal, (16 * arrowInfo->palNum) + 0x100, 0x20);
     }
@@ -1099,7 +1099,7 @@ u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate *arrowInfo, u16
     data->topSpriteId = AddScrollIndicatorArrowObject(arrowInfo->firstArrowType, arrowInfo->firstX, arrowInfo->firstY, arrowInfo->tileTag, arrowInfo->palTag);
     data->bottomSpriteId = AddScrollIndicatorArrowObject(arrowInfo->secondArrowType, arrowInfo->secondX, arrowInfo->secondY, arrowInfo->tileTag, arrowInfo->palTag);
 
-    if (arrowInfo->palTag == SPRITE_INVALID_TAG)
+    if (arrowInfo->palTag == TAG_NONE)
     {
         gSprites[data->topSpriteId].oam.paletteNum = arrowInfo->palNum;
         gSprites[data->bottomSpriteId].oam.paletteNum = arrowInfo->palNum;
@@ -1179,9 +1179,9 @@ void RemoveScrollIndicatorArrowPair(u8 taskId)
 {
     struct ScrollIndicatorPair *data = (void*) gTasks[taskId].data;
 
-    if (data->tileTag != SPRITE_INVALID_TAG)
+    if (data->tileTag != TAG_NONE)
         FreeSpriteTilesByTag(data->tileTag);
-    if (data->palTag != SPRITE_INVALID_TAG)
+    if (data->palTag != TAG_NONE)
         FreeSpritePaletteByTag(data->palTag);
 
     DestroySprite(&gSprites[data->topSpriteId]);
@@ -1322,7 +1322,7 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
     spriteSheet.tag = cursor->tileTag;
     LoadCompressedSpriteSheet(&spriteSheet);
 
-    if (cursor->palTag == SPRITE_INVALID_TAG)
+    if (cursor->palTag == TAG_NONE)
     {
         LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20);
     }
@@ -1352,7 +1352,7 @@ static u8 ListMenuAddRedOutlineCursorObject(struct CursorStruct *cursor)
     gSprites[data->spriteId].subpriority = 0;
     gSprites[data->spriteId].subspriteTableNum = 0;
 
-    if (cursor->palTag == SPRITE_INVALID_TAG)
+    if (cursor->palTag == TAG_NONE)
     {
         gSprites[data->spriteId].oam.paletteNum = cursor->palNum;
     }
@@ -1364,8 +1364,8 @@ static void ListMenuUpdateRedOutlineCursorObject(u8 taskId, u16 x, u16 y)
 {
     struct RedOutlineCursor *data = (void*) gTasks[taskId].data;
 
-    gSprites[data->spriteId].pos1.x = x + 120;
-    gSprites[data->spriteId].pos1.y = y + 120;
+    gSprites[data->spriteId].x = x + 120;
+    gSprites[data->spriteId].y = y + 120;
 }
 
 static void ListMenuRemoveRedOutlineCursorObject(u8 taskId)
@@ -1374,9 +1374,9 @@ static void ListMenuRemoveRedOutlineCursorObject(u8 taskId)
 
     Free(data->subspritesPtr);
 
-    if (data->tileTag != SPRITE_INVALID_TAG)
+    if (data->tileTag != TAG_NONE)
         FreeSpriteTilesByTag(data->tileTag);
-    if (data->palTag != SPRITE_INVALID_TAG)
+    if (data->palTag != TAG_NONE)
         FreeSpritePaletteByTag(data->palTag);
 
     DestroySprite(&gSprites[data->spriteId]);
@@ -1385,7 +1385,7 @@ static void ListMenuRemoveRedOutlineCursorObject(u8 taskId)
 
 static void SpriteCallback_RedArrowCursor(struct Sprite *sprite)
 {
-    sprite->pos2.x = gSineTable[(u8)(sprite->data[0])] / 64;
+    sprite->x2 = gSineTable[(u8)(sprite->data[0])] / 64;
     sprite->data[0] += 8;
 }
 
@@ -1407,7 +1407,7 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
     spriteSheet.tag = cursor->tileTag;
     LoadCompressedSpriteSheet(&spriteSheet);
 
-    if (cursor->palTag == SPRITE_INVALID_TAG)
+    if (cursor->palTag == TAG_NONE)
     {
         LoadPalette(sRedArrowPal, (16 * cursor->palNum) + 0x100, 0x20);
     }
@@ -1429,10 +1429,10 @@ static u8 ListMenuAddRedArrowCursorObject(struct CursorStruct *cursor)
     spriteTemplate.paletteTag = cursor->palTag;
 
     data->spriteId = CreateSprite(&spriteTemplate, cursor->left, cursor->top, 0);
-    gSprites[data->spriteId].pos2.x = 8;
-    gSprites[data->spriteId].pos2.y = 8;
+    gSprites[data->spriteId].x2 = 8;
+    gSprites[data->spriteId].y2 = 8;
 
-    if (cursor->palTag == SPRITE_INVALID_TAG)
+    if (cursor->palTag == TAG_NONE)
     {
         gSprites[data->spriteId].oam.paletteNum = cursor->palNum;
     }
@@ -1444,17 +1444,17 @@ static void ListMenuUpdateRedArrowCursorObject(u8 taskId, u16 x, u16 y)
 {
     struct RedArrowCursor *data = (void*) gTasks[taskId].data;
 
-    gSprites[data->spriteId].pos1.x = x;
-    gSprites[data->spriteId].pos1.y = y;
+    gSprites[data->spriteId].x = x;
+    gSprites[data->spriteId].y = y;
 }
 
 static void ListMenuRemoveRedArrowCursorObject(u8 taskId)
 {
     struct RedArrowCursor *data = (void*) gTasks[taskId].data;
 
-    if (data->tileTag != SPRITE_INVALID_TAG)
+    if (data->tileTag != TAG_NONE)
         FreeSpriteTilesByTag(data->tileTag);
-    if (data->palTag != SPRITE_INVALID_TAG)
+    if (data->palTag != TAG_NONE)
         FreeSpritePaletteByTag(data->palTag);
 
     DestroySprite(&gSprites[data->spriteId]);
diff --git a/src/m4a.c b/src/m4a.c
index 105312a40..b159e3873 100644
--- a/src/m4a.c
+++ b/src/m4a.c
@@ -906,7 +906,6 @@ void CgbSound(void)
 {
     s32 ch;
     struct CgbChannel *channels;
-    s32 envelopeStepTimeAndDir;
     s32 prevC15;
     struct SoundInfo *soundInfo = SOUND_INFO_PTR;
     vu8 *nrx0ptr;
@@ -914,6 +913,7 @@ void CgbSound(void)
     vu8 *nrx2ptr;
     vu8 *nrx3ptr;
     vu8 *nrx4ptr;
+    s32 envelopeStepTimeAndDir;
 
     // Most comparision operations that cast to s8 perform 'and' by 0xFF.
     int mask = 0xff;
@@ -1198,8 +1198,8 @@ void CgbSound(void)
             }
             else
             {
-                envelopeStepTimeAndDir &= 0xf;
-                *nrx2ptr = (channels->envelopeVolume << 4) + envelopeStepTimeAndDir;
+                u32 envMask = 0xF;
+                *nrx2ptr = (envelopeStepTimeAndDir & envMask) + (channels->envelopeVolume << 4);
                 *nrx4ptr = channels->n4 | 0x80;
                 if (ch == 1 && !(*nrx0ptr & 0x08))
                     *nrx4ptr = channels->n4 | 0x80;
diff --git a/src/mail.c b/src/mail.c
index 0ee294787..50ff553aa 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -134,98 +134,98 @@ static const u16 sBgColors[GENDER_COUNT][2] = {
 
 static const struct MailGraphics sMailGraphics[] = {
     [ITEM_TO_MAIL(ITEM_ORANGE_MAIL)] = {
-        .palette = gMailPalette_Orange, 
-        .tiles = gMailTiles_Orange, 
-        .tileMap = gMailTilemap_Orange, 
-        .unused = 0x2C0, 
+        .palette = gMailPalette_Orange,
+        .tiles = gMailTiles_Orange,
+        .tileMap = gMailTilemap_Orange,
+        .unused = 0x2C0,
         .textColor = RGB(10, 10, 10),
         .textShadow = RGB(25, 25, 25),
-    }, 
+    },
     [ITEM_TO_MAIL(ITEM_HARBOR_MAIL)] = {
-        .palette = gMailPalette_Harbor, 
-        .tiles = gMailTiles_Harbor, 
-        .tileMap = gMailTilemap_Harbor, 
-        .unused = 0x2E0, 
+        .palette = gMailPalette_Harbor,
+        .tiles = gMailTiles_Harbor,
+        .tileMap = gMailTilemap_Harbor,
+        .unused = 0x2E0,
         .textColor = RGB_WHITE,
         .textShadow = RGB(17, 17, 17),
     },
     [ITEM_TO_MAIL(ITEM_GLITTER_MAIL)] = {
-        .palette = gMailPalette_Glitter, 
-        .tiles = gMailTiles_Glitter, 
-        .tileMap = gMailTilemap_Glitter, 
-        .unused = 0x400, 
+        .palette = gMailPalette_Glitter,
+        .tiles = gMailTiles_Glitter,
+        .tileMap = gMailTilemap_Glitter,
+        .unused = 0x400,
         .textColor = RGB(10, 10, 10),
         .textShadow = RGB(25, 25, 25),
-    }, 
+    },
     [ITEM_TO_MAIL(ITEM_MECH_MAIL)] = {
-        .palette = gMailPalette_Mech, 
-        .tiles = gMailTiles_Mech, 
-        .tileMap = gMailTilemap_Mech, 
-        .unused = 0x1E0, 
+        .palette = gMailPalette_Mech,
+        .tiles = gMailTiles_Mech,
+        .tileMap = gMailTilemap_Mech,
+        .unused = 0x1E0,
         .textColor = RGB_WHITE,
         .textShadow = RGB(17, 17, 17),
-    }, 
+    },
     [ITEM_TO_MAIL(ITEM_WOOD_MAIL)] = {
-        .palette = gMailPalette_Wood, 
-        .tiles = gMailTiles_Wood, 
-        .tileMap = gMailTilemap_Wood, 
-        .unused = 0x2E0, 
+        .palette = gMailPalette_Wood,
+        .tiles = gMailTiles_Wood,
+        .tileMap = gMailTilemap_Wood,
+        .unused = 0x2E0,
         .textColor = RGB_WHITE,
         .textShadow = RGB(17, 17, 17),
-    }, 
+    },
     [ITEM_TO_MAIL(ITEM_WAVE_MAIL)] = {
-        .palette = gMailPalette_Wave, 
-        .tiles = gMailTiles_Wave, 
-        .tileMap = gMailTilemap_Wave, 
-        .unused = 0x300, 
+        .palette = gMailPalette_Wave,
+        .tiles = gMailTiles_Wave,
+        .tileMap = gMailTilemap_Wave,
+        .unused = 0x300,
         .textColor = RGB(10, 10, 10),
         .textShadow = RGB(25, 25, 25),
-    }, 
+    },
     [ITEM_TO_MAIL(ITEM_BEAD_MAIL)] = {
-        .palette = gMailPalette_Bead, 
-        .tiles = gMailTiles_Bead, 
-        .tileMap = gMailTilemap_Bead, 
-        .unused = 0x140, 
+        .palette = gMailPalette_Bead,
+        .tiles = gMailTiles_Bead,
+        .tileMap = gMailTilemap_Bead,
+        .unused = 0x140,
         .textColor = RGB_WHITE,
         .textShadow = RGB(17, 17, 17),
-    }, 
+    },
     [ITEM_TO_MAIL(ITEM_SHADOW_MAIL)] = {
-        .palette = gMailPalette_Shadow, 
-        .tiles = gMailTiles_Shadow, 
-        .tileMap = gMailTilemap_Shadow, 
-        .unused = 0x300, 
+        .palette = gMailPalette_Shadow,
+        .tiles = gMailTiles_Shadow,
+        .tileMap = gMailTilemap_Shadow,
+        .unused = 0x300,
         .textColor = RGB_WHITE,
         .textShadow = RGB(17, 17, 17),
-    }, 
+    },
     [ITEM_TO_MAIL(ITEM_TROPIC_MAIL)] = {
-        .palette = gMailPalette_Tropic, 
-        .tiles = gMailTiles_Tropic, 
-        .tileMap = gMailTilemap_Tropic, 
-        .unused = 0x220, 
+        .palette = gMailPalette_Tropic,
+        .tiles = gMailTiles_Tropic,
+        .tileMap = gMailTilemap_Tropic,
+        .unused = 0x220,
         .textColor = RGB(10, 10, 10),
         .textShadow = RGB(25, 25, 25),
-    }, 
+    },
     [ITEM_TO_MAIL(ITEM_DREAM_MAIL)] = {
-        .palette = gMailPalette_Dream, 
-        .tiles = gMailTiles_Dream, 
-        .tileMap = gMailTilemap_Dream, 
-        .unused = 0x340, 
+        .palette = gMailPalette_Dream,
+        .tiles = gMailTiles_Dream,
+        .tileMap = gMailTilemap_Dream,
+        .unused = 0x340,
         .textColor = RGB(10, 10, 10),
         .textShadow = RGB(25, 25, 25),
-    }, 
+    },
     [ITEM_TO_MAIL(ITEM_FAB_MAIL)] = {
-        .palette = gMailPalette_Fab, 
-        .tiles = gMailTiles_Fab, 
-        .tileMap = gMailTilemap_Fab, 
-        .unused = 0x2a0, 
+        .palette = gMailPalette_Fab,
+        .tiles = gMailTiles_Fab,
+        .tileMap = gMailTilemap_Fab,
+        .unused = 0x2a0,
         .textColor = RGB(10, 10, 10),
         .textShadow = RGB(25, 25, 25),
-    }, 
+    },
     [ITEM_TO_MAIL(ITEM_RETRO_MAIL)] = {
-        .palette = gMailPalette_Retro, 
-        .tiles = gMailTiles_Retro, 
-        .tileMap = gMailTilemap_Retro, 
-        .unused = 0x520, 
+        .palette = gMailPalette_Retro,
+        .tiles = gMailTiles_Retro,
+        .tileMap = gMailTilemap_Retro,
+        .unused = 0x520,
         .textColor = RGB(10, 10, 10),
         .textShadow = RGB(25, 25, 25),
     }
@@ -238,7 +238,7 @@ static const struct MailLineLayout sLineLayouts_Wide[] = {
 };
 
 static const struct MailLayout sMailLayouts_Wide[] = {
-    [ITEM_TO_MAIL(ITEM_ORANGE_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_ORANGE_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -246,7 +246,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_HARBOR_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_HARBOR_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -254,7 +254,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_GLITTER_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_GLITTER_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -262,7 +262,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_MECH_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_MECH_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -270,7 +270,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_WOOD_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_WOOD_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -278,7 +278,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_WAVE_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_WAVE_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -286,7 +286,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_BEAD_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_BEAD_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -294,7 +294,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_SHADOW_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_SHADOW_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -302,7 +302,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_TROPIC_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_TROPIC_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -310,7 +310,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_DREAM_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_DREAM_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -318,7 +318,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_FAB_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_FAB_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 8,
         .signatureWidth = 0,
@@ -326,7 +326,7 @@ static const struct MailLayout sMailLayouts_Wide[] = {
         .wordsXPos = 4,
         .lines = sLineLayouts_Wide,
     },
-    [ITEM_TO_MAIL(ITEM_RETRO_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_RETRO_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Wide),
         .signatureYPos = 0,
         .signatureWidth = 0,
@@ -345,7 +345,7 @@ static const struct MailLineLayout sLineLayouts_Tall[] = {
 };
 
 static const struct MailLayout sMailLayouts_Tall[] = {
-    [ITEM_TO_MAIL(ITEM_ORANGE_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_ORANGE_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 7,
         .signatureWidth = 88,
@@ -353,7 +353,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_HARBOR_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_HARBOR_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 10,
         .signatureWidth = 96,
@@ -361,7 +361,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_GLITTER_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_GLITTER_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 12,
         .signatureWidth = 104,
@@ -369,7 +369,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_MECH_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_MECH_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 5,
         .signatureWidth = 96,
@@ -377,7 +377,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_WOOD_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_WOOD_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 10,
         .signatureWidth = 96,
@@ -385,7 +385,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_WAVE_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_WAVE_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 9,
         .signatureWidth = 112,
@@ -393,7 +393,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_BEAD_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_BEAD_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 12,
         .signatureWidth = 104,
@@ -401,7 +401,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_SHADOW_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_SHADOW_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 13,
         .signatureWidth = 104,
@@ -409,7 +409,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_TROPIC_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_TROPIC_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 9,
         .signatureWidth = 96,
@@ -417,7 +417,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_DREAM_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_DREAM_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 9,
         .signatureWidth = 96,
@@ -425,7 +425,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_FAB_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_FAB_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 17,
         .signatureWidth = 104,
@@ -433,7 +433,7 @@ static const struct MailLayout sMailLayouts_Tall[] = {
         .wordsXPos = 30,
         .lines = sLineLayouts_Tall,
     },
-    [ITEM_TO_MAIL(ITEM_RETRO_MAIL)] = { 
+    [ITEM_TO_MAIL(ITEM_RETRO_MAIL)] = {
         .numLines = ARRAY_COUNT(sLineLayouts_Tall),
         .signatureYPos = 9,
         .signatureWidth = 96,
diff --git a/src/main.c b/src/main.c
index 3125716e2..215f85c46 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,7 +57,7 @@ const IntrFunc gIntrTableTemplate[] =
 
 #define INTR_COUNT ((int)(sizeof(gIntrTableTemplate)/sizeof(IntrFunc)))
 
-static u16 gUnknown_03000000;
+static u16 sUnusedVar; // Never read
 
 u16 gKeyRepeatStartDelay;
 bool8 gLinkTransferringData;
@@ -117,7 +117,7 @@ void AgbMain()
         SetMainCallback2(NULL);
 
     gLinkTransferringData = FALSE;
-    gUnknown_03000000 = 0xFC0;
+    sUnusedVar = 0xFC0;
 
     for (;;)
     {
diff --git a/src/main_menu.c b/src/main_menu.c
index 38e7648d0..a60cf1a28 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -40,17 +40,17 @@
 /*
  * Main menu state machine
  * -----------------------
- * 
+ *
  * Entry point: CB2_InitMainMenu
- * 
+ *
  * Note: States advance sequentially unless otherwise stated.
- * 
+ *
  * CB2_InitMainMenu / CB2_ReinitMainMenu
  *  - Both of these states call InitMainMenu, which does all the work.
  *  - In the Reinit case, the init code will check if the user came from
  *    the options screen. If they did, then the options menu item is
  *    pre-selected.
- * 
+ *
  * Task_MainMenuCheckSaveFile
  *  - Determines how many menu options to show based on whether
  *    the save file is Ok, empty, corrupted, etc.
@@ -59,33 +59,33 @@
  *  - If there were no errors, advance to Task_MainMenuCheckBattery.
  *  - Note that the check to enable Mystery Events would normally happen
  *    here, but this version of Emerald has them disabled.
- * 
+ *
  * Task_WaitForSaveFileErrorWindow
  *  - Wait for the text to finish printing and then for the A button
  *    to be pressed.
- * 
+ *
  * Task_MainMenuCheckBattery
  *  - If the battery is OK, advance to Task_DisplayMainMenu.
  *  - If the battery is dry, advance to Task_WaitForBatteryDryErrorWindow.
- * 
+ *
  * Task_WaitForBatteryDryErrorWindow
  *  - Wait for the text to finish printing and then for the A button
  *    to be pressed.
- * 
+ *
  * Task_DisplayMainWindow
  *  - Display the buttons to the user. If the menu is in HAS_MYSTERY_EVENTS
  *    mode, there are too many buttons for one screen and a scrollbar is added,
  *    and the scrollbar task is spawned (Task_ScrollIndicatorArrowPairOnMainMenu).
- * 
+ *
  * Task_HighlightSelectedMainMenuItem
  *  - Update the UI to match the currently selected item.
- * 
+ *
  * Task_HandleMainMenuInput
  *  - If A is pressed, advance to Task_HandleMainMenuAPressed.
  *  - If B is pressed, return to the title screen via CB2_InitTitleScreen.
  *  - If Up or Down is pressed, handle scrolling if there is a scroll bar, change
  *    the selection, then go back to Task_HighlightSelectedMainMenuItem.
- * 
+ *
  * Task_HandleMainMenuAPressed
  *  - If the user selected New Game, advance to Task_NewGameBirchSpeech_Init.
  *  - If the user selected Continue, advance to CB2_ContinueSavedGame.
@@ -95,15 +95,15 @@
  *    Task_DisplayMainMenuInvalidActionError.
  *  - Code to start a Mystery Event is present here, but is unreachable in this
  *    version.
- *    
+ *
  * Task_HandleMainMenuBPressed
  *  - Clean up the main menu and go back to CB2_InitTitleScreen.
- * 
+ *
  * Task_DisplayMainMenuInvalidActionError
  *  - Print one of three different error messages, wait for the text to stop
  *    printing, and then wait for A or B to be pressed.
  * - Then advance to Task_HandleMainMenuBPressed.
- * 
+ *
  * Task_NewGameBirchSpeechInit
  *  - Load the sprites for the intro speech, start playing music
  * Task_NewGameBirchSpeech_WaitToShowBirch
@@ -126,11 +126,11 @@
  *  - Animates by advancing to Task_NewGameBirchSpeech_SlideOutOldGenderSprite
  *    whenever the player's selection changes.
  *  - Advances to Task_NewGameBirchSpeech_WhatsYourName when done.
- * 
+ *
  * Task_NewGameBirchSpeech_SlideOutOldGenderSprite
  * Task_NewGameBirchSpeech_SlideInNewGenderSprite
  *  - Returns back to Task_NewGameBirchSpeech_ChooseGender.
- * 
+ *
  * Task_NewGameBirchSpeech_WhatsYourName
  * Task_NewGameBirchSpeech_WaitForWhatsYourNameToPrint
  * Task_NewGameBirchSpeech_WaitPressBeforeNameChoice
@@ -144,7 +144,7 @@
  * Task_NewGameBirchSpeech_ProcessNameYesNoMenu
  *  - If confirmed, advance to Task_NewGameBirchSpeech_SlidePlatformAway2.
  *  - Otherwise, return to Task_NewGameBirchSpeech_BoyOrGirl.
- * 
+ *
  * Task_NewGameBirchSpeech_SlidePlatformAway2
  * Task_NewGameBirchSpeech_ReshowBirchLotad
  * Task_NewGameBirchSpeech_WaitForSpriteFadeInAndTextPrinter
@@ -154,7 +154,7 @@
  * Task_NewGameBirchSpeech_FadePlayerToWhite
  * Task_NewGameBirchSpeech_Cleanup
  *  - Advances to CB2_NewGame.
- * 
+ *
  * Task_NewGameBirchSpeechSub_InitPokeball
  *  - Advances to Task_NewGameBirchSpeechSub_WaitForLotad
  * Task_NewGameBirchSpeechSub_WaitForLotad
@@ -170,7 +170,7 @@
 
 // Static RAM declarations
 
-static EWRAM_DATA u8 gUnknown_02022D04 = 0;
+static EWRAM_DATA bool8 sStartedPokeBallTask = 0;
 static EWRAM_DATA u16 sCurrItemAndOptionMenuCheck = 0;
 
 static u8 sBirchSpeechMainTaskId;
@@ -201,7 +201,7 @@ static void NewGameBirchSpeech_ShowDialogueWindow(u8, u8);
 static void NewGameBirchSpeech_ClearWindow(u8);
 static void Task_NewGameBirchSpeech_ThisIsAPokemon(u8);
 static void Task_NewGameBirchSpeech_MainSpeech(u8);
-static void NewGameBirchSpeech_ShowPokeBallPrinterCallback(struct TextPrinterTemplate *printer, u16 a);
+static void NewGameBirchSpeech_WaitForThisIsPokemonText(struct TextPrinterTemplate *printer, u16 a);
 static void Task_NewGameBirchSpeech_AndYouAre(u8);
 static void Task_NewGameBirchSpeechSub_WaitForLotad(u8);
 static void Task_NewGameBirchSpeech_StartBirchLotadPlatformFade(u8);
@@ -1306,8 +1306,8 @@ static void Task_NewGameBirchSpeech_WaitToShowBirch(u8 taskId)
     else
     {
         spriteId = gTasks[taskId].tBirchSpriteId;
-        gSprites[spriteId].pos1.x = 136;
-        gSprites[spriteId].pos1.y = 60;
+        gSprites[spriteId].x = 136;
+        gSprites[spriteId].y = 60;
         gSprites[spriteId].invisible = FALSE;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 10);
@@ -1348,7 +1348,7 @@ static void Task_NewGameBirchSpeech_ThisIsAPokemon(u8 taskId)
     {
         gTasks[taskId].func = Task_NewGameBirchSpeech_MainSpeech;
         StringExpandPlaceholders(gStringVar4, gText_ThisIsAPokemon);
-        AddTextPrinterWithCallbackForMessage(1, NewGameBirchSpeech_ShowPokeBallPrinterCallback);
+        AddTextPrinterWithCallbackForMessage(1, NewGameBirchSpeech_WaitForThisIsPokemonText);
         sBirchSpeechMainTaskId = taskId;
     }
 }
@@ -1369,8 +1369,8 @@ static void Task_NewGameBirchSpeechSub_InitPokeBall(u8 taskId)
 {
     u8 spriteId = gTasks[sBirchSpeechMainTaskId].tLotadSpriteId;
 
-    gSprites[spriteId].pos1.x = 100;
-    gSprites[spriteId].pos1.y = 75;
+    gSprites[spriteId].x = 100;
+    gSprites[spriteId].y = 75;
     gSprites[spriteId].invisible = FALSE;
     gSprites[spriteId].data[0] = 0;
 
@@ -1411,7 +1411,7 @@ static void Task_NewGameBirchSpeech_AndYouAre(u8 taskId)
 {
     if (!RunTextPrintersAndIsPrinter0Active())
     {
-        gUnknown_02022D04 = 0;
+        sStartedPokeBallTask = FALSE;
         StringExpandPlaceholders(gStringVar4, gText_Birch_AndYouAre);
         AddTextPrinterForMessage(1);
         gTasks[taskId].func = Task_NewGameBirchSpeech_StartBirchLotadPlatformFade;
@@ -1459,8 +1459,8 @@ static void Task_NewGameBirchSpeech_StartPlayerFadeIn(u8 taskId)
         {
             u8 spriteId = gTasks[taskId].tBrendanSpriteId;
 
-            gSprites[spriteId].pos1.x = 180;
-            gSprites[spriteId].pos1.y = 60;
+            gSprites[spriteId].x = 180;
+            gSprites[spriteId].y = 60;
             gSprites[spriteId].invisible = FALSE;
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
             gTasks[taskId].tPlayerSpriteId = spriteId;
@@ -1533,7 +1533,7 @@ static void Task_NewGameBirchSpeech_SlideOutOldGenderSprite(u8 taskId)
     u8 spriteId = gTasks[taskId].tPlayerSpriteId;
     if (gTasks[taskId].tIsDoneFadingSprites == 0)
     {
-        gSprites[spriteId].pos1.x += 4;
+        gSprites[spriteId].x += 4;
     }
     else
     {
@@ -1542,8 +1542,8 @@ static void Task_NewGameBirchSpeech_SlideOutOldGenderSprite(u8 taskId)
             spriteId = gTasks[taskId].tMaySpriteId;
         else
             spriteId = gTasks[taskId].tBrendanSpriteId;
-        gSprites[spriteId].pos1.x = DISPLAY_WIDTH;
-        gSprites[spriteId].pos1.y = 60;
+        gSprites[spriteId].x = DISPLAY_WIDTH;
+        gSprites[spriteId].y = 60;
         gSprites[spriteId].invisible = FALSE;
         gTasks[taskId].tPlayerSpriteId = spriteId;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
@@ -1556,13 +1556,13 @@ static void Task_NewGameBirchSpeech_SlideInNewGenderSprite(u8 taskId)
 {
     u8 spriteId = gTasks[taskId].tPlayerSpriteId;
 
-    if (gSprites[spriteId].pos1.x > 180)
+    if (gSprites[spriteId].x > 180)
     {
-        gSprites[spriteId].pos1.x -= 4;
+        gSprites[spriteId].x -= 4;
     }
     else
     {
-        gSprites[spriteId].pos1.x = 180;
+        gSprites[spriteId].x = 180;
         if (gTasks[taskId].tIsDoneFadingSprites)
         {
             gSprites[spriteId].oam.objMode = ST_OAM_OBJ_NORMAL;
@@ -1663,13 +1663,13 @@ static void Task_NewGameBirchSpeech_ReshowBirchLotad(u8 taskId)
         gSprites[gTasks[taskId].tBrendanSpriteId].invisible = TRUE;
         gSprites[gTasks[taskId].tMaySpriteId].invisible = TRUE;
         spriteId = gTasks[taskId].tBirchSpriteId;
-        gSprites[spriteId].pos1.x = 136;
-        gSprites[spriteId].pos1.y = 60;
+        gSprites[spriteId].x = 136;
+        gSprites[spriteId].y = 60;
         gSprites[spriteId].invisible = FALSE;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         spriteId = gTasks[taskId].tLotadSpriteId;
-        gSprites[spriteId].pos1.x = 100;
-        gSprites[spriteId].pos1.y = 75;
+        gSprites[spriteId].x = 100;
+        gSprites[spriteId].y = 75;
         gSprites[spriteId].invisible = FALSE;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         NewGameBirchSpeech_StartFadeInTarget1OutTarget2(taskId, 2);
@@ -1716,8 +1716,8 @@ static void Task_NewGameBirchSpeech_AreYouReady(u8 taskId)
             spriteId = gTasks[taskId].tMaySpriteId;
         else
             spriteId = gTasks[taskId].tBrendanSpriteId;
-        gSprites[spriteId].pos1.x = 120;
-        gSprites[spriteId].pos1.y = 60;
+        gSprites[spriteId].x = 120;
+        gSprites[spriteId].y = 60;
         gSprites[spriteId].invisible = FALSE;
         gSprites[spriteId].oam.objMode = ST_OAM_OBJ_BLEND;
         gTasks[taskId].tPlayerSpriteId = spriteId;
@@ -1833,8 +1833,8 @@ static void CB2_NewGameBirchSpeech_ReturnFromNamingScreen(void)
         gTasks[taskId].tPlayerGender = MALE;
         spriteId = gTasks[taskId].tBrendanSpriteId;
     }
-    gSprites[spriteId].pos1.x = 180;
-    gSprites[spriteId].pos1.y = 60;
+    gSprites[spriteId].x = 180;
+    gSprites[spriteId].y = 60;
     gSprites[spriteId].invisible = FALSE;
     gTasks[taskId].tPlayerSpriteId = spriteId;
     SetGpuReg(REG_OFFSET_BG1HOFS, -60);
@@ -1869,8 +1869,8 @@ static void SpriteCB_MovePlayerDownWhileShrinking(struct Sprite *sprite)
 {
     u32 y;
 
-    y = (sprite->pos1.y << 16) + sprite->data[0] + 0xC000;
-    sprite->pos1.y = y >> 16;
+    y = (sprite->y << 16) + sprite->data[0] + 0xC000;
+    sprite->y = y >> 16;
     sprite->data[0] = y;
 }
 
@@ -2250,21 +2250,21 @@ static void NewGameBirchSpeech_ClearWindow(u8 windowId)
     CopyWindowToVram(windowId, 2);
 }
 
-static void NewGameBirchSpeech_ShowPokeBallPrinterCallback(struct TextPrinterTemplate *printer, u16 a)
+static void NewGameBirchSpeech_WaitForThisIsPokemonText(struct TextPrinterTemplate *printer, u16 a)
 {
-    if (*(printer->currentChar - 2) == 8 && gUnknown_02022D04 == 0)
+    // Wait for Birch's "This is a Pokémon" text to reach the pause
+    // Then start the PokéBall release (if it hasn't been started already)
+    if (*(printer->currentChar - 2) == EXT_CTRL_CODE_PAUSE && !sStartedPokeBallTask)
     {
-        gUnknown_02022D04 = 1;
+        sStartedPokeBallTask = TRUE;
         CreateTask(Task_NewGameBirchSpeechSub_InitPokeBall, 0);
     }
 }
 
-void CreateYesNoMenuParameterized(u8 a, u8 b, u16 c, u16 d, u8 e, u8 f)
+void CreateYesNoMenuParameterized(u8 x, u8 y, u16 baseTileNum, u16 baseBlock, u8 yesNoPalNum, u8 winPalNum)
 {
-    struct WindowTemplate sp;
-
-    sp = CreateWindowTemplate(0, a + 1, b + 1, 5, 4, f, d);
-    CreateYesNoMenu(&sp, c, e, 0);
+    struct WindowTemplate template = CreateWindowTemplate(0, x + 1, y + 1, 5, 4, winPalNum, baseBlock);
+    CreateYesNoMenu(&template, baseTileNum, yesNoPalNum, 0);
 }
 
 static void NewGameBirchSpeech_ShowDialogueWindow(u8 windowId, u8 copyToVram)
diff --git a/src/map_name_popup.c b/src/map_name_popup.c
index cd92bbac1..97b02acf6 100644
--- a/src/map_name_popup.c
+++ b/src/map_name_popup.c
@@ -68,7 +68,7 @@ static const u16 sMapPopUp_PaletteTable[][16] =
 
 static const u16 sMapPopUp_Palette_Underwater[16] = INCBIN_U16("graphics/interface/map_popup/underwater.gbapal");
 
-static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] =
+static const u8 sRegionMapSectionId_To_PopUpThemeIdMapping[] =
 {
     [MAPSEC_LITTLEROOT_TOWN] = MAPPOPUP_THEME_WOOD,
     [MAPSEC_OLDALE_TOWN] = MAPPOPUP_THEME_WOOD,
@@ -378,7 +378,7 @@ static void LoadMapNamePopUpWindowBg(void)
         else
             regionMapSectionId = 0; // Discard kanto region sections;
     }
-    popUpThemeId = gRegionMapSectionId_To_PopUpThemeIdMapping[regionMapSectionId];
+    popUpThemeId = sRegionMapSectionId_To_PopUpThemeIdMapping[regionMapSectionId];
 
     LoadBgTiles(GetWindowAttribute(popupWindowId, WINDOW_BG), sMapPopUp_OutlineTable[popUpThemeId], 0x400, 0x21D);
     CallWindowFunction(popupWindowId, DrawMapNamePopUpFrame);
diff --git a/src/match_call.c b/src/match_call.c
index fd0db630c..b71fc8322 100644
--- a/src/match_call.c
+++ b/src/match_call.c
@@ -1051,8 +1051,8 @@ static bool32 CheckMatchCallChance(void)
     int callChance = 1;
     if (!GetMonData(&gPlayerParty[0], MON_DATA_SANITY_IS_EGG) && GetMonAbility(&gPlayerParty[0]) == ABILITY_LIGHTNING_ROD)
         callChance = 2;
-    
-    if (Random() % 10 < callChance * 3) 
+
+    if (Random() % 10 < callChance * 3)
         return TRUE;
     else
         return FALSE;
@@ -1062,7 +1062,7 @@ static bool32 MapAllowsMatchCall(void)
 {
     if (!Overworld_MapTypeAllowsTeleportAndFly(gMapHeader.mapType) || gMapHeader.regionMapSectionId == MAPSEC_SAFARI_ZONE)
         return FALSE;
-    
+
     if (gMapHeader.regionMapSectionId == MAPSEC_SOOTOPOLIS_CITY
      && FlagGet(FLAG_HIDE_SOOTOPOLIS_CITY_RAYQUAZA) == TRUE
      && FlagGet(FLAG_NEVER_SET_0x0DC) == FALSE)
@@ -1312,7 +1312,7 @@ static bool32 MatchCall_PrintIntro(u8 taskId)
     if (!RunMatchCallTextPrinter(tWindowId))
     {
         FillWindowPixelBuffer(tWindowId, PIXEL_FILL(8));
-        
+
         // Ready the message
         if (!sMatchCallState.triggeredFromScript)
             SelectMatchCallMessage(sMatchCallState.trainerId, gStringVar4);
@@ -1569,7 +1569,7 @@ static const struct MatchCallText *GetBattleMatchCallText(int matchCallId, u8 *s
 {
     int mask;
     u32 textId, topic, id;
-    
+
     topic = Random() % 3;
     textId = sMatchCallTrainers[matchCallId].battleTopicTextIds[topic];
     if (!textId)
@@ -1833,7 +1833,7 @@ static void PopulateBattleFrontierStreak(int matchCallId, u8 *destStr)
         streak /= 10;
         i++;
     }
-    
+
     ConvertIntToDecimalStringN(destStr, sBattleFrontierStreakInfo.streak, STR_CONV_MODE_LEFT_ALIGN, i);
 }
 
@@ -2022,7 +2022,7 @@ static u8 GetPokedexRatingLevel(u16 numSeen)
         return 18;
     if (numSeen < 200)
         return 19;
-    
+
     if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_DEOXYS), FLAG_GET_CAUGHT))
         numSeen--;
     if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(SPECIES_JIRACHI), FLAG_GET_CAUGHT))
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 239639e0b..8de9fc3c9 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -914,219 +914,219 @@ struct Story
 static const struct Story sStorytellerStories[] = {
     // The 50 below is replaced with GAME_STAT_SAVED_GAME
     {
-        50, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_SavedGameAction, 
+        50, 1,
+        MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle,
+        MauvilleCity_PokemonCenter_1F_Text_SavedGameAction,
         MauvilleCity_PokemonCenter_1F_Text_SavedGameStory
     },
     {
-        GAME_STAT_STARTED_TRENDS, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction, 
+        GAME_STAT_STARTED_TRENDS, 1,
+        MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle,
+        MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction,
         MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory
     },
     {
-        GAME_STAT_PLANTED_BERRIES, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction, 
+        GAME_STAT_PLANTED_BERRIES, 1,
+        MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle,
+        MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction,
         MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory
     },
     {
-        GAME_STAT_TRADED_BIKES, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction, 
+        GAME_STAT_TRADED_BIKES, 1,
+        MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle,
+        MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction,
         MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory
     },
     {
-        GAME_STAT_GOT_INTERVIEWED, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_InterviewsAction, 
+        GAME_STAT_GOT_INTERVIEWED, 1,
+        MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle,
+        MauvilleCity_PokemonCenter_1F_Text_InterviewsAction,
         MauvilleCity_PokemonCenter_1F_Text_InterviewsStory
     },
     {
-        GAME_STAT_TRAINER_BATTLES, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction, 
+        GAME_STAT_TRAINER_BATTLES, 1,
+        MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle,
+        MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction,
         MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesStory
     },
     {
-        GAME_STAT_POKEMON_CAPTURES, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction, 
+        GAME_STAT_POKEMON_CAPTURES, 1,
+        MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle,
+        MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction,
         MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory
     },
     {
-        GAME_STAT_FISHING_CAPTURES, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction, 
+        GAME_STAT_FISHING_CAPTURES, 1,
+        MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle,
+        MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction,
         MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory
     },
     {
-        GAME_STAT_HATCHED_EGGS, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction, 
+        GAME_STAT_HATCHED_EGGS, 1,
+        MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle,
+        MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction,
         MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory
     },
     {
-        GAME_STAT_EVOLVED_POKEMON, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction, 
+        GAME_STAT_EVOLVED_POKEMON, 1,
+        MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle,
+        MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction,
         MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory
     },
     {
-        GAME_STAT_USED_POKECENTER, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction, 
+        GAME_STAT_USED_POKECENTER, 1,
+        MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle,
+        MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction,
         MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory
     },
     {
-        GAME_STAT_RESTED_AT_HOME, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction, 
+        GAME_STAT_RESTED_AT_HOME, 1,
+        MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle,
+        MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction,
         MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory
     },
     {
-        GAME_STAT_ENTERED_SAFARI_ZONE, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction, 
+        GAME_STAT_ENTERED_SAFARI_ZONE, 1,
+        MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle,
+        MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction,
         MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory
     },
     {
-        GAME_STAT_USED_CUT, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedCutAction, 
+        GAME_STAT_USED_CUT, 1,
+        MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle,
+        MauvilleCity_PokemonCenter_1F_Text_UsedCutAction,
         MauvilleCity_PokemonCenter_1F_Text_UsedCutStory
     },
     {
-        GAME_STAT_USED_ROCK_SMASH, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction, 
+        GAME_STAT_USED_ROCK_SMASH, 1,
+        MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle,
+        MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction,
         MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory
     },
     {
-        GAME_STAT_MOVED_SECRET_BASE, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction, 
+        GAME_STAT_MOVED_SECRET_BASE, 1,
+        MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle,
+        MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction,
         MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory
     },
     {
-        GAME_STAT_USED_SPLASH, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction, 
+        GAME_STAT_USED_SPLASH, 1,
+        MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle,
+        MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction,
         MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory
     },
     {
-        GAME_STAT_USED_STRUGGLE, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction, 
+        GAME_STAT_USED_STRUGGLE, 1,
+        MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle,
+        MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction,
         MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory
     },
     {
-        GAME_STAT_SLOT_JACKPOTS, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction, 
+        GAME_STAT_SLOT_JACKPOTS, 1,
+        MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle,
+        MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction,
         MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory
     },
     {
-        GAME_STAT_CONSECUTIVE_ROULETTE_WINS, 2, 
-        MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction, 
+        GAME_STAT_CONSECUTIVE_ROULETTE_WINS, 2,
+        MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle,
+        MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction,
         MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory
     },
     {
-        GAME_STAT_ENTERED_BATTLE_TOWER, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction, 
+        GAME_STAT_ENTERED_BATTLE_TOWER, 1,
+        MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle,
+        MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction,
         MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory
     },
     {
-        GAME_STAT_POKEBLOCKS, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction, 
+        GAME_STAT_POKEBLOCKS, 1,
+        MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle,
+        MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction,
         MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory
     },
     {
-        GAME_STAT_ENTERED_CONTEST, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction, 
+        GAME_STAT_ENTERED_CONTEST, 1,
+        MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle,
+        MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction,
         MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory
     },
     {
-        GAME_STAT_WON_CONTEST, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_WonContestsAction, 
+        GAME_STAT_WON_CONTEST, 1,
+        MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle,
+        MauvilleCity_PokemonCenter_1F_Text_WonContestsAction,
         MauvilleCity_PokemonCenter_1F_Text_WonContestsStory
     },
     {
-        GAME_STAT_SHOPPED, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction, 
+        GAME_STAT_SHOPPED, 1,
+        MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle,
+        MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction,
         MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory
     },
     {
-        GAME_STAT_USED_ITEMFINDER, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction, 
+        GAME_STAT_USED_ITEMFINDER, 1,
+        MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle,
+        MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction,
         MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory
     },
     {
-        GAME_STAT_GOT_RAINED_ON, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction, 
+        GAME_STAT_GOT_RAINED_ON, 1,
+        MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle,
+        MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction,
         MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory
     },
     {
-        GAME_STAT_CHECKED_POKEDEX, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction, 
+        GAME_STAT_CHECKED_POKEDEX, 1,
+        MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle,
+        MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction,
         MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory
     },
     {
-        GAME_STAT_RECEIVED_RIBBONS, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction, 
+        GAME_STAT_RECEIVED_RIBBONS, 1,
+        MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle,
+        MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction,
         MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory
     },
     {
-        GAME_STAT_JUMPED_DOWN_LEDGES, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction, 
+        GAME_STAT_JUMPED_DOWN_LEDGES, 1,
+        MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle,
+        MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction,
         MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory
     },
     {
-        GAME_STAT_WATCHED_TV, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction, 
+        GAME_STAT_WATCHED_TV, 1,
+        MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle,
+        MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction,
         MauvilleCity_PokemonCenter_1F_Text_TVWatchedStory
     },
     {
-        GAME_STAT_CHECKED_CLOCK, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction, 
+        GAME_STAT_CHECKED_CLOCK, 1,
+        MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle,
+        MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction,
         MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory
     },
     {
-        GAME_STAT_WON_POKEMON_LOTTERY, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction, 
+        GAME_STAT_WON_POKEMON_LOTTERY, 1,
+        MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle,
+        MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction,
         MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory
     },
     {
-        GAME_STAT_USED_DAYCARE, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction, 
+        GAME_STAT_USED_DAYCARE, 1,
+        MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle,
+        MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction,
         MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory
     },
     {
-        GAME_STAT_RODE_CABLE_CAR, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction, 
+        GAME_STAT_RODE_CABLE_CAR, 1,
+        MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle,
+        MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction,
         MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory
     },
     {
-        GAME_STAT_ENTERED_HOT_SPRINGS, 1, 
-        MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle, 
-        MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction, 
+        GAME_STAT_ENTERED_HOT_SPRINGS, 1,
+        MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle,
+        MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction,
         MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory
     }
 };
diff --git a/src/menu.c b/src/menu.c
index 90e7d8c75..dcc32319e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -62,11 +62,11 @@ static EWRAM_DATA void *sTempTileDataBuffer[0x20] = {NULL};
 
 const u16 gUnknown_0860F074[] = INCBIN_U16("graphics/interface/860F074.gbapal");
 
-static const u8 sTextSpeedFrameDelays[] = 
-{ 
-    [OPTIONS_TEXT_SPEED_SLOW] = 8, 
-    [OPTIONS_TEXT_SPEED_MID]  = 4, 
-    [OPTIONS_TEXT_SPEED_FAST] = 1 
+static const u8 sTextSpeedFrameDelays[] =
+{
+    [OPTIONS_TEXT_SPEED_SLOW] = 8,
+    [OPTIONS_TEXT_SPEED_MID]  = 4,
+    [OPTIONS_TEXT_SPEED_FAST] = 1
 };
 
 static const struct WindowTemplate sStandardTextBox_WindowTemplates[] =
@@ -1097,32 +1097,32 @@ s8 Menu_ProcessInputNoWrapAround_other(void)
     return MENU_NOTHING_CHOSEN;
 }
 
-void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs)
+void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *menuActions)
 {
     u8 i;
     for (i = 0; i < itemCount; i++)
     {
-        AddTextPrinterParameterized(windowId, fontId, strs[i].text, left, (lineHeight * i) + top, 0xFF, NULL);
+        AddTextPrinterParameterized(windowId, fontId, menuActions[i].text, left, (lineHeight * i) + top, 0xFF, NULL);
     }
     CopyWindowToVram(windowId, 2);
 }
 
-void sub_81987BC(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 a6, u8 a7)
+void sub_81987BC(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *menuActions, u8 a6, u8 a7)
 {
     u8 i;
     for (i = 0; i < itemCount; i++)
     {
-        AddTextPrinterParameterized5(windowId, fontId, strs[i].text, left, (lineHeight * i) + top, 0xFF, NULL, a6, a7);
+        AddTextPrinterParameterized5(windowId, fontId, menuActions[i].text, left, (lineHeight * i) + top, 0xFF, NULL, a6, a7);
     }
     CopyWindowToVram(windowId, 2);
 }
 
-void sub_8198854(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs)
+void sub_8198854(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *menuActions)
 {
-    PrintTextArray(windowId, fontId, GetFontAttribute(fontId, 0), 1, lineHeight, itemCount, strs);
+    PrintTextArray(windowId, fontId, GetFontAttribute(fontId, 0), 1, lineHeight, itemCount, menuActions);
 }
 
-void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a8)
+void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *menuActions, const u8 *actionIds)
 {
     u8 i;
     struct TextPrinterTemplate printer;
@@ -1140,7 +1140,7 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l
 
     for (i = 0; i < itemCount; i++)
     {
-        printer.currentChar = strs[a8[i]].text;
+        printer.currentChar = menuActions[actionIds[i]].text;
         printer.y = (lineHeight * i) + top;
         printer.currentY = printer.y;
         AddTextPrinter(&printer, 0xFF, NULL);
@@ -1149,9 +1149,9 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l
     CopyWindowToVram(windowId, 2);
 }
 
-void sub_81989B8(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a5)
+void sub_81989B8(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *menuActions, const u8 *actionIds)
 {
-    AddItemMenuActionTextPrinters(windowId, fontId, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH), 1, GetFontAttribute(fontId, FONTATTR_LETTER_SPACING), lineHeight, itemCount, strs, a5);
+    AddItemMenuActionTextPrinters(windowId, fontId, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH), 1, GetFontAttribute(fontId, FONTATTR_LETTER_SPACING), lineHeight, itemCount, menuActions, actionIds);
 }
 
 void SetWindowTemplateFields(struct WindowTemplate *template, u8 bg, u8 left, u8 top, u8 width, u8 height, u8 paletteNum, u16 baseBlock)
@@ -1224,7 +1224,7 @@ void sub_8198C78(void)
     RemoveWindow(sYesNoWindowId);
 }
 
-void sub_8198C94(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u8 a7, const struct MenuAction *strs)
+void sub_8198C94(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u8 a7, const struct MenuAction *menuActions)
 {
     u8 i;
     u8 j;
@@ -1232,18 +1232,18 @@ void sub_8198C94(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 a5, u8 a6, u
     {
         for (j = 0; j < a6; j++)
         {
-            AddTextPrinterParameterized(windowId, fontId, strs[(i * a6) + j].text, (a4 * j) + left, (a5 * i) + top, 0xFF, NULL);
+            AddTextPrinterParameterized(windowId, fontId, menuActions[(i * a6) + j].text, (a4 * j) + left, (a5 * i) + top, 0xFF, NULL);
         }
     }
     CopyWindowToVram(windowId, 2);
 }
 
-void sub_8198D54(u8 windowId, u8 fontId, u8 a2, u8 a3, u8 a4, u8 a5, const struct MenuAction *strs)
+void sub_8198D54(u8 windowId, u8 fontId, u8 a2, u8 a3, u8 a4, u8 a5, const struct MenuAction *menuActions)
 {
-    sub_8198C94(windowId, fontId, GetFontAttribute(fontId, 0), 0, a2, a3, a4, a5, strs);
+    sub_8198C94(windowId, fontId, GetFontAttribute(fontId, 0), 0, a2, a3, a4, a5, menuActions);
 }
 
-void PrintMenuActionGrid(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 horizontalCount, u8 verticalCount, const struct MenuAction *strs, const u8 *strIds)
+void PrintMenuActionGrid(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 horizontalCount, u8 verticalCount, const struct MenuAction *menuActions, const u8 *actionIds)
 {
     u8 i;
     u8 j;
@@ -1262,7 +1262,7 @@ void PrintMenuActionGrid(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth
     {
         for (j = 0; j < horizontalCount; j++)
         {
-            printer.currentChar = strs[strIds[(horizontalCount * i) + j]].text;
+            printer.currentChar = menuActions[actionIds[(horizontalCount * i) + j]].text;
             printer.x = (optionWidth * j) + left;
             printer.y = (GetFontAttribute(fontId, FONTATTR_MAX_LETTER_HEIGHT) * i) + top;
             printer.currentX = printer.x;
@@ -1275,9 +1275,9 @@ void PrintMenuActionGrid(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth
 }
 
 // Unused
-static void PrintMenuActionGrid_TopLeft(u8 windowId, u8 fontId, u8 optionWidth, u8 unused, u8 horizontalCount, u8 verticalCount, const struct MenuAction *strs, const u8 *strIds)
+static void PrintMenuActionGrid_TopLeft(u8 windowId, u8 fontId, u8 optionWidth, u8 unused, u8 horizontalCount, u8 verticalCount, const struct MenuAction *menuActions, const u8 *actionIds)
 {
-    PrintMenuActionGrid(windowId, fontId, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH), 0, optionWidth, horizontalCount, verticalCount, strs, strIds);
+    PrintMenuActionGrid(windowId, fontId, GetFontAttribute(fontId, FONTATTR_MAX_LETTER_WIDTH), 0, optionWidth, horizontalCount, verticalCount, menuActions, actionIds);
 }
 
 u8 sub_8198F58(u8 windowId, u8 fontId, u8 left, u8 top, u8 a4, u8 cursorHeight, u8 a6, u8 a7, u8 numChoices, u8 a9)
@@ -1597,19 +1597,19 @@ u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 itemCount, u8
     return InitMenuInUpperLeftCorner(windowId, itemCount, initialCursorPos, FALSE);
 }
 
-void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs)
+void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *menuActions)
 {
     u32 i;
 
     for (i = 0; i < itemCount; i++)
     {
-        AddTextPrinterParameterized(windowId, 1, strs[i].text, 8, (i * 16) + 1, 0xFF, NULL);
+        AddTextPrinterParameterized(windowId, 1, menuActions[i].text, 8, (i * 16) + 1, 0xFF, NULL);
     }
 
     CopyWindowToVram(windowId, 2);
 }
 
-void sub_81995E4(u8 windowId, u8 itemCount, const struct MenuAction *strs, const u8 *a8)
+void sub_81995E4(u8 windowId, u8 itemCount, const struct MenuAction *menuActions, const u8 *actionIds)
 {
     u8 i;
     struct TextPrinterTemplate printer;
@@ -1627,7 +1627,7 @@ void sub_81995E4(u8 windowId, u8 itemCount, const struct MenuAction *strs, const
 
     for (i = 0; i < itemCount; i++)
     {
-        printer.currentChar = strs[a8[i]].text;
+        printer.currentChar = menuActions[actionIds[i]].text;
         printer.y = (i * 16) + 1;
         printer.currentY = (i * 16) + 1;
         AddTextPrinter(&printer, 0xFF, NULL);
@@ -1661,19 +1661,19 @@ void CreateYesNoMenu(const struct WindowTemplate *window, u16 baseTileNum, u8 pa
     InitMenuInUpperLeftCornerPlaySoundWhenAPressed(sYesNoWindowId, 2, initialCursorPos);
 }
 
-void PrintMenuGridTable(u8 windowId, u8 optionWidth, u8 columns, u8 rows, const struct MenuAction *strs)
+void PrintMenuGridTable(u8 windowId, u8 optionWidth, u8 columns, u8 rows, const struct MenuAction *menuActions)
 {
     u32 i, j;
 
     for (i = 0; i < rows; i++)
     {
         for (j = 0; j < columns; j++)
-            AddTextPrinterParameterized(windowId, 1, strs[(i * columns) + j].text, (optionWidth * j) + 8, (i * 16) + 1, 0xFF, NULL);
+            AddTextPrinterParameterized(windowId, 1, menuActions[(i * columns) + j].text, (optionWidth * j) + 8, (i * 16) + 1, 0xFF, NULL);
     }
     CopyWindowToVram(windowId, 2);
 }
 
-void sub_819983C(u8 windowId, u8 a4, u8 itemCount, u8 itemCount2, const struct MenuAction *strs, const u8 *a8)
+void sub_819983C(u8 windowId, u8 a4, u8 itemCount, u8 itemCount2, const struct MenuAction *menuActions, const u8 *actionIds)
 {
     u8 i;
     u8 j;
@@ -1692,7 +1692,7 @@ void sub_819983C(u8 windowId, u8 a4, u8 itemCount, u8 itemCount2, const struct M
     {
         for (j = 0; j < itemCount; j++)
         {
-            printer.currentChar = strs[a8[(itemCount * i) + j]].text;
+            printer.currentChar = menuActions[actionIds[(itemCount * i) + j]].text;
             printer.x = (a4 * j) + 8;
             printer.y = (16 * i) + 1;
             printer.currentX = printer.x;
@@ -1769,9 +1769,7 @@ void ResetTempTileDataBuffers(void)
 {
     int i;
     for (i = 0; i < (int)ARRAY_COUNT(sTempTileDataBuffer); i++)
-    {
         sTempTileDataBuffer[i] = NULL;
-    }
     sTempTileDataBufferIdx = 0;
 }
 
@@ -1784,9 +1782,7 @@ bool8 FreeTempTileDataBuffersIfPossible(void)
         if (sTempTileDataBufferIdx)
         {
             for (i = 0; i < sTempTileDataBufferIdx; i++)
-            {
                 FREE_AND_SET_NULL(sTempTileDataBuffer[i]);
-            }
             sTempTileDataBufferIdx = 0;
         }
         return FALSE;
diff --git a/src/menu_helpers.c b/src/menu_helpers.c
index 151de0bd4..331755590 100644
--- a/src/menu_helpers.c
+++ b/src/menu_helpers.c
@@ -23,10 +23,10 @@
 static void Task_ContinueTaskAfterMessagePrints(u8 taskId);
 static void Task_CallYesOrNoCallback(u8 taskId);
 
-EWRAM_DATA static struct YesNoFuncTable gUnknown_0203A138 = {0};
-EWRAM_DATA static u8 gUnknown_0203A140 = 0;
+EWRAM_DATA static struct YesNoFuncTable sYesNo = {0};
+EWRAM_DATA static u8 sMessageWindowId = 0;
 
-static TaskFunc gUnknown_0300117C;
+static TaskFunc sMessageNextTask;
 
 static const struct OamData sOamData_SwapLine =
 {
@@ -122,17 +122,17 @@ void SetVBlankHBlankCallbacksToNull(void)
     SetHBlankCallback(NULL);
 }
 
-void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc)
+void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 paletteNum, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc)
 {
-    gUnknown_0203A140 = windowId;
-    DrawDialogFrameWithCustomTileAndPalette(windowId, TRUE, arg2, arg3);
+    sMessageWindowId = windowId;
+    DrawDialogFrameWithCustomTileAndPalette(windowId, TRUE, tileNum, paletteNum);
 
     if (string != gStringVar4)
         StringExpandPlaceholders(gStringVar4, string);
 
     gTextFlags.canABSpeedUpPrint = 1;
     AddTextPrinterParameterized2(windowId, fontId, gStringVar4, textSpeed, NULL, 2, 1, 3);
-    gUnknown_0300117C = taskFunc;
+    sMessageNextTask = taskFunc;
     gTasks[taskId].func = Task_ContinueTaskAfterMessagePrints;
 }
 
@@ -144,20 +144,20 @@ bool16 RunTextPrintersRetIsActive(u8 textPrinterId)
 
 static void Task_ContinueTaskAfterMessagePrints(u8 taskId)
 {
-    if (!RunTextPrintersRetIsActive(gUnknown_0203A140))
-        gUnknown_0300117C(taskId);
+    if (!RunTextPrintersRetIsActive(sMessageWindowId))
+        sMessageNextTask(taskId);
 }
 
 void DoYesNoFuncWithChoice(u8 taskId, const struct YesNoFuncTable *data)
 {
-    gUnknown_0203A138 = *data;
+    sYesNo = *data;
     gTasks[taskId].func = Task_CallYesOrNoCallback;
 }
 
 void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo)
 {
     CreateYesNoMenu(template, tileStart, palette, 0);
-    gUnknown_0203A138 = *yesNo;
+    sYesNo = *yesNo;
     gTasks[taskId].func = Task_CallYesOrNoCallback;
 }
 
@@ -167,12 +167,12 @@ static void Task_CallYesOrNoCallback(u8 taskId)
     {
     case 0:
         PlaySE(SE_SELECT);
-        gUnknown_0203A138.yesFunc(taskId);
+        sYesNo.yesFunc(taskId);
         break;
     case 1:
     case MENU_B_PRESSED:
         PlaySE(SE_SELECT);
-        gUnknown_0203A138.noFunc(taskId);
+        sYesNo.noFunc(taskId);
         break;
     }
 }
@@ -275,11 +275,13 @@ u8 GetLRKeysPressedAndHeld(void)
     return 0;
 }
 
-bool8 sub_8122148(u16 itemId)
+bool8 IsHoldingItemAllowed(u16 itemId)
 {
+    // Enigma Berry can't be held in link areas
     if (itemId != ITEM_ENIGMA_BERRY)
         return TRUE;
-    else if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRADE_CENTER) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRADE_CENTER))
+    else if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(TRADE_CENTER)
+          && gSaveBlock1Ptr->location.mapNum == MAP_NUM(TRADE_CENTER))
         return FALSE;
     else if (InUnionRoom() != TRUE)
         return TRUE;
@@ -323,66 +325,72 @@ bool8 MenuHelpers_CallLinkSomething(void)
         return TRUE;
 }
 
-void sub_812220C(struct ItemSlot *slots, u8 count, u8 *arg2, u8 *usedSlotsCount, u8 maxUsedSlotsCount)
+void SetItemListPerPageCount(struct ItemSlot *slots, u8 slotsCount, u8 *pageItems, u8 *totalItems, u8 maxPerPage)
 {
     u16 i;
     struct ItemSlot *slots_ = slots;
 
-    (*usedSlotsCount) = 0;
-    for (i = 0; i < count; i++)
+    // Count the number of non-empty item slots
+    *totalItems = 0;
+    for (i = 0; i < slotsCount; i++)
     {
         if (slots_[i].itemId != ITEM_NONE)
-            (*usedSlotsCount)++;
+            (*totalItems)++;
     }
+    (*totalItems)++; // + 1 for 'Cancel'
 
-    (*usedSlotsCount)++;
-    if ((*usedSlotsCount) > maxUsedSlotsCount)
-        *arg2 = maxUsedSlotsCount;
+    // Set number of items per page
+    if (*totalItems > maxPerPage)
+        *pageItems = maxPerPage;
     else
-        *arg2 = (*usedSlotsCount);
+        *pageItems = *totalItems;
 }
 
-void sub_812225C(u16 *scrollOffset, u16 *cursorPos, u8 maxShownItems, u8 numItems)
+void SetCursorWithinListBounds(u16 *scrollOffset, u16 *cursorPos, u8 maxShownItems, u8 totalItems)
 {
-    if (*scrollOffset != 0 && *scrollOffset + maxShownItems > numItems)
-        *scrollOffset = numItems - maxShownItems;
+    if (*scrollOffset != 0 && *scrollOffset + maxShownItems > totalItems)
+        *scrollOffset = totalItems - maxShownItems;
 
-    if (*scrollOffset + *cursorPos >= numItems)
+    if (*scrollOffset + *cursorPos >= totalItems)
     {
-        if (numItems == 0)
+        if (totalItems == 0)
             *cursorPos = 0;
         else
-            *cursorPos = numItems - 1;
+            *cursorPos = totalItems - 1;
     }
 }
 
-void sub_8122298(u16 *arg0, u16 *arg1, u8 arg2, u8 arg3, u8 arg4)
+void SetCursorScrollWithinListBounds(u16 *scrollOffset, u16 *cursorPos, u8 shownItems, u8 totalItems, u8 maxShownItems)
 {
     u8 i;
 
-    if (arg4 % 2 != 0)
+    if (maxShownItems % 2 != 0)
     {
-        if ((*arg1) >= arg4 / 2)
+        // Is cursor at least halfway down visible list
+        if (*cursorPos >= maxShownItems / 2)
         {
-            for (i = 0; i < (*arg1) - (arg4 / 2); i++)
+            for (i = 0; i < *cursorPos - (maxShownItems / 2); i++)
             {
-                if ((*arg0) + arg2 == arg3)
+                // Stop if reached end of list
+                if (*scrollOffset + shownItems == totalItems)
                     break;
-                (*arg1)--;
-                (*arg0)++;
+                (*cursorPos)--;
+                (*scrollOffset)++;
             }
         }
     }
     else
     {
-        if ((*arg1) >= (arg4 / 2) + 1)
+        // Is cursor at least halfway down visible list
+        if (*cursorPos >= (maxShownItems / 2) + 1)
         {
-            for (i = 0; i <= (*arg1) - (arg4 / 2); i++)
+            for (i = 0; i <= *cursorPos - (maxShownItems / 2); i++)
             {
-                if ((*arg0) + arg2 == arg3)
+                // Stop if reached end of list
+                if (*scrollOffset + shownItems == totalItems)
                     break;
-                (*arg1)--;
-                (*arg0)++;
+                (*cursorPos)--;
+                (*scrollOffset)++;
             }
         }
     }
@@ -432,16 +440,20 @@ void SetSwapLineSpritesInvisibility(u8 *spriteIds, u8 count, bool8 invisible)
 void UpdateSwapLineSpritesPos(u8 *spriteIds, u8 count, s16 x, u16 y)
 {
     u8 i;
-    bool8 unknownBit = count & 0x80;
-    count &= ~(0x80);
+    bool8 hasMargin = count & SWAP_LINE_HAS_MARGIN;
+    count &= ~SWAP_LINE_HAS_MARGIN;
 
     for (i = 0; i < count; i++)
     {
-        if (i == count - 1 && unknownBit)
-            gSprites[spriteIds[i]].pos2.x = x - 8;
+        // If the list menu has a right margin, the swap line
+        // shouldn't extend all the way to the edge of the screen.
+        // If this is the last sprite in the line, move it a bit
+        // to the left to keep it out of the margin.
+        if (i == count - 1 && hasMargin)
+            gSprites[spriteIds[i]].x2 = x - 8;
         else
-            gSprites[spriteIds[i]].pos2.x = x;
+            gSprites[spriteIds[i]].x2 = x;
 
-        gSprites[spriteIds[i]].pos1.y = 1 + y;
+        gSprites[spriteIds[i]].y = 1 + y;
     }
 }
diff --git a/src/menu_specialized.c b/src/menu_specialized.c
index 2afcf51ca..c9d895e19 100644
--- a/src/menu_specialized.c
+++ b/src/menu_specialized.c
@@ -28,10 +28,10 @@
 
 extern const struct CompressedSpriteSheet gMonFrontPicTable[];
 
-EWRAM_DATA static u8 sUnknown_0203CF48[3] = {0};
-EWRAM_DATA static struct ListMenuItem *sUnknown_0203CF4C = NULL;
+EWRAM_DATA static u8 sMailboxWindowIds[MAILBOXWIN_COUNT] = {0};
+EWRAM_DATA static struct ListMenuItem *sMailboxList = NULL;
 
-static void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list);
+static void MailboxMenu_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list);
 static void sub_81D24A4(struct ConditionGraph *a0);
 static void sub_81D2634(struct ConditionGraph *a0);
 static void MoveRelearnerCursorCallback(s32 itemIndex, bool8 onInit, struct ListMenu *list);
@@ -40,33 +40,33 @@ static void SetNextConditionSparkle(struct Sprite *sprite);
 static void SpriteCB_ConditionSparkle(struct Sprite *sprite);
 static void ShowAllConditionSparkles(struct Sprite *sprite);
 
-static const struct WindowTemplate sUnknown_086253E8[] =
+static const struct WindowTemplate sWindowTemplates_MailboxMenu[MAILBOXWIN_COUNT] =
 {
-    {
+    [MAILBOXWIN_TITLE] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 1,
         .width = 8,
         .height = 2,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x8
     },
-    {
+    [MAILBOXWIN_LIST] = {
         .bg = 0,
         .tilemapLeft = 21,
         .tilemapTop = 1,
         .width = 8,
         .height = 18,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x18
     },
-    {
+    [MAILBOXWIN_OPTIONS] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 1,
         .width = 11,
         .height = 8,
-        .paletteNum = 0xF,
+        .paletteNum = 15,
         .baseBlock = 0x18
     }
 };
@@ -207,53 +207,55 @@ static const struct ListMenuTemplate sMoveRelearnerMovesListTemplate =
     .cursorKind = 0
 };
 
-bool8 sub_81D1C44(u8 count)
+bool8 MailboxMenu_Alloc(u8 count)
 {
     u8 i;
 
-    sUnknown_0203CF4C = Alloc(count * sizeof(*sUnknown_0203CF4C) + sizeof(*sUnknown_0203CF4C));
-    if (sUnknown_0203CF4C == NULL)
+    // + 1 to count for 'Cancel'
+    sMailboxList = Alloc((count + 1) * sizeof(*sMailboxList));
+    if (sMailboxList == NULL)
         return FALSE;
 
-    for (i = 0; i < ARRAY_COUNT(sUnknown_0203CF48); i++)
-        sUnknown_0203CF48[i] = WINDOW_NONE;
+    for (i = 0; i < ARRAY_COUNT(sMailboxWindowIds); i++)
+        sMailboxWindowIds[i] = WINDOW_NONE;
 
     return TRUE;
 }
 
-u8 sub_81D1C84(u8 a0)
+u8 MailboxMenu_AddWindow(u8 windowIdx)
 {
-    if (sUnknown_0203CF48[a0] == WINDOW_NONE)
+    if (sMailboxWindowIds[windowIdx] == WINDOW_NONE)
     {
-        if (a0 == 2)
+        if (windowIdx == MAILBOXWIN_OPTIONS)
         {
-            struct WindowTemplate template = sUnknown_086253E8[2];
+            struct WindowTemplate template = sWindowTemplates_MailboxMenu[windowIdx];
             template.width = GetMaxWidthInMenuTable(&gMailboxMailOptions[0], 4);
-            sUnknown_0203CF48[2] = AddWindow(&template);
+            sMailboxWindowIds[windowIdx] = AddWindow(&template);
         }
-        else
+        else // MAILBOXWIN_TITLE or MAILBOXWIN_LIST
         {
-            sUnknown_0203CF48[a0] = AddWindow(&sUnknown_086253E8[a0]);
+            sMailboxWindowIds[windowIdx] = AddWindow(&sWindowTemplates_MailboxMenu[windowIdx]);
         }
-        SetStandardWindowBorderStyle(sUnknown_0203CF48[a0], 0);
+        SetStandardWindowBorderStyle(sMailboxWindowIds[windowIdx], 0);
     }
-    return sUnknown_0203CF48[a0];
+    return sMailboxWindowIds[windowIdx];
 }
 
-void sub_81D1D04(u8 a0)
+void MailboxMenu_RemoveWindow(u8 windowIdx)
 {
-    ClearStdWindowAndFrameToTransparent(sUnknown_0203CF48[a0], 0);
-    ClearWindowTilemap(sUnknown_0203CF48[a0]);
-    RemoveWindow(sUnknown_0203CF48[a0]);
-    sUnknown_0203CF48[a0] = WINDOW_NONE;
+    ClearStdWindowAndFrameToTransparent(sMailboxWindowIds[windowIdx], 0);
+    ClearWindowTilemap(sMailboxWindowIds[windowIdx]);
+    RemoveWindow(sMailboxWindowIds[windowIdx]);
+    sMailboxWindowIds[windowIdx] = WINDOW_NONE;
 }
 
-static u8 sub_81D1D34(u8 a0)
+// Unused
+static u8 MailboxMenu_GetWindowId(u8 windowIdx)
 {
-    return sUnknown_0203CF48[a0];
+    return sMailboxWindowIds[windowIdx];
 }
 
-static void sub_81D1D44(u8 windowId, u32 itemId, u8 y)
+static void MailboxMenu_ItemPrintFunc(u8 windowId, u32 itemId, u8 y)
 {
     u8 buffer[30];
     u16 length;
@@ -269,21 +271,21 @@ static void sub_81D1D44(u8 windowId, u32 itemId, u8 y)
     AddTextPrinterParameterized4(windowId, 1, 8, y, 0, 0, sPlayerNameTextColors, -1, buffer);
 }
 
-u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page)
+u8 MailboxMenu_CreateList(struct PlayerPCItemPageStruct *page)
 {
     u16 i;
     for (i = 0; i < page->count; i++)
     {
-        sUnknown_0203CF4C[i].name = sEmptyItemName;
-        sUnknown_0203CF4C[i].id = i;
+        sMailboxList[i].name = sEmptyItemName;
+        sMailboxList[i].id = i;
     }
 
-    sUnknown_0203CF4C[i].name = gText_Cancel2;
-    sUnknown_0203CF4C[i].id = LIST_CANCEL;
+    sMailboxList[i].name = gText_Cancel2;
+    sMailboxList[i].id = LIST_CANCEL;
 
-    gMultiuseListMenuTemplate.items = sUnknown_0203CF4C;
+    gMultiuseListMenuTemplate.items = sMailboxList;
     gMultiuseListMenuTemplate.totalItems = page->count + 1;
-    gMultiuseListMenuTemplate.windowId = sUnknown_0203CF48[1];
+    gMultiuseListMenuTemplate.windowId = sMailboxWindowIds[MAILBOXWIN_LIST];
     gMultiuseListMenuTemplate.header_X = 0;
     gMultiuseListMenuTemplate.item_X = 8;
     gMultiuseListMenuTemplate.cursor_X = 0;
@@ -292,8 +294,8 @@ u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page)
     gMultiuseListMenuTemplate.cursorPal = 2;
     gMultiuseListMenuTemplate.fillValue = 1;
     gMultiuseListMenuTemplate.cursorShadowPal = 3;
-    gMultiuseListMenuTemplate.moveCursorFunc = sub_81D1E7C;
-    gMultiuseListMenuTemplate.itemPrintFunc = sub_81D1D44;
+    gMultiuseListMenuTemplate.moveCursorFunc = MailboxMenu_MoveCursorFunc;
+    gMultiuseListMenuTemplate.itemPrintFunc = MailboxMenu_ItemPrintFunc;
     gMultiuseListMenuTemplate.fontId = 1;
     gMultiuseListMenuTemplate.cursorKind = 0;
     gMultiuseListMenuTemplate.lettersSpacing = 0;
@@ -302,20 +304,20 @@ u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page)
     return ListMenuInit(&gMultiuseListMenuTemplate, page->itemsAbove, page->cursorPos);
 }
 
-static void sub_81D1E7C(s32 itemIndex, bool8 onInit, struct ListMenu *list)
+static void MailboxMenu_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list)
 {
     if (onInit != TRUE)
         PlaySE(SE_SELECT);
 }
 
-void sub_81D1E90(struct PlayerPCItemPageStruct *page)
+void MailboxMenu_AddScrollArrows(struct PlayerPCItemPageStruct *page)
 {
     page->scrollIndicatorTaskId = AddScrollIndicatorArrowPairParameterized(2, 0xC8, 12, 0x94, page->count - page->pageItems + 1, 0x6E, 0x6E, &page->itemsAbove);
 }
 
-void sub_81D1EC0(void)
+void MailboxMenu_Free(void)
 {
-    Free(sUnknown_0203CF4C);
+    Free(sMailboxList);
 }
 
 void InitConditionGraphData(struct ConditionGraph *graph)
@@ -995,7 +997,7 @@ void GetConditionMenuMonNameAndLocString(u8 *locationDst, u8 *nameDst, u16 boxId
         if (box == TOTAL_BOXES_COUNT) // Party mon.
             BufferConditionMenuSpacedStringN(&locationDst[5], gText_InParty, 8);
         else
-            BufferConditionMenuSpacedStringN(&locationDst[5], GetBoxNamePtr(box), 8);
+            BufferConditionMenuSpacedStringN(&locationDst[5], GetBoxNamePtr(box), BOX_NAME_LENGTH);
     }
     else
     {
@@ -1310,13 +1312,13 @@ static void SetConditionSparklePosition(struct Sprite *sprite)
 
     if (mon != NULL)
     {
-        sprite->pos1.x = mon->pos1.x + mon->pos2.x + sConditionSparkleCoords[sprite->sSparkleId][0];
-        sprite->pos1.y = mon->pos1.y + mon->pos2.y + sConditionSparkleCoords[sprite->sSparkleId][1];
+        sprite->x = mon->x + mon->x2 + sConditionSparkleCoords[sprite->sSparkleId][0];
+        sprite->y = mon->y + mon->y2 + sConditionSparkleCoords[sprite->sSparkleId][1];
     }
     else
     {
-        sprite->pos1.x = sConditionSparkleCoords[sprite->sSparkleId][0] + 40;
-        sprite->pos1.y = sConditionSparkleCoords[sprite->sSparkleId][1] + 104;
+        sprite->x = sConditionSparkleCoords[sprite->sSparkleId][0] + 40;
+        sprite->y = sConditionSparkleCoords[sprite->sSparkleId][1] + 104;
     }
 }
 
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index 2a9304a4d..5c8b8ec51 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -631,11 +631,11 @@ bool8 MetatileBehavior_IsCableBoxResults1(u8 metatileBehavior)
 
 bool8 MetatileBehavior_IsOpenSecretBaseDoor(u8 metatileBehavior)
 {
-    if (metatileBehavior == MB_SECRET_BASE_SPOT_RED_CAVE_OPEN 
+    if (metatileBehavior == MB_SECRET_BASE_SPOT_RED_CAVE_OPEN
      || metatileBehavior == MB_SECRET_BASE_SPOT_BROWN_CAVE_OPEN
-     || metatileBehavior == MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN 
+     || metatileBehavior == MB_SECRET_BASE_SPOT_YELLOW_CAVE_OPEN
      || metatileBehavior == MB_SECRET_BASE_SPOT_TREE_LEFT_OPEN
-     || metatileBehavior == MB_SECRET_BASE_SPOT_SHRUB_OPEN 
+     || metatileBehavior == MB_SECRET_BASE_SPOT_SHRUB_OPEN
      || metatileBehavior == MB_SECRET_BASE_SPOT_BLUE_CAVE_OPEN
      || metatileBehavior == MB_SECRET_BASE_SPOT_TREE_RIGHT_OPEN)
         return TRUE;
diff --git a/src/minigame_countdown.c b/src/minigame_countdown.c
index 2d4d98138..cd2971732 100644
--- a/src/minigame_countdown.c
+++ b/src/minigame_countdown.c
@@ -242,10 +242,10 @@ static void Task_StaticCountdown_Init(u8 taskId)
     StaticCountdown_CreateSprites(taskId, data);
 
     StartSpriteAnim(&gSprites[tSpriteIds(1)], ANIM_START_MID);
-    gSprites[tSpriteIds(1)].pos2.x = -32;
+    gSprites[tSpriteIds(1)].x2 = -32;
 
     StartSpriteAnim(&gSprites[tSpriteIds(2)], ANIM_START_RIGHT);
-    gSprites[tSpriteIds(2)].pos2.x = 32;
+    gSprites[tSpriteIds(2)].x2 = 32;
 }
 
 static void Task_StaticCountdown_Free(u8 taskId)
@@ -453,7 +453,7 @@ static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId)
     case 1:
         if (sprite->sTimer == 0)
             PlaySE(SE_BALL_BOUNCE_2);
-        
+
         if (++sprite->sTimer >= 20)
         {
             // Ready for jump
@@ -477,7 +477,7 @@ static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId)
         break;
     case 4:
         // Moving up from jump
-        sprite->pos1.y -= 4;
+        sprite->y -= 4;
         if (++sprite->sTimer >= 8)
         {
             if (sprite->sAnimNum < 2)
@@ -497,7 +497,7 @@ static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId)
         break;
     case 5:
         // Falling after jump
-        sprite->pos1.y += 4;
+        sprite->y += 4;
         if (++sprite->sTimer >= 8)
         {
             // Land from jump
@@ -528,8 +528,8 @@ static bool32 RunMinigameCountdownDigitsAnim(u8 spriteId)
 // First argument is unused.
 static void InitStartGraphic(u8 spriteId1, u8 spriteId2, u8 spriteId3)
 {
-    gSprites[spriteId2].pos2.y = -40;
-    gSprites[spriteId3].pos2.y = -40;
+    gSprites[spriteId2].y2 = -40;
+    gSprites[spriteId3].y2 = -40;
     gSprites[spriteId2].invisible = FALSE;
     gSprites[spriteId3].invisible = FALSE;
     gSprites[spriteId2].callback = SpriteCB_Start;
@@ -555,16 +555,16 @@ static void SpriteCB_Start(struct Sprite *sprite)
     {
     case 0:
         sYSpeed = 64;
-        sY = sprite->pos2.y << 4;
+        sY = sprite->y2 << 4;
         sState++;
     case 1:
         sY += sYSpeed;
         sYSpeed++;
-        sprite->pos2.y = sY >> 4;
-        if (sprite->pos2.y >= 0)
+        sprite->y2 = sY >> 4;
+        if (sprite->y2 >= 0)
         {
             PlaySE(SE_BALL_BOUNCE_2);
-            sprite->pos2.y = 0;
+            sprite->y2 = 0;
             sState++;
         }
         break;
@@ -577,7 +577,7 @@ static void SpriteCB_Start(struct Sprite *sprite)
             sState++;
         }
         y = gSineTable[sTimer];
-        sprite->pos2.y = -(y >> 4);
+        sprite->y2 = -(y >> 4);
         break;
     case 3:
         sTimer += 16;
@@ -587,7 +587,7 @@ static void SpriteCB_Start(struct Sprite *sprite)
             sTimer = 0;
             sState++;
         }
-        sprite->pos2.y = -(gSineTable[sTimer] >> 5);
+        sprite->y2 = -(gSineTable[sTimer] >> 5);
         break;
     case 4:
         if (++sTimer > 40)
diff --git a/src/mirage_tower.c b/src/mirage_tower.c
index 9f91dff50..65aae7255 100644
--- a/src/mirage_tower.c
+++ b/src/mirage_tower.c
@@ -20,7 +20,7 @@
 #include "constants/songs.h"
 #include "constants/metatile_labels.h"
 
-struct MirageTowerPulseBlend 
+struct MirageTowerPulseBlend
 {
     u8 taskId;
     struct PulseBlend pulseBlend;
@@ -153,8 +153,8 @@ static const union AnimCmd *const sAnims_FallingFossil[] =
 
 static const struct SpriteTemplate sSpriteTemplate_FallingFossil =
 {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_FallingFossil,
     .anims = sAnims_FallingFossil,
     .images = NULL,
@@ -204,7 +204,7 @@ static const struct OamData sOamData_CeilingCrumbleSmall =
 
 static const struct SpriteTemplate sSpriteTemplate_CeilingCrumbleSmall = {
     .tileTag = TAG_CEILING_CRUMBLE,
-    .paletteTag = 0xFFFF,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_CeilingCrumbleSmall,
     .anims = sAnims_CeilingCrumbleSmall,
     .images = NULL,
@@ -242,7 +242,7 @@ static const struct OamData sOamData_CeilingCrumbleLarge =
 
 static const struct SpriteTemplate sSpriteTemplate_CeilingCrumbleLarge = {
     .tileTag = TAG_CEILING_CRUMBLE,
-    .paletteTag = 0xFFFF,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_CeilingCrumbleLarge,
     .anims = sAnims_CeilingCrumbleLarge,
     .images = NULL,
@@ -356,10 +356,10 @@ static void PlayerDescendMirageTower(u8 taskId)
 
     TryGetObjectEventIdByLocalIdAndMap(LOCALID_ROUTE111_PLAYER_FALLING, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, &objectEventId);
     fallingPlayer = &gObjectEvents[objectEventId];
-    gSprites[fallingPlayer->spriteId].pos2.y += 4;
+    gSprites[fallingPlayer->spriteId].y2 += 4;
     player = &gObjectEvents[gPlayerAvatar.objectEventId];
-    if ((gSprites[fallingPlayer->spriteId].pos1.y + gSprites[fallingPlayer->spriteId].pos2.y) >=
-        (gSprites[player->spriteId].pos1.y + gSprites[player->spriteId].pos2.y))
+    if ((gSprites[fallingPlayer->spriteId].y + gSprites[fallingPlayer->spriteId].y2) >=
+        (gSprites[player->spriteId].y + gSprites[player->spriteId].y2))
     {
         DestroyTask(taskId);
         EnableBothScriptContexts();
@@ -467,8 +467,8 @@ static void CreateCeilingCrumbleSprites(void)
 static void SpriteCB_CeilingCrumble(struct Sprite* sprite)
 {
     sprite->data[1] += 2;
-    sprite->pos2.y = sprite->data[1] / 2;
-    if(((sprite->pos1.y) + (sprite->pos2.y)) >  sCeilingCrumblePositions[sprite->data[0]][2])
+    sprite->y2 = sprite->data[1] / 2;
+    if(((sprite->y) + (sprite->y2)) >  sCeilingCrumblePositions[sprite->data[0]][2])
     {
         DestroySprite(sprite);
         IncrementCeilingCrumbleFinishedCount();
@@ -688,7 +688,7 @@ static void Task_FossilFallAndSink(u8 taskId)
             fossilTemplate.images = sFallingFossil->frameImage;
             sFallingFossil->spriteId = CreateSprite(&fossilTemplate, 128, -16, 1);
             gSprites[sFallingFossil->spriteId].centerToCornerVecX = 0;
-            gSprites[sFallingFossil->spriteId].data[0] = gSprites[sFallingFossil->spriteId].pos1.x;
+            gSprites[sFallingFossil->spriteId].data[0] = gSprites[sFallingFossil->spriteId].x;
             gSprites[sFallingFossil->spriteId].data[1] = 1;
         }
     case 5:
@@ -731,7 +731,7 @@ static void SpriteCB_FallingFossil(struct Sprite *sprite)
         // End animation
         sprite->callback = SpriteCallbackDummy;
     }
-    else if (sprite->pos1.y >= 96)
+    else if (sprite->y >= 96)
     {
         // Fossil has reached the ground, update disintegration animation
         u8 i;
@@ -743,7 +743,7 @@ static void SpriteCB_FallingFossil(struct Sprite *sprite)
     else
     {
         // Fossil is still falling
-        sprite->pos1.y++;
+        sprite->y++;
     }
 }
 
@@ -764,7 +764,7 @@ static void UpdateDisintegrationEffect(u8* tiles, u16 randId, u8 c, u8 size, u8
     col = width & 7;
     sDebug_DisintegrationData[2] = height & 7;
     sDebug_DisintegrationData[3] = width & 7;
-    
+
     widthTiles = width / 8;
     heightTiles = height / 8;
     sDebug_DisintegrationData[4] = width / 8;
@@ -772,11 +772,11 @@ static void UpdateDisintegrationEffect(u8* tiles, u16 randId, u8 c, u8 size, u8
 
     var = (size / 8) * (heightTiles * 64) + (widthTiles * 64);
     sDebug_DisintegrationData[6] = var;
-    
+
     baseOffset = var + ((row * 8) + col);
     baseOffset /= 2;
     sDebug_DisintegrationData[7] = var + ((row * 8) + col);
-    
+
     flag = ((randId % 2) ^ 1);
     tileMask = (c << (flag << 2)) | 15 << (((flag ^ 1) << 2));
     tiles[baseOffset + (offset * 32)] &= tileMask;
diff --git a/src/mon_markings.c b/src/mon_markings.c
index e71d6d795..dbd5a2fa8 100644
--- a/src/mon_markings.c
+++ b/src/mon_markings.c
@@ -493,7 +493,7 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base
             return;
         }
     }
-    sMenu->windowSprites[1]->pos1.y = y + 96;
+    sMenu->windowSprites[1]->y = y + 96;
 
 
     // Create marking sprites
@@ -526,8 +526,8 @@ static void CreateMonMarkingsMenuSprites(s16 x, s16 y, u16 baseTileTag, u16 base
         sMenu->textSprite->oam.shape = SPRITE_SHAPE(32x32);
         sMenu->textSprite->oam.size = SPRITE_SIZE(32x32);
         StartSpriteAnim(sMenu->textSprite, ANIM_TEXT);
-        sMenu->textSprite->pos1.x = x + 32;
-        sMenu->textSprite->pos1.y = y + 80;
+        sMenu->textSprite->x = x + 32;
+        sMenu->textSprite->y = y + 80;
         CalcCenterToCornerVec(sMenu->textSprite, SPRITE_SHAPE(32x16), SPRITE_SIZE(32x16), ST_OAM_AFFINE_OFF);
     }
     else
@@ -567,7 +567,7 @@ static void SpriteCB_Marking(struct Sprite *sprite)
 
 static void SpriteCB_Cursor(struct Sprite *sprite)
 {
-    sprite->pos1.y = (16 * sMenu->cursorPos) + sprite->sCursorYOffset;
+    sprite->y = (16 * sMenu->cursorPos) + sprite->sCursorYOffset;
 }
 
 #undef sCursorYOffset
diff --git a/src/move_relearner.c b/src/move_relearner.c
index 9fa7bf11c..1fa947eba 100644
--- a/src/move_relearner.c
+++ b/src/move_relearner.c
@@ -28,9 +28,9 @@
 /*
  * Move relearner state machine
  * ------------------------
- * 
+ *
  * Entry point: TeachMoveRelearnerMove
- * 
+ *
  * TeachMoveRelearnerMove
  * Task_WaitForFadeOut
  * CB2_InitLearnMove
@@ -45,21 +45,21 @@
  * DoMoveRelearnerMain: MENU_STATE_FADE_TO_BLACK
  * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_FADE
  *   - Go to MENU_STATE_IDLE_BATTLE_MODE
- * 
+ *
  * DoMoveRelearnerMain: MENU_STATE_SETUP_BATTLE_MODE
  * DoMoveRelearnerMain: MENU_STATE_IDLE_BATTLE_MODE
  *   - If the player selected a move (pressed A), go to MENU_STATE_PRINT_TEACH_MOVE_PROMPT.
  *   - If the player cancelled (pressed B), go to MENU_STATE_PRINT_GIVE_UP_PROMPT.
  *   - If the player pressed left or right, swap the move display window to contest mode,
  *     and go to MENU_STATE_SETUP_CONTEST_MODE.
- * 
+ *
  * DoMoveRelearnerMain: MENU_STATE_SETUP_CONTEST_MODE
  * DoMoveRelearnerMain: MENU_STATE_IDLE_CONTEST_MODE
  *   - If the player selected a move, go to MENU_STATE_PRINT_TEACH_MOVE_PROMPT.
  *   - If the player cancelled, go to MENU_STATE_PRINT_GIVE_UP_PROMPT
  *   - If the player pressed left or right, swap the move display window to battle mode,
  *     and go to MENU_STATE_SETUP_BATTLE_MODE.
- * 
+ *
  * DoMoveRelearnerMain: MENU_STATE_PRINT_TEACH_MOVE_PROMPT
  * DoMoveRelearnerMain: MENU_STATE_TEACH_MOVE_CONFIRM
  *   - Wait for the player to confirm.
@@ -68,24 +68,24 @@
  *     MENU_STATE_PRINT_TEXT_THEN_FANFARE.
  *   - If confirmed and the pokemon doesn't have an empty move slot, go to
  *     MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT.
- * 
+ *
  * DoMoveRelearnerMain: MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT
  * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_TRYING_TO_LEARN
  * DoMoveRelearnerMain: MENU_STATE_CONFIRM_DELETE_OLD_MOVE
  *   - If the player confirms, go to MENU_STATE_PRINT_WHICH_MOVE_PROMPT.
  *   - If the player cancels, go to MENU_STATE_PRINT_STOP_TEACHING
- * 
+ *
  * DoMoveRelearnerMain: MENU_STATE_PRINT_STOP_TEACHING
  * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_STOP_TEACHING
  * DoMoveRelearnerMain: MENU_STATE_CONFIRM_STOP_TEACHING
  *   - If the player confirms, go to MENU_STATE_CHOOSE_SETUP_STATE.
  *   - If the player cancels, go back to MENU_STATE_PRINT_TRYING_TO_LEARN_PROMPT.
- * 
+ *
  * DoMoveRelearnerMain: MENU_STATE_PRINT_WHICH_MOVE_PROMPT
  * DoMoveRelearnerMain: MENU_STATE_SHOW_MOVE_SUMMARY_SCREEN
  *   - Go to ShowSelectMovePokemonSummaryScreen. When done, control returns to
  *     CB2_InitLearnMoveReturnFromSelectMove.
- * 
+ *
  * DoMoveRelearnerMain: MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE
  * DoMoveRelearnerMain: MENU_STATE_PRINT_TEXT_THEN_FANFARE
  * DoMoveRelearnerMain: MENU_STATE_WAIT_FOR_FANFARE
@@ -93,13 +93,13 @@
  * DoMoveRelearnerMain: MENU_STATE_FADE_AND_RETURN
  * DoMoveRelearnerMain: MENU_STATE_RETURN_TO_FIELD
  *   - Clean up and go to CB2_ReturnToField.
- * 
+ *
  * DoMoveRelearnerMain: MENU_STATE_PRINT_GIVE_UP_PROMPT
  * DoMoveRelearnerMain: MENU_STATE_GIVE_UP_CONFIRM
  *   - If the player confirms, go to MENU_STATE_FADE_AND_RETURN, and set VAR_0x8004 to FALSE.
  *   - If the player cancels, go to either MENU_STATE_SETUP_BATTLE_MODE or
  *     MENU_STATE_SETUP_CONTEST_MODE.
- * 
+ *
  * CB2_InitLearnMoveReturnFromSelectMove:
  *   - Do most of the same stuff as CB2_InitLearnMove.
  * DoMoveRelearnerMain: MENU_STATE_FADE_FROM_SUMMARY_SCREEN
@@ -108,7 +108,7 @@
  *     go to MENU_STATE_DOUBLE_FANFARE_FORGOT_MOVE and set VAR_0x8004 to TRUE.
  *   - If the chosen move is the one the player selected before the summary screen,
  *     go to MENU_STATE_PRINT_STOP_TEACHING.
- * 
+ *
  */
 
 #define MENU_STATE_FADE_TO_BLACK 0
diff --git a/src/naming_screen.c b/src/naming_screen.c
index 3c8478e04..19da9da02 100644
--- a/src/naming_screen.c
+++ b/src/naming_screen.c
@@ -25,6 +25,7 @@
 #include "menu.h"
 #include "text_window.h"
 #include "overworld.h"
+#include "walda_phrase.h"
 #include "constants/event_objects.h"
 #include "constants/rgb.h"
 
@@ -149,7 +150,7 @@ struct NamingScreenTemplate
     const u8 *title;
 };
 
-struct NamingScreenData 
+struct NamingScreenData
 {
     u8 tilemapBuffer1[0x800];
     u8 tilemapBuffer2[0x800];
@@ -299,12 +300,12 @@ static const u8 sKeyboardChars[KBPAGE_COUNT * KBROW_COUNT * KBCOL_COUNT] = __(
     "!?♂♀/-  "
     "…“”‘'   ");
 
-static const u8 sPageColumnCounts[KBPAGE_COUNT] = { 
-    [KEYBOARD_LETTERS_LOWER] = KBCOL_COUNT, 
-    [KEYBOARD_LETTERS_UPPER] = KBCOL_COUNT, 
-    [KEYBOARD_SYMBOLS]       = 6 
+static const u8 sPageColumnCounts[KBPAGE_COUNT] = {
+    [KEYBOARD_LETTERS_LOWER] = KBCOL_COUNT,
+    [KEYBOARD_LETTERS_UPPER] = KBCOL_COUNT,
+    [KEYBOARD_SYMBOLS]       = 6
 };
-static const u8 sPageColumnXPos[KBPAGE_COUNT * KBCOL_COUNT] = { 
+static const u8 sPageColumnXPos[KBPAGE_COUNT * KBCOL_COUNT] = {
     0, 12, 24, 56, 68, 80, 92, 123, // KEYBOARD_LETTERS_LOWER
     0, 12, 24, 56, 68, 80, 92, 123, // KEYBOARD_LETTERS_UPPER
     0, 22, 44, 66, 88, 110          // KEYBOARD_SYMBOLS
@@ -583,25 +584,25 @@ static void Task_NamingScreen(u8 taskId)
 }
 
 // Which gfx/pal to load for the swap page button
-static const u8 sPageToNextGfxId[KBPAGE_COUNT] = 
-{ 
-    [KBPAGE_SYMBOLS]       = PAGE_SWAP_UPPER, 
-    [KBPAGE_LETTERS_UPPER] = PAGE_SWAP_LOWER, 
-    [KBPAGE_LETTERS_LOWER] = PAGE_SWAP_OTHERS 
+static const u8 sPageToNextGfxId[KBPAGE_COUNT] =
+{
+    [KBPAGE_SYMBOLS]       = PAGE_SWAP_UPPER,
+    [KBPAGE_LETTERS_UPPER] = PAGE_SWAP_LOWER,
+    [KBPAGE_LETTERS_LOWER] = PAGE_SWAP_OTHERS
 };
 
-static const u8 sPageToNextKeyboardId[KBPAGE_COUNT] = 
-{ 
-    [KBPAGE_SYMBOLS]       = KEYBOARD_LETTERS_UPPER, 
-    [KBPAGE_LETTERS_UPPER] = KEYBOARD_LETTERS_LOWER, 
-    [KBPAGE_LETTERS_LOWER] = KEYBOARD_SYMBOLS 
+static const u8 sPageToNextKeyboardId[KBPAGE_COUNT] =
+{
+    [KBPAGE_SYMBOLS]       = KEYBOARD_LETTERS_UPPER,
+    [KBPAGE_LETTERS_UPPER] = KEYBOARD_LETTERS_LOWER,
+    [KBPAGE_LETTERS_LOWER] = KEYBOARD_SYMBOLS
 };
 
-static const u8 sPageToKeyboardId[KBPAGE_COUNT] = 
-{ 
-    [KBPAGE_SYMBOLS]       = KEYBOARD_SYMBOLS, 
-    [KBPAGE_LETTERS_UPPER] = KEYBOARD_LETTERS_UPPER, 
-    [KBPAGE_LETTERS_LOWER] = KEYBOARD_LETTERS_LOWER 
+static const u8 sPageToKeyboardId[KBPAGE_COUNT] =
+{
+    [KBPAGE_SYMBOLS]       = KEYBOARD_SYMBOLS,
+    [KBPAGE_LETTERS_UPPER] = KEYBOARD_LETTERS_UPPER,
+    [KBPAGE_LETTERS_LOWER] = KEYBOARD_LETTERS_LOWER
 };
 
 static u8 PageToNextGfxId(u8 page)
@@ -674,7 +675,7 @@ static bool8 MainState_PressedOKButton(void)
     SetInputState(INPUT_STATE_DISABLED);
     SetCursorFlashing(FALSE);
     TryStartButtonFlash(BUTTON_COUNT, FALSE, TRUE);
-    if (sNamingScreen->templateNum == NAMING_SCREEN_CAUGHT_MON 
+    if (sNamingScreen->templateNum == NAMING_SCREEN_CAUGHT_MON
         && CalculatePlayerPartyCount() >= PARTY_SIZE)
     {
         DisplaySentToPCMessage();
@@ -1030,9 +1031,9 @@ static void SpriteCB_Cursor(struct Sprite *sprite)
     if (sprite->sX == GetCurrentPageColumnCount())
         sprite->invisible = TRUE;
 
-    if (sprite->invisible 
+    if (sprite->invisible
        || !(sprite->sFlashing)
-       || sprite->sX != sprite->sPrevX 
+       || sprite->sX != sprite->sPrevX
        || sprite->sY != sprite->sPrevY)
     {
         sprite->sColor = 0;
@@ -1071,7 +1072,7 @@ static void SpriteCB_InputArrow(struct Sprite *sprite)
         sprite->sDelay = 8;
         sprite->sXPosId = (sprite->sXPosId + 1) & (ARRAY_COUNT(x) - 1);
     }
-    sprite->pos2.x = x[sprite->sXPosId];
+    sprite->x2 = x[sprite->sXPosId];
 }
 
 #undef sDelay
@@ -1089,13 +1090,13 @@ static void SpriteCB_Underscore(struct Sprite *sprite)
     pos = GetTextEntryPosition();
     if (pos != (u8)sprite->sId)
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         sprite->sYPosId = 0;
         sprite->sDelay = 0;
     }
     else
     {
-        sprite->pos2.y = y[sprite->sYPosId];
+        sprite->y2 = y[sprite->sYPosId];
         sprite->sDelay++;
         if (sprite->sDelay > 8)
         {
@@ -1134,11 +1135,11 @@ static void SetCursorPos(s16 x, s16 y)
     struct Sprite *cursorSprite = &gSprites[sNamingScreen->cursorSpriteId];
 
     if (x < sPageColumnCounts[CurrentPageToKeyboardId()])
-        cursorSprite->pos1.x = sPageColumnXPos[x + CurrentPageToKeyboardId() * KBCOL_COUNT] + 38;
+        cursorSprite->x = sPageColumnXPos[x + CurrentPageToKeyboardId() * KBCOL_COUNT] + 38;
     else
-        cursorSprite->pos1.x = 0;
+        cursorSprite->x = 0;
 
-    cursorSprite->pos1.y = y * 16 + 88;
+    cursorSprite->y = y * 16 + 88;
     cursorSprite->sPrevX = cursorSprite->sX;
     cursorSprite->sPrevY = cursorSprite->sY;
     cursorSprite->sX = x;
@@ -1284,11 +1285,11 @@ static bool8 PageSwapSprite_SlideOff(struct Sprite *sprite)
     struct Sprite *text = &gSprites[sprite->sTextSpriteId];
     struct Sprite *button = &gSprites[sprite->sButtonSpriteId];
 
-    text->pos2.y++;
-    if (text->pos2.y > 7)
+    text->y2++;
+    if (text->y2 > 7)
     {
         sprite->sState++;
-        text->pos2.y = -4;
+        text->y2 = -4;
         text->invisible = TRUE;
         SetPageSwapButtonGfx(PageToNextGfxId(((u8)sprite->sPage + 1) % KBPAGE_COUNT), text, button);
     }
@@ -1300,24 +1301,24 @@ static bool8 PageSwapSprite_SlideOn(struct Sprite *sprite)
     struct Sprite *text = &gSprites[sprite->sTextSpriteId];
 
     text->invisible = FALSE;
-    text->pos2.y++;
-    if (text->pos2.y >= 0)
+    text->y2++;
+    if (text->y2 >= 0)
     {
-        text->pos2.y = 0;
+        text->y2 = 0;
         sprite->sState = 1; // go to PageSwapSprite_Idle
     }
     return FALSE;
 }
 
 static const u16 sPageSwapPalTags[] = {
-    [PAGE_SWAP_UPPER]  = PALTAG_PAGE_SWAP_UPPER, 
-    [PAGE_SWAP_OTHERS] = PALTAG_PAGE_SWAP_OTHERS, 
+    [PAGE_SWAP_UPPER]  = PALTAG_PAGE_SWAP_UPPER,
+    [PAGE_SWAP_OTHERS] = PALTAG_PAGE_SWAP_OTHERS,
     [PAGE_SWAP_LOWER]  = PALTAG_PAGE_SWAP_LOWER
 };
 
 static const u16 sPageSwapGfxTags[] = {
-    [PAGE_SWAP_UPPER]  = GFXTAG_PAGE_SWAP_UPPER, 
-    [PAGE_SWAP_OTHERS] = GFXTAG_PAGE_SWAP_OTHERS, 
+    [PAGE_SWAP_UPPER]  = GFXTAG_PAGE_SWAP_UPPER,
+    [PAGE_SWAP_OTHERS] = GFXTAG_PAGE_SWAP_OTHERS,
     [PAGE_SWAP_LOWER]  = GFXTAG_PAGE_SWAP_LOWER
 };
 
@@ -1651,7 +1652,7 @@ static void HandleDpadMovement(struct Task *task)
     if (cursorX > GetCurrentPageColumnCount())
         cursorX = 0;
 
-    
+
     // Handle moving on/off the button column
     if (sDpadDeltaX[input] != 0)
     {
@@ -2089,7 +2090,7 @@ static void Debug_NamingScreenNickname(void)
 static const struct NamingScreenTemplate sPlayerNamingScreenTemplate =
 {
     .copyExistingString = FALSE,
-    .maxChars = 7,
+    .maxChars = PLAYER_NAME_LENGTH,
     .iconFunction = 1,
     .addGenderIcon = FALSE,
     .initialPage = KBPAGE_LETTERS_UPPER,
@@ -2100,7 +2101,7 @@ static const struct NamingScreenTemplate sPlayerNamingScreenTemplate =
 static const struct NamingScreenTemplate sPCBoxNamingTemplate =
 {
     .copyExistingString = FALSE,
-    .maxChars = 8,
+    .maxChars = BOX_NAME_LENGTH,
     .iconFunction = 2,
     .addGenderIcon = FALSE,
     .initialPage = KBPAGE_LETTERS_UPPER,
@@ -2111,7 +2112,7 @@ static const struct NamingScreenTemplate sPCBoxNamingTemplate =
 static const struct NamingScreenTemplate sMonNamingScreenTemplate =
 {
     .copyExistingString = FALSE,
-    .maxChars = 10,
+    .maxChars = POKEMON_NAME_LENGTH,
     .iconFunction = 3,
     .addGenderIcon = TRUE,
     .initialPage = KBPAGE_LETTERS_UPPER,
@@ -2122,7 +2123,7 @@ static const struct NamingScreenTemplate sMonNamingScreenTemplate =
 static const struct NamingScreenTemplate sWaldaWordsScreenTemplate =
 {
     .copyExistingString = TRUE,
-    .maxChars = 15,
+    .maxChars = WALDA_PHRASE_LENGTH,
     .iconFunction = 4,
     .addGenderIcon = FALSE,
     .initialPage = KBPAGE_LETTERS_UPPER,
@@ -2184,67 +2185,67 @@ static const struct OamData sOam_32x16 =
 static const struct Subsprite sSubsprites_PageSwapFrame[] =
 {
     {
-        .x = -20,  
-        .y = -16, 
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8),  
-        .tileOffset = 0,     
+        .x = -20,
+        .y = -16,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x =  12,  
-        .y = -16, 
-        .shape = SPRITE_SHAPE(8x8),  
-        .size = SPRITE_SIZE(8x8),  
-        .tileOffset = 4,     
+        .x =  12,
+        .y = -16,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 4,
         .priority = 1
     },
     {
-        .x = -20,  
-        .y = -8,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 5,     
+        .x = -20,
+        .y = -8,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 5,
         .priority = 1
     },
     {
-        .x =  12,  
-        .y = -8,  
-        .shape = SPRITE_SHAPE(8x8),  
+        .x =  12,
+        .y = -8,
+        .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
-        .tileOffset = 9,     
+        .tileOffset = 9,
         .priority = 1
     },
     {
-        .x = -20,  
-        .y =  0,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 10,    
+        .x = -20,
+        .y =  0,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 10,
         .priority = 1
     },
     {
-        .x =  12,  
-        .y =  0,  
-        .shape = SPRITE_SHAPE(8x8),  
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 14,    
+        .x =  12,
+        .y =  0,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 14,
         .priority = 1
     },
     {
-        .x = -20,  
-        .y =  8,  
-        .shape = SPRITE_SHAPE(32x8),  
+        .x = -20,
+        .y =  8,
+        .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
-        .tileOffset = 15,    
+        .tileOffset = 15,
         .priority = 1
     },
     {
-        .x =  12,  
-        .y =  8,  
-        .shape = SPRITE_SHAPE(8x8),  
+        .x =  12,
+        .y =  8,
+        .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
-        .tileOffset = 19,    
+        .tileOffset = 19,
         .priority = 1
     }
 };
@@ -2252,19 +2253,19 @@ static const struct Subsprite sSubsprites_PageSwapFrame[] =
 static const struct Subsprite sSubsprites_PageSwapText[] =
 {
     {
-        .x = -12,  
-        .y = -4,  
-        .shape = SPRITE_SHAPE(16x8),  
-        .size = SPRITE_SIZE(16x8),  
-        .tileOffset = 0,     
+        .x = -12,
+        .y = -4,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x =   4,  
-        .y = -4,  
-        .shape = SPRITE_SHAPE(8x8),  
-        .size = SPRITE_SIZE(8x8), 
-        .tileOffset = 2,     
+        .x =   4,
+        .y = -4,
+        .shape = SPRITE_SHAPE(8x8),
+        .size = SPRITE_SIZE(8x8),
+        .tileOffset = 2,
         .priority = 1
     }
 };
@@ -2272,51 +2273,51 @@ static const struct Subsprite sSubsprites_PageSwapText[] =
 static const struct Subsprite sSubsprites_Button[] =
 {
     {
-        .x = -20,  
-        .y = -12, 
-        .shape = SPRITE_SHAPE(32x8),  
+        .x = -20,
+        .y = -12,
+        .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
-        .tileOffset = 0,     
+        .tileOffset = 0,
         .priority = 1
     },
     {
-        .x =  12,  
-        .y = -12, 
-        .shape = SPRITE_SHAPE(8x8),  
+        .x =  12,
+        .y = -12,
+        .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
-        .tileOffset = 4,     
+        .tileOffset = 4,
         .priority = 1
     },
     {
-        .x = -20,  
-        .y = -4,  
-        .shape = SPRITE_SHAPE(32x8),  
+        .x = -20,
+        .y = -4,
+        .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
-        .tileOffset = 5,     
+        .tileOffset = 5,
         .priority = 1
     },
     {
-        .x =  12,  
-        .y = -4,  
-        .shape = SPRITE_SHAPE(8x8),  
+        .x =  12,
+        .y = -4,
+        .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
-        .tileOffset = 9,     
+        .tileOffset = 9,
         .priority = 1
     },
     {
-        .x = -20,  
-        .y =  4,  
-        .shape = SPRITE_SHAPE(32x8),  
-        .size = SPRITE_SIZE(32x8), 
-        .tileOffset = 10,    
+        .x = -20,
+        .y =  4,
+        .shape = SPRITE_SHAPE(32x8),
+        .size = SPRITE_SIZE(32x8),
+        .tileOffset = 10,
         .priority = 1
     },
     {
-        .x =  12,  
-        .y =  4,  
-        .shape = SPRITE_SHAPE(8x8),  
+        .x =  12,
+        .y =  4,
+        .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
-        .tileOffset = 14,    
+        .tileOffset = 14,
         .priority = 1
     }
 };
@@ -2324,27 +2325,27 @@ static const struct Subsprite sSubsprites_Button[] =
 static const struct Subsprite sSubsprites_PCIcon[] =
 {
     {
-        .x = -8,   
-        .y = -12, 
-        .shape = SPRITE_SHAPE(16x8),  
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 0,     
+        .x = -8,
+        .y = -12,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 0,
         .priority = 3
     },
     {
-        .x = -8,   
-        .y = -4,  
-        .shape = SPRITE_SHAPE(16x8),  
+        .x = -8,
+        .y = -4,
+        .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
-        .tileOffset = 2,     
+        .tileOffset = 2,
         .priority = 3
     },
     {
-        .x = -8,   
-        .y =  4,  
-        .shape = SPRITE_SHAPE(16x8),  
-        .size = SPRITE_SIZE(16x8), 
-        .tileOffset = 4,     
+        .x = -8,
+        .y =  4,
+        .shape = SPRITE_SHAPE(16x8),
+        .size = SPRITE_SIZE(16x8),
+        .tileOffset = 4,
         .priority = 3
     }
 };
@@ -2503,7 +2504,7 @@ static const struct SpriteTemplate sSpriteTemplate_Underscore =
 
 static const struct SpriteTemplate sSpriteTemplate_PCIcon =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = PALTAG_PC_ICON,
     .oam = &sOam_8x8,
     .anims = sAnims_PCIcon,
@@ -2514,21 +2515,21 @@ static const struct SpriteTemplate sSpriteTemplate_PCIcon =
 
 static const u8* const sNamingScreenKeyboardText[KBPAGE_COUNT][KBROW_COUNT] =
 {
-    [KEYBOARD_LETTERS_LOWER] = 
+    [KEYBOARD_LETTERS_LOWER] =
     {
         gText_NamingScreenKeyboard_abcdef,
         gText_NamingScreenKeyboard_ghijkl,
         gText_NamingScreenKeyboard_mnopqrs,
         gText_NamingScreenKeyboard_tuvwxyz
     },
-    [KEYBOARD_LETTERS_UPPER] = 
+    [KEYBOARD_LETTERS_UPPER] =
     {
         gText_NamingScreenKeyboard_ABCDEF,
         gText_NamingScreenKeyboard_GHIJKL,
         gText_NamingScreenKeyboard_MNOPQRS,
         gText_NamingScreenKeyboard_TUVWXYZ
     },
-    [KEYBOARD_SYMBOLS] = 
+    [KEYBOARD_SYMBOLS] =
     {
         gText_NamingScreenKeyboard_01234,
         gText_NamingScreenKeyboard_56789,
diff --git a/src/overworld.c b/src/overworld.c
index 154ece042..8347c67a6 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -823,7 +823,7 @@ void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum)
     ResetFieldTasksArgs();
     RunOnResumeMapScript();
 
-    if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER 
+    if (gMapHeader.regionMapSectionId != MAPSEC_BATTLE_FRONTIER
      || gMapHeader.regionMapSectionId != sLastMapSectionId)
         ShowMapNamePopup();
 }
@@ -1082,7 +1082,7 @@ static bool16 IsInflitratedSpaceCenter(struct WarpData *warp)
 u16 GetLocationMusic(struct WarpData *warp)
 {
     if (NoMusicInSotopolisWithLegendaries(warp) == TRUE)
-        return 0xFFFF;
+        return MUS_NONE;
     else if (ShouldLegendaryMusicPlayAtLocation(warp) == TRUE)
         return MUS_ABNORMAL_WEATHER;
     else if (IsInflitratedSpaceCenter(warp) == TRUE)
@@ -2235,10 +2235,10 @@ static void CB1_UpdateLinkState(void)
 
         // Note: Because guestId is between 0 and 4, while the smallest key code is
         // LINK_KEY_CODE_EMPTY, this is functionally equivalent to `sPlayerKeyInterceptCallback(0)`.
-        // It is expecting the callback to be KeyInterCB_SelfIdle, and that will 
+        // It is expecting the callback to be KeyInterCB_SelfIdle, and that will
         // completely ignore any input parameters.
         //
-        // UpdateHeldKeyCode performs a sanity check on its input; if 
+        // UpdateHeldKeyCode performs a sanity check on its input; if
         // sPlayerKeyInterceptCallback echoes back the argument, which is selfId, then
         // it'll use LINK_KEY_CODE_EMPTY instead.
         //
@@ -3051,7 +3051,7 @@ static void SetPlayerFacingDirection(u8 linkPlayerId, u8 facing)
             #define TEMP gLinkPlayerMovementModes[linkPlayerObjEvent->movementMode](linkPlayerObjEvent, objEvent, facing)
 
             gMovementStatusHandler[TEMP](linkPlayerObjEvent, objEvent);
-            
+
             // Clean up the hack.
             #undef TEMP
         }
@@ -3199,8 +3199,8 @@ static void SpriteCB_LinkPlayer(struct Sprite *sprite)
 {
     struct LinkPlayerObjectEvent *linkPlayerObjEvent = &gLinkPlayerObjectEvents[sprite->data[0]];
     struct ObjectEvent *objEvent = &gObjectEvents[linkPlayerObjEvent->objEventId];
-    sprite->pos1.x = objEvent->initialCoords.x;
-    sprite->pos1.y = objEvent->initialCoords.y;
+    sprite->x = objEvent->initialCoords.x;
+    sprite->y = objEvent->initialCoords.y;
     SetObjectSubpriorityByZCoord(objEvent->previousElevation, sprite, 1);
     sprite->oam.priority = ZCoordToPriority(objEvent->previousElevation);
 
diff --git a/src/palette.c b/src/palette.c
index cbaae8da2..e106ce685 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -586,7 +586,7 @@ static u8 UpdateFastPaletteFade(void)
 
     if (IsSoftwarePaletteFadeFinishing())
         return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE;
-        
+
 
     if (gPaletteFade.objPaletteToggle)
     {
@@ -721,7 +721,7 @@ static u8 UpdateFastPaletteFade(void)
         gPaletteFade.mode = NORMAL_FADE;
         gPaletteFade.softwareFadeFinishing = 1;
     }
-    
+
     // gPaletteFade.active cannot change since the last time it was checked. So this
     // is equivalent to `return PALETTE_FADE_STATUS_ACTIVE;`
     return gPaletteFade.active ? PALETTE_FADE_STATUS_ACTIVE : PALETTE_FADE_STATUS_DONE;
@@ -986,8 +986,8 @@ static bool32 IsBlendPalettesGraduallyTaskActive(u8 id)
     int i;
 
     for (i = 0; i < NUM_TASKS; i++)
-        if ((gTasks[i].isActive == TRUE) 
-            && (gTasks[i].func == Task_BlendPalettesGradually) 
+        if ((gTasks[i].isActive == TRUE)
+            && (gTasks[i].func == Task_BlendPalettesGradually)
             && (gTasks[i].tId == id))
             return TRUE;
 
diff --git a/src/palette_util.c b/src/palette_util.c
index 5364ff6d9..3fbde9284 100755
--- a/src/palette_util.c
+++ b/src/palette_util.c
@@ -247,7 +247,7 @@ int InitPulseBlendPaletteSettings(struct PulseBlend *pulseBlend, const struct Pu
 
     if (pulseBlendPalette == NULL)
         return 0xFF;
-    
+
     pulseBlendPalette->blendCoeff = 0;
     pulseBlendPalette->fadeDirection = 0;
     pulseBlendPalette->available = 1;
@@ -322,7 +322,7 @@ void MarkUsedPulseBlendPalettes(struct PulseBlend *pulseBlend, u16 pulseBlendPal
                 pulseBlend->usedPulseBlendPalettes |= 1 << i;
             }
         }
-    }    
+    }
 }
 
 void UnmarkUsedPulseBlendPalettes(struct PulseBlend *pulseBlend, u16 pulseBlendPaletteSelector, u8 multiSelection)
@@ -423,7 +423,7 @@ void UpdatePulseBlend(struct PulseBlend *pulseBlend)
                             pulseBlendPalette->blendCoeff = 0;
                         else
                             pulseBlendPalette->blendCoeff = pulseBlendPalette->pulseBlendSettings.maxBlendCoeff & 0xF;
-                        
+
                         pulseBlendPalette->fadeDirection ^= 1;
                         pulseBlendPalette->fadeCycleCounter++;
                         break;
diff --git a/src/party_menu.c b/src/party_menu.c
index e657dcf7d..0381509c6 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -2831,10 +2831,10 @@ static void MoveAndBufferPartySlot(const void *rectSrc, s16 x, s16 y, s16 width,
 
 static void MovePartyMenuBoxSprites(struct PartyMenuBox *menuBox, s16 offset)
 {
-    gSprites[menuBox->pokeballSpriteId].pos2.x += offset * 8;
-    gSprites[menuBox->itemSpriteId].pos2.x += offset * 8;
-    gSprites[menuBox->monSpriteId].pos2.x += offset * 8;
-    gSprites[menuBox->statusSpriteId].pos2.x += offset * 8;
+    gSprites[menuBox->pokeballSpriteId].x2 += offset * 8;
+    gSprites[menuBox->itemSpriteId].x2 += offset * 8;
+    gSprites[menuBox->monSpriteId].x2 += offset * 8;
+    gSprites[menuBox->statusSpriteId].x2 += offset * 8;
 }
 
 static void SlidePartyMenuBoxSpritesOneStep(u8 taskId)
@@ -2924,18 +2924,18 @@ static void SwitchMenuBoxSprites(u8 *spriteIdPtr1, u8 *spriteIdPtr2)
 
     *spriteIdPtr1 = *spriteIdPtr2;
     *spriteIdPtr2 = spriteIdBuffer;
-    xBuffer1 = gSprites[*spriteIdPtr1].pos1.x;
-    yBuffer1 = gSprites[*spriteIdPtr1].pos1.y;
-    xBuffer2 = gSprites[*spriteIdPtr1].pos2.x;
-    yBuffer2 = gSprites[*spriteIdPtr1].pos2.y;
-    gSprites[*spriteIdPtr1].pos1.x = gSprites[*spriteIdPtr2].pos1.x;
-    gSprites[*spriteIdPtr1].pos1.y = gSprites[*spriteIdPtr2].pos1.y;
-    gSprites[*spriteIdPtr1].pos2.x = gSprites[*spriteIdPtr2].pos2.x;
-    gSprites[*spriteIdPtr1].pos2.y = gSprites[*spriteIdPtr2].pos2.y;
-    gSprites[*spriteIdPtr2].pos1.x = xBuffer1;
-    gSprites[*spriteIdPtr2].pos1.y = yBuffer1;
-    gSprites[*spriteIdPtr2].pos2.x = xBuffer2;
-    gSprites[*spriteIdPtr2].pos2.y = yBuffer2;
+    xBuffer1 = gSprites[*spriteIdPtr1].x;
+    yBuffer1 = gSprites[*spriteIdPtr1].y;
+    xBuffer2 = gSprites[*spriteIdPtr1].x2;
+    yBuffer2 = gSprites[*spriteIdPtr1].y2;
+    gSprites[*spriteIdPtr1].x = gSprites[*spriteIdPtr2].x;
+    gSprites[*spriteIdPtr1].y = gSprites[*spriteIdPtr2].y;
+    gSprites[*spriteIdPtr1].x2 = gSprites[*spriteIdPtr2].x2;
+    gSprites[*spriteIdPtr1].y2 = gSprites[*spriteIdPtr2].y2;
+    gSprites[*spriteIdPtr2].x = xBuffer1;
+    gSprites[*spriteIdPtr2].y = yBuffer1;
+    gSprites[*spriteIdPtr2].x2 = xBuffer2;
+    gSprites[*spriteIdPtr2].y2 = yBuffer2;
 }
 
 static void SwitchPartyMon(void)
@@ -3905,22 +3905,22 @@ static void AnimateSelectedPartyIcon(u8 spriteId, u8 animNum)
     gSprites[spriteId].data[0] = 0;
     if (animNum == 0)
     {
-        if (gSprites[spriteId].pos1.x == 16)
+        if (gSprites[spriteId].x == 16)
         {
-            gSprites[spriteId].pos2.x = 0;
-            gSprites[spriteId].pos2.y = -4;
+            gSprites[spriteId].x2 = 0;
+            gSprites[spriteId].y2 = -4;
         }
         else
         {
-            gSprites[spriteId].pos2.x = -4;
-            gSprites[spriteId].pos2.y = 0;
+            gSprites[spriteId].x2 = -4;
+            gSprites[spriteId].y2 = 0;
         }
         gSprites[spriteId].callback = SpriteCB_UpdatePartyMonIcon;
     }
     else
     {
-        gSprites[spriteId].pos2.x = 0;
-        gSprites[spriteId].pos2.y = 0;
+        gSprites[spriteId].x2 = 0;
+        gSprites[spriteId].y2 = 0;
         gSprites[spriteId].callback = SpriteCB_BouncePartyMonIcon;
     }
 }
@@ -3932,9 +3932,9 @@ static void SpriteCB_BouncePartyMonIcon(struct Sprite *sprite)
     if (animCmd != 0)
     {
         if (animCmd & 1) // % 2 also matches
-            sprite->pos2.y = -3;
+            sprite->y2 = -3;
         else
-            sprite->pos2.y = 1;
+            sprite->y2 = 1;
     }
 }
 
@@ -4020,8 +4020,8 @@ static void CreateHeldItemSpriteForTrade(u8 spriteId, bool8 isMail)
     u8 subpriority = gSprites[spriteId].subpriority;
     u8 newSpriteId = CreateSprite(&sSpriteTemplate_HeldItem, 250, 170, subpriority - 1);
 
-    gSprites[newSpriteId].pos2.x = 4;
-    gSprites[newSpriteId].pos2.y = 10;
+    gSprites[newSpriteId].x2 = 4;
+    gSprites[newSpriteId].y2 = 10;
     gSprites[newSpriteId].callback = SpriteCB_HeldItem;
     gSprites[newSpriteId].data[7] = spriteId;
     StartSpriteAnim(&gSprites[newSpriteId], isMail);
@@ -4039,8 +4039,8 @@ static void SpriteCB_HeldItem(struct Sprite *sprite)
     else
     {
         sprite->invisible = FALSE;
-        sprite->pos1.x = gSprites[otherSpriteId].pos1.x + gSprites[otherSpriteId].pos2.x;
-        sprite->pos1.y = gSprites[otherSpriteId].pos1.y + gSprites[otherSpriteId].pos2.y;
+        sprite->x = gSprites[otherSpriteId].x + gSprites[otherSpriteId].x2;
+        sprite->y = gSprites[otherSpriteId].y + gSprites[otherSpriteId].y2;
     }
 }
 
@@ -4087,15 +4087,15 @@ static void SpriteCB_BounceConfirmCancelButton(u8 spriteId, u8 spriteId2, u8 ani
     {
         StartSpriteAnim(&gSprites[spriteId], 2);
         StartSpriteAnim(&gSprites[spriteId2], 4);
-        gSprites[spriteId].pos2.y = 0;
-        gSprites[spriteId2].pos2.y = 0;
+        gSprites[spriteId].y2 = 0;
+        gSprites[spriteId2].y2 = 0;
     }
     else
     {
         StartSpriteAnim(&gSprites[spriteId], 3);
         StartSpriteAnim(&gSprites[spriteId2], 5);
-        gSprites[spriteId].pos2.y = -4;
-        gSprites[spriteId2].pos2.y = 4;
+        gSprites[spriteId].y2 = -4;
+        gSprites[spriteId2].y2 = 4;
     }
 }
 
@@ -4203,7 +4203,7 @@ static void CB2_ReturnToBagMenu(void)
     if (InBattlePyramid() == FALSE)
         GoToBagMenu(ITEMMENULOCATION_LAST, POCKETS_COUNT, NULL);
     else
-        GoToBattlePyramidBagMenu(PYRAMIDBAG_LOC_PREV, gPyramidBagMenuState.callback);
+        GoToBattlePyramidBagMenu(PYRAMIDBAG_LOC_PREV, gPyramidBagMenuState.exitCallback);
 }
 
 static void Task_SetSacredAshCB(u8 taskId)
@@ -5471,7 +5471,7 @@ static void TryGiveMailToSelectedMon(u8 taskId)
     struct MailStruct *mail;
 
     gPartyMenuUseExitCallback = FALSE;
-    mail = &gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + 6 + playerPCItemPageInfo.cursorPos];
+    mail = &gSaveBlock1Ptr->mail[gPlayerPCItemPageInfo.itemsAbove + PARTY_SIZE + gPlayerPCItemPageInfo.cursorPos];
     if (GetMonData(mon, MON_DATA_HELD_ITEM) != ITEM_NONE)
     {
         DisplayPartyMenuMessage(gText_PkmnHoldingItemCantHoldMail, TRUE);
@@ -6095,7 +6095,7 @@ static void Task_WaitAfterMultiPartnerPartySlideIn(u8 taskId)
 static void MoveMultiPartyMenuBoxSprite(u8 spriteId, s16 x)
 {
     if (x >= 0)
-        gSprites[spriteId].pos2.x = x;
+        gSprites[spriteId].x2 = x;
 }
 
 static void SlideMultiPartyMenuBoxSpritesOneStep(u8 taskId)
diff --git a/src/player_pc.c b/src/player_pc.c
index 946f0645c..507fc6558 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -30,24 +30,79 @@
 #include "window.h"
 #include "menu_specialized.h"
 
-// structures
-struct Struct203BCC4
+// Top level PC menu options
+enum {
+    MENU_ITEMSTORAGE,
+    MENU_MAILBOX,
+    MENU_DECORATION,
+    MENU_TURNOFF
+};
+
+// Item storage menu options
+enum {
+    MENU_WITHDRAW,
+    MENU_DEPOSIT,
+    MENU_TOSS,
+    MENU_EXIT
+};
+
+// Windows for the main menus (top level menu, and item storage menu)
+enum {
+    WIN_MAIN_MENU,
+    WIN_MAIN_MENU_BEDROOM,
+    WIN_ITEM_STORAGE_MENU,
+};
+
+// Windows for item storage (while viewing the PC's item inventory)
+enum {
+    ITEMPC_WIN_LIST,
+    ITEMPC_WIN_MESSAGE,
+    ITEMPC_WIN_ICON,
+    ITEMPC_WIN_TITLE,
+    ITEMPC_WIN_QUANTITY,
+    ITEMPC_WIN_YESNO,
+    ITEMPC_WIN_COUNT
+};
+ // When showing the main list, the first window to this window are drawn
+#define ITEMPC_WIN_LIST_END ITEMPC_WIN_TITLE
+
+// Message IDs for Item Storage
+enum {
+    MSG_SWITCH_WHICH_ITEM = 0xFFF7,
+    MSG_OKAY_TO_THROW_AWAY,
+    MSG_TOO_IMPORTANT,
+    MSG_NO_MORE_ROOM,
+    MSG_THREW_AWAY_ITEM,
+    MSG_HOW_MANY_TO_TOSS,
+    MSG_WITHDREW_ITEM,
+    MSG_HOW_MANY_TO_WITHDRAW,
+    MSG_GO_BACK_TO_PREV
+};
+
+#define TAG_ITEM_ICON    5110
+#define TAG_SCROLL_ARROW 5112
+
+// Item list ID for toSwapPos to indicate an item is not currently being swapped
+#define NOT_SWAPPING 0xFF
+
+#define SWAP_LINE_LENGTH 7
+
+struct ItemStorageMenu
 {
-    struct ListMenuItem unk0[51];
-    u8 unk198[51][0x18];
-    u8 windowIds[6];
-    u8 unk666;
+    struct ListMenuItem listItems[PC_ITEMS_COUNT + 1];
+    u8 itemNames[PC_ITEMS_COUNT + 1][ITEM_NAME_LENGTH + 10];
+    u8 windowIds[ITEMPC_WIN_COUNT];
+    u8 toSwapPos;
     u8 spriteId;
-    u8 spriteIds[7];
+    u8 swapLineSpriteIds[SWAP_LINE_LENGTH];
 };
 
-// static functions
 static void InitPlayerPCMenu(u8 taskId);
 static void PlayerPCProcessMenuInput(u8 taskId);
 static void InitItemStorageMenu(u8 taskId, u8 var);
 
 static u8 GetMailboxMailCount(void);
-static void Mailbox_UpdateMailList(void);
+static void Mailbox_CompactMailList(void);
 static void Mailbox_DrawMailboxMenu(u8 taskId);
 static void Mailbox_ProcessInput(u8 taskId);
 static void Mailbox_PrintWhatToDoWithPlayerMailText(u8 taskId);
@@ -67,15 +122,14 @@ static void Mailbox_Give(u8 taskId);
 static void Mailbox_Cancel(u8 taskId);
 
 static void Mailbox_CancelMoveToBag(u8 taskId);
-static void Mailbox_MoveToBagYesNoPrompt(u8 taskId);
-static void Mailbox_DrawYesNoBeforeMove(u8 taskId);
+static void Mailbox_HandleConfirmMoveToBag(u8 taskId);
+static void Mailbox_AskConfirmMoveToBag(u8 taskId);
 static void Mailbox_DoGiveMailPokeMenu(u8 taskId);
 static void Mailbox_NoPokemonForMail(u8 taskId);
 
 static void Mailbox_FadeAndReadMail(u8 taskId);
 static void Mailbox_ReturnToFieldFromReadMail(void);
-static void Mailbox_DoRedrawMailboxMenuAfterReturn(void);
-static void pal_fill_for_maplights_or_black(void);
+static void Mailbox_ReshowAfterMail(void);
 static void Mailbox_HandleReturnToProcessInput(u8 taskId);
 static void Mailbox_UpdateMailListAfterDeposit(void);
 
@@ -83,91 +137,92 @@ static void ItemStorage_Withdraw(u8 taskId);
 static void ItemStorage_Deposit(u8 taskId);
 static void ItemStorage_Toss(u8 taskId);
 static void ItemStorage_Exit(u8 taskId);
-static void ItemStorage_ResumeInputFromYesToss(u8 taskId);
-static void ItemStorage_ResumeInputFromNoToss(u8 taskId);
+static void ItemStorage_TossItemYes(u8 taskId);
+static void ItemStorage_TossItemNo(u8 taskId);
 
 static void ItemStorageMenuPrint(const u8 *);
 static void ItemStorageMenuProcessInput(u8 taskId);
-static void ItemStorage_ProcessWithdrawTossInput(u8 taskId);
-static void ItemStorage_SetItemAndMailCount(u8);
+static void SetPlayerPCListCount(u8);
 static void ItemStorage_HandleReturnToProcessInput(u8 taskId);
 
-static void ItemStorage_WithdrawToss_Helper(u8 taskId, bool8 toss);
+static void ItemStorage_Enter(u8 taskId, bool8 toss);
+static void ItemStorage_CreateListMenu(u8 taskId);
+static void ItemStorage_ProcessInput(u8 taskId);
 static void Task_ItemStorage_Deposit(u8 taskId);
+static void ItemStorage_ReshowAfterBagMenu(void);
 static void ItemStorage_DoItemWithdraw(u8 taskId);
 static void ItemStorage_DoItemToss(u8 taskid);
 static void ItemStorage_HandleQuantityRolling(u8 taskid);
-static void ItemStorage_GoBackToPlayerPCMenu(u8 taskId);
-static void ItemStorage_ItemSwapChoosePrompt(u8 taskId);
+static void ItemStorage_ExitItemList(u8 taskId);
+static void ItemStorage_StartItemSwap(u8 taskId);
 static void ItemStorage_DoItemAction(u8 taskId);
-static void ItemStorage_ProcessInput(u8 taskId);
-static void ItemStorage_DoItemSwap(u8 taskId, bool8 a);
+static void ItemStorage_FinishItemSwap(u8 taskId, bool8 a);
 static void ItemStorage_HandleRemoveItem(u8 taskId);
-static void ItemStorage_WaitPressHandleResumeProcessInput(u8 taskId);
-static void ItemStorage_StartScrollIndicatorAndProcessInput(u8 taskId);
+static void ItemStorage_HandleErrorMessageInput(u8 taskId);
+static void ItemStorage_ReturnToListInput(u8 taskId);
 
-static const u8* ItemStorage_GetItemPcResponse(u16);
+static const u8* ItemStorage_GetMessage(u16);
 static void CopyItemName_PlayerPC(u8 *string, u16 itemId);
 
-static void sub_816BC14(void);
-static void sub_816BFE0(u8 y, u8, u8 speed);
-static void sub_816BCC4(u8);
-static void UpdateSwapLinePos(u8);
-static void sub_816C4FC(u8 taskId);
-static void sub_816C0C8(void);
-static void sub_816C060(u16 itemId);
-static void sub_816BEF0(s32 id);
-static void sub_816B4DC(u8 taskId);
+static void ItemStorage_Init(void);
+static void ItemStorage_DrawSwapArrow(u8 y, u8, u8 speed);
+static void ItemStorage_RemoveWindow(u8);
+static void ItemStorage_UpdateSwapLinePos(u8);
+static void ItemStorage_ProcessItemSwapInput(u8 taskId);
+static void ItemStorage_EraseItemIcon(void);
+static void ItemStorage_DrawItemIcon(u16 itemId);
+static void ItemStorage_PrintDescription(s32 id);
+static void ItemStorage_EraseMainMenu(u8 taskId);
 static void ItemStorage_MoveCursor(s32 id, bool8 b, struct ListMenu * thisMenu);
-static void fish4_goto_x5_or_x6(u8 windowId, u32 id, u8 yOffset);
+static void ItemStorage_PrintMenuItem(u8 windowId, u32 id, u8 yOffset);
 
-// EWRAM
-static EWRAM_DATA const u8 *gPcItemMenuOptionOrder = NULL;
-static EWRAM_DATA u8 gPcItemMenuOptionsNum = 0;
-EWRAM_DATA struct PlayerPCItemPageStruct playerPCItemPageInfo = {0, 0, 0, 0, {0, 0, 0}, 0};
-static EWRAM_DATA struct Struct203BCC4 *gUnknown_0203BCC4 = NULL;
+static EWRAM_DATA const u8 *sTopMenuOptionOrder = NULL;
+static EWRAM_DATA u8 sTopMenuNumOptions = 0;
+EWRAM_DATA struct PlayerPCItemPageStruct gPlayerPCItemPageInfo = {};
+static EWRAM_DATA struct ItemStorageMenu *sItemStorageMenu = NULL;
 
-// .rodata
-static const u8 *const gPCText_OptionDescList[] =
+static const u8 *const sItemStorage_OptionDescriptions[] =
 {
-    gText_TakeOutItemsFromPC,
-    gText_StoreItemsInPC,
-    gText_ThrowAwayItemsInPC,
-    gText_GoBackPrevMenu,
+    [MENU_WITHDRAW] = gText_TakeOutItemsFromPC,
+    [MENU_DEPOSIT]  = gText_StoreItemsInPC,
+    [MENU_TOSS]     = gText_ThrowAwayItemsInPC,
+    [MENU_EXIT]     = gText_GoBackPrevMenu,
 };
 
 static const struct MenuAction sPlayerPCMenuActions[] =
 {
-    { gText_ItemStorage, PlayerPC_ItemStorage },
-    { gText_Mailbox, PlayerPC_Mailbox },
-    { gText_Decoration, PlayerPC_Decoration },
-    { gText_TurnOff, PlayerPC_TurnOff }
+    [MENU_ITEMSTORAGE] = { gText_ItemStorage, PlayerPC_ItemStorage },
+    [MENU_MAILBOX]     = { gText_Mailbox,     PlayerPC_Mailbox },
+    [MENU_DECORATION]  = { gText_Decoration,  PlayerPC_Decoration },
+    [MENU_TURNOFF]     = { gText_TurnOff,     PlayerPC_TurnOff }
 };
 
-static const u8 gBedroomPC_OptionOrder[] =
+static const u8 sBedroomPC_OptionOrder[] =
 {
-    PLAYERPC_MENU_ITEMSTORAGE,
-    PLAYERPC_MENU_MAILBOX,
-    PLAYERPC_MENU_DECORATION,
-    PLAYERPC_MENU_TURNOFF
+    MENU_ITEMSTORAGE,
+    MENU_MAILBOX,
+    MENU_DECORATION,
+    MENU_TURNOFF
 };
+#define NUM_BEDROOM_PC_OPTIONS ARRAY_COUNT(sBedroomPC_OptionOrder)
 
-static const u8 gPlayerPC_OptionOrder[] =
+static const u8 sPlayerPC_OptionOrder[] =
 {
-    PLAYERPC_MENU_ITEMSTORAGE,
-    PLAYERPC_MENU_MAILBOX,
-    PLAYERPC_MENU_TURNOFF
+    MENU_ITEMSTORAGE,
+    MENU_MAILBOX,
+    MENU_TURNOFF
 };
+#define NUM_PLAYER_PC_OPTIONS ARRAY_COUNT(sPlayerPC_OptionOrder)
 
-static const struct MenuAction gPCText_ItemPCOptionsText[] =
+static const struct MenuAction sItemStorage_MenuActions[] =
 {
-    { gText_WithdrawItem, ItemStorage_Withdraw },
-    { gText_DepositItem, ItemStorage_Deposit },
-    { gText_TossItem, ItemStorage_Toss },
-    { gText_Cancel, ItemStorage_Exit }
+    [MENU_WITHDRAW] = { gText_WithdrawItem, ItemStorage_Withdraw },
+    [MENU_DEPOSIT]  = { gText_DepositItem,  ItemStorage_Deposit },
+    [MENU_TOSS]     = { gText_TossItem,     ItemStorage_Toss },
+    [MENU_EXIT]     = { gText_Cancel,       ItemStorage_Exit }
 };
 
-static const struct ItemSlot gNewGamePCItems[] =
+static const struct ItemSlot sNewGamePCItems[] =
 {
     { ITEM_POTION, 1 },
     { ITEM_NONE, 0 }
@@ -175,15 +230,15 @@ static const struct ItemSlot gNewGamePCItems[] =
 
 const struct MenuAction gMailboxMailOptions[] =
 {
-    { gText_Read, Mailbox_DoMailRead },
+    { gText_Read,      Mailbox_DoMailRead },
     { gText_MoveToBag, Mailbox_MoveToBag },
-    { gText_Give2, Mailbox_Give },
-    { gText_Cancel2, Mailbox_Cancel }
+    { gText_Give2,     Mailbox_Give },
+    { gText_Cancel2,   Mailbox_Cancel }
 };
 
-static const struct WindowTemplate gUnknown_085DFF24[3] =
+static const struct WindowTemplate sWindowTemplates_MainMenus[] =
 {
-    {
+    [WIN_MAIN_MENU] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 1,
@@ -192,7 +247,7 @@ static const struct WindowTemplate gUnknown_085DFF24[3] =
         .paletteNum = 15,
         .baseBlock = 1
     },
-    {
+    [WIN_MAIN_MENU_BEDROOM] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 1,
@@ -201,7 +256,7 @@ static const struct WindowTemplate gUnknown_085DFF24[3] =
         .paletteNum = 15,
         .baseBlock = 1
     },
-    {
+    [WIN_ITEM_STORAGE_MENU] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 1,
@@ -212,17 +267,17 @@ static const struct WindowTemplate gUnknown_085DFF24[3] =
     }
 };
 
-static const struct YesNoFuncTable ResumeFromWithdrawYesNoFuncList = // ResumeFromWithdrawYesNoFuncList
+static const struct YesNoFuncTable ItemTossYesNoFuncs =
 {
-    ItemStorage_ResumeInputFromYesToss,
-    ItemStorage_ResumeInputFromNoToss
+    ItemStorage_TossItemYes,
+    ItemStorage_TossItemNo
 };
 
-static const struct ListMenuTemplate gUnknown_085DFF44 =
+static const struct ListMenuTemplate sListMenuTemplate_ItemStorage =
 {
     .items = NULL,
     .moveCursorFunc = ItemStorage_MoveCursor,
-    .itemPrintFunc = fish4_goto_x5_or_x6,
+    .itemPrintFunc = ItemStorage_PrintMenuItem,
     .totalItems = 0,
     .maxShowed = 0,
     .windowId = 0,
@@ -239,9 +294,9 @@ static const struct ListMenuTemplate gUnknown_085DFF44 =
     .fontId = 7
 };
 
-static const struct WindowTemplate gUnknown_085DFF5C[5] =
+static const struct WindowTemplate sWindowTemplates_ItemStorage[ITEMPC_WIN_COUNT] =
 {
-    {
+    [ITEMPC_WIN_LIST] = {
         .bg = 0,
         .tilemapLeft = 16,
         .tilemapTop = 1,
@@ -250,7 +305,7 @@ static const struct WindowTemplate gUnknown_085DFF5C[5] =
         .paletteNum = 15,
         .baseBlock = 0x0001
     },
-    {
+    [ITEMPC_WIN_MESSAGE] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 13,
@@ -259,7 +314,7 @@ static const struct WindowTemplate gUnknown_085DFF5C[5] =
         .paletteNum = 15,
         .baseBlock = 0x00EB
     },
-    {
+    [ITEMPC_WIN_ICON] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 8,
@@ -268,7 +323,7 @@ static const struct WindowTemplate gUnknown_085DFF5C[5] =
         .paletteNum = 15,
         .baseBlock = 0x0153
     },
-    {
+    [ITEMPC_WIN_TITLE] = {
         .bg = 0,
         .tilemapLeft = 1,
         .tilemapTop = 1,
@@ -277,7 +332,7 @@ static const struct WindowTemplate gUnknown_085DFF5C[5] =
         .paletteNum = 15,
         .baseBlock = 0x0139
     },
-    {
+    [ITEMPC_WIN_QUANTITY] = {
         .bg = 0,
         .tilemapLeft = 8,
         .tilemapTop = 9,
@@ -285,61 +340,67 @@ static const struct WindowTemplate gUnknown_085DFF5C[5] =
         .height = 2,
         .paletteNum = 15,
         .baseBlock = 0x015C
+    },
+    [ITEMPC_WIN_YESNO] = {
+        .bg = 0,
+        .tilemapLeft = 9,
+        .tilemapTop = 7,
+        .width = 5,
+        .height = 4,
+        .paletteNum = 15,
+        .baseBlock = 0x0168
     }
 };
 
-static const struct WindowTemplate gUnknown_085DFF84 =
-{
-    .bg = 0,
-    .tilemapLeft = 9,
-    .tilemapTop = 7,
-    .width = 5,
-    .height = 4,
-    .paletteNum = 15,
-    .baseBlock = 0x0168
-};
-
-static const u8 gUnknown_085DFF8C[] = {0x01, 0x03, 0x02, 0x00};
+static const u8 sSwapArrowTextColors[] = {TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GRAY, TEXT_COLOR_DARK_GRAY};
 
-// text
+// Macro below is likely a fakematch, equivalent to sNewGamePCItems[i].quantity
+#define GET_QUANTITY(i) ((u16)((u16 *)sNewGamePCItems + 1)[i * 2])
 void NewGameInitPCItems(void)
 {
-    u8 i;
-
-    // because Game Freak don't know how to use a struct or a 2d array
-    for(i = 0, ClearItemSlots(gSaveBlock1Ptr->pcItems, ARRAY_COUNT(gSaveBlock1Ptr->pcItems)); NEW_GAME_PC_ITEMS(i, PC_ITEM_ID) && NEW_GAME_PC_ITEMS(i, PC_QUANTITY) &&
-        AddPCItem(NEW_GAME_PC_ITEMS(i, PC_ITEM_ID), NEW_GAME_PC_ITEMS(i, PC_QUANTITY)) == TRUE; i++);
+    u8 i = 0;
+    ClearItemSlots(gSaveBlock1Ptr->pcItems, PC_ITEMS_COUNT);
+    for(; sNewGamePCItems[i].itemId != ITEM_NONE && GET_QUANTITY(i) &&
+        AddPCItem(sNewGamePCItems[i].itemId, GET_QUANTITY(i)) == TRUE; i++);
 }
+#undef GET_QUANTITY
 
 void BedroomPC(void)
 {
-    gPcItemMenuOptionOrder = gBedroomPC_OptionOrder;
-    gPcItemMenuOptionsNum = 4;
+    sTopMenuOptionOrder = sBedroomPC_OptionOrder;
+    sTopMenuNumOptions = NUM_BEDROOM_PC_OPTIONS;
     DisplayItemMessageOnField(CreateTask(TaskDummy, 0), gText_WhatWouldYouLike, InitPlayerPCMenu);
 }
 
 void PlayerPC(void)
 {
-    gPcItemMenuOptionOrder = gPlayerPC_OptionOrder;
-    gPcItemMenuOptionsNum = 3;
+    sTopMenuOptionOrder = sPlayerPC_OptionOrder;
+    sTopMenuNumOptions = NUM_PLAYER_PC_OPTIONS;
     DisplayItemMessageOnField(CreateTask(TaskDummy, 0), gText_WhatWouldYouLike, InitPlayerPCMenu);
 }
 
+#define tUsedSlots  data[1]
+#define tQuantity   data[2]
+#define tInTossMenu data[3]
+#define tWindowId   data[4]
+#define tListTaskId data[5]
+
 static void InitPlayerPCMenu(u8 taskId)
 {
     u16 *data;
     struct WindowTemplate windowTemplate;
-
     data = gTasks[taskId].data;
-    if (gPcItemMenuOptionsNum == 3)
-        windowTemplate = gUnknown_085DFF24[0];
-    else
-        windowTemplate = gUnknown_085DFF24[1];
-    windowTemplate.width = sub_81DB3D8(sPlayerPCMenuActions, gPcItemMenuOptionOrder, gPcItemMenuOptionsNum);
-    data[4] = AddWindow(&windowTemplate);
-    SetStandardWindowBorderStyle(data[4], 0);
-    sub_81995E4(data[4], gPcItemMenuOptionsNum, sPlayerPCMenuActions, gPcItemMenuOptionOrder);
-    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[4], gPcItemMenuOptionsNum, 0);
+
+    if (sTopMenuNumOptions == NUM_PLAYER_PC_OPTIONS)
+        windowTemplate = sWindowTemplates_MainMenus[WIN_MAIN_MENU];
+    else // Bedroom PC
+        windowTemplate = sWindowTemplates_MainMenus[WIN_MAIN_MENU_BEDROOM];
+
+    windowTemplate.width = sub_81DB3D8(sPlayerPCMenuActions, sTopMenuOptionOrder, sTopMenuNumOptions);
+    tWindowId = AddWindow(&windowTemplate);
+    SetStandardWindowBorderStyle(tWindowId, 0);
+    sub_81995E4(tWindowId, sTopMenuNumOptions, sPlayerPCMenuActions, sTopMenuOptionOrder);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(tWindowId, sTopMenuNumOptions, 0);
     ScheduleBgCopyTilemapToVram(0);
     gTasks[taskId].func = PlayerPCProcessMenuInput;
 }
@@ -350,30 +411,30 @@ static void PlayerPCProcessMenuInput(u8 taskId)
     s8 inputOptionId;
 
     data = gTasks[taskId].data;
-    if (gPcItemMenuOptionsNum > 3)
+    if (sTopMenuNumOptions > 3)
         inputOptionId = Menu_ProcessInput();
     else
         inputOptionId = Menu_ProcessInputNoWrap();
 
     switch (inputOptionId)
     {
-        case MENU_NOTHING_CHOSEN:
-            break;
-        case MENU_B_PRESSED:
-            PlaySE(SE_SELECT);
-            ClearStdWindowAndFrameToTransparent(data[4], FALSE);
-            ClearWindowTilemap(data[4]);
-            RemoveWindow(data[4]);
-            ScheduleBgCopyTilemapToVram(0);
-            gTasks[taskId].func = PlayerPC_TurnOff;
-            break;
-        default:
-            ClearStdWindowAndFrameToTransparent(data[4], FALSE);
-            ClearWindowTilemap(data[4]);
-            RemoveWindow(data[4]);
-            ScheduleBgCopyTilemapToVram(0);
-            gTasks[taskId].func = sPlayerPCMenuActions[gPcItemMenuOptionOrder[inputOptionId]].func.void_u8;
-            break;
+    case MENU_NOTHING_CHOSEN:
+        break;
+    case MENU_B_PRESSED:
+        PlaySE(SE_SELECT);
+        ClearStdWindowAndFrameToTransparent(tWindowId, FALSE);
+        ClearWindowTilemap(tWindowId);
+        RemoveWindow(tWindowId);
+        ScheduleBgCopyTilemapToVram(0);
+        gTasks[taskId].func = PlayerPC_TurnOff;
+        break;
+    default:
+        ClearStdWindowAndFrameToTransparent(tWindowId, FALSE);
+        ClearWindowTilemap(tWindowId);
+        RemoveWindow(tWindowId);
+        ScheduleBgCopyTilemapToVram(0);
+        gTasks[taskId].func = sPlayerPCMenuActions[sTopMenuOptionOrder[inputOptionId]].func.void_u8;
+        break;
     }
 }
 
@@ -384,31 +445,37 @@ void ReshowPlayerPC(u8 var)
 
 static void PlayerPC_ItemStorage(u8 taskId)
 {
-    InitItemStorageMenu(taskId, ITEMPC_MENU_WITHDRAW);
+    InitItemStorageMenu(taskId, MENU_WITHDRAW);
     gTasks[taskId].func = ItemStorageMenuProcessInput;
 }
 
 static void PlayerPC_Mailbox(u8 taskId)
 {
-    playerPCItemPageInfo.count = GetMailboxMailCount();
+    gPlayerPCItemPageInfo.count = GetMailboxMailCount();
 
-    if (playerPCItemPageInfo.count == 0)
+    if (gPlayerPCItemPageInfo.count == 0)
+    {
+        // Mailbox cannot be opened if no mail is in PC
         DisplayItemMessageOnField(taskId, gText_NoMailHere, ReshowPlayerPC);
+    }
     else
     {
-        playerPCItemPageInfo.cursorPos = 0;
-        playerPCItemPageInfo.itemsAbove = 0;
-        playerPCItemPageInfo.scrollIndicatorTaskId = TASK_NONE;
-        Mailbox_UpdateMailList();
-        ItemStorage_SetItemAndMailCount(taskId);
-        if (sub_81D1C44(playerPCItemPageInfo.count) == TRUE)
+        gPlayerPCItemPageInfo.cursorPos = 0;
+        gPlayerPCItemPageInfo.itemsAbove = 0;
+        gPlayerPCItemPageInfo.scrollIndicatorTaskId = TASK_NONE;
+        Mailbox_CompactMailList();
+        SetPlayerPCListCount(taskId);
+        if (MailboxMenu_Alloc(gPlayerPCItemPageInfo.count) == TRUE)
         {
             ClearDialogWindowAndFrame(0, 0);
             Mailbox_DrawMailboxMenu(taskId);
             gTasks[taskId].func = Mailbox_ProcessInput;
         }
         else
+        {
+            // Alloc failed, exit Mailbox
             DisplayItemMessageOnField(taskId, gText_NoMailHere, ReshowPlayerPC);
+        }
     }
 }
 
@@ -419,7 +486,7 @@ static void PlayerPC_Decoration(u8 taskId)
 
 static void PlayerPC_TurnOff(u8 taskId)
 {
-    if (gPcItemMenuOptionsNum == 4) // if the option count is 4, we are at the bedroom PC, so do gender specific handling.
+    if (sTopMenuNumOptions == NUM_BEDROOM_PC_OPTIONS) // Flimsy way to determine if Bedroom PC is in use
     {
         if (gSaveBlock2Ptr->playerGender == MALE)
             ScriptContext1_SetupScript(LittlerootTown_BrendansHouse_2F_EventScript_TurnOffPlayerPC);
@@ -439,14 +506,14 @@ static void InitItemStorageMenu(u8 taskId, u8 var)
     struct WindowTemplate windowTemplate;
 
     data = gTasks[taskId].data;
-    windowTemplate = gUnknown_085DFF24[2];
-    windowTemplate.width = GetMaxWidthInMenuTable(gPCText_ItemPCOptionsText, 4);
-    data[4] = AddWindow(&windowTemplate);
-    SetStandardWindowBorderStyle(data[4], 0);
-    PrintMenuTable(data[4], ARRAY_COUNT(gPCText_ItemPCOptionsText), gPCText_ItemPCOptionsText);
-    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[4], 4, var);
+    windowTemplate = sWindowTemplates_MainMenus[WIN_ITEM_STORAGE_MENU];
+    windowTemplate.width = GetMaxWidthInMenuTable(sItemStorage_MenuActions, ARRAY_COUNT(sItemStorage_MenuActions));
+    tWindowId = AddWindow(&windowTemplate);
+    SetStandardWindowBorderStyle(tWindowId, 0);
+    PrintMenuTable(tWindowId, ARRAY_COUNT(sItemStorage_MenuActions), sItemStorage_MenuActions);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(tWindowId, 4, var);
     ScheduleBgCopyTilemapToVram(0);
-    ItemStorageMenuPrint(gPCText_OptionDescList[var]);
+    ItemStorageMenuPrint(sItemStorage_OptionDescriptions[var]);
 }
 
 static void ItemStorageMenuPrint(const u8 *textPtr)
@@ -457,27 +524,26 @@ static void ItemStorageMenuPrint(const u8 *textPtr)
 
 static void ItemStorageMenuProcessInput(u8 taskId)
 {
-    s8 r5;
-    s8 r2;
+    s8 oldPos, newPos;
     s8 inputOptionId;
 
-    r5 = Menu_GetCursorPos();
+    oldPos = Menu_GetCursorPos();
     inputOptionId = Menu_ProcessInput();
-    r2 = Menu_GetCursorPos();
+    newPos = Menu_GetCursorPos();
     switch (inputOptionId)
     {
-        case MENU_NOTHING_CHOSEN:
-            if (r5 != r2)
-                ItemStorageMenuPrint(gPCText_OptionDescList[r2]);
-            break;
-        case MENU_B_PRESSED:
-            PlaySE(SE_SELECT);
-            ItemStorage_Exit(taskId);
-            break;
-        default:
-            PlaySE(SE_SELECT);
-            gPCText_ItemPCOptionsText[inputOptionId].func.void_u8(taskId);
-            break;
+    case MENU_NOTHING_CHOSEN:
+        if (oldPos != newPos)
+            ItemStorageMenuPrint(sItemStorage_OptionDescriptions[newPos]);
+        break;
+    case MENU_B_PRESSED:
+        PlaySE(SE_SELECT);
+        ItemStorage_Exit(taskId);
+        break;
+    default:
+        PlaySE(SE_SELECT);
+        sItemStorage_MenuActions[inputOptionId].func.void_u8(taskId);
+        break;
     }
 }
 
@@ -497,13 +563,13 @@ static void Task_ItemStorage_Deposit(u8 taskId)
     }
 }
 
-void sub_816B31C(void)
+void CB2_PlayerPCExitBagMenu(void)
 {
-    gFieldCallback = Mailbox_DoRedrawMailboxMenuAfterReturn;
+    gFieldCallback = ItemStorage_ReshowAfterBagMenu;
     SetMainCallback2(CB2_ReturnToField);
 }
 
-void Mailbox_DoRedrawMailboxMenuAfterReturn(void)
+static void ItemStorage_ReshowAfterBagMenu(void)
 {
     LoadMessageBoxAndBorderGfx();
     DrawDialogueFrame(0, 1);
@@ -521,12 +587,15 @@ static void ItemStorage_Withdraw(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    NUM_ITEMS = CountUsedPCItemSlots();
-    if (NUM_ITEMS != 0)
-        ItemStorage_WithdrawToss_Helper(taskId, FALSE);
+    tUsedSlots = CountUsedPCItemSlots();
+    if (tUsedSlots != 0)
+    {
+        ItemStorage_Enter(taskId, FALSE);
+    }
     else
     {
-        sub_816B4DC(taskId);
+        // Can't withdraw, no items in PC
+        ItemStorage_EraseMainMenu(taskId);
         DisplayItemMessageOnField(taskId, gText_NoItems, PlayerPC_ItemStorage);
     }
 
@@ -536,136 +605,133 @@ static void ItemStorage_Toss(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    NUM_ITEMS = CountUsedPCItemSlots();
-    if (NUM_ITEMS != 0)
-        ItemStorage_WithdrawToss_Helper(taskId, TRUE);
+    tUsedSlots = CountUsedPCItemSlots();
+    if (tUsedSlots != 0)
+    {
+        ItemStorage_Enter(taskId, TRUE);
+    }
     else
     {
-        sub_816B4DC(taskId);
+        // Can't toss, no items in PC
+        ItemStorage_EraseMainMenu(taskId);
         DisplayItemMessageOnField(taskId, gText_NoItems, PlayerPC_ItemStorage);
     }
 }
 
-static void ItemStorage_WithdrawToss_Helper(u8 taskId, bool8 toss)
+static void ItemStorage_Enter(u8 taskId, bool8 toss)
 {
     u16 *data = gTasks[taskId].data;
 
-    data[3] = toss;
-    sub_816B4DC(taskId);
-    playerPCItemPageInfo.cursorPos = 0;
-    playerPCItemPageInfo.itemsAbove = 0;
-    playerPCItemPageInfo.scrollIndicatorTaskId = TASK_NONE;
-    ItemStorage_SetItemAndMailCount(taskId);
-    sub_816BC14();
+    tInTossMenu = toss;
+    ItemStorage_EraseMainMenu(taskId);
+    gPlayerPCItemPageInfo.cursorPos = 0;
+    gPlayerPCItemPageInfo.itemsAbove = 0;
+    gPlayerPCItemPageInfo.scrollIndicatorTaskId = TASK_NONE;
+    SetPlayerPCListCount(taskId);
+    ItemStorage_Init();
     FreeAndReserveObjectSpritePalettes();
     LoadListMenuSwapLineGfx();
-    CreateSwapLineSprites(gUnknown_0203BCC4->spriteIds, 7);
+    CreateSwapLineSprites(sItemStorageMenu->swapLineSpriteIds, SWAP_LINE_LENGTH);
     ClearDialogWindowAndFrame(0,0);
-    gTasks[taskId].func = ItemStorage_ProcessWithdrawTossInput;
+    gTasks[taskId].func = ItemStorage_CreateListMenu;
 }
 
 static void ItemStorage_Exit(u8 taskId)
 {
-    sub_816B4DC(taskId);
+    ItemStorage_EraseMainMenu(taskId);
     ReshowPlayerPC(taskId);
 }
 
-
-static void ItemStorage_SetItemAndMailCount(u8 taskId)
+// Used by Item Storage and the Mailbox
+static void SetPlayerPCListCount(u8 taskId)
 {
-    if (playerPCItemPageInfo.count > 7)
-        playerPCItemPageInfo.pageItems = 8;
+    if (gPlayerPCItemPageInfo.count > 7)
+        gPlayerPCItemPageInfo.pageItems = 8;
     else
-        playerPCItemPageInfo.pageItems = playerPCItemPageInfo.count + 1;
+        gPlayerPCItemPageInfo.pageItems = gPlayerPCItemPageInfo.count + 1;
 }
 
-static void sub_816B4DC(u8 taskId)
+static void ItemStorage_EraseMainMenu(u8 taskId)
 {
     u16 *data = gTasks[taskId].data;
-
-    ClearStdWindowAndFrameToTransparent(data[4], FALSE);
-    ClearWindowTilemap(data[4]);
-    RemoveWindow(data[4]);
+    ClearStdWindowAndFrameToTransparent(tWindowId, FALSE);
+    ClearWindowTilemap(tWindowId);
+    RemoveWindow(tWindowId);
     ScheduleBgCopyTilemapToVram(0);
 }
 
 static u8 GetMailboxMailCount(void)
 {
-    u8 i, j;
+    u8 mailInPC, i;
 
-    for(i = 0, j = PARTY_SIZE; j < MAIL_COUNT; j++)
-        if (gSaveBlock1Ptr->mail[j].itemId != ITEM_NONE)
-            i++;
+    // Count mail in PC (by first skipping over mail in party)
+    for (mailInPC = 0, i = PARTY_SIZE; i < MAIL_COUNT; i++)
+        if (gSaveBlock1Ptr->mail[i].itemId != ITEM_NONE)
+            mailInPC++;
 
-    return i;
+    return mailInPC;
 }
 
-static void Mailbox_UpdateMailList(void)
+static void Mailbox_CompactMailList(void)
 {
-    struct MailStruct mailBuffer;
+    struct MailStruct temp;
     u8 i, j;
 
     for (i = PARTY_SIZE; i < MAIL_COUNT - 1; i++)
     {
         for (j = i + 1; j < MAIL_COUNT; j++)
         {
-            if (gSaveBlock1Ptr->mail[i].itemId == 0)
-            {
-                mailBuffer = gSaveBlock1Ptr->mail[i];
-                gSaveBlock1Ptr->mail[i] = gSaveBlock1Ptr->mail[j];
-                gSaveBlock1Ptr->mail[j] = mailBuffer;
-            }
+            if (gSaveBlock1Ptr->mail[i].itemId == ITEM_NONE)
+                SWAP(gSaveBlock1Ptr->mail[i], gSaveBlock1Ptr->mail[j], temp);
         }
     }
 }
 
 static void Mailbox_DrawMailboxMenu(u8 taskId)
 {
-    u8 windowId;
-
-    windowId = sub_81D1C84(0);
-    sub_81D1C84(1);
+    u8 windowId = MailboxMenu_AddWindow(MAILBOXWIN_TITLE);
+    MailboxMenu_AddWindow(MAILBOXWIN_LIST);
     AddTextPrinterParameterized(windowId, 1, gText_Mailbox, GetStringCenterAlignXOffset(1, gText_Mailbox, 0x40), 1, 0, NULL);
     ScheduleBgCopyTilemapToVram(0);
-    gTasks[taskId].data[5] = sub_81D1DC0(&playerPCItemPageInfo);
-    sub_81D1E90(&playerPCItemPageInfo);
+    gTasks[taskId].tListTaskId = MailboxMenu_CreateList(&gPlayerPCItemPageInfo);
+    MailboxMenu_AddScrollArrows(&gPlayerPCItemPageInfo);
 }
 
 static void Mailbox_ProcessInput(u8 taskId)
 {
     u16 *data = gTasks[taskId].data;
-    s32 inputOptionId;
 
     if (!gPaletteFade.active)
     {
-        inputOptionId = ListMenu_ProcessInput(data[5]);
-        ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
+        s32 inputOptionId = ListMenu_ProcessInput(tListTaskId);
+        ListMenuGetScrollAndRow(tListTaskId, &gPlayerPCItemPageInfo.itemsAbove, &gPlayerPCItemPageInfo.cursorPos);
 
         switch (inputOptionId)
         {
-            case LIST_NOTHING_CHOSEN:
-                break;
-            case LIST_CANCEL:
-                PlaySE(SE_SELECT);
-                RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorTaskId);
-                Mailbox_ReturnToPlayerPC(taskId);
-                break;
-            default:
-                PlaySE(SE_SELECT);
-                sub_81D1D04(0);
-                sub_81D1D04(1);
-                DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
-                ScheduleBgCopyTilemapToVram(0);
-                RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorTaskId);
-                gTasks[taskId].func = Mailbox_PrintWhatToDoWithPlayerMailText;
-                break;
+        case LIST_NOTHING_CHOSEN:
+            break;
+        case LIST_CANCEL:
+            PlaySE(SE_SELECT);
+            RemoveScrollIndicatorArrowPair(gPlayerPCItemPageInfo.scrollIndicatorTaskId);
+            Mailbox_ReturnToPlayerPC(taskId);
+            break;
+        default:
+            // Selected mail, ask what to do with it
+            PlaySE(SE_SELECT);
+            MailboxMenu_RemoveWindow(MAILBOXWIN_TITLE);
+            MailboxMenu_RemoveWindow(MAILBOXWIN_LIST);
+            DestroyListMenuTask(tListTaskId, &gPlayerPCItemPageInfo.itemsAbove, &gPlayerPCItemPageInfo.cursorPos);
+            ScheduleBgCopyTilemapToVram(0);
+            RemoveScrollIndicatorArrowPair(gPlayerPCItemPageInfo.scrollIndicatorTaskId);
+            gTasks[taskId].func = Mailbox_PrintWhatToDoWithPlayerMailText;
+            break;
         }
     }
 }
 
 static void Mailbox_PrintWhatToDoWithPlayerMailText(u8 taskId)
 {
-    StringCopy(gStringVar1, gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + PARTY_SIZE + playerPCItemPageInfo.cursorPos].playerName);
+    StringCopy(gStringVar1, gSaveBlock1Ptr->mail[gPlayerPCItemPageInfo.itemsAbove + PARTY_SIZE + gPlayerPCItemPageInfo.cursorPos].playerName);
     ConvertInternationalPlayerNameStripChar(gStringVar1, CHAR_SPACE);
     StringExpandPlaceholders(gStringVar4, gText_WhatToDoWithVar1sMail);
     DisplayItemMessageOnField(taskId, gStringVar4, Mailbox_PrintMailOptions);
@@ -675,19 +741,19 @@ static void Mailbox_ReturnToPlayerPC(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    sub_81D1D04(0);
-    sub_81D1D04(1);
-    DestroyListMenuTask(data[5], NULL, NULL);
+    MailboxMenu_RemoveWindow(MAILBOXWIN_TITLE);
+    MailboxMenu_RemoveWindow(MAILBOXWIN_LIST);
+    DestroyListMenuTask(tListTaskId, NULL, NULL);
     ScheduleBgCopyTilemapToVram(0);
-    sub_81D1EC0();
+    MailboxMenu_Free();
     ReshowPlayerPC(taskId);
 }
 
 static void Mailbox_PrintMailOptions(u8 taskId)
 {
-    u8 r4 = sub_81D1C84(2);
-    PrintMenuTable(r4, ARRAY_COUNT(gMailboxMailOptions), gMailboxMailOptions);
-    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(r4, 4, 0);
+    u8 windowId = MailboxMenu_AddWindow(MAILBOXWIN_OPTIONS);
+    PrintMenuTable(windowId, ARRAY_COUNT(gMailboxMailOptions), gMailboxMailOptions);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(windowId, 4, 0);
     ScheduleBgCopyTilemapToVram(0);
     gTasks[taskId].func = Mailbox_MailOptionsProcessInput;
 }
@@ -696,19 +762,18 @@ static void Mailbox_MailOptionsProcessInput(u8 taskId)
 {
     s8 inputOptionId = ProcessMenuInput_other();
 
-    switch(inputOptionId)
+    switch (inputOptionId)
     {
-        case -2:
-            break;
-        case -1:
-            PlaySE(SE_SELECT);
-            Mailbox_Cancel(taskId);
-            break;
-
-        default:
-            PlaySE(SE_SELECT);
-            gMailboxMailOptions[inputOptionId].func.void_u8(taskId);
-            break;
+    case MENU_NOTHING_CHOSEN:
+        break;
+    case MENU_B_PRESSED:
+        PlaySE(SE_SELECT);
+        Mailbox_Cancel(taskId);
+        break;
+    default:
+        PlaySE(SE_SELECT);
+        gMailboxMailOptions[inputOptionId].func.void_u8(taskId);
+        break;
     }
 }
 
@@ -722,26 +787,26 @@ static void Mailbox_FadeAndReadMail(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        sub_81D1EC0();
+        MailboxMenu_Free();
         CleanupOverworldWindowsAndTilemaps();
-        ReadMail(&(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + PARTY_SIZE + playerPCItemPageInfo.cursorPos]), Mailbox_ReturnToFieldFromReadMail, TRUE);
+        ReadMail(&gSaveBlock1Ptr->mail[gPlayerPCItemPageInfo.itemsAbove + PARTY_SIZE + gPlayerPCItemPageInfo.cursorPos], Mailbox_ReturnToFieldFromReadMail, TRUE);
         DestroyTask(taskId);
     }
 }
 
 static void Mailbox_ReturnToFieldFromReadMail(void)
 {
-    gFieldCallback = pal_fill_for_maplights_or_black;
+    gFieldCallback = Mailbox_ReshowAfterMail;
     SetMainCallback2(CB2_ReturnToField);
 }
 
-static void pal_fill_for_maplights_or_black(void)
+static void Mailbox_ReshowAfterMail(void)
 {
     u8 taskId;
 
     LoadMessageBoxAndBorderGfx();
     taskId = CreateTask(Mailbox_HandleReturnToProcessInput, 0);
-    if (sub_81D1C44(playerPCItemPageInfo.count) == TRUE)
+    if (MailboxMenu_Alloc(gPlayerPCItemPageInfo.count) == TRUE)
         Mailbox_DrawMailboxMenu(taskId);
     else
         DestroyTask(taskId);
@@ -756,49 +821,49 @@ static void Mailbox_HandleReturnToProcessInput(u8 taskId)
 
 static void Mailbox_MoveToBag(u8 taskId)
 {
-    DisplayItemMessageOnField(taskId, gText_MessageWillBeLost, Mailbox_DrawYesNoBeforeMove);
+    DisplayItemMessageOnField(taskId, gText_MessageWillBeLost, Mailbox_AskConfirmMoveToBag);
 }
 
-static void Mailbox_DrawYesNoBeforeMove(u8 taskId)
+static void Mailbox_AskConfirmMoveToBag(u8 taskId)
 {
     DisplayYesNoMenuDefaultYes();
-    gTasks[taskId].func = Mailbox_MoveToBagYesNoPrompt;
+    gTasks[taskId].func = Mailbox_HandleConfirmMoveToBag;
 }
 
-static void Mailbox_MoveToBagYesNoPrompt(u8 taskId)
+static void Mailbox_HandleConfirmMoveToBag(u8 taskId)
 {
-    switch(Menu_ProcessInputNoWrapClearOnChoose())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
-        case 0:
-            Mailbox_DoMailMoveToBag(taskId);
-            break;
-        case -1:
-            PlaySE(SE_SELECT);
-        case 1:
-            Mailbox_CancelMoveToBag(taskId);
-            break;
-        case -2:
-        default:
-            break;
+    case 0: // Yes
+        Mailbox_DoMailMoveToBag(taskId);
+        break;
+    case MENU_B_PRESSED:
+        PlaySE(SE_SELECT);
+    case 1: // No
+        Mailbox_CancelMoveToBag(taskId);
+        break;
+    case MENU_NOTHING_CHOSEN:
+    default:
+        break;
     }
 }
 
 static void Mailbox_DoMailMoveToBag(u8 taskId)
 {
-    struct MailStruct *mailStruct = &(gSaveBlock1Ptr->mail[playerPCItemPageInfo.itemsAbove + PARTY_SIZE + playerPCItemPageInfo.cursorPos]);
-    if (!AddBagItem(mailStruct->itemId, 1))
+    struct MailStruct *mail = &gSaveBlock1Ptr->mail[gPlayerPCItemPageInfo.itemsAbove + PARTY_SIZE + gPlayerPCItemPageInfo.cursorPos];
+    if (!AddBagItem(mail->itemId, 1))
     {
         DisplayItemMessageOnField(taskId, gText_BagIsFull, Mailbox_Cancel);
     }
     else
     {
         DisplayItemMessageOnField(taskId, gText_MailToBagMessageErased, Mailbox_Cancel);
-        ClearMailStruct(mailStruct);
-        Mailbox_UpdateMailList();
-        playerPCItemPageInfo.count--;
-        if (playerPCItemPageInfo.count < (playerPCItemPageInfo.pageItems + playerPCItemPageInfo.itemsAbove) && playerPCItemPageInfo.itemsAbove != 0)
-            playerPCItemPageInfo.itemsAbove--;
-        ItemStorage_SetItemAndMailCount(taskId);
+        ClearMailStruct(mail);
+        Mailbox_CompactMailList();
+        gPlayerPCItemPageInfo.count--;
+        if (gPlayerPCItemPageInfo.count < (gPlayerPCItemPageInfo.pageItems + gPlayerPCItemPageInfo.itemsAbove) && gPlayerPCItemPageInfo.itemsAbove != 0)
+            gPlayerPCItemPageInfo.itemsAbove--;
+        SetPlayerPCListCount(taskId);
     }
 }
 
@@ -822,7 +887,7 @@ static void Mailbox_DoGiveMailPokeMenu(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        sub_81D1EC0();
+        MailboxMenu_Free();
         CleanupOverworldWindowsAndTilemaps();
         ChooseMonToGiveMailFromMailbox();
         DestroyTask(taskId);
@@ -840,15 +905,15 @@ static void Mailbox_UpdateMailListAfterDeposit(void)
     u8 taskId;
     u8 prevCount;
     taskId = CreateTask(Mailbox_HandleReturnToProcessInput, 0);
-    prevCount = playerPCItemPageInfo.count;
-    playerPCItemPageInfo.count = GetMailboxMailCount();
-    Mailbox_UpdateMailList();
-    if (prevCount != playerPCItemPageInfo.count && (playerPCItemPageInfo.count < (playerPCItemPageInfo.pageItems + playerPCItemPageInfo.itemsAbove))
-       && playerPCItemPageInfo.itemsAbove != 0)
-        playerPCItemPageInfo.itemsAbove--;
-    ItemStorage_SetItemAndMailCount(taskId);
+    prevCount = gPlayerPCItemPageInfo.count;
+    gPlayerPCItemPageInfo.count = GetMailboxMailCount();
+    Mailbox_CompactMailList();
+    if (prevCount != gPlayerPCItemPageInfo.count && (gPlayerPCItemPageInfo.count < (gPlayerPCItemPageInfo.pageItems + gPlayerPCItemPageInfo.itemsAbove))
+       && gPlayerPCItemPageInfo.itemsAbove != 0)
+        gPlayerPCItemPageInfo.itemsAbove--;
+    SetPlayerPCListCount(taskId);
     LoadMessageBoxAndBorderGfx();
-    if (sub_81D1C44(playerPCItemPageInfo.count) == TRUE)
+    if (MailboxMenu_Alloc(gPlayerPCItemPageInfo.count) == TRUE)
         Mailbox_DrawMailboxMenu(taskId);
     else
         DestroyTask(taskId);
@@ -862,45 +927,44 @@ static void Mailbox_NoPokemonForMail(u8 taskId)
 
 static void Mailbox_Cancel(u8 taskId)
 {
-    sub_81D1D04(2);
+    MailboxMenu_RemoveWindow(MAILBOXWIN_OPTIONS);
     ClearDialogWindowAndFrame(0, 0);
     Mailbox_DrawMailboxMenu(taskId);
     ScheduleBgCopyTilemapToVram(0);
     gTasks[taskId].func = Mailbox_ProcessInput;
 }
 
-static void sub_816BC14(void)
+static void ItemStorage_Init(void)
 {
-    gUnknown_0203BCC4 = AllocZeroed(sizeof(struct Struct203BCC4));
-    memset(gUnknown_0203BCC4->windowIds, 0xFF, 0x6);
-    gUnknown_0203BCC4->unk666 = 0xFF;
-    gUnknown_0203BCC4->spriteId = SPRITE_NONE;
+    sItemStorageMenu = AllocZeroed(sizeof(*sItemStorageMenu));
+    memset(sItemStorageMenu->windowIds, WINDOW_NONE, ITEMPC_WIN_COUNT);
+    sItemStorageMenu->toSwapPos = NOT_SWAPPING;
+    sItemStorageMenu->spriteId = SPRITE_NONE;
 }
 
-static void sub_816BC58(void)
+static void ItemStorage_Free(void)
 {
     u32 i;
-
-    for(i = 0; i < 6; i++)
-        sub_816BCC4(i);
-    Free(gUnknown_0203BCC4);
+    for (i = 0; i < ITEMPC_WIN_COUNT; i++)
+        ItemStorage_RemoveWindow(i);
+    Free(sItemStorageMenu);
 }
 
-static u8 sub_816BC7C(u8 a)
+static u8 ItemStorage_AddWindow(u8 i)
 {
-    u8 *windowIdLoc = &(gUnknown_0203BCC4->windowIds[a]);
+    u8 *windowIdLoc = &sItemStorageMenu->windowIds[i];
     if (*windowIdLoc == WINDOW_NONE)
     {
-        *windowIdLoc = AddWindow(&gUnknown_085DFF5C[a]);
+        *windowIdLoc = AddWindow(&sWindowTemplates_ItemStorage[i]);
         DrawStdFrameWithCustomTileAndPalette(*windowIdLoc, FALSE, 0x214, 0xE);
         ScheduleBgCopyTilemapToVram(0);
     }
     return *windowIdLoc;
 }
 
-static void sub_816BCC4(u8 a)
+static void ItemStorage_RemoveWindow(u8 i)
 {
-    u8 *windowIdLoc = &(gUnknown_0203BCC4->windowIds[a]);
+    u8 *windowIdLoc = &sItemStorageMenu->windowIds[i];
     if (*windowIdLoc != WINDOW_NONE)
     {
         ClearStdWindowAndFrameToTransparent(*windowIdLoc, FALSE);
@@ -915,20 +979,25 @@ void ItemStorage_RefreshListMenu(void)
 {
     u16 i;
 
-    for(i = 0; i < playerPCItemPageInfo.count - 1; i++)
+    // Copy item names for all entries but the last (which is Cancel)
+    for(i = 0; i < gPlayerPCItemPageInfo.count - 1; i++)
     {
-        CopyItemName_PlayerPC(&(gUnknown_0203BCC4->unk198[i][0]), gSaveBlock1Ptr->pcItems[i].itemId);
-        gUnknown_0203BCC4->unk0[i].name = &(gUnknown_0203BCC4->unk198[i][0]);
-        gUnknown_0203BCC4->unk0[i].id = i;
+        CopyItemName_PlayerPC(&sItemStorageMenu->itemNames[i][0], gSaveBlock1Ptr->pcItems[i].itemId);
+        sItemStorageMenu->listItems[i].name = &sItemStorageMenu->itemNames[i][0];
+        sItemStorageMenu->listItems[i].id = i;
     }
-    StringCopy(&(gUnknown_0203BCC4->unk198[i][0]) ,gText_Cancel2);
-    gUnknown_0203BCC4->unk0[i].name = &(gUnknown_0203BCC4->unk198[i][0]);
-    gUnknown_0203BCC4->unk0[i].id = -2;
-    gMultiuseListMenuTemplate = gUnknown_085DFF44;
-    gMultiuseListMenuTemplate.windowId = sub_816BC7C(0);
-    gMultiuseListMenuTemplate.totalItems = playerPCItemPageInfo.count;
-    gMultiuseListMenuTemplate.items = gUnknown_0203BCC4->unk0;
-    gMultiuseListMenuTemplate.maxShowed = playerPCItemPageInfo.pageItems;
+
+    // Set up Cancel entry
+    StringCopy(&sItemStorageMenu->itemNames[i][0], gText_Cancel2);
+    sItemStorageMenu->listItems[i].name = &sItemStorageMenu->itemNames[i][0];
+    sItemStorageMenu->listItems[i].id = LIST_CANCEL;
+
+    // Set list menu data
+    gMultiuseListMenuTemplate = sListMenuTemplate_ItemStorage;
+    gMultiuseListMenuTemplate.windowId = ItemStorage_AddWindow(ITEMPC_WIN_LIST);
+    gMultiuseListMenuTemplate.totalItems = gPlayerPCItemPageInfo.count;
+    gMultiuseListMenuTemplate.items = sItemStorageMenu->listItems;
+    gMultiuseListMenuTemplate.maxShowed = gPlayerPCItemPageInfo.pageItems;
 }
 
 void CopyItemName_PlayerPC(u8 *string, u16 itemId)
@@ -936,31 +1005,31 @@ void CopyItemName_PlayerPC(u8 *string, u16 itemId)
     CopyItemName(itemId, string);
 }
 
-static void ItemStorage_MoveCursor(s32 id, bool8 b, struct ListMenu *thisMenu)
+static void ItemStorage_MoveCursor(s32 id, bool8 onInit, struct ListMenu *list)
 {
-    if (b != TRUE)
+    if (onInit != TRUE)
         PlaySE(SE_SELECT);
-    if (gUnknown_0203BCC4->unk666 == 0xFF)
+    if (sItemStorageMenu->toSwapPos == NOT_SWAPPING)
     {
-        sub_816C0C8();
+        ItemStorage_EraseItemIcon();
         if (id != LIST_CANCEL)
-            sub_816C060(gSaveBlock1Ptr->pcItems[id].itemId);
+            ItemStorage_DrawItemIcon(gSaveBlock1Ptr->pcItems[id].itemId);
         else
-            sub_816C060(ITEMPC_GO_BACK_TO_PREV);
-        sub_816BEF0(id);
+            ItemStorage_DrawItemIcon(MSG_GO_BACK_TO_PREV);
+        ItemStorage_PrintDescription(id);
     }
 }
 
-static void fish4_goto_x5_or_x6(u8 windowId, u32 id, u8 yOffset)
+static void ItemStorage_PrintMenuItem(u8 windowId, u32 id, u8 yOffset)
 {
     if (id != LIST_CANCEL)
     {
-        if (gUnknown_0203BCC4->unk666 != 0xFF)
+        if (sItemStorageMenu->toSwapPos != NOT_SWAPPING)
         {
-            if (gUnknown_0203BCC4->unk666 == (u8)id)
-                sub_816BFE0(yOffset, 0, 0xFF);
+            if (sItemStorageMenu->toSwapPos == (u8)id)
+                ItemStorage_DrawSwapArrow(yOffset, 0, TEXT_SPEED_FF);
             else
-                sub_816BFE0(yOffset, 0xFF, 0xFF);
+                ItemStorage_DrawSwapArrow(yOffset, 0xFF, TEXT_SPEED_FF);
         }
         ConvertIntToDecimalStringN(gStringVar1, gSaveBlock1Ptr->pcItems[id].quantity, STR_CONV_MODE_RIGHT_ALIGN, 3);
         StringExpandPlaceholders(gStringVar4, gText_xVar1);
@@ -968,92 +1037,98 @@ static void fish4_goto_x5_or_x6(u8 windowId, u32 id, u8 yOffset)
     }
 }
 
-static void sub_816BEF0(s32 id)
+static void ItemStorage_PrintDescription(s32 id)
 {
     const u8* description;
-    u8 windowId = gUnknown_0203BCC4->windowIds[1];
+    u8 windowId = sItemStorageMenu->windowIds[ITEMPC_WIN_MESSAGE];
 
-    if (id != -2)
+    // Get item description (or Cancel text)
+    if (id != LIST_CANCEL)
         description = (u8 *)ItemId_GetDescription(gSaveBlock1Ptr->pcItems[id].itemId);
     else
-        description = ItemStorage_GetItemPcResponse(ITEMPC_GO_BACK_TO_PREV);
+        description = ItemStorage_GetMessage(MSG_GO_BACK_TO_PREV);
+
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     AddTextPrinterParameterized(windowId, 1, description, 0, 1, 0, NULL);
 }
 
-static void ItemStorage_StartScrollIndicator(void)
+static void ItemStorage_AddScrollIndicator(void)
 {
-    if (playerPCItemPageInfo.scrollIndicatorTaskId == TASK_NONE)
-        playerPCItemPageInfo.scrollIndicatorTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 0xB0, 0xC, 0x94, playerPCItemPageInfo.count - playerPCItemPageInfo.pageItems, 0x13F8, 0x13F8, &(playerPCItemPageInfo.itemsAbove));
+    if (gPlayerPCItemPageInfo.scrollIndicatorTaskId == TASK_NONE)
+        gPlayerPCItemPageInfo.scrollIndicatorTaskId = AddScrollIndicatorArrowPairParameterized(SCROLL_ARROW_UP, 176, 12, 148,
+                                                                                                gPlayerPCItemPageInfo.count - gPlayerPCItemPageInfo.pageItems,
+                                                                                                TAG_SCROLL_ARROW,
+                                                                                                TAG_SCROLL_ARROW,
+                                                                                                &gPlayerPCItemPageInfo.itemsAbove);
 }
 
 static void ItemStorage_RemoveScrollIndicator(void)
 {
-    if (playerPCItemPageInfo.scrollIndicatorTaskId != TASK_NONE)
+    if (gPlayerPCItemPageInfo.scrollIndicatorTaskId != TASK_NONE)
     {
-        RemoveScrollIndicatorArrowPair(playerPCItemPageInfo.scrollIndicatorTaskId);
-        playerPCItemPageInfo.scrollIndicatorTaskId = TASK_NONE;
+        RemoveScrollIndicatorArrowPair(gPlayerPCItemPageInfo.scrollIndicatorTaskId);
+        gPlayerPCItemPageInfo.scrollIndicatorTaskId = TASK_NONE;
     }
 }
 
-static void sub_816BFB8(u8 a, u8 b, u8 speed)
+static void ItemStorage_SetSwapArrow(u8 listTaskId, u8 b, u8 speed)
 {
-    sub_816BFE0(ListMenuGetYCoordForPrintingArrowCursor(a), b, speed);
+    ItemStorage_DrawSwapArrow(ListMenuGetYCoordForPrintingArrowCursor(listTaskId), b, speed);
 }
 
-static void sub_816BFE0(u8 y, u8 b, u8 speed)
+static void ItemStorage_DrawSwapArrow(u8 y, u8 b, u8 speed)
 {
-    u8 windowId = gUnknown_0203BCC4->windowIds[0];
+    u8 windowId = sItemStorageMenu->windowIds[ITEMPC_WIN_LIST];
     if (b == 0xFF)
         FillWindowPixelRect(windowId, PIXEL_FILL(1), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
     else
-        AddTextPrinterParameterized4(windowId, 1, 0, y, 0, 0, gUnknown_085DFF8C, speed, gText_SelectorArrow2);
+        AddTextPrinterParameterized4(windowId, 1, 0, y, 0, 0, sSwapArrowTextColors, speed, gText_SelectorArrow2);
 }
 
-static void sub_816C060(u16 itemId)
+static void ItemStorage_DrawItemIcon(u16 itemId)
 {
     u8 spriteId;
-    u8* spriteIdLoc = &(gUnknown_0203BCC4->spriteId);
+    u8* spriteIdLoc = &sItemStorageMenu->spriteId;
 
     if (*spriteIdLoc == SPRITE_NONE)
     {
-        FreeSpriteTilesByTag(0x13F6);
-        FreeSpritePaletteByTag(0x13F6);
-        spriteId = AddItemIconSprite(0x13F6, 0x13F6, itemId);
+        FreeSpriteTilesByTag(TAG_ITEM_ICON);
+        FreeSpritePaletteByTag(TAG_ITEM_ICON);
+        spriteId = AddItemIconSprite(TAG_ITEM_ICON, TAG_ITEM_ICON, itemId);
         if (spriteId != MAX_SPRITES)
         {
             *spriteIdLoc = spriteId;
             gSprites[spriteId].oam.priority = 0;
-            gSprites[spriteId].pos2.x = 24;
-            gSprites[spriteId].pos2.y = 80;
+            gSprites[spriteId].x2 = 24;
+            gSprites[spriteId].y2 = 80;
         }
     }
 }
 
-static void sub_816C0C8(void)
+static void ItemStorage_EraseItemIcon(void)
 {
-    u8* spriteIdLoc = &(gUnknown_0203BCC4->spriteId);
+    u8* spriteIdLoc = &sItemStorageMenu->spriteId;
     if (*spriteIdLoc != SPRITE_NONE)
     {
-        FreeSpriteTilesByTag(0x13F6);
-        FreeSpritePaletteByTag(0x13F6);
-        DestroySprite(&(gSprites[*spriteIdLoc]));
+        FreeSpriteTilesByTag(TAG_ITEM_ICON);
+        FreeSpritePaletteByTag(TAG_ITEM_ICON);
+        DestroySprite(&gSprites[*spriteIdLoc]);
         *spriteIdLoc = SPRITE_NONE;
     }
 }
 
-static void sub_816C110(void)
+static void ItemStorage_CompactList(void)
 {
     CompactPCItems();
-    sub_812220C(gSaveBlock1Ptr->pcItems, 50, &(playerPCItemPageInfo.pageItems), &(playerPCItemPageInfo.count), 0x8);
+    SetItemListPerPageCount(gSaveBlock1Ptr->pcItems, PC_ITEMS_COUNT, &gPlayerPCItemPageInfo.pageItems, &gPlayerPCItemPageInfo.count, 8);
 }
 
-static void sub_816C140(void)
+static void ItemStorage_CompactCursor(void)
 {
-    sub_812225C(&(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos), playerPCItemPageInfo.pageItems, playerPCItemPageInfo.count);
+    SetCursorWithinListBounds(&gPlayerPCItemPageInfo.itemsAbove, &gPlayerPCItemPageInfo.cursorPos, gPlayerPCItemPageInfo.pageItems, gPlayerPCItemPageInfo.count);
 }
 
-static void ItemStorage_ProcessWithdrawTossInput(u8 taskId)
+static void ItemStorage_CreateListMenu(u8 taskId)
 {
     s16 *data;
     bool32 toss;
@@ -1061,98 +1136,97 @@ static void ItemStorage_ProcessWithdrawTossInput(u8 taskId)
     const u8* text;
 
     data = gTasks[taskId].data;
-    for(i = 0; i <=3; i++)
-        sub_816BC7C(i);
-    toss = data[3];
+    for (i = 0; i <= ITEMPC_WIN_LIST_END; i++)
+        ItemStorage_AddWindow(i);
+    toss = tInTossMenu;
     text = gText_TossItem;
     if (!toss)
         text = gText_WithdrawItem;
     x = GetStringCenterAlignXOffset(1, text, 104);
-    AddTextPrinterParameterized(gUnknown_0203BCC4->windowIds[3], 1, text, x, 1, 0, NULL);
-    CopyWindowToVram(gUnknown_0203BCC4->windowIds[2], 2);
-    sub_816C110();
-    sub_816C140();
+    AddTextPrinterParameterized(sItemStorageMenu->windowIds[ITEMPC_WIN_TITLE], 1, text, x, 1, 0, NULL);
+    CopyWindowToVram(sItemStorageMenu->windowIds[ITEMPC_WIN_ICON], 2);
+    ItemStorage_CompactList();
+    ItemStorage_CompactCursor();
     ItemStorage_RefreshListMenu();
-    data[5] = ListMenuInit(&gMultiuseListMenuTemplate, playerPCItemPageInfo.itemsAbove, playerPCItemPageInfo.cursorPos);
-    ItemStorage_StartScrollIndicator();
+    tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, gPlayerPCItemPageInfo.itemsAbove, gPlayerPCItemPageInfo.cursorPos);
+    ItemStorage_AddScrollIndicator();
     ScheduleBgCopyTilemapToVram(0);
     gTasks[taskId].func = ItemStorage_ProcessInput;
 }
 
-static const u8* ItemStorage_GetItemPcResponse(u16 itemId)
+static const u8* ItemStorage_GetMessage(u16 itemId)
 {
     const u8 *string;
 
     switch(itemId)
     {
-        case ITEMPC_GO_BACK_TO_PREV:
-            string = gText_GoBackPrevMenu;
-            break;
-        case ITEMPC_HOW_MANY_TO_WITHDRAW:
-            string = gText_WithdrawHowManyItems;
-            break;
-        case ITEMPC_WITHDREW_THING:
-            string = gText_WithdrawXItems;
-            break;
-        case ITEMPC_HOW_MANY_TO_TOSS:
-            string = gText_TossHowManyVar1s;
-            break;
-        case ITEMPC_THREW_AWAY_ITEM:
-            string = gText_ThrewAwayVar2Var1s;
-            break;
-        case ITEMPC_NO_MORE_ROOM:
-            string = gText_NoRoomInBag;
-            break;
-        case ITEMPC_TOO_IMPORTANT:
-            string = gText_TooImportantToToss;
-            break;
-        case ITEMPC_OKAY_TO_THROW_AWAY:
-            string = gText_ConfirmTossItems;
-            break;
-        case ITEMPC_SWITCH_WHICH_ITEM:
-            string = gText_MoveVar1Where;
-            break;
-        default:
-            string = ItemId_GetDescription(itemId);
-            break;
+    case MSG_GO_BACK_TO_PREV:
+        string = gText_GoBackPrevMenu;
+        break;
+    case MSG_HOW_MANY_TO_WITHDRAW:
+        string = gText_WithdrawHowManyItems;
+        break;
+    case MSG_WITHDREW_ITEM:
+        string = gText_WithdrawXItems;
+        break;
+    case MSG_HOW_MANY_TO_TOSS:
+        string = gText_TossHowManyVar1s;
+        break;
+    case MSG_THREW_AWAY_ITEM:
+        string = gText_ThrewAwayVar2Var1s;
+        break;
+    case MSG_NO_MORE_ROOM:
+        string = gText_NoRoomInBag;
+        break;
+    case MSG_TOO_IMPORTANT:
+        string = gText_TooImportantToToss;
+        break;
+    case MSG_OKAY_TO_THROW_AWAY:
+        string = gText_ConfirmTossItems;
+        break;
+    case MSG_SWITCH_WHICH_ITEM:
+        string = gText_MoveVar1Where;
+        break;
+    default:
+        string = ItemId_GetDescription(itemId);
+        break;
     }
     return string;
 }
 
-static void ItemStorage_PrintItemPcResponse(const u8 *string)
+static void ItemStorage_PrintMessage(const u8 *string)
 {
-    u8 windowId = gUnknown_0203BCC4->windowIds[1];
+    u8 windowId = sItemStorageMenu->windowIds[ITEMPC_WIN_MESSAGE];
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     StringExpandPlaceholders(gStringVar4, string);
     AddTextPrinterParameterized(windowId, 1, gStringVar4, 0, 1, 0, NULL);
 }
 
+// Process input while on the item storage's item list
 static void ItemStorage_ProcessInput(u8 taskId)
 {
-    s16 *data;
-    s32 id;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     if (JOY_NEW(SELECT_BUTTON))
     {
-        ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
-        if ((playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos) != (playerPCItemPageInfo.count - 1))
+        // 'Select' starts input for swapping items if not on Cancel
+        ListMenuGetScrollAndRow(tListTaskId, &gPlayerPCItemPageInfo.itemsAbove, &gPlayerPCItemPageInfo.cursorPos);
+        if (gPlayerPCItemPageInfo.itemsAbove + gPlayerPCItemPageInfo.cursorPos != gPlayerPCItemPageInfo.count - 1)
         {
             PlaySE(SE_SELECT);
-            ItemStorage_ItemSwapChoosePrompt(taskId);
+            ItemStorage_StartItemSwap(taskId);
         }
     }
     else
     {
-        id = ListMenu_ProcessInput(data[5]);
-        ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
-        switch(id)
+        s32 id = ListMenu_ProcessInput(tListTaskId);
+        ListMenuGetScrollAndRow(tListTaskId, &gPlayerPCItemPageInfo.itemsAbove, &gPlayerPCItemPageInfo.cursorPos);
+        switch (id)
         {
         case LIST_NOTHING_CHOSEN:
             break;
         case LIST_CANCEL:
             PlaySE(SE_SELECT);
-            ItemStorage_GoBackToPlayerPCMenu(taskId);
+            ItemStorage_ExitItemList(taskId);
             break;
         default:
             PlaySE(SE_SELECT);
@@ -1162,50 +1236,46 @@ static void ItemStorage_ProcessInput(u8 taskId)
     }
 }
 
-static void ItemStorage_GoBackToPlayerPCMenu_InitStorage(u8 taskId)
+static void ItemStorage_ReturnToMenuSelect(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     if (!IsDma3ManagerBusyWithBgCopy())
     {
         DrawDialogueFrame(0, 0);
-        if (!data[3])
-            InitItemStorageMenu(taskId, ITEMPC_MENU_WITHDRAW);
+
+        // Select Withdraw/Toss by default depending on which was just exited
+        if (!tInTossMenu)
+            InitItemStorageMenu(taskId, MENU_WITHDRAW);
         else
-            InitItemStorageMenu(taskId, ITEMPC_MENU_TOSS);
+            InitItemStorageMenu(taskId, MENU_TOSS);
         gTasks[taskId].func = ItemStorageMenuProcessInput;
     }
 }
 
-static void ItemStorage_GoBackToPlayerPCMenu(u8 taskId)
+static void ItemStorage_ExitItemList(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
-    sub_816C0C8();
+    s16 *data = gTasks[taskId].data;
+    ItemStorage_EraseItemIcon();
     ItemStorage_RemoveScrollIndicator();
-    DestroyListMenuTask(data[5], NULL, NULL);
-    DestroySwapLineSprites(gUnknown_0203BCC4->spriteIds, 7);
-    sub_816BC58();
-    gTasks[taskId].func = ItemStorage_GoBackToPlayerPCMenu_InitStorage;
+    DestroyListMenuTask(tListTaskId, NULL, NULL);
+    DestroySwapLineSprites(sItemStorageMenu->swapLineSpriteIds, SWAP_LINE_LENGTH);
+    ItemStorage_Free();
+    gTasks[taskId].func = ItemStorage_ReturnToMenuSelect;
 }
 
-static void ItemStorage_ItemSwapChoosePrompt(u8 taskId)
+static void ItemStorage_StartItemSwap(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
-    ListMenuSetUnkIndicatorsStructField(data[5], 16, 1);
-    gUnknown_0203BCC4->unk666 = (playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos);
-    sub_816BFB8(data[5], 0, 0);
-    UpdateSwapLinePos(gUnknown_0203BCC4->unk666);
-    CopyItemName(gSaveBlock1Ptr->pcItems[gUnknown_0203BCC4->unk666].itemId, gStringVar1);
-    ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(ITEMPC_SWITCH_WHICH_ITEM));
-    gTasks[taskId].func = sub_816C4FC;
+    s16 *data = gTasks[taskId].data;
+    ListMenuSetUnkIndicatorsStructField(tListTaskId, 16, 1);
+    sItemStorageMenu->toSwapPos = gPlayerPCItemPageInfo.itemsAbove + gPlayerPCItemPageInfo.cursorPos;
+    ItemStorage_SetSwapArrow(tListTaskId, 0, 0);
+    ItemStorage_UpdateSwapLinePos(sItemStorageMenu->toSwapPos);
+    CopyItemName(gSaveBlock1Ptr->pcItems[sItemStorageMenu->toSwapPos].itemId, gStringVar1);
+    ItemStorage_PrintMessage(ItemStorage_GetMessage(MSG_SWITCH_WHICH_ITEM));
+    gTasks[taskId].func = ItemStorage_ProcessItemSwapInput;
 }
 
-static void sub_816C4FC(u8 taskId)
+static void ItemStorage_ProcessItemSwapInput(u8 taskId)
 {
     s16 *data;
     s32 id;
@@ -1213,225 +1283,220 @@ static void sub_816C4FC(u8 taskId)
     data = gTasks[taskId].data;
     if (JOY_NEW(SELECT_BUTTON))
     {
-        ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
-        ItemStorage_DoItemSwap(taskId, FALSE);
+        ListMenuGetScrollAndRow(tListTaskId, &gPlayerPCItemPageInfo.itemsAbove, &gPlayerPCItemPageInfo.cursorPos);
+        ItemStorage_FinishItemSwap(taskId, FALSE);
         return;
     }
-    id = ListMenu_ProcessInput(data[5]);
-    ListMenuGetScrollAndRow(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
-    SetSwapLineSpritesInvisibility(gUnknown_0203BCC4->spriteIds, 7, FALSE);
-    UpdateSwapLinePos(playerPCItemPageInfo.cursorPos);
-    switch(id)
+    id = ListMenu_ProcessInput(tListTaskId);
+    ListMenuGetScrollAndRow(tListTaskId, &gPlayerPCItemPageInfo.itemsAbove, &gPlayerPCItemPageInfo.cursorPos);
+    SetSwapLineSpritesInvisibility(sItemStorageMenu->swapLineSpriteIds, SWAP_LINE_LENGTH, FALSE);
+    ItemStorage_UpdateSwapLinePos(gPlayerPCItemPageInfo.cursorPos);
+    switch (id)
     {
     case LIST_NOTHING_CHOSEN:
         break;
     case LIST_CANCEL:
         if (JOY_NEW(A_BUTTON))
-        {
-            ItemStorage_DoItemSwap(taskId, FALSE);
-        }
+            ItemStorage_FinishItemSwap(taskId, FALSE);
         else
-        {
-            ItemStorage_DoItemSwap(taskId, TRUE);
-        }
+            ItemStorage_FinishItemSwap(taskId, TRUE);
         break;
     default:
-        ItemStorage_DoItemSwap(taskId, FALSE);
+        ItemStorage_FinishItemSwap(taskId, FALSE);
         break;
     }
 }
 
-static void ItemStorage_DoItemSwap(u8 taskId, bool8 a)
+static void ItemStorage_FinishItemSwap(u8 taskId, bool8 canceled)
 {
-    s16 *data;
-    u16 b;
-
-    data = gTasks[taskId].data;
-    b = (playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos);
+    s16 *data = gTasks[taskId].data;
+    u16 newPos = gPlayerPCItemPageInfo.itemsAbove + gPlayerPCItemPageInfo.cursorPos;
     PlaySE(SE_SELECT);
-    DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
-    if (!a)
+    DestroyListMenuTask(tListTaskId, &gPlayerPCItemPageInfo.itemsAbove, &gPlayerPCItemPageInfo.cursorPos);
+
+    if (!canceled && sItemStorageMenu->toSwapPos != newPos && sItemStorageMenu->toSwapPos != newPos - 1)
     {
-        if (gUnknown_0203BCC4->unk666 != b)
-        {
-            if (gUnknown_0203BCC4->unk666 != b - 1)
-            {
-                MoveItemSlotInList(gSaveBlock1Ptr->pcItems, gUnknown_0203BCC4->unk666, b);
-                ItemStorage_RefreshListMenu();
-            }
-        }
+        MoveItemSlotInList(gSaveBlock1Ptr->pcItems, sItemStorageMenu->toSwapPos, newPos);
+        ItemStorage_RefreshListMenu();
     }
-    if (gUnknown_0203BCC4->unk666 < b)
-        playerPCItemPageInfo.cursorPos--;
-    SetSwapLineSpritesInvisibility(gUnknown_0203BCC4->spriteIds, 7, TRUE);
-    gUnknown_0203BCC4->unk666 = 0xFF;
-    data[5] = ListMenuInit(&gMultiuseListMenuTemplate, playerPCItemPageInfo.itemsAbove, playerPCItemPageInfo.cursorPos);
+    if (sItemStorageMenu->toSwapPos < newPos)
+        gPlayerPCItemPageInfo.cursorPos--;
+
+    SetSwapLineSpritesInvisibility(sItemStorageMenu->swapLineSpriteIds, SWAP_LINE_LENGTH, TRUE);
+    sItemStorageMenu->toSwapPos = NOT_SWAPPING;
+    tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, gPlayerPCItemPageInfo.itemsAbove, gPlayerPCItemPageInfo.cursorPos);
     ScheduleBgCopyTilemapToVram(0);
     gTasks[taskId].func = ItemStorage_ProcessInput;
 }
 
-static void UpdateSwapLinePos(u8 y)
+static void ItemStorage_UpdateSwapLinePos(u8 y)
 {
-    UpdateSwapLineSpritesPos(gUnknown_0203BCC4->spriteIds, 7, 128, ((y+1) * 16));
+    UpdateSwapLineSpritesPos(sItemStorageMenu->swapLineSpriteIds, SWAP_LINE_LENGTH, 128, (y+1) * 16);
 }
 
-static void sub_816C6BC(u8 windowId, u16 value, u32 mode, u8 x, u8 y, u8 n)
+static void ItemStorage_PrintItemQuantity(u8 windowId, u16 value, u32 mode, u8 x, u8 y, u8 n)
 {
     ConvertIntToDecimalStringN(gStringVar1, value, mode, n);
     StringExpandPlaceholders(gStringVar4, gText_xVar1);
     AddTextPrinterParameterized(windowId, 1, gStringVar4, GetStringCenterAlignXOffset(1, gStringVar4, 48), y, 0, NULL);
 }
 
+// Start an item Withdraw/Toss
 static void ItemStorage_DoItemAction(u8 taskId)
 {
-    s16 *data;
-    u16 b;
-
-    data = gTasks[taskId].data;
-    b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove);
+    s16 *data = gTasks[taskId].data;
+    u16 pos = gPlayerPCItemPageInfo.cursorPos + gPlayerPCItemPageInfo.itemsAbove;
     ItemStorage_RemoveScrollIndicator();
-    data[2] = 1;
-    if (!data[3])
+    tQuantity = 1;
+
+    if (!tInTossMenu)
     {
-        if (gSaveBlock1Ptr->pcItems[b].quantity == 1)
+        if (gSaveBlock1Ptr->pcItems[pos].quantity == 1)
         {
+            // Withdrawing 1 item, do it automatically
             ItemStorage_DoItemWithdraw(taskId);
             return;
         }
-        CopyItemName(gSaveBlock1Ptr->pcItems[b].itemId, gStringVar1);
-        ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(ITEMPC_HOW_MANY_TO_WITHDRAW));
+
+        // Withdrawing multiple items, show "how many" message
+        CopyItemName(gSaveBlock1Ptr->pcItems[pos].itemId, gStringVar1);
+        ItemStorage_PrintMessage(ItemStorage_GetMessage(MSG_HOW_MANY_TO_WITHDRAW));
     }
     else
     {
-        if (gSaveBlock1Ptr->pcItems[b].quantity == 1)
+        if (gSaveBlock1Ptr->pcItems[pos].quantity == 1)
         {
+            // Tossing 1 item, do it automatically
             ItemStorage_DoItemToss(taskId);
             return;
         }
-        CopyItemName(gSaveBlock1Ptr->pcItems[b].itemId, gStringVar1);
-        ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(ITEMPC_HOW_MANY_TO_TOSS));
+
+        // Tossing multiple items, show "how many" message
+        CopyItemName(gSaveBlock1Ptr->pcItems[pos].itemId, gStringVar1);
+        ItemStorage_PrintMessage(ItemStorage_GetMessage(MSG_HOW_MANY_TO_TOSS));
     }
-    sub_816C6BC(sub_816BC7C(4), data[2], STR_CONV_MODE_LEADING_ZEROS, 8, 1, 3);
+
+    // Set up "how many" prompt
+    ItemStorage_PrintItemQuantity(ItemStorage_AddWindow(ITEMPC_WIN_QUANTITY), tQuantity, STR_CONV_MODE_LEADING_ZEROS, 8, 1, 3);
     gTasks[taskId].func = ItemStorage_HandleQuantityRolling;
 }
 
 static void ItemStorage_HandleQuantityRolling(u8 taskId)
 {
-    s16 *data;
-    u16 b;
+    s16 *data = gTasks[taskId].data;
+    u16 pos = gPlayerPCItemPageInfo.cursorPos + gPlayerPCItemPageInfo.itemsAbove;
 
-    data = gTasks[taskId].data;
-    b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove);
-    if (AdjustQuantityAccordingToDPadInput(&(data[2]), gSaveBlock1Ptr->pcItems[b].quantity) == TRUE)
-        sub_816C6BC(sub_816BC7C(4), data[2], STR_CONV_MODE_LEADING_ZEROS, 8, 1, 3);
+    if (AdjustQuantityAccordingToDPadInput(&tQuantity, gSaveBlock1Ptr->pcItems[pos].quantity) == TRUE)
+    {
+        ItemStorage_PrintItemQuantity(ItemStorage_AddWindow(ITEMPC_WIN_QUANTITY), tQuantity, STR_CONV_MODE_LEADING_ZEROS, 8, 1, 3);
+    }
     else
     {
         if (JOY_NEW(A_BUTTON))
         {
+            // Quantity confirmed, perform action
             PlaySE(SE_SELECT);
-            sub_816BCC4(4);
-            if (!data[3])
+            ItemStorage_RemoveWindow(ITEMPC_WIN_QUANTITY);
+            if (!tInTossMenu)
                 ItemStorage_DoItemWithdraw(taskId);
             else
                 ItemStorage_DoItemToss(taskId);
         }
         else if (JOY_NEW(B_BUTTON))
         {
+            // Canceled action
             PlaySE(SE_SELECT);
-            sub_816BCC4(4);
-            ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(gSaveBlock1Ptr->pcItems[b].itemId));
-            ItemStorage_StartScrollIndicatorAndProcessInput(taskId);
+            ItemStorage_RemoveWindow(ITEMPC_WIN_QUANTITY);
+            ItemStorage_PrintMessage(ItemStorage_GetMessage(gSaveBlock1Ptr->pcItems[pos].itemId));
+            ItemStorage_ReturnToListInput(taskId);
         }
     }
 }
 
 static void ItemStorage_DoItemWithdraw(u8 taskId)
 {
-    s16 *data;
-    u16 b;
+    s16 *data = gTasks[taskId].data;
+    u16 pos = gPlayerPCItemPageInfo.cursorPos + gPlayerPCItemPageInfo.itemsAbove;
 
-    data = gTasks[taskId].data;
-    b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove);
-    if (AddBagItem(gSaveBlock1Ptr->pcItems[b].itemId, data[2]) == TRUE)
+    if (AddBagItem(gSaveBlock1Ptr->pcItems[pos].itemId, tQuantity) == TRUE)
     {
-        CopyItemName(gSaveBlock1Ptr->pcItems[b].itemId, gStringVar1);
-        ConvertIntToDecimalStringN(gStringVar2, data[2], STR_CONV_MODE_LEFT_ALIGN, 3);
-        ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(ITEMPC_WITHDREW_THING));
+        // Item withdrawn
+        CopyItemName(gSaveBlock1Ptr->pcItems[pos].itemId, gStringVar1);
+        ConvertIntToDecimalStringN(gStringVar2, tQuantity, STR_CONV_MODE_LEFT_ALIGN, 3);
+        ItemStorage_PrintMessage(ItemStorage_GetMessage(MSG_WITHDREW_ITEM));
         gTasks[taskId].func = ItemStorage_HandleRemoveItem;
     }
     else
     {
-        data[2] = 0;
-        ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(ITEMPC_NO_MORE_ROOM));
-        gTasks[taskId].func = ItemStorage_WaitPressHandleResumeProcessInput;
+        // No room to withdraw items
+        tQuantity = 0;
+        ItemStorage_PrintMessage(ItemStorage_GetMessage(MSG_NO_MORE_ROOM));
+        gTasks[taskId].func = ItemStorage_HandleErrorMessageInput;
     }
 }
 
 static void ItemStorage_DoItemToss(u8 taskId)
 {
-    s16 *data;
-    u16 b;
+    s16 *data = gTasks[taskId].data;
+    u16 pos = gPlayerPCItemPageInfo.cursorPos + gPlayerPCItemPageInfo.itemsAbove;
 
-    data = gTasks[taskId].data;
-    b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove);
-    if (!ItemId_GetImportance(gSaveBlock1Ptr->pcItems[b].itemId))
+    if (!ItemId_GetImportance(gSaveBlock1Ptr->pcItems[pos].itemId))
     {
-        CopyItemName(gSaveBlock1Ptr->pcItems[b].itemId, gStringVar1);
-        ConvertIntToDecimalStringN(gStringVar2, data[2], STR_CONV_MODE_LEFT_ALIGN, 3);
-        ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(ITEMPC_OKAY_TO_THROW_AWAY));
-        CreateYesNoMenuWithCallbacks(taskId, &gUnknown_085DFF84, 1, 0, 1, 0x214, 0xE, &ResumeFromWithdrawYesNoFuncList);
+        // Show toss confirmation prompt
+        CopyItemName(gSaveBlock1Ptr->pcItems[pos].itemId, gStringVar1);
+        ConvertIntToDecimalStringN(gStringVar2, tQuantity, STR_CONV_MODE_LEFT_ALIGN, 3);
+        ItemStorage_PrintMessage(ItemStorage_GetMessage(MSG_OKAY_TO_THROW_AWAY));
+        CreateYesNoMenuWithCallbacks(taskId, &sWindowTemplates_ItemStorage[ITEMPC_WIN_YESNO], 1, 0, 1, 0x214, 0xE, &ItemTossYesNoFuncs);
     }
     else
     {
-        data[2] = 0;
-        ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(ITEMPC_TOO_IMPORTANT));
-        gTasks[taskId].func = ItemStorage_WaitPressHandleResumeProcessInput;
+        // Can't toss important items
+        tQuantity = 0;
+        ItemStorage_PrintMessage(ItemStorage_GetMessage(MSG_TOO_IMPORTANT));
+        gTasks[taskId].func = ItemStorage_HandleErrorMessageInput;
     }
 }
 
-static void ItemStorage_ResumeInputFromYesToss(u8 taskId)
+static void ItemStorage_TossItemYes(u8 taskId)
 {
-    ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(ITEMPC_THREW_AWAY_ITEM));
+    ItemStorage_PrintMessage(ItemStorage_GetMessage(MSG_THREW_AWAY_ITEM));
     gTasks[taskId].func = ItemStorage_HandleRemoveItem;
 }
 
-static void ItemStorage_ResumeInputFromNoToss(u8 taskId)
+static void ItemStorage_TossItemNo(u8 taskId)
 {
-    ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(gSaveBlock1Ptr->pcItems[(playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos)].itemId));
-    ItemStorage_StartScrollIndicatorAndProcessInput(taskId);
+    ItemStorage_PrintMessage(ItemStorage_GetMessage(gSaveBlock1Ptr->pcItems[gPlayerPCItemPageInfo.itemsAbove + gPlayerPCItemPageInfo.cursorPos].itemId));
+    ItemStorage_ReturnToListInput(taskId);
 }
 
+// Remove item from PC (was either Tossed or Withdrawn)
 static void ItemStorage_HandleRemoveItem(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
-        RemovePCItem((playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove), data[2]);
-        DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
-        sub_816C110();
-        sub_816C140();
+        RemovePCItem(gPlayerPCItemPageInfo.cursorPos + gPlayerPCItemPageInfo.itemsAbove, tQuantity);
+        DestroyListMenuTask(tListTaskId, &gPlayerPCItemPageInfo.itemsAbove, &gPlayerPCItemPageInfo.cursorPos);
+        ItemStorage_CompactList();
+        ItemStorage_CompactCursor();
         ItemStorage_RefreshListMenu();
-        data[5] = ListMenuInit(&gMultiuseListMenuTemplate, playerPCItemPageInfo.itemsAbove, playerPCItemPageInfo.cursorPos);
-        ItemStorage_StartScrollIndicatorAndProcessInput(taskId);
+        tListTaskId = ListMenuInit(&gMultiuseListMenuTemplate, gPlayerPCItemPageInfo.itemsAbove, gPlayerPCItemPageInfo.cursorPos);
+        ItemStorage_ReturnToListInput(taskId);
     }
 }
 
-static void ItemStorage_WaitPressHandleResumeProcessInput(u8 taskId)
+static void ItemStorage_HandleErrorMessageInput(u8 taskId)
 {
-    s16 *data;
-
-    data = gTasks[taskId].data;
+    s16 *data = gTasks[taskId].data;
     if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
-        ItemStorage_PrintItemPcResponse(ItemStorage_GetItemPcResponse(gSaveBlock1Ptr->pcItems[(playerPCItemPageInfo.itemsAbove + playerPCItemPageInfo.cursorPos)].itemId));
-        ItemStorage_StartScrollIndicatorAndProcessInput(taskId);
+        ItemStorage_PrintMessage(ItemStorage_GetMessage(gSaveBlock1Ptr->pcItems[gPlayerPCItemPageInfo.itemsAbove + gPlayerPCItemPageInfo.cursorPos].itemId));
+        ItemStorage_ReturnToListInput(taskId);
     }
 }
 
-static void ItemStorage_StartScrollIndicatorAndProcessInput(u8 taskId)
+static void ItemStorage_ReturnToListInput(u8 taskId)
 {
-    ItemStorage_StartScrollIndicator();
+    ItemStorage_AddScrollIndicator();
     gTasks[taskId].func = ItemStorage_ProcessInput;
 }
diff --git a/src/pokeball.c b/src/pokeball.c
index 3671e6a35..52d47b534 100644
--- a/src/pokeball.c
+++ b/src/pokeball.c
@@ -373,13 +373,13 @@ static void Task_DoPokeballSendOutAnim(u8 taskId)
     {
     case POKEBALL_PLAYER_SENDOUT:
         gBattlerTarget = battlerId;
-        gSprites[ballSpriteId].pos1.x = 24;
-        gSprites[ballSpriteId].pos1.y = 68;
+        gSprites[ballSpriteId].x = 24;
+        gSprites[ballSpriteId].y = 68;
         gSprites[ballSpriteId].callback = SpriteCB_PlayerMonSendOut_1;
         break;
     case POKEBALL_OPPONENT_SENDOUT:
-        gSprites[ballSpriteId].pos1.x = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_X);
-        gSprites[ballSpriteId].pos1.y = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_Y) + 24;
+        gSprites[ballSpriteId].x = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_X);
+        gSprites[ballSpriteId].y = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_Y) + 24;
         gBattlerTarget = battlerId;
         gSprites[ballSpriteId].data[0] = 0;
         gSprites[ballSpriteId].callback = SpriteCB_OpponentMonSendOut;
@@ -423,13 +423,13 @@ static void SpriteCB_BallThrow(struct Sprite *sprite)
 
         StartSpriteAnim(sprite, 1);
         sprite->affineAnimPaused = 1;
-        sprite->pos1.x += sprite->pos2.x;
-        sprite->pos1.y += sprite->pos2.y;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x += sprite->x2;
+        sprite->y += sprite->y2;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[5] = 0;
         ballId = ItemIdToBallId(GetBattlerPokeballItemId(opponentBattler));
-        AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId);
+        AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 0x1C, ballId);
         sprite->data[0] = LaunchBallFadeMonTask(FALSE, opponentBattler, 14, ballId);
         sprite->sBattler = opponentBattler;
         sprite->data[7] = noOfShakes;
@@ -476,7 +476,7 @@ static void SpriteCB_BallThrow_ShrinkMon(struct Sprite *sprite)
     else
     {
         gSprites[gBattlerSpriteIds[sprite->sBattler]].data[1] += 0x60;
-        gSprites[gBattlerSpriteIds[sprite->sBattler]].pos2.y = -gSprites[gBattlerSpriteIds[sprite->sBattler]].data[1] >> 8;
+        gSprites[gBattlerSpriteIds[sprite->sBattler]].y2 = -gSprites[gBattlerSpriteIds[sprite->sBattler]].data[1] >> 8;
     }
 }
 
@@ -490,8 +490,8 @@ static void SpriteCB_BallThrow_Close(struct Sprite *sprite)
             sprite->data[3] = 0;
             sprite->data[4] = 32;
             sprite->data[5] = 0;
-            sprite->pos1.y += Cos(0, 32);
-            sprite->pos2.y = -Cos(0, sprite->data[4]);
+            sprite->y += Cos(0, 32);
+            sprite->y2 = -Cos(0, sprite->data[4]);
             sprite->callback = SpriteCB_BallThrow_FallToGround;
         }
     }
@@ -504,7 +504,7 @@ static void SpriteCB_BallThrow_FallToGround(struct Sprite *sprite)
     switch (sprite->data[3] & 0xFF)
     {
     case 0:
-        sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]);
+        sprite->y2 = -Cos(sprite->data[5], sprite->data[4]);
         sprite->data[5] += 4 + (sprite->data[3] >> 8);
         if (sprite->data[5] >= 64)
         {
@@ -530,7 +530,7 @@ static void SpriteCB_BallThrow_FallToGround(struct Sprite *sprite)
         }
         break;
     case 1:
-        sprite->pos2.y = -Cos(sprite->data[5], sprite->data[4]);
+        sprite->y2 = -Cos(sprite->data[5], sprite->data[4]);
         sprite->data[5] -= 4 + (sprite->data[3] >> 8);
         if (sprite->data[5] <= 0)
         {
@@ -542,8 +542,8 @@ static void SpriteCB_BallThrow_FallToGround(struct Sprite *sprite)
     if (r5)
     {
         sprite->data[3] = 0;
-        sprite->pos1.y += Cos(64, 32);
-        sprite->pos2.y = 0;
+        sprite->y += Cos(64, 32);
+        sprite->y2 = 0;
         if (sprite->data[7] == 0)
         {
             sprite->callback = SpriteCB_ReleaseMonFromBall;
@@ -576,7 +576,7 @@ static void SpriteCB_BallThrow_Shake(struct Sprite *sprite)
     {
     case 0:
     case 2:
-        sprite->pos2.x += sprite->data[4];
+        sprite->x2 += sprite->data[4];
         sprite->data[5] += sprite->data[4];
         sprite->affineAnimPaused = FALSE;
         if (sprite->data[5] > 3 || sprite->data[5] < -3)
@@ -740,7 +740,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
 
     StartSpriteAnim(sprite, 1);
     ballId = ItemIdToBallId(GetBattlerPokeballItemId(battlerId));
-    AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 0x1C, ballId);
+    AnimateBallOpenParticles(sprite->x, sprite->y - 5, 1, 0x1C, ballId);
     sprite->data[0] = LaunchBallFadeMonTask(TRUE, sprite->sBattler, 14, ballId);
     sprite->callback = HandleBallAnimEnd;
 
@@ -844,13 +844,13 @@ static void HandleBallAnimEnd(struct Sprite *sprite)
     else
     {
         gSprites[gBattlerSpriteIds[battlerId]].data[1] -= 288;
-        gSprites[gBattlerSpriteIds[battlerId]].pos2.y = gSprites[gBattlerSpriteIds[battlerId]].data[1] >> 8;
+        gSprites[gBattlerSpriteIds[battlerId]].y2 = gSprites[gBattlerSpriteIds[battlerId]].data[1] >> 8;
     }
     if (sprite->animEnded && affineAnimEnded)
     {
         s32 i, doneBattlers;
 
-        gSprites[gBattlerSpriteIds[battlerId]].pos2.y = 0;
+        gSprites[gBattlerSpriteIds[battlerId]].y2 = 0;
         gDoingBattleAnim = FALSE;
         gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = 0;
         FreeSpriteOamMatrix(sprite);
@@ -927,7 +927,7 @@ static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite)
         r4 = sprite->data[0];
         AnimTranslateLinear(sprite);
         sprite->data[7] += sprite->sBattler / 3;
-        sprite->pos2.y += Sin(HIBYTE(sprite->data[7]), sprite->data[5]);
+        sprite->y2 += Sin(HIBYTE(sprite->data[7]), sprite->data[5]);
         sprite->oam.affineParam += 0x100;
         if ((sprite->oam.affineParam >> 8) % 3 != 0)
             sprite->data[0] = r4;
@@ -945,10 +945,10 @@ static void SpriteCB_PlayerMonSendOut_2(struct Sprite *sprite)
     {
         if (TranslateAnimHorizontalArc(sprite))
         {
-            sprite->pos1.x += sprite->pos2.x;
-            sprite->pos1.y += sprite->pos2.y;
-            sprite->pos2.y = 0;
-            sprite->pos2.x = 0;
+            sprite->x += sprite->x2;
+            sprite->y += sprite->y2;
+            sprite->y2 = 0;
+            sprite->x2 = 0;
             sprite->sBattler = sprite->oam.affineParam & 0xFF;
             sprite->data[0] = 0;
 
@@ -1008,11 +1008,11 @@ void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 battlerId, u8 x, u8 y,
     spriteId = CreateSprite(&gBallSpriteTemplates[0], x, y, subpriortiy);
 
     gSprites[spriteId].data[0] = monSpriteId;
-    gSprites[spriteId].data[5] = gSprites[monSpriteId].pos1.x;
-    gSprites[spriteId].data[6] = gSprites[monSpriteId].pos1.y;
+    gSprites[spriteId].data[5] = gSprites[monSpriteId].x;
+    gSprites[spriteId].data[6] = gSprites[monSpriteId].y;
 
-    gSprites[monSpriteId].pos1.x = x;
-    gSprites[monSpriteId].pos1.y = y;
+    gSprites[monSpriteId].x = x;
+    gSprites[monSpriteId].y = y;
     gSprites[monSpriteId].data[7] = species;
 
     gSprites[spriteId].data[1] = g;
@@ -1040,7 +1040,7 @@ static void SpriteCB_PokeballReleaseMon(struct Sprite *sprite)
             r5 = 0;
 
         StartSpriteAnim(sprite, 1);
-        AnimateBallOpenParticlesForPokeball(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r5);
+        AnimateBallOpenParticlesForPokeball(sprite->x, sprite->y - 5, sprite->oam.priority, r5);
         sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, battlerId, r4);
         sprite->callback = SpriteCB_ReleasedMonFlyOut;
         gSprites[r7].invisible = FALSE;
@@ -1070,24 +1070,24 @@ static void SpriteCB_ReleasedMonFlyOut(struct Sprite *sprite)
         StartSpriteAffineAnim(&gSprites[monSpriteId], BATTLER_AFFINE_NORMAL);
         r12 = TRUE;
     }
-    var1 = (sprite->data[5] - sprite->pos1.x) * sprite->data[7] / 128 + sprite->pos1.x;
-    var2 = (sprite->data[6] - sprite->pos1.y) * sprite->data[7] / 128 + sprite->pos1.y;
-    gSprites[monSpriteId].pos1.x = var1;
-    gSprites[monSpriteId].pos1.y = var2;
+    var1 = (sprite->data[5] - sprite->x) * sprite->data[7] / 128 + sprite->x;
+    var2 = (sprite->data[6] - sprite->y) * sprite->data[7] / 128 + sprite->y;
+    gSprites[monSpriteId].x = var1;
+    gSprites[monSpriteId].y = var2;
     if (sprite->data[7] < 128)
     {
         s16 sine = -(gSineTable[(u8)sprite->data[7]] / 8);
 
         sprite->data[7] += 4;
-        gSprites[monSpriteId].pos2.x = sine;
-        gSprites[monSpriteId].pos2.y = sine;
+        gSprites[monSpriteId].x2 = sine;
+        gSprites[monSpriteId].y2 = sine;
     }
     else
     {
-        gSprites[monSpriteId].pos1.x = sprite->data[5];
-        gSprites[monSpriteId].pos1.y = sprite->data[6];
-        gSprites[monSpriteId].pos2.x = 0;
-        gSprites[monSpriteId].pos2.y = 0;
+        gSprites[monSpriteId].x = sprite->data[5];
+        gSprites[monSpriteId].y = sprite->data[6];
+        gSprites[monSpriteId].x2 = 0;
+        gSprites[monSpriteId].y2 = 0;
         r6 = TRUE;
     }
     if (sprite->animEnded && r12 && r6)
@@ -1133,7 +1133,7 @@ static void SpriteCB_TradePokeball(struct Sprite *sprite)
             r6 = 0;
 
         StartSpriteAnim(sprite, 1);
-        AnimateBallOpenParticlesForPokeball(sprite->pos1.x, sprite->pos1.y - 5, sprite->oam.priority, r6);
+        AnimateBallOpenParticlesForPokeball(sprite->x, sprite->y - 5, sprite->oam.priority, r6);
         sprite->data[1] = LaunchBallFadeMonTaskForPokeball(1, r8, r5);
         sprite->callback = SpriteCB_TradePokeballSendOff;
 #ifdef BUGFIX
@@ -1169,7 +1169,7 @@ static void SpriteCB_TradePokeballSendOff(struct Sprite *sprite)
     else
     {
         gSprites[monSpriteId].data[1] += 96;
-        gSprites[monSpriteId].pos2.y = -gSprites[monSpriteId].data[1] >> 8;
+        gSprites[monSpriteId].y2 = -gSprites[monSpriteId].data[1] >> 8;
     }
 }
 
@@ -1195,15 +1195,15 @@ void StartHealthboxSlideIn(u8 battlerId)
 
     healthboxSprite->sSpeedX = 5;
     healthboxSprite->sSpeedY = 0;
-    healthboxSprite->pos2.x = 0x73;
-    healthboxSprite->pos2.y = 0;
+    healthboxSprite->x2 = 0x73;
+    healthboxSprite->y2 = 0;
     healthboxSprite->callback = SpriteCB_HealthboxSlideIn;
     if (GetBattlerSide(battlerId) != B_SIDE_PLAYER)
     {
         healthboxSprite->sSpeedX = -healthboxSprite->sSpeedX;
         healthboxSprite->sSpeedY = -healthboxSprite->sSpeedY;
-        healthboxSprite->pos2.x = -healthboxSprite->pos2.x;
-        healthboxSprite->pos2.y = -healthboxSprite->pos2.y;
+        healthboxSprite->x2 = -healthboxSprite->x2;
+        healthboxSprite->y2 = -healthboxSprite->y2;
     }
     gSprites[healthboxSprite->data[5]].callback(&gSprites[healthboxSprite->data[5]]);
     if (GetBattlerPosition(battlerId) == B_POSITION_PLAYER_RIGHT)
@@ -1222,9 +1222,9 @@ static void SpriteCB_HealthboxSlideInDelayed(struct Sprite *sprite)
 
 static void SpriteCB_HealthboxSlideIn(struct Sprite *sprite)
 {
-    sprite->pos2.x -= sprite->sSpeedX;
-    sprite->pos2.y -= sprite->sSpeedY;
-    if (sprite->pos2.x == 0 && sprite->pos2.y == 0)
+    sprite->x2 -= sprite->sSpeedX;
+    sprite->y2 -= sprite->sSpeedY;
+    if (sprite->x2 == 0 && sprite->y2 == 0)
         sprite->callback = SpriteCallbackDummy;
 }
 
@@ -1246,13 +1246,13 @@ static void SpriteCB_HitAnimHealthoxEffect(struct Sprite *sprite)
 {
     u8 r1 = sprite->data[1];
 
-    gSprites[r1].pos2.y = sprite->data[0];
+    gSprites[r1].y2 = sprite->data[0];
     sprite->data[0] = -sprite->data[0];
     sprite->data[2]++;
     if (sprite->data[2] == 21)
     {
-        gSprites[r1].pos2.x = 0;
-        gSprites[r1].pos2.y = 0;
+        gSprites[r1].x2 = 0;
+        gSprites[r1].y2 = 0;
         DestroySprite(sprite);
     }
 }
diff --git a/src/pokeblock.c b/src/pokeblock.c
index fad6858ec..89c2bc962 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -36,8 +36,8 @@
 #define MAX_MENU_ITEMS 9
 #define MENU_MIDPOINT (MAX_MENU_ITEMS / 2)
 
-#define TILE_HIGHLIGHT_NONE 0x0005 // Tile number for the bg of an unselected menu item 
-#define TILE_HIGHLIGHT_BLUE 0x1005 // Tile number for the bg of a selected menu item 
+#define TILE_HIGHLIGHT_NONE 0x0005 // Tile number for the bg of an unselected menu item
+#define TILE_HIGHLIGHT_BLUE 0x1005 // Tile number for the bg of a selected menu item
 #define TILE_HIGHLIGHT_RED  0x2005 // Tile number for the bg of a menu item to swap
 
 #define TAG_POKEBLOCK_CASE  14800
@@ -792,7 +792,7 @@ static void DrawPokeblockInfo(s32 pkblId)
             }
             CopyToBgTilemapBufferRect(2, rectTilemapSrc, (i / 3 * 6) + 1, (i % 3 * 2) + 13, 1, 2);
         }
-        
+
         // Print the Pokéblock's feel
         ConvertIntToDecimalStringN(gStringVar1, GetPokeblocksFeel(pokeblock), STR_CONV_MODE_RIGHT_ALIGN, 2);
         PrintOnPokeblockWindow(WIN_FEEL, gStringVar1, 4);
diff --git a/src/pokeblock_feed.c b/src/pokeblock_feed.c
index 47e510562..b123e6031 100644
--- a/src/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -934,8 +934,8 @@ static u8 CreateMonSprite(struct Pokemon* mon)
 
 static void StartMonJumpForPokeblock(u8 spriteId)
 {
-    gSprites[spriteId].pos1.x = MON_X;
-    gSprites[spriteId].pos1.y = MON_Y;
+    gSprites[spriteId].x = MON_X;
+    gSprites[spriteId].y = MON_Y;
     gSprites[spriteId].sSpeed = -8;
     gSprites[spriteId].sAccel = 1;
     gSprites[spriteId].callback = SpriteCB_MonJumpForPokeblock;
@@ -943,8 +943,8 @@ static void StartMonJumpForPokeblock(u8 spriteId)
 
 static void SpriteCB_MonJumpForPokeblock(struct Sprite* sprite)
 {
-    sprite->pos1.x += 4;
-    sprite->pos1.y += sprite->sSpeed;
+    sprite->x += 4;
+    sprite->y += sprite->sSpeed;
     sprite->sSpeed += sprite->sAccel;
 
     // Play cry at jump peak
@@ -988,8 +988,8 @@ static u8 CreatePokeblockSprite(void)
 
 static void SpriteCB_ThrownPokeblock(struct Sprite* sprite)
 {
-    sprite->pos1.x -= 4;
-    sprite->pos1.y += sprite->sSpeed;
+    sprite->x -= 4;
+    sprite->y += sprite->sSpeed;
     sprite->sSpeed += sprite->sAccel;
     if (sprite->sSpeed == 10)
         DestroySprite(sprite);
@@ -1003,7 +1003,7 @@ static void CalculateMonAnimLength(void)
     pokeblockFeed = sPokeblockFeed;
     pokeblockFeed->monAnimLength = 1;
     animId = sNatureToMonPokeblockAnim[pokeblockFeed->nature][0];
-    
+
     // Add up the time each stage of the animation will take
     for (i = 0; i < 8; i++, animId++)
     {
@@ -1094,8 +1094,8 @@ static bool8 InitMonAnimStage(void)
         pokeblockFeed->monInitX = Sin(pokeblockFeed->animData[ANIMDATA_ROT_IDX], pokeblockFeed->animData[ANIMDATA_SIN_AMPLITUDE]);
         pokeblockFeed->monInitY = Cos(pokeblockFeed->animData[ANIMDATA_ROT_IDX], pokeblockFeed->animData[ANIMDATA_COS_AMPLITUDE]);
         pokeblockFeed->maxAnimStageTime = pokeblockFeed->animData[ANIMDATA_TIME];
-        pokeblockFeed->monX = pokeblockFeed->monSpritePtr->pos2.x;
-        pokeblockFeed->monY = pokeblockFeed->monSpritePtr->pos2.y;
+        pokeblockFeed->monX = pokeblockFeed->monSpritePtr->x2;
+        pokeblockFeed->monY = pokeblockFeed->monSpritePtr->y2;
 
         // Calculate the positions to move to during the animation
         // The time is counted down during this, so reset it afterwards
@@ -1111,8 +1111,8 @@ static bool8 DoMonAnimStep(void)
 {
     // Update mon's position
     u16 time = sPokeblockFeed->maxAnimStageTime - sPokeblockFeed->animData[ANIMDATA_TIME];
-    sPokeblockFeed->monSpritePtr->pos2.x = sPokeblockFeed->monAnimX[time];
-    sPokeblockFeed->monSpritePtr->pos2.y = sPokeblockFeed->monAnimY[time];
+    sPokeblockFeed->monSpritePtr->x2 = sPokeblockFeed->monAnimX[time];
+    sPokeblockFeed->monSpritePtr->y2 = sPokeblockFeed->monAnimY[time];
 
     // Count down time remaining in this stage
     // Return TRUE if this stage is complete
@@ -1177,16 +1177,16 @@ static void CalculateMonAnimMovement(void)
 
         if (!negative)
         {
-            pokeblockFeed->monAnimX[time] = Sin(pokeblockFeed->animData[ANIMDATA_ROT_IDX], 
+            pokeblockFeed->monAnimX[time] = Sin(pokeblockFeed->animData[ANIMDATA_ROT_IDX],
                                                 pokeblockFeed->animData[ANIMDATA_SIN_AMPLITUDE] + amplitude / 0x100) + x;
-            pokeblockFeed->monAnimY[time] = Cos(pokeblockFeed->animData[ANIMDATA_ROT_IDX], 
+            pokeblockFeed->monAnimY[time] = Cos(pokeblockFeed->animData[ANIMDATA_ROT_IDX],
                                                 pokeblockFeed->animData[ANIMDATA_COS_AMPLITUDE] + amplitude / 0x100) + y;
         }
         else
         {
-            pokeblockFeed->monAnimX[time] = Sin(pokeblockFeed->animData[ANIMDATA_ROT_IDX], 
+            pokeblockFeed->monAnimX[time] = Sin(pokeblockFeed->animData[ANIMDATA_ROT_IDX],
                                                 pokeblockFeed->animData[ANIMDATA_SIN_AMPLITUDE] - amplitude / 0x100) + x;
-            pokeblockFeed->monAnimY[time] = Cos(pokeblockFeed->animData[ANIMDATA_ROT_IDX], 
+            pokeblockFeed->monAnimY[time] = Cos(pokeblockFeed->animData[ANIMDATA_ROT_IDX],
                                                 pokeblockFeed->animData[ANIMDATA_COS_AMPLITUDE] - amplitude / 0x100) + y;
         }
 
diff --git a/src/pokedex.c b/src/pokedex.c
index c7c892d53..98fa40dbf 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -1785,7 +1785,7 @@ static void Task_HandlePokedexStartMenuInput(u8 taskId)
 
 static void Task_OpenInfoScreenAfterMonMovement(u8 taskId)
 {
-    if (gSprites[sPokedexView->selectedMonSpriteId].pos1.x == 48 && gSprites[sPokedexView->selectedMonSpriteId].pos1.y == 56)
+    if (gSprites[sPokedexView->selectedMonSpriteId].x == 48 && gSprites[sPokedexView->selectedMonSpriteId].y == 56)
     {
         sPokedexView->currentPageBackup = sPokedexView->currentPage;
         gTasks[taskId].tTaskId = LoadInfoScreen(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId);
@@ -1987,7 +1987,7 @@ static void Task_HandleSearchResultsStartMenuInput(u8 taskId)
 
 static void Task_OpenSearchResultsInfoScreenAfterMonMovement(u8 taskId)
 {
-    if (gSprites[sPokedexView->selectedMonSpriteId].pos1.x == 48 && gSprites[sPokedexView->selectedMonSpriteId].pos1.y == 56)
+    if (gSprites[sPokedexView->selectedMonSpriteId].x == 48 && gSprites[sPokedexView->selectedMonSpriteId].y == 56)
     {
         sPokedexView->currentPageBackup = sPokedexView->currentPage;
         gTasks[taskId].tTaskId = LoadInfoScreen(&sPokedexView->pokedexList[sPokedexView->selectedPokemon], sPokedexView->selectedMonSpriteId);
@@ -2652,7 +2652,7 @@ static void UpdateSelectedMonSpriteId(void)
     {
         u16 spriteId = sPokedexView->monSpriteIds[i];
 
-        if (gSprites[spriteId].pos2.x == 0 && gSprites[spriteId].pos2.y == 0 && spriteId != 0xFFFF)
+        if (gSprites[spriteId].x2 == 0 && gSprites[spriteId].y2 == 0 && spriteId != 0xFFFF)
             sPokedexView->selectedMonSpriteId = spriteId;
     }
 }
@@ -3000,19 +3000,19 @@ void SpriteCB_MoveMonForInfoScreen(struct Sprite *sprite)
 {
     sprite->oam.priority = 0;
     sprite->oam.affineMode = ST_OAM_AFFINE_OFF;
-    sprite->pos2.x = 0;
-    sprite->pos2.y = 0;
-    if (sprite->pos1.x != 48 || sprite->pos1.y != 56)
+    sprite->x2 = 0;
+    sprite->y2 = 0;
+    if (sprite->x != 48 || sprite->y != 56)
     {
-        if (sprite->pos1.x > 48)
-            sprite->pos1.x--;
-        if (sprite->pos1.x < 48)
-            sprite->pos1.x++;
+        if (sprite->x > 48)
+            sprite->x--;
+        if (sprite->x < 48)
+            sprite->x++;
 
-        if (sprite->pos1.y > 56)
-            sprite->pos1.y--;
-        if (sprite->pos1.y < 56)
-            sprite->pos1.y++;
+        if (sprite->y > 56)
+            sprite->y--;
+        if (sprite->y < 56)
+            sprite->y++;
     }
     else
     {
@@ -3032,7 +3032,7 @@ static void SpriteCB_PokedexListMonSprite(struct Sprite *sprite)
     else
     {
         u32 var;
-        sprite->pos2.y = gSineTable[(u8)sprite->data[5]] * 76 / 256;
+        sprite->y2 = gSineTable[(u8)sprite->data[5]] * 76 / 256;
         var = SAFE_DIV(0x10000, gSineTable[sprite->data[5] + 64]);
         if (var > 0xFFFF)
             var = 0xFFFF;
@@ -3062,7 +3062,7 @@ static void SpriteCB_Scrollbar(struct Sprite *sprite)
     if (sPokedexView->currentPage != PAGE_MAIN && sPokedexView->currentPage != PAGE_SEARCH_RESULTS)
         DestroySprite(sprite);
     else
-        sprite->pos2.y = sPokedexView->selectedPokemon * 120 / (sPokedexView->pokemonListCount - 1);
+        sprite->y2 = sPokedexView->selectedPokemon * 120 / (sPokedexView->pokemonListCount - 1);
 }
 
 static void SpriteCB_ScrollArrow(struct Sprite *sprite)
@@ -3091,7 +3091,7 @@ static void SpriteCB_ScrollArrow(struct Sprite *sprite)
                 sprite->invisible = FALSE;
             r0 = sprite->data[2] - 128;
         }
-        sprite->pos2.y = gSineTable[r0] / 64;
+        sprite->y2 = gSineTable[r0] / 64;
         sprite->data[2] = sprite->data[2] + 8;
         if (sPokedexView->menuIsOpen == FALSE && sPokedexView->menuY == 0 && sprite->invisible == FALSE)
             sprite->invisible = FALSE;
@@ -3126,8 +3126,8 @@ static void SpriteCB_RotatingPokeBall(struct Sprite *sprite)
         val = sPokedexView->pokeBallRotation + (sprite->data[1] + 64);
         r3 = gSineTable[val];
         r0 = gSineTable[val + 64];
-        sprite->pos2.x = r0 * 40 / 256;
-        sprite->pos2.y = r3 * 40 / 256;
+        sprite->x2 = r0 * 40 / 256;
+        sprite->y2 = r3 * 40 / 256;
     }
 }
 
@@ -3144,8 +3144,8 @@ static void SpriteCB_DexListStartMenuCursor(struct Sprite *sprite)
         if (sPokedexView->menuIsOpen && sPokedexView->menuY == r1)
         {
             sprite->invisible = FALSE;
-            sprite->pos2.y = sPokedexView->menuCursorPos * 16;
-            sprite->pos2.x = gSineTable[(u8)sprite->data[2]] / 64;
+            sprite->y2 = sPokedexView->menuCursorPos * 16;
+            sprite->x2 = gSineTable[(u8)sprite->data[2]] / 64;
             sprite->data[2] += 8;
         }
         else
@@ -3755,7 +3755,7 @@ static void Task_LoadSizeScreen(u8 taskId)
         gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
         gSprites[spriteId].oam.matrixNum = 1;
         gSprites[spriteId].oam.priority = 0;
-        gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset;
+        gSprites[spriteId].y2 = gPokedexEntries[sPokedexListItem->dexNum].trainerOffset;
         SetOamMatrix(1, gPokedexEntries[sPokedexListItem->dexNum].trainerScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].trainerScale);
         LoadPalette(sSizeScreenSilhouette_Pal, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
         gTasks[taskId].data[5] = spriteId;
@@ -3766,7 +3766,7 @@ static void Task_LoadSizeScreen(u8 taskId)
         gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
         gSprites[spriteId].oam.matrixNum = 2;
         gSprites[spriteId].oam.priority = 0;
-        gSprites[spriteId].pos2.y = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset;
+        gSprites[spriteId].y2 = gPokedexEntries[sPokedexListItem->dexNum].pokemonOffset;
         SetOamMatrix(2, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale, 0, 0, gPokedexEntries[sPokedexListItem->dexNum].pokemonScale);
         LoadPalette(sSizeScreenSilhouette_Pal, (gSprites[spriteId].oam.paletteNum + 16) * 16, 0x20);
         gTasks[taskId].tMonSpriteId = spriteId;
@@ -4054,15 +4054,15 @@ static void Task_ExitCaughtMonPage(u8 taskId)
 
 static void SpriteCB_SlideCaughtMonToCenter(struct Sprite *sprite)
 {
-    if (sprite->pos1.x < 0x78)
-        sprite->pos1.x += 2;
-    if (sprite->pos1.x > 0x78)
-        sprite->pos1.x -= 2;
+    if (sprite->x < 0x78)
+        sprite->x += 2;
+    if (sprite->x > 0x78)
+        sprite->x -= 2;
 
-    if (sprite->pos1.y < 0x50)
-        sprite->pos1.y += 1;
-    if (sprite->pos1.y > 0x50)
-        sprite->pos1.y -= 1;
+    if (sprite->y < 0x50)
+        sprite->y += 1;
+    if (sprite->y > 0x50)
+        sprite->y -= 1;
 }
 
 #undef tState
@@ -4633,12 +4633,12 @@ static u32 GetPokedexMonPersonality(u16 species)
 u16 CreateMonSpriteFromNationalDexNumber(u16 nationalNum, s16 x, s16 y, u16 paletteSlot)
 {
     nationalNum = NationalPokedexNumToSpecies(nationalNum);
-    return CreateMonPicSprite_HandleDeoxys(nationalNum, SHINY_ODDS, GetPokedexMonPersonality(nationalNum), TRUE, x, y, paletteSlot, 0xFFFF);
+    return CreateMonPicSprite_HandleDeoxys(nationalNum, SHINY_ODDS, GetPokedexMonPersonality(nationalNum), TRUE, x, y, paletteSlot, TAG_NONE);
 }
 
 static u16 CreateSizeScreenTrainerPic(u16 species, s16 x, s16 y, s8 paletteSlot)
 {
-    return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, 0xFFFF);
+    return CreateTrainerPicSprite(species, TRUE, x, y, paletteSlot, TAG_NONE);
 }
 
 static int DoPokedexSearch(u8 dexMode, u8 order, u8 abcGroup, u8 bodyColor, u8 type1, u8 type2)
@@ -5235,7 +5235,7 @@ void SetSearchRectHighlight(u8 flags, u8 x, u8 y, u8 width)
         temp &= 0x0fff;
         temp |= (flags << 12);
         *(u16 *)(ptr + (y + 0) * 64 + (x + i) * 2) = temp;
-        
+
         temp = *(u16 *)(ptr + (y + 1) * 64 + (x + i) * 2);
         temp &= 0x0fff;
         temp |= (flags << 12);
@@ -5570,7 +5570,7 @@ static void SpriteCB_SearchParameterScrollArrow(struct Sprite *sprite)
                 sprite->invisible = FALSE;
         }
         val = sprite->data[2] + sprite->sIsDownArrow * 128;
-        sprite->pos2.y = gSineTable[val] / 128;
+        sprite->y2 = gSineTable[val] / 128;
         sprite->data[2] += 8;
     }
     else
diff --git a/src/pokedex_area_region_map.c b/src/pokedex_area_region_map.c
index 82d5e50e5..1ee5ca988 100644
--- a/src/pokedex_area_region_map.c
+++ b/src/pokedex_area_region_map.c
@@ -17,7 +17,7 @@ static const u32 sPokedexAreaMapAffine_Tilemap[] = INCBIN_U32("graphics/interfac
 void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *template)
 {
     u8 mode;
-    sPokedexAreaMapBgNum = Alloc(4);
+    sPokedexAreaMapBgNum = Alloc(sizeof(sPokedexAreaMapBgNum));
     mode = template->mode;
 
     if (mode == 0)
@@ -28,8 +28,9 @@ void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *template)
     }
     else
     {
+        // This is never reached, only a mode of 0 is given
         SetBgAttribute(template->bg, BG_ATTR_METRIC, 2);
-        SetBgAttribute(template->bg, BG_ATTR_TYPE, 1);
+        SetBgAttribute(template->bg, BG_ATTR_TYPE, BG_TYPE_AFFINE); // This does nothing. BG_ATTR_TYPE can't be set with this function
         DecompressAndCopyTileDataToVram(template->bg, sPokedexAreaMapAffine_Gfx, 0, template->offset, 0);
         sub_8199D3C(DecompressAndCopyTileDataToVram(template->bg, sPokedexAreaMapAffine_Tilemap, 0, 0, 1), template->offset, 64, 64, TRUE);
     }
@@ -41,7 +42,7 @@ void LoadPokedexAreaMapGfx(const struct PokedexAreaMapTemplate *template)
     *sPokedexAreaMapBgNum = template->bg;
 }
 
-bool32 sub_81C4E90(void)
+bool32 TryShowPokedexAreaMap(void)
 {
     if (!FreeTempTileDataBuffersIfPossible())
     {
@@ -56,8 +57,7 @@ bool32 sub_81C4E90(void)
 
 void FreePokedexAreaMapBgNum(void)
 {
-    if (sPokedexAreaMapBgNum != NULL)
-        FREE_AND_SET_NULL(sPokedexAreaMapBgNum);
+    TRY_FREE_AND_SET_NULL(sPokedexAreaMapBgNum);
 }
 
 void PokedexAreaMapChangeBgY(u32 a0)
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c
index f9cf42309..2f0d676cb 100755
--- a/src/pokedex_area_screen.c
+++ b/src/pokedex_area_screen.c
@@ -86,7 +86,7 @@ static void CreateAreaMarkerSprites(void);
 static void LoadAreaUnknownGraphics(void);
 static void CreateAreaUnknownSprites(void);
 static void Task_HandlePokedexAreaScreenInput(u8);
-static void sub_813D6B4(void);
+static void ResetPokedexAreaMapBg(void);
 static void DestroyAreaMarkerSprites(void);
 
 static const u32 sAreaGlow_Pal[] = INCBIN_U32("graphics/pokedex/area_glow.gbapal");
@@ -527,7 +527,7 @@ static void BuildAreaGlowTilemap(void)
                     sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH] |= GLOW_TILE_BOTTOM;
                 if (y != AREA_SCREEN_HEIGHT - 1 && sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH] != GLOW_TILE_FULL)
                     sPokedexAreaScreen->areaGlowTilemap[j + AREA_SCREEN_WIDTH] |= GLOW_TILE_TOP;
-                
+
                 // Diagonals
                 if (x != 0 && y != 0 && sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH - 1] != GLOW_TILE_FULL)
                     sPokedexAreaScreen->areaGlowTilemap[j - AREA_SCREEN_WIDTH - 1] |= GLOW_TILE_BOTTOM_RIGHT;
@@ -665,7 +665,7 @@ static void Task_ShowPokedexAreaScreen(u8 taskId)
             StringFill(sPokedexAreaScreen->charBuffer, CHAR_SPACE, 16);
             break;
         case 2:
-            if (sub_81C4E90() == TRUE)
+            if (TryShowPokedexAreaMap() == TRUE)
                 return;
             PokedexAreaMapChangeBgY(-8);
             break;
@@ -697,7 +697,7 @@ static void Task_ShowPokedexAreaScreen(u8 taskId)
             SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_BG0 | BLDCNT_TGT2_ALL);
             StartAreaGlow();
             ShowBg(2);
-            ShowBg(3);
+            ShowBg(3); // TryShowPokedexAreaMap will have done this already
             SetGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON);
             break;
         case 11:
@@ -743,7 +743,7 @@ static void Task_HandlePokedexAreaScreenInput(u8 taskId)
             return;
         DestroyAreaMarkerSprites();
         sPokedexAreaScreen->screenSwitchState[0] = gTasks[taskId].data[1];
-        sub_813D6B4();
+        ResetPokedexAreaMapBg();
         DestroyTask(taskId);
         FreePokedexAreaMapBgNum();
         FREE_AND_SET_NULL(sPokedexAreaScreen);
@@ -753,7 +753,7 @@ static void Task_HandlePokedexAreaScreenInput(u8 taskId)
     gTasks[taskId].tState++;
 }
 
-static void sub_813D6B4(void)
+static void ResetPokedexAreaMapBg(void)
 {
     SetBgAttribute(3, BG_ATTR_CHARBASEINDEX, 0);
     SetBgAttribute(3, BG_ATTR_PALETTEMODE, 0);
diff --git a/src/pokedex_cry_screen.c b/src/pokedex_cry_screen.c
index 447ce7515..350946f3b 100644
--- a/src/pokedex_cry_screen.c
+++ b/src/pokedex_cry_screen.c
@@ -19,7 +19,7 @@
 //      .        .
 //    96   .  .  -96
 //         127
-//   
+//
 #define MIN_NEEDLE_POS  32
 #define MAX_NEEDLE_POS -32
 
@@ -253,7 +253,7 @@ bool8 LoadCryWaveformWindow(struct CryScreenWindow *window, u8 windowId)
     case 1:
         for (i = 0; i < sDexCryScreen->playStartPos * 8; i++)
             DrawWaveformSegment(i, 0);
-        
+
         gDexCryScreenState++;
         break;
     case 2:
@@ -295,7 +295,7 @@ void UpdateCryWaveformWindow(u8 windowId)
         DrawWaveformFlatline();
         return;
     }
-    
+
     // Cry playing, buffer waveform
     if (sDexCryScreen->cryState == 1)
     {
@@ -560,8 +560,8 @@ static void SpriteCB_CryMeterNeedle(struct Sprite *sprite)
     SetOamMatrix(0, matrix.a, matrix.b, matrix.c, matrix.d);
     x = gSineTable[((sCryMeterNeedle->rotation + 0x7F) & 0xFF)];
     y = gSineTable[((sCryMeterNeedle->rotation + 0x7F) & 0xFF) + 64];
-    sprite->pos2.x = x * 24 / 256;
-    sprite->pos2.y = y * 24 / 256;
+    sprite->x2 = x * 24 / 256;
+    sprite->y2 = y * 24 / 256;
 }
 
 static void SetCryMeterNeedleTarget(s8 offset)
diff --git a/src/pokemon.c b/src/pokemon.c
index 28b402216..aca68d53c 100644
--- a/src/pokemon.c
+++ b/src/pokemon.c
@@ -1915,7 +1915,7 @@ static const u8 sHoldEffectToType[][2] =
 const struct SpriteTemplate gBattlerSpriteTemplates[MAX_BATTLERS_COUNT] =
 {
     [B_POSITION_PLAYER_LEFT] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpritePlayerSide,
         .anims = NULL,
@@ -1924,7 +1924,7 @@ const struct SpriteTemplate gBattlerSpriteTemplates[MAX_BATTLERS_COUNT] =
         .callback = SpriteCB_BattleSpriteStartSlideLeft,
     },
     [B_POSITION_OPPONENT_LEFT] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpriteOpponentSide,
         .anims = NULL,
@@ -1933,7 +1933,7 @@ const struct SpriteTemplate gBattlerSpriteTemplates[MAX_BATTLERS_COUNT] =
         .callback = SpriteCb_WildMon,
     },
     [B_POSITION_PLAYER_RIGHT] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpritePlayerSide,
         .anims = NULL,
@@ -1942,7 +1942,7 @@ const struct SpriteTemplate gBattlerSpriteTemplates[MAX_BATTLERS_COUNT] =
         .callback = SpriteCB_BattleSpriteStartSlideLeft,
     },
     [B_POSITION_OPPONENT_RIGHT] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpriteOpponentSide,
         .anims = NULL,
@@ -1955,7 +1955,7 @@ const struct SpriteTemplate gBattlerSpriteTemplates[MAX_BATTLERS_COUNT] =
 static const struct SpriteTemplate sTrainerBackSpriteTemplates[] =
 {
     [TRAINER_BACK_PIC_BRENDAN] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpritePlayerSide,
         .anims = NULL,
@@ -1964,7 +1964,7 @@ static const struct SpriteTemplate sTrainerBackSpriteTemplates[] =
         .callback = SpriteCB_BattleSpriteStartSlideLeft,
     },
     [TRAINER_BACK_PIC_MAY] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpritePlayerSide,
         .anims = NULL,
@@ -1973,7 +1973,7 @@ static const struct SpriteTemplate sTrainerBackSpriteTemplates[] =
         .callback = SpriteCB_BattleSpriteStartSlideLeft,
     },
     [TRAINER_BACK_PIC_RED] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpritePlayerSide,
         .anims = NULL,
@@ -1982,7 +1982,7 @@ static const struct SpriteTemplate sTrainerBackSpriteTemplates[] =
         .callback = SpriteCB_BattleSpriteStartSlideLeft,
     },
     [TRAINER_BACK_PIC_LEAF] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpritePlayerSide,
         .anims = NULL,
@@ -1991,7 +1991,7 @@ static const struct SpriteTemplate sTrainerBackSpriteTemplates[] =
         .callback = SpriteCB_BattleSpriteStartSlideLeft,
     },
     [TRAINER_BACK_PIC_RUBY_SAPPHIRE_BRENDAN] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpritePlayerSide,
         .anims = NULL,
@@ -2000,7 +2000,7 @@ static const struct SpriteTemplate sTrainerBackSpriteTemplates[] =
         .callback = SpriteCB_BattleSpriteStartSlideLeft,
     },
     [TRAINER_BACK_PIC_RUBY_SAPPHIRE_MAY] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpritePlayerSide,
         .anims = NULL,
@@ -2009,7 +2009,7 @@ static const struct SpriteTemplate sTrainerBackSpriteTemplates[] =
         .callback = SpriteCB_BattleSpriteStartSlideLeft,
     },
     [TRAINER_BACK_PIC_WALLY] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpritePlayerSide,
         .anims = NULL,
@@ -2018,7 +2018,7 @@ static const struct SpriteTemplate sTrainerBackSpriteTemplates[] =
         .callback = SpriteCB_BattleSpriteStartSlideLeft,
     },
     [TRAINER_BACK_PIC_STEVEN] = {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = 0,
         .oam = &gOamData_BattleSpritePlayerSide,
         .anims = NULL,
@@ -2103,8 +2103,8 @@ static const struct OamData sOamData_8329F20 =
 
 static const struct SpriteTemplate gUnknown_08329F28 =
 {
-    .tileTag = 0xFFFF,
-    .paletteTag = 0xFFFF,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_8329F20,
     .anims = gDummySpriteAnimTable,
     .images = NULL,
@@ -3268,7 +3268,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
         // are effects of weather negated with cloud nine or air lock
         if (WEATHER_HAS_EFFECT2)
         {
-            if (gBattleWeather & WEATHER_RAIN_TEMPORARY)
+            if (gBattleWeather & B_WEATHER_RAIN_TEMPORARY)
             {
                 switch (type)
                 {
@@ -3282,11 +3282,11 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
             }
 
             // any weather except sun weakens solar beam
-            if ((gBattleWeather & (WEATHER_RAIN_ANY | WEATHER_SANDSTORM_ANY | WEATHER_HAIL_ANY)) && gCurrentMove == MOVE_SOLAR_BEAM)
+            if ((gBattleWeather & (B_WEATHER_RAIN | B_WEATHER_SANDSTORM | B_WEATHER_HAIL)) && gCurrentMove == MOVE_SOLAR_BEAM)
                 damage /= 2;
 
             // sunny
-            if (gBattleWeather & WEATHER_SUN_ANY)
+            if (gBattleWeather & B_WEATHER_SUN)
             {
                 switch (type)
                 {
@@ -4879,7 +4879,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
                         temp2 = itemEffect[itemEffectParam];
                         dataSigned = GetMonData(mon, sGetMonDataEVConstants[temp1], NULL);
                         evChange = temp2;
-     
+
                         if (evChange > 0) // Increasing EV (HP or Atk)
                         {
                             // Has EV increase limit already been reached?
@@ -4977,7 +4977,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
                         {
                             if (!usedByAI)
                             {
-                                // Restore HP 
+                                // Restore HP
                                 dataUnsigned = GetMonData(mon, MON_DATA_HP, NULL) + dataUnsigned;
                                 if (dataUnsigned > GetMonData(mon, MON_DATA_MAX_HP, NULL))
                                     dataUnsigned = GetMonData(mon, MON_DATA_MAX_HP, NULL);
@@ -5056,7 +5056,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
                                     dataUnsigned = CalculatePPWithBonus(moveId, GetMonData(mon, MON_DATA_PP_BONUSES, NULL), moveIndex);
                                 }
                                 SetMonData(mon, MON_DATA_PP1 + moveIndex, &dataUnsigned);
-                                
+
                                 // Heal battler PP too (if applicable)
                                 if (gMain.inBattle
                                  && battlerId != MAX_BATTLERS_COUNT && !(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED)
@@ -5093,7 +5093,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
         case 5:
             effectFlags = itemEffect[i];
             temp1 = 0;
-            
+
             // Loop through and try each of the ITEM5 effects
             while (effectFlags != 0)
             {
diff --git a/src/pokemon_animation.c b/src/pokemon_animation.c
index 500916b0e..9a95edf4b 100644
--- a/src/pokemon_animation.c
+++ b/src/pokemon_animation.c
@@ -10,7 +10,7 @@
 #include "constants/battle_anim.h"
 #include "constants/rgb.h"
 
-/* 
+/*
     This file handles the movements of the Pokémon intro animations.
 
     Each animation type is identified by an ANIM_* constant that
@@ -26,7 +26,7 @@
 
     The table linking species to a BACK_ANIM is in this file (sSpeciesToBackAnimSet)
     while the table linking species to an ANIM for their front animation is in
-    pokemon.c (sMonFrontAnimIdsTable). 
+    pokemon.c (sMonFrontAnimIdsTable).
 
     These are the functions that will start an animation:
     - LaunchAnimationTaskForFrontSprite
@@ -877,8 +877,8 @@ static void SetPosForRotation(struct Sprite *sprite, u16 index, s16 amplitudeX,
     amplitudeX *= -1;
     amplitudeY *= -1;
 
-    sprite->pos2.x = xAdder + amplitudeX;
-    sprite->pos2.y = yAdder + amplitudeY;
+    sprite->x2 = xAdder + amplitudeX;
+    sprite->y2 = yAdder + amplitudeY;
 }
 
 u8 GetSpeciesBackAnimSet(u16 species)
@@ -1030,7 +1030,7 @@ static void HandleSetAffineData(struct Sprite *sprite, s16 xScale, s16 yScale, u
 static void TryFlipX(struct Sprite *sprite)
 {
     if (!sprite->sDontFlip)
-        sprite->pos2.x *= -1;
+        sprite->x2 *= -1;
 }
 
 static bool32 InitAnimData(u8 id)
@@ -1111,7 +1111,7 @@ static void Anim_HorizontalVibrate(struct Sprite *sprite)
     if (sprite->data[2] > 40)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
     }
     else
     {
@@ -1121,7 +1121,7 @@ static void Anim_HorizontalVibrate(struct Sprite *sprite)
         else
             sign = -1;
 
-        sprite->pos2.x = Sin((sprite->data[2] * 128 / 40) % 256, 6) * sign;
+        sprite->x2 = Sin((sprite->data[2] * 128 / 40) % 256, 6) * sign;
     }
 
     sprite->data[2]++;
@@ -1134,11 +1134,11 @@ static void HorizontalSlide(struct Sprite *sprite)
     if (sprite->data[2] > sprite->data[0])
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
     }
     else
     {
-        sprite->pos2.x = Sin((sprite->data[2] * 384 / sprite->data[0]) % 256, 6);
+        sprite->x2 = Sin((sprite->data[2] * 384 / sprite->data[0]) % 256, 6);
     }
 
     sprite->data[2]++;
@@ -1159,11 +1159,11 @@ static void VerticalSlide(struct Sprite *sprite)
     if (sprite->data[2] > sprite->data[0])
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
     }
     else
     {
-        sprite->pos2.y = -(Sin((sprite->data[2] * 384 / sprite->data[0]) % 256, 6));
+        sprite->y2 = -(Sin((sprite->data[2] * 384 / sprite->data[0]) % 256, 6));
     }
 
     sprite->data[2]++;
@@ -1183,8 +1183,8 @@ static void VerticalJumps(struct Sprite *sprite)
     if (counter > 384)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
     }
     else
     {
@@ -1193,12 +1193,12 @@ static void VerticalJumps(struct Sprite *sprite)
         {
         case 0:
         case 1:
-            sprite->pos2.y = -(Sin(counter % 128, sprite->data[0] * 2));
+            sprite->y2 = -(Sin(counter % 128, sprite->data[0] * 2));
             break;
         case 2:
         case 3:
             counter -= 256;
-            sprite->pos2.y = -(Sin(counter, sprite->data[0] * 3));
+            sprite->y2 = -(Sin(counter, sprite->data[0] * 3));
             break;
         }
     }
@@ -1220,8 +1220,8 @@ static void Anim_VerticalJumpsHorizontalJumps(struct Sprite *sprite)
     if (counter > 768)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
     }
     else
     {
@@ -1231,23 +1231,23 @@ static void Anim_VerticalJumpsHorizontalJumps(struct Sprite *sprite)
         {
         case 0:
         case 1:
-            sprite->pos2.x = 0;
+            sprite->x2 = 0;
             break;
         case 2:
             counter = 0;
             break;
         case 3:
-            sprite->pos2.x = -(counter % 128 * 8) / 128;
+            sprite->x2 = -(counter % 128 * 8) / 128;
             break;
         case 4:
-            sprite->pos2.x = (counter % 128) / 8 - 8;
+            sprite->x2 = (counter % 128) / 8 - 8;
             break;
         case 5:
-            sprite->pos2.x = -(counter % 128 * 8) / 128 + 8;
+            sprite->x2 = -(counter % 128 * 8) / 128 + 8;
             break;
         }
 
-        sprite->pos2.y = -(Sin(counter % 128, 8));
+        sprite->y2 = -(Sin(counter % 128, 8));
     }
 
     sprite->data[2] += 12;
@@ -1326,8 +1326,8 @@ static void Zigzag(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos2.x += sZigzagData[sprite->data[3]][0];
-        sprite->pos2.y += sZigzagData[sprite->data[3]][1];
+        sprite->x2 += sZigzagData[sprite->data[3]][0];
+        sprite->y2 += sZigzagData[sprite->data[3]][1];
         sprite->data[2]++;
         TryFlipX(sprite);
     }
@@ -1346,11 +1346,11 @@ static void HorizontalShake(struct Sprite *sprite)
     if (counter > 2304)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
     }
     else
     {
-        sprite->pos2.x = Sin(counter % 256, sprite->data[7]);
+        sprite->x2 = Sin(counter % 256, sprite->data[7]);
     }
 
     sprite->data[2] += sprite->data[0];
@@ -1371,11 +1371,11 @@ static void VerticalShake(struct Sprite *sprite)
     if (counter > 2304)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
     }
     else
     {
-        sprite->pos2.y = Sin(counter % 256, 3);
+        sprite->y2 = Sin(counter % 256, 3);
     }
 
     sprite->data[2] += sprite->data[0];
@@ -1393,8 +1393,8 @@ static void Anim_CircularVibrate(struct Sprite *sprite)
     if (sprite->data[2] > 512)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
     }
     else
     {
@@ -1409,8 +1409,8 @@ static void Anim_CircularVibrate(struct Sprite *sprite)
         amplitude = Sin(sprite->data[2] / 4, 8);
         index = sprite->data[2] % 256;
 
-        sprite->pos2.y = Sin(index, amplitude) * sign;
-        sprite->pos2.x = Cos(index, amplitude) * sign;
+        sprite->y2 = Sin(index, amplitude) * sign;
+        sprite->x2 = Cos(index, amplitude) * sign;
     }
 
     sprite->data[2] += 9;
@@ -1508,16 +1508,16 @@ static void CircleCounterclockwise(struct Sprite *sprite)
 
     if (sprite->data[2] > sAnims[id].rotation)
     {
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->callback = WaitAnimEnd;
     }
     else
     {
         s16 index = (sprite->data[2] + 192) % 256;
 
-        sprite->pos2.x = -(Cos(index, sAnims[id].data * 2));
-        sprite->pos2.y = Sin(index, sAnims[id].data) + sAnims[id].data;
+        sprite->x2 = -(Cos(index, sAnims[id].data * 2));
+        sprite->y2 = Sin(index, sAnims[id].data) + sAnims[id].data;
     }
 
     sprite->data[2] += sAnims[id].speed;
@@ -1605,7 +1605,7 @@ static void Anim_VerticalStretch(struct Sprite *sprite)
         HandleSetAffineData(sprite, 256, 256, 0);
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.y = posY;
+        sprite->y2 = posY;
     }
     else
     {
@@ -1627,7 +1627,7 @@ static void Anim_VerticalStretch(struct Sprite *sprite)
         if (sprite->data[5] != 256)
             posY = (256 - sprite->data[5]) / 8;
 
-        sprite->pos2.y = -(posY);
+        sprite->y2 = -(posY);
         SetAffineData(sprite, sprite->data[4], sprite->data[5], 0);
     }
 
@@ -1650,11 +1650,11 @@ static void VerticalShakeTwice(struct Sprite *sprite)
     if (var5 == (u8)-1)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
     }
     else
     {
-        sprite->pos2.y = Sin(index, amplitude);
+        sprite->y2 = Sin(index, amplitude);
 
         if (var7 == var6)
         {
@@ -1691,7 +1691,7 @@ static void Anim_TipMoveForward(struct Sprite *sprite)
         HandleSetAffineData(sprite, 256, 256, 0);
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
     }
     else
     {
@@ -1700,7 +1700,7 @@ static void Anim_TipMoveForward(struct Sprite *sprite)
         if (counter < 10)
             HandleSetAffineData(sprite, 256, 256, counter / 2 * 512);
         else if (counter >= 10 && counter <= 29)
-            sprite->pos2.x = -(Sin(index, 5));
+            sprite->x2 = -(Sin(index, 5));
         else
             HandleSetAffineData(sprite, 256, 256, (35 - counter) / 2 * 1024);
     }
@@ -1717,14 +1717,14 @@ static void Anim_HorizontalPivot(struct Sprite *sprite)
     if (sprite->data[2] > 100)
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
     else
     {
         s16 index = (sprite->data[2] * 256) / 100;
-        sprite->pos2.y = Sin(index, 10);
+        sprite->y2 = Sin(index, 10);
         HandleSetAffineData(sprite, 256, 256, Sin(index, 3276));
     }
 
@@ -1742,7 +1742,7 @@ static void VerticalSlideWobble(struct Sprite *sprite)
     if (sprite->data[2] > 100)
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
@@ -1751,7 +1751,7 @@ static void VerticalSlideWobble(struct Sprite *sprite)
         index = (sprite->data[2] * 256) / 100;
         var = (sprite->data[2] * 512) / 100;
         var &= 0xFF;
-        sprite->pos2.y = Sin(index, sprite->data[0]);
+        sprite->y2 = Sin(index, sprite->data[0]);
         HandleSetAffineData(sprite, 256, 256, Sin(var, 3276));
     }
 
@@ -1776,7 +1776,7 @@ static void RisingWobble(struct Sprite *sprite)
     if (sprite->data[2] > 100)
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
@@ -1785,7 +1785,7 @@ static void RisingWobble(struct Sprite *sprite)
         index = (sprite->data[2] * 256) / 100;
         var = (sprite->data[2] * 512) / 100;
         var &= 0xFF;
-        sprite->pos2.y = -(Sin(index / 2, sprite->data[0] * 2));
+        sprite->y2 = -(Sin(index / 2, sprite->data[0] * 2));
         HandleSetAffineData(sprite, 256, 256, Sin(var, 3276));
     }
 
@@ -1813,7 +1813,7 @@ static void Anim_HorizontalSlideWobble(struct Sprite *sprite)
     if (sprite->data[2] > 100)
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
@@ -1822,7 +1822,7 @@ static void Anim_HorizontalSlideWobble(struct Sprite *sprite)
         index = (sprite->data[2] * 256) / 100;
         var = (sprite->data[2] * 512) / 100;
         var &= 0xFF;
-        sprite->pos2.x = Sin(index, 8);
+        sprite->x2 = Sin(index, 8);
         HandleSetAffineData(sprite, 256, 256, Sin(var, 3276));
     }
 
@@ -1845,7 +1845,7 @@ static void VerticalSquishBounce(struct Sprite *sprite)
     if (sprite->data[2] > sprite->data[0] * 3)
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
@@ -1858,7 +1858,7 @@ static void VerticalSquishBounce(struct Sprite *sprite)
         if (yScale > 256)
             posY = (256 - yScale) / 8;
 
-        sprite->pos2.y = -(Sin(sprite->data[3], 10)) - posY;
+        sprite->y2 = -(Sin(sprite->data[3], 10)) - posY;
         HandleSetAffineData(sprite, 256 - Sin(sprite->data[4], 32), yScale, 0);
         sprite->data[2]++;
         sprite->data[4] = (sprite->data[4] + 128 / sprite->data[0]) & 0xFF;
@@ -1881,7 +1881,7 @@ static void ShrinkGrow(struct Sprite *sprite)
     if (sprite->data[2] > (128 / sprite->data[6]) * sprite->data[7])
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
@@ -1892,7 +1892,7 @@ static void ShrinkGrow(struct Sprite *sprite)
         if (yScale > 256)
             posY = (256 - yScale) / 8;
 
-        sprite->pos2.y = -(posY);
+        sprite->y2 = -(posY);
         HandleSetAffineData(sprite, Sin(sprite->data[4], 48) + 256, yScale, 0);
         sprite->data[2]++;
         sprite->data[4] = (sprite->data[4] + sprite->data[6]) & 0xFF;
@@ -1961,8 +1961,8 @@ static void BounceRotateToSides(struct Sprite *sprite)
     if (sBounceRotateToSidesData[arrId][sprite->data[4]][2] == 0)
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
@@ -1970,10 +1970,10 @@ static void BounceRotateToSides(struct Sprite *sprite)
     {
         u16 rotation;
 
-        sprite->pos2.y = -(Sin(r7 * 128 / sBounceRotateToSidesData[arrId][sprite->data[4]][2], 10));
-        sprite->pos2.x = (r10 * r7 / sBounceRotateToSidesData[arrId][sprite->data[4]][2]) + r9;
+        sprite->y2 = -(Sin(r7 * 128 / sBounceRotateToSidesData[arrId][sprite->data[4]][2], 10));
+        sprite->x2 = (r10 * r7 / sBounceRotateToSidesData[arrId][sprite->data[4]][2]) + r9;
 
-        rotation = -(var * sprite->pos2.x) / 8;
+        rotation = -(var * sprite->x2) / 8;
         HandleSetAffineData(sprite, 256, 256, rotation);
 
         if (r7 == sBounceRotateToSidesData[arrId][sprite->data[4]][2])
@@ -2039,9 +2039,9 @@ static void Anim_BackAndLunge(struct Sprite *sprite)
 static void BackAndLunge_0(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    if (++sprite->pos2.x > 7)
+    if (++sprite->x2 > 7)
     {
-        sprite->pos2.x = 8;
+        sprite->x2 = 8;
         sprite->data[7] = 2;
         sprite->callback = BackAndLunge_1;
     }
@@ -2052,14 +2052,14 @@ static void BackAndLunge_1(struct Sprite *sprite)
 {
     TryFlipX(sprite);
 
-    sprite->pos2.x -= sprite->data[7];
+    sprite->x2 -= sprite->data[7];
     sprite->data[7]++;
-    if (sprite->pos2.x <= 0)
+    if (sprite->x2 <= 0)
     {
         s16 subResult;
         u8 var = sprite->data[7];
         sprite->data[6] = 0;
-        subResult = sprite->pos2.x;
+        subResult = sprite->x2;
 
         do
         {
@@ -2081,7 +2081,7 @@ static void BackAndLunge_2(struct Sprite *sprite)
     u8 rotation;
 
     TryFlipX(sprite);
-    sprite->pos2.x -= sprite->data[7];
+    sprite->x2 -= sprite->data[7];
     sprite->data[7]++;
     rotation = (sprite->data[5] * 6) / sprite->data[6];
 
@@ -2090,9 +2090,9 @@ static void BackAndLunge_2(struct Sprite *sprite)
 
     HandleSetAffineData(sprite, 256, 256, rotation * 256);
 
-    if (sprite->pos2.x < -8)
+    if (sprite->x2 < -8)
     {
-        sprite->pos2.x = -8;
+        sprite->x2 = -8;
         sprite->data[4] = 2;
         sprite->data[3] = 0;
         sprite->data[2] = rotation;
@@ -2118,7 +2118,7 @@ static void BackAndLunge_3(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos2.x += sprite->data[4];
+        sprite->x2 += sprite->data[4];
         sprite->data[4] *= -1;
         sprite->data[3]++;
     }
@@ -2130,10 +2130,10 @@ static void BackAndLunge_4(struct Sprite *sprite)
 {
     TryFlipX(sprite);
 
-    sprite->pos2.x += 2;
-    if (sprite->pos2.x > 0)
+    sprite->x2 += 2;
+    if (sprite->x2 > 0)
     {
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
@@ -2155,15 +2155,15 @@ static void Anim_BackFlip(struct Sprite *sprite)
 static void BackFlip_0(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    sprite->pos2.x++;
-    sprite->pos2.y--;
+    sprite->x2++;
+    sprite->y2--;
 
-    if (sprite->pos2.x % 2 == 0 && sprite->data[3] <= 0)
+    if (sprite->x2 % 2 == 0 && sprite->data[3] <= 0)
         sprite->data[3] = 10;
-    if (sprite->pos2.x > 7)
+    if (sprite->x2 > 7)
     {
-        sprite->pos2.x = 8;
-        sprite->pos2.y = -8;
+        sprite->x2 = 8;
+        sprite->y2 = -8;
         sprite->data[4] = 0;
         sprite->callback = BackFlip_1;
     }
@@ -2174,8 +2174,8 @@ static void BackFlip_0(struct Sprite *sprite)
 static void BackFlip_1(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    sprite->pos2.x = Cos(sprite->data[4], 16) - 8;
-    sprite->pos2.y = Sin(sprite->data[4], 16) - 8;
+    sprite->x2 = Cos(sprite->data[4], 16) - 8;
+    sprite->y2 = Sin(sprite->data[4], 16) - 8;
 
     if (sprite->data[4] > 63)
     {
@@ -2202,16 +2202,16 @@ static void BackFlip_2(struct Sprite *sprite)
     {
         u32 rotation;
 
-        sprite->pos2.x = Cos(sprite->data[2], 5) - 4;
-        sprite->pos2.y = -(Sin(sprite->data[2], 5)) + 4;
+        sprite->x2 = Cos(sprite->data[2], 5) - 4;
+        sprite->y2 = -(Sin(sprite->data[2], 5)) + 4;
         sprite->data[2] -= 4;
         rotation = sprite->data[2] - 32;
         HandleSetAffineData(sprite, 256, 256, rotation * 512);
 
         if (sprite->data[2] <= 32)
         {
-            sprite->pos2.x = 0;
-            sprite->pos2.y = 0;
+            sprite->x2 = 0;
+            sprite->y2 = 0;
             ResetSpriteAfterAnim(sprite);
             sprite->callback = WaitAnimEnd;
         }
@@ -2252,13 +2252,13 @@ static void Anim_BackFlipBig(struct Sprite *sprite)
 static void BackFlipBig_0(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    sprite->pos2.x--;
-    sprite->pos2.y++;
+    sprite->x2--;
+    sprite->y2++;
 
-    if (sprite->pos2.x <= -16)
+    if (sprite->x2 <= -16)
     {
-        sprite->pos2.x = -16;
-        sprite->pos2.y = 16;
+        sprite->x2 = -16;
+        sprite->y2 = 16;
         sprite->callback = BackFlipBig_1;
         sprite->data[2] = 160;
     }
@@ -2272,8 +2272,8 @@ static void BackFlipBig_1(struct Sprite *sprite)
 
     TryFlipX(sprite);
     sprite->data[2] -= 4;
-    sprite->pos2.x = Cos(sprite->data[2], 22);
-    sprite->pos2.y = -(Sin(sprite->data[2], 22));
+    sprite->x2 = Cos(sprite->data[2], 22);
+    sprite->y2 = -(Sin(sprite->data[2], 22));
     rotation = sprite->data[2] - 32;
     HandleSetAffineData(sprite, 256, 256, rotation * 512);
 
@@ -2286,10 +2286,10 @@ static void BackFlipBig_1(struct Sprite *sprite)
 static void BackFlipBig_2(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    sprite->pos2.x--;
-    sprite->pos2.y++;
+    sprite->x2--;
+    sprite->y2++;
 
-    if (sprite->pos2.x <= 0)
+    if (sprite->x2 <= 0)
     {
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
@@ -2311,10 +2311,10 @@ static void Anim_FrontFlip(struct Sprite *sprite)
 static void FrontFlip_0(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    sprite->pos2.x++;
-    sprite->pos2.y--;
+    sprite->x2++;
+    sprite->y2--;
 
-    if (sprite->pos2.x > 15)
+    if (sprite->x2 > 15)
     {
         sprite->data[2] = 0;
         sprite->callback = FrontFlip_1;
@@ -2328,17 +2328,17 @@ static void FrontFlip_1(struct Sprite *sprite)
     TryFlipX(sprite);
     sprite->data[2] += 16;
 
-    if (sprite->pos2.x <= -16)
+    if (sprite->x2 <= -16)
     {
-        sprite->pos2.x = -16;
-        sprite->pos2.y = 16;
+        sprite->x2 = -16;
+        sprite->y2 = 16;
         sprite->data[2] = 0;
         sprite->callback = FrontFlip_2;
     }
     else
     {
-        sprite->pos2.x -= 2;
-        sprite->pos2.y += 2;
+        sprite->x2 -= 2;
+        sprite->y2 += 2;
     }
 
     HandleSetAffineData(sprite, 256, 256, sprite->data[2] << 8);
@@ -2348,13 +2348,13 @@ static void FrontFlip_1(struct Sprite *sprite)
 static void FrontFlip_2(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    sprite->pos2.x++;
-    sprite->pos2.y--;;
+    sprite->x2++;
+    sprite->y2--;;
 
-    if (sprite->pos2.x >= 0)
+    if (sprite->x2 >= 0)
     {
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
@@ -2392,26 +2392,26 @@ static void TumblingFrontFlip(struct Sprite *sprite)
             sprite->data[6] = 0;
         }
 
-        sprite->pos2.x += (sprite->data[7] * 2 * sprite->data[3]);
-        sprite->pos2.y += (sprite->data[7] * sprite->data[4]);
+        sprite->x2 += (sprite->data[7] * 2 * sprite->data[3]);
+        sprite->y2 += (sprite->data[7] * sprite->data[4]);
         sprite->data[6] += 8;
-        if (sprite->pos2.x <= -16 || sprite->pos2.x >= 16)
+        if (sprite->x2 <= -16 || sprite->x2 >= 16)
         {
-            sprite->pos2.x = sprite->data[3] * 16;
+            sprite->x2 = sprite->data[3] * 16;
             sprite->data[3] *= -1;
             sprite->data[5]++;
         }
-        else if (sprite->pos2.y <= -16 || sprite->pos2.y >= 16)
+        else if (sprite->y2 <= -16 || sprite->y2 >= 16)
         {
-            sprite->pos2.y = sprite->data[4] * 16;
+            sprite->y2 = sprite->data[4] * 16;
             sprite->data[4] *= -1;
             sprite->data[5]++;
         }
 
-        if (sprite->data[5] > 5 && sprite->pos2.x <= 0)
+        if (sprite->data[5] > 5 && sprite->x2 <= 0)
         {
-            sprite->pos2.x = 0;
-            sprite->pos2.y = 0;
+            sprite->x2 = 0;
+            sprite->y2 = 0;
             if (sAnims[sprite->data[0]].runs > 1)
             {
                 sAnims[sprite->data[0]].runs--;
@@ -2445,8 +2445,8 @@ static void Figure8(struct Sprite *sprite)
 {
     TryFlipX(sprite);
     sprite->data[6] += 4;
-    sprite->pos2.x = -(Sin(sprite->data[6], 16));
-    sprite->pos2.y = -(Sin((sprite->data[6] * 2) & 0xFF, 8));
+    sprite->x2 = -(Sin(sprite->data[6], 16));
+    sprite->y2 = -(Sin((sprite->data[6] * 2) & 0xFF, 8));
     if (sprite->data[6] > 192 && sprite->data[7] == 1)
     {
         HandleSetAffineData(sprite, 256, 256, 0);
@@ -2460,8 +2460,8 @@ static void Figure8(struct Sprite *sprite)
 
     if (sprite->data[6] > 255)
     {
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         HandleSetAffineData(sprite, 256, 256, 0);
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
@@ -2517,7 +2517,7 @@ static void SwingConcave(struct Sprite *sprite)
     if (sprite->data[2] > sAnims[sprite->data[0]].data)
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         if (sAnims[sprite->data[0]].runs > 1)
         {
             sAnims[sprite->data[0]].runs--;
@@ -2532,7 +2532,7 @@ static void SwingConcave(struct Sprite *sprite)
     else
     {
         s16 index = (sprite->data[2] * 256) / sAnims[sprite->data[0]].data;
-        sprite->pos2.x = -(Sin(index, 10));
+        sprite->x2 = -(Sin(index, 10));
         HandleSetAffineData(sprite, 256, 256, Sin(index, 3276));
     }
 
@@ -2557,7 +2557,7 @@ static void SwingConvex(struct Sprite *sprite)
     if (sprite->data[2] > sAnims[sprite->data[0]].data)
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         if (sAnims[sprite->data[0]].runs > 1)
         {
             sAnims[sprite->data[0]].runs--;
@@ -2572,7 +2572,7 @@ static void SwingConvex(struct Sprite *sprite)
     else
     {
         s16 index = (sprite->data[2] * 256) / sAnims[sprite->data[0]].data;
-        sprite->pos2.x = -(Sin(index, 10));
+        sprite->x2 = -(Sin(index, 10));
         HandleSetAffineData(sprite, 256, 256, -(Sin(index, 3276)));
     }
 
@@ -2604,9 +2604,9 @@ static void RotateUpSlamDown_0(struct Sprite *sprite)
 {
     TryFlipX(sprite);
     sprite->data[7]--;
-    sprite->pos2.x = sprite->data[6] + Cos(sprite->data[7], sprite->data[6]);
+    sprite->x2 = sprite->data[6] + Cos(sprite->data[7], sprite->data[6]);
 
-    sprite->pos2.y = -(Sin(sprite->data[7], sprite->data[6]));
+    sprite->y2 = -(Sin(sprite->data[7], sprite->data[6]));
 
     HandleSetAffineData(sprite, 256, 256, (sprite->data[7] - 128) << 8);
     if (sprite->data[7] <= 120)
@@ -2634,15 +2634,15 @@ static void RotateUpSlamDown_2(struct Sprite *sprite)
 {
     TryFlipX(sprite);
     sprite->data[7] += 2;
-    sprite->pos2.x = sprite->data[6] + Cos(sprite->data[7], sprite->data[6]);
+    sprite->x2 = sprite->data[6] + Cos(sprite->data[7], sprite->data[6]);
 
-    sprite->pos2.y = -(Sin(sprite->data[7], sprite->data[6]));
+    sprite->y2 = -(Sin(sprite->data[7], sprite->data[6]));
 
     HandleSetAffineData(sprite, 256, 256, (sprite->data[7] - 128) << 8);
     if (sprite->data[7] >= 128)
     {
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         HandleSetAffineData(sprite, 256, 256, 0);
         sprite->data[2] = 0;
         ResetSpriteAfterAnim(sprite);
@@ -2671,7 +2671,7 @@ static void DeepVerticalSquishBounce(struct Sprite *sprite)
         if (sprite->data[5] == 0)
         {
             sprite->data[7] = Sin(sprite->data[4], 256);
-            sprite->pos2.y = Sin(sprite->data[4], 16);
+            sprite->y2 = Sin(sprite->data[4], 16);
             sprite->data[6] = Sin(sprite->data[4], 32);
             HandleSetAffineData(sprite, 256 - sprite->data[6], 256 + sprite->data[7], 0);
             if (sprite->data[4] == 128)
@@ -2683,7 +2683,7 @@ static void DeepVerticalSquishBounce(struct Sprite *sprite)
         else if (sprite->data[5] == 1)
         {
             sprite->data[7] = Sin(sprite->data[4], 32);
-            sprite->pos2.y = -(Sin(sprite->data[4], 8));
+            sprite->y2 = -(Sin(sprite->data[4], 8));
             sprite->data[6] = Sin(sprite->data[4], 128);
             HandleSetAffineData(sprite, 256 + sprite->data[6], 256 - sprite->data[7], 0);
             if (sprite->data[4] == 128)
@@ -2723,28 +2723,28 @@ static void Anim_HorizontalJumps(struct Sprite *sprite)
     if (counter > 512)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
     }
     else
     {
         switch (sprite->data[2] / 128)
         {
         case 0:
-            sprite->pos2.x = -(counter % 128 * 8) / 128;
+            sprite->x2 = -(counter % 128 * 8) / 128;
             break;
         case 1:
-            sprite->pos2.x = (counter % 128 / 16) - 8;
+            sprite->x2 = (counter % 128 / 16) - 8;
             break;
         case 2:
-            sprite->pos2.x = (counter % 128 / 16);
+            sprite->x2 = (counter % 128 / 16);
             break;
         case 3:
-            sprite->pos2.x = -(counter % 128 * 8) / 128 + 8;
+            sprite->x2 = -(counter % 128 * 8) / 128 + 8;
             break;
         }
 
-        sprite->pos2.y = -(Sin(counter % 128, 8));
+        sprite->y2 = -(Sin(counter % 128, 8));
     }
 
     sprite->data[2] += 12;
@@ -2785,8 +2785,8 @@ static void HorizontalJumpsVerticalStretch_0(struct Sprite *sprite)
         else
         {
             s32 var = 8 * sAnims[sprite->data[0]].data;
-            sprite->pos2.x = var * (counter % 128) / 128;
-            sprite->pos2.y = -(Sin(counter % 128, 8));
+            sprite->x2 = var * (counter % 128) / 128;
+            sprite->y2 = -(Sin(counter % 128, 8));
             sprite->data[2] += 12;
         }
 
@@ -2800,7 +2800,7 @@ static void HorizontalJumpsVerticalStretch_1(struct Sprite *sprite)
     if (sprite->data[2] > 48)
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         sprite->data[2] = 0;
         sprite->callback = HorizontalJumpsVerticalStretch_2;
     }
@@ -2811,14 +2811,14 @@ static void HorizontalJumpsVerticalStretch_1(struct Sprite *sprite)
         if (sprite->data[2] >= 16 && sprite->data[2] <= 31)
         {
             sprite->data[3] += 8;
-            sprite->pos2.x -= sAnims[sprite->data[0]].data;
+            sprite->x2 -= sAnims[sprite->data[0]].data;
         }
 
         yDelta = 0;
         if (yScale > 256)
             yDelta = (256 - yScale) / 8;
 
-        sprite->pos2.y = -(Sin(sprite->data[3], 20)) - yDelta;
+        sprite->y2 = -(Sin(sprite->data[3], 20)) - yDelta;
         HandleSetAffineData(sprite, 256 - Sin(sprite->data[4], 32), yScale, 0);
         sprite->data[2]++;
         sprite->data[4] += 8;
@@ -2851,15 +2851,15 @@ static void HorizontalJumpsVerticalStretch_2(struct Sprite *sprite)
             sprite->callback = WaitAnimEnd;
         }
 
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
     }
     else
     {
         s32 var = sAnims[sprite->data[0]].data;
 
-        sprite->pos2.x = var * ((counter % 128) * 8) / 128 + 8 * -var;
-        sprite->pos2.y = -(Sin(counter % 128, 8));
+        sprite->x2 = var * ((counter % 128) * 8) / 128 + 8 * -var;
+        sprite->y2 = -(Sin(counter % 128, 8));
     }
 
     sprite->data[2] += 12;
@@ -2877,8 +2877,8 @@ static void RotateToSides(struct Sprite *sprite)
     TryFlipX(sprite);
     if (sprite->data[7] > 254)
     {
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         HandleSetAffineData(sprite, 256, 256, 0);
         if (sAnims[sprite->data[0]].runs > 1)
         {
@@ -2898,7 +2898,7 @@ static void RotateToSides(struct Sprite *sprite)
     {
         u16 rotation;
 
-        sprite->pos2.x = -(Sin(sprite->data[7], 16));
+        sprite->x2 = -(Sin(sprite->data[7], 16));
         rotation = Sin(sprite->data[7], 32);
         HandleSetAffineData(sprite, 256, 256, rotation << 8);
         sprite->data[7] += sAnims[sprite->data[0]].rotation;
@@ -2925,8 +2925,8 @@ static void Anim_RotateUpToSides(struct Sprite *sprite)
     TryFlipX(sprite);
     if (sprite->data[7] > 254)
     {
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         HandleSetAffineData(sprite, 256, 256, 0);
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
@@ -2936,8 +2936,8 @@ static void Anim_RotateUpToSides(struct Sprite *sprite)
     {
         u16 rotation;
 
-        sprite->pos2.x = -(Sin(sprite->data[7], 16));
-        sprite->pos2.y = -(Sin(sprite->data[7] % 128, 16));
+        sprite->x2 = -(Sin(sprite->data[7], 16));
+        sprite->y2 = -(Sin(sprite->data[7] % 128, 16));
         rotation = Sin(sprite->data[7], 32);
         HandleSetAffineData(sprite, 256, 256, rotation << 8);
         sprite->data[7] += 8;
@@ -3006,8 +3006,8 @@ static void TipHopForward_1(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos2.x = -(sprite->data[2] * 16) / 512;
-        sprite->pos2.y = -(Sin(sprite->data[2] % 128, 4));
+        sprite->x2 = -(sprite->data[2] * 16) / 512;
+        sprite->y2 = -(Sin(sprite->data[2] % 128, 4));
         sprite->data[2] += 12;
     }
 
@@ -3021,13 +3021,13 @@ static void TipHopForward_2(struct Sprite *sprite)
     if (sprite->data[7] < 0)
     {
         sprite->data[7] = 0;
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
     else
     {
-        sprite->pos2.x = -(Sin(sprite->data[7] * 2, 16));
+        sprite->x2 = -(Sin(sprite->data[7] * 2, 16));
     }
 
     HandleSetAffineData(sprite, 256, 256, sprite->data[7] << 8);
@@ -3048,8 +3048,8 @@ static void Anim_PivotShake(struct Sprite *sprite)
     TryFlipX(sprite);
     if (sprite->data[7] > 255)
     {
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[7] = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
@@ -3057,8 +3057,8 @@ static void Anim_PivotShake(struct Sprite *sprite)
     else
     {
         sprite->data[7] += 16;
-        sprite->pos2.x = -(Sin(sprite->data[7] % 128, 8));
-        sprite->pos2.y = -(Sin(sprite->data[7] % 128, 8));
+        sprite->x2 = -(Sin(sprite->data[7] % 128, 8));
+        sprite->y2 = -(Sin(sprite->data[7] % 128, 8));
     }
 
     rotation = Sin(sprite->data[7] % 128, 16);
@@ -3093,8 +3093,8 @@ static void TipAndShake_0(struct Sprite *sprite)
     else
     {
         sprite->data[7] += 2;
-        sprite->pos2.x = Sin(sprite->data[7], 8);
-        sprite->pos2.y = -(Sin(sprite->data[7], 8));
+        sprite->x2 = Sin(sprite->data[7], 8);
+        sprite->y2 = -(Sin(sprite->data[7], 8));
     }
 
     HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
@@ -3112,8 +3112,8 @@ static void TipAndShake_1(struct Sprite *sprite)
     else
     {
         sprite->data[7] += 2;
-        sprite->pos2.x = Sin(sprite->data[7], 8);
-        sprite->pos2.y = -(Sin(sprite->data[7], 8));
+        sprite->x2 = Sin(sprite->data[7], 8);
+        sprite->y2 = -(Sin(sprite->data[7], 8));
     }
 
     HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
@@ -3130,8 +3130,8 @@ static void TipAndShake_2(struct Sprite *sprite)
         sprite->callback = TipAndShake_3;
     }
 
-    sprite->pos2.x = Sin(sprite->data[7], 8);
-    sprite->pos2.y = -(Sin(sprite->data[7], 8));
+    sprite->x2 = Sin(sprite->data[7], 8);
+    sprite->y2 = -(Sin(sprite->data[7], 8));
     if (sprite->data[7] <= 28 || sprite->data[7] >= 36)
     {
         sprite->data[6] *= -1;
@@ -3154,8 +3154,8 @@ static void TipAndShake_3(struct Sprite *sprite)
     else
     {
         sprite->data[7] -= 2;
-        sprite->pos2.x = Sin(sprite->data[7], 8);
-        sprite->pos2.y = -(Sin(sprite->data[7], 8));
+        sprite->x2 = Sin(sprite->data[7], 8);
+        sprite->y2 = -(Sin(sprite->data[7], 8));
     }
 
     HandleSetAffineData(sprite, 256, 256, -(sprite->data[7]) << 8);
@@ -3168,7 +3168,7 @@ static void Anim_VibrateToCorners(struct Sprite *sprite)
     if (sprite->data[2] > 40)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
     }
     else
     {
@@ -3180,13 +3180,13 @@ static void Anim_VibrateToCorners(struct Sprite *sprite)
 
         if ((sprite->data[2] % 4) / 2 == 0)
         {
-            sprite->pos2.x = Sin((sprite->data[2] * 128 / 40) % 256, 16) * sign;
-            sprite->pos2.y = -(sprite->pos2.x);
+            sprite->x2 = Sin((sprite->data[2] * 128 / 40) % 256, 16) * sign;
+            sprite->y2 = -(sprite->x2);
         }
         else
         {
-            sprite->pos2.x = -(Sin((sprite->data[2] * 128 / 40) % 256, 16)) * sign;
-            sprite->pos2.y = sprite->pos2.x;
+            sprite->x2 = -(Sin((sprite->data[2] * 128 / 40) % 256, 16)) * sign;
+            sprite->y2 = sprite->x2;
         }
     }
 
@@ -3273,7 +3273,7 @@ static void Anim_VerticalSpring(struct Sprite *sprite)
 
     if (sprite->data[7] > 512)
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         HandleSetAffineData(sprite, 256, 256, 0);
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
@@ -3282,7 +3282,7 @@ static void Anim_VerticalSpring(struct Sprite *sprite)
     {
         s16 yScale;
 
-        sprite->pos2.y = Sin(sprite->data[7] % 256, 8);
+        sprite->y2 = Sin(sprite->data[7] % 256, 8);
         sprite->data[7] += 8;
         yScale = Sin(sprite->data[7] % 128, 96);
         HandleSetAffineData(sprite, 256, yScale + 256, 0);
@@ -3300,7 +3300,7 @@ static void Anim_VerticalRepeatedSpring(struct Sprite *sprite)
 
     if (sprite->data[7] > 256)
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         HandleSetAffineData(sprite, 256, 256, 0);
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
@@ -3309,7 +3309,7 @@ static void Anim_VerticalRepeatedSpring(struct Sprite *sprite)
     {
         s16 yScale;
 
-        sprite->pos2.y = Sin(sprite->data[7], 16);
+        sprite->y2 = Sin(sprite->data[7], 16);
         sprite->data[7] += 4;
         yScale = Sin((sprite->data[7] % 64) * 2, 128);
         HandleSetAffineData(sprite, 256, yScale + 256, 0);
@@ -3362,7 +3362,7 @@ static void SpringRising_1(struct Sprite *sprite)
     {
         s16 sign, index;
 
-        sprite->pos2.y = -(sprite->data[6] * 4) - Sin(sprite->data[7], 8);
+        sprite->y2 = -(sprite->data[6] * 4) - Sin(sprite->data[7], 8);
         if (sprite->data[7] > 63)
         {
             sign = -1;
@@ -3391,12 +3391,12 @@ static void SpringRising_2(struct Sprite *sprite)
 
     sprite->data[7] += 8;
     yScale = Cos(sprite->data[7], 128);
-    sprite->pos2.y = -(Cos(sprite->data[7], 12));
+    sprite->y2 = -(Cos(sprite->data[7], 12));
     if (sprite->data[7] > 63)
     {
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         HandleSetAffineData(sprite, 256, 256, 0);
     }
 
@@ -3407,7 +3407,7 @@ static void HorizontalSpring(struct Sprite *sprite)
 {
     if (sprite->data[7] > sprite->data[5])
     {
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
         HandleSetAffineData(sprite, 256, 256, 0);
@@ -3416,7 +3416,7 @@ static void HorizontalSpring(struct Sprite *sprite)
     {
         s16 xScale;
 
-        sprite->pos2.x = Sin(sprite->data[7] % 256, sprite->data[4]);
+        sprite->x2 = Sin(sprite->data[7] % 256, sprite->data[4]);
         sprite->data[7] += sprite->data[6];
         xScale = Sin(sprite->data[7] % 128, 96);
         HandleSetAffineData(sprite, 256 + xScale, 256, 0);
@@ -3442,7 +3442,7 @@ static void HorizontalRepeatedSpring(struct Sprite *sprite)
 {
     if (sprite->data[7] > sprite->data[5])
     {
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
         HandleSetAffineData(sprite, 256, 256, 0);
@@ -3451,7 +3451,7 @@ static void HorizontalRepeatedSpring(struct Sprite *sprite)
     {
         s16 xScale;
 
-        sprite->pos2.x = Sin(sprite->data[7] % 256, sprite->data[4]);
+        sprite->x2 = Sin(sprite->data[7] % 256, sprite->data[4]);
         sprite->data[7] += sprite->data[6];
         xScale = Sin((sprite->data[7] % 64) * 2, 128);
         HandleSetAffineData(sprite, 256 + xScale, 256, 0);
@@ -3485,7 +3485,7 @@ static void Anim_HorizontalSlideShrink(struct Sprite *sprite)
 
     if (sprite->data[7] > 512)
     {
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         ResetSpriteAfterAnim(sprite);
         HandleSetAffineData(sprite, 256, 256, 0);
         sprite->callback = WaitAnimEnd;
@@ -3494,7 +3494,7 @@ static void Anim_HorizontalSlideShrink(struct Sprite *sprite)
     {
         s16 scale;
 
-        sprite->pos2.x = Sin(sprite->data[7] % 256, 8);
+        sprite->x2 = Sin(sprite->data[7] % 256, 8);
         sprite->data[7] += 8;
         scale = Sin(sprite->data[7] % 128, 96);
         HandleSetAffineData(sprite, 256 + scale, 256 + scale, 0);
@@ -3515,7 +3515,7 @@ static void Anim_LungeGrow(struct Sprite *sprite)
 
     if (sprite->data[7] > 512)
     {
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         ResetSpriteAfterAnim(sprite);
         HandleSetAffineData(sprite, 256, 256, 0);
         sprite->callback = WaitAnimEnd;
@@ -3524,7 +3524,7 @@ static void Anim_LungeGrow(struct Sprite *sprite)
     {
         s16 scale;
 
-        sprite->pos2.x = -(Sin((sprite->data[7] % 256) / 2, 16));
+        sprite->x2 = -(Sin((sprite->data[7] % 256) / 2, 16));
         sprite->data[7] += 8;
         scale = -(Sin((sprite->data[7] % 256) / 2, 64));
         HandleSetAffineData(sprite, 256 + scale, 256 + scale, 0);
@@ -3545,7 +3545,7 @@ static void Anim_CircleIntoBackground(struct Sprite *sprite)
 
     if (sprite->data[7] > 512)
     {
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         ResetSpriteAfterAnim(sprite);
         HandleSetAffineData(sprite, 256, 256, 0);
         sprite->callback = WaitAnimEnd;
@@ -3554,7 +3554,7 @@ static void Anim_CircleIntoBackground(struct Sprite *sprite)
     {
         s16 scale;
 
-        sprite->pos2.x = -(Sin(sprite->data[7] % 256 , 8));
+        sprite->x2 = -(Sin(sprite->data[7] % 256 , 8));
         sprite->data[7] += 8;
         scale = Sin((sprite->data[7] % 256) / 2, 96);
         HandleSetAffineData(sprite, 256 + scale, 256 + scale, 0);
@@ -3577,20 +3577,20 @@ static void Anim_RapidHorizontalHops(struct Sprite *sprite)
         switch (caseVar)
         {
         case 0:
-            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512;
+            sprite->x2 = -(sprite->data[2] % 512 * 16) / 512;
             break;
         case 1:
-            sprite->pos2.x = (sprite->data[2] % 512 / 32) - 16;
+            sprite->x2 = (sprite->data[2] % 512 / 32) - 16;
             break;
         case 2:
-            sprite->pos2.x = (sprite->data[2] % 512) / 32;
+            sprite->x2 = (sprite->data[2] % 512) / 32;
             break;
         case 3:
-            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512 + 16;
+            sprite->x2 = -(sprite->data[2] % 512 * 16) / 512 + 16;
             break;
         }
 
-        sprite->pos2.y = -(Sin(sprite->data[2] % 128, 4));
+        sprite->y2 = -(Sin(sprite->data[2] % 128, 4));
         sprite->data[2] += 24;
     }
 
@@ -3628,25 +3628,25 @@ static void Anim_FourPetal(struct Sprite *sprite)
     switch (sprite->data[6])
     {
     case 1:
-        sprite->pos2.x = -(Cos(sprite->data[7], 8));
-        sprite->pos2.y = Sin(sprite->data[7], 8) - 8;
+        sprite->x2 = -(Cos(sprite->data[7], 8));
+        sprite->y2 = Sin(sprite->data[7], 8) - 8;
         break;
     case 2:
-        sprite->pos2.x = Sin(sprite->data[7] + 128, 8) + 8;
-        sprite->pos2.y = -(Cos(sprite->data[7], 8));
+        sprite->x2 = Sin(sprite->data[7] + 128, 8) + 8;
+        sprite->y2 = -(Cos(sprite->data[7], 8));
         break;
     case 3:
-        sprite->pos2.x = Cos(sprite->data[7], 8);
-        sprite->pos2.y = Sin(sprite->data[7] + 128, 8) + 8;
+        sprite->x2 = Cos(sprite->data[7], 8);
+        sprite->y2 = Sin(sprite->data[7] + 128, 8) + 8;
         break;
     case 0:
     case 4:
-        sprite->pos2.x = Sin(sprite->data[7], 8) - 8;
-        sprite->pos2.y = Cos(sprite->data[7], 8);
+        sprite->x2 = Sin(sprite->data[7], 8) - 8;
+        sprite->y2 = Cos(sprite->data[7], 8);
         break;
     default:
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->callback = WaitAnimEnd;
         break;
     }
@@ -3877,11 +3877,11 @@ static void VerticalShakeBack(struct Sprite *sprite)
     if (counter > 2304)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
     }
     else
     {
-        sprite->pos2.y = Sin((counter + 192) % 256, sprite->data[7]) + sprite->data[7];
+        sprite->y2 = Sin((counter + 192) % 256, sprite->data[7]) + sprite->data[7];
     }
 
     sprite->data[2] += sprite->data[0];
@@ -3917,20 +3917,20 @@ static void Anim_VerticalShakeHorizontalSlide_Slow(struct Sprite *sprite)
         switch (divCase)
         {
         case 0:
-            sprite->pos2.x = (sprite->data[2] % 512) / 32;
+            sprite->x2 = (sprite->data[2] % 512) / 32;
             break;
         case 2:
-            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512;
+            sprite->x2 = -(sprite->data[2] % 512 * 16) / 512;
             break;
         case 1:
-            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512 + 16;
+            sprite->x2 = -(sprite->data[2] % 512 * 16) / 512 + 16;
             break;
         case 3:
-            sprite->pos2.x = (sprite->data[2] % 512) / 32 - 16;
+            sprite->x2 = (sprite->data[2] % 512) / 32 - 16;
             break;
         }
 
-        sprite->pos2.y = Sin(sprite->data[2] % 128, 4);
+        sprite->y2 = Sin(sprite->data[2] % 128, 4);
         sprite->data[2] += 24;
     }
 
@@ -3943,7 +3943,7 @@ static void VerticalStretchBothEnds(struct Sprite *sprite)
 
     if (sprite->data[5] > sprite->data[6])
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         sprite->data[5] = 0;
         HandleSetAffineData(sprite, 256, 256, 0);
         if (sprite->data[4] <= 1)
@@ -4079,11 +4079,11 @@ static void VerticalShakeLowTwice(struct Sprite *sprite)
     if (var5 == (u8)-1)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
     }
     else
     {
-        sprite->pos2.y = Sin((var8 + 192) % 256, var7) + var7;
+        sprite->y2 = Sin((var8 + 192) % 256, var7) + var7;
         if (var9 == var6)
         {
             sprite->data[5]++;
@@ -4126,7 +4126,7 @@ static void Anim_HorizontalVibrate_Fast(struct Sprite *sprite)
     if (sprite->data[2] > 40)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
     }
     else
     {
@@ -4136,7 +4136,7 @@ static void Anim_HorizontalVibrate_Fast(struct Sprite *sprite)
         else
             sign = -1;
 
-        sprite->pos2.x = Sin((sprite->data[2] * 128 / 40) % 256, 9) * sign;
+        sprite->x2 = Sin((sprite->data[2] * 128 / 40) % 256, 9) * sign;
     }
 
     sprite->data[2]++;
@@ -4147,7 +4147,7 @@ static void Anim_HorizontalVibrate_Fastest(struct Sprite *sprite)
     if (sprite->data[2] > 40)
     {
         sprite->callback = WaitAnimEnd;
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
     }
     else
     {
@@ -4157,7 +4157,7 @@ static void Anim_HorizontalVibrate_Fastest(struct Sprite *sprite)
         else
             sign = -1;
 
-        sprite->pos2.x = Sin((sprite->data[2] * 128 / 40) % 256, 12) * sign;
+        sprite->x2 = Sin((sprite->data[2] * 128 / 40) % 256, 12) * sign;
     }
 
     sprite->data[2]++;
@@ -4203,7 +4203,7 @@ static void GrowStutter(struct Sprite *sprite)
     s16 index1 = 0, index2 = 0;
     if (sprite->data[5] > sprite->data[6])
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         sprite->data[5] = 0;
         HandleSetAffineData(sprite, 256, 256, 0);
         if (sprite->data[4] <= 1)
@@ -4274,20 +4274,20 @@ static void Anim_VerticalShakeHorizontalSlide(struct Sprite *sprite)
         switch (divCase)
         {
         case 0:
-            sprite->pos2.x = (sprite->data[2] % 512) / 32;
+            sprite->x2 = (sprite->data[2] % 512) / 32;
             break;
         case 2:
-            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512;
+            sprite->x2 = -(sprite->data[2] % 512 * 16) / 512;
             break;
         case 1:
-            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512 + 16;
+            sprite->x2 = -(sprite->data[2] % 512 * 16) / 512 + 16;
             break;
         case 3:
-            sprite->pos2.x = (sprite->data[2] % 512) / 32 - 16;
+            sprite->x2 = (sprite->data[2] % 512) / 32 - 16;
             break;
         }
 
-        sprite->pos2.y = Sin(sprite->data[2] % 128, 4);
+        sprite->y2 = Sin(sprite->data[2] % 128, 4);
         sprite->data[2] += 48;
     }
 
@@ -4308,20 +4308,20 @@ static void Anim_VerticalShakeHorizontalSlide_Fast(struct Sprite *sprite)
         switch (divCase)
         {
         case 0:
-            sprite->pos2.x = (sprite->data[2] % 512) / 32;
+            sprite->x2 = (sprite->data[2] % 512) / 32;
             break;
         case 2:
-            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512;
+            sprite->x2 = -(sprite->data[2] % 512 * 16) / 512;
             break;
         case 1:
-            sprite->pos2.x = -(sprite->data[2] % 512 * 16) / 512 + 16;
+            sprite->x2 = -(sprite->data[2] % 512 * 16) / 512 + 16;
             break;
         case 3:
-            sprite->pos2.x = (sprite->data[2] % 512) / 32 - 16;
+            sprite->x2 = (sprite->data[2] % 512) / 32 - 16;
             break;
         }
 
-        sprite->pos2.y = Sin(sprite->data[2] % 96, 4);
+        sprite->y2 = Sin(sprite->data[2] % 96, 4);
         sprite->data[2] += 64;
     }
 
@@ -4359,8 +4359,8 @@ static void TriangleDown(struct Sprite *sprite)
     else
     {
         s32 amplitude = sprite->data[5];
-        sprite->pos2.x += (sTriangleDownData[sprite->data[3]][0] * amplitude);
-        sprite->pos2.y += (sTriangleDownData[sprite->data[3]][1] * sprite->data[5]); // Not using amplitude here. No reason for this.
+        sprite->x2 += (sTriangleDownData[sprite->data[3]][0] * amplitude);
+        sprite->y2 += (sTriangleDownData[sprite->data[3]][1] * sprite->data[5]); // Not using amplitude here. No reason for this.
         sprite->data[2]++;
         TryFlipX(sprite);
     }
@@ -4636,8 +4636,8 @@ static void ConcaveArc(struct Sprite *sprite)
         if (sprite->data[6] <= 1)
         {
             sprite->callback = WaitAnimEnd;
-            sprite->pos2.x = 0;
-            sprite->pos2.y = 0;
+            sprite->x2 = 0;
+            sprite->y2 = 0;
         }
         else
         {
@@ -4647,12 +4647,12 @@ static void ConcaveArc(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos2.x = -(Sin(sprite->data[7], sprite->data[5]));
-        sprite->pos2.y = Sin((sprite->data[7] + 192) % 256, sprite->data[4]);
-        if (sprite->pos2.y > 0)
-            sprite->pos2.y *= -1;
+        sprite->x2 = -(Sin(sprite->data[7], sprite->data[5]));
+        sprite->y2 = Sin((sprite->data[7] + 192) % 256, sprite->data[4]);
+        if (sprite->y2 > 0)
+            sprite->y2 *= -1;
 
-        sprite->pos2.y += sprite->data[4];
+        sprite->y2 += sprite->data[4];
         sprite->data[7] += sprite->data[3];
     }
 }
@@ -4716,8 +4716,8 @@ static void ConvexDoubleArc(struct Sprite *sprite)
             sprite->data[7] = 0;
         }
 
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
     }
     else
     {
@@ -4728,22 +4728,22 @@ static void ConvexDoubleArc(struct Sprite *sprite)
             if (sprite->data[7] > 256)
                 sprite->data[7] = 256;
 
-            sprite->pos2.y = -(Sin(sprite->data[7] % 256, 8));
+            sprite->y2 = -(Sin(sprite->data[7] % 256, 8));
         }
         else if (sprite->data[7] > 95)
         {
-            sprite->pos2.y = Sin(96, 6) - Sin((sprite->data[7] - 96) * 2, 4);
+            sprite->y2 = Sin(96, 6) - Sin((sprite->data[7] - 96) * 2, 4);
         }
         else
         {
-            sprite->pos2.y = Sin(sprite->data[7], 6);
+            sprite->y2 = Sin(sprite->data[7], 6);
         }
 
         posX = -(Sin(sprite->data[7] / 2, sprite->data[5]));
         if (sprite->data[4] % 2 == 0)
             posX *= -1;
 
-        sprite->pos2.x = posX;
+        sprite->x2 = posX;
         sprite->data[7] += sprite->data[3];
     }
 }
@@ -4861,8 +4861,8 @@ static void Anim_HorizontalDip(struct Sprite *sprite)
     if (sprite->data[2] > sprite->data[7])
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[0]++;
         if (sprite->data[3] <= sprite->data[0])
         {
@@ -4898,8 +4898,8 @@ static void Anim_HorizontalDip_Fast(struct Sprite *sprite)
     if (sprite->data[2] > sprite->data[7])
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[0]++;
         if (sprite->data[3] <= sprite->data[0])
         {
@@ -4935,8 +4935,8 @@ static void Anim_HorizontalDip_Twice(struct Sprite *sprite)
     if (sprite->data[2] > sprite->data[7])
     {
         HandleSetAffineData(sprite, 256, 256, 0);
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->data[0]++;
         if (sprite->data[3] <= sprite->data[0])
         {
@@ -4961,7 +4961,7 @@ static void ShrinkGrowVibrate(struct Sprite *sprite)
 {
     if (sprite->data[2] > sprite->data[7])
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         HandleSetAffineData(sprite, 256, 256, 0);
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
@@ -4990,7 +4990,7 @@ static void ShrinkGrowVibrate(struct Sprite *sprite)
         posY = posY_signed;
         if (posY < 0)
             posY += 7;
-        sprite->pos2.y = (u32)(posY) >> 3;
+        sprite->y2 = (u32)(posY) >> 3;
         HandleSetAffineData(sprite, sprite->data[4], sprite->data[5], 0);
     }
 
@@ -5002,7 +5002,7 @@ static void Anim_ShrinkGrowVibrate_Fast(struct Sprite *sprite)
     if (sprite->data[2] == 0)
     {
         HandleStartAffineAnim(sprite);
-        sprite->pos2.y += 2;
+        sprite->y2 += 2;
         sprite->data[6] = 40;
         sprite->data[7] = 80;
     }
@@ -5015,7 +5015,7 @@ static void Anim_ShrinkGrowVibrate(struct Sprite *sprite)
     if (sprite->data[2] == 0)
     {
         HandleStartAffineAnim(sprite);
-        sprite->pos2.y += 2;
+        sprite->y2 += 2;
         sprite->data[6] = 40;
         sprite->data[7] = 40;
     }
@@ -5028,7 +5028,7 @@ static void Anim_ShrinkGrowVibrate_Slow(struct Sprite *sprite)
     if (sprite->data[2] == 0)
     {
         HandleStartAffineAnim(sprite);
-        sprite->pos2.y += 2;
+        sprite->y2 += 2;
         sprite->data[6] = 80;
         sprite->data[7] = 80;
     }
@@ -5044,10 +5044,10 @@ static void JoltRight_3(struct Sprite *sprite);
 static void JoltRight(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    sprite->pos2.x -= sprite->data[2];
-    if (sprite->pos2.x <= -sprite->data[6])
+    sprite->x2 -= sprite->data[2];
+    if (sprite->x2 <= -sprite->data[6])
     {
-        sprite->pos2.x = -sprite->data[6];
+        sprite->x2 = -sprite->data[6];
         sprite->data[7] = 2;
         sprite->callback = JoltRight_0;
     }
@@ -5058,9 +5058,9 @@ static void JoltRight(struct Sprite *sprite)
 static void JoltRight_0(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    sprite->pos2.x += sprite->data[7];
+    sprite->x2 += sprite->data[7];
     sprite->data[7]++;
-    if (sprite->pos2.x >= 0)
+    if (sprite->x2 >= 0)
         sprite->callback = JoltRight_1;
 
     TryFlipX(sprite);
@@ -5069,11 +5069,11 @@ static void JoltRight_0(struct Sprite *sprite)
 static void JoltRight_1(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    sprite->pos2.x += sprite->data[7];
+    sprite->x2 += sprite->data[7];
     sprite->data[7]++;
-    if (sprite->pos2.x > sprite->data[6])
+    if (sprite->x2 > sprite->data[6])
     {
-        sprite->pos2.x = sprite->data[6];
+        sprite->x2 = sprite->data[6];
         sprite->callback = JoltRight_2;
     }
 
@@ -5089,7 +5089,7 @@ static void JoltRight_2(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos2.x += sprite->data[4];
+        sprite->x2 += sprite->data[4];
         sprite->data[4] *= -1;
         sprite->data[3]++;
     }
@@ -5100,10 +5100,10 @@ static void JoltRight_2(struct Sprite *sprite)
 static void JoltRight_3(struct Sprite *sprite)
 {
     TryFlipX(sprite);
-    sprite->pos2.x -= 2;
-    if (sprite->pos2.x <= 0)
+    sprite->x2 -= 2;
+    if (sprite->x2 <= 0)
     {
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         ResetSpriteAfterAnim(sprite);
         sprite->callback = WaitAnimEnd;
     }
@@ -5149,7 +5149,7 @@ static void Anim_JoltRight_Slow(struct Sprite *sprite)
 
 static void SetShakeFlashYellowPos(struct Sprite *sprite)
 {
-    sprite->pos2.x = sprite->data[1];
+    sprite->x2 = sprite->data[1];
     if (sprite->data[0] > 1)
     {
         sprite->data[1] *= -1;
@@ -5230,7 +5230,7 @@ static void ShakeFlashYellow(struct Sprite *sprite)
     SetShakeFlashYellowPos(sprite);
     if (array[sprite->data[6]].time == (u8)-1)
     {
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         sprite->callback = WaitAnimEnd;
     }
     else
@@ -5339,12 +5339,12 @@ static void ShakeGlow_Move(struct Sprite *sprite)
             if (++sprite->data[3] < sprite->data[4])
                 sprite->data[5] = 0;
 
-            sprite->pos2.x = 0;
+            sprite->x2 = 0;
         }
         else
         {
             s8 sign = 1 - (sprite->data[3] % 2 * 2);
-            sprite->pos2.x = sign * Sin((sprite->data[5] * 384 / sprite->data[0]) % 256, 6);
+            sprite->x2 = sign * Sin((sprite->data[5] * 384 / sprite->data[0]) % 256, 6);
             sprite->data[5]++;
         }
 
diff --git a/src/pokemon_icon.c b/src/pokemon_icon.c
index 42330b6a5..3cd80cf0d 100644
--- a/src/pokemon_icon.c
+++ b/src/pokemon_icon.c
@@ -1005,21 +1005,21 @@ const union AffineAnimCmd *const sMonIconAffineAnims[] =
 
 const u16 sSpriteImageSizes[3][4] =
 {
-    [ST_OAM_SQUARE] = 
+    [ST_OAM_SQUARE] =
     {
         [SPRITE_SIZE(8x8)]   =  0x20,
         [SPRITE_SIZE(16x16)] =  0x80,
         [SPRITE_SIZE(32x32)] = 0x200,
         [SPRITE_SIZE(64x64)] = 0x800,
     },
-    [ST_OAM_H_RECTANGLE] = 
+    [ST_OAM_H_RECTANGLE] =
     {
         [SPRITE_SIZE(16x8)]  =  0x40,
         [SPRITE_SIZE(32x8)]  =  0x80,
         [SPRITE_SIZE(32x16)] = 0x100,
         [SPRITE_SIZE(64x32)] = 0x400,
     },
-    [ST_OAM_V_RECTANGLE] = 
+    [ST_OAM_V_RECTANGLE] =
     {
         [SPRITE_SIZE(8x16)]  =  0x40,
         [SPRITE_SIZE(8x32)]  =  0x80,
@@ -1278,7 +1278,7 @@ static u8 CreateMonIconSprite(struct MonIconSpriteTemplate *iconTemplate, s16 x,
 
     struct SpriteTemplate spriteTemplate =
     {
-        .tileTag = 0xFFFF,
+        .tileTag = TAG_NONE,
         .paletteTag = iconTemplate->paletteTag,
         .oam = iconTemplate->oam,
         .anims = iconTemplate->anims,
diff --git a/src/pokemon_jump.c b/src/pokemon_jump.c
index 361dc278b..ab86ee09f 100755
--- a/src/pokemon_jump.c
+++ b/src/pokemon_jump.c
@@ -126,7 +126,7 @@ enum {
 #define PLAY_AGAIN_YES 2
 
 #define TAG_MON1 0
-#define TAG_MON2 1 // MON2-5 used implicitly by adding multiplayer id to tag 
+#define TAG_MON2 1 // MON2-5 used implicitly by adding multiplayer id to tag
 #define TAG_MON3 2
 #define TAG_MON4 3
 #define TAG_MON5 4
@@ -1723,7 +1723,7 @@ static void UpdateVineState(void)
 
         sPokemonJump->prevVineState = sPokemonJump->vineState;
         sPokemonJump->vineState = sPokemonJump->vineStateTimer >> 8;
-        
+
         // If beginning upswing
         if (sPokemonJump->vineState > VINE_UPSWING_LOWER && sPokemonJump->prevVineState < VINE_UPSWING_LOW)
         {
@@ -1960,23 +1960,23 @@ static void HandleMonState(void)
 
 static const s8 sJumpOffsets[][48] =
 {
-    [JUMP_TYPE_NORMAL] = { -3,  -6,  -8, -10, -13, -15, -17, -19, 
-                          -21, -23, -25, -27, -28, -29, 
-                          JUMP_PEAK, JUMP_PEAK, JUMP_PEAK, 
-                          -28, -27, -26, -25, -23, -22, -20, -18, 
+    [JUMP_TYPE_NORMAL] = { -3,  -6,  -8, -10, -13, -15, -17, -19,
+                          -21, -23, -25, -27, -28, -29,
+                          JUMP_PEAK, JUMP_PEAK, JUMP_PEAK,
+                          -28, -27, -26, -25, -23, -22, -20, -18,
                           -17, -15, -13, -11,  -8,  -6,  -4,  -1},
 
-    [JUMP_TYPE_FAST]  = { -3,  -6,  -9, -11, -14, -16, -18, -20, 
-                         -22, -24, -26, -28, -29, 
-                         JUMP_PEAK, JUMP_PEAK, 
-                         -28, -26, -24, -22, -20, -18, -16, -14, 
+    [JUMP_TYPE_FAST]  = { -3,  -6,  -9, -11, -14, -16, -18, -20,
+                         -22, -24, -26, -28, -29,
+                         JUMP_PEAK, JUMP_PEAK,
+                         -28, -26, -24, -22, -20, -18, -16, -14,
                          -11, -9,  -6,  -4,  -1},
 
-    [JUMP_TYPE_SLOW]  = { -3,  -6,  -9, -11, -13, -15, -17, -19, 
-                         -21, -23, -25, -27, -28, -29, 
-                         JUMP_PEAK, JUMP_PEAK, JUMP_PEAK, JUMP_PEAK, 
-                         -29, -29, -28, -28, -27, -27, -26, -25, 
-                         -24, -22, -20, -18, -16, -14, -12, -11,  
+    [JUMP_TYPE_SLOW]  = { -3,  -6,  -9, -11, -13, -15, -17, -19,
+                         -21, -23, -25, -27, -28, -29,
+                         JUMP_PEAK, JUMP_PEAK, JUMP_PEAK, JUMP_PEAK,
+                         -29, -29, -28, -28, -27, -27, -26, -25,
+                         -24, -22, -20, -18, -16, -14, -12, -11,
                           -9,  -6,  -4,  -1},
 };
 
@@ -2248,13 +2248,13 @@ static void TryUpdateExcellentsRecord(u16 excellentsInRow)
 }
 
 static const u16 sPrizeItems[] = {
-    ITEM_LEPPA_BERRY, 
-    ITEM_LUM_BERRY, 
-    ITEM_SITRUS_BERRY, 
-    ITEM_FIGY_BERRY, 
-    ITEM_WIKI_BERRY, 
-    ITEM_MAGO_BERRY, 
-    ITEM_AGUAV_BERRY, 
+    ITEM_LEPPA_BERRY,
+    ITEM_LUM_BERRY,
+    ITEM_SITRUS_BERRY,
+    ITEM_FIGY_BERRY,
+    ITEM_WIKI_BERRY,
+    ITEM_MAGO_BERRY,
+    ITEM_AGUAV_BERRY,
     ITEM_IAPAPA_BERRY
 };
 
@@ -2764,7 +2764,7 @@ static void DoStarAnim(struct PokemonJumpGfx *jumpGfx, int multiplayerId)
     ResetPokeJumpSpriteData(jumpGfx->starSprites[multiplayerId]);
     jumpGfx->starSprites[multiplayerId]->sOffset = jumpGfx->monSprites[multiplayerId] - gSprites;
     jumpGfx->starSprites[multiplayerId]->invisible = FALSE;
-    jumpGfx->starSprites[multiplayerId]->pos1.y = 96;
+    jumpGfx->starSprites[multiplayerId]->y = 96;
     jumpGfx->starSprites[multiplayerId]->callback = SpriteCB_Star;
     StartSpriteAnim(jumpGfx->starSprites[multiplayerId], 1);
 }
@@ -2781,11 +2781,11 @@ static void SpriteCB_Star(struct Sprite *sprite)
         }
         break;
     case 1:
-        sprite->pos1.y--;
+        sprite->y--;
         sprite->sTimer++;
-        if (sprite->pos1.y <= 72)
+        if (sprite->y <= 72)
         {
-            sprite->pos1.y = 72;
+            sprite->y = 72;
             sprite->sState++;
         }
         break;
@@ -2806,7 +2806,7 @@ static void SpriteCB_Star(struct Sprite *sprite)
 static void Gfx_StartMonHitShake(struct PokemonJumpGfx *jumpGfx, int multiplayerId)
 {
     jumpGfx->monSprites[multiplayerId]->callback = SpriteCB_MonHitShake;
-    jumpGfx->monSprites[multiplayerId]->pos2.y = 0;
+    jumpGfx->monSprites[multiplayerId]->y2 = 0;
     ResetPokeJumpSpriteData(jumpGfx->monSprites[multiplayerId]);
 }
 
@@ -2823,16 +2823,16 @@ static void SpriteCB_MonHitShake(struct Sprite *sprite)
     if (++sprite->sTimer > 1)
     {
         if (++sprite->sNumShakes & 1)
-            sprite->pos2.y = 2;
+            sprite->y2 = 2;
         else
-            sprite->pos2.y = -2;
+            sprite->y2 = -2;
 
         sprite->sTimer = 0;
     }
 
     if (sprite->sNumShakes > 12)
     {
-        sprite->pos2.y = 0;
+        sprite->y2 = 0;
         sprite->callback = SpriteCallbackDummy;
     }
 }
@@ -2919,7 +2919,7 @@ static void SpriteCB_MonIntroBounce(struct Sprite *sprite)
         if (sprite->sHopPos > 127)
             sprite->sHopPos = 0;
 
-        sprite->pos2.y = -(gSineTable[sprite->sHopPos] >> 3);
+        sprite->y2 = -(gSineTable[sprite->sHopPos] >> 3);
         if (sprite->sHopPos == 0)
         {
             if (++sprite->sNumHops < 2)
@@ -2990,7 +2990,7 @@ static void UpdateVineAnim(struct PokemonJumpGfx *jumpGfx, int vineState)
     count = 0;
     for (i = 0; i < VINE_SPRITES_PER_SIDE; i++)
     {
-        jumpGfx->vineSprites[count]->pos1.y = sVineYCoords[i][vineState];
+        jumpGfx->vineSprites[count]->y = sVineYCoords[i][vineState];
         jumpGfx->vineSprites[count]->oam.priority = priority;
         jumpGfx->vineSprites[count]->oam.paletteNum = palNum;
         StartSpriteAnim(jumpGfx->vineSprites[count], vineState);
@@ -2999,7 +2999,7 @@ static void UpdateVineAnim(struct PokemonJumpGfx *jumpGfx, int vineState)
 
     for (i = VINE_SPRITES_PER_SIDE - 1; i >= 0; i--)
     {
-        jumpGfx->vineSprites[count]->pos1.y = sVineYCoords[i][vineState];
+        jumpGfx->vineSprites[count]->y = sVineYCoords[i][vineState];
         jumpGfx->vineSprites[count]->oam.priority = priority;
         jumpGfx->vineSprites[count]->oam.paletteNum = palNum;
         StartSpriteAnim(jumpGfx->vineSprites[count], vineState);
@@ -3649,15 +3649,15 @@ enum {
 };
 
 static const u8 sVenusaurStates[] = {
-    [VINE_HIGHEST]          = VENUSAUR_UP, 
-    [VINE_DOWNSWING_HIGHER] = VENUSAUR_UP, 
-    [VINE_DOWNSWING_HIGH]   = VENUSAUR_NEUTRAL, 
-    [VINE_DOWNSWING_LOW]    = VENUSAUR_NEUTRAL, 
-    [VINE_DOWNSWING_LOWER]  = VENUSAUR_DOWN, 
-    [VINE_LOWEST]           = VENUSAUR_DOWN, 
-    [VINE_UPSWING_LOWER]    = VENUSAUR_DOWN, 
-    [VINE_UPSWING_LOW]      = VENUSAUR_NEUTRAL, 
-    [VINE_UPSWING_HIGH]     = VENUSAUR_NEUTRAL, 
+    [VINE_HIGHEST]          = VENUSAUR_UP,
+    [VINE_DOWNSWING_HIGHER] = VENUSAUR_UP,
+    [VINE_DOWNSWING_HIGH]   = VENUSAUR_NEUTRAL,
+    [VINE_DOWNSWING_LOW]    = VENUSAUR_NEUTRAL,
+    [VINE_DOWNSWING_LOWER]  = VENUSAUR_DOWN,
+    [VINE_LOWEST]           = VENUSAUR_DOWN,
+    [VINE_UPSWING_LOWER]    = VENUSAUR_DOWN,
+    [VINE_UPSWING_LOW]      = VENUSAUR_NEUTRAL,
+    [VINE_UPSWING_HIGH]     = VENUSAUR_NEUTRAL,
     [VINE_UPSWING_HIGHER]   = VENUSAUR_UP,
 };
 
@@ -3665,25 +3665,25 @@ static const struct CompressedSpriteSheet sSpriteSheet_Digits = {gMinigameDigits
 static const struct SpritePalette sSpritePalette_Digits = {gMinigameDigits_Pal, TAG_DIGITS};
 
 static const u16 sPlayerNameWindowCoords_2Players[] = {
-     6, 8, 
+     6, 8,
     16, 8
 };
 static const u16 sPlayerNameWindowCoords_3Players[] = {
-     6, 8, 
-    11, 6, 
+     6, 8,
+    11, 6,
     16, 8
 };
 static const u16 sPlayerNameWindowCoords_4Players[] = {
-     2, 6, 
-     6, 8, 
-    16, 8, 
+     2, 6,
+     6, 8,
+    16, 8,
     20, 6
 };
 static const u16 sPlayerNameWindowCoords_5Players[] = {
-     2, 6, 
-     6, 8, 
-    11, 6, 
-    16, 8, 
+     2, 6,
+     6, 8,
+    11, 6,
+    16, 8,
     20, 6
 };
 
@@ -3726,7 +3726,7 @@ static void CreateJumpMonSprites(void)
 
 static void SetMonSpriteY(u32 id, s16 y)
 {
-    sPokemonJumpGfx->monSprites[id]->pos2.y = y;
+    sPokemonJumpGfx->monSprites[id]->y2 = y;
 }
 
 static void UpdateVineSwing(int vineState)
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index c82caf0b0..bd0910658 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -1873,12 +1873,12 @@ static void ChooseBoxMenu_CreateSprites(u8 curBox)
         anim = 0;
         if (i & 2)
         {
-            sChooseBoxMenu->menuSideSprites[i]->pos1.x = 196;
+            sChooseBoxMenu->menuSideSprites[i]->x = 196;
             anim = 2;
         }
         if (i & 1)
         {
-            sChooseBoxMenu->menuSideSprites[i]->pos1.y = 112;
+            sChooseBoxMenu->menuSideSprites[i]->y = 112;
             sChooseBoxMenu->menuSideSprites[i]->oam.size = 0;
             anim++;
         }
@@ -1970,11 +1970,11 @@ static void SpriteCB_ChooseBoxArrow(struct Sprite *sprite)
     if (++sprite->data[1] > 3)
     {
         sprite->data[1] = 0;
-        sprite->pos2.x += sprite->data[0];
+        sprite->x2 += sprite->data[0];
         if (++sprite->data[2] > 5)
         {
             sprite->data[2] = 0;
-            sprite->pos2.x = 0;
+            sprite->x2 = 0;
         }
     }
 }
@@ -3881,8 +3881,8 @@ static void CreateMarkingComboSprite(void)
     sStorage->markingComboSprite = CreateMonMarkingComboSprite(GFXTAG_MARKING_COMBO, PALTAG_MARKING_COMBO, NULL);
     sStorage->markingComboSprite->oam.priority = 1;
     sStorage->markingComboSprite->subpriority = 1;
-    sStorage->markingComboSprite->pos1.x = 40;
-    sStorage->markingComboSprite->pos1.y = 150;
+    sStorage->markingComboSprite->x = 40;
+    sStorage->markingComboSprite->y = 150;
     sStorage->markingComboTilesPtr = (void*) OBJ_VRAM0 + 32 * GetSpriteTileStartByTag(GFXTAG_MARKING_COMBO);
 }
 
@@ -4532,13 +4532,13 @@ static void SpriteCB_BoxMonIconScrollIn(struct Sprite *sprite)
     {
         // Icon moving
         sprite->sDistance--;
-        sprite->pos1.x += sprite->sSpeed;
+        sprite->x += sprite->sSpeed;
     }
     else
     {
         // Icon arrived
         sStorage->iconScrollNumIncoming--;
-        sprite->pos1.x = sprite->sScrollInDestX;
+        sprite->x = sprite->sScrollInDestX;
         sprite->callback = SpriteCallbackDummy;
     }
 }
@@ -4552,8 +4552,8 @@ static void SpriteCB_BoxMonIconScrollOut(struct Sprite *sprite)
     else
     {
         // Icon moving
-        sprite->pos1.x += sprite->sSpeed;
-        sprite->sScrollOutX = sprite->pos1.x + sprite->pos2.x;
+        sprite->x += sprite->sSpeed;
+        sprite->sScrollOutX = sprite->x + sprite->x2;
 
         // Check if icon offscreen
         if (sprite->sScrollOutX <= 68 || sprite->sScrollOutX >= 252)
@@ -4687,7 +4687,7 @@ static bool8 UpdateBoxMonIconScroll(void)
         // Create the new incoming column of icons
         sStorage->iconScrollPos += sStorage->iconScrollSpeed;
         sStorage->iconScrollNumIncoming += CreateBoxMonIconsInColumn(sStorage->iconScrollCurColumn, sStorage->iconScrollDistance, sStorage->iconScrollSpeed);
-        
+
         if ((sStorage->iconScrollDirection > 0 && sStorage->iconScrollCurColumn == IN_BOX_COLUMNS - 1)
          || (sStorage->iconScrollDirection < 0 && sStorage->iconScrollCurColumn == 0))
         {
@@ -4777,7 +4777,7 @@ static void CreatePartyMonsSprites(bool8 visible)
     {
         for (i = 0; i < count; i++)
         {
-            sStorage->partySprites[i]->pos1.y -= DISPLAY_HEIGHT;
+            sStorage->partySprites[i]->y -= DISPLAY_HEIGHT;
             sStorage->partySprites[i]->invisible = TRUE;
         }
     }
@@ -4834,8 +4834,8 @@ static void MovePartySpriteToNextSlot(struct Sprite *sprite, u16 partyId)
     else
         x = 152, y = 8 * (3 * (partyId - 1)) + 16;
 
-    sprite->sMonX = (u16)(sprite->pos1.x) * 8;
-    sprite->sMonY = (u16)(sprite->pos1.y) * 8;
+    sprite->sMonX = (u16)(sprite->x) * 8;
+    sprite->sMonY = (u16)(sprite->y) * 8;
     sprite->sSpeedX = ((x * 8) - sprite->sMonX) / 8;
     sprite->sSpeedY = ((y * 8) - sprite->sMonY) / 8;
     sprite->data[6] = 8;
@@ -4848,21 +4848,21 @@ static void SpriteCB_MovePartyMonToNextSlot(struct Sprite *sprite)
     {
         s16 x = sprite->sMonX += sprite->sSpeedX;
         s16 y = sprite->sMonY += sprite->sSpeedY;
-        sprite->pos1.x = x / 8u;
-        sprite->pos1.y = y / 8u;
+        sprite->x = x / 8u;
+        sprite->y = y / 8u;
         sprite->sMoveSteps--;
     }
     else
     {
         if (sprite->sPartyId == 0)
         {
-            sprite->pos1.x = 104;
-            sprite->pos1.y = 64;
+            sprite->x = 104;
+            sprite->y = 64;
         }
         else
         {
-            sprite->pos1.x = 152;
-            sprite->pos1.y = 8 * (3 * (sprite->sPartyId - 1)) + 16;
+            sprite->x = 152;
+            sprite->y = 8 * (3 * (sprite->sPartyId - 1)) + 16;
         }
         sprite->callback = SpriteCallbackDummy;
         sStorage->partySprites[sprite->sPartyId] = sprite;
@@ -4894,8 +4894,8 @@ static void MovePartySprites(s16 yDelta)
     {
         if (sStorage->partySprites[i] != NULL)
         {
-            sStorage->partySprites[i]->pos1.y += yDelta;
-            posY = sStorage->partySprites[i]->pos1.y + sStorage->partySprites[i]->pos2.y + sStorage->partySprites[i]->centerToCornerVecY;
+            sStorage->partySprites[i]->y += yDelta;
+            posY = sStorage->partySprites[i]->y + sStorage->partySprites[i]->y2 + sStorage->partySprites[i]->centerToCornerVecY;
             posY += 16;
             if (posY > 192)
                 sStorage->partySprites[i]->invisible = TRUE;
@@ -4995,12 +4995,12 @@ static bool8 MoveShiftingMons(void)
     sStorage->shiftTimer++;
     if (sStorage->shiftTimer & 1)
     {
-        (*sStorage->shiftMonSpritePtr)->pos1.y--;
-        sStorage->movingMonSprite->pos1.y++;
+        (*sStorage->shiftMonSpritePtr)->y--;
+        sStorage->movingMonSprite->y++;
     }
 
-    (*sStorage->shiftMonSpritePtr)->pos2.x = gSineTable[sStorage->shiftTimer * 8] / 16;
-    sStorage->movingMonSprite->pos2.x = -(gSineTable[sStorage->shiftTimer * 8] / 16);
+    (*sStorage->shiftMonSpritePtr)->x2 = gSineTable[sStorage->shiftTimer * 8] / 16;
+    sStorage->movingMonSprite->x2 = -(gSineTable[sStorage->shiftTimer * 8] / 16);
     if (sStorage->shiftTimer == 8)
     {
         sStorage->movingMonSprite->oam.priority = (*sStorage->shiftMonSpritePtr)->oam.priority;
@@ -5050,7 +5050,7 @@ static void SetReleaseMon(u8 mode, u8 position)
 
 static bool8 TryHideReleaseMonSprite(void)
 {
-    if (*sStorage->releaseMonSpritePtr == NULL 
+    if (*sStorage->releaseMonSpritePtr == NULL
     || (*sStorage->releaseMonSpritePtr)->invisible)
         return FALSE;
 
@@ -5097,8 +5097,8 @@ static void SetMovingMonPriority(u8 priority)
 
 static void SpriteCB_HeldMon(struct Sprite *sprite)
 {
-    sprite->pos1.x = sStorage->cursorSprite->pos1.x;
-    sprite->pos1.y = sStorage->cursorSprite->pos1.y + sStorage->cursorSprite->pos2.y + 4;
+    sprite->x = sStorage->cursorSprite->x;
+    sprite->y = sStorage->cursorSprite->y + sStorage->cursorSprite->y2 + 4;
 }
 
 static u16 TryLoadMonIconTiles(u16 species)
@@ -5512,7 +5512,7 @@ static void InitBoxTitle(u8 boxId)
     sStorage->boxTitleAltPalOffset = 0x10e + 16 * tagIndex;
     sStorage->wallpaperPalBits |= 0x10000 << tagIndex;
 
-    StringCopyPadded(sStorage->boxTitleText, GetBoxNamePtr(boxId), 0, 8);
+    StringCopyPadded(sStorage->boxTitleText, GetBoxNamePtr(boxId), 0, BOX_NAME_LENGTH);
     DrawTextWindowAndBufferTiles(sStorage->boxTitleText, sStorage->boxTitleTiles, 0, 0, 2);
     LoadSpriteSheet(&spriteSheet);
     x = GetBoxTitleBaseX(GetBoxNamePtr(boxId));
@@ -5557,7 +5557,7 @@ static void CreateIncomingBoxTitle(u8 boxId, s8 direction)
         template.paletteTag = PALTAG_BOX_TITLE;
     }
 
-    StringCopyPadded(sStorage->boxTitleText, GetBoxNamePtr(boxId), 0, 8);
+    StringCopyPadded(sStorage->boxTitleText, GetBoxNamePtr(boxId), 0, BOX_NAME_LENGTH);
     DrawTextWindowAndBufferTiles(sStorage->boxTitleText, sStorage->boxTitleTiles, 0, 0, 2);
     LoadSpriteSheet(&spriteSheet);
     LoadPalette(sBoxTitleColors[GetBoxWallpaper(boxId)], palOffset, sizeof(sBoxTitleColors[0]));
@@ -5598,7 +5598,7 @@ static void SpriteCB_IncomingBoxTitle(struct Sprite *sprite)
 {
     if (sprite->sIncomingDelay != 0)
         sprite->sIncomingDelay--;
-    else if ((sprite->pos1.x += sprite->sSpeed) == sprite->sIncomingX)
+    else if ((sprite->x += sprite->sSpeed) == sprite->sIncomingX)
         sprite->callback = SpriteCallbackDummy;
 }
 
@@ -5610,8 +5610,8 @@ static void SpriteCB_OutgoingBoxTitle(struct Sprite *sprite)
     }
     else
     {
-        sprite->pos1.x += sprite->sSpeed;
-        sprite->sOutgoingX = sprite->pos1.x + sprite->pos2.x;
+        sprite->x += sprite->sSpeed;
+        sprite->sOutgoingX = sprite->x + sprite->x2;
         if (sprite->sOutgoingX < 64 || sprite->sOutgoingX > DISPLAY_WIDTH + 16)
             DestroySprite(sprite);
     }
@@ -5676,7 +5676,7 @@ static void StartBoxScrollArrowsSlide(s8 direction)
 
     for (i = 0; i < 2; i++)
     {
-        sStorage->arrowSprites[i]->pos2.x = 0;
+        sStorage->arrowSprites[i]->x2 = 0;
         sStorage->arrowSprites[i]->sState = 2;
     }
     if (direction < 0)
@@ -5704,8 +5704,8 @@ static void StopBoxScrollArrowsSlide(void)
 
     for (i = 0; i < 2; i++)
     {
-        sStorage->arrowSprites[i]->pos1.x = 136 * i + 92;
-        sStorage->arrowSprites[i]->pos2.x = 0;
+        sStorage->arrowSprites[i]->x = 136 * i + 92;
+        sStorage->arrowSprites[i]->x2 = 0;
         sStorage->arrowSprites[i]->invisible = FALSE;
     }
     AnimateBoxScrollArrows(TRUE);
@@ -5740,17 +5740,17 @@ static void SpriteCB_Arrow(struct Sprite *sprite)
     switch (sprite->sState)
     {
     case 0:
-        sprite->pos2.x = 0;
+        sprite->x2 = 0;
         break;
     case 1:
         if (++sprite->sTimer > 3)
         {
             sprite->sTimer = 0;
-            sprite->pos2.x += sprite->sSpeed;
+            sprite->x2 += sprite->sSpeed;
             if (++sprite->data[2] > 5)
             {
                 sprite->data[2] = 0;
-                sprite->pos2.x = 0;
+                sprite->x2 = 0;
             }
         }
         break;
@@ -5758,18 +5758,18 @@ static void SpriteCB_Arrow(struct Sprite *sprite)
         sprite->sState = 3;
         break;
     case 3:
-        sprite->pos1.x -= sStorage->scrollSpeed;
-        if (sprite->pos1.x <= 72 || sprite->pos1.x >= DISPLAY_WIDTH + 8)
+        sprite->x -= sStorage->scrollSpeed;
+        if (sprite->x <= 72 || sprite->x >= DISPLAY_WIDTH + 8)
             sprite->invisible = TRUE;
         if (--sprite->sTimer == 0)
         {
-            sprite->pos1.x = sprite->data[2];
+            sprite->x = sprite->data[2];
             sprite->invisible = FALSE;
             sprite->sState = 4;
         }
         break;
     case 4:
-        sprite->pos1.x -= sStorage->scrollSpeed;
+        sprite->x -= sStorage->scrollSpeed;
         break;
     }
 }
@@ -5901,35 +5901,35 @@ static bool8 UpdateCursorPos(void)
         // Update position toward target
         sStorage->cursorNewX += sStorage->cursorSpeedX;
         sStorage->cursorNewY += sStorage->cursorSpeedY;
-        sStorage->cursorSprite->pos1.x = sStorage->cursorNewX >> 8;
-        sStorage->cursorSprite->pos1.y = sStorage->cursorNewY >> 8;
-        
+        sStorage->cursorSprite->x = sStorage->cursorNewX >> 8;
+        sStorage->cursorSprite->y = sStorage->cursorNewY >> 8;
+
         // Limit cursor on right
-        if (sStorage->cursorSprite->pos1.x > DISPLAY_WIDTH + 16)
+        if (sStorage->cursorSprite->x > DISPLAY_WIDTH + 16)
         {
-            tmp = sStorage->cursorSprite->pos1.x - (DISPLAY_WIDTH + 16);
-            sStorage->cursorSprite->pos1.x = tmp + 64;
+            tmp = sStorage->cursorSprite->x - (DISPLAY_WIDTH + 16);
+            sStorage->cursorSprite->x = tmp + 64;
         }
 
         // Limit cursor on left
-        if (sStorage->cursorSprite->pos1.x < 64)
+        if (sStorage->cursorSprite->x < 64)
         {
-            tmp = 64 - sStorage->cursorSprite->pos1.x;
-            sStorage->cursorSprite->pos1.x = DISPLAY_WIDTH + 16 - tmp;
+            tmp = 64 - sStorage->cursorSprite->x;
+            sStorage->cursorSprite->x = DISPLAY_WIDTH + 16 - tmp;
         }
 
         // Limit cursor on bottom
-        if (sStorage->cursorSprite->pos1.y > DISPLAY_HEIGHT + 16)
+        if (sStorage->cursorSprite->y > DISPLAY_HEIGHT + 16)
         {
-            tmp = sStorage->cursorSprite->pos1.y - (DISPLAY_HEIGHT + 16);
-            sStorage->cursorSprite->pos1.y = tmp - 16;
+            tmp = sStorage->cursorSprite->y - (DISPLAY_HEIGHT + 16);
+            sStorage->cursorSprite->y = tmp - 16;
         }
 
         // Limit cursor on top
-        if (sStorage->cursorSprite->pos1.y < -16)
+        if (sStorage->cursorSprite->y < -16)
         {
-            tmp = -16 - sStorage->cursorSprite->pos1.y;
-            sStorage->cursorSprite->pos1.y = DISPLAY_HEIGHT + 16 - tmp;
+            tmp = -16 - sStorage->cursorSprite->y;
+            sStorage->cursorSprite->y = DISPLAY_HEIGHT + 16 - tmp;
         }
 
         // Cursor flips vertically when moving on/off the top buttons
@@ -5939,8 +5939,8 @@ static bool8 UpdateCursorPos(void)
     else
     {
         // Time is up for cursor movement, make sure it's exactly at target
-        sStorage->cursorSprite->pos1.x = sStorage->cursorTargetX;
-        sStorage->cursorSprite->pos1.y = sStorage->cursorTargetY;
+        sStorage->cursorSprite->x = sStorage->cursorTargetX;
+        sStorage->cursorSprite->y = sStorage->cursorTargetY;
         DoCursorNewPosUpdate();
     }
 
@@ -5973,26 +5973,26 @@ static void InitCursorMove(void)
     switch (sStorage->cursorVerticalWrap)
     {
         default: // No wrap
-            yDistance = sStorage->cursorTargetY - sStorage->cursorSprite->pos1.y;
+            yDistance = sStorage->cursorTargetY - sStorage->cursorSprite->y;
             break;
         case -1: // Wrap from top to bottom
-            yDistance = sStorage->cursorTargetY - 192 - sStorage->cursorSprite->pos1.y;
+            yDistance = sStorage->cursorTargetY - 192 - sStorage->cursorSprite->y;
             break;
         case 1: // Wrap from bottom to top
-            yDistance = sStorage->cursorTargetY + 192 - sStorage->cursorSprite->pos1.y;
+            yDistance = sStorage->cursorTargetY + 192 - sStorage->cursorSprite->y;
             break;
     }
 
     switch (sStorage->cursorHorizontalWrap)
     {
         default: // No Wrap
-            xDistance = sStorage->cursorTargetX - sStorage->cursorSprite->pos1.x;
+            xDistance = sStorage->cursorTargetX - sStorage->cursorSprite->x;
             break;
         case -1: // Wrap from left to right
-            xDistance = sStorage->cursorTargetX - 192 - sStorage->cursorSprite->pos1.x;
+            xDistance = sStorage->cursorTargetX - 192 - sStorage->cursorSprite->x;
             break;
         case 1: // Wrap from right to left
-            xDistance = sStorage->cursorTargetX + 192 - sStorage->cursorSprite->pos1.x;
+            xDistance = sStorage->cursorTargetX + 192 - sStorage->cursorSprite->x;
             break;
     }
 
@@ -6000,8 +6000,8 @@ static void InitCursorMove(void)
     xDistance <<= 8;
     sStorage->cursorSpeedX = xDistance / sStorage->cursorMoveSteps;
     sStorage->cursorSpeedY = yDistance / sStorage->cursorMoveSteps;
-    sStorage->cursorNewX = sStorage->cursorSprite->pos1.x << 8;
-    sStorage->cursorNewY = sStorage->cursorSprite->pos1.y << 8;
+    sStorage->cursorNewX = sStorage->cursorSprite->x << 8;
+    sStorage->cursorNewY = sStorage->cursorSprite->y << 8;
 }
 
 static void SetCursorPosition(u8 newCursorArea, u8 newCursorPosition)
@@ -6277,13 +6277,13 @@ static bool8 MultiMonPlaceChange_Up(void)
 
 static bool8 MonPlaceChange_CursorDown(void)
 {
-    switch (sStorage->cursorSprite->pos2.y)
+    switch (sStorage->cursorSprite->y2)
     {
     default:
-        sStorage->cursorSprite->pos2.y++;
+        sStorage->cursorSprite->y2++;
         break;
     case 0:
-        sStorage->cursorSprite->pos2.y++;
+        sStorage->cursorSprite->y2++;
         break;
     case 8: // Cursor has reached bottom
         return FALSE;
@@ -6294,12 +6294,12 @@ static bool8 MonPlaceChange_CursorDown(void)
 
 static bool8 MonPlaceChange_CursorUp(void)
 {
-    switch (sStorage->cursorSprite->pos2.y)
+    switch (sStorage->cursorSprite->y2)
     {
     case 0: // Cursor has reached top
         return FALSE;
     default:
-        sStorage->cursorSprite->pos2.y--;
+        sStorage->cursorSprite->y2--;
         break;
     }
 
@@ -6525,7 +6525,7 @@ static void GetRestrictedReleaseMoves(u16 *moves)
     for (i = 0; i < ARRAY_COUNT(sRestrictedReleaseMoves); i++)
     {
         if (sRestrictedReleaseMoves[i].mapGroup == MAP_GROUPS_COUNT
-        || (sRestrictedReleaseMoves[i].mapGroup == gSaveBlock1Ptr->location.mapGroup 
+        || (sRestrictedReleaseMoves[i].mapGroup == gSaveBlock1Ptr->location.mapGroup
          && sRestrictedReleaseMoves[i].mapNum == gSaveBlock1Ptr->location.mapNum))
         {
             *moves = sRestrictedReleaseMoves[i].move;
@@ -6589,7 +6589,7 @@ static bool32 AtLeastThreeUsableMons(void)
 {
     s32 i, j;
     s32 count = (sIsMonBeingMoved != FALSE);
-    
+
     // Check party for usable Pokémon
     for (j = 0; j < PARTY_SIZE; j++)
     {
@@ -6660,7 +6660,7 @@ static s8 RunCanReleaseMon(void)
         for (i = 0; i < IN_BOX_COUNT; i++)
         {
             knownMoves = GetAndCopyBoxMonDataAt(sStorage->releaseCheckBoxId, sStorage->releaseCheckBoxPos, MON_DATA_KNOWN_MOVES, (u8*)sStorage->restrictedMoveList);
-            if (knownMoves != 0 && !(sStorage->releaseBoxId == sStorage->releaseCheckBoxId 
+            if (knownMoves != 0 && !(sStorage->releaseBoxId == sStorage->releaseCheckBoxId
                                   && sStorage->releaseBoxPos == sStorage->releaseCheckBoxPos))
             {
                 // Found PC Pokémon with restricted move, clear move from list
@@ -7537,7 +7537,7 @@ static u8 HandleInput_OnButtons(void)
             sStorage->cursorVerticalWrap = -1;
             if (sCursorPosition == 0)
                 cursorPosition = IN_BOX_COUNT - 1 - 5;
-            else 
+            else
                 cursorPosition = IN_BOX_COUNT - 1;
             sStorage->cursorFlipTimer = 1;
             break;
@@ -7570,7 +7570,7 @@ static u8 HandleInput_OnButtons(void)
         // Button was pressed, determine which
         if (JOY_NEW(A_BUTTON))
             return (cursorPosition == 0) ? INPUT_SHOW_PARTY : INPUT_CLOSE_BOX;
-        
+
         if (JOY_NEW(B_BUTTON))
             return INPUT_PRESSED_B;
 
@@ -7743,8 +7743,8 @@ static bool8 SetMenuTexts_Item(void)
 
 static void SpriteCB_CursorShadow(struct Sprite *sprite)
 {
-    sprite->pos1.x = sStorage->cursorSprite->pos1.x;
-    sprite->pos1.y = sStorage->cursorSprite->pos1.y + 20;
+    sprite->x = sStorage->cursorSprite->x;
+    sprite->y = sStorage->cursorSprite->y + 20;
 }
 
 static void CreateCursorSprites(void)
@@ -8084,9 +8084,9 @@ static void RemoveMenu(void)
 
 //------------------------------------------------------------------------------
 //  SECTION: MultiMove
-// 
+//
 //  The functions below handle moving and selecting multiple Pokémon at once.
-//  The icon sprites are moved to bg 0, and this bg is manipulated to move 
+//  The icon sprites are moved to bg 0, and this bg is manipulated to move
 //  them as a group.
 //------------------------------------------------------------------------------
 
@@ -8644,7 +8644,7 @@ static bool8 MultiMove_CanPlaceSelection(void)
 
 //------------------------------------------------------------------------------
 //  SECTION: Item mode
-// 
+//
 //  The functions below handle the Move Items mode
 //------------------------------------------------------------------------------
 
@@ -8950,7 +8950,7 @@ static void MoveItemFromCursorToBag(void)
 
 // The party menu is being closed, if the cursor is on
 // a Pokémon that has a held item make sure it slides
-// up along with the closing menu. 
+// up along with the closing menu.
 static void MoveHeldItemWithPartyMenu(void)
 {
     s32 i;
@@ -8960,7 +8960,7 @@ static void MoveHeldItemWithPartyMenu(void)
 
     for (i = 0; i < MAX_ITEM_ICONS; i++)
     {
-        if (sStorage->itemIcons[i].active 
+        if (sStorage->itemIcons[i].active
          && sStorage->itemIcons[i].area == CURSOR_AREA_IN_PARTY)
             SetItemIconCallback(i, ITEM_CB_HIDE_PARTY, CURSOR_AREA_IN_HAND, 0);
     }
@@ -8974,10 +8974,10 @@ static bool8 IsItemIconAnimActive(void)
     {
         if (sStorage->itemIcons[i].active)
         {
-            if (!sStorage->itemIcons[i].sprite->affineAnimEnded 
+            if (!sStorage->itemIcons[i].sprite->affineAnimEnded
               && sStorage->itemIcons[i].sprite->affineAnimBeginning)
                 return TRUE;
-            if (sStorage->itemIcons[i].sprite->callback != SpriteCallbackDummy 
+            if (sStorage->itemIcons[i].sprite->callback != SpriteCallbackDummy
              && sStorage->itemIcons[i].sprite->callback != SpriteCB_ItemIcon_SetPosToCursor)
                 return TRUE;
         }
@@ -8993,7 +8993,7 @@ static bool8 IsMovingItem(void)
     {
         for (i = 0; i < MAX_ITEM_ICONS; i++)
         {
-            if (sStorage->itemIcons[i].active 
+            if (sStorage->itemIcons[i].active
              && sStorage->itemIcons[i].area == CURSOR_AREA_IN_HAND)
                 return TRUE;
         }
@@ -9079,20 +9079,20 @@ static void SetItemIconPosition(u8 id, u8 cursorArea, u8 cursorPos)
     case CURSOR_AREA_IN_BOX:
         x = cursorPos % IN_BOX_COLUMNS;
         y = cursorPos / IN_BOX_COLUMNS;
-        sStorage->itemIcons[id].sprite->pos1.x = (24 * x) + 112;
-        sStorage->itemIcons[id].sprite->pos1.y = (24 * y) + 56;
+        sStorage->itemIcons[id].sprite->x = (24 * x) + 112;
+        sStorage->itemIcons[id].sprite->y = (24 * y) + 56;
         sStorage->itemIcons[id].sprite->oam.priority = 2;
         break;
     case CURSOR_AREA_IN_PARTY:
         if (cursorPos == 0)
         {
-            sStorage->itemIcons[id].sprite->pos1.x = 116;
-            sStorage->itemIcons[id].sprite->pos1.y = 76;
+            sStorage->itemIcons[id].sprite->x = 116;
+            sStorage->itemIcons[id].sprite->y = 76;
         }
         else
         {
-            sStorage->itemIcons[id].sprite->pos1.x = 164;
-            sStorage->itemIcons[id].sprite->pos1.y = 24 * (cursorPos - 1) + 28;
+            sStorage->itemIcons[id].sprite->x = 164;
+            sStorage->itemIcons[id].sprite->y = 24 * (cursorPos - 1) + 28;
         }
         sStorage->itemIcons[id].sprite->oam.priority = 1;
         break;
@@ -9281,8 +9281,8 @@ static void SpriteCB_ItemIcon_ToHand(struct Sprite *sprite)
     switch (sprite->sState)
     {
     case 0:
-        sprite->data[1] = sprite->pos1.x << 4;
-        sprite->data[2] = sprite->pos1.y << 4;
+        sprite->data[1] = sprite->x << 4;
+        sprite->data[2] = sprite->y << 4;
         sprite->data[3] = 10;
         sprite->data[4] = 21;
         sprite->data[5] = 0;
@@ -9290,8 +9290,8 @@ static void SpriteCB_ItemIcon_ToHand(struct Sprite *sprite)
     case 1:
         sprite->data[1] -= sprite->data[3];
         sprite->data[2] -= sprite->data[4];
-        sprite->pos1.x = sprite->data[1] >> 4;
-        sprite->pos1.y = sprite->data[2] >> 4;
+        sprite->x = sprite->data[1] >> 4;
+        sprite->y = sprite->data[2] >> 4;
         if (++sprite->data[5] > 11)
             sprite->callback = SpriteCB_ItemIcon_SetPosToCursor;
         break;
@@ -9300,8 +9300,8 @@ static void SpriteCB_ItemIcon_ToHand(struct Sprite *sprite)
 
 static void SpriteCB_ItemIcon_SetPosToCursor(struct Sprite *sprite)
 {
-    sprite->pos1.x = sStorage->cursorSprite->pos1.x + 4;
-    sprite->pos1.y = sStorage->cursorSprite->pos1.y + sStorage->cursorSprite->pos2.y + 8;
+    sprite->x = sStorage->cursorSprite->x + 4;
+    sprite->y = sStorage->cursorSprite->y + sStorage->cursorSprite->y2 + 8;
     sprite->oam.priority = sStorage->cursorSprite->oam.priority;
 }
 
@@ -9310,8 +9310,8 @@ static void SpriteCB_ItemIcon_ToMon(struct Sprite *sprite)
     switch (sprite->sState)
     {
     case 0:
-        sprite->data[1] = sprite->pos1.x << 4;
-        sprite->data[2] = sprite->pos1.y << 4;
+        sprite->data[1] = sprite->x << 4;
+        sprite->data[2] = sprite->y << 4;
         sprite->data[3] = 10;
         sprite->data[4] = 21;
         sprite->data[5] = 0;
@@ -9319,8 +9319,8 @@ static void SpriteCB_ItemIcon_ToMon(struct Sprite *sprite)
     case 1:
         sprite->data[1] += sprite->data[3];
         sprite->data[2] += sprite->data[4];
-        sprite->pos1.x = sprite->data[1] >> 4;
-        sprite->pos1.y = sprite->data[2] >> 4;
+        sprite->x = sprite->data[1] >> 4;
+        sprite->y = sprite->data[2] >> 4;
         if (++sprite->data[5] > 11)
         {
             SetItemIconPosition(GetItemIconIdxBySprite(sprite), sprite->sCursorArea, sprite->sCursorPos);
@@ -9335,8 +9335,8 @@ static void SpriteCB_ItemIcon_SwapToHand(struct Sprite *sprite)
     switch (sprite->sState)
     {
     case 0:
-        sprite->data[1] = sprite->pos1.x << 4;
-        sprite->data[2] = sprite->pos1.y << 4;
+        sprite->data[1] = sprite->x << 4;
+        sprite->data[2] = sprite->y << 4;
         sprite->data[3] = 10;
         sprite->data[4] = 21;
         sprite->data[5] = 0;
@@ -9344,13 +9344,13 @@ static void SpriteCB_ItemIcon_SwapToHand(struct Sprite *sprite)
     case 1:
         sprite->data[1] -= sprite->data[3];
         sprite->data[2] -= sprite->data[4];
-        sprite->pos1.x = sprite->data[1] >> 4;
-        sprite->pos1.y = sprite->data[2] >> 4;
-        sprite->pos2.x = gSineTable[sprite->data[5] * 8] >> 4;
+        sprite->x = sprite->data[1] >> 4;
+        sprite->y = sprite->data[2] >> 4;
+        sprite->x2 = gSineTable[sprite->data[5] * 8] >> 4;
         if (++sprite->data[5] > 11)
         {
             SetItemIconPosition(GetItemIconIdxBySprite(sprite), sprite->sCursorArea, sprite->sCursorPos);
-            sprite->pos2.x = 0;
+            sprite->x2 = 0;
             sprite->callback = SpriteCB_ItemIcon_SetPosToCursor;
         }
         break;
@@ -9362,8 +9362,8 @@ static void SpriteCB_ItemIcon_SwapToMon(struct Sprite *sprite)
     switch (sprite->sState)
     {
     case 0:
-        sprite->data[1] = sprite->pos1.x << 4;
-        sprite->data[2] = sprite->pos1.y << 4;
+        sprite->data[1] = sprite->x << 4;
+        sprite->data[2] = sprite->y << 4;
         sprite->data[3] = 10;
         sprite->data[4] = 21;
         sprite->data[5] = 0;
@@ -9371,14 +9371,14 @@ static void SpriteCB_ItemIcon_SwapToMon(struct Sprite *sprite)
     case 1:
         sprite->data[1] += sprite->data[3];
         sprite->data[2] += sprite->data[4];
-        sprite->pos1.x = sprite->data[1] >> 4;
-        sprite->pos1.y = sprite->data[2] >> 4;
-        sprite->pos2.x = -(gSineTable[sprite->data[5] * 8] >> 4);
+        sprite->x = sprite->data[1] >> 4;
+        sprite->y = sprite->data[2] >> 4;
+        sprite->x2 = -(gSineTable[sprite->data[5] * 8] >> 4);
         if (++sprite->data[5] > 11)
         {
             SetItemIconPosition(GetItemIconIdxBySprite(sprite), sprite->sCursorArea, sprite->sCursorPos);
             sprite->callback = SpriteCallbackDummy;
-            sprite->pos2.x = 0;
+            sprite->x2 = 0;
         }
         break;
     }
@@ -9386,8 +9386,8 @@ static void SpriteCB_ItemIcon_SwapToMon(struct Sprite *sprite)
 
 static void SpriteCB_ItemIcon_HideParty(struct Sprite *sprite)
 {
-    sprite->pos1.y -= 8;
-    if (sprite->pos1.y + sprite->pos2.y < -16)
+    sprite->y -= 8;
+    if (sprite->y + sprite->y2 < -16)
     {
         sprite->callback = SpriteCallbackDummy;
         SetItemIconActive(GetItemIconIdxBySprite(sprite), FALSE);
@@ -9822,13 +9822,13 @@ struct
     u16 height;
 } static const sTilemapDimensions[][4] =
 {
-    {
+    [BG_TYPE_NORMAL] = {
         { 256,  256},
         { 512,  256},
         { 256,  512},
         { 512,  512},
     },
-    {
+    [BG_TYPE_AFFINE] = {
         { 128,  128},
         { 256,  256},
         { 512,  512},
@@ -9853,7 +9853,7 @@ static void TilemapUtil_SetMap(u8 id, u8 bg, const void *tilemap, u16 width, u16
     bgType = GetBgAttribute(bg, BG_ATTR_TYPE);
     sTilemapUtil[id].altWidth = sTilemapDimensions[bgType][bgScreenSize].width;
     sTilemapUtil[id].altHeight = sTilemapDimensions[bgType][bgScreenSize].height;
-    if (bgType != 0)
+    if (bgType != BG_TYPE_NORMAL)
         sTilemapUtil[id].tileSize = 1;
     else
         sTilemapUtil[id].tileSize = 2;
@@ -9988,7 +9988,7 @@ static void TilemapUtil_Draw(u8 id)
 
 //------------------------------------------------------------------------------
 //  SECTION: UnkUtil
-// 
+//
 //  Some data transfer utility that goes functionally unused.
 //  It gets initialized with UnkUtil_Init, and run every vblank in Pokémon
 //  Storage with UnkUtil_Run, but neither of the Add functions are ever used,
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 31505b7c9..dc009bbff 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -3627,7 +3627,7 @@ static void PrintMoveDetails(u16 move)
     FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
     if (move != MOVE_NONE)
     {
-        if (sMonSummaryScreen->currPageIndex == SUMMARY_MODE_BOX)
+        if (sMonSummaryScreen->currPageIndex == PSS_PAGE_BATTLE_MOVES)
         {
             PrintMovePowerAndAccuracy(move);
             PrintTextOnWindow(windowId, gMoveDescriptionPointers[move - 1], 6, 1, 0, 0);
@@ -3772,8 +3772,8 @@ static void SetTypeSpritePosAndPal(u8 typeId, u8 x, u8 y, u8 spriteArrayId)
     struct Sprite *sprite = &gSprites[sMonSummaryScreen->spriteIds[spriteArrayId]];
     StartSpriteAnim(sprite, typeId);
     sprite->oam.paletteNum = sMoveTypeToOamPaletteNum[typeId];
-    sprite->pos1.x = x + 16;
-    sprite->pos1.y = y + 8;
+    sprite->x = x + 16;
+    sprite->y = y + 8;
     SetSpriteInvisibility(spriteArrayId, FALSE);
 }
 
@@ -3999,8 +3999,8 @@ static void CreateMonMarkingsSprite(struct Pokemon *mon)
     if (sprite != NULL)
     {
         StartSpriteAnim(sprite, GetMonData(mon, MON_DATA_MARKINGS));
-        sMonSummaryScreen->markingsSprite->pos1.x = 60;
-        sMonSummaryScreen->markingsSprite->pos1.y = 26;
+        sMonSummaryScreen->markingsSprite->x = 60;
+        sMonSummaryScreen->markingsSprite->y = 26;
         sMonSummaryScreen->markingsSprite->oam.priority = 1;
     }
 }
@@ -4087,9 +4087,9 @@ static void SpriteCb_MoveSelector(struct Sprite *sprite)
     }
 
     if (sprite->data[0] == SPRITE_ARR_ID_MOVE_SELECTOR1)
-        sprite->pos2.y = sMonSummaryScreen->firstMoveIndex * 16;
+        sprite->y2 = sMonSummaryScreen->firstMoveIndex * 16;
     else
-        sprite->pos2.y = sMonSummaryScreen->secondMoveIndex * 16;
+        sprite->y2 = sMonSummaryScreen->secondMoveIndex * 16;
 }
 
 static void DestroyMoveSelectorSprites(u8 firstArrayId)
diff --git a/src/pokenav.c b/src/pokenav.c
index 881411b9e..925560543 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -52,7 +52,7 @@ static void CB2_InitPokenavForTutorial(void);
 // TODO: Use MENU ids
 const struct PokenavCallbacks PokenavMenuCallbacks[15] =
 {
-    [POKENAV_MAIN_MENU - POKENAV_MENU_IDS_START] = 
+    [POKENAV_MAIN_MENU - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_MainMenuCursorOnMap,
         .callback = GetMenuHandlerCallback,
@@ -62,7 +62,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeMenuHandlerSubstruct1,
         .free2 = FreeMenuHandlerSubstruct2,
     },
-    [POKENAV_MAIN_MENU_CURSOR_ON_MAP - POKENAV_MENU_IDS_START] = 
+    [POKENAV_MAIN_MENU_CURSOR_ON_MAP - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_MainMenuCursorOnMap,
         .callback = GetMenuHandlerCallback,
@@ -72,7 +72,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeMenuHandlerSubstruct1,
         .free2 = FreeMenuHandlerSubstruct2,
     },
-    [POKENAV_CONDITION_MENU - POKENAV_MENU_IDS_START] = 
+    [POKENAV_CONDITION_MENU - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_ConditionMenu,
         .callback = GetMenuHandlerCallback,
@@ -82,7 +82,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeMenuHandlerSubstruct1,
         .free2 = FreeMenuHandlerSubstruct2,
     },
-    [POKENAV_CONDITION_SEARCH_MENU - POKENAV_MENU_IDS_START] = 
+    [POKENAV_CONDITION_SEARCH_MENU - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_ConditionSearchMenu,
         .callback = GetMenuHandlerCallback,
@@ -92,7 +92,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeMenuHandlerSubstruct1,
         .free2 = FreeMenuHandlerSubstruct2,
     },
-    [POKENAV_MAIN_MENU_CURSOR_ON_MATCH_CALL - POKENAV_MENU_IDS_START] = 
+    [POKENAV_MAIN_MENU_CURSOR_ON_MATCH_CALL - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_MainMenuCursorOnMatchCall,
         .callback = GetMenuHandlerCallback,
@@ -102,7 +102,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeMenuHandlerSubstruct1,
         .free2 = FreeMenuHandlerSubstruct2,
     },
-    [POKENAV_MAIN_MENU_CURSOR_ON_RIBBONS - POKENAV_MENU_IDS_START] = 
+    [POKENAV_MAIN_MENU_CURSOR_ON_RIBBONS - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_MainMenuCursorOnRibbons,
         .callback = GetMenuHandlerCallback,
@@ -112,7 +112,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeMenuHandlerSubstruct1,
         .free2 = FreeMenuHandlerSubstruct2,
     },
-    [POKENAV_REGION_MAP - POKENAV_MENU_IDS_START] = 
+    [POKENAV_REGION_MAP - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_RegionMap,
         .callback = GetRegionMapCallback,
@@ -122,7 +122,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeRegionMapSubstruct1,
         .free2 = FreeRegionMapSubstruct2,
     },
-    [POKENAV_CONDITION_PARTY - POKENAV_MENU_IDS_START] = 
+    [POKENAV_CONDITION_PARTY - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_PartyCondition,
         .callback = GetPartyConditionCallback,
@@ -132,7 +132,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreePartyConditionSubstruct1,
         .free2 = FreePartyConditionSubstruct2,
     },
-    [POKENAV_CONDITION_SEARCH_RESULTS - POKENAV_MENU_IDS_START] = 
+    [POKENAV_CONDITION_SEARCH_RESULTS - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_ConditionSearch,
         .callback = GetConditionSearchResultsCallback,
@@ -142,7 +142,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeSearchResultSubstruct1,
         .free2 = FreeSearchResultSubstruct2,
     },
-    [POKENAV_CONDITION_GRAPH_FROM_SEARCH - POKENAV_MENU_IDS_START] = 
+    [POKENAV_CONDITION_GRAPH_FROM_SEARCH - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_ConditionGraphFromSearch,
         .callback = GetPartyConditionCallback,
@@ -152,7 +152,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreePartyConditionSubstruct1,
         .free2 = FreePartyConditionSubstruct2,
     },
-    [POKENAV_RETURN_CONDITION_SEARCH - POKENAV_MENU_IDS_START] = 
+    [POKENAV_RETURN_CONDITION_SEARCH - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_ReturnToMonSearchList,
         .callback = GetConditionSearchResultsCallback,
@@ -162,7 +162,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeSearchResultSubstruct1,
         .free2 = FreeSearchResultSubstruct2,
     },
-    [POKENAV_MATCH_CALL - POKENAV_MENU_IDS_START] = 
+    [POKENAV_MATCH_CALL - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_MatchCall,
         .callback = GetMatchCallCallback,
@@ -172,7 +172,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeMatchCallSubstruct1,
         .free2 = FreeMatchCallSubstruct2,
     },
-    [POKENAV_RIBBONS_MON_LIST - POKENAV_MENU_IDS_START] = 
+    [POKENAV_RIBBONS_MON_LIST - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_MonRibbonList,
         .callback = GetRibbonsMonListCallback,
@@ -182,7 +182,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeRibbonsMonList1,
         .free2 = FreeRibbonsMonList2,
     },
-    [POKENAV_RIBBONS_SUMMARY_SCREEN - POKENAV_MENU_IDS_START] = 
+    [POKENAV_RIBBONS_SUMMARY_SCREEN - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_RibbonsSummaryMenu,
         .callback = GetRibbonsSummaryMenuCallback,
@@ -192,7 +192,7 @@ const struct PokenavCallbacks PokenavMenuCallbacks[15] =
         .free1 = FreeRibbonsSummaryScreen1,
         .free2 = FreeRibbonsSummaryScreen2,
     },
-    [POKENAV_RIBBONS_RETURN_TO_MON_LIST - POKENAV_MENU_IDS_START] = 
+    [POKENAV_RIBBONS_RETURN_TO_MON_LIST - POKENAV_MENU_IDS_START] =
     {
         .init = PokenavCallback_Init_RibbonsMonListFromSummary,
         .callback = GetRibbonsMonListCallback,
diff --git a/src/pokenav_conditions_1.c b/src/pokenav_conditions_1.c
index 61b289ae1..d2424629a 100644
--- a/src/pokenav_conditions_1.c
+++ b/src/pokenav_conditions_1.c
@@ -217,7 +217,7 @@ u8 SwitchConditionSummaryIndex(u8 moveUp)
     }
 
     isNotLastMon = (monListPtr->currIndex != ((IsConditionMenuSearchMode() != 0) ? monListPtr->listCount : monListPtr->listCount - 1));
-    
+
     if (!wasNotLastMon)
         return PARTY_CONDITION_FUNC_NO_TRANSITION;
     else if (!isNotLastMon)
@@ -435,7 +435,7 @@ void CopyMonNameGenderLocation(s16 id, u8 arg1)
         if (boxId == TOTAL_BOXES_COUNT)
             CopyStringLeftAlignedToConditionData(&structPtr->searchLocBuffer[arg1][5], gText_InParty, 8);
         else
-            CopyStringLeftAlignedToConditionData(&structPtr->searchLocBuffer[arg1][5], GetBoxNamePtr(boxId), 8);
+            CopyStringLeftAlignedToConditionData(&structPtr->searchLocBuffer[arg1][5], GetBoxNamePtr(boxId), BOX_NAME_LENGTH);
     }
     else
     {
diff --git a/src/pokenav_conditions_2.c b/src/pokenav_conditions_2.c
index dc07dd44c..ef3792063 100644
--- a/src/pokenav_conditions_2.c
+++ b/src/pokenav_conditions_2.c
@@ -30,7 +30,7 @@ const u32 gUnknown_08623228[] = INCBIN_U32("graphics/pokenav/8623228.4bpp.lz");
 const u32 sConditionGraph_Tilemap[] = INCBIN_U32("graphics/pokenav/862323C.bin.lz");
 const u16 sConditionGraphMonMarkingsPal[] = INCBIN_U16("graphics/pokenav/8623338.gbapal");
 
-const struct BgTemplate sPartyConditionBgTemplates[3] = 
+const struct BgTemplate sPartyConditionBgTemplates[3] =
 {
     {
         .bg = 1,
@@ -61,7 +61,7 @@ const struct BgTemplate sPartyConditionBgTemplates[3] =
     }
 };
 
-const struct WindowTemplate sMonNameGenderWindowTemplate = 
+const struct WindowTemplate sMonNameGenderWindowTemplate =
 {
     .bg = 1,
     .tilemapLeft = 13,
@@ -72,7 +72,7 @@ const struct WindowTemplate sMonNameGenderWindowTemplate =
     .baseBlock = 2
 };
 
-const struct WindowTemplate sConditionGraphListIdWindowTemplate = 
+const struct WindowTemplate sConditionGraphListIdWindowTemplate =
 {
     .bg = 1,
     .tilemapLeft = 1,
@@ -83,7 +83,7 @@ const struct WindowTemplate sConditionGraphListIdWindowTemplate =
     .baseBlock = 0x36
 };
 
-const struct WindowTemplate sUnusedWindowTemplate1 = 
+const struct WindowTemplate sUnusedWindowTemplate1 =
 {
     .bg = 1,
     .tilemapLeft = 1,
@@ -94,7 +94,7 @@ const struct WindowTemplate sUnusedWindowTemplate1 =
     .baseBlock = 0x44
 };
 
-const struct WindowTemplate sUnusedWindowTemplate2 = 
+const struct WindowTemplate sUnusedWindowTemplate2 =
 {
     .bg = 1,
     .tilemapLeft = 13,
@@ -672,8 +672,8 @@ void CreateMonMarkingsOrPokeballIndicators(void)
         BufferMonMarkingsMenuTiles();
         sprite = CreateMonMarkingAllCombosSprite(0x69, 0x69, sConditionGraphMonMarkingsPal);
         sprite->oam.priority = 3;
-        sprite->pos1.x = 192;
-        sprite->pos1.y = 32;
+        sprite->x = 192;
+        sprite->y = 32;
         sprite->callback = MonMarkingsCallback;
         structPtr->monMarksSprite = sprite;
         PokenavFillPalette(IndexOfSpritePaletteTag(0x69), 0);
@@ -792,7 +792,7 @@ void FreePartyConditionSubstruct2(void)
 void MonPicGfxSpriteCallback(struct Sprite *sprite)
 {
     struct Pokenav7Struct *structPtr = GetSubstructPtr(POKENAV_SUBSTRUCT_MON_MARK_MENU);
-    sprite->pos1.x = structPtr->monTransitionX + 38;
+    sprite->x = structPtr->monTransitionX + 38;
 }
 
 void CreateConditionMonPic(u8 id)
diff --git a/src/pokenav_conditions_3.c b/src/pokenav_conditions_3.c
index 712be6f69..219bb5a07 100644
--- a/src/pokenav_conditions_3.c
+++ b/src/pokenav_conditions_3.c
@@ -102,7 +102,7 @@ static const struct BgTemplate sConditionSearchResultBgTemplates[] =
     }
 };
 
-static const LoopedTask sSearchResultLoopTaskFuncs[] = 
+static const LoopedTask sSearchResultLoopTaskFuncs[] =
 {
     [CONDITION_SEARCH_FUNC_NONE]       = NULL,
     [CONDITION_SEARCH_FUNC_MOVE_UP]    = LoopedTask_MoveSearchListCursorUp,
@@ -113,7 +113,7 @@ static const LoopedTask sSearchResultLoopTaskFuncs[] =
     [CONDITION_SEARCH_FUNC_SELECT_MON] = LoopedTask_SelectSearchResult
 };
 
-static const struct WindowTemplate sSearchResultListMenuWindowTemplate = 
+static const struct WindowTemplate sSearchResultListMenuWindowTemplate =
 {
     .bg = 1,
     .tilemapLeft = 1,
@@ -664,7 +664,7 @@ static void PrintSearchResultListMenuItems(struct PokenavSub8 *searchList)
 static void InitConditionSearchListMenuTemplate(void)
 {
     struct PokenavListTemplate template;
-    
+
     template.list.monList = GetSearchResultsMonDataList();
     template.count = GetSearchResultsMonListCount();
     template.unk8 = 4;
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c
index 9c4d15286..88c1773a6 100644
--- a/src/pokenav_main_menu.c
+++ b/src/pokenav_main_menu.c
@@ -604,7 +604,7 @@ static void CleanupPokenavMainMenuResources(void)
 static void SpriteCB_SpinningPokenav(struct Sprite *sprite)
 {
     // If the background starts scrolling, follow it.
-    sprite->pos2.y = (GetBgY(0) / 256u) * -1;
+    sprite->y2 = (GetBgY(0) / 256u) * -1;
 }
 
 struct Sprite *PauseSpinningPokenavSprite(void)
@@ -619,8 +619,8 @@ void ResumeSpinningPokenavSprite(void)
 {
     struct PokenavMainMenuResources *structPtr = GetSubstructPtr(POKENAV_SUBSTRUCT_MAIN_MENU);
 
-    structPtr->spinningPokenav->pos1.x = 220;
-    structPtr->spinningPokenav->pos1.y = 12;
+    structPtr->spinningPokenav->x = 220;
+    structPtr->spinningPokenav->y = 12;
     structPtr->spinningPokenav->callback = SpriteCB_SpinningPokenav;
     structPtr->spinningPokenav->invisible = FALSE;
     structPtr->spinningPokenav->oam.priority = 0;
@@ -640,13 +640,13 @@ static void InitHoennMapHeaderSprites(void)
         spriteId = CreateSprite(&sPokenavLeftHeaderHoennMapSpriteTemplate, 0, 0, 1);
         structPtr->leftHeaderSprites[i] = &gSprites[spriteId];
         structPtr->leftHeaderSprites[i]->invisible = TRUE;
-        structPtr->leftHeaderSprites[i]->pos2.x = i * 64;
+        structPtr->leftHeaderSprites[i]->x2 = i * 64;
 
         spriteId = CreateSprite(&sUnknown_0861FB44, 0, 0, 2);
         structPtr->submenuLeftHeaderSprites[i] = &gSprites[spriteId];
         structPtr->submenuLeftHeaderSprites[i]->invisible = TRUE;
-        structPtr->submenuLeftHeaderSprites[i]->pos2.x = i * 32;
-        structPtr->submenuLeftHeaderSprites[i]->pos2.y = 18;
+        structPtr->submenuLeftHeaderSprites[i]->x2 = i * 32;
+        structPtr->submenuLeftHeaderSprites[i]->y2 = 18;
         structPtr->submenuLeftHeaderSprites[i]->oam.tileNum += (i * 8) + 64;
     }
 }
@@ -686,9 +686,9 @@ static void LoadLeftHeaderGfxForMenu(u32 menuGfxId)
     structPtr->leftHeaderSprites[1]->oam.tileNum = GetSpriteTileStartByTag(2) + sPokenavMenuLeftHeaderSpriteSheets[menuGfxId].size;
 
     if (menuGfxId == POKENAV_GFX_MAP_MENU_ZOOMED_OUT || menuGfxId == POKENAV_GFX_MAP_MENU_ZOOMED_IN)
-        structPtr->leftHeaderSprites[1]->pos2.x = 56;
+        structPtr->leftHeaderSprites[1]->x2 = 56;
     else
-        structPtr->leftHeaderSprites[1]->pos2.x = 64;
+        structPtr->leftHeaderSprites[1]->x2 = 64;
 }
 
 static void LoadLeftHeaderGfxForSubMenu(u32 menuGfxId)
@@ -762,7 +762,7 @@ static void ShowLeftHeaderSprites(u32 startY, bool32 isOnRightSide)
 
     for (i = 0; i < (s32)ARRAY_COUNT(structPtr->leftHeaderSprites); i++)
     {
-        structPtr->leftHeaderSprites[i]->pos1.y = startY;
+        structPtr->leftHeaderSprites[i]->y = startY;
         MoveLeftHeader(structPtr->leftHeaderSprites[i], start, end, 12);
     }
 }
@@ -779,7 +779,7 @@ static void ShowLeftHeaderSubmenuSprites(u32 startY, bool32 isOnRightSide)
 
     for (i = 0; i < (s32)ARRAY_COUNT(structPtr->submenuLeftHeaderSprites); i++)
     {
-        structPtr->submenuLeftHeaderSprites[i]->pos1.y = startY;
+        structPtr->submenuLeftHeaderSprites[i]->y = startY;
         MoveLeftHeader(structPtr->submenuLeftHeaderSprites[i], start, end, 12);
     }
 }
@@ -818,7 +818,7 @@ static void HideLeftHeaderSubmenuSprites(bool32 isOnRightSide)
 
 static void MoveLeftHeader(struct Sprite *sprite, s32 startX, s32 endX, s32 duration)
 {
-    sprite->pos1.x = startX;
+    sprite->x = startX;
     sprite->data[0] = startX * 16;
     sprite->data[1] = (endX - startX) * 16 / duration;
     sprite->data[2] = duration;
@@ -832,15 +832,15 @@ static void SpriteCB_MoveLeftHeader(struct Sprite *sprite)
     {
         sprite->data[2]--;
         sprite->data[0] += sprite->data[1];
-        sprite->pos1.x = sprite->data[0] >> 4;
-        if (sprite->pos1.x < -16 || sprite->pos1.x > 256)
+        sprite->x = sprite->data[0] >> 4;
+        if (sprite->x < -16 || sprite->x > 256)
             sprite->invisible = TRUE;
         else
             sprite->invisible = FALSE;
     }
     else
     {
-        sprite->pos1.x = sprite->data[7];
+        sprite->x = sprite->data[7];
         sprite->callback = SpriteCallbackDummy;
     }
 }
diff --git a/src/pokenav_match_call_1.c b/src/pokenav_match_call_1.c
index fb44aaa87..e9d4c0b67 100755
--- a/src/pokenav_match_call_1.c
+++ b/src/pokenav_match_call_1.c
@@ -38,16 +38,16 @@ static bool32 sub_81CB1D0(void);
 
 #include "data/text/match_call_messages.h"
 
-static const u8 sMatchCallOptionsNoCheckPage[] = 
+static const u8 sMatchCallOptionsNoCheckPage[] =
 {
-    MATCH_CALL_OPTION_CALL, 
+    MATCH_CALL_OPTION_CALL,
     MATCH_CALL_OPTION_CANCEL
 };
 
-static const u8 sMatchCallOptionsHasCheckPage[] = 
+static const u8 sMatchCallOptionsHasCheckPage[] =
 {
-    MATCH_CALL_OPTION_CALL, 
-    MATCH_CALL_OPTION_CHECK, 
+    MATCH_CALL_OPTION_CALL,
+    MATCH_CALL_OPTION_CHECK,
     MATCH_CALL_OPTION_CANCEL
 };
 
diff --git a/src/pokenav_match_call_2.c b/src/pokenav_match_call_2.c
index 398e174d8..e3f0bb6ef 100755
--- a/src/pokenav_match_call_2.c
+++ b/src/pokenav_match_call_2.c
@@ -119,7 +119,7 @@ static const u16 gUnknown_08622700[] = INCBIN_U16("graphics/pokenav/8622700.gbap
 static const u16 gUnknown_08622720[] = INCBIN_U16("graphics/pokenav/pokeball_matchcall.gbapal");
 static const u32 gUnknown_08622760[] = INCBIN_U32("graphics/pokenav/pokeball_matchcall.4bpp.lz");
 
-const struct BgTemplate sMatchCallBgTemplates[3] = 
+const struct BgTemplate sMatchCallBgTemplates[3] =
 {
     {
         .bg = 1,
@@ -150,7 +150,7 @@ const struct BgTemplate sMatchCallBgTemplates[3] =
     }
 };
 
-static const LoopedTask sMatchCallLoopTaskFuncs[] = 
+static const LoopedTask sMatchCallLoopTaskFuncs[] =
 {
     [POKENAV_MC_FUNC_NONE]                = NULL,
     [POKENAV_MC_FUNC_DOWN]                = MatchCallListCursorDown,
@@ -170,7 +170,7 @@ static const LoopedTask sMatchCallLoopTaskFuncs[] =
     [POKENAV_MC_FUNC_EXIT]                = ExitMatchCall
 };
 
-static const struct WindowTemplate sMatchCallLocationWindowTemplate = 
+static const struct WindowTemplate sMatchCallLocationWindowTemplate =
 {
     .bg = 2,
     .tilemapLeft = 0,
@@ -181,7 +181,7 @@ static const struct WindowTemplate sMatchCallLocationWindowTemplate =
     .baseBlock = 16
 };
 
-static const struct WindowTemplate sMatchCallInfoBoxWindowTemplate = 
+static const struct WindowTemplate sMatchCallInfoBoxWindowTemplate =
 {
     .bg = 2,
     .tilemapLeft = 0,
@@ -192,7 +192,7 @@ static const struct WindowTemplate sMatchCallInfoBoxWindowTemplate =
     .baseBlock = 38
 };
 
-static const u8 *const sMatchCallOptionTexts[MATCH_CALL_OPTION_COUNT] = 
+static const u8 *const sMatchCallOptionTexts[MATCH_CALL_OPTION_COUNT] =
 {
     [MATCH_CALL_OPTION_CALL]   = gText_Call,
     [MATCH_CALL_OPTION_CHECK]  = gText_Check,
@@ -202,7 +202,7 @@ static const u8 *const sMatchCallOptionTexts[MATCH_CALL_OPTION_COUNT] =
 // The series of 5 dots that appear when someone is called with Match Call
 static const u8 sText_CallingDots[] = _("·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·{PAUSE 0x04}·\p");
 
-static const struct WindowTemplate sCallMsgBoxWindowTemplate = 
+static const struct WindowTemplate sCallMsgBoxWindowTemplate =
 {
     .bg = 1,
     .tilemapLeft = 1,
@@ -213,17 +213,17 @@ static const struct WindowTemplate sCallMsgBoxWindowTemplate =
     .baseBlock = 10
 };
 
-const struct CompressedSpriteSheet gUnknown_08622810[1] = 
+const struct CompressedSpriteSheet gUnknown_08622810[1] =
 {
     {gUnknown_086226B8, 0x40, 7}
 };
 
-const struct SpritePalette gUnknown_08622818[2] = 
+const struct SpritePalette gUnknown_08622818[2] =
 {
     {gUnknown_08622698, 12}
 };
 
-static const struct OamData sOptionsCursorOamData = 
+static const struct OamData sOptionsCursorOamData =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -235,7 +235,7 @@ static const struct OamData sOptionsCursorOamData =
     .tileNum = 0,
     .priority = 1,
     .paletteNum = 0,
-}; 
+};
 
 static const struct SpriteTemplate sOptionsCursorSpriteTemplate =
 {
@@ -248,7 +248,7 @@ static const struct SpriteTemplate sOptionsCursorSpriteTemplate =
     .callback = SpriteCB_OptionsCursor,
 };
 
-static const struct OamData sTrainerPicOamData = 
+static const struct OamData sTrainerPicOamData =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -1006,7 +1006,7 @@ static void PrintMatchCallLocation(struct Pokenav4Struct *state, int arg1)
         GetMapName(mapName, mapSec, 0);
     else
         StringCopy(mapName, gText_Unknown);
-    
+
     x = GetStringCenterAlignXOffset(7, mapName, 88);
     FillWindowPixelBuffer(state->locWindowId, PIXEL_FILL(1));
     AddTextPrinterParameterized(state->locWindowId, 7, mapName, x, 1, 0, NULL);
@@ -1074,9 +1074,9 @@ static void DrawMsgBoxForMatchCallMsg(struct Pokenav4Struct *state)
     PutWindowTilemap(state->msgBoxWindowId);
     CopyWindowToVram(state->msgBoxWindowId, 3);
     sprite = PauseSpinningPokenavSprite();
-    sprite->pos1.x = 24;
-    sprite->pos1.y = 112;
-    sprite->pos2.y = 0;
+    sprite->x = 24;
+    sprite->y = 112;
+    sprite->y2 = 0;
 }
 
 static void DrawMsgBoxForCloseByMsg(struct Pokenav4Struct *state)
@@ -1200,7 +1200,7 @@ static void CloseMatchCallSelectOptionsWindow(struct Pokenav4Struct *state)
 
 static void UpdateCursorGfxPos(struct Pokenav4Struct *state, int top)
 {
-    state->optionsCursorSprite->pos2.y = top * 16;
+    state->optionsCursorSprite->y2 = top * 16;
 }
 
 void SpriteCB_OptionsCursor(struct Sprite *sprite)
@@ -1208,7 +1208,7 @@ void SpriteCB_OptionsCursor(struct Sprite *sprite)
     if (++sprite->data[0] > 3)
     {
         sprite->data[0] = 0;
-        sprite->pos2.x = (sprite->pos2.x + 1) & 0x7;
+        sprite->x2 = (sprite->x2 + 1) & 0x7;
     }
 }
 
@@ -1251,16 +1251,16 @@ static void SpriteCB_TrainerPicSlideOnscreen(struct Sprite *sprite)
     case 0:
         if (CheckForSpaceForDma3Request(sprite->data[7]) != -1)
         {
-            sprite->pos2.x = -80;
+            sprite->x2 = -80;
             sprite->invisible = FALSE;
             sprite->data[0]++;
         }
         break;
     case 1:
-        sprite->pos2.x += 8;
-        if (sprite->pos2.x >= 0)
+        sprite->x2 += 8;
+        if (sprite->x2 >= 0)
         {
-            sprite->pos2.x = 0;
+            sprite->x2 = 0;
             sprite->callback = SpriteCallbackDummy;
         }
         break;
@@ -1269,8 +1269,8 @@ static void SpriteCB_TrainerPicSlideOnscreen(struct Sprite *sprite)
 
 static void SpriteCB_TrainerPicSlideOffscreen(struct Sprite *sprite)
 {
-    sprite->pos2.x -= 8;
-    if (sprite->pos2.x <= -80)
+    sprite->x2 -= 8;
+    if (sprite->x2 <= -80)
     {
         sprite->invisible = TRUE;
         sprite->callback = SpriteCallbackDummy;
diff --git a/src/pokenav_match_call_data.c b/src/pokenav_match_call_data.c
index 6610dcb80..46ce43d4c 100644
--- a/src/pokenav_match_call_data.c
+++ b/src/pokenav_match_call_data.c
@@ -658,38 +658,38 @@ static void (*const sMatchCall_GetNameAndDescFunctions[])(match_call_t, const u8
 };
 
 static const struct MatchCallCheckPageOverride sCheckPageOverrides[] = {
-    { 
-        .idx = MC_HEADER_STEVEN,  
-        .facilityClass = FACILITY_CLASS_STEVEN,  
-        .flag = 0xFFFF,                     
-        .flavorTexts = { 
-            [CHECK_PAGE_STRATEGY] = gText_MatchCallSteven_Strategy, 
-            [CHECK_PAGE_POKEMON]  = gText_MatchCallSteven_Pokemon, 
-            [CHECK_PAGE_INTRO_1]  = gText_MatchCallSteven_Intro1_BeforeMeteorFallsBattle, 
-            [CHECK_PAGE_INTRO_2]  = gText_MatchCallSteven_Intro2_BeforeMeteorFallsBattle 
-        } 
+    {
+        .idx = MC_HEADER_STEVEN,
+        .facilityClass = FACILITY_CLASS_STEVEN,
+        .flag = 0xFFFF,
+        .flavorTexts = {
+            [CHECK_PAGE_STRATEGY] = gText_MatchCallSteven_Strategy,
+            [CHECK_PAGE_POKEMON]  = gText_MatchCallSteven_Pokemon,
+            [CHECK_PAGE_INTRO_1]  = gText_MatchCallSteven_Intro1_BeforeMeteorFallsBattle,
+            [CHECK_PAGE_INTRO_2]  = gText_MatchCallSteven_Intro2_BeforeMeteorFallsBattle
+        }
     },
-    { 
-        .idx = MC_HEADER_STEVEN,  
-        .facilityClass = FACILITY_CLASS_STEVEN,  
-        .flag = FLAG_DEFEATED_MOSSDEEP_GYM, 
-        .flavorTexts = { 
-            [CHECK_PAGE_STRATEGY] = gText_MatchCallSteven_Strategy, 
-            [CHECK_PAGE_POKEMON]  = gText_MatchCallSteven_Pokemon, 
-            [CHECK_PAGE_INTRO_1]  = gText_MatchCallSteven_Intro1_AfterMeteorFallsBattle, 
-            [CHECK_PAGE_INTRO_2]  = gText_MatchCallSteven_Intro2_AfterMeteorFallsBattle 
-        } 
+    {
+        .idx = MC_HEADER_STEVEN,
+        .facilityClass = FACILITY_CLASS_STEVEN,
+        .flag = FLAG_DEFEATED_MOSSDEEP_GYM,
+        .flavorTexts = {
+            [CHECK_PAGE_STRATEGY] = gText_MatchCallSteven_Strategy,
+            [CHECK_PAGE_POKEMON]  = gText_MatchCallSteven_Pokemon,
+            [CHECK_PAGE_INTRO_1]  = gText_MatchCallSteven_Intro1_AfterMeteorFallsBattle,
+            [CHECK_PAGE_INTRO_2]  = gText_MatchCallSteven_Intro2_AfterMeteorFallsBattle
+        }
     },
-    { 
-        .idx = MC_HEADER_BRENDAN, 
-        .facilityClass = FACILITY_CLASS_BRENDAN, 
-        .flag = 0xFFFF,                     
+    {
+        .idx = MC_HEADER_BRENDAN,
+        .facilityClass = FACILITY_CLASS_BRENDAN,
+        .flag = 0xFFFF,
         .flavorTexts = MCFLAVOR(Brendan)
     },
-    { 
-        .idx = MC_HEADER_MAY,     
-        .facilityClass = FACILITY_CLASS_MAY,     
-        .flag = 0xFFFF,                     
+    {
+        .idx = MC_HEADER_MAY,
+        .facilityClass = FACILITY_CLASS_MAY,
+        .flag = 0xFFFF,
         .flavorTexts = MCFLAVOR(May)
     }
 };
@@ -896,12 +896,12 @@ static bool32 MatchCall_HasCheckPage_Wally(match_call_t matchCall)
     return TRUE;
 }
 
-static bool32 MatchCall_HasCheckPage_Rival(match_call_t matchCall) 
+static bool32 MatchCall_HasCheckPage_Rival(match_call_t matchCall)
 {
     return FALSE;
 }
 
-static bool32 MatchCall_HasCheckPage_Birch(match_call_t matchCall) 
+static bool32 MatchCall_HasCheckPage_Birch(match_call_t matchCall)
 {
     return FALSE;
 }
diff --git a/src/pokenav_match_call_ui.c b/src/pokenav_match_call_ui.c
index b3f9331b7..ba495245b 100644
--- a/src/pokenav_match_call_ui.c
+++ b/src/pokenav_match_call_ui.c
@@ -741,11 +741,11 @@ void PrintMatchCallFieldNames(struct PokenavSub17Substruct *list, u32 fieldId)
 static void PrintMatchCallFlavorText(struct MatchCallWindowState *a0, struct PokenavSub17Substruct *list, u32 checkPageEntry)
 {
     // lines 1, 3, and 5 are the field names printed by PrintMatchCallFieldNames
-    static const u8 lineOffsets[CHECK_PAGE_ENTRY_COUNT] = 
+    static const u8 lineOffsets[CHECK_PAGE_ENTRY_COUNT] =
     {
-        [CHECK_PAGE_STRATEGY] = 2, 
-        [CHECK_PAGE_POKEMON]  = 4, 
-        [CHECK_PAGE_INTRO_1]  = 6, 
+        [CHECK_PAGE_STRATEGY] = 2,
+        [CHECK_PAGE_POKEMON]  = 4,
+        [CHECK_PAGE_INTRO_1]  = 6,
         [CHECK_PAGE_INTRO_2]  = 7
     };
 
@@ -890,7 +890,7 @@ void ToggleMatchCallArrows(struct PokenavSub17Substruct *list, bool32 shouldHide
 void SpriteCB_MatchCallRightArrow(struct Sprite *sprite)
 {
     struct PokenavSub17 *structPtr = GetSubstructPtr(POKENAV_SUBSTRUCT_MATCH_CALL_LIST);
-    sprite->pos2.y = structPtr->unk888.selectedIndexOffset << 4;
+    sprite->y2 = structPtr->unk888.selectedIndexOffset << 4;
 }
 
 void SpriteCB_MatchCallDownArrow(struct Sprite *sprite)
@@ -907,7 +907,7 @@ void SpriteCB_MatchCallDownArrow(struct Sprite *sprite)
         sprite->data[0] = 0;
         offset = (sprite->data[1] + 1) & 7;
         sprite->data[1] = offset;
-        sprite->pos2.y = offset;
+        sprite->y2 = offset;
     }
 }
 
@@ -925,7 +925,7 @@ void SpriteCB_MatchCallUpArrow(struct Sprite *sprite)
         sprite->data[0] = 0;
         offset = (sprite->data[1] + 1) & 7;
         sprite->data[1] = offset;
-        sprite->pos2.y = -1 * offset;
+        sprite->y2 = -1 * offset;
     }
 }
 
diff --git a/src/pokenav_menu_handler_2.c b/src/pokenav_menu_handler_2.c
index 8cd2a6b2f..5f6c4460a 100644
--- a/src/pokenav_menu_handler_2.c
+++ b/src/pokenav_menu_handler_2.c
@@ -118,7 +118,7 @@ static const struct BgTemplate sPokenavMainMenuBgTemplates[] = {
     }
 };
 
-static const LoopedTask sMenuHandlerLoopTaskFuncs[] = 
+static const LoopedTask sMenuHandlerLoopTaskFuncs[] =
 {
     [POKENAV_MENU_FUNC_NONE]                  = NULL,
     [POKENAV_MENU_FUNC_MOVE_CURSOR]           = LoopedTask_MoveMenuCursor,
@@ -179,31 +179,31 @@ struct OptionsLabelGfx
 
 static const struct OptionsLabelGfx sPokenavMenuOptionLabelGfx[POKENAV_MENU_TYPE_COUNT] =
 {
-    [POKENAV_MENU_TYPE_DEFAULT] = 
+    [POKENAV_MENU_TYPE_DEFAULT] =
     {
         .yStart = 42,
         .deltaY = 20,
         {sOptionsLabelGfx_RegionMap, sOptionsLabelGfx_Condition, sOptionsLabelGfx_SwitchOff}
     },
-    [POKENAV_MENU_TYPE_UNLOCK_MC] = 
+    [POKENAV_MENU_TYPE_UNLOCK_MC] =
     {
         .yStart = 42,
         .deltaY = 20,
         {sOptionsLabelGfx_RegionMap, sOptionsLabelGfx_Condition, sOptionsLabelGfx_MatchCall, sOptionsLabelGfx_SwitchOff}
     },
-    [POKENAV_MENU_TYPE_UNLOCK_MC_RIBBONS] = 
+    [POKENAV_MENU_TYPE_UNLOCK_MC_RIBBONS] =
     {
         .yStart = 42,
         .deltaY = 20,
         {sOptionsLabelGfx_RegionMap, sOptionsLabelGfx_Condition, sOptionsLabelGfx_MatchCall, sOptionsLabelGfx_Ribbons, sOptionsLabelGfx_SwitchOff}
     },
-    [POKENAV_MENU_TYPE_CONDITION] = 
+    [POKENAV_MENU_TYPE_CONDITION] =
     {
         .yStart = 56,
         .deltaY = 20,
         {sOptionsLabelGfx_Party, sOptionsLabelGfx_Search, sOptionsLabelGfx_Cancel}
     },
-    [POKENAV_MENU_TYPE_CONDITION_SEARCH] = 
+    [POKENAV_MENU_TYPE_CONDITION_SEARCH] =
     {
         .yStart = 40,
         .deltaY = 16,
@@ -341,7 +341,7 @@ bool32 OpenPokenavMenuInitial(void)
 
     if (state == NULL)
         return FALSE;
-    
+
     state->pokenavAlreadyOpen = FALSE;
     return TRUE;
 }
@@ -781,7 +781,7 @@ static void CreateMenuOptionSprites(void)
         {
             u8 spriteId = CreateSprite(&sMenuOptionSpriteTemplate, 0x8c, 20 * i + 40, 3);
             unk->iconSprites[i][j] = &gSprites[spriteId];
-            gSprites[spriteId].pos2.x = 32 * j;
+            gSprites[spriteId].x2 = 32 * j;
         }
     }
 }
@@ -822,9 +822,9 @@ static void DrawOptionLabelGfx(const u16 *const *tiles, s32 yPos, s32 deltaY)
                 unk->iconSprites[i][j]->oam.tileNum = (*tiles)[0] + sp04 + 8 * j;
                 unk->iconSprites[i][j]->oam.paletteNum = IndexOfSpritePaletteTag((*tiles)[1] + 4);
                 unk->iconSprites[i][j]->invisible = TRUE;
-                unk->iconSprites[i][j]->pos1.y = yPos;
-                unk->iconSprites[i][j]->pos1.x = 0x8c;
-                unk->iconSprites[i][j]->pos2.x = 32 * j;
+                unk->iconSprites[i][j]->y = yPos;
+                unk->iconSprites[i][j]->x = 0x8c;
+                unk->iconSprites[i][j]->x2 = 32 * j;
             }
             unk->iconVisible[i] = TRUE;
         }
@@ -935,7 +935,7 @@ static void SetMenuOptionGfxParamsInactive(struct Sprite ** sprites, s32 x, s32
 
     for (i = 0; i < 4; i++)
     {
-        (*sprites)->pos1.x = x;
+        (*sprites)->x = x;
         (*sprites)->data[0] = a3;
         (*sprites)->data[1] = 16 * (a2 - x) / a3;
         (*sprites)->data[2] = 16 * x;
@@ -987,11 +987,11 @@ static void sub_81CA474(struct Sprite * sprite)
     if (sprite->data[0] != -1)
     {
         sprite->data[2] += sprite->data[1];
-        sprite->pos1.x = sprite->data[2] >> 4;
+        sprite->x = sprite->data[2] >> 4;
     }
     else
     {
-        sprite->pos1.x = sprite->data[7];
+        sprite->x = sprite->data[7];
         sprite->callback = SpriteCallbackDummy;
     }
 }
@@ -1007,8 +1007,8 @@ static void sub_81CA4AC(struct Sprite * sprite)
             StartSpriteAffineAnim(sprite, 1);
             sprite->data[1]++;
             sprite->data[2] = 0x100;
-            sprite->pos1.x += sprite->pos2.x;
-            sprite->pos2.x = 0;
+            sprite->x += sprite->x2;
+            sprite->x2 = 0;
         }
         else
         {
@@ -1019,16 +1019,16 @@ static void sub_81CA4AC(struct Sprite * sprite)
             switch (sprite->data[7])
             {
             case 0:
-                sprite->pos2.x = -r1 * 3;
+                sprite->x2 = -r1 * 3;
                 break;
             case 1:
-                sprite->pos2.x = -r1;
+                sprite->x2 = -r1;
                 break;
             case 2:
-                sprite->pos2.x = r1;
+                sprite->x2 = r1;
                 break;
             case 3:
-                sprite->pos2.x = r1 * 3;
+                sprite->x2 = r1 * 3;
                 break;
             }
             if (sprite->affineAnimEnded)
diff --git a/src/pokenav_region_map.c b/src/pokenav_region_map.c
index 3d53bc98a..13a7030da 100755
--- a/src/pokenav_region_map.c
+++ b/src/pokenav_region_map.c
@@ -79,7 +79,7 @@ static const u32 sRegionMapCityZoomTiles_Gfx[] = INCBIN_U32("graphics/pokenav/zo
 
 #include "data/region_map/city_map_tilemaps.h"
 
-static const struct BgTemplate sRegionMapBgTemplates[3] = 
+static const struct BgTemplate sRegionMapBgTemplates[3] =
 {
     {
         .bg = 1,
@@ -110,7 +110,7 @@ static const struct BgTemplate sRegionMapBgTemplates[3] =
     },
 };
 
-static const LoopedTask sRegionMapLoopTaskFuncs[] = 
+static const LoopedTask sRegionMapLoopTaskFuncs[] =
 {
     [POKENAV_MAP_FUNC_NONE]         = NULL,
     [POKENAV_MAP_FUNC_CURSOR_MOVED] = LoopedTask_UpdateInfoAfterCursorMove,
@@ -119,18 +119,18 @@ static const LoopedTask sRegionMapLoopTaskFuncs[] =
     [POKENAV_MAP_FUNC_EXIT]         = LoopedTask_ExitRegionMap
 };
 
-static const struct CompressedSpriteSheet sCityZoomTextSpriteSheet[1] = 
+static const struct CompressedSpriteSheet sCityZoomTextSpriteSheet[1] =
 {
     {gRegionMapCityZoomText_Gfx, 0x800, 6}
 };
 
-static const struct SpritePalette sCityZoomTilesSpritePalette[] = 
+static const struct SpritePalette sCityZoomTilesSpritePalette[] =
 {
     {gRegionMapCityZoomTiles_Pal, 11},
     {}
 };
 
-static const struct WindowTemplate sMapSecInfoWindowTemplate = 
+static const struct WindowTemplate sMapSecInfoWindowTemplate =
 {
     .bg = 1,
     .tilemapLeft = 17,
@@ -143,7 +143,7 @@ static const struct WindowTemplate sMapSecInfoWindowTemplate =
 
 #include "data/region_map/city_map_entries.h"
 
-const struct OamData sCityZoomTextSprite_OamData = 
+const struct OamData sCityZoomTextSprite_OamData =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -592,7 +592,7 @@ static void Task_ChangeBgYForZoom(u8 taskId)
             ChangeBgY(1, 0, 0);
             DestroyTask(taskId);
         }
-        
+
         UpdateCityZoomTextPosition();
     }
     else
@@ -727,7 +727,7 @@ static void UpdateCityZoomTextPosition(void)
     struct Pokenav5Struct_2 *state = GetSubstructPtr(POKENAV_SUBSTRUCT_REGION_MAP_ZOOM);
     int y = 132 - (GetBgY(1) >> 8);
     for (i = 0; i < (int)ARRAY_COUNT(state->cityZoomTextSprites); i++)
-        state->cityZoomTextSprites[i]->pos1.y = y;
+        state->cityZoomTextSprites[i]->y = y;
 }
 
 static void SetCityZoomTextInvisibility(bool32 invisible)
diff --git a/src/pokenav_ribbons_2.c b/src/pokenav_ribbons_2.c
index 8a9061ace..bf1886ed0 100644
--- a/src/pokenav_ribbons_2.c
+++ b/src/pokenav_ribbons_2.c
@@ -32,7 +32,7 @@ enum
 #define PALTAG_RIBBON_ICONS_5 19
 
 #define RIBBONS_PER_ROW 9
-#define GIFT_RIBBON_ROW (1 + (FIRST_GIFT_RIBBON / RIBBONS_PER_ROW)) // Gift ribbons start on a new row after the normal ribbons. 
+#define GIFT_RIBBON_ROW (1 + (FIRST_GIFT_RIBBON / RIBBONS_PER_ROW)) // Gift ribbons start on a new row after the normal ribbons.
 #define GIFT_RIBBON_START_POS (RIBBONS_PER_ROW * GIFT_RIBBON_ROW)
 
 #define MON_SPRITE_X_ON  40
@@ -828,11 +828,11 @@ static void PrintRibbonNameAndDescription(struct PokenavSub14 *structPtr)
     }
     else
     {
-        // ribbonId here is one of the 'gift' ribbon slots, used to read 
+        // ribbonId here is one of the 'gift' ribbon slots, used to read
         // its actual value from giftRibbons to determine which specific
         // gift ribbon it is
         ribbonId = gSaveBlock1Ptr->giftRibbons[ribbonId - FIRST_GIFT_RIBBON];
-        
+
         // If 0, this gift ribbon slot is unoccupied
         if (ribbonId == 0)
             return;
@@ -962,7 +962,7 @@ static u16 DrawRibbonsMonFrontPic(s32 x, s32 y)
     u32 personality, otId;
 
     GetMonSpeciesPersonalityOtId(&species, &personality, &otId);
-    spriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, MON_SPRITE_X_ON, MON_SPRITE_Y, 15, 0xFFFF);
+    spriteId = CreateMonPicSprite_HandleDeoxys(species, otId, personality, TRUE, MON_SPRITE_X_ON, MON_SPRITE_Y, 15, TAG_NONE);
     gSprites[spriteId].oam.priority = 0;
     return spriteId;
 }
@@ -997,7 +997,7 @@ static void StartMonSpriteSlide(struct Sprite *sprite, s32 startX, s32 destX, s3
 {
     u32 delta = destX - startX;
 
-    sprite->pos1.x = startX;
+    sprite->x = startX;
     sprite->sCurrX = startX << 4;
     sprite->sMoveIncr = (delta << 4) / time;
     sprite->sTime = time;
@@ -1012,15 +1012,15 @@ static void SpriteCB_MonSpriteSlide(struct Sprite *sprite)
     {
         sprite->sTime--;
         sprite->sCurrX += sprite->sMoveIncr;
-        sprite->pos1.x = sprite->sCurrX >> 4;
-        if (sprite->pos1.x <= MON_SPRITE_X_OFF)
+        sprite->x = sprite->sCurrX >> 4;
+        if (sprite->x <= MON_SPRITE_X_OFF)
             sprite->invisible = TRUE;
         else
             sprite->invisible = FALSE;
     }
     else
     {
-        sprite->pos1.x = sprite->sDestX;
+        sprite->x = sprite->sDestX;
         sprite->callback = SpriteCallbackDummy;
     }
 }
@@ -1232,8 +1232,8 @@ static void UpdateAndZoomInSelectedRibbon(struct PokenavSub14 *structPtr)
     s32 x = (position % RIBBONS_PER_ROW) * 16 + 96;
     s32 y = (position / RIBBONS_PER_ROW) * 16 + 40;
 
-    structPtr->bigRibbonSprite->pos1.x = x;
-    structPtr->bigRibbonSprite->pos1.y = y;
+    structPtr->bigRibbonSprite->x = x;
+    structPtr->bigRibbonSprite->y = y;
 
     // Set new selected ribbon's gfx data
     ribbonId = GetRibbonId();
diff --git a/src/post_battle_event_funcs.c b/src/post_battle_event_funcs.c
index 081a40218..8c209f908 100644
--- a/src/post_battle_event_funcs.c
+++ b/src/post_battle_event_funcs.c
@@ -64,7 +64,7 @@ int GameClear(void)
     {
         IncrementGameStat(GAME_STAT_RECEIVED_RIBBONS);
         FlagSet(FLAG_SYS_RIBBON_GET);
-        
+
         for (i = 1; i < 6; i++)
         {
             if (ribbonCounts[i].count > ribbonCounts[0].count)
diff --git a/src/rayquaza_scene.c b/src/rayquaza_scene.c
index 24e76e1c9..642fe6233 100644
--- a/src/rayquaza_scene.c
+++ b/src/rayquaza_scene.c
@@ -1433,34 +1433,34 @@ static void SpriteCB_DuoFightPre_Groudon(struct Sprite *sprite)
     s16 *data = sprite->data;
     data[5]++;
     data[5] &= 0x1F;
-    if (data[5] == 0 && sprite->pos1.x != 72)
+    if (data[5] == 0 && sprite->x != 72)
     {
-        sprite->pos1.x--;
-        gSprites[sprite->sGroudonBodySpriteId].pos1.x--;
-        gSprites[sGroudonShoulderSpriteId].pos1.x--;
-        gSprites[sGroudonClawSpriteId].pos1.x--;
+        sprite->x--;
+        gSprites[sprite->sGroudonBodySpriteId].x--;
+        gSprites[sGroudonShoulderSpriteId].x--;
+        gSprites[sGroudonClawSpriteId].x--;
     }
 
     switch (sprite->animCmdIndex)
     {
     case 0:
-        gSprites[sGroudonShoulderSpriteId].pos2.x = 0;
-        gSprites[sGroudonShoulderSpriteId].pos2.y = 0;
-        gSprites[sGroudonClawSpriteId].pos2.x = 0;
-        gSprites[sGroudonClawSpriteId].pos2.y = 0;
+        gSprites[sGroudonShoulderSpriteId].x2 = 0;
+        gSprites[sGroudonShoulderSpriteId].y2 = 0;
+        gSprites[sGroudonClawSpriteId].x2 = 0;
+        gSprites[sGroudonClawSpriteId].y2 = 0;
         break;
     case 1:
     case 3:
-        gSprites[sGroudonShoulderSpriteId].pos2.x = -1;
-        gSprites[sGroudonShoulderSpriteId].pos2.y = 0;
-        gSprites[sGroudonClawSpriteId].pos2.x = -1;
-        gSprites[sGroudonClawSpriteId].pos2.y = 0;
+        gSprites[sGroudonShoulderSpriteId].x2 = -1;
+        gSprites[sGroudonShoulderSpriteId].y2 = 0;
+        gSprites[sGroudonClawSpriteId].x2 = -1;
+        gSprites[sGroudonClawSpriteId].y2 = 0;
         break;
     case 2:
-        gSprites[sGroudonShoulderSpriteId].pos2.x = -1;
-        gSprites[sGroudonShoulderSpriteId].pos2.y = 1;
-        gSprites[sGroudonClawSpriteId].pos2.x = -2;
-        gSprites[sGroudonClawSpriteId].pos2.y = 1;
+        gSprites[sGroudonShoulderSpriteId].x2 = -1;
+        gSprites[sGroudonShoulderSpriteId].y2 = 1;
+        gSprites[sGroudonClawSpriteId].x2 = -2;
+        gSprites[sGroudonClawSpriteId].y2 = 1;
         break;
     }
 }
@@ -1502,58 +1502,58 @@ static void SpriteCB_DuoFightPre_Kyogre(struct Sprite *sprite)
     s16 *data = sprite->data;
     data[5]++;
     data[5] &= 0x1F;
-    if (data[5] == 0 && sprite->pos1.x != 152)
+    if (data[5] == 0 && sprite->x != 152)
     {
-        sprite->pos1.x++;
-        gSprites[sprite->data[0] >> 8].pos1.x++;
-        gSprites[sprite->data[0] & 0xFF].pos1.x++;
-        gSprites[data[1] >> 8].pos1.x++;
-        gSprites[data[1] & 0xFF].pos1.x++;
-        gSprites[data[2] >> 8].pos1.x++;
-        gSprites[data[2] & 0xFF].pos1.x++;
-        gSprites[data[3] >> 8].pos1.x++;
-        gSprites[data[3] & 0xFF].pos1.x++;
-        gSprites[data[4] >> 8].pos1.x++;
-        gSprites[data[4] & 0xFF].pos1.x++;
+        sprite->x++;
+        gSprites[sprite->data[0] >> 8].x++;
+        gSprites[sprite->data[0] & 0xFF].x++;
+        gSprites[data[1] >> 8].x++;
+        gSprites[data[1] & 0xFF].x++;
+        gSprites[data[2] >> 8].x++;
+        gSprites[data[2] & 0xFF].x++;
+        gSprites[data[3] >> 8].x++;
+        gSprites[data[3] & 0xFF].x++;
+        gSprites[data[4] >> 8].x++;
+        gSprites[data[4] & 0xFF].x++;
     }
 
     switch (gSprites[data[2] & 0xFF].animCmdIndex)
     {
     case 0:
-        sprite->pos2.y = 0;
-        gSprites[data[0] >> 8].pos2.y = 0;
-        gSprites[data[0] & 0xFF].pos2.y = 0;
-        gSprites[data[1] >> 8].pos2.y = 0;
-        gSprites[data[1] & 0xFF].pos2.y = 0;
-        gSprites[data[2] >> 8].pos2.y = 0;
-        gSprites[data[2] & 0xFF].pos2.y = 0;
-        gSprites[data[3] >> 8].pos2.y = 0;
-        gSprites[data[3] & 0xFF].pos2.y = 0;
-        gSprites[data[4] >> 8].pos2.y = 0;
-        gSprites[data[4] & 0xFF].pos2.y = 0;
+        sprite->y2 = 0;
+        gSprites[data[0] >> 8].y2 = 0;
+        gSprites[data[0] & 0xFF].y2 = 0;
+        gSprites[data[1] >> 8].y2 = 0;
+        gSprites[data[1] & 0xFF].y2 = 0;
+        gSprites[data[2] >> 8].y2 = 0;
+        gSprites[data[2] & 0xFF].y2 = 0;
+        gSprites[data[3] >> 8].y2 = 0;
+        gSprites[data[3] & 0xFF].y2 = 0;
+        gSprites[data[4] >> 8].y2 = 0;
+        gSprites[data[4] & 0xFF].y2 = 0;
         break;
     case 1:
     case 3:
-        sprite->pos2.y = 1;
-        gSprites[data[0] >> 8].pos2.y = 1;
-        gSprites[data[0] & 0xFF].pos2.y = 1;
-        gSprites[data[1] >> 8].pos2.y = 1;
-        gSprites[data[1] & 0xFF].pos2.y = 1;
-        gSprites[data[2] >> 8].pos2.y = 1;
-        gSprites[data[2] & 0xFF].pos2.y = 1;
-        gSprites[data[3] >> 8].pos2.y = 1;
-        gSprites[data[3] & 0xFF].pos2.y = 1;
-        gSprites[data[4] >> 8].pos2.y = 1;
-        gSprites[data[4] & 0xFF].pos2.y = 1;
+        sprite->y2 = 1;
+        gSprites[data[0] >> 8].y2 = 1;
+        gSprites[data[0] & 0xFF].y2 = 1;
+        gSprites[data[1] >> 8].y2 = 1;
+        gSprites[data[1] & 0xFF].y2 = 1;
+        gSprites[data[2] >> 8].y2 = 1;
+        gSprites[data[2] & 0xFF].y2 = 1;
+        gSprites[data[3] >> 8].y2 = 1;
+        gSprites[data[3] & 0xFF].y2 = 1;
+        gSprites[data[4] >> 8].y2 = 1;
+        gSprites[data[4] & 0xFF].y2 = 1;
         break;
     case 2:
-        sprite->pos2.y = 2;
-        gSprites[data[0] >> 8].pos2.y = 2;
-        gSprites[data[0] & 0xFF].pos2.y = 2;
-        gSprites[data[1] >> 8].pos2.y = 2;
-        gSprites[data[1] & 0xFF].pos2.y = 2;
-        gSprites[data[2] >> 8].pos2.y = 2;
-        gSprites[data[4] & 0xFF].pos2.y = 2;
+        sprite->y2 = 2;
+        gSprites[data[0] >> 8].y2 = 2;
+        gSprites[data[0] & 0xFF].y2 = 2;
+        gSprites[data[1] >> 8].y2 = 2;
+        gSprites[data[1] & 0xFF].y2 = 2;
+        gSprites[data[2] >> 8].y2 = 2;
+        gSprites[data[4] & 0xFF].y2 = 2;
         break;
     }
 }
@@ -1825,34 +1825,34 @@ static void SpriteCB_DuoFight_Groudon(struct Sprite *sprite)
     s16 *data = sprite->data;
     data[5]++;
     data[5] &= 0xF;
-    if (!(data[5] & 7) && sprite->pos1.x != 72)
+    if (!(data[5] & 7) && sprite->x != 72)
     {
-        sprite->pos1.x--;
-        gSprites[sprite->sGroudonBodySpriteId].pos1.x--;
-        gSprites[sGroudonShoulderSpriteId].pos1.x--;
-        gSprites[sGroudonClawSpriteId].pos1.x--;
+        sprite->x--;
+        gSprites[sprite->sGroudonBodySpriteId].x--;
+        gSprites[sGroudonShoulderSpriteId].x--;
+        gSprites[sGroudonClawSpriteId].x--;
     }
 
     switch (sprite->animCmdIndex)
     {
     case 0:
-        gSprites[sGroudonShoulderSpriteId].pos2.x = 0;
-        gSprites[sGroudonShoulderSpriteId].pos2.y = 0;
-        gSprites[sGroudonClawSpriteId].pos2.x = 0;
-        gSprites[sGroudonClawSpriteId].pos2.y = 0;
+        gSprites[sGroudonShoulderSpriteId].x2 = 0;
+        gSprites[sGroudonShoulderSpriteId].y2 = 0;
+        gSprites[sGroudonClawSpriteId].x2 = 0;
+        gSprites[sGroudonClawSpriteId].y2 = 0;
         break;
     case 1:
     case 3:
-        gSprites[sGroudonShoulderSpriteId].pos2.x = -1;
-        gSprites[sGroudonShoulderSpriteId].pos2.y = 0;
-        gSprites[sGroudonClawSpriteId].pos2.x = -1;
-        gSprites[sGroudonClawSpriteId].pos2.y = 0;
+        gSprites[sGroudonShoulderSpriteId].x2 = -1;
+        gSprites[sGroudonShoulderSpriteId].y2 = 0;
+        gSprites[sGroudonClawSpriteId].x2 = -1;
+        gSprites[sGroudonClawSpriteId].y2 = 0;
         break;
     case 2:
-        gSprites[sGroudonShoulderSpriteId].pos2.x = -1;
-        gSprites[sGroudonShoulderSpriteId].pos2.y = 1;
-        gSprites[sGroudonClawSpriteId].pos2.x = -2;
-        gSprites[sGroudonClawSpriteId].pos2.y = 1;
+        gSprites[sGroudonShoulderSpriteId].x2 = -1;
+        gSprites[sGroudonShoulderSpriteId].y2 = 1;
+        gSprites[sGroudonClawSpriteId].x2 = -2;
+        gSprites[sGroudonClawSpriteId].y2 = 1;
         break;
     }
 }
@@ -1860,12 +1860,12 @@ static void SpriteCB_DuoFight_Groudon(struct Sprite *sprite)
 static void DuoFight_SlideGroudonDown(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
-    if (sprite->pos1.y <= DISPLAY_HEIGHT)
+    if (sprite->y <= DISPLAY_HEIGHT)
     {
-        sprite->pos1.y += 8;
-        gSprites[sprite->sGroudonBodySpriteId].pos1.y += 8;
-        gSprites[sGroudonShoulderSpriteId].pos1.y += 8;
-        gSprites[sGroudonClawSpriteId].pos1.y += 8;
+        sprite->y += 8;
+        gSprites[sprite->sGroudonBodySpriteId].y += 8;
+        gSprites[sGroudonShoulderSpriteId].y += 8;
+        gSprites[sGroudonClawSpriteId].y += 8;
     }
 }
 
@@ -1906,58 +1906,58 @@ static void SpriteCB_DuoFight_Kyogre(struct Sprite *sprite)
     s16 *data = sprite->data;
     data[5]++;
     data[5] &= 0xF;
-    if (!(data[5] & 7) && sprite->pos1.x != 152)
+    if (!(data[5] & 7) && sprite->x != 152)
     {
-        sprite->pos1.x++;
-        gSprites[sprite->data[0] >> 8].pos1.x++;
-        gSprites[sprite->data[0] & 0xFF].pos1.x++;
-        gSprites[data[1] >> 8].pos1.x++;
-        gSprites[data[1] & 0xFF].pos1.x++;
-        gSprites[data[2] >> 8].pos1.x++;
-        gSprites[data[2] & 0xFF].pos1.x++;
-        gSprites[data[3] >> 8].pos1.x++;
-        gSprites[data[3] & 0xFF].pos1.x++;
-        gSprites[data[4] >> 8].pos1.x++;
-        gSprites[data[4] & 0xFF].pos1.x++;
+        sprite->x++;
+        gSprites[sprite->data[0] >> 8].x++;
+        gSprites[sprite->data[0] & 0xFF].x++;
+        gSprites[data[1] >> 8].x++;
+        gSprites[data[1] & 0xFF].x++;
+        gSprites[data[2] >> 8].x++;
+        gSprites[data[2] & 0xFF].x++;
+        gSprites[data[3] >> 8].x++;
+        gSprites[data[3] & 0xFF].x++;
+        gSprites[data[4] >> 8].x++;
+        gSprites[data[4] & 0xFF].x++;
     }
 
     switch (gSprites[data[2] & 0xFF].animCmdIndex)
     {
     case 0:
-        sprite->pos2.y = 0;
-        gSprites[data[0] >> 8].pos2.y = 0;
-        gSprites[data[0] & 0xFF].pos2.y = 0;
-        gSprites[data[1] >> 8].pos2.y = 0;
-        gSprites[data[1] & 0xFF].pos2.y = 0;
-        gSprites[data[2] >> 8].pos2.y = 0;
-        gSprites[data[2] & 0xFF].pos2.y = 0;
-        gSprites[data[3] >> 8].pos2.y = 0;
-        gSprites[data[3] & 0xFF].pos2.y = 0;
-        gSprites[data[4] >> 8].pos2.y = 0;
-        gSprites[data[4] & 0xFF].pos2.y = 0;
+        sprite->y2 = 0;
+        gSprites[data[0] >> 8].y2 = 0;
+        gSprites[data[0] & 0xFF].y2 = 0;
+        gSprites[data[1] >> 8].y2 = 0;
+        gSprites[data[1] & 0xFF].y2 = 0;
+        gSprites[data[2] >> 8].y2 = 0;
+        gSprites[data[2] & 0xFF].y2 = 0;
+        gSprites[data[3] >> 8].y2 = 0;
+        gSprites[data[3] & 0xFF].y2 = 0;
+        gSprites[data[4] >> 8].y2 = 0;
+        gSprites[data[4] & 0xFF].y2 = 0;
         break;
     case 1:
     case 3:
-        sprite->pos2.y = 1;
-        gSprites[data[0] >> 8].pos2.y = 1;
-        gSprites[data[0] & 0xFF].pos2.y = 1;
-        gSprites[data[1] >> 8].pos2.y = 1;
-        gSprites[data[1] & 0xFF].pos2.y = 1;
-        gSprites[data[2] >> 8].pos2.y = 1;
-        gSprites[data[2] & 0xFF].pos2.y = 1;
-        gSprites[data[3] >> 8].pos2.y = 1;
-        gSprites[data[3] & 0xFF].pos2.y = 1;
-        gSprites[data[4] >> 8].pos2.y = 1;
-        gSprites[data[4] & 0xFF].pos2.y = 1;
+        sprite->y2 = 1;
+        gSprites[data[0] >> 8].y2 = 1;
+        gSprites[data[0] & 0xFF].y2 = 1;
+        gSprites[data[1] >> 8].y2 = 1;
+        gSprites[data[1] & 0xFF].y2 = 1;
+        gSprites[data[2] >> 8].y2 = 1;
+        gSprites[data[2] & 0xFF].y2 = 1;
+        gSprites[data[3] >> 8].y2 = 1;
+        gSprites[data[3] & 0xFF].y2 = 1;
+        gSprites[data[4] >> 8].y2 = 1;
+        gSprites[data[4] & 0xFF].y2 = 1;
         break;
     case 2:
-        sprite->pos2.y = 2;
-        gSprites[data[0] >> 8].pos2.y = 2;
-        gSprites[data[0] & 0xFF].pos2.y = 2;
-        gSprites[data[1] >> 8].pos2.y = 2;
-        gSprites[data[1] & 0xFF].pos2.y = 2;
-        gSprites[data[2] >> 8].pos2.y = 2;
-        gSprites[data[4] & 0xFF].pos2.y = 2;
+        sprite->y2 = 2;
+        gSprites[data[0] >> 8].y2 = 2;
+        gSprites[data[0] & 0xFF].y2 = 2;
+        gSprites[data[1] >> 8].y2 = 2;
+        gSprites[data[1] & 0xFF].y2 = 2;
+        gSprites[data[2] >> 8].y2 = 2;
+        gSprites[data[4] & 0xFF].y2 = 2;
         break;
     }
 }
@@ -1965,19 +1965,19 @@ static void SpriteCB_DuoFight_Kyogre(struct Sprite *sprite)
 static void DuoFight_SlideKyogreDown(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
-    if (sprite->pos1.y <= DISPLAY_HEIGHT)
+    if (sprite->y <= DISPLAY_HEIGHT)
     {
-        sprite->pos1.y += 8;
-        gSprites[sprite->data[0] >> 8].pos1.y += 8;
-        gSprites[sprite->data[0] & 0xFF].pos1.y += 8;
-        gSprites[data[1] >> 8].pos1.y += 8;
-        gSprites[data[1] & 0xFF].pos1.y += 8;
-        gSprites[data[2] >> 8].pos1.y += 8;
-        gSprites[data[2] & 0xFF].pos1.y += 8;
-        gSprites[data[3] >> 8].pos1.y += 8;
-        gSprites[data[3] & 0xFF].pos1.y += 8;
-        gSprites[data[4] >> 8].pos1.y += 8;
-        gSprites[data[4] & 0xFF].pos1.y += 8;
+        sprite->y += 8;
+        gSprites[sprite->data[0] >> 8].y += 8;
+        gSprites[sprite->data[0] & 0xFF].y += 8;
+        gSprites[data[1] >> 8].y += 8;
+        gSprites[data[1] & 0xFF].y += 8;
+        gSprites[data[2] >> 8].y += 8;
+        gSprites[data[2] & 0xFF].y += 8;
+        gSprites[data[3] >> 8].y += 8;
+        gSprites[data[3] & 0xFF].y += 8;
+        gSprites[data[4] >> 8].y += 8;
+        gSprites[data[4] & 0xFF].y += 8;
     }
 }
 
@@ -2184,13 +2184,13 @@ static void SpriteCB_TakesFlight_Smoke(struct Sprite *sprite)
 {
     if (sprite->sTimer == 0)
     {
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
     }
     else
     {
-        sprite->pos2.x += sTakesFlight_SmokeCoords[sprite->sSmokeId][0];
-        sprite->pos2.y += sTakesFlight_SmokeCoords[sprite->sSmokeId][1];
+        sprite->x2 += sTakesFlight_SmokeCoords[sprite->sSmokeId][0];
+        sprite->y2 += sTakesFlight_SmokeCoords[sprite->sSmokeId][1];
     }
 
     sprite->sTimer++;
@@ -2392,7 +2392,7 @@ static void SpriteCB_Descends_Rayquaza(struct Sprite *sprite)
 {
     s16 *data = sprite->data;
     s16 frame = sTimer;
-    
+
     // Updates to Rayquaza's coords occur more frequently
     // as time goes on (it accelerates as it emerges)
     if (frame == 0)
@@ -2433,13 +2433,13 @@ static void SpriteCB_Descends_Rayquaza(struct Sprite *sprite)
 
     if (sTimer % sXMovePeriod == 0)
     {
-        sprite->pos2.x--;
-        gSprites[sTailSpriteId].pos2.x--;
+        sprite->x2--;
+        gSprites[sTailSpriteId].x2--;
     }
     if (sTimer % sYMovePeriod == 0)
     {
-        sprite->pos2.y++;
-        gSprites[sTailSpriteId].pos2.y++;
+        sprite->y2++;
+        gSprites[sTailSpriteId].y2++;
     }
 
     sTimer++;
@@ -2902,14 +2902,14 @@ static void SpriteCB_ChasesAway_DuoRingPush(struct Sprite *sprite)
     {
         if (!sprite->sIsKyogre)
         {
-            sprite->pos1.x -= sprite->sSpeed;
-            gSprites[sprite->sBodyPartSpriteId1].pos1.x -= sprite->sSpeed;
+            sprite->x -= sprite->sSpeed;
+            gSprites[sprite->sBodyPartSpriteId1].x -= sprite->sSpeed;
         }
         else
         {
-            sprite->pos1.x += sprite->sSpeed;
-            gSprites[sprite->sBodyPartSpriteId1].pos1.x += sprite->sSpeed;
-            gSprites[sprite->sBodyPartSpriteId2].pos1.x += sprite->sSpeed;
+            sprite->x += sprite->sSpeed;
+            gSprites[sprite->sBodyPartSpriteId1].x += sprite->sSpeed;
+            gSprites[sprite->sBodyPartSpriteId2].x += sprite->sSpeed;
         }
 
         sprite->sDecel++;
@@ -2949,18 +2949,18 @@ static void SpriteCB_ChasesAway_GroudonLeave(struct Sprite *sprite)
     case 2:
         if (sprite->animDelayCounter % 12 == 0)
         {
-            sprite->pos1.x -= 2;
-            gSprites[sprite->data[0]].pos1.x -=2;
+            sprite->x -= 2;
+            gSprites[sprite->data[0]].x -=2;
         }
-        gSprites[sprite->data[0]].pos2.y = 0;
+        gSprites[sprite->data[0]].y2 = 0;
         break;
     case 1:
     case 3:
-        gSprites[sprite->data[0]].pos2.y = -2;
+        gSprites[sprite->data[0]].y2 = -2;
         if ((sprite->animDelayCounter & 15) == 0)
         {
-            sprite->pos1.y++;
-            gSprites[sprite->data[0]].pos1.y++;
+            sprite->y++;
+            gSprites[sprite->data[0]].y++;
         }
         break;
     }
@@ -2982,10 +2982,10 @@ static void SpriteCB_ChasesAway_KyogreLeave(struct Sprite *sprite)
 {
     if ((sprite->data[4] & 3) == 0)
     {
-        if (sprite->pos2.x == 1)
-            sprite->pos2.x = -1;
+        if (sprite->x2 == 1)
+            sprite->x2 = -1;
         else
-            sprite->pos2.x = 1;
+            sprite->x2 = 1;
     }
     if (sprite->data[5] == 128)
     {
@@ -2998,10 +2998,10 @@ static void SpriteCB_ChasesAway_KyogreLeave(struct Sprite *sprite)
     }
     if (sprite->data[5] > 127)
     {
-        if (sprite->pos2.y != 32)
+        if (sprite->y2 != 32)
         {
             sprite->data[6]++;
-            sprite->pos2.y = sprite->data[6] >> 4;
+            sprite->y2 = sprite->data[6] >> 4;
         }
     }
     else
@@ -3029,8 +3029,8 @@ static void SpriteCB_ChasesAway_Rayquaza(struct Sprite *sprite)
     s16 frame = sprite->sTimer;
     if (frame <= 64)
     {
-        sprite->pos2.y += 2;
-        gSprites[sprite->sTailSpriteId].pos2.y += 2;
+        sprite->y2 += 2;
+        gSprites[sprite->sTailSpriteId].y2 += 2;
         if (sprite->sTimer == 64)
         {
             ChasesAway_SetRayquazaAnim(sprite, 1, 0, -48);
@@ -3062,8 +3062,8 @@ static void SpriteCB_ChasesAway_Rayquaza(struct Sprite *sprite)
     {
         SpriteCB_ChasesAway_RayquazaFloat(sprite);
         ChasesAway_SetRayquazaAnim(sprite, 3, 48, 16);
-        sprite->pos2.x = 1;
-        gSprites[sprite->sTailSpriteId].pos2.x = 1;
+        sprite->x2 = 1;
+        gSprites[sprite->sTailSpriteId].x2 = 1;
         PlayCry1(SPECIES_RAYQUAZA, 0);
         CreateTask(Task_ChasesAway_AnimateRing, 0);
     }
@@ -3072,8 +3072,8 @@ static void SpriteCB_ChasesAway_Rayquaza(struct Sprite *sprite)
         switch (frame)
         {
         case 376:
-            sprite->pos2.x = 0;
-            gSprites[sprite->sTailSpriteId].pos2.x = 0;
+            sprite->x2 = 0;
+            gSprites[sprite->sTailSpriteId].x2 = 0;
             SpriteCB_ChasesAway_RayquazaFloat(sprite);
             ChasesAway_SetRayquazaAnim(sprite, 2, 48, 16);
             sprite->callback = SpriteCB_ChasesAway_RayquazaFloat;
@@ -3086,8 +3086,8 @@ static void SpriteCB_ChasesAway_Rayquaza(struct Sprite *sprite)
 
     if (sprite->sTimer > 328 && (sprite->sTimer & 1) == 0)
     {
-        sprite->pos2.x *= -1;
-        gSprites[sprite->sTailSpriteId].pos2.x = sprite->pos2.x;
+        sprite->x2 *= -1;
+        gSprites[sprite->sTailSpriteId].x2 = sprite->x2;
     }
 
     sprite->sTimer++;
@@ -3098,8 +3098,8 @@ static void SpriteCB_ChasesAway_RayquazaFloat(struct Sprite *body)
     struct Sprite *tail = &gSprites[body->sTailSpriteId];
     if (!(body->sFloatTimer & tail->sTailFloatDelay))
     {
-        body->pos2.y += body->sYOffset;
-        gSprites[body->sTailSpriteId].pos2.y += body->sYOffset; // why access gSprites again? tail->pos2.y would be sufficient
+        body->y2 += body->sYOffset;
+        gSprites[body->sTailSpriteId].y2 += body->sYOffset; // why access gSprites again? tail->y2 would be sufficient
         body->sYOffset += body->sYOffsetDir;
         if (body->sYOffset >= tail->sTailFloatPeak || body->sYOffset <= -tail->sTailFloatPeak)
         {
@@ -3119,11 +3119,11 @@ static void ChasesAway_SetRayquazaAnim(struct Sprite *body, u8 animNum, s16 x, s
 {
     struct Sprite *tail = &gSprites[body->sTailSpriteId];
 
-    tail->pos1.x = body->pos1.x + x;
-    tail->pos1.y = body->pos1.y + y;
+    tail->x = body->x + x;
+    tail->y = body->y + y;
 
-    tail->pos2.x = body->pos2.x;
-    tail->pos2.y = body->pos2.y;
+    tail->x2 = body->x2;
+    tail->y2 = body->y2;
 
     StartSpriteAnim(body, animNum);
     StartSpriteAnim(tail, animNum);
diff --git a/src/record_mixing.c b/src/record_mixing.c
index c01f3421c..ad97b6af5 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -952,7 +952,7 @@ static void Task_DoRecordMixing(u8 taskId)
         else
             task->data[0] = 6;
         break;
-    
+
     // Mixing Ruby/Sapphire records.
     case 2:
         SetContinueGameWarpStatusToDynamicWarp();
diff --git a/src/region_map.c b/src/region_map.c
index 335323421..4e547b5fb 100644
--- a/src/region_map.c
+++ b/src/region_map.c
@@ -48,6 +48,12 @@
 
 #define FLYDESTICON_RED_OUTLINE 6
 
+enum {
+    TAG_CURSOR,
+    TAG_PLAYER_ICON,
+    TAG_FLY_ICON,
+};
+
 // Static type declarations
 
 struct MultiNameFlyDest
@@ -237,13 +243,13 @@ static const union AnimCmd *const sRegionMapCursorAnimTable[] =
 static const struct SpritePalette sRegionMapCursorSpritePalette =
 {
     .data = sRegionMapCursorPal,
-    .tag = 0
+    .tag = TAG_CURSOR
 };
 
 static const struct SpriteTemplate sRegionMapCursorSpriteTemplate =
 {
-    .tileTag = 0,
-    .paletteTag = 0,
+    .tileTag = TAG_CURSOR,
+    .paletteTag = TAG_CURSOR,
     .oam = &sRegionMapCursorOam,
     .anims = sRegionMapCursorAnimTable,
     .images = NULL,
@@ -419,7 +425,7 @@ static const struct WindowTemplate sFlyMapWindowTemplates[] =
 static const struct SpritePalette sFlyTargetIconsSpritePalette =
 {
     .data = sFlyTargetIcons_Pal,
-    .tag = 2
+    .tag = TAG_FLY_ICON
 };
 
 static const u16 sRedOutlineFlyDestinations[][2] =
@@ -497,8 +503,8 @@ static const union AnimCmd *const sFlyDestIcon_Anims[] =
 
 static const struct SpriteTemplate sFlyDestIconSpriteTemplate =
 {
-    .tileTag = 2,
-    .paletteTag = 2,
+    .tileTag = TAG_FLY_ICON,
+    .paletteTag = TAG_FLY_ICON,
     .oam = &sFlyDestIcon_OamData,
     .anims = sFlyDestIcon_Anims,
     .images = NULL,
@@ -952,8 +958,8 @@ void PokedexAreaScreen_UpdateRegionMapVariablesAndVideoRegs(s16 x, s16 y)
     UpdateRegionMapVideoRegs();
     if (gRegionMap->playerIconSprite != NULL)
     {
-        gRegionMap->playerIconSprite->pos2.x = -x;
-        gRegionMap->playerIconSprite->pos2.y = -y;
+        gRegionMap->playerIconSprite->x2 = -x;
+        gRegionMap->playerIconSprite->y2 = -y;
     }
 }
 
@@ -1364,8 +1370,8 @@ static void SpriteCB_CursorMapFull(struct Sprite *sprite)
 {
     if (gRegionMap->cursorMovementFrameCounter != 0)
     {
-        sprite->pos1.x += 2 * gRegionMap->cursorDeltaX;
-        sprite->pos1.y += 2 * gRegionMap->cursorDeltaY;
+        sprite->x += 2 * gRegionMap->cursorDeltaX;
+        sprite->y += 2 * gRegionMap->cursorDeltaY;
         gRegionMap->cursorMovementFrameCounter--;
     }
 }
@@ -1411,15 +1417,15 @@ void CreateRegionMapCursor(u16 tileTag, u16 paletteTag)
         if (gRegionMap->zoomed == TRUE)
         {
             gRegionMap->cursorSprite->oam.size = SPRITE_SIZE(32x32);
-            gRegionMap->cursorSprite->pos1.x -= 8;
-            gRegionMap->cursorSprite->pos1.y -= 8;
+            gRegionMap->cursorSprite->x -= 8;
+            gRegionMap->cursorSprite->y -= 8;
             StartSpriteAnim(gRegionMap->cursorSprite, 1);
         }
         else
         {
             gRegionMap->cursorSprite->oam.size = SPRITE_SIZE(16x16);
-            gRegionMap->cursorSprite->pos1.x = 8 * gRegionMap->cursorPosX + 4;
-            gRegionMap->cursorSprite->pos1.y = 8 * gRegionMap->cursorPosY + 4;
+            gRegionMap->cursorSprite->x = 8 * gRegionMap->cursorPosX + 4;
+            gRegionMap->cursorSprite->y = 8 * gRegionMap->cursorPosY + 4;
         }
         gRegionMap->cursorSprite->data[1] = 2;
         gRegionMap->cursorSprite->data[2] = (IndexOfSpritePaletteTag(paletteTag) << 4) + 0x101;
@@ -1472,14 +1478,14 @@ void CreateRegionMapPlayerIcon(u16 tileTag, u16 paletteTag)
     gRegionMap->playerIconSprite = &gSprites[spriteId];
     if (!gRegionMap->zoomed)
     {
-        gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 8 + 4;
-        gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 8 + 4;
+        gRegionMap->playerIconSprite->x = gRegionMap->playerIconSpritePosX * 8 + 4;
+        gRegionMap->playerIconSprite->y = gRegionMap->playerIconSpritePosY * 8 + 4;
         gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconMapFull;
     }
     else
     {
-        gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 16 - 0x30;
-        gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 16 - 0x42;
+        gRegionMap->playerIconSprite->x = gRegionMap->playerIconSpritePosX * 16 - 0x30;
+        gRegionMap->playerIconSprite->y = gRegionMap->playerIconSpritePosY * 16 - 0x42;
         gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconMapZoomed;
     }
 }
@@ -1499,17 +1505,17 @@ static void UnhideRegionMapPlayerIcon(void)
     {
         if (gRegionMap->zoomed == TRUE)
         {
-            gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 16 - 0x30;
-            gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 16 - 0x42;
+            gRegionMap->playerIconSprite->x = gRegionMap->playerIconSpritePosX * 16 - 0x30;
+            gRegionMap->playerIconSprite->y = gRegionMap->playerIconSpritePosY * 16 - 0x42;
             gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconMapZoomed;
             gRegionMap->playerIconSprite->invisible = FALSE;
         }
         else
         {
-            gRegionMap->playerIconSprite->pos1.x = gRegionMap->playerIconSpritePosX * 8 + 4;
-            gRegionMap->playerIconSprite->pos1.y = gRegionMap->playerIconSpritePosY * 8 + 4;
-            gRegionMap->playerIconSprite->pos2.x = 0;
-            gRegionMap->playerIconSprite->pos2.y = 0;
+            gRegionMap->playerIconSprite->x = gRegionMap->playerIconSpritePosX * 8 + 4;
+            gRegionMap->playerIconSprite->y = gRegionMap->playerIconSpritePosY * 8 + 4;
+            gRegionMap->playerIconSprite->x2 = 0;
+            gRegionMap->playerIconSprite->y2 = 0;
             gRegionMap->playerIconSprite->callback = SpriteCB_PlayerIconMapFull;
             gRegionMap->playerIconSprite->invisible = FALSE;
         }
@@ -1518,10 +1524,10 @@ static void UnhideRegionMapPlayerIcon(void)
 
 static void SpriteCB_PlayerIconMapZoomed(struct Sprite *sprite)
 {
-    sprite->pos2.x = -2 * gRegionMap->scrollX;
-    sprite->pos2.y = -2 * gRegionMap->scrollY;
-    sprite->data[0] = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY;
-    sprite->data[1] = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX;
+    sprite->x2 = -2 * gRegionMap->scrollX;
+    sprite->y2 = -2 * gRegionMap->scrollY;
+    sprite->data[0] = sprite->y + sprite->y2 + sprite->centerToCornerVecY;
+    sprite->data[1] = sprite->x + sprite->x2 + sprite->centerToCornerVecX;
     if (sprite->data[0] < -8 || sprite->data[0] > 0xa8 || sprite->data[1] < -8 || sprite->data[1] > 0xf8)
     {
         sprite->data[2] = FALSE;
@@ -1692,8 +1698,8 @@ void CB2_OpenFlyMap(void)
         break;
     case 4:
         InitRegionMap(&sFlyMap->regionMap, FALSE);
-        CreateRegionMapCursor(0, 0);
-        CreateRegionMapPlayerIcon(1, 1);
+        CreateRegionMapCursor(TAG_CURSOR, TAG_CURSOR);
+        CreateRegionMapPlayerIcon(TAG_PLAYER_ICON, TAG_PLAYER_ICON);
         sFlyMap->mapSecId = sFlyMap->regionMap.mapSecId;
         StringFill(sFlyMap->nameBuffer, CHAR_SPACE, MAP_NAME_LENGTH);
         sDrawFlyDestTextWindow = TRUE;
@@ -1827,7 +1833,7 @@ static void LoadFlyDestIcons(void)
     LZ77UnCompWram(sFlyTargetIcons_Gfx, sFlyMap->tileBuffer);
     sheet.data = sFlyMap->tileBuffer;
     sheet.size = sizeof(sFlyMap->tileBuffer);
-    sheet.tag = 2;
+    sheet.tag = TAG_FLY_ICON;
     LoadSpriteSheet(&sheet);
     LoadSpritePalette(&sFlyTargetIconsSpritePalette);
     CreateFlyDestIcons();
diff --git a/src/reset_rtc_screen.c b/src/reset_rtc_screen.c
index cc4da7e16..5e6fcd436 100644
--- a/src/reset_rtc_screen.c
+++ b/src/reset_rtc_screen.c
@@ -80,33 +80,33 @@ static const struct BgTemplate sBgTemplates[] =
 static const struct WindowTemplate sWindowTemplates[] =
 {
     {
-        .bg = 0, 
-        .tilemapLeft = 1, 
-        .tilemapTop = 1, 
-        .width = 19, 
-        .height = 9, 
-        .paletteNum = 15, 
+        .bg = 0,
+        .tilemapLeft = 1,
+        .tilemapTop = 1,
+        .width = 19,
+        .height = 9,
+        .paletteNum = 15,
         .baseBlock = 0x155
     },
     {
-        .bg = 0, 
-        .tilemapLeft = 2, 
-        .tilemapTop = 15, 
-        .width = 27, 
-        .height = 4, 
-        .paletteNum = 15, 
+        .bg = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 15,
+        .width = 27,
+        .height = 4,
+        .paletteNum = 15,
         .baseBlock = 0xE9
     },
     DUMMY_WIN_TEMPLATE
 };
 
 static const struct WindowTemplate sInputTimeWindow = {
-    .bg = 0, 
-    .tilemapLeft = 4, 
-    .tilemapTop = 9, 
-    .width = 21, 
-    .height = 2, 
-    .paletteNum = 15, 
+    .bg = 0,
+    .tilemapLeft = 4,
+    .tilemapTop = 9,
+    .width = 21,
+    .height = 2,
+    .paletteNum = 15,
     .baseBlock = 0xBF
 };
 
@@ -219,7 +219,7 @@ static const union AnimCmd *const sAnims_Arrow[] =
 
 static const struct SpriteTemplate sSpriteTemplate_Arrow =
 {
-    .tileTag = 0xFFFF,
+    .tileTag = TAG_NONE,
     .paletteTag = PALTAG_ARROW,
     .oam = &sOamData_Arrow,
     .anims = sAnims_Arrow,
@@ -243,36 +243,36 @@ static void SpriteCB_Cursor_UpOrRight(struct Sprite *sprite)
             sprite->invisible = FALSE;
             sprite->animNum = ARROW_UP;
             sprite->animDelayCounter = 0;
-            sprite->pos1.x = 53;
-            sprite->pos1.y = 68;
+            sprite->x = 53;
+            sprite->y = 68;
             break;
         case SELECTION_HOURS:
             sprite->invisible = FALSE;
             sprite->animNum = ARROW_UP;
             sprite->animDelayCounter = 0;
-            sprite->pos1.x = 86;
-            sprite->pos1.y = 68;
+            sprite->x = 86;
+            sprite->y = 68;
             break;
         case SELECTION_MINS:
             sprite->invisible = FALSE;
             sprite->animNum = ARROW_UP;
             sprite->animDelayCounter = 0;
-            sprite->pos1.x = 101;
-            sprite->pos1.y = 68;
+            sprite->x = 101;
+            sprite->y = 68;
             break;
         case SELECTION_SECS:
             sprite->invisible = FALSE;
             sprite->animNum = ARROW_UP;
             sprite->animDelayCounter = 0;
-            sprite->pos1.x = 116;
-            sprite->pos1.y = 68;
+            sprite->x = 116;
+            sprite->y = 68;
             break;
         case SELECTION_CONFIRM:
             sprite->invisible = FALSE;
             sprite->animNum = ARROW_RIGHT;
             sprite->animDelayCounter = 0;
-            sprite->pos1.x = 153;
-            sprite->pos1.y = 80;
+            sprite->x = 153;
+            sprite->y = 80;
             break;
         case SELECTION_NONE:
             DestroySprite(sprite);
@@ -293,29 +293,29 @@ static void SpriteCB_Cursor_Down(struct Sprite *sprite)
             sprite->invisible = FALSE;
             sprite->animNum = ARROW_DOWN;
             sprite->animDelayCounter = 0;
-            sprite->pos1.x = 53;
-            sprite->pos1.y = 92;
+            sprite->x = 53;
+            sprite->y = 92;
             break;
         case SELECTION_HOURS:
             sprite->invisible = FALSE;
             sprite->animNum = ARROW_DOWN;
             sprite->animDelayCounter = 0;
-            sprite->pos1.x = 86;
-            sprite->pos1.y = 92;
+            sprite->x = 86;
+            sprite->y = 92;
             break;
         case SELECTION_MINS:
             sprite->invisible = FALSE;
             sprite->animNum = ARROW_DOWN;
             sprite->animDelayCounter = 0;
-            sprite->pos1.x = 101;
-            sprite->pos1.y = 92;
+            sprite->x = 101;
+            sprite->y = 92;
             break;
         case SELECTION_SECS:
             sprite->invisible = FALSE;
             sprite->animNum = ARROW_DOWN;
             sprite->animDelayCounter = 0;
-            sprite->pos1.x = 116;
-            sprite->pos1.y = 92;
+            sprite->x = 116;
+            sprite->y = 92;
             break;
         case SELECTION_CONFIRM:
             // The up arrow is used as a right arrow when Confirm is selected
@@ -362,7 +362,7 @@ static void PrintTime(u8 windowId, u8 x, u8 y, u16 days, u8 hours, u8 minutes, u
 {
     u8 *dest = gStringVar4;
 
-    // Print days    
+    // Print days
     ConvertIntToDecimalStringN(gStringVar1, days, STR_CONV_MODE_RIGHT_ALIGN, 4);
     dest = StringCopy(dest, gStringVar1);
     dest = StringCopy(dest, gText_Day);
@@ -648,7 +648,7 @@ static void Task_ResetRtcScreen(u8 taskId)
     case MAINSTATE_CHECK_SAVE:
         if (!gPaletteFade.active)
         {
-            if (gSaveFileStatus == SAVE_STATUS_EMPTY 
+            if (gSaveFileStatus == SAVE_STATUS_EMPTY
              || gSaveFileStatus == SAVE_STATUS_CORRUPT)
             {
                 ShowMessage(gText_NoSaveFileCantSetTime);
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 58de22f05..6bc0e175b 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -162,7 +162,7 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
         BeginHardwarePaletteFade(0xFF, 0, 0x10, 0, 1);
         gPaletteFade.bufferTransferDisabled = 0;
         SetMainCallback2(BattleMainCB2);
-        sub_805EF14();
+        FillAroundBattleWindows();
         break;
     }
 
diff --git a/src/rotating_gate.c b/src/rotating_gate.c
index 36c23c2a5..997404c27 100644
--- a/src/rotating_gate.c
+++ b/src/rotating_gate.c
@@ -461,7 +461,7 @@ static const union AffineAnimCmd *const sSpriteAffineAnimTable_RotatingGate[] =
 static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge =
 {
     .tileTag = ROTATING_GATE_TILE_TAG,
-    .paletteTag = 0xFFFF,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_RotatingGateLarge,
     .anims = sSpriteAnimTable_RotatingGateLarge,
     .images = NULL,
@@ -472,7 +472,7 @@ static const struct SpriteTemplate sSpriteTemplate_RotatingGateLarge =
 static const struct SpriteTemplate sSpriteTemplate_RotatingGateRegular =
 {
     .tileTag = ROTATING_GATE_TILE_TAG,
-    .paletteTag = 0xFFFF,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_RotatingGateRegular,
     .anims = sSpriteAnimTable_RotatingGateRegular,
     .images = NULL,
@@ -755,7 +755,7 @@ static u8 RotatingGate_CreateGate(u8 gateId, s16 deltaX, s16 deltaY)
     sprite->data[0] = gateId;
     sprite->coordOffsetEnabled = 1;
 
-    GetMapCoordsFromSpritePos(x + deltaX, y + deltaY, &sprite->pos1.x, &sprite->pos1.y);
+    GetMapCoordsFromSpritePos(x + deltaX, y + deltaY, &sprite->x, &sprite->y);
     RotatingGate_HideGatesOutsideViewport(sprite);
     StartSpriteAffineAnim(sprite, RotatingGate_GetGateOrientation(gateId));
 
@@ -800,8 +800,8 @@ static void RotatingGate_HideGatesOutsideViewport(struct Sprite *sprite)
     s16 x2, y2;
 
     sprite->invisible = FALSE;
-    x = sprite->pos1.x + sprite->pos2.x + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
-    y = sprite->pos1.y + sprite->pos2.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
+    x = sprite->x + sprite->x2 + sprite->centerToCornerVecX + gSpriteCoordOffsetX;
+    y = sprite->y + sprite->y2 + sprite->centerToCornerVecY + gSpriteCoordOffsetY;
 
     x2 = x + 0x40; // Dimensions of the rotating gate
     y2 = y + 0x40;
diff --git a/src/rotating_tile_puzzle.c b/src/rotating_tile_puzzle.c
index fd26361dd..a3bee4180 100644
--- a/src/rotating_tile_puzzle.c
+++ b/src/rotating_tile_puzzle.c
@@ -10,7 +10,7 @@
 
 #define ROTATE_COUNTERCLOCKWISE 0
 #define ROTATE_CLOCKWISE        1
-#define ROTATE_NONE             2 
+#define ROTATE_NONE             2
 
 struct RotatingTileObject
 {
@@ -129,7 +129,7 @@ u16 MoveRotatingTileObjects(u8 puzzleNumber)
             puzzleTileStart = METATILE_TrickHousePuzzle_Arrow_YellowOnWhite_Right;
 
         // Object is on a metatile before the puzzle tile section
-        // UB: Because this is not if (metatile < puzzleTileStart), for the trick house (metatile - puzzleTileStart) below can result in casting a negative value to u8 
+        // UB: Because this is not if (metatile < puzzleTileStart), for the trick house (metatile - puzzleTileStart) below can result in casting a negative value to u8
         if (metatile < METATILE_MossdeepGym_YellowArrow_Right)
             continue;
 
@@ -223,7 +223,7 @@ void TurnRotatingTileObjects(void)
         // Which means tileDifference will always either be -1 or 3 after the below subtraction, and rotation will always be ROTATE_COUNTERCLOCKWISE after the following conditionals
         tileDifference = (u8)((metatile - puzzleTileStart) % 8);
         tileDifference -= (sRotatingTilePuzzle->objects[i].prevPuzzleTileNum);
-        
+
         // Always true, see above
         if (tileDifference < 0 || tileDifference == 3)
         {
diff --git a/src/roulette.c b/src/roulette.c
index adde16199..9b494d752 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -148,7 +148,7 @@
 #define GFXTAG_SHADOW 14
 
 // 2 different Roulette tables with 2 different rates (normal vs service day special)
-// & 1 gets which table, >> 7 gets if ROULETTE_SPECIAL_RATE is set 
+// & 1 gets which table, >> 7 gets if ROULETTE_SPECIAL_RATE is set
 #define GET_MIN_BET_ID(var)(((var) & 1) + (((var) >> 7) * 2))
 
 // Having Shroomish or Taillow in the party can make rolls more consistent in length
@@ -1448,7 +1448,7 @@ static void ProcessBetGridInput(u8 taskId)
         RouletteFlash_Stop(&sRoulette->flashUtil, 0xFFFF);
         sRoulette->flashUtil.palettes[FLASH_ICON].available = sRoulette->flashUtil.palettes[FLASH_ICON_2].available = sRoulette->flashUtil.palettes[FLASH_ICON_3].available = FALSE;
         FlashSelectionOnWheel(gTasks[taskId].tSelectionId);
-        
+
         // Switch all the poke (column) headers to gray outlines
         for (i = 0; i < NUM_BOARD_POKES; i++)
         {
@@ -1568,11 +1568,11 @@ static u8 GetRandomForBallTravelDistance(u16 ballNum, u16 rand)
             else
                 return 1;
         }
-        else if (!(rand & 3)) 
+        else if (!(rand & 3))
         {
             return sRouletteTables[sRoulette->tableId].randDistanceLow / 2;
         }
-        else 
+        else
         {
             return sRouletteTables[sRoulette->tableId].randDistanceLow;
         }
@@ -1586,11 +1586,11 @@ static u8 GetRandomForBallTravelDistance(u16 ballNum, u16 rand)
             else
                 return 1;
         }
-        else if ((rand & 1) && ballNum > BALLS_PER_ROUND) 
+        else if ((rand & 1) && ballNum > BALLS_PER_ROUND)
         {
             return sRouletteTables[sRoulette->tableId].randDistanceLow / 4;
         }
-        else 
+        else
         {
             return sRouletteTables[sRoulette->tableId].randDistanceLow / 2;
         }
@@ -2060,14 +2060,14 @@ static u8 RecordHit(u8 taskId, u8 slotId)
 {
     u8 i, j;
     u32 columnFlags[NUM_BOARD_POKES] = {
-        F_WYNAUT_COL | F_ORANGE_WYNAUT | F_GREEN_WYNAUT | F_PURPLE_WYNAUT, 
-        F_AZURILL_COL | F_ORANGE_AZURILL | F_GREEN_AZURILL | F_PURPLE_AZURILL, 
-        F_SKITTY_COL | F_ORANGE_SKITTY | F_GREEN_SKITTY | F_PURPLE_SKITTY, 
+        F_WYNAUT_COL | F_ORANGE_WYNAUT | F_GREEN_WYNAUT | F_PURPLE_WYNAUT,
+        F_AZURILL_COL | F_ORANGE_AZURILL | F_GREEN_AZURILL | F_PURPLE_AZURILL,
+        F_SKITTY_COL | F_ORANGE_SKITTY | F_GREEN_SKITTY | F_PURPLE_SKITTY,
         F_MAKUHITA_COL | F_ORANGE_MAKUHITA | F_GREEN_MAKUHITA | F_PURPLE_MAKUHITA
     };
     u32 rowFlags[NUM_BOARD_COLORS] = {
-        F_ORANGE_ROW | F_ORANGE_WYNAUT | F_ORANGE_AZURILL | F_ORANGE_SKITTY | F_ORANGE_MAKUHITA, 
-        F_GREEN_ROW | F_GREEN_WYNAUT | F_GREEN_AZURILL | F_GREEN_SKITTY | F_GREEN_MAKUHITA, 
+        F_ORANGE_ROW | F_ORANGE_WYNAUT | F_ORANGE_AZURILL | F_ORANGE_SKITTY | F_ORANGE_MAKUHITA,
+        F_GREEN_ROW | F_GREEN_WYNAUT | F_GREEN_AZURILL | F_GREEN_SKITTY | F_GREEN_MAKUHITA,
         F_PURPLE_ROW | F_PURPLE_WYNAUT | F_PURPLE_AZURILL | F_PURPLE_SKITTY | F_PURPLE_MAKUHITA
     };
 
@@ -2109,15 +2109,15 @@ static bool8 IsHitInBetSelection(u8 gridSquare, u8 betSelection)
         case COL_AZURILL:
         case COL_SKITTY:
         case COL_MAKUHITA:
-            if (hit == betSelection + ROW_ORANGE 
-             || hit == betSelection + ROW_GREEN 
+            if (hit == betSelection + ROW_ORANGE
+             || hit == betSelection + ROW_GREEN
              || hit == betSelection + ROW_PURPLE)
                 return TRUE;
             break;
         case ROW_ORANGE:
         case ROW_GREEN:
         case ROW_PURPLE:
-            if (hit >= (betSelection + COL_WYNAUT) 
+            if (hit >= (betSelection + COL_WYNAUT)
              && hit <= (betSelection + COL_MAKUHITA))
                 return TRUE;
             break;
@@ -3438,7 +3438,7 @@ static void Task_PrintRouletteEntryMsg(u8 taskId)
     PrintCoinsString(gTasks[taskId].tCoins);
     minBet = sTableMinBets[GET_MIN_BET_ID(gSpecialVar_0x8004)];
     ConvertIntToDecimalStringN(gStringVar1, minBet, STR_CONV_MODE_LEADING_ZEROS, 1);
-    
+
     if (gTasks[taskId].tCoins >= minBet)
     {
         if ((gSpecialVar_0x8004 & ROULETTE_SPECIAL_RATE) && (gSpecialVar_0x8004 & 1))
@@ -3632,8 +3632,8 @@ static void ShowHideGridBalls(bool8 hideAll, u8 hideBallId)
             else
             {
                 gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].invisible = FALSE;
-                gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].pos1.x = (sGridSelections[sRoulette->hitSquares[i]].x + 1) * 8 + 4;
-                gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].pos1.y = (sGridSelections[sRoulette->hitSquares[i]].y + 1) * 8 + 3;
+                gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].x = (sGridSelections[sRoulette->hitSquares[i]].x + 1) * 8 + 4;
+                gSprites[sRoulette->spriteIds[i + SPR_GRID_BALLS]].y = (sGridSelections[sRoulette->hitSquares[i]].y + 1) * 8 + 3;
             }
         }
     }
@@ -3648,8 +3648,8 @@ static void ShowHideWinSlotCursor(u8 selectionId)
     else
     {
         gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].invisible = FALSE;
-        gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].pos1.x = (sGridSelections[selectionId].x + 2) * 8;
-        gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].pos1.y = (sGridSelections[selectionId].y + 2) * 8;
+        gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].x = (sGridSelections[selectionId].x + 2) * 8;
+        gSprites[sRoulette->spriteIds[SPR_WIN_SLOT_CURSOR]].y = (sGridSelections[selectionId].y + 2) * 8;
     }
 }
 
@@ -3688,8 +3688,8 @@ static void SpriteCB_WheelIcon(struct Sprite *sprite)
         angle -= 360;
     sin = Sin2(angle);
     cos = Cos2(angle);
-    sprite->pos2.x =  sin * sprite->data[1] >> 12;
-    sprite->pos2.y = -cos * sprite->data[1] >> 12;
+    sprite->x2 =  sin * sprite->data[1] >> 12;
+    sprite->y2 = -cos * sprite->data[1] >> 12;
     matrixNum = sprite->oam.matrixNum;
     sin /= 16;
     gOamMatrices[matrixNum].d = cos /= 16;
@@ -3845,7 +3845,7 @@ static void SetBallCounterNumLeft(u8 numBalls)
 
 static void SpriteCB_GridSquare(struct Sprite *sprite)
 {
-    sprite->pos2.x = sRoulette->gridX;
+    sprite->x2 = sRoulette->gridX;
 }
 
 static void CreateWheelCenterSprite(void)
@@ -3995,12 +3995,12 @@ static void UpdateBallPos(struct Sprite *sprite)
     sprite->sBallDistToCenter = sRoulette->ballDistToCenter;
     sin = Sin2(sprite->sBallAngle);
     cos = Cos2(sprite->sBallAngle);
-    sprite->pos2.x =  sin * sprite->sBallDistToCenter >> 12;
-    sprite->pos2.y = -cos * sprite->sBallDistToCenter >> 12;
+    sprite->x2 =  sin * sprite->sBallDistToCenter >> 12;
+    sprite->y2 = -cos * sprite->sBallDistToCenter >> 12;
     if (IsSEPlaying())
     {
-        m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, sprite->pos2.x);
-        m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, sprite->pos2.x);
+        m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, sprite->x2);
+        m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, sprite->x2);
     }
 }
 
@@ -4013,9 +4013,9 @@ static void SpriteCB_BallLandInSlot(struct Sprite *sprite)
         sprite->sBallAngle -= 360;
     sin = Sin2(sprite->sBallAngle);
     cos = Cos2(sprite->sBallAngle);
-    sprite->pos2.x =  sin * sprite->sBallDistToCenter >> 12;
-    sprite->pos2.y = -cos * sprite->sBallDistToCenter >> 12;
-    sprite->pos2.y += gSpriteCoordOffsetY;
+    sprite->x2 =  sin * sprite->sBallDistToCenter >> 12;
+    sprite->y2 = -cos * sprite->sBallDistToCenter >> 12;
+    sprite->y2 += gSpriteCoordOffsetY;
 }
 
 static void SpriteCB_UnstickBall_ShroomishBallFall(struct Sprite *sprite)
@@ -4098,9 +4098,9 @@ static void SpriteCB_UnstickBall_Shroomish(struct Sprite *sprite)
 
 static void SpriteCB_UnstickBall_TaillowDrop(struct Sprite *sprite)
 {
-    sprite->pos2.y = (s16)(sprite->data[2] * 0.05f * sprite->data[2]) - 45;
+    sprite->y2 = (s16)(sprite->data[2] * 0.05f * sprite->data[2]) - 45;
     sprite->data[2]++;
-    if (sprite->data[2] >= DEGREES_PER_SLOT && sprite->pos2.y >= 0)
+    if (sprite->data[2] >= DEGREES_PER_SLOT && sprite->y2 >= 0)
     {
         LandBall()
         sRoulette->ballUnstuck = TRUE;
@@ -4111,11 +4111,11 @@ static void SpriteCB_UnstickBall_TaillowPickUp(struct Sprite *sprite)
 {
     if (sprite->data[2]++ < 45)
     {
-        sprite->pos2.y--;
+        sprite->y2--;
         if (sprite->data[2] == 45)
         {
             if (gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]].animCmdIndex == 1)
-                sprite->pos2.y++;
+                sprite->y2++;
         }
     }
     else
@@ -4125,9 +4125,9 @@ static void SpriteCB_UnstickBall_TaillowPickUp(struct Sprite *sprite)
             if (gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]].animDelayCounter == 0)
             {
                 if (gSprites[sRoulette->spriteIds[SPR_CLEAR_MON]].animCmdIndex == 1)
-                    sprite->pos2.y++;
+                    sprite->y2++;
                 else
-                    sprite->pos2.y--;
+                    sprite->y2--;
             }
         }
         else
@@ -4516,8 +4516,8 @@ static void SpriteCB_ShroomishExit(struct Sprite *sprite)
     // Delay for screen shaking, then exit left
     if (sprite->data[1]++ >= sprite->data[3])
     {
-	    sprite->pos1.x -= 2;
-        if (sprite->pos1.x < -16)
+	    sprite->x -= 2;
+        if (sprite->x < -16)
         {
             if (!sRoulette->ballUnstuck)
                 sRoulette->ballUnstuck = TRUE;
@@ -4563,7 +4563,7 @@ static void SpriteCB_ShroomishFall(struct Sprite *sprite)
     f32 timer;
     sprite->data[1]++;
     timer = sprite->data[1];
-    sprite->pos2.y = timer * 0.039f * timer;
+    sprite->y2 = timer * 0.039f * timer;
     sRoulette->shroomishShadowAlpha = sShroomishShadowAlphas[(sRoulette->shroomishShadowTimer - 1) / 2];
     if (sRoulette->shroomishShadowTimer < ARRAY_COUNT(sShroomishShadowAlphas) * 2 - 1)
         sRoulette->shroomishShadowTimer++;
@@ -4636,9 +4636,9 @@ static void SpriteCB_TaillowShadow_Flash(struct Sprite *sprite)
 
 static void SpriteCB_Taillow_FlyAway(struct Sprite *sprite)
 {
-    if (sprite->pos1.y > -16)
+    if (sprite->y > -16)
     {
-        sprite->pos1.y--;
+        sprite->y--;
     }
     else
     {
@@ -4657,9 +4657,9 @@ static void SpriteCB_Taillow_PickUpBall(struct Sprite *sprite)
     if (sprite->data[1] >= 0)
     {
         sprite->data[1]--;
-        sprite->pos1.y--;
+        sprite->y--;
         if (sprite->data[1] == 0 && sprite->animCmdIndex == 1)
-            sprite->pos2.y++;
+            sprite->y2++;
     }
     else
     {
@@ -4669,9 +4669,9 @@ static void SpriteCB_Taillow_PickUpBall(struct Sprite *sprite)
             if (sprite->animDelayCounter == 0)
             {
                 if (sprite->animCmdIndex == 1)
-                    sprite->pos2.y++;
+                    sprite->y2++;
                 else
-                    sprite->pos2.y--;
+                    sprite->y2--;
             }
         }
         else
@@ -4700,10 +4700,10 @@ static void SpriteCB_Taillow_FlyIn(struct Sprite *sprite)
 
     if (sprite->data[1]-- > 7)
     {
-        sprite->pos1.x += xMoveOffsets[sRoulette->ball->sStuckOnWheelLeft] * 2;
+        sprite->x += xMoveOffsets[sRoulette->ball->sStuckOnWheelLeft] * 2;
         if (IsSEPlaying())
         {
-            s8 pan = -((116 - sprite->pos1.x) / 2);
+            s8 pan = -((116 - sprite->x) / 2);
             m4aMPlayPanpotControl(&gMPlayInfo_SE1, 0xFFFF, pan);
             m4aMPlayPanpotControl(&gMPlayInfo_SE2, 0xFFFF, pan);
         }
@@ -4712,8 +4712,8 @@ static void SpriteCB_Taillow_FlyIn(struct Sprite *sprite)
     {
         if (sprite->data[1] >= 0)
         {
-            sprite->pos1.x += xMoveOffsets[sRoulette->ball->sStuckOnWheelLeft] * yMoveOffsets[7 - sprite->data[1]][0];
-            sprite->pos1.y += yMoveOffsets[7 - sprite->data[1]][1];
+            sprite->x += xMoveOffsets[sRoulette->ball->sStuckOnWheelLeft] * yMoveOffsets[7 - sprite->data[1]][0];
+            sprite->y += yMoveOffsets[7 - sprite->data[1]][1];
         }
         else
         {
@@ -4735,7 +4735,7 @@ static void SpriteCB_TaillowShadow_FlyIn(struct Sprite *sprite)
 
     if (sprite->data[1]-- >= 0)
     {
-        sprite->pos1.x += moveDir[sRoulette->ball->sStuckOnWheelLeft] * 2;
+        sprite->x += moveDir[sRoulette->ball->sStuckOnWheelLeft] * 2;
         gSprites[sprite->sMonShadowSpriteId].invisible ^= 1;
     }
     else
diff --git a/src/scrcmd.c b/src/scrcmd.c
index f53483978..dfda7b3a2 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -459,7 +459,7 @@ bool8 ScrCmd_compare_var_to_var(struct ScriptContext *ctx)
     return FALSE;
 }
 
-// Note: addvar doesn't support adding from a variable in vanilla. If you were to 
+// Note: addvar doesn't support adding from a variable in vanilla. If you were to
 // add a VarGet() to the above, make sure you change the `addvar VAR_*, -1`
 // in the contest scripts to `subvar VAR_*, 1`, else contests will break.
 bool8 ScrCmd_addvar(struct ScriptContext *ctx)
@@ -649,7 +649,7 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
     switch (mode)
     {
         case FADE_TO_BLACK:
-        case FADE_TO_WHITE:   
+        case FADE_TO_WHITE:
         default:
             CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE);
             FadeScreen(mode, 0);
diff --git a/src/script_movement.c b/src/script_movement.c
index 013270697..92f36e92d 100644
--- a/src/script_movement.c
+++ b/src/script_movement.c
@@ -66,7 +66,7 @@ static void ScriptMovement_StartMoveObjects(u8 priority)
 
     taskId = CreateTask(ScriptMovement_MoveObjects, priority);
 
-    for (i = 1; i < NUM_TASK_DATA; i++) 
+    for (i = 1; i < NUM_TASK_DATA; i++)
         gTasks[taskId].data[i] = 0xFFFF;
 }
 
diff --git a/src/secret_base.c b/src/secret_base.c
index e1c62e2f2..0a1472e31 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -325,7 +325,7 @@ void ToggleSecretBaseEntranceMetatile(void)
 
     GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
     metatileId = MapGridGetMetatileIdAt(x, y);
-    
+
     // Look for entrance metatiles to open
     for (i = 0; i < ARRAY_COUNT(sSecretBaseEntranceMetatiles); i++)
     {
@@ -1074,7 +1074,7 @@ void DeleteRegistry_Yes_Callback(u8 taskId)
     DestroyListMenuTask(tListTaskId, &tScrollOffset, &tSelectedRow);
     gSaveBlock1Ptr->secretBases[tSelectedBaseId].registryStatus = UNREGISTERED;
     BuildRegistryMenuItems(taskId);
-    sub_812225C(&tScrollOffset, &tSelectedRow, tMaxShownItems, tNumBases);
+    SetCursorWithinListBounds(&tScrollOffset, &tSelectedRow, tMaxShownItems, tNumBases);
     FinalizeRegistryMenu(taskId);
     gTasks[taskId].func = HandleRegistryMenuInput;
 }
@@ -1226,28 +1226,28 @@ void SecretBasePerStepCallback(u8 taskId)
                     VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | SECRET_BASE_USED_SOLID_BOARD);
                 }
             }
-            else if (tileId == METATILE_SecretBase_SmallChair 
-                  || tileId == METATILE_SecretBase_PokemonChair 
-                  || tileId == METATILE_SecretBase_HeavyChair 
-                  || tileId == METATILE_SecretBase_PrettyChair 
-                  || tileId == METATILE_SecretBase_ComfortChair 
-                  || tileId == METATILE_SecretBase_RaggedChair 
-                  || tileId == METATILE_SecretBase_BrickChair 
-                  || tileId == METATILE_SecretBase_CampChair 
+            else if (tileId == METATILE_SecretBase_SmallChair
+                  || tileId == METATILE_SecretBase_PokemonChair
+                  || tileId == METATILE_SecretBase_HeavyChair
+                  || tileId == METATILE_SecretBase_PrettyChair
+                  || tileId == METATILE_SecretBase_ComfortChair
+                  || tileId == METATILE_SecretBase_RaggedChair
+                  || tileId == METATILE_SecretBase_BrickChair
+                  || tileId == METATILE_SecretBase_CampChair
                   || tileId == METATILE_SecretBase_HardChair)
             {
                 if (sInFriendSecretBase == TRUE)
                     VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | SECRET_BASE_USED_CHAIR);
             }
-            else if (tileId == METATILE_SecretBase_RedTent_DoorTop 
-                  || tileId == METATILE_SecretBase_RedTent_Door 
-                  || tileId == METATILE_SecretBase_BlueTent_DoorTop 
+            else if (tileId == METATILE_SecretBase_RedTent_DoorTop
+                  || tileId == METATILE_SecretBase_RedTent_Door
+                  || tileId == METATILE_SecretBase_BlueTent_DoorTop
                   || tileId == METATILE_SecretBase_BlueTent_Door)
             {
                 if (sInFriendSecretBase == TRUE)
                     VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | SECRET_BASE_USED_TENT);
             }
-            else if ((behavior == MB_IMPASSABLE_NORTHEAST && tileId == METATILE_SecretBase_Stand_CornerRight) 
+            else if ((behavior == MB_IMPASSABLE_NORTHEAST && tileId == METATILE_SecretBase_Stand_CornerRight)
                   || (behavior == MB_IMPASSABLE_NORTHWEST && MapGridGetMetatileIdAt(x, y) == METATILE_SecretBase_Stand_CornerLeft))
             {
                 if (sInFriendSecretBase == TRUE)
@@ -1490,7 +1490,7 @@ static void SortSecretBasesByRegistryStatus(void)
     {
         for (j = i + 1; j < SECRET_BASES_COUNT; j++)
         {
-            if ((secretBases[i].registryStatus == UNREGISTERED && secretBases[j].registryStatus == REGISTERED) 
+            if ((secretBases[i].registryStatus == UNREGISTERED && secretBases[j].registryStatus == REGISTERED)
              || (secretBases[i].registryStatus == NEW && secretBases[j].registryStatus != NEW))
             {
                 struct SecretBase temp;
diff --git a/src/shop.c b/src/shop.c
index 2a30bea22..f4e3fa2d8 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -625,8 +625,8 @@ static void BuyMenuAddItemIcon(u16 item, u8 iconSlot)
         if (spriteId != MAX_SPRITES)
         {
             *spriteIdPtr = spriteId;
-            gSprites[spriteId].pos2.x = 24;
-            gSprites[spriteId].pos2.y = 88;
+            gSprites[spriteId].x2 = 24;
+            gSprites[spriteId].y2 = 88;
         }
     }
     else
diff --git a/src/slot_machine.c b/src/slot_machine.c
index 9a3a9ee06..af55e0d9b 100644
--- a/src/slot_machine.c
+++ b/src/slot_machine.c
@@ -660,12 +660,12 @@ static const struct BgTemplate sBgTemplates[] =
 static const struct WindowTemplate sWindowTemplates[] =
 {
     {
-        .bg = 0, 
-        .tilemapLeft = 2, 
-        .tilemapTop = 15, 
-        .width = 27, 
-        .height = 4, 
-        .paletteNum = 15, 
+        .bg = 0,
+        .tilemapLeft = 2,
+        .tilemapTop = 15,
+        .width = 27,
+        .height = 4,
+        .paletteNum = 15,
         .baseBlock = 0x194
     },
     DUMMY_WIN_TEMPLATE
@@ -673,12 +673,12 @@ static const struct WindowTemplate sWindowTemplates[] =
 
 static const struct WindowTemplate sWindowTemplate_InfoBox =
 {
-    .bg = 0, 
-    .tilemapLeft = 1, 
-    .tilemapTop = 3, 
-    .width = 20, 
-    .height = 13, 
-    .paletteNum = 13, 
+    .bg = 0,
+    .tilemapLeft = 1,
+    .tilemapTop = 3,
+    .width = 20,
+    .height = 13,
+    .paletteNum = 13,
     .baseBlock = 1
 };
 
@@ -2184,8 +2184,8 @@ static bool8 AreTagsAtPosition_Reel1(s16 pos, u8 tag1, u8 tag2)
 
 static bool8 AreCherriesOnScreen_Reel1(s16 offsetFromCenter)
 {
-    if (GetTag(LEFT_REEL, 1 - offsetFromCenter) == GFXTAG_CHERRY 
-     || GetTag(LEFT_REEL, 2 - offsetFromCenter) == GFXTAG_CHERRY 
+    if (GetTag(LEFT_REEL, 1 - offsetFromCenter) == GFXTAG_CHERRY
+     || GetTag(LEFT_REEL, 2 - offsetFromCenter) == GFXTAG_CHERRY
      || GetTag(LEFT_REEL, 3 - offsetFromCenter) == GFXTAG_CHERRY)
         return TRUE;
     else
@@ -3605,7 +3605,7 @@ static void SpriteCB_ReelSymbol(struct Sprite *sprite)
 {
     sprite->data[2] = sSlotMachine->reelPixelOffsets[sprite->data[0]] + sprite->data[1];
     sprite->data[2] %= 120;
-    sprite->pos1.y = sSlotMachine->reelPixelOffsetsWhileStopping[sprite->data[0]] + 28 + sprite->data[2];
+    sprite->y = sSlotMachine->reelPixelOffsetsWhileStopping[sprite->data[0]] + 28 + sprite->data[2];
     sprite->sheetTileStart = GetSpriteTileStartByTag(GetTagAtRest(sprite->data[0], sprite->data[2] / 24));
     SetSpriteSheetFrameTileNum(sprite);
 }
@@ -3692,12 +3692,12 @@ static void DestroyReelTimePikachuSprite(void)
 
 static void SpriteCB_ReelTimePikachu(struct Sprite *sprite)
 {
-    sprite->pos2.y = sprite->pos2.x = 0;
+    sprite->y2 = sprite->x2 = 0;
     if (sprite->animNum == 4)
     {
-        sprite->pos2.y = sprite->pos2.x = 8;
+        sprite->y2 = sprite->x2 = 8;
         if ((sprite->animCmdIndex != 0 && sprite->animDelayCounter != 0) || (sprite->animCmdIndex == 0 && sprite->animDelayCounter == 0))
-            sprite->pos2.y = -8;
+            sprite->y2 = -8;
     }
 }
 
@@ -3776,7 +3776,7 @@ static void SpriteCB_ReelTimeNumbers(struct Sprite *sprite)
 {
     s16 r0 = (u16)(sSlotMachine->reeltimePixelOffset + sprite->data[7]);
     r0 %= 40;
-    sprite->pos1.y = r0 + 59;
+    sprite->y = r0 + 59;
     StartSpriteAnimIfDifferent(sprite, GetNearbyReelTimeTag(r0 / 20));
 }
 
@@ -3872,15 +3872,15 @@ static void SpriteCB_ReelTimeBolt(struct Sprite *sprite)
     if (sprite->sDelayTimer != 0)
     {
         sprite->sDelayTimer--;
-        sprite->pos2.x = 0;
-        sprite->pos2.y = 0;
+        sprite->x2 = 0;
+        sprite->y2 = 0;
         sprite->invisible = TRUE;
     }
     else
     {
         sprite->invisible = FALSE;
-        sprite->pos2.x += sprite->sXDir;
-        sprite->pos2.y += sprite->sYDir;
+        sprite->x2 += sprite->sXDir;
+        sprite->y2 += sprite->sYDir;
         if (++sprite->sCounter >= 8)
         {
             sprite->sDelayTimer = sprite->sDelay;
@@ -3971,7 +3971,7 @@ static void CreateReelTimeExplosionSprite(void)
 
 static void SpriteCB_ReelTimeExplosion(struct Sprite *sprite)
 {
-    sprite->pos2.y = gSpriteCoordOffsetY;
+    sprite->y2 = gSpriteCoordOffsetY;
 }
 
 static void DestroyReelTimeExplosionSprite(void)
@@ -3999,8 +3999,8 @@ static void SpriteCB_ReelTimeDuck(struct Sprite *sprite)
 {
     sprite->data[0] -= 2;
     sprite->data[0] &= 0xff;
-    sprite->pos2.x = Cos(sprite->data[0], 20);
-    sprite->pos2.y = Sin(sprite->data[0], 6);
+    sprite->x2 = Cos(sprite->data[0], 20);
+    sprite->y2 = Sin(sprite->data[0], 6);
     sprite->subpriority = 0;
     if (sprite->data[0] >= 0x80)
     {
@@ -4061,7 +4061,7 @@ static void SpriteCB_ReelTimeSmoke(struct Sprite *sprite)
     }
     sprite->sMoveY &= 0xff;
     sprite->sMoveY += 16;
-    sprite->pos2.y -= (sprite->sMoveY >> 8);
+    sprite->y2 -= (sprite->sMoveY >> 8);
 }
 
 static u8 IsReelTimeSmokeAnimFinished(void)
@@ -4147,12 +4147,12 @@ static void SpriteCB_DigitalDisplay_Smoke(struct Sprite *sprite)
         sprite->subspriteTableNum ^= 1;
         sprite->sCounter = 0;
     }
-    sprite->pos2.x = 0;
-    sprite->pos2.y = 0;
+    sprite->x2 = 0;
+    sprite->y2 = 0;
     if (sprite->subspriteTableNum != 0)
     {
-        sprite->pos2.x = targetX[sprite->sSpriteId];
-        sprite->pos2.y = targetY[sprite->sSpriteId];
+        sprite->x2 = targetX[sprite->sSpriteId];
+        sprite->y2 = targetY[sprite->sSpriteId];
     }
 }
 
@@ -4181,10 +4181,10 @@ static void SpriteCB_DigitalDisplay_Reel(struct Sprite *sprite)
     switch (sprite->sState)
     {
     case 0:
-        sprite->pos1.x += 4;
-        if (sprite->pos1.x >= 0xd0)
+        sprite->x += 4;
+        if (sprite->x >= 0xd0)
         {
-            sprite->pos1.x = 0xd0;
+            sprite->x = 0xd0;
             sprite->sState++;
         }
         break;
@@ -4193,8 +4193,8 @@ static void SpriteCB_DigitalDisplay_Reel(struct Sprite *sprite)
             sprite->sState++;
         break;
     case 2:
-        sprite->pos1.x += 4;
-        if (sprite->pos1.x >= 0x110)
+        sprite->x += 4;
+        if (sprite->x >= 0x110)
             sprite->sState++;
         break;
     case 3:
@@ -4209,10 +4209,10 @@ static void SpriteCB_DigitalDisplay_Time(struct Sprite *sprite)
     switch (sprite->sState)
     {
     case 0:
-        sprite->pos1.x -= 4;
-        if (sprite->pos1.x <= 0xd0)
+        sprite->x -= 4;
+        if (sprite->x <= 0xd0)
         {
-            sprite->pos1.x = 0xd0;
+            sprite->x = 0xd0;
             sprite->sState++;
         }
         break;
@@ -4221,8 +4221,8 @@ static void SpriteCB_DigitalDisplay_Time(struct Sprite *sprite)
             sprite->sState++;
         break;
     case 2:
-        sprite->pos1.x -= 4;
-        if (sprite->pos1.x <= 0x90)
+        sprite->x -= 4;
+        if (sprite->x <= 0x90)
             sprite->sState++;
         break;
     case 3:
@@ -4247,10 +4247,10 @@ static void SpriteCB_DigitalDisplay_ReelTimeNumber(struct Sprite *sprite)
         }
         break;
     case 2:
-        sprite->pos1.x += 4;
-        if (sprite->pos1.x >= 0xd0)
+        sprite->x += 4;
+        if (sprite->x >= 0xd0)
         {
-            sprite->pos1.x = 0xd0;
+            sprite->x = 0xd0;
             sprite->sState++;
         }
         break;
@@ -4259,8 +4259,8 @@ static void SpriteCB_DigitalDisplay_ReelTimeNumber(struct Sprite *sprite)
             sprite->sState++;
         break;
     case 4:
-        sprite->pos1.x += 4;
-        if (sprite->pos1.x >= 0xf8)
+        sprite->x += 4;
+        if (sprite->x >= 0xf8)
             sprite->sState++;
         break;
     case 5:
@@ -4278,10 +4278,10 @@ static void SpriteCB_DigitalDisplay_PokeballRocking(struct Sprite *sprite)
         sprite->sState++;
         // fallthrough
     case 1:
-        sprite->pos1.y += 8;
-        if (sprite->pos1.y >= 0x70)
+        sprite->y += 8;
+        if (sprite->y >= 0x70)
         {
-            sprite->pos1.y = 0x70;
+            sprite->y = 0x70;
             sprite->sCounter = 16;
             sprite->sState++;
         }
@@ -4289,7 +4289,7 @@ static void SpriteCB_DigitalDisplay_PokeballRocking(struct Sprite *sprite)
     case 2:
         if (sprite->data[2] == 0)
         {
-            sprite->pos1.y -= sprite->sCounter;
+            sprite->y -= sprite->sCounter;
             sprite->sCounter = -sprite->sCounter;
             if (++sprite->data[3] >= 2)
             {
@@ -4318,10 +4318,10 @@ static void SpriteCB_DigitalDisplay_Stop(struct Sprite *sprite)
             sprite->sState++;
         break;
     case 1:
-        sprite->pos1.y += 2;
-        if (sprite->pos1.y >= 0x30)
+        sprite->y += 2;
+        if (sprite->y >= 0x30)
         {
-            sprite->pos1.y = 0x30;
+            sprite->y = 0x30;
             sprite->sState++;
             sprite->sWaitForAnim = FALSE;
         }
@@ -4397,8 +4397,8 @@ static void SpriteCB_DigitalDisplay_RegBonus(struct Sprite *sprite)
     switch (sprite->sState)
     {
     case 0:
-        sprite->pos2.x = letterXOffset[sprite->sSpriteId];
-        sprite->pos2.y = letterYOffset[sprite->sSpriteId];
+        sprite->x2 = letterXOffset[sprite->sSpriteId];
+        sprite->y2 = letterYOffset[sprite->sSpriteId];
         sprite->sCounter = letterDelay[sprite->sSpriteId];
         sprite->sState++;
         // fallthrough
@@ -4407,17 +4407,17 @@ static void SpriteCB_DigitalDisplay_RegBonus(struct Sprite *sprite)
             sprite->sState++;
         break;
     case 2:
-        if (sprite->pos2.x > 0)
-            sprite->pos2.x -= 4;
-        else if (sprite->pos2.x < 0)
-            sprite->pos2.x += 4;
+        if (sprite->x2 > 0)
+            sprite->x2 -= 4;
+        else if (sprite->x2 < 0)
+            sprite->x2 += 4;
 
-        if (sprite->pos2.y > 0)
-            sprite->pos2.y -= 4;
-        else if (sprite->pos2.y < 0)
-            sprite->pos2.y += 4;
+        if (sprite->y2 > 0)
+            sprite->y2 -= 4;
+        else if (sprite->y2 < 0)
+            sprite->y2 += 4;
 
-        if (sprite->pos2.x == 0 && sprite->pos2.y == 0)
+        if (sprite->x2 == 0 && sprite->y2 == 0)
             sprite->sState++;
         break;
     }
@@ -4432,8 +4432,8 @@ static void SpriteCB_DigitalDisplay_BigBonus(struct Sprite *sprite)
         sprite->sState++;
         sprite->sCounter = 12;
     }
-    sprite->pos2.x = Cos(sp0[sprite->sSpriteId], sprite->sCounter);
-    sprite->pos2.y = Sin(sp0[sprite->sSpriteId], sprite->sCounter);
+    sprite->x2 = Cos(sp0[sprite->sSpriteId], sprite->sCounter);
+    sprite->y2 = Sin(sp0[sprite->sSpriteId], sprite->sCounter);
     if (sprite->sCounter != 0)
         sprite->sCounter--;
 }
@@ -4900,14 +4900,14 @@ static const u16 sSlotMatchFlags[] = {
 };
 
 static const u16 sSlotPayouts[] = {
-    [MATCHED_1CHERRY]   = 2, 
-    [MATCHED_2CHERRY]   = 4, 
-    [MATCHED_REPLAY]    = 0, 
-    [MATCHED_LOTAD]     = 6, 
-    [MATCHED_AZURILL]   = 12, 
-    [MATCHED_POWER]     = 3, 
-    [MATCHED_777_MIXED] = 90, 
-    [MATCHED_777_RED]   = 300, 
+    [MATCHED_1CHERRY]   = 2,
+    [MATCHED_2CHERRY]   = 4,
+    [MATCHED_REPLAY]    = 0,
+    [MATCHED_LOTAD]     = 6,
+    [MATCHED_AZURILL]   = 12,
+    [MATCHED_POWER]     = 3,
+    [MATCHED_777_MIXED] = 90,
+    [MATCHED_777_RED]   = 300,
     [MATCHED_777_BLUE]  = 300
 };
 
@@ -5072,7 +5072,7 @@ static void (*const sDigitalDisplaySceneExitCallbacks[])(void) = {
     [DIG_DISPLAY_BONUS_BIG]  = EndDigitalDisplayScene_Win
 };
 
-static const struct OamData sOam_8x8 = 
+static const struct OamData sOam_8x8 =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -5221,7 +5221,7 @@ static const struct SpriteFrameImage sImageTable_ReelTimeNumbers[] =
 static const struct SpriteFrameImage sImageTable_ReelTimeShadow[] = { gSlotMachineReelTimeShadow, 0x200 };
 static const struct SpriteFrameImage sImageTable_ReelTimeNumberGap[] = { gSlotMachineReelTimeNumberGap_Gfx, 0x40 };
 
-static const struct SpriteFrameImage sImageTable_ReelTimeBolt[] = 
+static const struct SpriteFrameImage sImageTable_ReelTimeBolt[] =
 {
     { gSlotMachineReelTimeBolt0, 0x100 },
     { gSlotMachineReelTimeBolt1, 0x100 },
@@ -5229,8 +5229,8 @@ static const struct SpriteFrameImage sImageTable_ReelTimeBolt[] =
 
 static const struct SpriteFrameImage sImageTable_ReelTimePikachuAura[] = { gSlotMachineReelTimePikaAura, 0x400 };
 
-static const struct SpriteFrameImage sImageTable_ReelTimeExplosion[] = 
-{ 
+static const struct SpriteFrameImage sImageTable_ReelTimeExplosion[] =
+{
     { gSlotMachineReelTimeExplosion0, 0x200 },
     { gSlotMachineReelTimeExplosion1, 0x200 },
 };
@@ -5239,13 +5239,13 @@ static const struct SpriteFrameImage sImageTable_ReelTimeDuck[] = { gSlotMachine
 static const struct SpriteFrameImage sImageTable_ReelTimeSmoke[] = { gSlotMachineReelTimeSmoke, 0x80};
 static const struct SpriteFrameImage sImageTable_PikaPowerBolt[] = { gSlotMachinePikaPowerBolt, 0x20};
 
-static const union AnimCmd sAnim_SingleFrame[] = 
+static const union AnimCmd sAnim_SingleFrame[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_END
 };
 
-static const union AnimCmd sAnim_ReelTimeDuck[] = 
+static const union AnimCmd sAnim_ReelTimeDuck[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_JUMP(0)
@@ -5510,367 +5510,367 @@ static const union AffineAnimCmd *const sAffineAnims_PikaPowerBolt[] =
 
 static const struct SpriteTemplate sSpriteTemplate_ReelSymbol =
 {
-    .tileTag = GFXTAG_SYMBOLS_START, 
-    .paletteTag = PALTAG_REEL, 
-    .oam = &sOam_32x32, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = GFXTAG_SYMBOLS_START,
+    .paletteTag = PALTAG_REEL,
+    .oam = &sOam_32x32,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_ReelSymbol
 };
 
 static const struct SpriteTemplate sSpriteTemplate_CoinNumber =
 {
-    .tileTag = GFXTAG_NUMBERS_START, 
-    .paletteTag = PALTAG_MISC, 
-    .oam = &sOam_8x16, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = GFXTAG_NUMBERS_START,
+    .paletteTag = PALTAG_MISC,
+    .oam = &sOam_8x16,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_CoinNumber
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelBackground =
 {
-    .tileTag = GFXTAG_REEL_BG, 
-    .paletteTag = PALTAG_REEL, 
-    .oam = &sOam_64x64, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = GFXTAG_REEL_BG,
+    .paletteTag = PALTAG_REEL,
+    .oam = &sOam_64x64,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimePikachu =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_REEL_TIME_PIKACHU, 
-    .oam = &sOam_64x64, 
-    .anims = sAnims_ReelTimePikachu, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_REEL_TIME_PIKACHU,
+    .oam = &sOam_64x64,
+    .anims = sAnims_ReelTimePikachu,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_ReelTimePikachu
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimeMachineAntennae =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_REEL_TIME_MISC, 
-    .oam = &sOam_8x16, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_REEL_TIME_MISC,
+    .oam = &sOam_8x16,
     .anims = sAnims_SingleFrame,
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimeMachine =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_REEL_TIME_MACHINE, 
-    .oam = &sOam_8x16, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_REEL_TIME_MACHINE,
+    .oam = &sOam_8x16,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_BrokenReelTimeMachine =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_REEL_TIME_MACHINE, 
-    .oam = &sOam_8x16, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_REEL_TIME_MACHINE,
+    .oam = &sOam_8x16,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimeNumbers =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_MISC, 
-    .oam = &sOam_16x16, 
-    .anims = sAnims_ReelTimeNumbers, 
-    .images = sImageTable_ReelTimeNumbers, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_MISC,
+    .oam = &sOam_16x16,
+    .anims = sAnims_ReelTimeNumbers,
+    .images = sImageTable_ReelTimeNumbers,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_ReelTimeNumbers
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimeShadow =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_MISC, 
-    .oam = &sOam_16x16, 
-    .anims = sAnims_SingleFrame, 
-    .images = sImageTable_ReelTimeShadow, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_MISC,
+    .oam = &sOam_16x16,
+    .anims = sAnims_SingleFrame,
+    .images = sImageTable_ReelTimeShadow,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimeNumberGap =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_MISC, 
-    .oam = &sOam_16x16, 
-    .anims = sAnims_SingleFrame, 
-    .images = sImageTable_ReelTimeNumberGap, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_MISC,
+    .oam = &sOam_16x16,
+    .anims = sAnims_SingleFrame,
+    .images = sImageTable_ReelTimeNumberGap,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimeBolt =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_MISC, 
-    .oam = &sOam_16x32, 
-    .anims = sAnims_ReelTimeBolt, 
-    .images = sImageTable_ReelTimeBolt, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_MISC,
+    .oam = &sOam_16x32,
+    .anims = sAnims_ReelTimeBolt,
+    .images = sImageTable_ReelTimeBolt,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_ReelTimeBolt
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimePikachuAura =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_PIKA_AURA, 
-    .oam = &sOam_32x64, 
-    .anims = sAnims_SingleFrame, 
-    .images = sImageTable_ReelTimePikachuAura, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_PIKA_AURA,
+    .oam = &sOam_32x64,
+    .anims = sAnims_SingleFrame,
+    .images = sImageTable_ReelTimePikachuAura,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_ReelTimePikachuAura
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimeExplosion =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_EXPLOSION, 
-    .oam = &sOam_32x32, 
-    .anims = sAnims_ReelTimeExplosion, 
-    .images = sImageTable_ReelTimeExplosion, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_EXPLOSION,
+    .oam = &sOam_32x32,
+    .anims = sAnims_ReelTimeExplosion,
+    .images = sImageTable_ReelTimeExplosion,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_ReelTimeExplosion
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimeDuck =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_MISC, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_ReelTimeDuck, 
-    .images = sImageTable_ReelTimeDuck, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_MISC,
+    .oam = &sOam_8x8,
+    .anims = sAnims_ReelTimeDuck,
+    .images = sImageTable_ReelTimeDuck,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCB_ReelTimeDuck
 };
 
 static const struct SpriteTemplate sSpriteTemplate_ReelTimeSmoke =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_MISC, 
-    .oam = &sOam_16x16, 
-    .anims = sAnims_SingleFrame, 
-    .images = sImageTable_ReelTimeSmoke, 
-    .affineAnims = sAffineAnims_ReelTimeSmoke, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_MISC,
+    .oam = &sOam_16x16,
+    .anims = sAnims_SingleFrame,
+    .images = sImageTable_ReelTimeSmoke,
+    .affineAnims = sAffineAnims_ReelTimeSmoke,
     .callback = SpriteCB_ReelTimeSmoke
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Reel =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_8x8,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Time =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_8x8,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Insert =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_8x8,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Stop =
 {
-    .tileTag = 18, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = 18,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_8x8,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Win =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_64x32, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_64x32,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Lose =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_64x32, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_64x32,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Bonus =
 {
-    .tileTag = 19, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = 19,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_8x8,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Big =
 {
-    .tileTag = 20, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = 20,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_8x8,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Reg =
 {
-    .tileTag = 21, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = 21,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_8x8,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_AButton =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_32x32, 
-    .anims = sAnims_DigitalDisplay_AButton, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_32x32,
+    .anims = sAnims_DigitalDisplay_AButton,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Smoke =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_SingleFrame, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_8x8,
+    .anims = sAnims_SingleFrame,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Number =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_16x16, 
-    .anims = sAnims_DigitalDisplay_Number, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_16x16,
+    .anims = sAnims_DigitalDisplay_Number,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_Pokeball =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_DigitalDisplay_Pokeball, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_8x8,
+    .anims = sAnims_DigitalDisplay_Pokeball,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_DigitalDisplay_DPad =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_DIG_DISPLAY, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_DigitalDisplay_DPad, 
-    .images = NULL, 
-    .affineAnims = gDummySpriteAffineAnimTable, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_DIG_DISPLAY,
+    .oam = &sOam_8x8,
+    .anims = sAnims_DigitalDisplay_DPad,
+    .images = NULL,
+    .affineAnims = gDummySpriteAffineAnimTable,
     .callback = SpriteCallbackDummy
 };
 
 static const struct SpriteTemplate sSpriteTemplate_PikaPowerBolt =
 {
-    .tileTag = 0xFFFF, 
-    .paletteTag = PALTAG_MISC, 
-    .oam = &sOam_8x8, 
-    .anims = sAnims_SingleFrame, 
-    .images = sImageTable_PikaPowerBolt, 
-    .affineAnims = sAffineAnims_PikaPowerBolt, 
+    .tileTag = TAG_NONE,
+    .paletteTag = PALTAG_MISC,
+    .oam = &sOam_8x8,
+    .anims = sAnims_SingleFrame,
+    .images = sImageTable_PikaPowerBolt,
+    .affineAnims = sAffineAnims_PikaPowerBolt,
     .callback = SpriteCB_PikaPowerBolt
 };
 
 static const struct Subsprite sSubsprites_ReelBackground[] =
 {
     {
-        .x = -64, 
-        .y = -64, 
+        .x = -64,
+        .y = -64,
         .shape = SPRITE_SHAPE(64x64),
         .size = SPRITE_SIZE(64x64),
-        .tileOffset = 0, 
-        .priority = 3, 
+        .tileOffset = 0,
+        .priority = 3,
     },
     {
-        .x = 0, 
-        .y = -64, 
+        .x = 0,
+        .y = -64,
         .shape = SPRITE_SHAPE(64x64),
         .size = SPRITE_SIZE(64x64),
-        .tileOffset = 0, 
-        .priority = 3, 
+        .tileOffset = 0,
+        .priority = 3,
     },
     {
         .x = -64,
-        .y = 0, 
+        .y = 0,
         .shape = SPRITE_SHAPE(64x64),
         .size = SPRITE_SIZE(64x64),
-        .tileOffset = 0, 
-        .priority = 3, 
+        .tileOffset = 0,
+        .priority = 3,
     },
     {
-        .x = 0, 
-        .y = 0, 
+        .x = 0,
+        .y = 0,
         .shape = SPRITE_SHAPE(64x64),
         .size = SPRITE_SIZE(64x64),
-        .tileOffset = 0, 
-        .priority = 3, 
+        .tileOffset = 0,
+        .priority = 3,
     }
 };
 
@@ -5881,52 +5881,52 @@ static const struct SubspriteTable sSubspriteTable_ReelBackground[] =
 
 static const struct Subsprite sSubsprites_ReelTimeMachineAntennae[] =
 {
-    { 
-        .x = -32, 
-        .y = -12, 
+    {
+        .x = -32,
+        .y = -12,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
-        .tileOffset = 0, 
+        .tileOffset = 0,
         .priority = 1,
     },
-    { 
-        .x = 0, 
-        .y = -12, 
+    {
+        .x = 0,
+        .y = -12,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 4,
         .priority = 1,
     },
-    { 
-        .x = -32, 
-        .y = -4, 
+    {
+        .x = -32,
+        .y = -4,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
-        .tileOffset = 8, 
+        .tileOffset = 8,
         .priority = 1,
     },
-    { 
-        .x = 0, 
-        .y = -4, 
+    {
+        .x = 0,
+        .y = -4,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 12,
         .priority = 1,
     },
-    { 
-        .x = -32, 
-        .y = 4, 
+    {
+        .x = -32,
+        .y = 4,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 16,
         .priority = 1,
     },
-    { 
-        .x = 0, 
-        .y = 4, 
+    {
+        .x = 0,
+        .y = 4,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
-        .tileOffset = 20, 
+        .tileOffset = 20,
         .priority = 1
     }
 };
@@ -5938,25 +5938,25 @@ static const struct SubspriteTable sSubspriteTable_ReelTimeMachineAntennae[] =
 
 static const struct Subsprite sSubsprites_ReelTimeMachine[] =
 {
-    { 
-        .x = -32, 
-        .y = -20, 
+    {
+        .x = -32,
+        .y = -20,
         .shape = SPRITE_SHAPE(64x32),
         .size = SPRITE_SIZE(64x32),
         .tileOffset = 0,
         .priority = 1,
     },
-    { 
-        .x = -32, 
-        .y = 12, 
+    {
+        .x = -32,
+        .y = 12,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 32,
         .priority = 1,
     },
-    { 
-        .x = 0, 
-        .y = 12, 
+    {
+        .x = 0,
+        .y = 12,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 36,
@@ -5971,41 +5971,41 @@ static const struct SubspriteTable sSubspriteTable_ReelTimeMachine[] =
 
 static const struct Subsprite sSubsprites_BrokenReelTimeMachine[] =
 {
-    { 
-        .x = -32, 
-        .y = -24, 
+    {
+        .x = -32,
+        .y = -24,
         .shape = SPRITE_SHAPE(64x32),
         .size = SPRITE_SIZE(64x32),
         .tileOffset = 0,
         .priority = 1,
     },
-    { 
-        .x = -32, 
-        .y = 8, 
+    {
+        .x = -32,
+        .y = 8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 32,
         .priority = 1,
     },
-    { 
-        .x = 0, 
-        .y = 8, 
+    {
+        .x = 0,
+        .y = 8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 36,
         .priority = 1,
     },
-    { 
-        .x = -32, 
-        .y = 16, 
+    {
+        .x = -32,
+        .y = 16,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 40,
         .priority = 1,
     },
-    { 
-        .x = 0, 
-        .y = 16, 
+    {
+        .x = 0,
+        .y = 16,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 44,
@@ -6020,33 +6020,33 @@ static const struct SubspriteTable sSubspriteTable_BrokenReelTimeMachine[] =
 
 static const struct Subsprite sSubsprites_ReelTimeShadow[] =
 {
-    { 
-        .x = -32, 
-        .y = -8, 
+    {
+        .x = -32,
+        .y = -8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 0,
         .priority = 1,
     },
-    { 
-        .x = 0, 
-        .y = -8, 
+    {
+        .x = 0,
+        .y = -8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 4,
         .priority = 1,
     },
-    { 
-        .x = -32, 
-        .y = 0, 
+    {
+        .x = -32,
+        .y = 0,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 8,
         .priority = 1,
     },
-    { 
-        .x = 0, 
-        .y = 0, 
+    {
+        .x = 0,
+        .y = 0,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 12,
@@ -6061,25 +6061,25 @@ static const struct SubspriteTable sSubspriteTable_ReelTimeShadow[] =
 
 static const struct Subsprite sSubsprites_ReelTimeNumberGap[] =
 {
-    { 
-        .x = -8, 
-        .y = -12, 
+    {
+        .x = -8,
+        .y = -12,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 0,
         .priority = 1,
     },
-    { 
-        .x = -8, 
-        .y = -4, 
+    {
+        .x = -8,
+        .y = -4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 0,
         .priority = 1,
     },
-    { 
-        .x = -8, 
-        .y = 4, 
+    {
+        .x = -8,
+        .y = 4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 0,
@@ -6094,41 +6094,41 @@ static const struct SubspriteTable sSubspriteTable_ReelTimeNumberGap[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_Reel[] =
 {
-    { 
-        .x = -32, 
-        .y = -24, 
+    {
+        .x = -32,
+        .y = -24,
         .shape = SPRITE_SHAPE(64x32),
         .size = SPRITE_SIZE(64x32),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = -32, 
-        .y = 8, 
+    {
+        .x = -32,
+        .y = 8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 32,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = 8, 
+    {
+        .x = 0,
+        .y = 8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 36,
         .priority = 3,
     },
-    { 
-        .x = -32, 
-        .y = 16, 
+    {
+        .x = -32,
+        .y = 16,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 40,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = 16, 
+    {
+        .x = 0,
+        .y = 16,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 44,
@@ -6143,33 +6143,33 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Reel[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_Time[] =
 {
-    { 
-        .x = -32, 
-        .y = -8, 
+    {
+        .x = -32,
+        .y = -8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = -8, 
+    {
+        .x = 0,
+        .y = -8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 4,
         .priority = 3,
     },
-    { 
-        .x = -32, 
-        .y = 0, 
+    {
+        .x = -32,
+        .y = 0,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 8,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = 0, 
+    {
+        .x = 0,
+        .y = 0,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 12,
@@ -6184,33 +6184,33 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Time[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_Insert[] =
 {
-    { 
-        .x = -32, 
-        .y = -8, 
+    {
+        .x = -32,
+        .y = -8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = -8, 
+    {
+        .x = 0,
+        .y = -8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 4,
         .priority = 3,
     },
-    { 
-        .x = -32, 
-        .y = 0, 
+    {
+        .x = -32,
+        .y = 0,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 8,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = 0, 
+    {
+        .x = 0,
+        .y = 0,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 12,
@@ -6225,33 +6225,33 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Insert[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_Unused1[] =
 {
-    { 
-        .x = -32, 
-        .y = -8, 
+    {
+        .x = -32,
+        .y = -8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = -8, 
+    {
+        .x = 0,
+        .y = -8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 4,
         .priority = 3,
     },
-    { 
-        .x = -32, 
-        .y = 0, 
+    {
+        .x = -32,
+        .y = 0,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 8,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = 0,  
+    {
+        .x = 0,
+        .y = 0,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 12,
@@ -6266,49 +6266,49 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Unused1[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_Win[] =
 {
-    { 
-        .x = -32, 
-        .y = -12, 
+    {
+        .x = -32,
+        .y = -12,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = -12, 
+    {
+        .x = 0,
+        .y = -12,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 4,
         .priority = 3,
     },
-    { 
-        .x = -32, 
-        .y = -4, 
+    {
+        .x = -32,
+        .y = -4,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 8,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = -4, 
+    {
+        .x = 0,
+        .y = -4,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 12,
         .priority = 3,
     },
-    { 
-        .x = -32, 
-        .y = 4, 
+    {
+        .x = -32,
+        .y = 4,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 16,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = 4, 
+    {
+        .x = 0,
+        .y = 4,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 20,
@@ -6324,8 +6324,8 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Win[] =
 static const struct Subsprite sSubsprites_DigitalDisplay_Smoke[] =
 {
     {
-        .x = -16, 
-        .y = -16, 
+        .x = -16,
+        .y = -16,
         .shape = SPRITE_SHAPE(32x32),
         .size = SPRITE_SIZE(32x32),
         .tileOffset = 0,
@@ -6336,8 +6336,8 @@ static const struct Subsprite sSubsprites_DigitalDisplay_Smoke[] =
 static const struct Subsprite sSubsprites_DigitalDisplay_Unused2[] =
 {
     {
-        .x = -8, 
-        .y = -8, 
+        .x = -8,
+        .y = -8,
         .shape = SPRITE_SHAPE(16x16),
         .size = SPRITE_SIZE(16x16),
         .tileOffset = 16,
@@ -6357,97 +6357,97 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Unused2[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_Pokeball[] =
 {
-    { 
-        .x = -24, 
-        .y = -24, 
+    {
+        .x = -24,
+        .y = -24,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = 8, 
-        -24, 
+    {
+        .x = 8,
+        -24,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 4,
         .priority = 3,
     },
-    { 
-        .x = -24, 
-        .y = -16, 
+    {
+        .x = -24,
+        .y = -16,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 6,
         .priority = 3,
     },
-    { 
-        .x = 8, 
-        .y = -16, 
+    {
+        .x = 8,
+        .y = -16,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 10,
         .priority = 3,
     },
-    { 
-        .x = -24, 
-        .y = -8, 
+    {
+        .x = -24,
+        .y = -8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 12,
         .priority = 3,
     },
-    { 
-        .x = 8, 
-        .y = -8,  
+    {
+        .x = 8,
+        .y = -8,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 16,
         .priority = 3,
     },
-    { 
-        .x = -24, 
-        .y = 0, 
+    {
+        .x = -24,
+        .y = 0,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 18,
         .priority = 3,
     },
-    { 
-        .x = 8, 
-        .y = 0, 
+    {
+        .x = 8,
+        .y = 0,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 22,
         .priority = 3,
     },
-    { 
-        .x = -24, 
-        .y = 8, 
+    {
+        .x = -24,
+        .y = 8,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 24,
         .priority = 3,
     },
-    { 
-        .x = 8, 
-        .y = 8, 
+    {
+        .x = 8,
+        .y = 8,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 28,
         .priority = 3,
     },
-    { 
-        .x = -24, 
-        .y = 16, 
+    {
+        .x = -24,
+        .y = 16,
         .shape = SPRITE_SHAPE(32x8),
         .size = SPRITE_SIZE(32x8),
         .tileOffset = 30,
         .priority = 3,
     },
-    { 
-        .x = 8, 
-        .y = 16, 
+    {
+        .x = 8,
+        .y = 16,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 34,
@@ -6462,25 +6462,25 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_Pokeball[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_DPad[] =
 {
-    { 
-        .x = -16, 
-        .y = -12, 
+    {
+        .x = -16,
+        .y = -12,
         .shape = SPRITE_SHAPE(32x16),
         .size = SPRITE_SIZE(32x16),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = -16, 
-        .y = 4, 
+    {
+        .x = -16,
+        .y = 4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 8,
         .priority = 3,
     },
-    { 
-        .x = 0, 
-        .y = 4, 
+    {
+        .x = 0,
+        .y = 4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 10,
@@ -6495,17 +6495,17 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_DPad[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_StopS[] =
 {
-    { 
-        .x = -8, 
-        .y = -8, 
+    {
+        .x = -8,
+        .y = -8,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = 0, 
+    {
+        .x = -8,
+        .y = 0,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 8,
@@ -6520,17 +6520,17 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_StopS[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_StopT[] =
 {
-    { 
-        .x = -8, 
-        .y = -8, 
+    {
+        .x = -8,
+        .y = -8,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 2,
         .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = 0, 
+    {
+        .x = -8,
+        .y = 0,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 10,
@@ -6545,17 +6545,17 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_StopT[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_StopO[] =
 {
-    { 
-        .x = -8, 
-        .y = -8, 
+    {
+        .x = -8,
+        .y = -8,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 4,
         .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = 0, 
+    {
+        .x = -8,
+        .y = 0,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 12,
@@ -6570,17 +6570,17 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_StopO[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_StopP[] =
 {
-    { 
-        .x = -8, 
-        .y = -8, 
+    {
+        .x = -8,
+        .y = -8,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 6,
         .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = 0, 
+    {
+        .x = -8,
+        .y = 0,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 14,
@@ -6595,17 +6595,17 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_StopP[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_BonusB[] =
 {
-    { 
-        .x = -8, 
-        .y = -8, 
+    {
+        .x = -8,
+        .y = -8,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = 0, 
+    {
+        .x = -8,
+        .y = 0,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 8,
@@ -6620,17 +6620,17 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BonusB[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_BonusO[] =
 {
-    { 
-        .x = -4, 
-        .y = -8, 
+    {
+        .x = -4,
+        .y = -8,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 2,
         .priority = 3,
     },
-    { 
-        .x = -4, 
-        .y = 0, 
+    {
+        .x = -4,
+        .y = 0,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 10,
@@ -6645,17 +6645,17 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BonusO[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_BonusN[] =
 {
-    { 
-        .x = -8, 
-        .y = -8, 
+    {
+        .x = -8,
+        .y = -8,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
-        .tileOffset = 3, 
-        .priority = 3, 
+        .tileOffset = 3,
+        .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = 0, 
+    {
+        .x = -8,
+        .y = 0,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 11,
@@ -6670,17 +6670,17 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BonusN[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_BonusU[] =
 {
-    { 
-        .x = -4, 
-        .y = -8, 
+    {
+        .x = -4,
+        .y = -8,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 5,
         .priority = 3,
     },
-    { 
-        .x = -4, 
-        .y = 0, 
+    {
+        .x = -4,
+        .y = 0,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 13,
@@ -6695,17 +6695,17 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BonusU[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_BonusS[] =
 {
-    { 
-        .x = -8, 
-        .y = -8, 
+    {
+        .x = -8,
+        .y = -8,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 6,
         .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = 0, 
+    {
+        .x = -8,
+        .y = 0,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 14,
@@ -6720,49 +6720,49 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BonusS[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_BigB[] =
 {
-    { 
-        .x = -12, 
-        .y = -12, 
+    {
+        .x = -12,
+        .y = -12,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = -12, 
+    {
+        .x = 4,
+        .y = -12,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 2,
         .priority = 3,
     },
-    { 
-        .x = -12, 
-        .y = -4, 
+    {
+        .x = -12,
+        .y = -4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 8,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = -4, 
+    {
+        .x = 4,
+        .y = -4,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 10,
         .priority = 3,
     },
-    { 
-        .x = -12, 
-        .y = 4, 
+    {
+        .x = -12,
+        .y = 4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 16,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = 4, 
+    {
+        .x = 4,
+        .y = 4,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 18,
@@ -6777,25 +6777,25 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BigB[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_BigI[] =
 {
-    { 
-        .x = -8, 
-        .y = -12, 
+    {
+        .x = -8,
+        .y = -12,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 3,
         .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = -4, 
+    {
+        .x = -8,
+        .y = -4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 11,
         .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = 4, 
+    {
+        .x = -8,
+        .y = 4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 19,
@@ -6810,49 +6810,49 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BigI[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_BigG[] =
 {
-    { 
-        .x = -12, 
-        .y = -12, 
+    {
+        .x = -12,
+        .y = -12,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 5,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = -12, 
+    {
+        .x = 4,
+        .y = -12,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 7,
         .priority = 3,
     },
-    { 
-        .x = -12, 
-        .y = -4, 
+    {
+        .x = -12,
+        .y = -4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 13,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = -4, 
+    {
+        .x = 4,
+        .y = -4,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 15,
         .priority = 3,
     },
-    { 
-        .x = -12, 
-        .y = 4, 
+    {
+        .x = -12,
+        .y = 4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 21,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = 4, 
+    {
+        .x = 4,
+        .y = 4,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 23,
@@ -6867,49 +6867,49 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_BigG[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_RegR[] =
 {
-    { 
-        .x = -12, 
-        .y = -12, 
+    {
+        .x = -12,
+        .y = -12,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 0,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = -12, 
+    {
+        .x = 4,
+        .y = -12,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 2,
         .priority = 3,
     },
-    { 
-        .x = -12, 
-        .y = -4, 
+    {
+        .x = -12,
+        .y = -4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 8,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = -4, 
+    {
+        .x = 4,
+        .y = -4,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 10,
         .priority = 3,
     },
-    { 
-        .x = -12, 
-        .y = 4, 
+    {
+        .x = -12,
+        .y = 4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 16,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = 4, 
+    {
+        .x = 4,
+        .y = 4,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 18,
@@ -6924,25 +6924,25 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_RegR[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_RegE[] =
 {
-    { 
-        .x = -8, 
-        .y = -12, 
+    {
+        .x = -8,
+        .y = -12,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 3,
         .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = -4, 
+    {
+        .x = -8,
+        .y = -4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 11,
         .priority = 3,
     },
-    { 
-        .x = -8, 
-        .y = 4, 
+    {
+        .x = -8,
+        .y = 4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 19,
@@ -6957,49 +6957,49 @@ static const struct SubspriteTable sSubspriteTable_DigitalDisplay_RegE[] =
 
 static const struct Subsprite sSubsprites_DigitalDisplay_RegG[] =
 {
-    { 
-        .x = -12, 
-        .y = -12, 
+    {
+        .x = -12,
+        .y = -12,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 5,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = -12, 
+    {
+        .x = 4,
+        .y = -12,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 7,
         .priority = 3,
     },
-    { 
-        .x = -12, 
-        .y = -4, 
+    {
+        .x = -12,
+        .y = -4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 13,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = -4, 
+    {
+        .x = 4,
+        .y = -4,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 15,
         .priority = 3,
     },
-    { 
-        .x = -12, 
-        .y = 4, 
+    {
+        .x = -12,
+        .y = 4,
         .shape = SPRITE_SHAPE(16x8),
         .size = SPRITE_SIZE(16x8),
         .tileOffset = 21,
         .priority = 3,
     },
-    { 
-        .x = 4, 
-        .y = 4, 
+    {
+        .x = 4,
+        .y = 4,
         .shape = SPRITE_SHAPE(8x8),
         .size = SPRITE_SIZE(8x8),
         .tileOffset = 23,
@@ -7102,7 +7102,7 @@ static const struct SpriteSheet sSlotMachineSpriteSheets[22] =
 
 static const u8 *const sReelBackground_Tilemap = gSlotMachineReelBackground_Tilemap;
 
-static const u16 sUnused[] = 
+static const u16 sUnused[] =
 {
     0x6F7B,
     0x6968,
@@ -7141,9 +7141,9 @@ static const u16 *const sDarkMatchLinePalTable[NUM_MATCH_LINES] =
 };
 
 static const u8 sMatchLinePalOffsets[NUM_MATCH_LINES] = {
-    [MATCH_MIDDLE_ROW] = 74, 
-    [MATCH_TOP_ROW]    = 75, 
-    [MATCH_BOTTOM_ROW] = 76, 
+    [MATCH_MIDDLE_ROW] = 74,
+    [MATCH_TOP_ROW]    = 75,
+    [MATCH_BOTTOM_ROW] = 76,
     [MATCH_NWSE_DIAG]  = 78, // Diag colors flipped for some reason
     [MATCH_NESW_DIAG]  = 77  // Doesn't matter as both are identical
 };
diff --git a/src/start_menu.c b/src/start_menu.c
index 3fcb5aa7b..9f271b890 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -198,12 +198,12 @@ static const struct WindowTemplate sWindowTemplates_LinkBattleSave[] =
 };
 
 static const struct WindowTemplate sSaveInfoWindowTemplate = {
-    .bg = 0, 
-    .tilemapLeft = 1, 
-    .tilemapTop = 1, 
-    .width = 14, 
-    .height = 10, 
-    .paletteNum = 15, 
+    .bg = 0,
+    .tilemapLeft = 1,
+    .tilemapTop = 1,
+    .width = 14,
+    .height = 10,
+    .paletteNum = 15,
     .baseBlock = 8
 };
 
diff --git a/src/starter_choose.c b/src/starter_choose.c
index 92cb2d48c..37c334680 100644
--- a/src/starter_choose.c
+++ b/src/starter_choose.c
@@ -523,8 +523,8 @@ static void Task_HandleStarterChooseInput(u8 taskId)
 static void Task_WaitForStarterSprite(u8 taskId)
 {
     if (gSprites[gTasks[taskId].tCircleSpriteId].affineAnimEnded &&
-        gSprites[gTasks[taskId].tCircleSpriteId].pos1.x == STARTER_PKMN_POS_X &&
-        gSprites[gTasks[taskId].tCircleSpriteId].pos1.y == STARTER_PKMN_POS_Y)
+        gSprites[gTasks[taskId].tCircleSpriteId].x == STARTER_PKMN_POS_X &&
+        gSprites[gTasks[taskId].tCircleSpriteId].y == STARTER_PKMN_POS_Y)
     {
         gTasks[taskId].func = Task_AskConfirmStarter;
     }
@@ -635,7 +635,7 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
 {
     u8 spriteId;
 
-    spriteId = CreatePicSprite2(species, SHINY_ODDS, 0, 1, x, y, 0xE, 0xFFFF);
+    spriteId = CreatePicSprite2(species, SHINY_ODDS, 0, 1, x, y, 0xE, TAG_NONE);
     gSprites[spriteId].oam.priority = 0;
     return spriteId;
 }
@@ -643,9 +643,9 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
 static void SpriteCB_SelectionHand(struct Sprite *sprite)
 {
     // Float up and down above selected pokeball
-    sprite->pos1.x = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][0];
-    sprite->pos1.y = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][1];
-    sprite->pos2.y = Sin(sprite->data[1], 8);
+    sprite->x = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][0];
+    sprite->y = sCursorCoords[gTasks[sprite->data[0]].tStarterSelection][1];
+    sprite->y2 = Sin(sprite->data[1], 8);
     sprite->data[1] = (u8)(sprite->data[1]) + 4;
 }
 
@@ -661,12 +661,12 @@ static void SpriteCB_Pokeball(struct Sprite *sprite)
 static void SpriteCB_StarterPokemon(struct Sprite *sprite)
 {
     // Move sprite to upper center of screen
-    if (sprite->pos1.x > STARTER_PKMN_POS_X)
-        sprite->pos1.x -= 4;
-    if (sprite->pos1.x < STARTER_PKMN_POS_X)
-        sprite->pos1.x += 4;
-    if (sprite->pos1.y > STARTER_PKMN_POS_Y)
-        sprite->pos1.y -= 2;
-    if (sprite->pos1.y < STARTER_PKMN_POS_Y)
-        sprite->pos1.y += 2;
+    if (sprite->x > STARTER_PKMN_POS_X)
+        sprite->x -= 4;
+    if (sprite->x < STARTER_PKMN_POS_X)
+        sprite->x += 4;
+    if (sprite->y > STARTER_PKMN_POS_Y)
+        sprite->y -= 2;
+    if (sprite->y < STARTER_PKMN_POS_Y)
+        sprite->y += 2;
 }
diff --git a/src/strings.c b/src/strings.c
index 4987e32d2..bebe89011 100644
--- a/src/strings.c
+++ b/src/strings.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "strings.h"
 #include "battle_pyramid_bag.h"
+#include "item_menu.h"
 
 ALIGNED(4)
 const u8 gText_ExpandedPlaceholder_Empty[] = _("");
@@ -255,18 +256,18 @@ const u8 gText_ThePC[] = _("the PC");
 
 const u8 *const gBagMenu_ReturnToStrings[] =
 {
-    gText_TheField,
-    gText_TheBattle,
-    gText_ThePokemonList,
-    gText_TheShop,
-    gText_TheField,
-    gText_TheField,
-    gText_ThePC,
-    gText_TheField,
-    gText_TheField,
-    gText_TheField,
-    gText_TheBattle,
-    gText_ThePC
+    [ITEMMENULOCATION_FIELD]               = gText_TheField,
+    [ITEMMENULOCATION_BATTLE]              = gText_TheBattle,
+    [ITEMMENULOCATION_PARTY]               = gText_ThePokemonList,
+    [ITEMMENULOCATION_SHOP]                = gText_TheShop,
+    [ITEMMENULOCATION_BERRY_TREE]          = gText_TheField,
+    [ITEMMENULOCATION_BERRY_BLENDER_CRUSH] = gText_TheField,
+    [ITEMMENULOCATION_ITEMPC]              = gText_ThePC,
+    [ITEMMENULOCATION_FAVOR_LADY]          = gText_TheField,
+    [ITEMMENULOCATION_QUIZ_LADY]           = gText_TheField,
+    [ITEMMENULOCATION_APPRENTICE]          = gText_TheField,
+    [ITEMMENULOCATION_WALLY]               = gText_TheBattle,
+    [ITEMMENULOCATION_PCBOX]               = gText_ThePC
 };
 
 const u8 *const gPyramidBagMenu_ReturnToStrings[] =
@@ -286,15 +287,15 @@ const u8 gText_KeyItemsPocket[] = _("KEY ITEMS");
 
 const u8 *const gPocketNamesStringsTable[] =
 {
-    gText_ItemsPocket,
-    gText_PokeBallsPocket,
-    gText_TMHMPocket,
-    gText_BerriesPocket,
-    gText_KeyItemsPocket
+    [ITEMS_POCKET] = gText_ItemsPocket,
+    [BALLS_POCKET] = gText_PokeBallsPocket,
+    [TMHM_POCKET]  = gText_TMHMPocket,
+    [BERRIES_POCKET] = gText_BerriesPocket,
+    [KEYITEMS_POCKET] = gText_KeyItemsPocket
 };
 
-const u8 gText_NumberVar1Clear7Var2[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}");
-const u8 gText_ClearTo11Var1Clear5Var2[] = _("{CLEAR_TO 0x11}{STR_VAR_1}{CLEAR 0x05}{STR_VAR_2}");
+const u8 gText_NumberItem_TMBerry[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}");
+const u8 gText_NumberItem_HM[] = _("{CLEAR_TO 0x11}{STR_VAR_1}{CLEAR 0x05}{STR_VAR_2}");
 const u8 gText_SizeSlash[] = _("SIZE /");
 const u8 gText_FirmSlash[] = _("FIRM /");
 const u8 gText_Var1DotVar2[] = _("{STR_VAR_1}.{STR_VAR_2}”");
@@ -657,7 +658,7 @@ const u8 gText_Satisfied[] = _("Satisfied");
 const u8 gText_Dissatisfied[] = _("Dissatisfied");
 const u8 gText_DeepSeaTooth[] = _("DEEPSEATOOTH");
 const u8 gText_DeepSeaScale[] = _("DEEPSEASCALE");
-const u8 gText_BlueFlute2[] = _("BLUE FLUTE"); 
+const u8 gText_BlueFlute2[] = _("BLUE FLUTE");
 const u8 gText_YellowFlute2[] = _("YELLOW FLUTE");
 const u8 gText_RedFlute2[] = _("RED FLUTE");
 const u8 gText_WhiteFlute2[] = _("WHITE FLUTE");
diff --git a/src/title_screen.c b/src/title_screen.c
index cf356cefa..3b60146b9 100644
--- a/src/title_screen.c
+++ b/src/title_screen.c
@@ -358,12 +358,12 @@ static void SpriteCB_VersionBannerLeft(struct Sprite *sprite)
     if (gTasks[sprite->data[1]].data[1] != 0)
     {
         sprite->oam.objMode = ST_OAM_OBJ_NORMAL;
-        sprite->pos1.y = VERSION_BANNER_Y_GOAL;
+        sprite->y = VERSION_BANNER_Y_GOAL;
     }
     else
     {
-        if (sprite->pos1.y != VERSION_BANNER_Y_GOAL)
-            sprite->pos1.y++;
+        if (sprite->y != VERSION_BANNER_Y_GOAL)
+            sprite->y++;
         if (sprite->data[0] != 0)
             sprite->data[0]--;
         SetGpuReg(REG_OFFSET_BLDALPHA, gTitleScreenAlphaBlend[sprite->data[0]]);
@@ -375,12 +375,12 @@ static void SpriteCB_VersionBannerRight(struct Sprite *sprite)
     if (gTasks[sprite->data[1]].data[1] != 0)
     {
         sprite->oam.objMode = ST_OAM_OBJ_NORMAL;
-        sprite->pos1.y = VERSION_BANNER_Y_GOAL;
+        sprite->y = VERSION_BANNER_Y_GOAL;
     }
     else
     {
-        if (sprite->pos1.y != VERSION_BANNER_Y_GOAL)
-            sprite->pos1.y++;
+        if (sprite->y != VERSION_BANNER_Y_GOAL)
+            sprite->y++;
     }
 }
 
@@ -430,13 +430,13 @@ static void CreateCopyrightBanner(s16 x, s16 y)
 
 static void SpriteCB_PokemonLogoShine(struct Sprite *sprite)
 {
-    if (sprite->pos1.x < DISPLAY_WIDTH + 32)
+    if (sprite->x < DISPLAY_WIDTH + 32)
     {
         if (sprite->data[0]) // Flash background
         {
             u16 backgroundColor;
 
-            if (sprite->pos1.x < DISPLAY_WIDTH / 2)
+            if (sprite->x < DISPLAY_WIDTH / 2)
             {
                 // Brighten background color
                 if (sprite->data[1] < 31)
@@ -454,15 +454,15 @@ static void SpriteCB_PokemonLogoShine(struct Sprite *sprite)
             }
 
             backgroundColor = _RGB(sprite->data[1], sprite->data[1], sprite->data[1]);
-            if (sprite->pos1.x == DISPLAY_WIDTH / 2 + 12
-                || sprite->pos1.x == DISPLAY_WIDTH / 2 + 16
-                || sprite->pos1.x == DISPLAY_WIDTH / 2 + 20
-                || sprite->pos1.x == DISPLAY_WIDTH / 2 + 24)
+            if (sprite->x == DISPLAY_WIDTH / 2 + 12
+                || sprite->x == DISPLAY_WIDTH / 2 + 16
+                || sprite->x == DISPLAY_WIDTH / 2 + 20
+                || sprite->x == DISPLAY_WIDTH / 2 + 24)
                 gPlttBufferFaded[0] = RGB(24, 31, 12);
             else
                 gPlttBufferFaded[0] = backgroundColor;
         }
-        sprite->pos1.x += 4;
+        sprite->x += 4;
     }
     else
     {
@@ -473,8 +473,8 @@ static void SpriteCB_PokemonLogoShine(struct Sprite *sprite)
 
 static void SpriteCB_PokemonLogoShine2(struct Sprite *sprite)
 {
-    if (sprite->pos1.x < DISPLAY_WIDTH + 32)
-        sprite->pos1.x += 8;
+    if (sprite->x < DISPLAY_WIDTH + 32)
+        sprite->x += 8;
     else
         DestroySprite(sprite);
 }
@@ -751,7 +751,7 @@ static void Task_TitleScreenPhase3(u8 taskId)
         FadeOutBGM(4);
         BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 0x10, RGB_BLACK);
         SetMainCallback2(CB2_GoToBerryFixScreen);
-    }   
+    }
     else
     {
         SetGpuReg(REG_OFFSET_BG2Y_L, 0);
diff --git a/src/trade.c b/src/trade.c
index 0899a6e21..60d999edd 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -773,8 +773,8 @@ static void CB2_ReturnToTradeMenu(void)
         else
             sTradeMenuData->cursorPosition = gLastViewedMonIndex + PARTY_SIZE;
 
-        sTradeMenuData->cursorSpriteId = CreateSprite(&sSpriteTemplate_Cursor, 
-                                                     sTradeMonSpriteCoords[sTradeMenuData->cursorPosition][0] * 8 + 32, 
+        sTradeMenuData->cursorSpriteId = CreateSprite(&sSpriteTemplate_Cursor,
+                                                     sTradeMonSpriteCoords[sTradeMenuData->cursorPosition][0] * 8 + 32,
                                                      sTradeMonSpriteCoords[sTradeMenuData->cursorPosition][1] * 8, 2);
         gMain.state = 16;
         break;
@@ -1339,14 +1339,14 @@ static void TradeMenuMoveCursor(u8 *cursorPosition, u8 direction)
     if (newPosition == (PARTY_SIZE * 2)) // CANCEL
     {
         StartSpriteAnim(&gSprites[sTradeMenuData->cursorSpriteId], CURSOR_ANIM_ON_CANCEL);
-        gSprites[sTradeMenuData->cursorSpriteId].pos1.x = DISPLAY_WIDTH - 16;
-        gSprites[sTradeMenuData->cursorSpriteId].pos1.y = DISPLAY_HEIGHT;
+        gSprites[sTradeMenuData->cursorSpriteId].x = DISPLAY_WIDTH - 16;
+        gSprites[sTradeMenuData->cursorSpriteId].y = DISPLAY_HEIGHT;
     }
     else
     {
         StartSpriteAnim(&gSprites[sTradeMenuData->cursorSpriteId], CURSOR_ANIM_NORMAL);
-        gSprites[sTradeMenuData->cursorSpriteId].pos1.x = sTradeMonSpriteCoords[newPosition][0] * 8 + 32;
-        gSprites[sTradeMenuData->cursorSpriteId].pos1.y = sTradeMonSpriteCoords[newPosition][1] * 8;
+        gSprites[sTradeMenuData->cursorSpriteId].x = sTradeMonSpriteCoords[newPosition][0] * 8 + 32;
+        gSprites[sTradeMenuData->cursorSpriteId].y = sTradeMonSpriteCoords[newPosition][1] * 8;
     }
 
     if (*cursorPosition != newPosition)
@@ -1535,8 +1535,8 @@ static bool32 CheckMonsBeforeTrade(void)
         aliveMons[i] = sTradeMenuData->isLiveMon[TRADE_PLAYER][i];
     }
 
-    switch (CheckValidityOfTradeMons(aliveMons, sTradeMenuData->partyCounts[TRADE_PLAYER], 
-                                                sTradeMenuData->cursorPosition, 
+    switch (CheckValidityOfTradeMons(aliveMons, sTradeMenuData->partyCounts[TRADE_PLAYER],
+                                                sTradeMenuData->cursorPosition,
                                                 sTradeMenuData->partnerCursorPosition))
     {
     case PLAYER_MON_INVALID:
@@ -1578,7 +1578,7 @@ static void ConfirmOrCancelTrade(void)
     }
 }
 
-// Only when choosing Yes to cancel, when No is chosen all are redrawn anyway 
+// Only when choosing Yes to cancel, when No is chosen all are redrawn anyway
 static void RestoreNicknamesCoveredByYesNo(void)
 {
     int i;
@@ -1847,11 +1847,11 @@ static void DrawTradeMenuParty(u8 whichParty)
     case 3:
         CopyToBgTilemapBufferRect_ChangePalette(1, sTradeMovesBoxTilemap, selectedMonParty * 15, 0, 15, 17, 0);
         CopyBgTilemapBufferToVram(1);
-        gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].pos1.x = (sTradeMonSpriteCoords[selectedMonParty * PARTY_SIZE][0]
+        gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].x = (sTradeMonSpriteCoords[selectedMonParty * PARTY_SIZE][0]
                                                                                                         + sTradeMonSpriteCoords[selectedMonParty * PARTY_SIZE + 1][0]) / 2 * 8 + 14;
-        gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].pos1.y = (sTradeMonSpriteCoords[selectedMonParty * PARTY_SIZE][1] * 8) - 12;
-        gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].pos2.x = 0;
-        gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].pos2.y = 0;
+        gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].y = (sTradeMonSpriteCoords[selectedMonParty * PARTY_SIZE][1] * 8) - 12;
+        gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].x2 = 0;
+        gSprites[sTradeMenuData->partySpriteIds[0][partyIdx + (selectedMonParty * PARTY_SIZE)]].y2 = 0;
         nameStringWidth = GetMonNicknameWidth(nickname, selectedMonParty, partyIdx);
         AddTextPrinterParameterized3((whichParty * 2) + 14, 0, (80 - nameStringWidth) / 2, 4, sTradeTextColors, 0, nickname);
         BufferTradeMonMoves(movesString, selectedMonParty, partyIdx);
@@ -2040,10 +2040,10 @@ static void ResetTradeMenuPartyPositions(u8 whichParty)
     for (i = 0; i < sTradeMenuData->partyCounts[whichParty]; i++)
     {
         gSprites[sTradeMenuData->partySpriteIds[whichParty][i]].invisible = FALSE;
-        gSprites[sTradeMenuData->partySpriteIds[whichParty][i]].pos1.x = sTradeMonSpriteCoords[(whichParty * PARTY_SIZE) + i][0] * 8 + 14;
-        gSprites[sTradeMenuData->partySpriteIds[whichParty][i]].pos1.y = sTradeMonSpriteCoords[(whichParty * PARTY_SIZE) + i][1] * 8 - 12;
-        gSprites[sTradeMenuData->partySpriteIds[whichParty][i]].pos2.x = 0;
-        gSprites[sTradeMenuData->partySpriteIds[whichParty][i]].pos2.y = 0;
+        gSprites[sTradeMenuData->partySpriteIds[whichParty][i]].x = sTradeMonSpriteCoords[(whichParty * PARTY_SIZE) + i][0] * 8 + 14;
+        gSprites[sTradeMenuData->partySpriteIds[whichParty][i]].y = sTradeMonSpriteCoords[(whichParty * PARTY_SIZE) + i][1] * 8 - 12;
+        gSprites[sTradeMenuData->partySpriteIds[whichParty][i]].x2 = 0;
+        gSprites[sTradeMenuData->partySpriteIds[whichParty][i]].y2 = 0;
     }
 }
 
@@ -2616,7 +2616,7 @@ static void SpriteCB_LinkMonShadow(struct Sprite *sprite)
 static void SpriteCB_CableEndSending(struct Sprite *sprite)
 {
     sprite->data[0]++;
-    sprite->pos2.y++;
+    sprite->y2++;
 
     if (sprite->data[0] == 10)
         DestroySprite(sprite);
@@ -2626,7 +2626,7 @@ static void SpriteCB_CableEndSending(struct Sprite *sprite)
 static void SpriteCB_CableEndReceiving(struct Sprite *sprite)
 {
     sprite->data[0]++;
-    sprite->pos2.y--;
+    sprite->y2--;
 
     if (sprite->data[0] == 10)
         DestroySprite(sprite);
@@ -3376,8 +3376,8 @@ static bool8 AnimateTradeSequenceCable(void)
     {
     case TS_STATE_START:
         gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].invisible = FALSE;
-        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.x = -180;
-        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.y = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PLAYER]].y_offset;
+        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].x2 = -180;
+        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PLAYER]].y_offset;
         sTradeData->state++;
         sTradeData->cachedMapMusic = GetCurrentMapMusic();
         PlayNewMapMusic(MUS_EVOLUTION);
@@ -3386,13 +3386,13 @@ static bool8 AnimateTradeSequenceCable(void)
         if (sTradeData->bg2hofs > 0)
         {
             // Sliding
-            gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.x += 3;
+            gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].x2 += 3;
             sTradeData->bg2hofs -= 3;
         }
         else
         {
             // Pokémon has arrived onscreen
-            gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.x = 0;
+            gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].x2 = 0;
             sTradeData->bg2hofs = 0;
             sTradeData->state = TS_STATE_SEND_MSG;
         }
@@ -3505,9 +3505,9 @@ static bool8 AnimateTradeSequenceCable(void)
                                       DISPCNT_OBJ_ON);
         break;
     case TS_STATE_LINK_MON_TRAVEL_OFFSCREEN:
-        gSprites[sTradeData->connectionSpriteId1].pos1.y -= 2;
-        gSprites[sTradeData->connectionSpriteId2].pos1.y -= 2;
-        if (gSprites[sTradeData->connectionSpriteId1].pos1.y < -8)
+        gSprites[sTradeData->connectionSpriteId1].y -= 2;
+        gSprites[sTradeData->connectionSpriteId2].y -= 2;
+        if (gSprites[sTradeData->connectionSpriteId1].y < -8)
             sTradeData->state = TS_STATE_FADE_OUT_TO_CROSSING;
         break;
     case TS_STATE_FADE_OUT_TO_CROSSING:
@@ -3535,13 +3535,13 @@ static bool8 AnimateTradeSequenceCable(void)
             PlaySE(SE_WARP_OUT);
             sTradeData->state++;
         }
-        gSprites[sTradeData->connectionSpriteId1].pos2.y -= 3;
-        gSprites[sTradeData->connectionSpriteId2].pos2.y += 3;
+        gSprites[sTradeData->connectionSpriteId1].y2 -= 3;
+        gSprites[sTradeData->connectionSpriteId2].y2 += 3;
         break;
     case TS_STATE_CROSSING_LINK_MONS_ENTER:
-        gSprites[sTradeData->connectionSpriteId1].pos2.y -= 3;
-        gSprites[sTradeData->connectionSpriteId2].pos2.y += 3;
-        if (gSprites[sTradeData->connectionSpriteId1].pos2.y <= -90)
+        gSprites[sTradeData->connectionSpriteId1].y2 -= 3;
+        gSprites[sTradeData->connectionSpriteId2].y2 += 3;
+        if (gSprites[sTradeData->connectionSpriteId1].y2 <= -90)
         {
             gSprites[sTradeData->connectionSpriteId1].data[1] = 1;
             gSprites[sTradeData->connectionSpriteId2].data[1] = 1;
@@ -3573,23 +3573,23 @@ static bool8 AnimateTradeSequenceCable(void)
             StartSpriteAffineAnim(&gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]], 0);
         }
         StartSpriteAffineAnim(&gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]], 0);
-        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos1.x = 60;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos1.x = 180;
-        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos1.y = 192;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos1.y = -32;
+        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].x = 60;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].x = 180;
+        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y = 192;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].y = -32;
         gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].invisible = FALSE;
         gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].invisible = FALSE;
         sTradeData->state++;
         break;
     case TS_STATE_CROSSING_MON_PICS_MOVE:
-        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.y -= 3;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos2.y += 3;
-        if (gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.y < -DISPLAY_HEIGHT 
-         && gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.y >= -DISPLAY_HEIGHT - 3)
+        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 -= 3;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].y2 += 3;
+        if (gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 < -DISPLAY_HEIGHT
+         && gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 >= -DISPLAY_HEIGHT - 3)
         {
             PlaySE(SE_WARP_IN);
         }
-        if (gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.y < -222)
+        if (gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 < -222)
         {
             gSprites[sTradeData->connectionSpriteId1].data[1] = 0;
             gSprites[sTradeData->connectionSpriteId2].data[1] = 0;
@@ -3600,9 +3600,9 @@ static bool8 AnimateTradeSequenceCable(void)
         }
         break;
     case TS_STATE_CROSSING_LINK_MONS_EXIT:
-        gSprites[sTradeData->connectionSpriteId1].pos2.y -= 3;
-        gSprites[sTradeData->connectionSpriteId2].pos2.y += 3;
-        if (gSprites[sTradeData->connectionSpriteId1].pos2.y <= -222)
+        gSprites[sTradeData->connectionSpriteId1].y2 -= 3;
+        gSprites[sTradeData->connectionSpriteId2].y2 += 3;
+        if (gSprites[sTradeData->connectionSpriteId1].y2 <= -222)
         {
             BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK);
             sTradeData->state++;
@@ -3634,9 +3634,9 @@ static bool8 AnimateTradeSequenceCable(void)
             sTradeData->state++;
         break;
     case TS_STATE_LINK_MON_TRAVEL_IN:
-        gSprites[sTradeData->connectionSpriteId1].pos2.y += 3;
-        gSprites[sTradeData->connectionSpriteId2].pos2.y += 3;
-        if (gSprites[sTradeData->connectionSpriteId1].pos2.y + gSprites[sTradeData->connectionSpriteId1].pos1.y == 64)
+        gSprites[sTradeData->connectionSpriteId1].y2 += 3;
+        gSprites[sTradeData->connectionSpriteId2].y2 += 3;
+        if (gSprites[sTradeData->connectionSpriteId1].y2 + gSprites[sTradeData->connectionSpriteId1].y == 64)
         {
             sTradeData->state++;
         }
@@ -3744,10 +3744,10 @@ static bool8 AnimateTradeSequenceCable(void)
         }
         break;
     case TS_STATE_SHOW_NEW_MON:
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos1.x = 120;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos1.y = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PARTNER]].y_offset + 60;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos2.x = 0;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos2.y = 0;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].x = 120;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].y = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PARTNER]].y_offset + 60;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].x2 = 0;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].y2 = 0;
         StartSpriteAnim(&gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]], 0);
         CreatePokeballSpriteToReleaseMon(sTradeData->monSpriteIds[TRADE_PARTNER], gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].oam.paletteNum, 120, 84, 2, 1, 20, 0xFFFFF, sTradeData->monSpecies[TRADE_PARTNER]);
         FreeSpriteOamMatrix(&gSprites[sTradeData->bouncingPokeballSpriteId]);
@@ -3849,8 +3849,8 @@ static bool8 AnimateTradeSequenceWireless(void)
     {
     case TS_STATE_START:
         gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].invisible = FALSE;
-        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.x = -180;
-        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.y = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PLAYER]].y_offset;
+        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].x2 = -180;
+        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PLAYER]].y_offset;
         sTradeData->state++;
         sTradeData->cachedMapMusic = GetCurrentMapMusic();
         PlayNewMapMusic(MUS_EVOLUTION);
@@ -3858,12 +3858,12 @@ static bool8 AnimateTradeSequenceWireless(void)
     case TS_STATE_MON_SLIDE_IN:
         if (sTradeData->bg2hofs > 0)
         {
-            gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.x += 3;
+            gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].x2 += 3;
             sTradeData->bg2hofs -= 3;
         }
         else
         {
-            gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.x = 0;
+            gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].x2 = 0;
             sTradeData->bg2hofs = 0;
             sTradeData->state = TS_STATE_SEND_MSG;
         }
@@ -3951,7 +3951,7 @@ static bool8 AnimateTradeSequenceWireless(void)
                                          BLDCNT_EFFECT_BLEND |
                                          BLDCNT_TGT2_BG2);
             SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(16, 4));
-            
+
             // Start wireless signal effect
             CreateTask(Task_AnimateWirelessSignal, 5);
             sTradeData->state++;
@@ -3982,9 +3982,9 @@ static bool8 AnimateTradeSequenceWireless(void)
                                       DISPCNT_OBJ_ON);
         break;
     case TS_STATE_LINK_MON_TRAVEL_OFFSCREEN:
-        gSprites[sTradeData->connectionSpriteId1].pos1.y -= 2;
-        gSprites[sTradeData->connectionSpriteId2].pos1.y -= 2;
-        if (gSprites[sTradeData->connectionSpriteId1].pos1.y < -8)
+        gSprites[sTradeData->connectionSpriteId1].y -= 2;
+        gSprites[sTradeData->connectionSpriteId2].y -= 2;
+        if (gSprites[sTradeData->connectionSpriteId1].y < -8)
         {
             sTradeData->state = TS_STATE_FADE_OUT_TO_CROSSING;
         }
@@ -4014,13 +4014,13 @@ static bool8 AnimateTradeSequenceWireless(void)
             PlaySE(SE_WARP_OUT);
             sTradeData->state++;
         }
-        gSprites[sTradeData->connectionSpriteId1].pos2.y -= 3;
-        gSprites[sTradeData->connectionSpriteId2].pos2.y += 3;
+        gSprites[sTradeData->connectionSpriteId1].y2 -= 3;
+        gSprites[sTradeData->connectionSpriteId2].y2 += 3;
         break;
     case TS_STATE_CROSSING_LINK_MONS_ENTER:
-        gSprites[sTradeData->connectionSpriteId1].pos2.y -= 3;
-        gSprites[sTradeData->connectionSpriteId2].pos2.y += 3;
-        if (gSprites[sTradeData->connectionSpriteId1].pos2.y <= -90)
+        gSprites[sTradeData->connectionSpriteId1].y2 -= 3;
+        gSprites[sTradeData->connectionSpriteId2].y2 += 3;
+        if (gSprites[sTradeData->connectionSpriteId1].y2 <= -90)
         {
             gSprites[sTradeData->connectionSpriteId1].data[1] = 1;
             gSprites[sTradeData->connectionSpriteId2].data[1] = 1;
@@ -4053,23 +4053,23 @@ static bool8 AnimateTradeSequenceWireless(void)
             StartSpriteAffineAnim(&gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]], 0);
         }
         StartSpriteAffineAnim(&gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]], 0);
-        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos1.x = 40;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos1.x = 200;
-        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos1.y = 192;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos1.y = -32;
+        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].x = 40;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].x = 200;
+        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y = 192;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].y = -32;
         gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].invisible = FALSE;
         gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].invisible = FALSE;
         sTradeData->state++;
         break;
     case TS_STATE_CROSSING_MON_PICS_MOVE:
-        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.y -= 3;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos2.y += 3;
-        if (gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.y < -DISPLAY_HEIGHT
-         && gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.y >= -DISPLAY_HEIGHT - 3)
+        gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 -= 3;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].y2 += 3;
+        if (gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 < -DISPLAY_HEIGHT
+         && gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 >= -DISPLAY_HEIGHT - 3)
         {
             PlaySE(SE_WARP_IN);
         }
-        if (gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].pos2.y < -222)
+        if (gSprites[sTradeData->monSpriteIds[TRADE_PLAYER]].y2 < -222)
         {
             gSprites[sTradeData->connectionSpriteId1].data[1] = 0;
             gSprites[sTradeData->connectionSpriteId2].data[1] = 0;
@@ -4080,9 +4080,9 @@ static bool8 AnimateTradeSequenceWireless(void)
         }
         break;
     case TS_STATE_CROSSING_LINK_MONS_EXIT:
-        gSprites[sTradeData->connectionSpriteId1].pos2.y -= 3;
-        gSprites[sTradeData->connectionSpriteId2].pos2.y += 3;
-        if (gSprites[sTradeData->connectionSpriteId1].pos2.y <= -222)
+        gSprites[sTradeData->connectionSpriteId1].y2 -= 3;
+        gSprites[sTradeData->connectionSpriteId2].y2 += 3;
+        if (gSprites[sTradeData->connectionSpriteId1].y2 <= -222)
         {
             BeginNormalPaletteFade(PALETTES_ALL, -1, 0, 16, RGB_BLACK);
             sTradeData->state++;
@@ -4117,9 +4117,9 @@ static bool8 AnimateTradeSequenceWireless(void)
             sTradeData->state++;
         break;
     case TS_STATE_LINK_MON_TRAVEL_IN:
-        gSprites[sTradeData->connectionSpriteId1].pos2.y += 4;
-        gSprites[sTradeData->connectionSpriteId2].pos2.y += 4;
-        if (gSprites[sTradeData->connectionSpriteId1].pos2.y + gSprites[sTradeData->connectionSpriteId1].pos1.y == 64)
+        gSprites[sTradeData->connectionSpriteId1].y2 += 4;
+        gSprites[sTradeData->connectionSpriteId2].y2 += 4;
+        if (gSprites[sTradeData->connectionSpriteId1].y2 + gSprites[sTradeData->connectionSpriteId1].y == 64)
         {
             sTradeData->state = TS_STATE_PAN_TO_GBA_WIRELESS;
             sTradeData->timer = 0;
@@ -4236,18 +4236,18 @@ static bool8 AnimateTradeSequenceWireless(void)
     case TS_STATE_POKEBALL_ARRIVE_WAIT:
         if (gSprites[sTradeData->bouncingPokeballSpriteId].callback == SpriteCallbackDummy)
         {
-            HandleLoadSpecialPokePic_2(&gMonFrontPicTable[sTradeData->monSpecies[TRADE_PARTNER]], 
-                                        gMonSpritesGfxPtr->sprites.ptr[3], 
-                                        sTradeData->monSpecies[TRADE_PARTNER], 
+            HandleLoadSpecialPokePic_2(&gMonFrontPicTable[sTradeData->monSpecies[TRADE_PARTNER]],
+                                        gMonSpritesGfxPtr->sprites.ptr[3],
+                                        sTradeData->monSpecies[TRADE_PARTNER],
                                         sTradeData->monPersonalities[TRADE_PARTNER]);
             sTradeData->state++;
         }
         break;
     case TS_STATE_SHOW_NEW_MON:
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos1.x = 120;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos1.y = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PARTNER]].y_offset + 60;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos2.x = 0;
-        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].pos2.y = 0;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].x = 120;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].y = gMonFrontPicCoords[sTradeData->monSpecies[TRADE_PARTNER]].y_offset + 60;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].x2 = 0;
+        gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].y2 = 0;
         StartSpriteAnim(&gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]], 0);
         CreatePokeballSpriteToReleaseMon(sTradeData->monSpriteIds[TRADE_PARTNER], gSprites[sTradeData->monSpriteIds[TRADE_PARTNER]].oam.paletteNum, 120, 84, 2, 1, 20, 0xFFFFF, sTradeData->monSpecies[TRADE_PARTNER]);
         FreeSpriteOamMatrix(&gSprites[sTradeData->bouncingPokeballSpriteId]);
@@ -4397,16 +4397,16 @@ static void UpdateTradeFinishFlags(void)
 
 static void SpriteCB_BouncingPokeball(struct Sprite *sprite)
 {
-    sprite->pos1.y += sprite->data[0] / 10;
+    sprite->y += sprite->data[0] / 10;
     sprite->data[5] += sprite->data[1];
-    sprite->pos1.x = sprite->data[5] / 10;
-    if (sprite->pos1.y > 0x4c)
+    sprite->x = sprite->data[5] / 10;
+    if (sprite->y > 0x4c)
     {
-        sprite->pos1.y = 0x4c;
+        sprite->y = 0x4c;
         sprite->data[0] = -(sprite->data[0] * sprite->data[2]) / 100;
         sprite->data[3] ++;
     }
-    if (sprite->pos1.x == 0x78)
+    if (sprite->x == 0x78)
         sprite->data[1] = 0;
     sprite->data[0] += sprite->data[4];
     if (sprite->data[3] == 4)
@@ -4418,7 +4418,7 @@ static void SpriteCB_BouncingPokeball(struct Sprite *sprite)
 
 static void SpriteCB_BouncingPokeballDepart(struct Sprite *sprite)
 {
-    sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]];
+    sprite->y2 += sTradeBallVerticalVelocityTable[sprite->data[0]];
     if (sprite->data[0] == 22)
         PlaySE(SE_BALL_BOUNCE_1);
     if (++ sprite->data[0] == 44)
@@ -4436,7 +4436,7 @@ static void SpriteCB_BouncingPokeballDepartEnd(struct Sprite *sprite)
         StartSpriteAffineAnim(sprite, 1);
     if (++ sprite->data[1] > 20)
     {
-        sprite->pos2.y -= sTradeBallVerticalVelocityTable[sprite->data[0]];
+        sprite->y2 -= sTradeBallVerticalVelocityTable[sprite->data[0]];
         if (++ sprite->data[0] == 23)
         {
             DestroySprite(sprite);
@@ -4449,7 +4449,7 @@ static void SpriteCB_BouncingPokeballArrive(struct Sprite *sprite)
 {
     if (sprite->data[2] == 0)
     {
-        if ((sprite->pos1.y += 4) > sprite->data[3])
+        if ((sprite->y += 4) > sprite->data[3])
         {
             sprite->data[2] ++;
             sprite->data[0] = 0x16;
@@ -4464,7 +4464,7 @@ static void SpriteCB_BouncingPokeballArrive(struct Sprite *sprite)
             PlaySE(SE_BALL_BOUNCE_3);
         if (sprite->data[0] == 0x6b)
             PlaySE(SE_BALL_BOUNCE_4);
-        sprite->pos2.y += sTradeBallVerticalVelocityTable[sprite->data[0]];
+        sprite->y2 += sTradeBallVerticalVelocityTable[sprite->data[0]];
         if (++sprite->data[0] == 0x6c)
             sprite->callback = SpriteCallbackDummy;
     }
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 1ec519c90..c11ee83c0 100755
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -281,31 +281,31 @@ static const u8 sTrainerPicOffset[2][GENDER_COUNT][2] =
 {
     // Kanto
     {
-        [MALE]   = {13, 4}, 
+        [MALE]   = {13, 4},
         [FEMALE] = {13, 4}
     },
     // Hoenn
     {
-        [MALE]   = {1, 0}, 
+        [MALE]   = {1, 0},
         [FEMALE] = {1, 0}
     },
 };
 
-static const u8 sTrainerPicFacilityClass[][GENDER_COUNT] = 
+static const u8 sTrainerPicFacilityClass[][GENDER_COUNT] =
 {
-    [CARD_TYPE_FRLG] = 
+    [CARD_TYPE_FRLG] =
     {
-        [MALE]   = FACILITY_CLASS_RED, 
+        [MALE]   = FACILITY_CLASS_RED,
         [FEMALE] = FACILITY_CLASS_LEAF
-    }, 
-    [CARD_TYPE_RS] = 
+    },
+    [CARD_TYPE_RS] =
     {
-        [MALE]   = FACILITY_CLASS_RS_BRENDAN, 
+        [MALE]   = FACILITY_CLASS_RS_BRENDAN,
         [FEMALE] = FACILITY_CLASS_RS_MAY
-    }, 
-    [CARD_TYPE_EMERALD] = 
+    },
+    [CARD_TYPE_EMERALD] =
     {
-        [MALE]   = FACILITY_CLASS_BRENDAN, 
+        [MALE]   = FACILITY_CLASS_BRENDAN,
         [FEMALE] = FACILITY_CLASS_MAY
     }
 };
@@ -1201,10 +1201,10 @@ static void PrintHofDebutTimeOnCard(void)
         PrintStatOnBackOfCard(0, gText_HallOfFameDebut, sData->textHofTime, sTrainerCardStatColors);
 }
 
-static const u8 *const sLinkBattleTexts[] = 
+static const u8 *const sLinkBattleTexts[] =
 {
-    [CARD_TYPE_FRLG]    = gText_LinkBattles, 
-    [CARD_TYPE_RS]      = gText_LinkCableBattles, 
+    [CARD_TYPE_FRLG]    = gText_LinkBattles,
+    [CARD_TYPE_RS]      = gText_LinkCableBattles,
     [CARD_TYPE_EMERALD] = gText_LinkBattles
 };
 
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 3ce90c430..70c2dd9d5 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -261,16 +261,16 @@ static const struct ObjectEventTemplate sTrainerObjectEventTemplate =
     .trainerType = TRAINER_TYPE_NORMAL,
 };
 
-static const u32 sNextFloorMapNum[NUM_TRAINER_HILL_FLOORS] = 
+static const u32 sNextFloorMapNum[NUM_TRAINER_HILL_FLOORS] =
 {
-    MAP_NUM(TRAINER_HILL_2F), 
-    MAP_NUM(TRAINER_HILL_3F), 
-    MAP_NUM(TRAINER_HILL_4F), 
+    MAP_NUM(TRAINER_HILL_2F),
+    MAP_NUM(TRAINER_HILL_3F),
+    MAP_NUM(TRAINER_HILL_4F),
     MAP_NUM(TRAINER_HILL_ROOF)
 };
-static const u8 sTrainerPartySlots[][PARTY_SIZE / 2] = 
+static const u8 sTrainerPartySlots[][PARTY_SIZE / 2] =
 {
-    {0, 1, 2}, 
+    {0, 1, 2},
     {3, 4, 5}
 };
 
diff --git a/src/trainer_pokemon_sprites.c b/src/trainer_pokemon_sprites.c
index 477c11faf..9e30f636e 100644
--- a/src/trainer_pokemon_sprites.c
+++ b/src/trainer_pokemon_sprites.c
@@ -100,9 +100,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8
 {
     if (!isTrainer)
     {
-        if (paletteTag == 0xFFFF)
+        if (paletteTag == TAG_NONE)
         {
-            sCreatingSpriteTemplate.paletteTag = 0xFFFF;
+            sCreatingSpriteTemplate.paletteTag = TAG_NONE;
             LoadCompressedPalette(GetMonSpritePalFromSpeciesAndPersonality(species, otId, personality), 0x100 + paletteSlot * 0x10, 0x20);
         }
         else
@@ -113,9 +113,9 @@ static void LoadPicPaletteByTagOrSlot(u16 species, u32 otId, u32 personality, u8
     }
     else
     {
-        if (paletteTag == 0xFFFF)
+        if (paletteTag == TAG_NONE)
         {
-            sCreatingSpriteTemplate.paletteTag = 0xFFFF;
+            sCreatingSpriteTemplate.paletteTag = TAG_NONE;
             LoadCompressedPalette(gTrainerFrontPicPaletteTable[species].data, 0x100 + paletteSlot * 0x10, 0x20);
         }
         else
@@ -182,7 +182,7 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront
         images[j].data = framePics + 0x800 * j;
         images[j].size = 0x800;
     }
-    sCreatingSpriteTemplate.tileTag = 0xFFFF;
+    sCreatingSpriteTemplate.tileTag = TAG_NONE;
     sCreatingSpriteTemplate.oam = &gUnknown_0860B064;
     AssignSpriteAnimsTable(isTrainer);
     sCreatingSpriteTemplate.images = images;
@@ -190,7 +190,7 @@ static u16 CreatePicSprite(u16 species, u32 otId, u32 personality, bool8 isFront
     sCreatingSpriteTemplate.callback = DummyPicSpriteCallback;
     LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, isTrainer);
     spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0);
-    if (paletteTag == 0xFFFF)
+    if (paletteTag == TAG_NONE)
     {
         gSprites[spriteId].oam.paletteNum = paletteSlot;
     }
@@ -257,7 +257,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
         images[j].data = framePics + 0x800 * j;
         images[j].size = 0x800;
     }
-    sCreatingSpriteTemplate.tileTag = 0xFFFF;
+    sCreatingSpriteTemplate.tileTag = TAG_NONE;
     sCreatingSpriteTemplate.anims = gMonFrontAnimsPtrTable[species];
     sCreatingSpriteTemplate.images = images;
     if (flags2 == 0x01)
@@ -278,7 +278,7 @@ u16 CreatePicSprite2(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s1
     sCreatingSpriteTemplate.callback = DummyPicSpriteCallback;
     LoadPicPaletteByTagOrSlot(species, otId, personality, paletteSlot, paletteTag, FALSE);
     spriteId = CreateSprite(&sCreatingSpriteTemplate, x, y, 0);
-    if (paletteTag == 0xFFFF)
+    if (paletteTag == TAG_NONE)
     {
         gSprites[spriteId].oam.paletteNum = paletteSlot;
     }
@@ -309,7 +309,7 @@ static u16 FreeAndDestroyPicSpriteInternal(u16 spriteId)
     }
     framePics = sSpritePics[i].frames;
     images = sSpritePics[i].images;
-    if (sSpritePics[i].paletteTag != 0xFFFF)
+    if (sSpritePics[i].paletteTag != TAG_NONE)
     {
         FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(gSprites[spriteId].oam.paletteNum));
     }
diff --git a/src/trainer_see.c b/src/trainer_see.c
index 155c84cbe..ec3dc8123 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -167,8 +167,8 @@ static const union AnimCmd *const sSpriteAnimTable_Icons[] =
 
 static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark =
 {
-    .tileTag = 0xffff,
-    .paletteTag = 0xffff,
+    .tileTag = TAG_NONE,
+    .paletteTag = TAG_NONE,
     .oam = &sOamData_Icons,
     .anims = sSpriteAnimTable_Icons,
     .images = sSpriteImageTable_ExclamationQuestionMark,
@@ -178,7 +178,7 @@ static const struct SpriteTemplate sSpriteTemplate_ExclamationQuestionMark =
 
 static const struct SpriteTemplate sSpriteTemplate_HeartIcon =
 {
-    .tileTag = 0xffff,
+    .tileTag = TAG_NONE,
     .paletteTag = FLDEFF_PAL_TAG_GENERAL_0,
     .oam = &sOamData_Icons,
     .anims = sSpriteAnimTable_Icons,
@@ -756,10 +756,10 @@ static void SpriteCB_TrainerIcons(struct Sprite *sprite)
     {
         struct Sprite *objEventSprite = &gSprites[gObjectEvents[objEventId].spriteId];
         sprite->sData4 += sprite->sData3;
-        sprite->pos1.x = objEventSprite->pos1.x;
-        sprite->pos1.y = objEventSprite->pos1.y - 16;
-        sprite->pos2.x = objEventSprite->pos2.x;
-        sprite->pos2.y = objEventSprite->pos2.y + sprite->sData4;
+        sprite->x = objEventSprite->x;
+        sprite->y = objEventSprite->y - 16;
+        sprite->x2 = objEventSprite->x2;
+        sprite->y2 = objEventSprite->y2 + sprite->sData4;
         if (sprite->sData4)
             sprite->sData3++;
         else
diff --git a/src/tv.c b/src/tv.c
index 14a0dc53f..452923933 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -199,31 +199,31 @@ static const struct {
     {
         .species = SPECIES_SEEDOT,
         .moves = {MOVE_BIDE, MOVE_HARDEN, MOVE_LEECH_SEED},
-        .level = 3, 
+        .level = 3,
         .location = MAP_NUM(ROUTE102)
     },
     {
         .species = SPECIES_NUZLEAF,
         .moves = {MOVE_HARDEN, MOVE_GROWTH, MOVE_NATURE_POWER, MOVE_LEECH_SEED},
-        .level = 15, 
+        .level = 15,
         .location = MAP_NUM(ROUTE114),
     },
     {
         .species = SPECIES_SEEDOT,
         .moves = {MOVE_HARDEN, MOVE_GROWTH, MOVE_NATURE_POWER, MOVE_LEECH_SEED},
-        .level = 13, 
+        .level = 13,
         .location = MAP_NUM(ROUTE117),
     },
     {
         .species = SPECIES_SEEDOT,
         .moves = {MOVE_GIGA_DRAIN, MOVE_FRUSTRATION, MOVE_SOLAR_BEAM, MOVE_LEECH_SEED},
-        .level = 25, 
+        .level = 25,
         .location = MAP_NUM(ROUTE120),
     },
     {
         .species = SPECIES_SKITTY,
         .moves = {MOVE_GROWL, MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_ATTRACT},
-        .level = 8, 
+        .level = 8,
         .location = MAP_NUM(ROUTE116),
     }
 };
@@ -648,50 +648,50 @@ static const u8 *const sTVWhatsNo1InHoennTodayTextGroup[] = {
     gTVWhatsNo1InHoennTodayText08
 };
 
-static const u8 *const sTVSecretBaseSecretsTextGroup[SBSECRETS_NUM_STATES] = 
+static const u8 *const sTVSecretBaseSecretsTextGroup[SBSECRETS_NUM_STATES] =
 {
-    [SBSECRETS_STATE_INTRO]               = TVSecretBaseSecrets_Text_Intro, 
+    [SBSECRETS_STATE_INTRO]               = TVSecretBaseSecrets_Text_Intro,
     [SBSECRETS_STATE_DO_NEXT1]            = TVSecretBaseSecrets_Text_WhatWillPlayerDoNext1,
     [SBSECRETS_STATE_DO_NEXT2]            = TVSecretBaseSecrets_Text_WhatWillPlayerDoNext2,
     [SBSECRETS_STATE_TOOK_X_STEPS]        = TVSecretBaseSecrets_Text_TookXStepsBeforeLeaving,
-    [SBSECRETS_STATE_BASE_INTEREST_LOW]   = TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer, 
-    [SBSECRETS_STATE_BASE_INTEREST_MED]   = TVSecretBaseSecrets_Text_PlayerEnjoyedBase, 
+    [SBSECRETS_STATE_BASE_INTEREST_LOW]   = TVSecretBaseSecrets_Text_BaseFailedToInterestPlayer,
+    [SBSECRETS_STATE_BASE_INTEREST_MED]   = TVSecretBaseSecrets_Text_PlayerEnjoyedBase,
     [SBSECRETS_STATE_BASE_INTEREST_HIGH]  = TVSecretBaseSecrets_Text_PlayerHugeFanOfBase,
-    [SBSECRETS_STATE_OUTRO]               = TVSecretBaseSecrets_Text_Outro, 
-    [SBSECRETS_STATE_NOTHING_USED1]       = TVSecretBaseSecrets_Text_StoppedMoving1, 
-    [SBSECRETS_STATE_NOTHING_USED2]       = TVSecretBaseSecrets_Text_StoppedMoving2, 
-    [SBSECRETS_STATE_USED_CHAIR]          = TVSecretBaseSecrets_Text_UsedChair, 
-    [SBSECRETS_STATE_USED_BALLOON]        = TVSecretBaseSecrets_Text_UsedBalloon, 
-    [SBSECRETS_STATE_USED_TENT]           = TVSecretBaseSecrets_Text_UsedTent, 
-    [SBSECRETS_STATE_USED_PLANT]          = TVSecretBaseSecrets_Text_UsedPlant, 
-    [SBSECRETS_STATE_USED_GOLD_SHIELD]    = TVSecretBaseSecrets_Text_UsedGoldShield, 
-    [SBSECRETS_STATE_USED_SILVER_SHIELD]  = TVSecretBaseSecrets_Text_UsedSilverShield, 
-    [SBSECRETS_STATE_USED_GLASS_ORNAMENT] = TVSecretBaseSecrets_Text_UsedGlassOrnament, 
-    [SBSECRETS_STATE_USED_TV]             = TVSecretBaseSecrets_Text_UsedTV, 
-    [SBSECRETS_STATE_USED_MUD_BALL]       = TVSecretBaseSecrets_Text_UsedMudBall, 
-    [SBSECRETS_STATE_USED_BAG]            = TVSecretBaseSecrets_Text_UsedBag, 
-    [SBSECRETS_STATE_USED_CUSHION]        = TVSecretBaseSecrets_Text_UsedCushion, 
-    [SBSECRETS_STATE_HIT_CUSHION]         = TVSecretBaseSecrets_Text_HitCushion, 
-    [SBSECRETS_STATE_HUGGED_CUSHION]      = TVSecretBaseSecrets_Text_HuggedCushion, 
-    [SBSECRETS_STATE_BATTLED_WON]         = TVSecretBaseSecrets_Text_BattledWon, 
-    [SBSECRETS_STATE_BATTLED_LOST]        = TVSecretBaseSecrets_Text_BattledLost, 
-    [SBSECRETS_STATE_DECLINED_BATTLE]     = TVSecretBaseSecrets_Text_DeclinedBattle, 
-    [SBSECRETS_STATE_USED_POSTER]         = TVSecretBaseSecrets_Text_UsedPoster, 
-    [SBSECRETS_STATE_USED_NOTE_MAT]       = TVSecretBaseSecrets_Text_UsedNoteMat, 
-    [SBSECRETS_STATE_BATTLED_DRAW]        = TVSecretBaseSecrets_Text_BattledDraw, 
-    [SBSECRETS_STATE_USED_SPIN_MAT]       = TVSecretBaseSecrets_Text_UsedSpinMat, 
-    [SBSECRETS_STATE_USED_SAND_ORNAMENT]  = TVSecretBaseSecrets_Text_UsedSandOrnament, 
-    [SBSECRETS_STATE_USED_DESK]           = TVSecretBaseSecrets_Text_UsedDesk, 
-    [SBSECRETS_STATE_USED_BRICK]          = TVSecretBaseSecrets_Text_UsedBrick, 
-    [SBSECRETS_STATE_USED_SOLID_BOARD]    = TVSecretBaseSecrets_Text_UsedSolidBoard, 
-    [SBSECRETS_STATE_USED_FENCE]          = TVSecretBaseSecrets_Text_UsedFence, 
-    [SBSECRETS_STATE_USED_GLITTER_MAT]    = TVSecretBaseSecrets_Text_UsedGlitterMat, 
-    [SBSECRETS_STATE_USED_TIRE]           = TVSecretBaseSecrets_Text_UsedTire, 
-    [SBSECRETS_STATE_USED_STAND]          = TVSecretBaseSecrets_Text_UsedStand, 
+    [SBSECRETS_STATE_OUTRO]               = TVSecretBaseSecrets_Text_Outro,
+    [SBSECRETS_STATE_NOTHING_USED1]       = TVSecretBaseSecrets_Text_StoppedMoving1,
+    [SBSECRETS_STATE_NOTHING_USED2]       = TVSecretBaseSecrets_Text_StoppedMoving2,
+    [SBSECRETS_STATE_USED_CHAIR]          = TVSecretBaseSecrets_Text_UsedChair,
+    [SBSECRETS_STATE_USED_BALLOON]        = TVSecretBaseSecrets_Text_UsedBalloon,
+    [SBSECRETS_STATE_USED_TENT]           = TVSecretBaseSecrets_Text_UsedTent,
+    [SBSECRETS_STATE_USED_PLANT]          = TVSecretBaseSecrets_Text_UsedPlant,
+    [SBSECRETS_STATE_USED_GOLD_SHIELD]    = TVSecretBaseSecrets_Text_UsedGoldShield,
+    [SBSECRETS_STATE_USED_SILVER_SHIELD]  = TVSecretBaseSecrets_Text_UsedSilverShield,
+    [SBSECRETS_STATE_USED_GLASS_ORNAMENT] = TVSecretBaseSecrets_Text_UsedGlassOrnament,
+    [SBSECRETS_STATE_USED_TV]             = TVSecretBaseSecrets_Text_UsedTV,
+    [SBSECRETS_STATE_USED_MUD_BALL]       = TVSecretBaseSecrets_Text_UsedMudBall,
+    [SBSECRETS_STATE_USED_BAG]            = TVSecretBaseSecrets_Text_UsedBag,
+    [SBSECRETS_STATE_USED_CUSHION]        = TVSecretBaseSecrets_Text_UsedCushion,
+    [SBSECRETS_STATE_HIT_CUSHION]         = TVSecretBaseSecrets_Text_HitCushion,
+    [SBSECRETS_STATE_HUGGED_CUSHION]      = TVSecretBaseSecrets_Text_HuggedCushion,
+    [SBSECRETS_STATE_BATTLED_WON]         = TVSecretBaseSecrets_Text_BattledWon,
+    [SBSECRETS_STATE_BATTLED_LOST]        = TVSecretBaseSecrets_Text_BattledLost,
+    [SBSECRETS_STATE_DECLINED_BATTLE]     = TVSecretBaseSecrets_Text_DeclinedBattle,
+    [SBSECRETS_STATE_USED_POSTER]         = TVSecretBaseSecrets_Text_UsedPoster,
+    [SBSECRETS_STATE_USED_NOTE_MAT]       = TVSecretBaseSecrets_Text_UsedNoteMat,
+    [SBSECRETS_STATE_BATTLED_DRAW]        = TVSecretBaseSecrets_Text_BattledDraw,
+    [SBSECRETS_STATE_USED_SPIN_MAT]       = TVSecretBaseSecrets_Text_UsedSpinMat,
+    [SBSECRETS_STATE_USED_SAND_ORNAMENT]  = TVSecretBaseSecrets_Text_UsedSandOrnament,
+    [SBSECRETS_STATE_USED_DESK]           = TVSecretBaseSecrets_Text_UsedDesk,
+    [SBSECRETS_STATE_USED_BRICK]          = TVSecretBaseSecrets_Text_UsedBrick,
+    [SBSECRETS_STATE_USED_SOLID_BOARD]    = TVSecretBaseSecrets_Text_UsedSolidBoard,
+    [SBSECRETS_STATE_USED_FENCE]          = TVSecretBaseSecrets_Text_UsedFence,
+    [SBSECRETS_STATE_USED_GLITTER_MAT]    = TVSecretBaseSecrets_Text_UsedGlitterMat,
+    [SBSECRETS_STATE_USED_TIRE]           = TVSecretBaseSecrets_Text_UsedTire,
+    [SBSECRETS_STATE_USED_STAND]          = TVSecretBaseSecrets_Text_UsedStand,
     [SBSECRETS_STATE_USED_BREAKABLE_DOOR] = TVSecretBaseSecrets_Text_BrokeDoor,
-    [SBSECRETS_STATE_USED_DOLL]           = TVSecretBaseSecrets_Text_UsedDoll, 
-    [SBSECRETS_STATE_USED_SLIDE]          = TVSecretBaseSecrets_Text_UsedSlide, 
-    [SBSECRETS_STATE_DECLINED_SLIDE]      = TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown, 
+    [SBSECRETS_STATE_USED_DOLL]           = TVSecretBaseSecrets_Text_UsedDoll,
+    [SBSECRETS_STATE_USED_SLIDE]          = TVSecretBaseSecrets_Text_UsedSlide,
+    [SBSECRETS_STATE_DECLINED_SLIDE]      = TVSecretBaseSecrets_Text_UsedSlideButDidntGoDown,
     [SBSECRETS_STATE_USED_JUMP_MAT]       = TVSecretBaseSecrets_Text_UsedJumpMat
 };
 
@@ -722,8 +722,8 @@ static const u8 *const sTVInSearchOfTrainersTextGroup[] = {
 };
 
 // Secret Base Secrets TV Show states for actions that can be taken in a secret base
-// The flags that determine whether or not the action was taken are commented 
-const u8 sTVSecretBaseSecretsActions[NUM_SECRET_BASE_FLAGS] = 
+// The flags that determine whether or not the action was taken are commented
+const u8 sTVSecretBaseSecretsActions[NUM_SECRET_BASE_FLAGS] =
 {
     SBSECRETS_STATE_USED_CHAIR,             // SECRET_BASE_USED_CHAIR
     SBSECRETS_STATE_USED_BALLOON,           // SECRET_BASE_USED_BALLOON
@@ -817,7 +817,7 @@ u8 FindAnyTVShowOnTheAir(void)
     if (slot == 0xFF)
         return 0xFF;
 
-    if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE 
+    if (gSaveBlock1Ptr->outbreakPokemonSpecies != SPECIES_NONE
      && gSaveBlock1Ptr->tvShows[slot].common.kind == TVSHOW_MASS_OUTBREAK)
         return FindFirstActiveTVShowThatIsNotAMassOutbreak();
 
@@ -837,7 +837,7 @@ void UpdateTVScreensOnMap(int width, int height)
         break;
 //  case PLAYERS_HOUSE_TV_NONE:
     default:
-        if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(LILYCOVE_CITY_COVE_LILY_MOTEL_1F) 
+        if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(LILYCOVE_CITY_COVE_LILY_MOTEL_1F)
          && gSaveBlock1Ptr->location.mapNum == MAP_NUM(LILYCOVE_CITY_COVE_LILY_MOTEL_1F))
         {
             // NPC in Lilycove Hotel is always watching TV
@@ -891,8 +891,8 @@ static u8 FindFirstActiveTVShowThatIsNotAMassOutbreak(void)
 
     for (i = 0; i < ARRAY_COUNT(gSaveBlock1Ptr->tvShows) - 1; i++)
     {
-        if (gSaveBlock1Ptr->tvShows[i].common.kind != TVSHOW_OFF_AIR 
-         && gSaveBlock1Ptr->tvShows[i].common.kind != TVSHOW_MASS_OUTBREAK 
+        if (gSaveBlock1Ptr->tvShows[i].common.kind != TVSHOW_OFF_AIR
+         && gSaveBlock1Ptr->tvShows[i].common.kind != TVSHOW_MASS_OUTBREAK
          && gSaveBlock1Ptr->tvShows[i].common.active == TRUE)
             return i;
     }
@@ -945,7 +945,7 @@ void GabbyAndTyBeforeInterview(void)
         gSaveBlock1Ptr->gabbyAndTyData.battleNum++;
     }
     gSaveBlock1Ptr->gabbyAndTyData.battleTookMoreThanOneTurn = gBattleResults.playerMonWasDamaged;
-    
+
     if (gBattleResults.playerFaintCounter != 0)
         gSaveBlock1Ptr->gabbyAndTyData.playerLostAMon = TRUE;
     else
@@ -2344,7 +2344,7 @@ bool8 ShouldHideFanClubInterviewer(void)
 
     if (gSaveBlock1Ptr->linkBattleRecords.entries[0].name[0] == EOS)
         return TRUE;
-    
+
     return FALSE;
 }
 
@@ -2603,8 +2603,8 @@ static u8 FindAnyPokeNewsOnTheAir(void)
 
     for (i = 0; i < POKE_NEWS_COUNT; i++)
     {
-        if (gSaveBlock1Ptr->pokeNews[i].kind != POKENEWS_NONE 
-         && gSaveBlock1Ptr->pokeNews[i].state == 1 
+        if (gSaveBlock1Ptr->pokeNews[i].kind != POKENEWS_NONE
+         && gSaveBlock1Ptr->pokeNews[i].state == 1
          && gSaveBlock1Ptr->pokeNews[i].days < 3)
             return i;
     }
@@ -2814,8 +2814,8 @@ static bool8 IsRecordMixShowAlreadySpawned(u8 kind, bool8 delete)
     playerId = GetPlayerIDAsU32();
     for (i = NUM_NORMAL_TVSHOW_SLOTS; i < LAST_TVSHOW_IDX; i++)
     {
-        if (shows[i].common.kind == kind 
-         && (playerId & 0xFF) == shows[i].common.trainerIdLo 
+        if (shows[i].common.kind == kind
+         && (playerId & 0xFF) == shows[i].common.trainerIdLo
          && ((playerId >> 8) & 0xFF) == shows[i].common.trainerIdHi)
         {
             if (delete == TRUE)
@@ -3139,7 +3139,7 @@ static void GetRandomWordFromShow(TVShow *show)
     u8 i;
 
     i = Random() % ARRAY_COUNT(show->fanclubLetter.words);
-    
+
     // From random point, get first non-empty word
     while (TRUE)
     {
@@ -3448,7 +3448,7 @@ void ReceiveTvShowsData(void *src, u32 size, u8 playersLinkId)
             else if (version == VERSION_EMERALD && gLinkPlayers[i].language == LANGUAGE_JAPANESE)
                 TranslateJapaneseEmeraldShows((*rmBuffer)[i]);
         }
-        
+
         // Position player's TV shows in argument list depending on link id
         switch (playersLinkId)
         {
@@ -3537,7 +3537,7 @@ static bool8 TryMixTVShow(TVShow *dest[TV_SHOWS_COUNT], TVShow *src[TV_SHOWS_COU
         success = TryMixOutbreakTVShow(&tv1[sCurTVShowSlot], &tv2[sTVShowMixingCurSlot], idx);
         break;
     }
-    
+
     // Show was mixed, delete from array
     if (success == TRUE)
     {
@@ -3551,7 +3551,7 @@ static bool8 TryMixNormalTVShow(TVShow *dest, TVShow *src, u8 idx)
 {
     u32 linkTrainerId = GetLinkPlayerTrainerId(idx);
 
-    if ((linkTrainerId & 0xFF) == src->common.trainerIdLo 
+    if ((linkTrainerId & 0xFF) == src->common.trainerIdLo
     && ((linkTrainerId >> 8) & 0xFF) == src->common.trainerIdHi)
         return FALSE;
 
@@ -3568,11 +3568,11 @@ static bool8 TryMixRecordMixTVShow(TVShow *dest, TVShow *src, u8 idx)
 {
     u32 linkTrainerId = GetLinkPlayerTrainerId(idx);
 
-    if ((linkTrainerId & 0xFF) == src->common.srcTrainerIdLo 
+    if ((linkTrainerId & 0xFF) == src->common.srcTrainerIdLo
     && ((linkTrainerId >> 8) & 0xFF) == src->common.srcTrainerIdHi)
         return FALSE;
 
-    if ((linkTrainerId & 0xFF) == src->common.trainerIdLo 
+    if ((linkTrainerId & 0xFF) == src->common.trainerIdLo
     && ((linkTrainerId >> 8) & 0xFF) == src->common.trainerIdHi)
         return FALSE;
 
@@ -3589,7 +3589,7 @@ static bool8 TryMixOutbreakTVShow(TVShow *dest, TVShow *src, u8 idx)
 {
     u32 linkTrainerId = GetLinkPlayerTrainerId(idx);
 
-    if ((linkTrainerId & 0xFF) == src->common.trainerIdLo 
+    if ((linkTrainerId & 0xFF) == src->common.trainerIdLo
     && ((linkTrainerId >> 8) & 0xFF) == src->common.trainerIdHi)
         return FALSE;
 
@@ -3825,7 +3825,7 @@ void ReceivePokeNewsData(void *src, u32 size, u8 playersLinkId)
             memcpy((*rmBuffer2)[i], src + i * size, sizeof((*rmBuffer2)[i]));
 
         rmBuffer = rmBuffer2;
-        
+
         // Position player's PokeNews in argument list depending on link id
         switch (playersLinkId)
         {
@@ -4018,7 +4018,7 @@ void SanitizeTVShowsForRuby(TVShow *shows)
     {
         if (curShow->bravoTrainerTower.kind == TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE)
         {
-            if ((curShow->bravoTrainerTower.language == LANGUAGE_JAPANESE && curShow->bravoTrainerTower.pokemonNameLanguage != LANGUAGE_JAPANESE) 
+            if ((curShow->bravoTrainerTower.language == LANGUAGE_JAPANESE && curShow->bravoTrainerTower.pokemonNameLanguage != LANGUAGE_JAPANESE)
              || (curShow->bravoTrainerTower.language != LANGUAGE_JAPANESE && curShow->bravoTrainerTower.pokemonNameLanguage == LANGUAGE_JAPANESE))
                 memset(curShow, 0, sizeof(TVShow));
         }
@@ -4887,7 +4887,7 @@ static void DoTVShowPokemonNewsMassOutbreak(void)
     ShowFieldMessage(sTVMassOutbreakTextGroup[sTVShowState]);
 }
 
-// TV Show that plays after a Link Contest. 
+// TV Show that plays after a Link Contest.
 // First talks about the winner and something they did, then about a losing player and something they did
 // The show is only generated when the player wins, but can be record mixed to other games
 // Each state buffers any needed data for a message to print from sTVContestLiveUpdatesTextGroup
diff --git a/src/union_room.c b/src/union_room.c
index 54f95f53c..e3902a3b6 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -61,13 +61,13 @@ enum {
     UR_STATE_CHECK_SELECTING_MON,
     UR_STATE_MAIN,
     UR_STATE_DO_SOMETHING_PROMPT,
-    UR_STATE_HANDLE_DO_SOMETHING_PROMPT_INPUT,   
+    UR_STATE_HANDLE_DO_SOMETHING_PROMPT_INPUT,
     UR_STATE_DO_SOMETHING_PROMPT_2,
     UR_STATE_PRINT_MSG,
     UR_STATE_HANDLE_ACTIVITY_REQUEST,
-    UR_STATE_DECLINE_ACTIVITY_REQUEST,  
+    UR_STATE_DECLINE_ACTIVITY_REQUEST,
     UR_STATE_PLAYER_CONTACTED_YOU,
-    UR_STATE_RECV_CONTACT_DATA,    
+    UR_STATE_RECV_CONTACT_DATA,
     UR_STATE_PRINT_START_ACTIVITY_MSG,
     UR_STATE_START_ACTIVITY_LINK,
     UR_STATE_START_ACTIVITY_WAIT_FOR_LINK,
@@ -80,7 +80,7 @@ enum {
     UR_STATE_ACCEPT_CHAT_REQUEST,
     UR_STATE_WAIT_FOR_START_MENU,
     UR_STATE_INTERACT_WITH_PLAYER,
-    UR_STATE_TRY_COMMUNICATING,        
+    UR_STATE_TRY_COMMUNICATING,
     UR_STATE_PRINT_AND_EXIT,
     UR_STATE_SEND_ACTIVITY_REQUEST,
     UR_STATE_TRAINER_APPEARS_BUSY,
@@ -94,15 +94,15 @@ enum {
     UR_STATE_CANCEL_REQUEST_PRINT_MSG,
     UR_STATE_CANCEL_REQUEST_RESTART_LINK,
     UR_STATE_COMMUNICATING_WAIT_FOR_DATA,
-    UR_STATE_WAIT_FOR_CONTACT_DATA,    
+    UR_STATE_WAIT_FOR_CONTACT_DATA,
     UR_STATE_PRINT_CARD_INFO,
     UR_STATE_WAIT_FINISH_READING_CARD,
     UR_STATE_INTERACT_WITH_ATTENDANT,
-    UR_STATE_REGISTER_PROMPT,    
+    UR_STATE_REGISTER_PROMPT,
     UR_STATE_CANCEL_REGISTRATION_PROMPT,
     UR_STATE_CHECK_TRADING_BOARD,
     UR_STATE_TRADING_BOARD_LOAD,
-    UR_STATE_REGISTER_PROMPT_HANDLE_INPUT,    
+    UR_STATE_REGISTER_PROMPT_HANDLE_INPUT,
     UR_STATE_TRADING_BOARD_HANDLE_INPUT,
     UR_STATE_TRADE_PROMPT,
     UR_STATE_TRADE_SELECT_MON,
@@ -110,7 +110,7 @@ enum {
     UR_STATE_REGISTER_REQUEST_TYPE,
     UR_STATE_REGISTER_SELECT_MON_FADE,
     UR_STATE_REGISTER_SELECT_MON,
-    UR_STATE_REGISTER_COMPLETE,        
+    UR_STATE_REGISTER_COMPLETE,
     UR_STATE_CANCEL_REGISTRATION,
 };
 
@@ -2514,8 +2514,8 @@ static void Task_RunUnionRoom(u8 taskId)
         uroom->state = UR_STATE_CHECK_SELECTING_MON;
         break;
     case UR_STATE_CHECK_SELECTING_MON:
-        if ((GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_REGISTER 
-          || GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_TRADE) 
+        if ((GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_REGISTER
+          || GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_TRADE)
            && sUnionRoomTrade.state != URTRADE_STATE_NONE)
         {
             id = GetCursorSelectionMonId();
@@ -2700,10 +2700,10 @@ static void Task_RunUnionRoom(u8 taskId)
         ScheduleFieldMessageWithFollowupState(UR_STATE_HANDLE_DO_SOMETHING_PROMPT_INPUT, sHiDoSomethingTexts[id][playerGender]);
         break;
     case UR_STATE_HANDLE_DO_SOMETHING_PROMPT_INPUT:
-        input = ListMenuHandler_AllItemsAvailable(&uroom->textState, 
-                                                  &uroom->topListMenuWindowId, 
-                                                  &uroom->topListMenuId, 
-                                                  &sWindowTemplate_InviteToActivity, 
+        input = ListMenuHandler_AllItemsAvailable(&uroom->textState,
+                                                  &uroom->topListMenuWindowId,
+                                                  &uroom->topListMenuId,
+                                                  &sWindowTemplate_InviteToActivity,
                                                   &sListMenuTemplate_InviteToActivity);
         if (input != -1)
         {
@@ -3057,10 +3057,10 @@ static void Task_RunUnionRoom(u8 taskId)
             uroom->state = UR_STATE_REGISTER_PROMPT_HANDLE_INPUT;
         break;
     case UR_STATE_REGISTER_PROMPT_HANDLE_INPUT:
-        input = ListMenuHandler_AllItemsAvailable(&uroom->textState, 
-                                                  &uroom->tradeBoardMainWindowId, 
-                                                  &uroom->tradeBoardHeaderWindowId, 
-                                                  &sWindowTemplate_RegisterForTrade, 
+        input = ListMenuHandler_AllItemsAvailable(&uroom->textState,
+                                                  &uroom->tradeBoardMainWindowId,
+                                                  &uroom->tradeBoardHeaderWindowId,
+                                                  &sWindowTemplate_RegisterForTrade,
                                                   &sListMenuTemplate_RegisterForTrade);
         if (input != -1)
         {
@@ -3096,10 +3096,10 @@ static void Task_RunUnionRoom(u8 taskId)
         }
         break;
     case UR_STATE_REGISTER_REQUEST_TYPE:
-        input = ListMenuHandler_AllItemsAvailable(&uroom->textState, 
-                                                  &uroom->tradeBoardMainWindowId, 
-                                                  &uroom->tradeBoardHeaderWindowId, 
-                                                  &sWindowTemplate_TradingBoardRequestType, 
+        input = ListMenuHandler_AllItemsAvailable(&uroom->textState,
+                                                  &uroom->tradeBoardMainWindowId,
+                                                  &uroom->tradeBoardHeaderWindowId,
+                                                  &sWindowTemplate_TradingBoardRequestType,
                                                   &sMenuTemplate_TradingBoardRequestType);
         if (input != -1)
         {
diff --git a/src/union_room_battle.c b/src/union_room_battle.c
index 2d1274f6e..1ca414d79 100644
--- a/src/union_room_battle.c
+++ b/src/union_room_battle.c
@@ -166,7 +166,7 @@ void CB2_UnionRoomBattle(void)
     case 4:
         if (GetBlockReceivedStatus() == 3)
         {
-            if (gBlockRecvBuffer[0][0] == (ACTIVITY_ACCEPT | IN_UNION_ROOM) 
+            if (gBlockRecvBuffer[0][0] == (ACTIVITY_ACCEPT | IN_UNION_ROOM)
              && gBlockRecvBuffer[1][0] == (ACTIVITY_ACCEPT | IN_UNION_ROOM))
             {
                 BeginNormalPaletteFade(PALETTES_ALL, 0, 0, 16, RGB_BLACK);
diff --git a/src/union_room_chat.c b/src/union_room_chat.c
index 27558814d..adf496fe6 100755
--- a/src/union_room_chat.c
+++ b/src/union_room_chat.c
@@ -310,11 +310,11 @@ static void (*const sChatMainFunctions[])(void) = {
     [CHAT_FUNC_SAVE_AND_EXIT] = Chat_SaveAndExit
 };
 
-static const u8 sKeyboardPageMaxRow[UNION_ROOM_KB_PAGE_COUNT] = 
+static const u8 sKeyboardPageMaxRow[UNION_ROOM_KB_PAGE_COUNT] =
 {
-    [UNION_ROOM_KB_PAGE_UPPER]    = 9, 
-    [UNION_ROOM_KB_PAGE_LOWER]    = 9, 
-    [UNION_ROOM_KB_PAGE_EMOJI]    = 9, 
+    [UNION_ROOM_KB_PAGE_UPPER]    = 9,
+    [UNION_ROOM_KB_PAGE_LOWER]    = 9,
+    [UNION_ROOM_KB_PAGE_EMOJI]    = 9,
     [UNION_ROOM_KB_PAGE_REGISTER] = 9
 };
 
@@ -466,45 +466,45 @@ static const u8 sCaseToggleTable[256] = {
 };
 
 // Excludes UNION_ROOM_KB_PAGE_REGISTER, the text for which is chosen by the player
-static const u8 *const sUnionRoomKeyboardText[UNION_ROOM_KB_PAGE_COUNT - 1][UNION_ROOM_KB_ROW_COUNT] = 
-{
-    [UNION_ROOM_KB_PAGE_UPPER] = 
-    {
-        gText_UnionRoomChatKeyboard_ABCDE, 
-        gText_UnionRoomChatKeyboard_FGHIJ, 
-        gText_UnionRoomChatKeyboard_KLMNO, 
-        gText_UnionRoomChatKeyboard_PQRST, 
-        gText_UnionRoomChatKeyboard_UVWXY, 
-        gText_UnionRoomChatKeyboard_Z, 
-        gText_UnionRoomChatKeyboard_01234Upper, 
-        gText_UnionRoomChatKeyboard_56789Upper, 
-        gText_UnionRoomChatKeyboard_PunctuationUpper, 
+static const u8 *const sUnionRoomKeyboardText[UNION_ROOM_KB_PAGE_COUNT - 1][UNION_ROOM_KB_ROW_COUNT] =
+{
+    [UNION_ROOM_KB_PAGE_UPPER] =
+    {
+        gText_UnionRoomChatKeyboard_ABCDE,
+        gText_UnionRoomChatKeyboard_FGHIJ,
+        gText_UnionRoomChatKeyboard_KLMNO,
+        gText_UnionRoomChatKeyboard_PQRST,
+        gText_UnionRoomChatKeyboard_UVWXY,
+        gText_UnionRoomChatKeyboard_Z,
+        gText_UnionRoomChatKeyboard_01234Upper,
+        gText_UnionRoomChatKeyboard_56789Upper,
+        gText_UnionRoomChatKeyboard_PunctuationUpper,
         gText_UnionRoomChatKeyboard_SymbolsUpper
     },
-    [UNION_ROOM_KB_PAGE_LOWER] = 
-    {
-        gText_UnionRoomChatKeyboard_abcde, 
-        gText_UnionRoomChatKeyboard_fghij, 
-        gText_UnionRoomChatKeyboard_klmno, 
-        gText_UnionRoomChatKeyboard_pqrst, 
-        gText_UnionRoomChatKeyboard_uvwxy, 
-        gText_UnionRoomChatKeyboard_z, 
-        gText_UnionRoomChatKeyboard_01234Lower, 
-        gText_UnionRoomChatKeyboard_56789Lower, 
-        gText_UnionRoomChatKeyboard_PunctuationLower, 
+    [UNION_ROOM_KB_PAGE_LOWER] =
+    {
+        gText_UnionRoomChatKeyboard_abcde,
+        gText_UnionRoomChatKeyboard_fghij,
+        gText_UnionRoomChatKeyboard_klmno,
+        gText_UnionRoomChatKeyboard_pqrst,
+        gText_UnionRoomChatKeyboard_uvwxy,
+        gText_UnionRoomChatKeyboard_z,
+        gText_UnionRoomChatKeyboard_01234Lower,
+        gText_UnionRoomChatKeyboard_56789Lower,
+        gText_UnionRoomChatKeyboard_PunctuationLower,
         gText_UnionRoomChatKeyboard_SymbolsLower
     },
-    [UNION_ROOM_KB_PAGE_EMOJI] = 
-    {
-        gText_UnionRoomChatKeyboard_Emoji1, 
-        gText_UnionRoomChatKeyboard_Emoji2, 
-        gText_UnionRoomChatKeyboard_Emoji3, 
-        gText_UnionRoomChatKeyboard_Emoji4, 
-        gText_UnionRoomChatKeyboard_Emoji5, 
-        gText_UnionRoomChatKeyboard_Emoji6, 
-        gText_UnionRoomChatKeyboard_Emoji7, 
-        gText_UnionRoomChatKeyboard_Emoji8, 
-        gText_UnionRoomChatKeyboard_Emoji9, 
+    [UNION_ROOM_KB_PAGE_EMOJI] =
+    {
+        gText_UnionRoomChatKeyboard_Emoji1,
+        gText_UnionRoomChatKeyboard_Emoji2,
+        gText_UnionRoomChatKeyboard_Emoji3,
+        gText_UnionRoomChatKeyboard_Emoji4,
+        gText_UnionRoomChatKeyboard_Emoji5,
+        gText_UnionRoomChatKeyboard_Emoji6,
+        gText_UnionRoomChatKeyboard_Emoji7,
+        gText_UnionRoomChatKeyboard_Emoji8,
+        gText_UnionRoomChatKeyboard_Emoji9,
         gText_UnionRoomChatKeyboard_Emoji10
     }
 };
@@ -610,113 +610,113 @@ static const struct SubtaskInfo sDisplaySubtasks[] = {
 
 static const struct MessageWindowInfo sDisplayStdMessages[] = {
     [STDMESSAGE_QUIT_CHATTING] = {
-        .text = gText_QuitChatting, 
-        .boxType = 1, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = FALSE, 
+        .text = gText_QuitChatting,
+        .boxType = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = FALSE,
         .useWiderBox = FALSE
     },
     [STDMESSAGE_REGISTER_WHERE] = {
-        .text = gText_RegisterTextWhere, 
-        .boxType = 1, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = FALSE, 
+        .text = gText_RegisterTextWhere,
+        .boxType = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = FALSE,
         .useWiderBox = FALSE
     },
     [STDMESSAGE_REGISTER_HERE] = {
-        .text = gText_RegisterTextHere, 
-        .boxType = 1, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = FALSE, 
+        .text = gText_RegisterTextHere,
+        .boxType = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = FALSE,
         .useWiderBox = FALSE
     },
     [STDMESSAGE_INPUT_TEXT] = {
-        .text = gText_InputText, 
-        .boxType = 1, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = FALSE, 
+        .text = gText_InputText,
+        .boxType = 1,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = FALSE,
         .useWiderBox = FALSE
     },
     [STDMESSAGE_EXITING_CHAT] = {
-        .text = gText_ExitingChat, 
-        .boxType = 2, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = FALSE, 
+        .text = gText_ExitingChat,
+        .boxType = 2,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = FALSE,
         .useWiderBox = FALSE
     },
     [STDMESSAGE_LEADER_LEFT] = {
-        .text = gText_LeaderLeftEndingChat, 
-        .boxType = 2, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = TRUE, 
+        .text = gText_LeaderLeftEndingChat,
+        .boxType = 2,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = TRUE,
         .useWiderBox = FALSE
     },
     [STDMESSAGE_ASK_SAVE] = {
-        .text = gText_RegisteredTextChangedOKToSave, 
-        .boxType = 2, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = FALSE, 
+        .text = gText_RegisteredTextChangedOKToSave,
+        .boxType = 2,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = FALSE,
         .useWiderBox = TRUE
     },
     [STDMESSAGE_ASK_OVERWRITE] = {
-        .text = gText_AlreadySavedFile_Chat, 
-        .boxType = 2, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = FALSE, 
+        .text = gText_AlreadySavedFile_Chat,
+        .boxType = 2,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = FALSE,
         .useWiderBox = TRUE
     },
     [STDMESSAGE_SAVING_NO_OFF] = {
-        .text = gText_SavingDontTurnOff_Chat, 
-        .boxType = 2, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = FALSE, 
+        .text = gText_SavingDontTurnOff_Chat,
+        .boxType = 2,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = FALSE,
         .useWiderBox = TRUE
     },
     [STDMESSAGE_SAVED_THE_GAME] = {
-        .text = gText_PlayerSavedGame_Chat, 
-        .boxType = 2, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = TRUE, 
+        .text = gText_PlayerSavedGame_Chat,
+        .boxType = 2,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = TRUE,
         .useWiderBox = TRUE
     },
     [STDMESSAGE_WARN_LEADER_LEAVE] = {
-        .text = gText_IfLeaderLeavesChatEnds, 
-        .boxType = 2, 
-        .x = 0, 
-        .y = 1, 
-        .letterSpacing = 0, 
-        .lineSpacing = 0, 
-        .hasPlaceholders = FALSE, 
+        .text = gText_IfLeaderLeavesChatEnds,
+        .boxType = 2,
+        .x = 0,
+        .y = 1,
+        .letterSpacing = 0,
+        .lineSpacing = 0,
+        .hasPlaceholders = FALSE,
         .useWiderBox = TRUE
     }
 };
@@ -1629,7 +1629,7 @@ static bool32 HandleDPadInput(void)
         return FALSE;
     } while (0);
 
-    return TRUE;  
+    return TRUE;
 }
 
 static void AppendTextToMessage(void)
@@ -1642,7 +1642,7 @@ static void AppendTextToMessage(void)
 
     if (sChat->currentPage != UNION_ROOM_KB_PAGE_REGISTER)
     {
-        // Going to append a single character        
+        // Going to append a single character
         charsStr = sUnionRoomKeyboardText[sChat->currentPage][sChat->currentRow];
         for (i = 0; i < sChat->currentCol; i++)
         {
@@ -3166,14 +3166,14 @@ static void MoveKeyboardCursor(void)
     if (page != UNION_ROOM_KB_PAGE_REGISTER)
     {
         StartSpriteAnim(sSprites->keyboardCursor, 0);
-        sSprites->keyboardCursor->pos1.x = x * 8 + 10;
-        sSprites->keyboardCursor->pos1.y = y * 12 + 24;
+        sSprites->keyboardCursor->x = x * 8 + 10;
+        sSprites->keyboardCursor->y = y * 12 + 24;
     }
     else
     {
         StartSpriteAnim(sSprites->keyboardCursor, 2);
-        sSprites->keyboardCursor->pos1.x = 24;
-        sSprites->keyboardCursor->pos1.y = y * 12 + 24;
+        sSprites->keyboardCursor->x = 24;
+        sSprites->keyboardCursor->y = y * 12 + 24;
     }
 }
 
@@ -3230,7 +3230,7 @@ static void SpriteCB_TextEntryCursor(struct Sprite *sprite)
     else
     {
         sprite->invisible = FALSE;
-        sprite->pos1.x = pos * 8 + 76;
+        sprite->x = pos * 8 + 76;
     }
 }
 
@@ -3239,8 +3239,8 @@ static void SpriteCB_TextEntryArrow(struct Sprite *sprite)
     if (++sprite->data[0] > 4)
     {
         sprite->data[0] = 0;
-        if (++sprite->pos2.x > 4)
-            sprite->pos2.x = 0;
+        if (++sprite->x2 > 4)
+            sprite->x2 = 0;
     }
 }
 
diff --git a/src/union_room_player_avatar.c b/src/union_room_player_avatar.c
index 9a0f1a883..4fe470422 100644
--- a/src/union_room_player_avatar.c
+++ b/src/union_room_player_avatar.c
@@ -26,23 +26,23 @@ static void SetUnionRoomObjectFacingDirection(s32, s32, u8);
 // + 2 is just to match, those elements are empty and never read
 static const u8 sUnionRoomObjGfxIds[GENDER_COUNT][MAX_UNION_ROOM_LEADERS + 2] = {
     [MALE] = {
-        OBJ_EVENT_GFX_MAN_3, 
-        OBJ_EVENT_GFX_BLACK_BELT, 
-        OBJ_EVENT_GFX_CAMPER, 
-        OBJ_EVENT_GFX_YOUNGSTER, 
-        OBJ_EVENT_GFX_PSYCHIC_M, 
-        OBJ_EVENT_GFX_BUG_CATCHER, 
-        OBJ_EVENT_GFX_MAN_4, 
+        OBJ_EVENT_GFX_MAN_3,
+        OBJ_EVENT_GFX_BLACK_BELT,
+        OBJ_EVENT_GFX_CAMPER,
+        OBJ_EVENT_GFX_YOUNGSTER,
+        OBJ_EVENT_GFX_PSYCHIC_M,
+        OBJ_EVENT_GFX_BUG_CATCHER,
+        OBJ_EVENT_GFX_MAN_4,
         OBJ_EVENT_GFX_MAN_5
     },
     [FEMALE] = {
-        OBJ_EVENT_GFX_WOMAN_5, 
-        OBJ_EVENT_GFX_HEX_MANIAC, 
-        OBJ_EVENT_GFX_PICNICKER, 
-        OBJ_EVENT_GFX_LASS, 
-        OBJ_EVENT_GFX_LASS, 
-        OBJ_EVENT_GFX_GIRL_3, 
-        OBJ_EVENT_GFX_WOMAN_2, 
+        OBJ_EVENT_GFX_WOMAN_5,
+        OBJ_EVENT_GFX_HEX_MANIAC,
+        OBJ_EVENT_GFX_PICNICKER,
+        OBJ_EVENT_GFX_LASS,
+        OBJ_EVENT_GFX_LASS,
+        OBJ_EVENT_GFX_GIRL_3,
+        OBJ_EVENT_GFX_WOMAN_2,
         OBJ_EVENT_GFX_BEAUTY
     }
 };
@@ -101,13 +101,13 @@ static const u8 sUnionRoomLocalIds[] = {
 
 // Unused
 static const u16 sHidePlayerFlags[] = {
-    FLAG_HIDE_UNION_ROOM_PLAYER_1, 
-    FLAG_HIDE_UNION_ROOM_PLAYER_2, 
-    FLAG_HIDE_UNION_ROOM_PLAYER_3, 
-    FLAG_HIDE_UNION_ROOM_PLAYER_4, 
-    FLAG_HIDE_UNION_ROOM_PLAYER_5, 
-    FLAG_HIDE_UNION_ROOM_PLAYER_6, 
-    FLAG_HIDE_UNION_ROOM_PLAYER_7, 
+    FLAG_HIDE_UNION_ROOM_PLAYER_1,
+    FLAG_HIDE_UNION_ROOM_PLAYER_2,
+    FLAG_HIDE_UNION_ROOM_PLAYER_3,
+    FLAG_HIDE_UNION_ROOM_PLAYER_4,
+    FLAG_HIDE_UNION_ROOM_PLAYER_5,
+    FLAG_HIDE_UNION_ROOM_PLAYER_6,
+    FLAG_HIDE_UNION_ROOM_PLAYER_7,
     FLAG_HIDE_UNION_ROOM_PLAYER_8
 };
 
@@ -400,10 +400,10 @@ void CreateUnionRoomPlayerSprites(u8 * spriteIds, s32 leaderId)
     for (memberId = 0; memberId < MAX_RFU_PLAYERS; memberId++)
     {
         s32 id = UR_PLAYER_SPRITE_ID(leaderId, memberId);
-        spriteIds[id] = CreateObjectSprite(OBJ_EVENT_GFX_MAN_4, 
-                                           id - UR_SPRITE_START_ID, 
-                                           sUnionRoomPlayerCoords[leaderId][0] + sUnionRoomGroupOffsets[memberId][0], 
-                                           sUnionRoomPlayerCoords[leaderId][1] + sUnionRoomGroupOffsets[memberId][1], 
+        spriteIds[id] = CreateObjectSprite(OBJ_EVENT_GFX_MAN_4,
+                                           id - UR_SPRITE_START_ID,
+                                           sUnionRoomPlayerCoords[leaderId][0] + sUnionRoomGroupOffsets[memberId][0],
+                                           sUnionRoomPlayerCoords[leaderId][1] + sUnionRoomGroupOffsets[memberId][1],
                                            3, 1);
         SetObjectEventSpriteInvisibility(id - UR_SPRITE_START_ID, TRUE);
     }
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index 669b6ab25..6ebc707e5 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -29,7 +29,7 @@
     This file handles the screen where the player chooses
     which pokemon to give a pokeblock to. The subsequent scene
     of feeding the pokeblock to the pokemon is handled by
-    pokeblock_feed.c, and the rest of the pokeblock menu (and 
+    pokeblock_feed.c, and the rest of the pokeblock menu (and
     other pokeblock-related functions) are in pokeblock.c
 */
 
@@ -243,7 +243,7 @@ static const struct BgTemplate sBgTemplates[4] =
     }
 };
 
-static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] = 
+static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] =
 {
     [WIN_NAME] = {
         .bg = 0,
@@ -275,7 +275,7 @@ static const struct WindowTemplate sWindowTemplates[WIN_COUNT + 1] =
     DUMMY_WIN_TEMPLATE
 };
 
-static const struct WindowTemplate sUsePokeblockYesNoWinTemplate = 
+static const struct WindowTemplate sUsePokeblockYesNoWinTemplate =
 {
     .bg = 0,
     .tilemapLeft = 24,
@@ -295,7 +295,7 @@ static const u8 *const sContestStatNames[] =
     gText_Beauty3
 };
 
-static const struct SpriteSheet sSpriteSheet_UpDown = 
+static const struct SpriteSheet sSpriteSheet_UpDown =
 {
     gUsePokeblockUpDown_Gfx, 0x200, TAG_UP_DOWN
 };
@@ -314,7 +314,7 @@ static const s16 sUpDownCoordsOnGraph[FLAVOR_COUNT][2] =
     {197,  59}
 };
 
-static const struct OamData sOam_UpDown = 
+static const struct OamData sOam_UpDown =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -357,7 +357,7 @@ static const struct SpriteTemplate sSpriteTemplate_UpDown =
     .callback = SpriteCallbackDummy,
 };
 
-static const struct OamData sOam_Condition = 
+static const struct OamData sOam_Condition =
 {
     .y = 0,
     .affineMode = ST_OAM_AFFINE_OFF,
@@ -1143,9 +1143,9 @@ static void LoadAndCreateUpDownSprites(void)
 static void SpriteCB_UpDown(struct Sprite *sprite)
 {
     if (sprite->data[0] < 6)
-        sprite->pos2.y -= 2;
+        sprite->y2 -= 2;
     else if (sprite->data[0] < 12)
-        sprite->pos2.y += 2;
+        sprite->y2 += 2;
 
     if (++sprite->data[0] > 60)
     {
@@ -1234,7 +1234,7 @@ static void UpdateMonPic(u8 loadId)
         {
             sMenu->curMonSpriteId = spriteId;
             gSprites[sMenu->curMonSpriteId].callback = SpriteCB_MonPic;
-            gSprites[sMenu->curMonSpriteId].pos2.y -= 34;
+            gSprites[sMenu->curMonSpriteId].y2 -= 34;
             sMenu->curMonTileStart = (void*)(OBJ_VRAM0 + (sMenu->curMonSheet * 32));
             sMenu->curMonPalette = (sMenu->curMonPalette * 16) + 0x100;
         }
@@ -1574,7 +1574,7 @@ static bool8 LoadNewSelection_MonToMon(void)
 
 static void SpriteCB_MonPic(struct Sprite *sprite)
 {
-    sprite->pos1.x = sMenu->curMonXOffset + 38;
+    sprite->x = sMenu->curMonXOffset + 38;
 }
 
 static void SpriteCB_SelectionIconPokeball(struct Sprite *sprite)
@@ -1594,7 +1594,7 @@ static void SpriteCB_SelectionIconCancel(struct Sprite *sprite)
 }
 
 // Calculate the max id for sparkles/stars that appear around the pokemon on the condition screen
-// All pokemon start with 1 sparkle (added by CreateConditionSparkleSprites), so the number here +1 
+// All pokemon start with 1 sparkle (added by CreateConditionSparkleSprites), so the number here +1
 // is the total number of sparkles that appear
 static void CalculateNumAdditionalSparkles(u8 monIndex)
 {
@@ -1661,13 +1661,13 @@ static bool8 LoadConditionTitle(void)
 // Literally the word "Condition", the title block that appears over the mon icon
 static void SpriteCB_Condition(struct Sprite *sprite)
 {
-    s16 prevX = sprite->pos1.x;
+    s16 prevX = sprite->x;
 
-    sprite->pos1.x += sprite->data[0];
-    if ((prevX <= sprite->data[1] && sprite->pos1.x >= sprite->data[1])
-     || (prevX >= sprite->data[1] && sprite->pos1.x <= sprite->data[1]))
+    sprite->x += sprite->data[0];
+    if ((prevX <= sprite->data[1] && sprite->x >= sprite->data[1])
+     || (prevX >= sprite->data[1] && sprite->x <= sprite->data[1]))
     {
-        sprite->pos1.x = sprite->data[1];
+        sprite->x = sprite->data[1];
         sprite->callback = SpriteCallbackDummy;
     }
 }
diff --git a/src/walda_phrase.c b/src/walda_phrase.c
index 18fb2791b..aa85c0d60 100644
--- a/src/walda_phrase.c
+++ b/src/walda_phrase.c
@@ -12,17 +12,20 @@
 
 extern const u8 gText_Peekaboo[];
 
-// this file's functions
 static void CB2_HandleGivenWaldaPhrase(void);
-static u32 GetWaldaPhraseInputCase(u8 *inputPtr);
-static bool32 TryCalculateWallpaper(u16* backgroundClr, u16 *foregroundClr, u8 *iconId, u8 *patternId, u16 trainerId, u8 *phrase);
-static void sub_81D9D5C(u8 *array, u8 *letterTableIds, u32 arg2, u32 arg3, u32 loopCount);
-static u32 sub_81D9DAC(u8 *array, u32 arg1, u32 loopCount);
-static void sub_81D9C90(u8 *array, s32 arg1, s32 arg2);
-static void sub_81D9CDC(u8 *array, u32 loopCount, u8 arg2);
-
-// only consonants are allowed, no vowels, some lowercase letters are missing
-static const u8 sWaldaLettersTable[] =
+static u32 GetWaldaPhraseInputCase(u8 *);
+static bool32 TryCalculateWallpaper(u16 *, u16 *, u8 *, u8 *, u16, u8 *);
+static void SetWallpaperDataFromLetter(u8 *, u8 *, u32, u32, u32);
+static u32 GetWallpaperDataBits(u8 *, u32, u32);
+static void RotateWallpaperDataLeft(u8 *, s32, s32);
+static void MaskWallpaperData(u8 *, u32, u8);
+
+// There are 32 (2^5) unique letters allowed in a successful phrase for Walda.
+#define BITS_PER_LETTER 5
+
+// The letters allowed in a successful phrase for Walda
+// All vowels are excluded, as well as X/x, Y/y, l, r, t, v, w, and z.
+static const u8 sWaldaLettersTable[1 << BITS_PER_LETTER] =
 {
     CHAR_B, CHAR_C, CHAR_D, CHAR_F, CHAR_G, CHAR_H, CHAR_J, CHAR_K, CHAR_L, CHAR_M, CHAR_N, CHAR_P, CHAR_Q, CHAR_R, CHAR_S, CHAR_T, CHAR_V, CHAR_W, CHAR_Z,
     CHAR_b, CHAR_c, CHAR_d, CHAR_f, CHAR_g, CHAR_h, CHAR_j, CHAR_k,         CHAR_m, CHAR_n, CHAR_p, CHAR_q,         CHAR_s
@@ -30,9 +33,9 @@ static const u8 sWaldaLettersTable[] =
 
 enum
 {
-    PHRASE_GIVEN_NEW,
+    PHRASE_CHANGED,
     PHRASE_NO_CHANGE,
-    PHRASE_FIRST_ATTEMPT
+    PHRASE_EMPTY
 };
 
 u16 TryBufferWaldaPhrase(void)
@@ -56,13 +59,15 @@ static void CB2_HandleGivenWaldaPhrase(void)
 
     switch (gSpecialVar_0x8004)
     {
-    case PHRASE_FIRST_ATTEMPT:
+    case PHRASE_EMPTY:
+        // If saved phrase is also empty, set default phrase
+        // Otherwise keep saved phrase
         if (IsWaldaPhraseEmpty())
             SetWaldaPhrase(gText_Peekaboo);
         else
             gSpecialVar_0x8004 = PHRASE_NO_CHANGE;
         break;
-    case PHRASE_GIVEN_NEW:
+    case PHRASE_CHANGED:
         SetWaldaPhrase(gStringVar2);
         break;
     case PHRASE_NO_CHANGE:
@@ -76,12 +81,16 @@ static void CB2_HandleGivenWaldaPhrase(void)
 
 static u32 GetWaldaPhraseInputCase(u8 *inputPtr)
 {
+    // No input given
     if (inputPtr[0] == EOS)
-        return PHRASE_FIRST_ATTEMPT;
+        return PHRASE_EMPTY;
+
+    // Input given is the same as saved phrase
     if (StringCompare(inputPtr, GetWaldaPhrasePtr()) == 0)
         return PHRASE_NO_CHANGE;
 
-    return PHRASE_GIVEN_NEW;
+    // Input is new phrase
+    return PHRASE_CHANGED;
 }
 
 u16 TryGetWallpaperWithWaldaPhrase(void)
@@ -99,7 +108,7 @@ u16 TryGetWallpaperWithWaldaPhrase(void)
     }
 
     SetWaldaWallpaperLockedOrUnlocked(gSpecialVar_Result);
-    return (bool8)(gSpecialVar_Result);
+    return (bool8)gSpecialVar_Result;
 }
 
 static u8 GetLetterTableId(u8 letter)
@@ -115,132 +124,155 @@ static u8 GetLetterTableId(u8 letter)
     return ARRAY_COUNT(sWaldaLettersTable);
 }
 
+// Attempts to generate a wallpaper based on the given trainer id and phrase.
+// Returns TRUE if successful and sets the wallpaper results to the given pointers.
+// Returns FALSE if no wallpaper was generated (Walda "didn't like" the phrase).
+// A 9-byte array is used to calculate the wallpaper's data.
+// The elements of this array are defined below.
+#define BG_COLOR_LO  data[0]
+#define BG_COLOR_HI  data[1]
+#define FG_COLOR_LO  data[2]
+#define FG_COLOR_HI  data[3]
+#define ICON_ID      data[4]
+#define PATTERN_ID   data[5]
+#define TID_CHECK_HI data[6]
+#define TID_CHECK_LO data[7]
+#define KEY          data[8]
+#define NUM_WALLPAPER_DATA_BYTES 9
+#define TO_BIT_OFFSET(i)  (3 + (8 * (i))) // Convert a position in the phrase to a bit number into the wallpaper data array
 static bool32 TryCalculateWallpaper(u16* backgroundClr, u16 *foregroundClr, u8 *iconId, u8 *patternId, u16 trainerId, u8 *phrase)
 {
     s32 i;
-    ALIGNED(2) u8 array[12];
-    u8 charsByTableId[16];
+    ALIGNED(2) u8 data[NUM_WALLPAPER_DATA_BYTES];
+    u8 charsByTableId[WALDA_PHRASE_LENGTH];
     u16 *ptr;
 
-    if (StringLength(phrase) != 15)
+    // Reject any phrase that does not use the full length
+    if (StringLength(phrase) != WALDA_PHRASE_LENGTH)
         return FALSE;
 
-    for (i = 0; i < 15; i++)
+    // Reject any phrase that uses characters not in sWaldaLettersTable
+    for (i = 0; i < WALDA_PHRASE_LENGTH; i++)
     {
         charsByTableId[i] = GetLetterTableId(phrase[i]);
         if (charsByTableId[i] == ARRAY_COUNT(sWaldaLettersTable))
             return FALSE;
     }
 
-    for (i = 0; i < 14; i++)
-    {
-        sub_81D9D5C(array, charsByTableId, (5 * i), 3 + (8 * i), 5);
-    }
+    // Use the given phrase to populate the wallpaper data array
+    // The data array is 9 bytes (72 bits) long, and each letter contributes to 5 bits of the array
+    // Because the phrase is 15 letters long there are 75 bits from the phrase to distribute
+    // Therefore the last letter contributes to the last 2 bits of the array, and the remaining 3 bits wrap around
+    for (i = 0; i < WALDA_PHRASE_LENGTH - 1; i++)
+        SetWallpaperDataFromLetter(data, charsByTableId, BITS_PER_LETTER * i, TO_BIT_OFFSET(i), BITS_PER_LETTER);
 
-    sub_81D9D5C(array, charsByTableId, 70, 115, 2);
+    // Do first 2 bits of the last letter
+    SetWallpaperDataFromLetter(data, charsByTableId, BITS_PER_LETTER * (WALDA_PHRASE_LENGTH - 1), TO_BIT_OFFSET(WALDA_PHRASE_LENGTH - 1), 2);
 
-    if (sub_81D9DAC(array, 0, 3) != sub_81D9DAC(charsByTableId, 117, 3))
+    // Check the first 3 bits of the data array against the remaining 3 bits of the last letter
+    // Reject the phrase if they are not already the same
+    if (GetWallpaperDataBits(data, 0, 3) != GetWallpaperDataBits(charsByTableId, TO_BIT_OFFSET(WALDA_PHRASE_LENGTH - 1) + 2, 3))
         return FALSE;
 
-    sub_81D9C90(array, 9, 21);
-    sub_81D9C90(array, 8, array[8] & 0xF);
-    sub_81D9CDC(array, 8, array[8] >> 4);
+    // Perform some relatively arbitrary changes to the wallpaper data using the last byte (KEY) 
+    RotateWallpaperDataLeft(data, NUM_WALLPAPER_DATA_BYTES,     21);
+    RotateWallpaperDataLeft(data, NUM_WALLPAPER_DATA_BYTES - 1, KEY & 0xF);
+    MaskWallpaperData(data, NUM_WALLPAPER_DATA_BYTES - 1, KEY >> 4);
 
-    if (array[6] != (array[0] ^ array[2] ^ array[4] ^ (trainerId >> 8)))
+    // Reject the results of any phrase that are 'incompatible' with the player's trainer id
+    if (TID_CHECK_HI != (BG_COLOR_LO ^ FG_COLOR_LO ^ ICON_ID ^ (trainerId >> 8)))
         return FALSE;
-
-    if (array[7] != (array[1] ^ array[3] ^ array[5] ^ (trainerId & 0xFF)))
+    if (TID_CHECK_LO != (BG_COLOR_HI ^ FG_COLOR_HI ^ PATTERN_ID ^ (trainerId & 0xFF)))
         return FALSE;
 
-    ptr = (u16*)(&array[0]);
+    // Successful phrase, save resulting wallpaper
+    ptr = (u16*) &BG_COLOR_LO;
     *backgroundClr = *ptr;
 
-    ptr = (u16*)(&array[2]);
+    ptr = (u16*) &FG_COLOR_LO;
     *foregroundClr = *ptr;
 
-    *iconId = array[4];
-    *patternId = array[5];
+    *iconId = ICON_ID;
+    *patternId = PATTERN_ID;
 
     return TRUE;
 }
 
-static void sub_81D9C90(u8 *array, s32 arg1, s32 arg2)
+static void RotateWallpaperDataLeft(u8 *data, s32 size, s32 numShifts)
 {
     s32 i, j;
-    u8 var1, var2;
+    u8 temp1, temp2;
 
-    for (i = arg2 - 1; i != -1; i--)
+    for (i = numShifts - 1; i != -1; i--)
     {
-        var1 = (array[0] & 0x80) >> 7;
+        temp1 = (data[0] & (1 << 7)) >> 7;
 
-        for (j = arg1 - 1; j >= 0; j--)
+        for (j = size - 1; j >= 0; j--)
         {
-            var2 = (array[j] & 0x80) >> 7;
-            array[j] <<= 1;
-            array[j] |= var1;
-            var1 = var2;
+            temp2 = (data[j] & (1 << 7)) >> 7;
+            data[j] <<= 1;
+            data[j] |= temp1;
+            temp1 = temp2;
         }
     }
 }
 
-static void sub_81D9CDC(u8 *array, u32 loopCount, u8 arg2)
+static void MaskWallpaperData(u8 *data, u32 size, u8 mask)
 {
     u32 i;
 
-    arg2 |= (arg2 << 4);
+    mask |= (mask << 4);
 
-    for (i = 0; i < loopCount; i++)
-    {
-        array[i] ^= arg2;
-    }
+    for (i = 0; i < size; i++)
+        data[i] ^= mask;
 }
 
-static bool8 sub_81D9D0C(u8 *array, u32 arg1)
+static bool8 GetWallpaperDataBit(u8 *data, u32 bitNum)
 {
-    u32 arrayId = arg1 >> 3;
-    u32 bits = 0x80 >> (7 & arg1);
+    u32 i = bitNum / 8;
+    u32 flag = (1 << 7) >> (bitNum % 8);
 
-    return ((array[arrayId] & bits) != 0);
+    return (data[i] & flag) != 0;
 }
 
-static void sub_81D9D28(u8 *array, u32 arg1)
+static void SetWallpaperDataBit(u8 *data, u32 bitNum)
 {
-    u32 arrayId = arg1 >> 3;
-    u8 bits = 0x80 >> (7 & arg1);
+    u32 i = bitNum / 8;
+    u8 flag = (1 << 7) >> (bitNum % 8);
 
-    array[arrayId] |= bits;
+    data[i] |= flag;
 }
 
-static void sub_81D9D40(u8 *array, u32 arg1)
+static void ClearWallpaperDataBit(u8 *data, u32 bitNum)
 {
-    u32 arrayId = arg1 >> 3;
-    u8 bits = ~(0x80 >> (7 & arg1));
+    u32 i = bitNum / 8;
+    u8 mask = ~((1 << 7) >> (bitNum % 8));
 
-    array[arrayId] &= bits;
+    data[i] &= mask;
 }
 
-static void sub_81D9D5C(u8 *array, u8 *letterTableIds, u32 arg2, u32 arg3, u32 loopCount)
+static void SetWallpaperDataFromLetter(u8 *data, u8 *letterTableIds, u32 setOffset, u32 getOffset, u32 numBits)
 {
     u32 i;
 
-    for (i = 0; i < loopCount; i++)
+    for (i = 0; i < numBits; i++)
     {
-        if (sub_81D9D0C(letterTableIds, arg3 + i))
-            sub_81D9D28(array, arg2 + i);
+        if (GetWallpaperDataBit(letterTableIds, getOffset + i))
+            SetWallpaperDataBit(data, setOffset + i);
         else
-            sub_81D9D40(array, arg2 + i);
+            ClearWallpaperDataBit(data, setOffset + i);
     }
 }
 
-static u32 sub_81D9DAC(u8 *array, u32 arg1, u32 loopCount)
+static u32 GetWallpaperDataBits(u8 *data, u32 offset, u32 numBits)
 {
-    u32 ret, i;
+    u32 bits, i;
 
-    for (ret = 0, i = 0; i < loopCount; i++)
+    for (bits = 0, i = 0; i < numBits; i++)
     {
-        ret <<= 1;
-        ret |= sub_81D9D0C(array, arg1 + i);
+        bits <<= 1;
+        bits |= GetWallpaperDataBit(data, offset + i);
     }
 
-    return ret;
+    return bits;
 }
diff --git a/src/wallclock.c b/src/wallclock.c
index 70888ac5f..6f9bc02ae 100644
--- a/src/wallclock.c
+++ b/src/wallclock.c
@@ -1029,8 +1029,8 @@ static void SpriteCB_MinuteHand(struct Sprite *sprite)
     if (y > 128)
         y |= 0xff00;
 
-    sprite->pos2.x = x;
-    sprite->pos2.y = y;
+    sprite->x2 = x;
+    sprite->y2 = y;
 }
 
 static void SpriteCB_HourHand(struct Sprite *sprite)
@@ -1049,8 +1049,8 @@ static void SpriteCB_HourHand(struct Sprite *sprite)
     if (y > 128)
         y |= 0xff00;
 
-    sprite->pos2.x = x;
-    sprite->pos2.y = y;
+    sprite->x2 = x;
+    sprite->y2 = y;
 }
 
 static void SpriteCB_PMIndicator(struct Sprite *sprite)
@@ -1077,8 +1077,8 @@ static void SpriteCB_PMIndicator(struct Sprite *sprite)
             sprite->data[1]--;
         }
     }
-    sprite->pos2.x = Cos2(sprite->data[1]) * 30 / 0x1000;
-    sprite->pos2.y = Sin2(sprite->data[1]) * 30 / 0x1000;
+    sprite->x2 = Cos2(sprite->data[1]) * 30 / 0x1000;
+    sprite->y2 = Sin2(sprite->data[1]) * 30 / 0x1000;
 }
 
 static void SpriteCB_AMIndicator(struct Sprite *sprite)
@@ -1105,6 +1105,6 @@ static void SpriteCB_AMIndicator(struct Sprite *sprite)
             sprite->data[1]--;
         }
     }
-    sprite->pos2.x = Cos2(sprite->data[1]) * 30 / 0x1000;
-    sprite->pos2.y = Sin2(sprite->data[1]) * 30 / 0x1000;
+    sprite->x2 = Cos2(sprite->data[1]) * 30 / 0x1000;
+    sprite->y2 = Sin2(sprite->data[1]) * 30 / 0x1000;
 }
diff --git a/src/wireless_communication_status_screen.c b/src/wireless_communication_status_screen.c
index 1d15df32f..5c5272a44 100644
--- a/src/wireless_communication_status_screen.c
+++ b/src/wireless_communication_status_screen.c
@@ -421,9 +421,9 @@ static bool32 UpdateCommunicationCounts(u32 * groupCounts, u32 * prevGroupCounts
         memcpy(groupCounts,     groupCountBuffer, sizeof(groupCountBuffer));
         memcpy(prevGroupCounts, groupCountBuffer, sizeof(groupCountBuffer));
 
-        groupCounts[GROUPTYPE_TOTAL] = groupCounts[GROUPTYPE_TRADE] 
-                                     + groupCounts[GROUPTYPE_BATTLE] 
-                                     + groupCounts[GROUPTYPE_UNION] 
+        groupCounts[GROUPTYPE_TOTAL] = groupCounts[GROUPTYPE_TRADE]
+                                     + groupCounts[GROUPTYPE_BATTLE]
+                                     + groupCounts[GROUPTYPE_UNION]
                                      + groupCounts[GROUPTYPE_TOTAL];
         return TRUE;
     }
diff --git a/sym_common.txt b/sym_common.txt
index 1525d8aec..938b78fbe 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -2,7 +2,7 @@
 	.include "main.o"
 	@ ../gflib/bg.o
 	.align 2
-gUnneededFireRedVariable:
+gWindowTileAutoAllocEnabled:
     .space 4
     @ ../gflib/window.o
     .align 4
diff --git a/tools/gbagfx/rl.c b/tools/gbagfx/rl.c
index 968c9347e..993ac6449 100644
--- a/tools/gbagfx/rl.c
+++ b/tools/gbagfx/rl.c
@@ -101,7 +101,7 @@ unsigned char *RLCompress(unsigned char *src, int srcSize, int *compressedSize)
             srcPos++;
             uncompressedLength++;
         }
-        
+
         if (uncompressedLength > 0)
         {
             dest[destPos++] = uncompressedLength - 1;